Merge lp:~jr/bzr/i18n-topic-help into lp:bzr

[Jonathan Riddell]

Turn on translations for help topics.

Add topic help to translations (bzr.pot will be updated before sending to PQM)

[Jelmer Vernooij (jelmer)]

Should this also be guarded against initializing i18n twice?

review: Needs Fixing

[Jonathan Riddell (jr)]

> Should this also be guarded against initializing i18n twice?

No need since https://code.launchpad.net/~jr/bzr/i18n-install-once/+merge/73508 is in trunk

[Jelmer Vernooij (jelmer)]

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

[Jonathan Riddell (jr)]

sent to pqm by email

=== modified file 'bzrlib/export_pot.py'
--- bzrlib/export_pot.py	2011-05-28 12:17:22 +0000
+++ bzrlib/export_pot.py	2011-09-07 14:35:33 +0000
@@ -28,6 +28,7 @@
     errors,
     help_topics,
     plugin,
+    help,
     )
 from bzrlib.trace import (
     mutter,
@@ -234,7 +235,11 @@
                     outf,
                     'dummy/help_topics/'+key+'/detail.txt',
                     1, doc)
-
+        elif callable(doc): # help topics from files
+            _poentry_per_paragraph(
+                    outf,
+                    'en/help_topics/'+key+'.txt',
+                    1, doc(key))
         summary = topic_registry.get_summary(key)
         if summary is not None:
             _poentry(outf, 'dummy/help_topics/'+key+'/summary.txt',
@@ -246,5 +251,4 @@
     _standard_options(outf)
     _command_helps(outf)
     _error_messages(outf)
-    # disable exporting help topics until we decide  how to translate it.
-    #_help_topics(outf)
+    _help_topics(outf)

=== modified file 'bzrlib/help_topics/__init__.py'
--- bzrlib/help_topics/__init__.py	2011-08-24 18:42:15 +0000
+++ bzrlib/help_topics/__init__.py	2011-09-07 14:35:33 +0000
@@ -40,6 +40,7 @@
     config,
     osutils,
     registry,
+    i18n,
     )
 
 
@@ -879,6 +880,8 @@
         result += _format_see_also(additional_see_also)
         if plain:
             result = help_as_plain_text(result)
+        i18n.install()
+        result = i18n.gettext_per_paragraph(result)
         return result
 
     def get_help_topic(self):

=== modified file 'bzrlib/tests/test_i18n.py'
--- bzrlib/tests/test_i18n.py	2011-09-07 10:50:09 +0000
+++ bzrlib/tests/test_i18n.py	2011-09-07 14:35:33 +0000
@@ -125,3 +125,12 @@
         except errors.NotBranchError,e:
             err = str(e)
         self.assertContainsRe(err, u"zz\xe5{{Not a branch: .*}}".encode("utf-8"))
+    def test_topic_help_translation(self):
+        """does topic help get translated?"""
+        from bzrlib import help
+        i18n.install()
+        self.overrideAttr(i18n, '_translations', ZzzTranslations())
+        from StringIO import StringIO
+        out = StringIO()
+        help.help("authentication", out)
+        self.assertContainsRe(out.getvalue(), "zz\xe5{{Authentication Settings")

=== modified file 'po/bzr.pot'
--- po/bzr.pot	2011-08-24 14:14:42 +0000
+++ po/bzr.pot	2011-09-07 14:35:33 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: bzr\n"
 "Report-Msgid-Bugs-To: <[e-mail]>\n"
-"POT-Creation-Date: 2011-08-24 15:14+0100\n"
+"POT-Creation-Date: 2011-09-07 15:32+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -327,7 +327,7 @@
 #: bzrlib/builtins.py:979
 msgid ""
 "If there is no default location set, the first pull will set it (use\n"
-"--no-remember to avoid settting it). After that, you can omit the\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 ""
@@ -357,72 +357,72 @@
 "master branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1097
+#: bzrlib/builtins.py:1096
 msgid "Update a mirror of this branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1099
+#: bzrlib/builtins.py:1098
 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:1102
+#: bzrlib/builtins.py:1101
 msgid ""
 "Some smart servers or protocols *may* put the working tree in place in\n"
 "the future."
 msgstr ""
 
-#: bzrlib/builtins.py:1105
+#: bzrlib/builtins.py:1104
 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:1109
+#: bzrlib/builtins.py:1108
 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:1112
+#: bzrlib/builtins.py:1111
 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:1116
+#: bzrlib/builtins.py:1115
 msgid ""
 "If there is no default push location set, the first push will set it (use\n"
-"--no-remember to avoid settting it).  After that, you can omit the\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 ""
 
 # help of 'directory' option of 'push' command
-#: bzrlib/builtins.py:1128
+#: bzrlib/builtins.py:1127
 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:1131
+#: bzrlib/builtins.py:1130
 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:1136
+#: bzrlib/builtins.py:1135
 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:1139
+#: bzrlib/builtins.py:1138
 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 "
@@ -430,22 +430,22 @@
 msgstr ""
 
 # help of 'strict' option of 'push' command
-#: bzrlib/builtins.py:1144
+#: bzrlib/builtins.py:1143
 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:1147
+#: bzrlib/builtins.py:1146
 msgid "Don't populate the working tree, even for protocols that support it."
 msgstr ""
 
-#: bzrlib/builtins.py:1212
+#: bzrlib/builtins.py:1211
 msgid "Create a new branch that is a copy of an existing branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1214
+#: bzrlib/builtins.py:1213
 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 ./"
@@ -456,65 +456,65 @@
 "create ./foo-bar."
 msgstr ""
 
-#: bzrlib/builtins.py:1221
+#: bzrlib/builtins.py:1220
 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:1224
+#: bzrlib/builtins.py:1223
 msgid "The synonyms 'clone' and 'get' for this command are deprecated."
 msgstr ""
 
 # help of 'no-tree' option of 'branch' command
-#: bzrlib/builtins.py:1234
+#: bzrlib/builtins.py:1233
 msgid "Create a branch without a working-tree."
 msgstr ""
 
 # help of 'switch' option of 'branch' command
-#: bzrlib/builtins.py:1236
+#: bzrlib/builtins.py:1235
 msgid "Switch the checkout in the current directory to the new branch."
 msgstr ""
 
 # help of 'stacked' option of 'branch' command
-#: bzrlib/builtins.py:1239
+#: bzrlib/builtins.py:1238
 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:1243
+#: bzrlib/builtins.py:1242
 msgid "Do not use a shared repository, even if available."
 msgstr ""
 
 # help of 'use-existing-dir' option of 'branch' command
-#: bzrlib/builtins.py:1245
+#: bzrlib/builtins.py:1244
 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:1250
+#: bzrlib/builtins.py:1249
 msgid "Bind new branch to from location."
 msgstr ""
 
-#: bzrlib/builtins.py:1342
+#: bzrlib/builtins.py:1341
 msgid "List the branches available at the current location."
 msgstr ""
 
-#: bzrlib/builtins.py:1344
+#: bzrlib/builtins.py:1343
 msgid ""
 "This command will print the names of all the branches at the current "
 "location."
 msgstr ""
 
-#: bzrlib/builtins.py:1359
+#: bzrlib/builtins.py:1358
 msgid "Create a new checkout of an existing branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1361
+#: bzrlib/builtins.py:1360
 msgid ""
 "If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
 "for\n"
@@ -524,7 +524,7 @@
 "location using SFTP."
 msgstr ""
 
-#: bzrlib/builtins.py:1366
+#: bzrlib/builtins.py:1365
 msgid ""
 "If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
 "will\n"
@@ -536,7 +536,7 @@
 "create ./foo-bar."
 msgstr ""
 
-#: bzrlib/builtins.py:1373
+#: bzrlib/builtins.py:1372
 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 "
@@ -547,7 +547,7 @@
 msgstr ""
 
 # help of 'lightweight' option of 'checkout' command
-#: bzrlib/builtins.py:1383
+#: bzrlib/builtins.py:1382
 msgid ""
 "Perform a lightweight checkout.  Lightweight checkouts depend on access to "
 "the branch for every operation.  Normal checkouts can perform common "
@@ -556,103 +556,103 @@
 msgstr ""
 
 # help of 'files-from' option of 'branch' command
-#: bzrlib/builtins.py:1390
+#: bzrlib/builtins.py:1389
 msgid "Get file contents from this tree."
 msgstr ""
 
 # help of 'hardlink' option of 'branch' command
-#: bzrlib/builtins.py:1392
+#: bzrlib/builtins.py:1391
 msgid "Hard-link working tree files where possible."
 msgstr ""
 
-#: bzrlib/builtins.py:1433
+#: bzrlib/builtins.py:1432
 msgid ""
 "Show list of renamed files.\n"
 "    "
 msgstr ""
 
-#: bzrlib/builtins.py:1463
+#: bzrlib/builtins.py:1462
 msgid "Update a tree to have the latest code committed to its branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1465
+#: bzrlib/builtins.py:1464
 msgid ""
 "This will perform a merge into the working tree, and may generate\n"
 "conflicts. If you have any local changes, you will still\n"
 "need to commit them after the update for the update to be complete."
 msgstr ""
 
-#: bzrlib/builtins.py:1469
+#: bzrlib/builtins.py:1468
 msgid ""
 "If you want to discard your local changes, you can just do a\n"
 "'bzr revert' instead of 'bzr commit' after the update."
 msgstr ""
 
-#: bzrlib/builtins.py:1472
+#: bzrlib/builtins.py:1471
 msgid ""
 "If you want to restore a file that has been removed locally, use\n"
 "'bzr revert' instead of 'bzr update'."
 msgstr ""
 
-#: bzrlib/builtins.py:1475
+#: bzrlib/builtins.py:1474
 msgid ""
 "If the tree's branch is bound to a master branch, it will also update\n"
 "the branch from the master."
 msgstr ""
 
-#: bzrlib/builtins.py:1556
+#: bzrlib/builtins.py:1555
 msgid "Show information about a working tree, branch or repository."
 msgstr ""
 
-#: bzrlib/builtins.py:1558
+#: bzrlib/builtins.py:1557
 msgid ""
 "This command will show all known locations and formats associated to the\n"
 "tree, branch or repository."
 msgstr ""
 
-#: bzrlib/builtins.py:1561
+#: bzrlib/builtins.py:1560
 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:1565
+#: bzrlib/builtins.py:1564
 msgid "Branches and working trees will also report any missing revisions."
 msgstr ""
 
-#: bzrlib/builtins.py:1569
+#: bzrlib/builtins.py:1568
 msgid "  Display information on the format and related locations:"
 msgstr ""
 
-#: bzrlib/builtins.py:1571
+#: bzrlib/builtins.py:1570
 msgid "    bzr info"
 msgstr ""
 
-#: bzrlib/builtins.py:1573
+#: bzrlib/builtins.py:1572
 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:1577
+#: bzrlib/builtins.py:1576
 msgid "    bzr info -v"
 msgstr ""
 
-#: bzrlib/builtins.py:1579
+#: bzrlib/builtins.py:1578
 msgid "  Display the above together with number of committers to the branch:"
 msgstr ""
 
-#: bzrlib/builtins.py:1581
+#: bzrlib/builtins.py:1580
 msgid "    bzr info -vv"
 msgstr ""
 
-#: bzrlib/builtins.py:1600
+#: bzrlib/builtins.py:1599
 msgid "Remove files or directories."
 msgstr ""
 
-#: bzrlib/builtins.py:1602
+#: bzrlib/builtins.py:1601
 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"
@@ -662,25 +662,25 @@
 msgstr ""
 
 # help of 'new' option of 'remove' command
-#: bzrlib/builtins.py:1610
+#: bzrlib/builtins.py:1609
 msgid "Only remove files that have never been committed."
 msgstr ""
 
 # help of 'file-deletion-strategy' option of 'remove' command
-#: bzrlib/builtins.py:1612
+#: bzrlib/builtins.py:1611
 msgid "The file deletion mode to be used."
 msgstr ""
 
 # title of 'file-deletion-strategy' option of 'remove' command
-#: bzrlib/builtins.py:1613
+#: bzrlib/builtins.py:1612
 msgid "Deletion Strategy"
 msgstr ""
 
-#: bzrlib/builtins.py:1704
+#: bzrlib/builtins.py:1703
 msgid "Reconcile bzr metadata in a branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1706
+#: bzrlib/builtins.py:1705
 msgid ""
 "This can correct data mismatches that may have been caused by\n"
 "previous ghost operations or bzr upgrades. You should only\n"
@@ -688,7 +688,7 @@
 "advises you to run it."
 msgstr ""
 
-#: bzrlib/builtins.py:1711
+#: bzrlib/builtins.py:1710
 msgid ""
 "If a second branch is provided, cross-branch reconciliation is\n"
 "also attempted, which will check that data like the tree root\n"
@@ -696,27 +696,27 @@
 "correctly in both branches."
 msgstr ""
 
-#: bzrlib/builtins.py:1716
+#: bzrlib/builtins.py:1715
 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:1719
+#: bzrlib/builtins.py:1718
 msgid "The branch *MUST* be on a listable system such as local disk or sftp."
 msgstr ""
 
-#: bzrlib/builtins.py:1783
+#: bzrlib/builtins.py:1782
 msgid "Make a directory into a versioned branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1785
+#: bzrlib/builtins.py:1784
 msgid ""
 "Use this to create an empty branch, or before importing an\n"
 "existing project."
 msgstr ""
 
-#: bzrlib/builtins.py:1788
+#: bzrlib/builtins.py:1787
 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"
@@ -724,17 +724,17 @@
 "in the .bzr directory."
 msgstr ""
 
-#: bzrlib/builtins.py:1793
+#: bzrlib/builtins.py:1792
 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:1796
+#: bzrlib/builtins.py:1795
 msgid "Recipe for importing a tree of files::"
 msgstr ""
 
-#: bzrlib/builtins.py:1798
+#: bzrlib/builtins.py:1797
 msgid ""
 "    cd ~/project\n"
 "    bzr init\n"
@@ -744,30 +744,30 @@
 msgstr ""
 
 # help of 'create-prefix' option of 'init' command
-#: bzrlib/builtins.py:1809
+#: bzrlib/builtins.py:1808
 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:1812
+#: bzrlib/builtins.py:1811
 msgid "Specify a format for this branch. See \"help formats\"."
 msgstr ""
 
 # help of 'append-revisions-only' option of 'init' command
-#: bzrlib/builtins.py:1820
+#: bzrlib/builtins.py:1819
 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:1823
+#: bzrlib/builtins.py:1822
 msgid "Create a branch without a working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:1900
+#: bzrlib/builtins.py:1899
 msgid "Create a shared repository for branches to share storage space."
 msgstr ""
 
-#: bzrlib/builtins.py:1902
+#: bzrlib/builtins.py:1901
 msgid ""
 "New branches created under the repository directory will store their\n"
 "revisions in the repository, not in the branch directory.  For branches\n"
@@ -775,7 +775,7 @@
 "speeds up the creation of new branches."
 msgstr ""
 
-#: bzrlib/builtins.py:1907
+#: bzrlib/builtins.py:1906
 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"
@@ -785,23 +785,23 @@
 "branches, such as on a server."
 msgstr ""
 
-#: bzrlib/builtins.py:1914
+#: bzrlib/builtins.py:1913
 msgid ""
 ":Examples:\n"
 "    Create a shared repository holding just branches::"
 msgstr ""
 
-#: bzrlib/builtins.py:1917
+#: bzrlib/builtins.py:1916
 msgid ""
 "        bzr init-repo --no-trees repo\n"
 "        bzr init repo/trunk"
 msgstr ""
 
-#: bzrlib/builtins.py:1920
+#: bzrlib/builtins.py:1919
 msgid "    Make a lightweight checkout elsewhere::"
 msgstr ""
 
-#: bzrlib/builtins.py:1922
+#: bzrlib/builtins.py:1921
 msgid ""
 "        bzr checkout --lightweight repo/trunk trunk-checkout\n"
 "        cd trunk-checkout\n"
@@ -809,26 +809,26 @@
 msgstr ""
 
 # help of 'format' option of 'init-repository' command
-#: bzrlib/builtins.py:1930
+#: bzrlib/builtins.py:1929
 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:1934
+#: bzrlib/builtins.py:1933
 msgid "Repository format"
 msgstr ""
 
 # help of 'no-trees' option of 'init-repository' command
-#: bzrlib/builtins.py:1936
+#: bzrlib/builtins.py:1935
 msgid "Branches in the repository will default to not having a working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:1960
+#: bzrlib/builtins.py:1959
 msgid "Show differences in the working tree, between revisions or branches."
 msgstr ""
 
-#: bzrlib/builtins.py:1962
+#: bzrlib/builtins.py:1961
 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"
@@ -838,13 +838,13 @@
 "given."
 msgstr ""
 
-#: bzrlib/builtins.py:1969
+#: bzrlib/builtins.py:1968
 msgid ""
 "\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
 "produces patches suitable for \"patch -p1\"."
 msgstr ""
 
-#: bzrlib/builtins.py:1972
+#: bzrlib/builtins.py:1971
 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"
@@ -854,7 +854,7 @@
 "in the range."
 msgstr ""
 
-#: bzrlib/builtins.py:1979
+#: bzrlib/builtins.py:1978
 msgid ""
 ":Exit values:\n"
 "    1 - changed\n"
@@ -863,113 +863,113 @@
 "    0 - no change"
 msgstr ""
 
-#: bzrlib/builtins.py:1985
+#: bzrlib/builtins.py:1984
 msgid ""
 ":Examples:\n"
 "    Shows the difference in the working tree versus the last commit::"
 msgstr ""
 
-#: bzrlib/builtins.py:1988
+#: bzrlib/builtins.py:1987
 msgid "        bzr diff"
 msgstr ""
 
-#: bzrlib/builtins.py:1990
+#: bzrlib/builtins.py:1989
 msgid "    Difference between the working tree and revision 1::"
 msgstr ""
 
-#: bzrlib/builtins.py:1992
+#: bzrlib/builtins.py:1991
 msgid "        bzr diff -r1"
 msgstr ""
 
-#: bzrlib/builtins.py:1994
+#: bzrlib/builtins.py:1993
 msgid "    Difference between revision 3 and revision 1::"
 msgstr ""
 
-#: bzrlib/builtins.py:1996
+#: bzrlib/builtins.py:1995
 msgid "        bzr diff -r1..3"
 msgstr ""
 
-#: bzrlib/builtins.py:1998
+#: bzrlib/builtins.py:1997
 msgid "    Difference between revision 3 and revision 1 for branch xxx::"
 msgstr ""
 
-#: bzrlib/builtins.py:2000
+#: bzrlib/builtins.py:1999
 msgid "        bzr diff -r1..3 xxx"
 msgstr ""
 
-#: bzrlib/builtins.py:2002
+#: bzrlib/builtins.py:2001
 msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
 msgstr ""
 
-#: bzrlib/builtins.py:2004
+#: bzrlib/builtins.py:2003
 msgid "        bzr diff -c2"
 msgstr ""
 
-#: bzrlib/builtins.py:2006
+#: bzrlib/builtins.py:2005
 msgid ""
 "    To see the changes introduced by revision X::\n"
 "    \n"
 "        bzr diff -cX"
 msgstr ""
 
-#: bzrlib/builtins.py:2010
+#: bzrlib/builtins.py:2009
 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:2014
+#: bzrlib/builtins.py:2013
 msgid "        bzr diff -r<chosen_parent>..X"
 msgstr ""
 
-#: bzrlib/builtins.py:2016
+#: bzrlib/builtins.py:2015
 msgid ""
 "    The changes between the current revision and the previous revision\n"
 "    (equivalent to -c-1 and -r-2..-1)"
 msgstr ""
 
-#: bzrlib/builtins.py:2019
+#: bzrlib/builtins.py:2018
 msgid "        bzr diff -r-2.."
 msgstr ""
 
-#: bzrlib/builtins.py:2021
+#: bzrlib/builtins.py:2020
 msgid "    Show just the differences for file NEWS::"
 msgstr ""
 
-#: bzrlib/builtins.py:2023
+#: bzrlib/builtins.py:2022
 msgid "        bzr diff NEWS"
 msgstr ""
 
-#: bzrlib/builtins.py:2025
+#: bzrlib/builtins.py:2024
 msgid "    Show the differences in working tree xxx for file NEWS::"
 msgstr ""
 
-#: bzrlib/builtins.py:2027
+#: bzrlib/builtins.py:2026
 msgid "        bzr diff xxx/NEWS"
 msgstr ""
 
-#: bzrlib/builtins.py:2029
+#: bzrlib/builtins.py:2028
 msgid "    Show the differences from branch xxx to this working tree:"
 msgstr ""
 
-#: bzrlib/builtins.py:2031
+#: bzrlib/builtins.py:2030
 msgid "        bzr diff --old xxx"
 msgstr ""
 
-#: bzrlib/builtins.py:2033
+#: bzrlib/builtins.py:2032
 msgid "    Show the differences between two branches for file NEWS::"
 msgstr ""
 
-#: bzrlib/builtins.py:2035
+#: bzrlib/builtins.py:2034
 msgid "        bzr diff --old xxx --new yyy NEWS"
 msgstr ""
 
-#: bzrlib/builtins.py:2037
+#: bzrlib/builtins.py:2036
 msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
 msgstr ""
 
-#: bzrlib/builtins.py:2039
+#: bzrlib/builtins.py:2038
 msgid ""
 "        bzr diff --prefix old/:new/\n"
 "        \n"
@@ -979,63 +979,63 @@
 msgstr ""
 
 # help of 'diff-options' option of 'diff' command
-#: bzrlib/builtins.py:2049
+#: bzrlib/builtins.py:2048
 msgid "Pass these options to the external diff program."
 msgstr ""
 
 # help of 'prefix' option of 'diff' command
-#: bzrlib/builtins.py:2052
+#: bzrlib/builtins.py:2051
 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:2055
+#: bzrlib/builtins.py:2054
 msgid "Branch/tree to compare from."
 msgstr ""
 
 # help of 'new' option of 'diff' command
-#: bzrlib/builtins.py:2059
+#: bzrlib/builtins.py:2058
 msgid "Branch/tree to compare to."
 msgstr ""
 
 # help of 'using' option of 'diff' command
-#: bzrlib/builtins.py:2065
+#: bzrlib/builtins.py:2064
 msgid "Use this command to compare files."
 msgstr ""
 
 # help of 'format' option of 'diff' command
-#: bzrlib/builtins.py:2070
+#: bzrlib/builtins.py:2069
 msgid "Diff format to use."
 msgstr ""
 
 # title of 'format' option of 'diff' command
-#: bzrlib/builtins.py:2072
+#: bzrlib/builtins.py:2071
 msgid "Diff format"
 msgstr ""
 
-#: bzrlib/builtins.py:2122
+#: bzrlib/builtins.py:2121
 msgid ""
 "List files deleted in the working tree.\n"
 "    "
 msgstr ""
 
-#: bzrlib/builtins.py:2200
+#: bzrlib/builtins.py:2199
 msgid "Show the tree root directory."
 msgstr ""
 
-#: bzrlib/builtins.py:2202
+#: bzrlib/builtins.py:2201
 msgid ""
 "The root is the nearest enclosing directory with a .bzr control\n"
 "directory."
 msgstr ""
 
-#: bzrlib/builtins.py:2230
+#: bzrlib/builtins.py:2229
 msgid "Show historical log for a branch or subset of a branch."
 msgstr ""
 
-#: bzrlib/builtins.py:2232
+#: bzrlib/builtins.py:2231
 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"
@@ -1043,14 +1043,14 @@
 "Here are some simple examples::"
 msgstr ""
 
-#: bzrlib/builtins.py:2237
+#: bzrlib/builtins.py:2236
 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:2241
+#: bzrlib/builtins.py:2240
 msgid ""
 "The filtering, ordering and information shown for each revision can\n"
 "be controlled as explained below. By default, all revisions are\n"
@@ -1060,11 +1060,11 @@
 "were merged."
 msgstr ""
 
-#: bzrlib/builtins.py:2248
+#: bzrlib/builtins.py:2247
 msgid ":Output control:"
 msgstr ""
 
-#: bzrlib/builtins.py:2250
+#: bzrlib/builtins.py:2249
 msgid ""
 "  The log format controls how information about each revision is\n"
 "  displayed. The standard log formats are called ``long``, ``short``\n"
@@ -1072,13 +1072,13 @@
 "  for more details on log formats."
 msgstr ""
 
-#: bzrlib/builtins.py:2255
+#: bzrlib/builtins.py:2254
 msgid ""
 "  The following options can be used to control what information is\n"
 "  displayed::"
 msgstr ""
 
-#: bzrlib/builtins.py:2258
+#: bzrlib/builtins.py:2257
 msgid ""
 "    -l N        display a maximum of N revisions\n"
 "    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
@@ -1087,25 +1087,25 @@
 "    --show-ids  display revision-ids (and file-ids), not just revnos"
 msgstr ""
 
-#: bzrlib/builtins.py:2264
+#: bzrlib/builtins.py:2263
 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:2268
+#: bzrlib/builtins.py:2267
 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:2272
+#: bzrlib/builtins.py:2271
 msgid ":Ordering control:"
 msgstr ""
 
-#: bzrlib/builtins.py:2274
+#: bzrlib/builtins.py:2273
 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"
@@ -1113,17 +1113,17 @@
 "  display revisions like --reverse does when it can."
 msgstr ""
 
-#: bzrlib/builtins.py:2279
+#: bzrlib/builtins.py:2278
 msgid ":Revision filtering:"
 msgstr ""
 
-#: bzrlib/builtins.py:2281
+#: bzrlib/builtins.py:2280
 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:2284
+#: bzrlib/builtins.py:2283
 msgid ""
 "    -rX      display revision X\n"
 "    -rX..    display revision X and later\n"
@@ -1131,13 +1131,13 @@
 "    -rX..Y   display from X to Y inclusive"
 msgstr ""
 
-#: bzrlib/builtins.py:2289
+#: bzrlib/builtins.py:2288
 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:2292
+#: bzrlib/builtins.py:2291
 msgid ""
 "    -r-1                show just the tip\n"
 "    -r-10..             show the last 10 mainline revisions\n"
@@ -1147,7 +1147,7 @@
 "    -rdate:yesterday..  show changes since yesterday"
 msgstr ""
 
-#: bzrlib/builtins.py:2299
+#: bzrlib/builtins.py:2298
 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"
@@ -1157,73 +1157,73 @@
 "  a nested merge revision and the log will be truncated accordingly."
 msgstr ""
 
-#: bzrlib/builtins.py:2306
+#: bzrlib/builtins.py:2305
 msgid ":Path filtering:"
 msgstr ""
 
-#: bzrlib/builtins.py:2308
+#: bzrlib/builtins.py:2307
 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:2312
+#: bzrlib/builtins.py:2311
 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:2316
+#: bzrlib/builtins.py:2315
 msgid ""
 "  Historical context is also important when interpreting pathnames of\n"
 "  renamed files/directories. Consider the following example:"
 msgstr ""
 
-#: bzrlib/builtins.py:2319
+#: bzrlib/builtins.py:2318
 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:2323
+#: bzrlib/builtins.py:2322
 msgid "  In this case:"
 msgstr ""
 
-#: bzrlib/builtins.py:2325
+#: bzrlib/builtins.py:2324
 msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
 msgstr ""
 
-#: bzrlib/builtins.py:2327
+#: bzrlib/builtins.py:2326
 msgid "  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
 msgstr ""
 
-#: bzrlib/builtins.py:2329
+#: bzrlib/builtins.py:2328
 msgid ""
 "  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
 "    the original file in revision 2."
 msgstr ""
 
-#: bzrlib/builtins.py:2332
+#: bzrlib/builtins.py:2331
 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:2335
+#: bzrlib/builtins.py:2334
 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:2339
+#: bzrlib/builtins.py:2338
 msgid ":Other filtering:"
 msgstr ""
 
-#: bzrlib/builtins.py:2341
+#: bzrlib/builtins.py:2340
 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"
@@ -1232,11 +1232,11 @@
 "  --match-message can be used to only match a specific field."
 msgstr ""
 
-#: bzrlib/builtins.py:2347
+#: bzrlib/builtins.py:2346
 msgid ":Tips & tricks:"
 msgstr ""
 
-#: bzrlib/builtins.py:2349
+#: bzrlib/builtins.py:2348
 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"
@@ -1245,11 +1245,11 @@
 "  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
 msgstr ""
 
-#: bzrlib/builtins.py:2355
+#: bzrlib/builtins.py:2354
 msgid "  You may find it useful to add the aliases below to ``bazaar.conf``::"
 msgstr ""
 
-#: bzrlib/builtins.py:2357
+#: bzrlib/builtins.py:2356
 msgid ""
 "    [ALIASES]\n"
 "    tip = log -r-1\n"
@@ -1257,20 +1257,20 @@
 "    show = log -v -p"
 msgstr ""
 
-#: bzrlib/builtins.py:2362
+#: bzrlib/builtins.py:2361
 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:2366
+#: bzrlib/builtins.py:2365
 msgid ""
 "  If you are interested in looking deeper into a particular merge X,\n"
 "  use ``bzr log -n0 -rX``."
 msgstr ""
 
-#: bzrlib/builtins.py:2369
+#: bzrlib/builtins.py:2368
 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"
@@ -1278,7 +1278,7 @@
 "  be given when using the -v option."
 msgstr ""
 
-#: bzrlib/builtins.py:2374
+#: bzrlib/builtins.py:2373
 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"
@@ -1286,7 +1286,7 @@
 "  a list of words but not others."
 msgstr ""
 
-#: bzrlib/builtins.py:2379
+#: bzrlib/builtins.py:2378
 msgid ""
 "  When exploring non-mainline history on large projects with deep\n"
 "  history, the performance of log can be greatly improved by installing\n"
@@ -1295,132 +1295,132 @@
 msgstr ""
 
 # help of 'forward' option of 'log' command
-#: bzrlib/builtins.py:2388
+#: bzrlib/builtins.py:2387
 msgid "Show from oldest to newest."
 msgstr ""
 
 # help of 'verbose' option of 'log' command
-#: bzrlib/builtins.py:2391
+#: bzrlib/builtins.py:2390
 msgid "Show files changed in each revision."
 msgstr ""
 
 # help of 'change' option of 'log' command
-#: bzrlib/builtins.py:2397
+#: bzrlib/builtins.py:2396
 msgid "Show just the specified revision. See also \"help revisionspec\"."
 msgstr ""
 
 # help of 'authors' option of 'log' command
-#: bzrlib/builtins.py:2401
+#: bzrlib/builtins.py:2400
 msgid "What names to list as authors - first, all or committer."
 msgstr ""
 
 # title of 'authors' option of 'log' command
-#: bzrlib/builtins.py:2402
+#: bzrlib/builtins.py:2401
 msgid "Authors"
 msgstr ""
 
 # help of 'levels' option of 'log' command
-#: bzrlib/builtins.py:2407
+#: bzrlib/builtins.py:2406
 msgid "Number of levels to display - 0 for all, 1 for flat."
 msgstr ""
 
 # help of 'limit' option of 'log' command
-#: bzrlib/builtins.py:2417
+#: bzrlib/builtins.py:2416
 msgid "Limit the output to the first N revisions."
 msgstr ""
 
 # help of 'show-diff' option of 'log' command
-#: bzrlib/builtins.py:2422
+#: bzrlib/builtins.py:2421
 msgid "Show changes made in each revision as a patch."
 msgstr ""
 
 # help of 'include-merges' option of 'log' command
-#: bzrlib/builtins.py:2424
+#: bzrlib/builtins.py:2423
 msgid "Show merged revisions like --levels 0 does."
 msgstr ""
 
 # help of 'exclude-common-ancestry' option of 'log' command
-#: bzrlib/builtins.py:2426
+#: bzrlib/builtins.py:2425
 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:2430
+#: bzrlib/builtins.py:2429
 msgid "Show digital signature validity"
 msgstr ""
 
 # help of 'match' option of 'log' command
-#: bzrlib/builtins.py:2433
+#: bzrlib/builtins.py:2432
 msgid "Show revisions whose properties match this expression."
 msgstr ""
 
 # help of 'match-message' option of 'log' command
-#: bzrlib/builtins.py:2437
+#: bzrlib/builtins.py:2436
 msgid "Show revisions whose message matches this expression."
 msgstr ""
 
 # help of 'match-committer' option of 'log' command
-#: bzrlib/builtins.py:2441
+#: bzrlib/builtins.py:2440
 msgid "Show revisions whose committer matches this expression."
 msgstr ""
 
 # help of 'match-author' option of 'log' command
-#: bzrlib/builtins.py:2445
+#: bzrlib/builtins.py:2444
 msgid "Show revisions whose authors match this expression."
 msgstr ""
 
 # help of 'match-bugs' option of 'log' command
-#: bzrlib/builtins.py:2449
+#: bzrlib/builtins.py:2448
 msgid "Show revisions whose bugs match this expression."
 msgstr ""
 
-#: bzrlib/builtins.py:2690
+#: bzrlib/builtins.py:2689
 msgid ""
 "List files in a tree.\n"
 "    "
 msgstr ""
 
 # help of 'recursive' option of 'ls' command
-#: bzrlib/builtins.py:2699
+#: bzrlib/builtins.py:2698
 msgid "Recurse into subdirectories."
 msgstr ""
 
 # help of 'from-root' option of 'ls' command
-#: bzrlib/builtins.py:2701
+#: bzrlib/builtins.py:2700
 msgid "Print paths relative to the root of the branch."
 msgstr ""
 
 # help of 'unknown' option of 'ls' command
-#: bzrlib/builtins.py:2703
+#: bzrlib/builtins.py:2702
 msgid "Print unknown files."
 msgstr ""
 
 # help of 'versioned' option of 'ls' command
-#: bzrlib/builtins.py:2704
+#: bzrlib/builtins.py:2703
 msgid "Print versioned files."
 msgstr ""
 
 # help of 'ignored' option of 'ls' command
-#: bzrlib/builtins.py:2707
+#: bzrlib/builtins.py:2706
 msgid "Print ignored files."
 msgstr ""
 
 # help of 'kind' option of 'ls' command
-#: bzrlib/builtins.py:2709
+#: bzrlib/builtins.py:2708
 msgid "List entries of a particular kind: file, directory, symlink."
 msgstr ""
 
-#: bzrlib/builtins.py:2821
+#: bzrlib/builtins.py:2820
 msgid "Ignore specified files or patterns."
 msgstr ""
 
-#: bzrlib/builtins.py:2823
+#: bzrlib/builtins.py:2822
 msgid "See ``bzr help patterns`` for details on the syntax of patterns."
 msgstr ""
 
-#: bzrlib/builtins.py:2825
+#: bzrlib/builtins.py:2824
 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"
@@ -1429,7 +1429,7 @@
 "the use of the ignore command will require an explicit add command."
 msgstr ""
 
-#: bzrlib/builtins.py:2831
+#: bzrlib/builtins.py:2830
 msgid ""
 "To remove patterns from the ignore list, edit the .bzrignore file.\n"
 "After adding, editing or deleting that file either indirectly by\n"
@@ -1437,7 +1437,7 @@
 "it."
 msgstr ""
 
-#: bzrlib/builtins.py:2836
+#: bzrlib/builtins.py:2835
 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"
@@ -1446,20 +1446,20 @@
 "can be edited directly using an editor."
 msgstr ""
 
-#: bzrlib/builtins.py:2842
+#: bzrlib/builtins.py:2841
 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:2846
+#: bzrlib/builtins.py:2845
 msgid ""
 "Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
 "precedence over the '!' exception patterns."
 msgstr ""
 
-#: bzrlib/builtins.py:2849
+#: bzrlib/builtins.py:2848
 msgid ""
 ":Notes: \n"
 "    \n"
@@ -1467,63 +1467,63 @@
 "  the shell on Unix."
 msgstr ""
 
-#: bzrlib/builtins.py:2854
+#: bzrlib/builtins.py:2853
 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:2857
+#: bzrlib/builtins.py:2856
 msgid ""
 ":Examples:\n"
 "    Ignore the top level Makefile::"
 msgstr ""
 
-#: bzrlib/builtins.py:2860
+#: bzrlib/builtins.py:2859
 msgid "        bzr ignore ./Makefile"
 msgstr ""
 
-#: bzrlib/builtins.py:2862
+#: bzrlib/builtins.py:2861
 msgid "    Ignore .class files in all directories...::"
 msgstr ""
 
-#: bzrlib/builtins.py:2864
+#: bzrlib/builtins.py:2863
 msgid "        bzr ignore \"*.class\""
 msgstr ""
 
-#: bzrlib/builtins.py:2866
+#: bzrlib/builtins.py:2865
 msgid "    ...but do not ignore \"special.class\"::"
 msgstr ""
 
-#: bzrlib/builtins.py:2868
+#: bzrlib/builtins.py:2867
 msgid "        bzr ignore \"!special.class\""
 msgstr ""
 
-#: bzrlib/builtins.py:2870
+#: bzrlib/builtins.py:2869
 msgid "    Ignore files whose name begins with the \"#\" character::"
 msgstr ""
 
-#: bzrlib/builtins.py:2872
+#: bzrlib/builtins.py:2871
 msgid "        bzr ignore \"RE:^#\""
 msgstr ""
 
-#: bzrlib/builtins.py:2874
+#: bzrlib/builtins.py:2873
 msgid "    Ignore .o files under the lib directory::"
 msgstr ""
 
-#: bzrlib/builtins.py:2876
+#: bzrlib/builtins.py:2875
 msgid "        bzr ignore \"lib/**/*.o\""
 msgstr ""
 
-#: bzrlib/builtins.py:2880
+#: bzrlib/builtins.py:2879
 msgid "        bzr ignore \"RE:lib/.*\\.o\""
 msgstr ""
 
-#: bzrlib/builtins.py:2882
+#: bzrlib/builtins.py:2881
 msgid "    Ignore everything but the \"debian\" toplevel directory::"
 msgstr ""
 
-#: bzrlib/builtins.py:2884
+#: bzrlib/builtins.py:2883
 msgid ""
 "        bzr ignore \"RE:(?!debian/).*\"\n"
 "    \n"
@@ -1536,61 +1536,61 @@
 msgstr ""
 
 # help of 'default-rules' option of 'ignore' command
-#: bzrlib/builtins.py:2898
+#: bzrlib/builtins.py:2897
 msgid "Display the default ignore rules that bzr uses."
 msgstr ""
 
-#: bzrlib/builtins.py:2946
+#: bzrlib/builtins.py:2945
 msgid "List ignored files and the patterns that matched them."
 msgstr ""
 
-#: bzrlib/builtins.py:2948
+#: bzrlib/builtins.py:2947
 msgid ""
 "List all the ignored files and the ignore pattern that caused the file to\n"
 "be ignored."
 msgstr ""
 
-#: bzrlib/builtins.py:2951
+#: bzrlib/builtins.py:2950
 msgid "Alternatively, to list just the files::"
 msgstr ""
 
-#: bzrlib/builtins.py:2953
+#: bzrlib/builtins.py:2952
 msgid "    bzr ls --ignored"
 msgstr ""
 
-#: bzrlib/builtins.py:2994
+#: bzrlib/builtins.py:2993
 msgid "Export current or past revision to a destination directory or archive."
 msgstr ""
 
-#: bzrlib/builtins.py:2996
+#: bzrlib/builtins.py:2995
 msgid "If no revision is specified this exports the last committed revision."
 msgstr ""
 
-#: bzrlib/builtins.py:2998
+#: bzrlib/builtins.py:2997
 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:3002
+#: bzrlib/builtins.py:3001
 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:3006
+#: bzrlib/builtins.py:3005
 msgid ""
 "If branch is omitted then the branch containing the current working\n"
 "directory will be used."
 msgstr ""
 
-#: bzrlib/builtins.py:3009
+#: bzrlib/builtins.py:3008
 msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
 msgstr ""
 
-#: bzrlib/builtins.py:3011
+#: bzrlib/builtins.py:3010
 msgid ""
 "  =================       =========================\n"
 "  Supported formats       Autodetected by extension\n"
@@ -1604,51 +1604,51 @@
 msgstr ""
 
 # help of 'format' option of 'export' command
-#: bzrlib/builtins.py:3025
+#: bzrlib/builtins.py:3024
 msgid "Type of file to export to."
 msgstr ""
 
 # help of 'filters' option of 'export' command
-#: bzrlib/builtins.py:3028
+#: bzrlib/builtins.py:3027
 msgid "Apply content filters to export the convenient form."
 msgstr ""
 
 # help of 'root' option of 'export' command
-#: bzrlib/builtins.py:3032
+#: bzrlib/builtins.py:3031
 msgid "Name of the root directory inside the exported file."
 msgstr ""
 
 # help of 'per-file-timestamps' option of 'export' command
-#: bzrlib/builtins.py:3034
+#: bzrlib/builtins.py:3033
 msgid ""
 "Set modification time of files to that of the last revision in which it was "
 "changed."
 msgstr ""
 
-#: bzrlib/builtins.py:3058
+#: bzrlib/builtins.py:3057
 msgid "Write the contents of a file as of a given revision to standard output."
 msgstr ""
 
-#: bzrlib/builtins.py:3060
+#: bzrlib/builtins.py:3059
 msgid "If no revision is nominated, the last revision is used."
 msgstr ""
 
-#: bzrlib/builtins.py:3062
+#: bzrlib/builtins.py:3061
 msgid ""
 "Note: Take care to redirect standard output when using this command on a\n"
 "binary file."
 msgstr ""
 
 # help of 'filters' option of 'cat' command
-#: bzrlib/builtins.py:3069
+#: bzrlib/builtins.py:3068
 msgid "Apply content filters to display the convenience form."
 msgstr ""
 
-#: bzrlib/builtins.py:3140
+#: bzrlib/builtins.py:3139
 msgid "Commit changes into a new revision."
 msgstr ""
 
-#: bzrlib/builtins.py:3142
+#: bzrlib/builtins.py:3141
 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"
@@ -1658,44 +1658,44 @@
 "boilerplate text loaded into the editor, use the --show-diff option."
 msgstr ""
 
-#: bzrlib/builtins.py:3149
+#: bzrlib/builtins.py:3148
 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:3153
+#: bzrlib/builtins.py:3152
 msgid ":Selective commits:"
 msgstr ""
 
-#: bzrlib/builtins.py:3155
+#: bzrlib/builtins.py:3154
 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:3159
+#: bzrlib/builtins.py:3158
 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:3163
+#: bzrlib/builtins.py:3162
 msgid "    bzr commit foo -x foo/bar"
 msgstr ""
 
-#: bzrlib/builtins.py:3165
+#: bzrlib/builtins.py:3164
 msgid "  A selective commit after a merge is not yet supported."
 msgstr ""
 
-#: bzrlib/builtins.py:3167
+#: bzrlib/builtins.py:3166
 msgid ":Custom authors:"
 msgstr ""
 
-#: bzrlib/builtins.py:3169
+#: bzrlib/builtins.py:3168
 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"
@@ -1705,11 +1705,11 @@
 "  author."
 msgstr ""
 
-#: bzrlib/builtins.py:3176
+#: bzrlib/builtins.py:3175
 msgid ":Checks:"
 msgstr ""
 
-#: bzrlib/builtins.py:3178
+#: bzrlib/builtins.py:3177
 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"
@@ -1718,18 +1718,18 @@
 "  for details."
 msgstr ""
 
-#: bzrlib/builtins.py:3184
+#: bzrlib/builtins.py:3183
 msgid ":Things to note:"
 msgstr ""
 
-#: bzrlib/builtins.py:3186
+#: bzrlib/builtins.py:3185
 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:3190
+#: bzrlib/builtins.py:3189
 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"
@@ -1738,100 +1738,100 @@
 msgstr ""
 
 # help of 'exclude' option of 'commit' command
-#: bzrlib/builtins.py:3200
+#: bzrlib/builtins.py:3199
 msgid "Do not consider changes made to a given path."
 msgstr ""
 
 # help of 'message' option of 'commit' command
-#: bzrlib/builtins.py:3203
+#: bzrlib/builtins.py:3202
 msgid "Description of the new revision."
 msgstr ""
 
 # help of 'unchanged' option of 'commit' command
-#: bzrlib/builtins.py:3206
+#: bzrlib/builtins.py:3205
 msgid "Commit even if nothing has changed."
 msgstr ""
 
 # help of 'file' option of 'commit' command
-#: bzrlib/builtins.py:3210
+#: bzrlib/builtins.py:3209
 msgid "Take commit message from this file."
 msgstr ""
 
 # help of 'strict' option of 'commit' command
-#: bzrlib/builtins.py:3212
+#: bzrlib/builtins.py:3211
 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:3215
+#: bzrlib/builtins.py:3214
 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:3218
+#: bzrlib/builtins.py:3217
 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:3221
+#: bzrlib/builtins.py:3220
 msgid "Set the author's name, if it's different from the committer."
 msgstr ""
 
 # help of 'local' option of 'commit' command
-#: bzrlib/builtins.py:3224
+#: bzrlib/builtins.py:3223
 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:3230
+#: bzrlib/builtins.py:3229
 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:3233
+#: bzrlib/builtins.py:3232
 msgid ""
 "When committing to a foreign version control system do not push data that "
 "can not be natively represented."
 msgstr ""
 
-#: bzrlib/builtins.py:3391
+#: bzrlib/builtins.py:3406
 msgid ""
 "Validate working tree structure, branch consistency and repository history."
 msgstr ""
 
-#: bzrlib/builtins.py:3393
+#: bzrlib/builtins.py:3408
 msgid ""
 "This command checks various invariants about branch and repository storage\n"
 "to detect data corruption or bzr bugs."
 msgstr ""
 
-#: bzrlib/builtins.py:3396
+#: bzrlib/builtins.py:3411
 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:3399
+#: bzrlib/builtins.py:3414
 msgid ""
 "revisions\n"
 "    This is just the number of revisions checked.  It doesn't\n"
 "    indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3403
+#: bzrlib/builtins.py:3418
 msgid ""
 "versionedfiles\n"
 "    This is just the number of versionedfiles checked.  It\n"
 "    doesn't indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3407
+#: bzrlib/builtins.py:3422
 msgid ""
 "unreferenced ancestors\n"
 "    Texts that are ancestors of other texts, but\n"
@@ -1839,14 +1839,14 @@
 "    subtle problem that Bazaar can work around."
 msgstr ""
 
-#: bzrlib/builtins.py:3412
+#: bzrlib/builtins.py:3427
 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:3416
+#: bzrlib/builtins.py:3431
 msgid ""
 "repeated file texts\n"
 "    This is the total number of repeated texts seen\n"
@@ -1855,61 +1855,61 @@
 "    indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3422
+#: bzrlib/builtins.py:3437
 msgid ""
 "If no restrictions are specified, all Bazaar data that is found at the "
 "given\n"
 "location will be checked."
 msgstr ""
 
-#: bzrlib/builtins.py:3425
+#: bzrlib/builtins.py:3440
 msgid ":Examples:"
 msgstr ""
 
-#: bzrlib/builtins.py:3427
+#: bzrlib/builtins.py:3442
 msgid "    Check the tree and branch at 'foo'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3429
+#: bzrlib/builtins.py:3444
 msgid "        bzr check --tree --branch foo"
 msgstr ""
 
-#: bzrlib/builtins.py:3431
+#: bzrlib/builtins.py:3446
 msgid "    Check only the repository at 'bar'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3433
+#: bzrlib/builtins.py:3448
 msgid "        bzr check --repo bar"
 msgstr ""
 
-#: bzrlib/builtins.py:3435
+#: bzrlib/builtins.py:3450
 msgid "    Check everything at 'baz'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3437
+#: bzrlib/builtins.py:3452
 msgid "        bzr check baz"
 msgstr ""
 
 # help of 'branch' option of 'check' command
-#: bzrlib/builtins.py:3443
+#: bzrlib/builtins.py:3458
 msgid "Check the branch related to the current directory."
 msgstr ""
 
 # help of 'repo' option of 'check' command
-#: bzrlib/builtins.py:3445
+#: bzrlib/builtins.py:3460
 msgid "Check the repository related to the current directory."
 msgstr ""
 
 # help of 'tree' option of 'check' command
-#: bzrlib/builtins.py:3447
+#: bzrlib/builtins.py:3462
 msgid "Check the working tree related to the current directory."
 msgstr ""
 
-#: bzrlib/builtins.py:3461
+#: bzrlib/builtins.py:3476
 msgid "Upgrade a repository, branch or working tree to a newer format."
 msgstr ""
 
-#: bzrlib/builtins.py:3463
+#: bzrlib/builtins.py:3478
 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"
@@ -1918,7 +1918,7 @@
 "with older repositories or with older versions of Bazaar."
 msgstr ""
 
-#: bzrlib/builtins.py:3469
+#: bzrlib/builtins.py:3484
 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"
@@ -1928,7 +1928,7 @@
 "2.x default) so downgrading is not always possible."
 msgstr ""
 
-#: bzrlib/builtins.py:3476
+#: bzrlib/builtins.py:3491
 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"
@@ -1939,7 +1939,7 @@
 "afterwards."
 msgstr ""
 
-#: bzrlib/builtins.py:3484
+#: bzrlib/builtins.py:3499
 msgid ""
 "If the location given is a shared repository, dependent branches\n"
 "are also converted provided the repository converts successfully.\n"
@@ -1947,132 +1947,132 @@
 "tried."
 msgstr ""
 
-#: bzrlib/builtins.py:3489
+#: bzrlib/builtins.py:3504
 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:3497
+#: bzrlib/builtins.py:3512
 msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
 msgstr ""
 
 # title of 'format' option of 'init' command
-#: bzrlib/builtins.py:3501
+#: bzrlib/builtins.py:3516
 msgid "Branch format"
 msgstr ""
 
 # help of 'clean' option of 'upgrade' command
-#: bzrlib/builtins.py:3503
+#: bzrlib/builtins.py:3518
 msgid "Remove the backup.bzr directory if successful."
 msgstr ""
 
-#: bzrlib/builtins.py:3520
+#: bzrlib/builtins.py:3535
 msgid "Show or set bzr user id."
 msgstr ""
 
-#: bzrlib/builtins.py:3522
+#: bzrlib/builtins.py:3537
 msgid ""
 ":Examples:\n"
 "    Show the email of the current user::"
 msgstr ""
 
-#: bzrlib/builtins.py:3525
+#: bzrlib/builtins.py:3540
 msgid "        bzr whoami --email"
 msgstr ""
 
-#: bzrlib/builtins.py:3527
+#: bzrlib/builtins.py:3542
 msgid "    Set the current user::"
 msgstr ""
 
-#: bzrlib/builtins.py:3529
+#: bzrlib/builtins.py:3544
 msgid "        bzr whoami \"Frank Chu <[e-mail]>\""
 msgstr ""
 
 # help of 'email' option of 'whoami' command
-#: bzrlib/builtins.py:3533
+#: bzrlib/builtins.py:3548
 msgid "Display email address only."
 msgstr ""
 
 # help of 'branch' option of 'whoami' command
-#: bzrlib/builtins.py:3535
+#: bzrlib/builtins.py:3550
 msgid "Set identity for the current branch instead of globally."
 msgstr ""
 
-#: bzrlib/builtins.py:3581
+#: bzrlib/builtins.py:3596
 msgid "Print or set the branch nickname."
 msgstr ""
 
-#: bzrlib/builtins.py:3583
+#: bzrlib/builtins.py:3598
 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:3586
+#: bzrlib/builtins.py:3601
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally."
 msgstr ""
 
-#: bzrlib/builtins.py:3606
+#: bzrlib/builtins.py:3621
 msgid "Set/unset and display aliases."
 msgstr ""
 
-#: bzrlib/builtins.py:3608
+#: bzrlib/builtins.py:3623
 msgid ""
 ":Examples:\n"
 "    Show the current aliases::"
 msgstr ""
 
-#: bzrlib/builtins.py:3611
+#: bzrlib/builtins.py:3626
 msgid "        bzr alias"
 msgstr ""
 
-#: bzrlib/builtins.py:3613
+#: bzrlib/builtins.py:3628
 msgid "    Show the alias specified for 'll'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3615
+#: bzrlib/builtins.py:3630
 msgid "        bzr alias ll"
 msgstr ""
 
-#: bzrlib/builtins.py:3617
+#: bzrlib/builtins.py:3632
 msgid "    Set an alias for 'll'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3619
+#: bzrlib/builtins.py:3634
 msgid "        bzr alias ll=\"log --line -r-10..-1\""
 msgstr ""
 
-#: bzrlib/builtins.py:3621
+#: bzrlib/builtins.py:3636
 msgid "    To remove an alias for 'll'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3623
+#: bzrlib/builtins.py:3638
 msgid "        bzr alias --remove ll"
 msgstr ""
 
 # help of 'remove' option of 'alias' command
-#: bzrlib/builtins.py:3628
+#: bzrlib/builtins.py:3643
 msgid "Remove the alias."
 msgstr ""
 
-#: bzrlib/builtins.py:3867
+#: bzrlib/builtins.py:3897
 msgid "Show version of bzr."
 msgstr ""
 
 # help of 'short' option of 'version' command
-#: bzrlib/builtins.py:3871
+#: bzrlib/builtins.py:3901
 msgid "Print just the version number."
 msgstr ""
 
-#: bzrlib/builtins.py:3918
+#: bzrlib/builtins.py:3948
 msgid "Perform a three-way merge."
 msgstr ""
 
-#: bzrlib/builtins.py:3920
+#: bzrlib/builtins.py:3950
 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"
@@ -2083,20 +2083,20 @@
 "the current working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:3928
+#: bzrlib/builtins.py:3958
 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:3932
+#: bzrlib/builtins.py:3962
 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:3935
+#: bzrlib/builtins.py:3965
 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"
@@ -2107,30 +2107,30 @@
 "changes from the other branch is not stored in the commit."
 msgstr ""
 
-#: bzrlib/builtins.py:3943
+#: bzrlib/builtins.py:3973
 msgid "Revision numbers are always relative to the source branch."
 msgstr ""
 
-#: bzrlib/builtins.py:3950
+#: bzrlib/builtins.py:3980
 msgid "Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
 msgstr ""
 
-#: bzrlib/builtins.py:3952
+#: bzrlib/builtins.py:3982
 msgid ""
 "If there is no default branch set, the first merge will set it (use\n"
-"--no-remember to avoid settting it). After that, you can omit the branch\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:3957
+#: bzrlib/builtins.py:3987
 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:3961
+#: bzrlib/builtins.py:3991
 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"
@@ -2139,60 +2139,60 @@
 "merge revision which has more than two parents."
 msgstr ""
 
-#: bzrlib/builtins.py:3967
+#: bzrlib/builtins.py:3997
 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:3971
+#: bzrlib/builtins.py:4001
 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:3974
+#: bzrlib/builtins.py:4004
 msgid ""
 ":Examples:\n"
 "    To merge all new revisions from bzr.dev::"
 msgstr ""
 
-#: bzrlib/builtins.py:3977
+#: bzrlib/builtins.py:4007
 msgid "        bzr merge ../bzr.dev"
 msgstr ""
 
-#: bzrlib/builtins.py:3979
+#: bzrlib/builtins.py:4009
 msgid "    To merge changes up to and including revision 82 from bzr.dev::"
 msgstr ""
 
-#: bzrlib/builtins.py:3981
+#: bzrlib/builtins.py:4011
 msgid "        bzr merge -r 82 ../bzr.dev"
 msgstr ""
 
-#: bzrlib/builtins.py:3983
+#: bzrlib/builtins.py:4013
 msgid "    To merge the changes introduced by 82, without previous changes::"
 msgstr ""
 
-#: bzrlib/builtins.py:3985
+#: bzrlib/builtins.py:4015
 msgid "        bzr merge -r 81..82 ../bzr.dev"
 msgstr ""
 
-#: bzrlib/builtins.py:3987
+#: bzrlib/builtins.py:4017
 msgid "    To apply a merge directive contained in /tmp/merge::"
 msgstr ""
 
-#: bzrlib/builtins.py:3989
+#: bzrlib/builtins.py:4019
 msgid "        bzr merge /tmp/merge"
 msgstr ""
 
-#: bzrlib/builtins.py:3991
+#: bzrlib/builtins.py:4021
 msgid ""
 "    To create a merge revision with three parents from two branches\n"
 "    feature1a and feature1b:"
 msgstr ""
 
-#: bzrlib/builtins.py:3994
+#: bzrlib/builtins.py:4024
 msgid ""
 "        bzr merge ../feature1a\n"
 "        bzr merge ../feature1b --force\n"
@@ -2200,18 +2200,18 @@
 msgstr ""
 
 # help of 'force' option of 'merge' command
-#: bzrlib/builtins.py:4006
+#: bzrlib/builtins.py:4036
 msgid "Merge even if the destination tree has uncommitted changes."
 msgstr ""
 
 # help of 'uncommitted' option of 'merge' command
-#: bzrlib/builtins.py:4012
+#: bzrlib/builtins.py:4042
 msgid ""
 "Apply uncommitted changes from a working copy, instead of branch changes."
 msgstr ""
 
 # help of 'pull' option of 'merge' command
-#: bzrlib/builtins.py:4014
+#: bzrlib/builtins.py:4044
 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 "
@@ -2219,77 +2219,77 @@
 msgstr ""
 
 # help of 'directory' option of 'merge' command
-#: bzrlib/builtins.py:4019
+#: bzrlib/builtins.py:4049
 msgid ""
 "Branch to merge into, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'preview' option of 'merge' command
-#: bzrlib/builtins.py:4021
+#: bzrlib/builtins.py:4051
 msgid "Instead of merging, show a diff of the merge."
 msgstr ""
 
 # help of 'interactive' option of 'merge' command
-#: bzrlib/builtins.py:4023
+#: bzrlib/builtins.py:4053
 msgid "Select changes interactively."
 msgstr ""
 
-#: bzrlib/builtins.py:4307
+#: bzrlib/builtins.py:4337
 msgid "Redo a merge."
 msgstr ""
 
-#: bzrlib/builtins.py:4309
+#: bzrlib/builtins.py:4339
 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:4313
+#: bzrlib/builtins.py:4343
 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:4317
+#: bzrlib/builtins.py:4347
 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:4321
+#: bzrlib/builtins.py:4351
 msgid "        bzr remerge --show-base"
 msgstr ""
 
-#: bzrlib/builtins.py:4323
+#: bzrlib/builtins.py:4353
 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:4326
+#: bzrlib/builtins.py:4356
 msgid "        bzr remerge --merge-type weave --reprocess foobar"
 msgstr ""
 
 # help of 'show-base' option of 'merge' command
-#: bzrlib/builtins.py:4333
+#: bzrlib/builtins.py:4363
 msgid "Show base revision text in conflicts."
 msgstr ""
 
-#: bzrlib/builtins.py:4401
+#: bzrlib/builtins.py:4431
 msgid "Revert files to a previous revision."
 msgstr ""
 
-#: bzrlib/builtins.py:4403
+#: bzrlib/builtins.py:4433
 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:4407
+#: bzrlib/builtins.py:4437
 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"
@@ -2298,14 +2298,14 @@
 "certain changes on a hunk-by-hunk basis, see the shelve command."
 msgstr ""
 
-#: bzrlib/builtins.py:4413
+#: bzrlib/builtins.py:4443
 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:4417
+#: bzrlib/builtins.py:4447
 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"
@@ -2313,7 +2313,7 @@
 "reverted."
 msgstr ""
 
-#: bzrlib/builtins.py:4422
+#: bzrlib/builtins.py:4452
 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"
@@ -2321,7 +2321,7 @@
 "deleted."
 msgstr ""
 
-#: bzrlib/builtins.py:4427
+#: bzrlib/builtins.py:4457
 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"
@@ -2333,7 +2333,7 @@
 "reverting any files."
 msgstr ""
 
-#: bzrlib/builtins.py:4436
+#: bzrlib/builtins.py:4466
 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"
@@ -2348,35 +2348,35 @@
 msgstr ""
 
 # help of 'no-backup' option of 'revert' command
-#: bzrlib/builtins.py:4450
+#: bzrlib/builtins.py:4480
 msgid "Do not save backups of reverted files."
 msgstr ""
 
 # help of 'forget-merges' option of 'revert' command
-#: bzrlib/builtins.py:4452
+#: bzrlib/builtins.py:4482
 msgid "Remove pending merge marker, without changing any files."
 msgstr ""
 
-#: bzrlib/builtins.py:4483
+#: bzrlib/builtins.py:4513
 msgid ""
 "Show help on a command or other topic.\n"
 "    "
 msgstr ""
 
 # help of 'long' option of 'help' command
-#: bzrlib/builtins.py:4488
+#: bzrlib/builtins.py:4518
 msgid "Show help on all commands."
 msgstr ""
 
-#: bzrlib/builtins.py:4517
+#: bzrlib/builtins.py:4547
 msgid "Show unmerged/unpulled revisions between two branches."
 msgstr ""
 
-#: bzrlib/builtins.py:4519
+#: bzrlib/builtins.py:4549
 msgid "OTHER_BRANCH may be local or remote."
 msgstr ""
 
-#: bzrlib/builtins.py:4521
+#: bzrlib/builtins.py:4551
 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"
@@ -2387,100 +2387,100 @@
 "    0 - no missing revisions"
 msgstr ""
 
-#: bzrlib/builtins.py:4531
+#: bzrlib/builtins.py:4561
 msgid ""
 "    Determine the missing revisions between this and the branch at the\n"
 "    remembered pull location::"
 msgstr ""
 
-#: bzrlib/builtins.py:4534
+#: bzrlib/builtins.py:4564
 msgid "        bzr missing"
 msgstr ""
 
-#: bzrlib/builtins.py:4536
+#: bzrlib/builtins.py:4566
 msgid "    Determine the missing revisions between this and another branch::"
 msgstr ""
 
-#: bzrlib/builtins.py:4538
+#: bzrlib/builtins.py:4568
 msgid "        bzr missing http://server/branch"
 msgstr ""
 
-#: bzrlib/builtins.py:4540
+#: bzrlib/builtins.py:4570
 msgid ""
 "    Determine the missing revisions up to a specific revision on the other\n"
 "    branch::"
 msgstr ""
 
-#: bzrlib/builtins.py:4543
+#: bzrlib/builtins.py:4573
 msgid "        bzr missing -r ..-10"
 msgstr ""
 
-#: bzrlib/builtins.py:4545
+#: bzrlib/builtins.py:4575
 msgid ""
 "    Determine the missing revisions up to a specific revision on this\n"
 "    branch::"
 msgstr ""
 
-#: bzrlib/builtins.py:4548
+#: bzrlib/builtins.py:4578
 msgid "        bzr missing --my-revision ..-10"
 msgstr ""
 
 # help of 'reverse' option of 'missing' command
-#: bzrlib/builtins.py:4555
+#: bzrlib/builtins.py:4585
 msgid "Reverse the order of revisions."
 msgstr ""
 
 # help of 'mine-only' option of 'missing' command
-#: bzrlib/builtins.py:4557
+#: bzrlib/builtins.py:4587
 msgid "Display changes in the local branch only."
 msgstr ""
 
 # help of 'this' option of 'missing' command
-#: bzrlib/builtins.py:4558
+#: bzrlib/builtins.py:4588
 msgid "Same as --mine-only."
 msgstr ""
 
 # help of 'theirs-only' option of 'missing' command
-#: bzrlib/builtins.py:4560
+#: bzrlib/builtins.py:4590
 msgid "Display changes in the remote branch only."
 msgstr ""
 
 # help of 'other' option of 'missing' command
-#: bzrlib/builtins.py:4561
+#: bzrlib/builtins.py:4591
 msgid "Same as --theirs-only."
 msgstr ""
 
 # help of 'revision' option of 'missing' command
-#: bzrlib/builtins.py:4566
+#: bzrlib/builtins.py:4596
 msgid ""
 "Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
 # help of 'my-revision' option of 'missing' command
-#: bzrlib/builtins.py:4570
+#: bzrlib/builtins.py:4600
 msgid ""
 "Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
 # help of 'include-merges' option of 'missing' command
-#: bzrlib/builtins.py:4573
+#: bzrlib/builtins.py:4603
 msgid "Show all revisions in addition to the mainline ones."
 msgstr ""
 
-#: bzrlib/builtins.py:4689
+#: bzrlib/builtins.py:4719
 msgid "Compress the data within a repository."
 msgstr ""
 
-#: bzrlib/builtins.py:4691
+#: bzrlib/builtins.py:4721
 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:4695
+#: bzrlib/builtins.py:4725
 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"
@@ -2489,7 +2489,7 @@
 "used."
 msgstr ""
 
-#: bzrlib/builtins.py:4701
+#: bzrlib/builtins.py:4731
 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"
@@ -2498,25 +2498,25 @@
 msgstr ""
 
 # help of 'clean-obsolete-packs' option of 'pack' command
-#: bzrlib/builtins.py:4710
+#: bzrlib/builtins.py:4740
 msgid "Delete obsolete packs to save disk space."
 msgstr ""
 
-#: bzrlib/builtins.py:4724
+#: bzrlib/builtins.py:4754
 msgid "List the installed plugins."
 msgstr ""
 
-#: bzrlib/builtins.py:4726
+#: bzrlib/builtins.py:4756
 msgid ""
 "This command displays the list of installed plugins including\n"
 "version of plugin and a short description of each."
 msgstr ""
 
-#: bzrlib/builtins.py:4729
+#: bzrlib/builtins.py:4759
 msgid "--verbose shows the path where each plugin is located."
 msgstr ""
 
-#: bzrlib/builtins.py:4731
+#: bzrlib/builtins.py:4761
 msgid ""
 "A plugin is an external component for Bazaar that extends the\n"
 "revision control system, by adding or replacing code in Bazaar.\n"
@@ -2525,7 +2525,7 @@
 "customizing log output."
 msgstr ""
 
-#: bzrlib/builtins.py:4737
+#: bzrlib/builtins.py:4767
 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"
@@ -2533,94 +2533,94 @@
 "plugins using the Python programming language."
 msgstr ""
 
-#: bzrlib/builtins.py:4753
+#: bzrlib/builtins.py:4783
 msgid "Show testament (signing-form) of a revision."
 msgstr ""
 
 # help of 'long' option of 'testament' command
-#: bzrlib/builtins.py:4756
+#: bzrlib/builtins.py:4786
 msgid "Produce long-format testament."
 msgstr ""
 
 # help of 'strict' option of 'testament' command
-#: bzrlib/builtins.py:4758
+#: bzrlib/builtins.py:4788
 msgid "Produce a strict-format testament."
 msgstr ""
 
-#: bzrlib/builtins.py:4784
+#: bzrlib/builtins.py:4814
 msgid "Show the origin of each line in a file."
 msgstr ""
 
-#: bzrlib/builtins.py:4786
+#: bzrlib/builtins.py:4816
 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:4789
+#: bzrlib/builtins.py:4819
 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:4797
+#: bzrlib/builtins.py:4827
 msgid "Show annotations on all lines."
 msgstr ""
 
 # help of 'long' option of 'annotate' command
-#: bzrlib/builtins.py:4798
+#: bzrlib/builtins.py:4828
 msgid "Show commit date in annotations."
 msgstr ""
 
-#: bzrlib/builtins.py:4901
+#: bzrlib/builtins.py:4931
 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:4904
+#: bzrlib/builtins.py:4934
 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:4907
+#: bzrlib/builtins.py:4937
 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:4942
+#: bzrlib/builtins.py:4972
 msgid "Convert the current checkout into a regular branch."
 msgstr ""
 
-#: bzrlib/builtins.py:4944
+#: bzrlib/builtins.py:4974
 msgid ""
 "After unbinding, the local branch is considered independent and subsequent\n"
 "commits will be local only."
 msgstr ""
 
-#: bzrlib/builtins.py:4959
+#: bzrlib/builtins.py:4989
 msgid "Remove the last committed revision."
 msgstr ""
 
-#: bzrlib/builtins.py:4961
+#: bzrlib/builtins.py:4991
 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:4965
+#: bzrlib/builtins.py:4995
 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:4969
+#: bzrlib/builtins.py:4999
 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"
@@ -2628,43 +2628,48 @@
 msgstr ""
 
 # help of 'dry-run' option of 'uncommit' command
-#: bzrlib/builtins.py:4980
+#: bzrlib/builtins.py:5010
 msgid "Don't actually make changes."
 msgstr ""
 
 # help of 'force' option of 'uncommit' command
-#: bzrlib/builtins.py:4981
+#: bzrlib/builtins.py:5011
 msgid "Say yes to all questions."
 msgstr ""
 
+# help of 'keep-tags' option of 'uncommit' command
+#: bzrlib/builtins.py:5013
+msgid "Keep tags that point to removed revisions."
+msgstr ""
+
 # help of 'local' option of 'uncommit' command
-#: bzrlib/builtins.py:4983
+#: bzrlib/builtins.py:5015
 msgid "Only remove the commits from the local branch when in a checkout."
 msgstr ""
 
-#: bzrlib/builtins.py:5068
+#: bzrlib/builtins.py:5101
 msgid "Break a dead lock."
 msgstr ""
 
-#: bzrlib/builtins.py:5070
+#: bzrlib/builtins.py:5103
 msgid ""
 "This command breaks a lock on a repository, branch, working directory or\n"
 "config file."
 msgstr ""
 
-#: bzrlib/builtins.py:5073
+#: bzrlib/builtins.py:5106
 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:5076
+#: bzrlib/builtins.py:5109
 msgid ""
 "You can get information on what locks are open via the 'bzr info\n"
 "[location]' command."
 msgstr ""
 
-#: bzrlib/builtins.py:5079
+#: bzrlib/builtins.py:5112
 msgid ""
 ":Examples:\n"
 "    bzr break-lock\n"
@@ -2673,36 +2678,36 @@
 msgstr ""
 
 # help of 'config' option of 'break-lock' command
-#: bzrlib/builtins.py:5088
+#: bzrlib/builtins.py:5121
 msgid "LOCATION is the directory where the config lock is."
 msgstr ""
 
 # help of 'force' option of 'break-lock' command
-#: bzrlib/builtins.py:5090
+#: bzrlib/builtins.py:5123
 msgid "Do not ask for confirmation before breaking the lock."
 msgstr ""
 
-#: bzrlib/builtins.py:5126
+#: bzrlib/builtins.py:5159
 msgid "Run the bzr server."
 msgstr ""
 
 # help of 'inet' option of 'serve' command
-#: bzrlib/builtins.py:5132
+#: bzrlib/builtins.py:5165
 msgid "Serve on stdin/out for use from inetd or sshd."
 msgstr ""
 
 # title of 'protocol' option of 'serve' command
-#: bzrlib/builtins.py:5133
+#: bzrlib/builtins.py:5166
 msgid "protocol"
 msgstr ""
 
 # help of 'protocol' option of 'serve' command
-#: bzrlib/builtins.py:5134
+#: bzrlib/builtins.py:5167
 msgid "Protocol to serve."
 msgstr ""
 
 # help of 'port' option of 'serve' command
-#: bzrlib/builtins.py:5138
+#: bzrlib/builtins.py:5171
 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.  "
@@ -2710,12 +2715,12 @@
 msgstr ""
 
 # help of 'directory' option of 'serve' command
-#: bzrlib/builtins.py:5144
+#: bzrlib/builtins.py:5177
 msgid "Serve contents of this directory."
 msgstr ""
 
 # help of 'allow-writes' option of 'serve' command
-#: bzrlib/builtins.py:5146
+#: bzrlib/builtins.py:5179
 msgid ""
 "By default the server is a readonly server.  Supplying --allow-writes "
 "enables write access to the contents of the served directory and below.  "
@@ -2724,83 +2729,83 @@
 "uncontrolled write access to your file system."
 msgstr ""
 
-#: bzrlib/builtins.py:5191
+#: bzrlib/builtins.py:5224
 msgid "Combine a tree into its containing tree."
 msgstr ""
 
-#: bzrlib/builtins.py:5193
+#: bzrlib/builtins.py:5226
 msgid "This command requires the target tree to be in a rich-root format."
 msgstr ""
 
-#: bzrlib/builtins.py:5195
+#: bzrlib/builtins.py:5228
 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:5199
+#: bzrlib/builtins.py:5232
 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:5237
+#: bzrlib/builtins.py:5270
 msgid "Split a subdirectory of a tree into a separate tree."
 msgstr ""
 
-#: bzrlib/builtins.py:5239
+#: bzrlib/builtins.py:5272
 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:5243
+#: bzrlib/builtins.py:5276
 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:5364
+#: bzrlib/builtins.py:5397
 msgid "Mail or create a merge-directive for submitting changes."
 msgstr ""
 
-#: bzrlib/builtins.py:5366
+#: bzrlib/builtins.py:5399
 msgid "A merge directive provides many things needed for requesting merges:"
 msgstr ""
 
-#: bzrlib/builtins.py:5368
+#: bzrlib/builtins.py:5401
 msgid "* A machine-readable description of the merge to perform"
 msgstr ""
 
-#: bzrlib/builtins.py:5370
+#: bzrlib/builtins.py:5403
 msgid "* An optional patch that is a preview of the changes requested"
 msgstr ""
 
-#: bzrlib/builtins.py:5372
+#: bzrlib/builtins.py:5405
 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:5376
+#: bzrlib/builtins.py:5409
 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:5379
+#: bzrlib/builtins.py:5412
 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:5383
+#: bzrlib/builtins.py:5416
 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"
@@ -2809,7 +2814,7 @@
 "included if known, so that people can check it later."
 msgstr ""
 
-#: bzrlib/builtins.py:5389
+#: bzrlib/builtins.py:5422
 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"
@@ -2818,16 +2823,16 @@
 "be changed using --from."
 msgstr ""
 
-#: bzrlib/builtins.py:5395
+#: bzrlib/builtins.py:5428
 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 settting it). After that, you can\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:5401
+#: bzrlib/builtins.py:5434
 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"
@@ -2835,20 +2840,20 @@
 "in the merge directive."
 msgstr ""
 
-#: bzrlib/builtins.py:5406
+#: bzrlib/builtins.py:5439
 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:5409
+#: bzrlib/builtins.py:5442
 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:5413
+#: bzrlib/builtins.py:5446
 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"
@@ -2860,7 +2865,7 @@
 "supported clients."
 msgstr ""
 
-#: bzrlib/builtins.py:5420
+#: bzrlib/builtins.py:5453
 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"
@@ -2868,7 +2873,7 @@
 "in the submit branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5425
+#: bzrlib/builtins.py:5458
 msgid ""
 "Two formats are currently supported: \"4\" uses revision bundle format 4 "
 "and\n"
@@ -2878,13 +2883,13 @@
 "format 1.  It is compatible with Bazaar 0.12 - 0.18."
 msgstr ""
 
-#: bzrlib/builtins.py:5431
+#: bzrlib/builtins.py:5464
 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:5434
+#: bzrlib/builtins.py:5467
 msgid ""
 "bzr send makes extensive use of public locations to map local locations "
 "into\n"
@@ -2893,90 +2898,90 @@
 msgstr ""
 
 # help of 'output' option of 'send' command
-#: bzrlib/builtins.py:5458
+#: bzrlib/builtins.py:5491
 msgid "Write merge directive to this file or directory; use - for stdout."
 msgstr ""
 
 # help of 'strict' option of 'send' command
-#: bzrlib/builtins.py:5462
+#: bzrlib/builtins.py:5495
 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:5464
+#: bzrlib/builtins.py:5497
 msgid "Mail the request to this address."
 msgstr ""
 
 # help of 'body' option of 'send' command
-#: bzrlib/builtins.py:5468
+#: bzrlib/builtins.py:5501
 msgid "Body for the email."
 msgstr ""
 
 # help of 'no-bundle' option of 'send' command
-#: bzrlib/builtins.py:5521
+#: bzrlib/builtins.py:5554
 msgid "Do not include a bundle in the merge directive."
 msgstr ""
 
 # help of 'no-patch' option of 'send' command
-#: bzrlib/builtins.py:5522
+#: bzrlib/builtins.py:5555
 msgid "Do not include a preview patch in the merge directive."
 msgstr ""
 
 # help of 'remember' option of 'send' command
-#: bzrlib/builtins.py:5525
+#: bzrlib/builtins.py:5558
 msgid "Remember submit and public branch."
 msgstr ""
 
 # help of 'from' option of 'send' command
-#: bzrlib/builtins.py:5527
+#: bzrlib/builtins.py:5560
 msgid ""
 "Branch to generate the submission from, rather than the one containing the "
 "working directory."
 msgstr ""
 
 # title of 'format' option of 'send' command
-#: bzrlib/builtins.py:5537
+#: bzrlib/builtins.py:5570
 msgid "format"
 msgstr ""
 
 # help of 'format' option of 'send' command
-#: bzrlib/builtins.py:5538
+#: bzrlib/builtins.py:5571
 msgid "Use the specified output format."
 msgstr ""
 
-#: bzrlib/builtins.py:5560
+#: bzrlib/builtins.py:5593
 msgid "Create, remove or modify a tag naming a revision."
 msgstr ""
 
-#: bzrlib/builtins.py:5562
+#: bzrlib/builtins.py:5595
 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:5566
+#: bzrlib/builtins.py:5599
 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:5569
+#: bzrlib/builtins.py:5602
 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:5572
+#: bzrlib/builtins.py:5605
 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:5575
+#: bzrlib/builtins.py:5608
 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"
@@ -2985,53 +2990,53 @@
 msgstr ""
 
 # help of 'delete' option of 'tag' command
-#: bzrlib/builtins.py:5585
+#: bzrlib/builtins.py:5618
 msgid "Delete this tag rather than placing it."
 msgstr ""
 
 # help of 'directory' option of 'tag' command
-#: bzrlib/builtins.py:5588
+#: bzrlib/builtins.py:5621
 msgid "Branch in which to place the tag."
 msgstr ""
 
 # help of 'force' option of 'tag' command
-#: bzrlib/builtins.py:5590
+#: bzrlib/builtins.py:5623
 msgid "Replace existing tags."
 msgstr ""
 
-#: bzrlib/builtins.py:5629
+#: bzrlib/builtins.py:5672
 msgid "List tags."
 msgstr ""
 
-#: bzrlib/builtins.py:5631
+#: bzrlib/builtins.py:5674
 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:5637
+#: bzrlib/builtins.py:5680
 msgid "Branch whose tags should be displayed."
 msgstr ""
 
 # help of 'sort' option of 'tags' command
-#: bzrlib/builtins.py:5639
+#: bzrlib/builtins.py:5682
 msgid "Sort tags by different criteria."
 msgstr ""
 
 # title of 'sort' option of 'tags' command
-#: bzrlib/builtins.py:5639
+#: bzrlib/builtins.py:5682
 msgid "Sorting"
 msgstr ""
 
-#: bzrlib/builtins.py:5684
+#: bzrlib/builtins.py:5727
 msgid "Reconfigure the type of a bzr directory."
 msgstr ""
 
-#: bzrlib/builtins.py:5686
+#: bzrlib/builtins.py:5729
 msgid "A target configuration must be specified."
 msgstr ""
 
-#: bzrlib/builtins.py:5688
+#: bzrlib/builtins.py:5731
 msgid ""
 "For checkouts, the bind-to location will be auto-detected if not specified.\n"
 "The order of preference is\n"
@@ -3043,42 +3048,42 @@
 msgstr ""
 
 # title of 'target_type' option of 'reconfigure' command
-#: bzrlib/builtins.py:5702
+#: bzrlib/builtins.py:5745
 msgid "Target type"
 msgstr ""
 
 # help of 'target_type' option of 'reconfigure' command
-#: bzrlib/builtins.py:5703
+#: bzrlib/builtins.py:5746
 msgid "The type to reconfigure the directory to."
 msgstr ""
 
 # help of 'bind-to' option of 'reconfigure' command
-#: bzrlib/builtins.py:5718
+#: bzrlib/builtins.py:5761
 msgid "Branch to bind checkout to."
 msgstr ""
 
 # help of 'force' option of 'reconfigure' command
-#: bzrlib/builtins.py:5720
+#: bzrlib/builtins.py:5763
 msgid "Perform reconfiguration even if local changes will be lost."
 msgstr ""
 
 # help of 'stacked-on' option of 'reconfigure' command
-#: bzrlib/builtins.py:5723
+#: bzrlib/builtins.py:5766
 msgid "Reconfigure a branch to be stacked on another branch."
 msgstr ""
 
 # help of 'unstacked' option of 'reconfigure' command
-#: bzrlib/builtins.py:5727
+#: bzrlib/builtins.py:5770
 msgid ""
 "Reconfigure a branch to be unstacked.  This may require copying substantial "
 "data into it."
 msgstr ""
 
-#: bzrlib/builtins.py:5775
+#: bzrlib/builtins.py:5818
 msgid "Set the branch of a checkout and update."
 msgstr ""
 
-#: bzrlib/builtins.py:5777
+#: bzrlib/builtins.py:5820
 msgid ""
 "For lightweight checkouts, this changes the branch being referenced.\n"
 "For heavyweight checkouts, this checks that there are no local commits\n"
@@ -3086,17 +3091,17 @@
 "of the new location and binds to it."
 msgstr ""
 
-#: bzrlib/builtins.py:5782
+#: bzrlib/builtins.py:5825
 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:5785
+#: bzrlib/builtins.py:5828
 msgid "Pending merges need to be committed or reverted before using switch."
 msgstr ""
 
-#: bzrlib/builtins.py:5787
+#: bzrlib/builtins.py:5830
 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"
@@ -3104,7 +3109,7 @@
 "/path/to/newbranch."
 msgstr ""
 
-#: bzrlib/builtins.py:5792
+#: bzrlib/builtins.py:5835
 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"
@@ -3112,20 +3117,20 @@
 msgstr ""
 
 # help of 'force' option of 'switch' command
-#: bzrlib/builtins.py:5800
+#: bzrlib/builtins.py:5843
 msgid "Switch even if local commits will be lost."
 msgstr ""
 
 # help of 'create-branch' option of 'switch' command
-#: bzrlib/builtins.py:5803
+#: bzrlib/builtins.py:5846
 msgid "Create the target branch from this one before switching to it."
 msgstr ""
 
-#: bzrlib/builtins.py:5872
+#: bzrlib/builtins.py:5915
 msgid "Manage filtered views."
 msgstr ""
 
-#: bzrlib/builtins.py:5874
+#: bzrlib/builtins.py:5917
 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"
@@ -3135,7 +3140,7 @@
 "must be within the current view."
 msgstr ""
 
-#: bzrlib/builtins.py:5881
+#: bzrlib/builtins.py:5924
 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"
@@ -3143,7 +3148,7 @@
 "and switch between them."
 msgstr ""
 
-#: bzrlib/builtins.py:5886
+#: bzrlib/builtins.py:5929
 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"
@@ -3151,131 +3156,131 @@
 "want to switch back to your view after that."
 msgstr ""
 
-#: bzrlib/builtins.py:5891
+#: bzrlib/builtins.py:5934
 msgid ""
 ":Examples:\n"
 "  To define the current view::"
 msgstr ""
 
-#: bzrlib/builtins.py:5894
+#: bzrlib/builtins.py:5937
 msgid "    bzr view file1 dir1 ..."
 msgstr ""
 
-#: bzrlib/builtins.py:5896
+#: bzrlib/builtins.py:5939
 msgid "  To list the current view::"
 msgstr ""
 
-#: bzrlib/builtins.py:5898
+#: bzrlib/builtins.py:5941
 msgid "    bzr view"
 msgstr ""
 
-#: bzrlib/builtins.py:5900
+#: bzrlib/builtins.py:5943
 msgid "  To delete the current view::"
 msgstr ""
 
-#: bzrlib/builtins.py:5902
+#: bzrlib/builtins.py:5945
 msgid "    bzr view --delete"
 msgstr ""
 
-#: bzrlib/builtins.py:5904
+#: bzrlib/builtins.py:5947
 msgid "  To disable the current view without deleting it::"
 msgstr ""
 
-#: bzrlib/builtins.py:5906
+#: bzrlib/builtins.py:5949
 msgid "    bzr view --switch off"
 msgstr ""
 
-#: bzrlib/builtins.py:5908
+#: bzrlib/builtins.py:5951
 msgid "  To define a named view and switch to it::"
 msgstr ""
 
-#: bzrlib/builtins.py:5910
+#: bzrlib/builtins.py:5953
 msgid "    bzr view --name view-name file1 dir1 ..."
 msgstr ""
 
-#: bzrlib/builtins.py:5912
+#: bzrlib/builtins.py:5955
 msgid "  To list a named view::"
 msgstr ""
 
-#: bzrlib/builtins.py:5914
+#: bzrlib/builtins.py:5957
 msgid "    bzr view --name view-name"
 msgstr ""
 
-#: bzrlib/builtins.py:5916
+#: bzrlib/builtins.py:5959
 msgid "  To delete a named view::"
 msgstr ""
 
-#: bzrlib/builtins.py:5918
+#: bzrlib/builtins.py:5961
 msgid "    bzr view --name view-name --delete"
 msgstr ""
 
-#: bzrlib/builtins.py:5920
+#: bzrlib/builtins.py:5963
 msgid "  To switch to a named view::"
 msgstr ""
 
-#: bzrlib/builtins.py:5922
+#: bzrlib/builtins.py:5965
 msgid "    bzr view --switch view-name"
 msgstr ""
 
-#: bzrlib/builtins.py:5924
+#: bzrlib/builtins.py:5967
 msgid "  To list all views defined::"
 msgstr ""
 
-#: bzrlib/builtins.py:5926
+#: bzrlib/builtins.py:5969
 msgid "    bzr view --all"
 msgstr ""
 
-#: bzrlib/builtins.py:5928
+#: bzrlib/builtins.py:5971
 msgid "  To delete all views::"
 msgstr ""
 
-#: bzrlib/builtins.py:5930
+#: bzrlib/builtins.py:5973
 msgid "    bzr view --delete --all"
 msgstr ""
 
 # help of 'all' option of 'view' command
-#: bzrlib/builtins.py:5937
+#: bzrlib/builtins.py:5980
 msgid "Apply list or delete action to all views."
 msgstr ""
 
 # help of 'delete' option of 'view' command
-#: bzrlib/builtins.py:5940
+#: bzrlib/builtins.py:5983
 msgid "Delete the view."
 msgstr ""
 
 # help of 'name' option of 'view' command
-#: bzrlib/builtins.py:5943
+#: bzrlib/builtins.py:5986
 msgid "Name of the view to define, list or delete."
 msgstr ""
 
 # help of 'switch' option of 'view' command
-#: bzrlib/builtins.py:5947
+#: bzrlib/builtins.py:5990
 msgid "Name of the view to switch to."
 msgstr ""
 
-#: bzrlib/builtins.py:6047
+#: bzrlib/builtins.py:6090
 msgid "Remove a branch."
 msgstr ""
 
-#: bzrlib/builtins.py:6049
+#: bzrlib/builtins.py:6092
 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:6054
+#: bzrlib/builtins.py:6097
 msgid "  Remove the branch at repo/trunk::"
 msgstr ""
 
-#: bzrlib/builtins.py:6056
+#: bzrlib/builtins.py:6099
 msgid "    bzr remove-branch repo/trunk"
 msgstr ""
 
-#: bzrlib/builtins.py:6072
+#: bzrlib/builtins.py:6115
 msgid "Temporarily set aside some changes from the current tree."
 msgstr ""
 
-#: bzrlib/builtins.py:6074
+#: bzrlib/builtins.py:6117
 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"
@@ -3284,11 +3289,11 @@
 "will they survive its deletion."
 msgstr ""
 
-#: bzrlib/builtins.py:6080
+#: bzrlib/builtins.py:6123
 msgid "If shelve --list is specified, previously-shelved changes are listed."
 msgstr ""
 
-#: bzrlib/builtins.py:6082
+#: bzrlib/builtins.py:6125
 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"
@@ -3296,35 +3301,35 @@
 "shelve all text changes at once, use shelve --all."
 msgstr ""
 
-#: bzrlib/builtins.py:6087
+#: bzrlib/builtins.py:6130
 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:6090
+#: bzrlib/builtins.py:6133
 msgid ""
 "If a revision is specified, changes since that revision will be shelved."
 msgstr ""
 
-#: bzrlib/builtins.py:6092
+#: bzrlib/builtins.py:6135
 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:6095
+#: bzrlib/builtins.py:6138
 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:6099
+#: bzrlib/builtins.py:6142
 msgid "    change_editor = PROGRAM @new_path @old_path"
 msgstr ""
 
-#: bzrlib/builtins.py:6101
+#: bzrlib/builtins.py:6144
 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"
@@ -3334,35 +3339,35 @@
 msgstr ""
 
 # help of 'all' option of 'shelve' command
-#: bzrlib/builtins.py:6113
+#: bzrlib/builtins.py:6156
 msgid "Shelve all changes."
 msgstr ""
 
 # help of 'writer' option of 'shelve' command
-#: bzrlib/builtins.py:6115
+#: bzrlib/builtins.py:6158
 msgid "Method to use for writing diffs."
 msgstr ""
 
 # title of 'writer' option of 'shelve' command
-#: bzrlib/builtins.py:6115
+#: bzrlib/builtins.py:6158
 msgid "writer"
 msgstr ""
 
 # help of 'list' option of 'shelve' command
-#: bzrlib/builtins.py:6119
+#: bzrlib/builtins.py:6162
 msgid "List shelved changes."
 msgstr ""
 
 # help of 'destroy' option of 'shelve' command
-#: bzrlib/builtins.py:6121
+#: bzrlib/builtins.py:6164
 msgid "Destroy removed changes instead of shelving them."
 msgstr ""
 
-#: bzrlib/builtins.py:6161
+#: bzrlib/builtins.py:6204
 msgid "Restore shelved changes."
 msgstr ""
 
-#: bzrlib/builtins.py:6163
+#: bzrlib/builtins.py:6206
 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"
@@ -3370,60 +3375,60 @@
 msgstr ""
 
 # help of 'action' option of 'unshelve' command
-#: bzrlib/builtins.py:6172
+#: bzrlib/builtins.py:6215
 msgid "The action to perform."
 msgstr ""
 
-#: bzrlib/builtins.py:6194
+#: bzrlib/builtins.py:6237
 msgid "Remove unwanted files from working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:6196
+#: bzrlib/builtins.py:6239
 msgid ""
 "By default, only unknown files, not ignored files, are deleted.  Versioned\n"
 "files are never deleted."
 msgstr ""
 
-#: bzrlib/builtins.py:6199
+#: bzrlib/builtins.py:6242
 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:6203
+#: bzrlib/builtins.py:6246
 msgid ""
 "If no options are specified, unknown files are deleted.  Otherwise, option\n"
 "flags are respected, and may be combined."
 msgstr ""
 
-#: bzrlib/builtins.py:6206
+#: bzrlib/builtins.py:6249
 msgid "To check what clean-tree will do, use --dry-run."
 msgstr ""
 
 # help of 'ignored' option of 'clean-tree' command
-#: bzrlib/builtins.py:6209
+#: bzrlib/builtins.py:6252
 msgid "Delete all ignored files."
 msgstr ""
 
 # help of 'detritus' option of 'clean-tree' command
-#: bzrlib/builtins.py:6210
+#: bzrlib/builtins.py:6253
 msgid ""
 "Delete conflict files, merge and revert backups, and failed selftest dirs."
 msgstr ""
 
 # help of 'unknown' option of 'clean-tree' command
-#: bzrlib/builtins.py:6213
+#: bzrlib/builtins.py:6256
 msgid "Delete files unknown to bzr (default)."
 msgstr ""
 
 # help of 'dry-run' option of 'clean-tree' command
-#: bzrlib/builtins.py:6214
+#: bzrlib/builtins.py:6257
 msgid "Show files to delete instead of deleting them."
 msgstr ""
 
 # help of 'force' option of 'clean-tree' command
-#: bzrlib/builtins.py:6216
+#: bzrlib/builtins.py:6259
 msgid "Do not prompt before deleting."
 msgstr ""
 
@@ -3594,26 +3599,26 @@
 msgid "All commits signed with verifiable keys"
 msgstr ""
 
-#: bzrlib/config.py:3118
+#: bzrlib/config.py:3277
 msgid "Display, set or remove a configuration option."
 msgstr ""
 
-#: bzrlib/config.py:3120
+#: bzrlib/config.py:3279
 msgid "Display the active value for a given option."
 msgstr ""
 
-#: bzrlib/config.py:3122
+#: bzrlib/config.py:3281
 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:3126
+#: bzrlib/config.py:3285
 msgid "If no NAME is given, --all .* is implied."
 msgstr ""
 
-#: bzrlib/config.py:3128
+#: bzrlib/config.py:3287
 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"
@@ -3621,17 +3626,17 @@
 msgstr ""
 
 # help of 'scope' option of 'config' command
-#: bzrlib/config.py:3139
+#: bzrlib/config.py:3298
 msgid "Reduce the scope to the specified configuration file"
 msgstr ""
 
 # help of 'all' option of 'config' command
-#: bzrlib/config.py:3143
+#: bzrlib/config.py:3302
 msgid "Display all the defined values for the matching options."
 msgstr ""
 
 # help of 'remove' option of 'config' command
-#: bzrlib/config.py:3145
+#: bzrlib/config.py:3304
 msgid "Remove the option from the configuration file"
 msgstr ""
 
@@ -3690,244 +3695,244 @@
 msgid "action"
 msgstr ""
 
-#: bzrlib/errors.py:208
+#: bzrlib/errors.py:215
 msgid "The tree builder is already building a tree."
 msgstr ""
 
-#: bzrlib/errors.py:229
+#: bzrlib/errors.py:236
 msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:248
+#: bzrlib/errors.py:255
 msgid ""
 "The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
 "versions \"%(minimum)s\" to \"%(current)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:260
+#: bzrlib/errors.py:267
 msgid "The transport '%(transport)s' is only accessible within this process."
 msgstr ""
 
-#: bzrlib/errors.py:278
+#: bzrlib/errors.py:285
 msgid "Invalid revision number %(revno)s"
 msgstr ""
 
-#: bzrlib/errors.py:287
+#: bzrlib/errors.py:294
 msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
 msgstr ""
 
-#: bzrlib/errors.py:298
+#: bzrlib/errors.py:305
 msgid "Reserved revision-id {%(revision_id)s}"
 msgstr ""
 
-#: bzrlib/errors.py:312
+#: bzrlib/errors.py:319
 msgid "There is no public branch set for \"%(branch_url)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:322
+#: bzrlib/errors.py:329
 msgid ""
 "No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
 "obtain a list of topics."
 msgstr ""
 
-#: bzrlib/errors.py:331
+#: bzrlib/errors.py:338
 msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
 msgstr ""
 
-#: bzrlib/errors.py:341
+#: bzrlib/errors.py:348
 msgid ""
 "The file id \"%(file_id)s\" is not present in the repository %(repository)r"
 msgstr ""
 
-#: bzrlib/errors.py:350
+#: bzrlib/errors.py:357
 msgid "The branch '%(branch)s' is not stacked."
 msgstr ""
 
-#: bzrlib/errors.py:364
+#: bzrlib/errors.py:371
 msgid "No WorkingTree exists for \"%(base)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:373
+#: bzrlib/errors.py:380
 msgid "Not currently building a tree."
 msgstr ""
 
-#: bzrlib/errors.py:378
+#: bzrlib/errors.py:385
 msgid "%(url)s is not a local path."
 msgstr ""
 
-#: bzrlib/errors.py:406
+#: bzrlib/errors.py:413
 msgid "%(not_locked)r is not write locked but needs to be."
 msgstr ""
 
-#: bzrlib/errors.py:414
+#: bzrlib/errors.py:421
 msgid "Error in command line options"
 msgstr ""
 
-#: bzrlib/errors.py:419
+#: bzrlib/errors.py:426
 msgid "%(value)s is not an index of type %(_type)s."
 msgstr ""
 
-#: bzrlib/errors.py:429
+#: bzrlib/errors.py:436
 msgid "Error in data for index %(value)s."
 msgstr ""
 
-#: bzrlib/errors.py:438
+#: bzrlib/errors.py:445
 msgid "The key '%(key)s' is already in index '%(index)s'."
 msgstr ""
 
-#: bzrlib/errors.py:448
+#: bzrlib/errors.py:455
 msgid "The key '%(key)s' is not a valid key."
 msgstr ""
 
-#: bzrlib/errors.py:457
+#: bzrlib/errors.py:464
 msgid "Could not parse options for index %(value)s."
 msgstr ""
 
-#: bzrlib/errors.py:466
+#: bzrlib/errors.py:473
 msgid "The value '%(value)s' is not a valid value."
 msgstr ""
 
-#: bzrlib/errors.py:494
+#: bzrlib/errors.py:501
 msgid "Generic path error: %(path)r%(extra)s)"
 msgstr ""
 
-#: bzrlib/errors.py:507
+#: bzrlib/errors.py:514
 msgid "No such file: %(path)r%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:512
+#: bzrlib/errors.py:519
 msgid "File exists: %(path)r%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:518
+#: bzrlib/errors.py:525
 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:534
+#: bzrlib/errors.py:541
 msgid "\"%(path)s\" is not a directory %(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:539
+#: bzrlib/errors.py:546
 msgid "\"%(path)s\" is not in the working directory %(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:544
+#: bzrlib/errors.py:551
 msgid "Directory not empty: \"%(path)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:549
+#: bzrlib/errors.py:556
 msgid "Hard-linking \"%(path)s\" is not supported"
 msgstr ""
 
-#: bzrlib/errors.py:564
+#: bzrlib/errors.py:571
 msgid "Device or resource busy: \"%(path)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:569
+#: bzrlib/errors.py:576
 msgid "Permission denied: \"%(path)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:574
+#: bzrlib/errors.py:581
 msgid "Invalid url supplied to transport: \"%(path)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:579
+#: bzrlib/errors.py:586
 msgid "Invalid URL join request: %(reason)s: %(base)r + %(join_args)r"
 msgstr ""
 
-#: bzrlib/errors.py:590
+#: bzrlib/errors.py:597
 msgid "URLs differ by more than path: %(from_)r and %(to)r"
 msgstr ""
 
-#: bzrlib/errors.py:612
+#: bzrlib/errors.py:619
 msgid "The %(type)s hook '%(hook)s' is unknown in this version of bzrlib."
 msgstr ""
 
-#: bzrlib/errors.py:622
+#: bzrlib/errors.py:629
 msgid "Unsupported protocol for url \"%(path)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:630
+#: bzrlib/errors.py:637
 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:641
+#: bzrlib/errors.py:648
 msgid "The branch '%(branch_url)s' cannot be stacked on '%(target_url)s'."
 msgstr ""
 
-#: bzrlib/errors.py:651
+#: bzrlib/errors.py:658
 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:662
+#: bzrlib/errors.py:669
 msgid "Error reading from %(path)r."
 msgstr ""
 
-#: bzrlib/errors.py:681
+#: bzrlib/errors.py:688
 msgid "Path \"%(path)s\" is not a child of path \"%(base)s\"%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:697
+#: bzrlib/errors.py:704
 msgid "Path \"%(path)s\" is not unicode normalized"
 msgstr ""
 
-#: bzrlib/errors.py:705
+#: bzrlib/errors.py:712
 msgid "Not a branch: \"%(path)s\"%(detail)s."
 msgstr ""
 
-#: bzrlib/errors.py:747
+#: bzrlib/errors.py:754
 msgid "No submit branch available for branch \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:756
+#: bzrlib/errors.py:763
 msgid "Already a branch: \"%(path)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:762
+#: bzrlib/errors.py:769
 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:767
+#: bzrlib/errors.py:774
 msgid ""
 "\"%(function)s\" called on an AtomicFile after it was closed: \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:777
+#: bzrlib/errors.py:784
 msgid ""
 "Parent not accessible given base \"%(base)s\" and relative path \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:787
+#: bzrlib/errors.py:794
 msgid "No repository present: \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:795
+#: bzrlib/errors.py:802
 msgid "File \"%(path)s\" is not in branch %(branch_base)s."
 msgstr ""
 
-#: bzrlib/errors.py:807
+#: bzrlib/errors.py:814
 msgid ""
 "Unsupported branch format: %(format)s\n"
 "Please run 'bzr upgrade'"
 msgstr ""
 
-#: bzrlib/errors.py:813
+#: bzrlib/errors.py:820
 msgid "Unknown %(kind)s format: %(format)r"
 msgstr ""
 
-#: bzrlib/errors.py:822
+#: bzrlib/errors.py:829
 msgid "Format %(format)s is not compatible with .bzr version %(bzrdir)s."
 msgstr ""
 
-#: bzrlib/errors.py:835
+#: bzrlib/errors.py:842
 msgid ""
 "%(target)s\n"
 "is not compatible with\n"
@@ -3935,452 +3940,452 @@
 "%(details)s"
 msgstr ""
 
-#: bzrlib/errors.py:851
+#: bzrlib/errors.py:858
 msgid "Revision is not compatible with %(repo_format)s"
 msgstr ""
 
-#: bzrlib/errors.py:861
+#: bzrlib/errors.py:868
 msgid "%(context_info)s%(path)s is already versioned."
 msgstr ""
 
-#: bzrlib/errors.py:882
+#: bzrlib/errors.py:889
 msgid "%(context_info)s%(path)s is not versioned."
 msgstr ""
 
-#: bzrlib/errors.py:903
+#: bzrlib/errors.py:910
 msgid "Path(s) are not versioned: %(paths_as_string)s"
 msgstr ""
 
-#: bzrlib/errors.py:914
+#: bzrlib/errors.py:921
 msgid "Path(s) do not exist: %(paths_as_string)s%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:933
+#: bzrlib/errors.py:940
 msgid "Cannot operate on \"%(filename)s\" of unsupported kind \"%(kind)s\""
 msgstr ""
 
-#: bzrlib/errors.py:941
+#: bzrlib/errors.py:948
 msgid ""
 "Filename %(filename)r is not valid in your current filesystem encoding "
 "%(fs_encoding)s"
 msgstr ""
 
-#: bzrlib/errors.py:952
+#: bzrlib/errors.py:959
 msgid "Cannot operate on \"%(filename)s\" because it is a control file"
 msgstr ""
 
-#: bzrlib/errors.py:970
+#: bzrlib/errors.py:977
 msgid "The lock for '%(lock_description)s' is in use and cannot be broken."
 msgstr ""
 
-#: bzrlib/errors.py:1009
+#: bzrlib/errors.py:1016
 msgid "Cannot lock %(lock)s: %(why)s"
 msgstr ""
 
-#: bzrlib/errors.py:1019
+#: bzrlib/errors.py:1026
 msgid ""
 "A transaction related operation was attempted after the transaction finished."
 msgstr ""
 
-#: bzrlib/errors.py:1046
+#: bzrlib/errors.py:1053
 msgid "Cannot lock: transport is read only: %(transport)s"
 msgstr ""
 
-#: bzrlib/errors.py:1054
+#: bzrlib/errors.py:1061
 msgid "Could not acquire lock \"%(lock)s\": %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1065
+#: bzrlib/errors.py:1072
 msgid "Lock was broken while still open: %(lock)s - check storage consistency!"
 msgstr ""
 
-#: bzrlib/errors.py:1076
+#: bzrlib/errors.py:1083
 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:1088
+#: bzrlib/errors.py:1095
 msgid ""
 "Lock is apparently held, but corrupted: %(corruption_info)s\n"
 "Use 'bzr break-lock' to clear it"
 msgstr ""
 
-#: bzrlib/errors.py:1101
+#: bzrlib/errors.py:1108
 msgid "Lock not held: %(lock)s"
 msgstr ""
 
-#: bzrlib/errors.py:1130
+#: bzrlib/errors.py:1137
 msgid "No changes to commit"
 msgstr ""
 
-#: bzrlib/errors.py:1135
+#: bzrlib/errors.py:1142
 msgid ""
 "Selected-file commit of merges is not supported yet: files %(files_str)s"
 msgstr ""
 
-#: bzrlib/errors.py:1145
+#: bzrlib/errors.py:1152
 msgid ""
 "Excluding paths during commit is not supported by repository at %(repository)"
 "r."
 msgstr ""
 
-#: bzrlib/errors.py:1154
+#: bzrlib/errors.py:1161
 msgid ""
 "The specified commit message contains characters unsupported by the current "
 "encoding."
 msgstr ""
 
-#: bzrlib/errors.py:1160
+#: bzrlib/errors.py:1167
 msgid "Upgrade URL cannot work with readonly URLs."
 msgstr ""
 
-#: bzrlib/errors.py:1165
+#: bzrlib/errors.py:1172
 msgid "The branch format %(format)s is already at the most recent format."
 msgstr ""
 
-#: bzrlib/errors.py:1188
+#: bzrlib/errors.py:1195
 msgid "Option --change does not accept revision ranges"
 msgstr ""
 
-#: bzrlib/errors.py:1193
+#: bzrlib/errors.py:1200
 msgid "No namespace registered for string: %(spec)r"
 msgstr ""
 
-#: bzrlib/errors.py:1212
+#: bzrlib/errors.py:1219
 msgid ""
 "Requested revision: '%(spec)s' does not exist in branch: %(branch_url)s"
 "%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:1226
+#: bzrlib/errors.py:1233
 msgid "%(branch)s is missing %(object_type)s {%(object_id)s}"
 msgstr ""
 
-#: bzrlib/errors.py:1231
+#: bzrlib/errors.py:1238
 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:1242
+#: bzrlib/errors.py:1249
 msgid ""
 "These branches have diverged. Use the missing command to see how.\n"
 "Use the merge command to reconcile them."
 msgstr ""
 
-#: bzrlib/errors.py:1262
+#: bzrlib/errors.py:1269
 msgid ""
 "Branches have no common ancestor, and no merge base revision was specified."
 msgstr ""
 
-#: bzrlib/errors.py:1268
+#: bzrlib/errors.py:1275
 msgid ""
 "Selected merge cannot perform reverse cherrypicks.  Try merge3 or diff3."
 msgstr ""
 
-#: bzrlib/errors.py:1274
+#: bzrlib/errors.py:1281
 msgid "Revisions have no common ancestor: %(revision_a)s %(revision_b)s"
 msgstr ""
 
-#: bzrlib/errors.py:1283
+#: bzrlib/errors.py:1290
 msgid ""
 "Revisions are not derived from the same root: %(revision_a)s %(revision_b)s."
 msgstr ""
 
-#: bzrlib/errors.py:1292
+#: bzrlib/errors.py:1299
 msgid "Revision %(rev_id)s is not an ancestor of %(not_ancestor_id)s"
 msgstr ""
 
-#: bzrlib/errors.py:1312
+#: bzrlib/errors.py:1319
 msgid "Branch %(branch)s has no commits."
 msgstr ""
 
-#: bzrlib/errors.py:1330
+#: bzrlib/errors.py:1337
 msgid ""
 "Bound branch %(branch)s is out of date with master branch %(master)s."
 "%(extra_help)s"
 msgstr ""
 
-#: bzrlib/errors.py:1342
+#: bzrlib/errors.py:1349
 msgid ""
 "Cannot commit to branch %(branch)s. It is bound to %(master)s, which is "
 "bound to %(remote)s."
 msgstr ""
 
-#: bzrlib/errors.py:1354
+#: bzrlib/errors.py:1361
 msgid "Cannot pull --overwrite to a branch which is bound %(branch)s"
 msgstr ""
 
-#: bzrlib/errors.py:1363
+#: bzrlib/errors.py:1370
 msgid ""
 "Unable to connect to target of bound branch %(branch)s => %(target)s: "
 "%(error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1375
+#: bzrlib/errors.py:1382
 msgid "Error in processing weave: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1384
+#: bzrlib/errors.py:1391
 msgid "Revision {%(revision_id)s} already present in %(weave)s"
 msgstr ""
 
-#: bzrlib/errors.py:1395
+#: bzrlib/errors.py:1402
 msgid "Revision {%(revision_id)s} not present in %(weave)s"
 msgstr ""
 
-#: bzrlib/errors.py:1405
+#: bzrlib/errors.py:1412
 msgid "Weave invariant violated: %(what)s"
 msgstr ""
 
-#: bzrlib/errors.py:1414
+#: bzrlib/errors.py:1421
 msgid "Parents are mismatched between two revisions. %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1436
+#: bzrlib/errors.py:1443
 msgid ""
 "Weaves differ on text content. Revision: {%(revision_id)s}, %(weave_a)s, "
 "%(weave_b)s"
 msgstr ""
 
-#: bzrlib/errors.py:1448
+#: bzrlib/errors.py:1455
 msgid "Versioned file error"
 msgstr ""
 
-#: bzrlib/errors.py:1453
+#: bzrlib/errors.py:1460
 msgid "Revision {%(revision_id)s} not present in \"%(file_id)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:1463
+#: bzrlib/errors.py:1470
 msgid "Revision {%(revision_id)s} already present in \"%(file_id)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:1473
+#: bzrlib/errors.py:1480
 msgid "Text did not match its checksum: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1598
+#: bzrlib/errors.py:1605
 msgid "Export format %(format)r not supported"
 msgstr ""
 
-#: bzrlib/errors.py:1607
+#: bzrlib/errors.py:1614
 msgid "Transport error: %(msg)s %(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1633
+#: bzrlib/errors.py:1640
 msgid "Generic bzr smart protocol error: %(details)s"
 msgstr ""
 
-#: bzrlib/errors.py:1641
+#: bzrlib/errors.py:1648
 msgid "Received bad protocol version marker: %(marker)r"
 msgstr ""
 
-#: bzrlib/errors.py:1672
+#: bzrlib/errors.py:1679
 msgid "Transport operation not possible: %(msg)s %(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1677
+#: bzrlib/errors.py:1684
 msgid "Connection error: %(msg)s %(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1682
+#: bzrlib/errors.py:1689
 msgid "%(msg)s %(host)s%(port)s%(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1703
+#: bzrlib/errors.py:1710
 msgid "Connection closed: %(msg)s %(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1708
+#: bzrlib/errors.py:1715
 msgid "Invalid range access in %(path)s at %(offset)s: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1718
+#: bzrlib/errors.py:1725
 msgid "Invalid http response for %(path)s: %(msg)s%(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1733
+#: bzrlib/errors.py:1740
 msgid "Invalid http range %(range)r for %(path)s: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1747
+#: bzrlib/errors.py:1754
 msgid "HTTP MIME Boundary missing for %(path)s: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1755
+#: bzrlib/errors.py:1762
 msgid "Invalid http Content-type \"%(ctype)s\" for %(path)s: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1764
+#: bzrlib/errors.py:1771
 msgid "%(source)s is%(permanently)s redirected to %(target)s"
 msgstr ""
 
-#: bzrlib/errors.py:1778
+#: bzrlib/errors.py:1785
 msgid "Too many redirections"
 msgstr ""
 
-#: bzrlib/errors.py:1783
+#: bzrlib/errors.py:1790
 msgid "Working tree has conflicts."
 msgstr ""
 
-#: bzrlib/errors.py:1787
+#: bzrlib/errors.py:1794
 msgid "Config file %(filename)s is not UTF-8 encoded\n"
 msgstr ""
 
-#: bzrlib/errors.py:1796
+#: bzrlib/errors.py:1803
 msgid ""
 "Error(s) parsing config file %(filename)s:\n"
 "%(errors)s"
 msgstr ""
 
-#: bzrlib/errors.py:1807
+#: bzrlib/errors.py:1814
 msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:1815
+#: bzrlib/errors.py:1822
 msgid "%(username)r does not seem to contain a reasonable email address"
 msgstr ""
 
-#: bzrlib/errors.py:1824
+#: bzrlib/errors.py:1831
 msgid "Failed to GPG sign data with command \"%(command_line)s\""
 msgstr ""
 
-#: bzrlib/errors.py:1832
+#: bzrlib/errors.py:1839
 msgid "Failed to verify GPG signature data with error \"%(error)s\""
 msgstr ""
 
-#: bzrlib/errors.py:1840
+#: bzrlib/errors.py:1847
 msgid "Unable to import library \"%(library)s\": %(error)s"
 msgstr ""
 
-#: bzrlib/errors.py:1848
+#: bzrlib/errors.py:1855
 msgid "python-gpgme is not installed, it is needed to verify signatures"
 msgstr ""
 
-#: bzrlib/errors.py:1856
+#: bzrlib/errors.py:1863
 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:1866
+#: bzrlib/errors.py:1873
 msgid ""
 "Can't reprocess and show base, because reprocessing obscures the "
 "relationship of conflicting lines to the base"
 msgstr ""
 
-#: bzrlib/errors.py:1872
+#: bzrlib/errors.py:1879
 msgid "Cycle in graph %(graph)r"
 msgstr ""
 
-#: bzrlib/errors.py:1900
+#: bzrlib/errors.py:1907
 msgid "File %(filename)s is not conflicted."
 msgstr ""
 
-#: bzrlib/errors.py:1922
+#: bzrlib/errors.py:1929
 msgid "No bundle was found in \"%(filename)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:1931
+#: bzrlib/errors.py:1938
 msgid "Unable to handle bundle version %(version)s: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:1941
+#: bzrlib/errors.py:1948
 msgid "Branch %(base)s is missing revision %(text_revision)s of %(file_id)s"
 msgstr ""
 
-#: bzrlib/errors.py:1954
+#: bzrlib/errors.py:1961
 msgid "File id {%(file_id)s} already exists in inventory as %(entry)s"
 msgstr ""
 
-#: bzrlib/errors.py:1964
+#: bzrlib/errors.py:1971
 msgid "Key %(key)s is already present in map"
 msgstr ""
 
-#: bzrlib/errors.py:1969
+#: bzrlib/errors.py:1976
 msgid "The prefix %(prefix)s is in the help search path twice."
 msgstr ""
 
-#: bzrlib/errors.py:1977
+#: bzrlib/errors.py:1984
 msgid "Tree transform is malformed %(conflicts)r"
 msgstr ""
 
-#: bzrlib/errors.py:1979
+#: bzrlib/errors.py:1986
 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:2011
+#: bzrlib/errors.py:2018
 msgid "Attempt to reuse a transform that has already been applied."
 msgstr ""
 
-#: bzrlib/errors.py:2016
+#: bzrlib/errors.py:2023
 msgid "Moving the root directory is not supported at this time"
 msgstr ""
 
-#: bzrlib/errors.py:2021
+#: bzrlib/errors.py:2028
 msgid "Failed to rename %(from_path)s to %(to_path)s: %(why)s"
 msgstr ""
 
-#: bzrlib/errors.py:2032
+#: bzrlib/errors.py:2039
 msgid ""
 "Could not move %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:2068
+#: bzrlib/errors.py:2075
 msgid ""
 "Could not rename %(from_path)s%(operator)s %(to_path)s%(_has_extra)s%(extra)s"
 msgstr ""
 
-#: bzrlib/errors.py:2077
+#: bzrlib/errors.py:2084
 msgid ""
 "Can't safely remove modified or unknown files:\n"
 "%(changes_as_text)sUse --keep to not delete them, or --force to delete them "
 "regardless."
 msgstr ""
 
-#: bzrlib/errors.py:2114
+#: bzrlib/errors.py:2121
 msgid "Unable to import paramiko (required for sftp support): %(error)s"
 msgstr ""
 
-#: bzrlib/errors.py:2122
+#: bzrlib/errors.py:2129
 msgid "Nothing to merge."
 msgstr ""
 
-#: bzrlib/errors.py:2127
+#: bzrlib/errors.py:2134
 msgid "Format %(format)s cannot be initialised by this version of bzr."
 msgstr ""
 
-#: bzrlib/errors.py:2136
+#: bzrlib/errors.py:2143
 msgid ""
 "Cannot convert from format %(from_format)s to format %(format)s.    "
 "%(problem)s"
 msgstr ""
 
-#: bzrlib/errors.py:2148
+#: bzrlib/errors.py:2155
 msgid "Could not find an appropriate Differ for file \"%(path)s\""
 msgstr ""
 
-#: bzrlib/errors.py:2156
+#: bzrlib/errors.py:2163
 msgid "%(exe_name)s could not be found on this machine"
 msgstr ""
 
-#: bzrlib/errors.py:2164
+#: bzrlib/errors.py:2171
 msgid "Diff is not installed on this machine: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:2172
+#: bzrlib/errors.py:2179
 msgid "Diff3 is not installed on this machine."
 msgstr ""
 
-#: bzrlib/errors.py:2178
+#: bzrlib/errors.py:2185
 msgid "The content being inserted is already present."
 msgstr ""
 
-#: bzrlib/errors.py:2183
+#: bzrlib/errors.py:2190
 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 "
@@ -4388,14 +4393,14 @@
 "    keep, and delete it when you are done."
 msgstr ""
 
-#: bzrlib/errors.py:2194
+#: bzrlib/errors.py:2201
 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:2204
+#: bzrlib/errors.py:2211
 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 "
@@ -4403,487 +4408,497 @@
 "    keep, and delete it when you are done."
 msgstr ""
 
-#: bzrlib/errors.py:2215
+#: bzrlib/errors.py:2222
 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:2225
+#: bzrlib/errors.py:2232
 msgid "Working tree is out of date, please run 'bzr update'.%(more)s"
 msgstr ""
 
-#: bzrlib/errors.py:2239
+#: bzrlib/errors.py:2246
 msgid "Public branch \"%(public_location)s\" lacks revision \"%(revstring)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:2252
+#: bzrlib/errors.py:2259
 msgid "Error in merge modified format"
 msgstr ""
 
-#: bzrlib/errors.py:2257
+#: bzrlib/errors.py:2264
 msgid "Format error in conflict listings"
 msgstr ""
 
-#: bzrlib/errors.py:2261
+#: bzrlib/errors.py:2268
 msgid ""
 "Inconsistency in dirstate file %(dirstate_path)s.\n"
 "Error: %(description)s"
 msgstr ""
 
-#: bzrlib/errors.py:2272
+#: bzrlib/errors.py:2279
 msgid ""
 "An error has been detected in the repository %(repo_path)s.\n"
 "Please run bzr reconcile on this repository."
 msgstr ""
 
-#: bzrlib/errors.py:2283
+#: bzrlib/errors.py:2290
 msgid ""
 "An inconsistent delta was supplied involving %(path)r, %(file_id)r\n"
 "reason: %(reason)s"
 msgstr ""
 
-#: bzrlib/errors.py:2296
+#: bzrlib/errors.py:2303
 msgid ""
 "An inconsistent delta was supplied: %(delta)r\n"
 "reason: %(reason)s"
 msgstr ""
 
-#: bzrlib/errors.py:2308
+#: bzrlib/errors.py:2315
 msgid "To use this feature you must upgrade your branch at %(path)s."
 msgstr ""
 
-#: bzrlib/errors.py:2317
+#: bzrlib/errors.py:2324
 msgid "To use this feature you must upgrade your repository at %(path)s."
 msgstr ""
 
-#: bzrlib/errors.py:2322
+#: bzrlib/errors.py:2329
 msgid ""
 "To use this feature you must upgrade your branch at %(path)s to a format "
 "which supports rich roots."
 msgstr ""
 
-#: bzrlib/errors.py:2328
+#: bzrlib/errors.py:2335
 msgid "Cannot perform local-only commits on unbound branches."
 msgstr ""
 
-#: bzrlib/errors.py:2333
+#: bzrlib/errors.py:2340
 msgid "The method %(mname)s is not supported on objects of type %(tname)s."
 msgstr ""
 
-#: bzrlib/errors.py:2354
+#: bzrlib/errors.py:2361
+msgid "Ghost tags not supported by format %(format)r."
+msgstr ""
+
+#: bzrlib/errors.py:2369
 msgid "File is binary but should be text."
 msgstr ""
 
-#: bzrlib/errors.py:2359
+#: bzrlib/errors.py:2374
 msgid "The path %(path)s is not permitted on this platform"
 msgstr ""
 
-#: bzrlib/errors.py:2368
+#: bzrlib/errors.py:2383
 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:2380
+#: bzrlib/errors.py:2395
 msgid "Not a bzr revision-bundle: %(text)r"
 msgstr ""
 
-#: bzrlib/errors.py:2389
+#: bzrlib/errors.py:2404
 msgid "Bad bzr revision-bundle: %(text)r"
 msgstr ""
 
-#: bzrlib/errors.py:2398
+#: bzrlib/errors.py:2413
 msgid "Malformed bzr revision-bundle header: %(text)r"
 msgstr ""
 
-#: bzrlib/errors.py:2403
+#: bzrlib/errors.py:2418
 msgid "Malformed patches in bzr revision-bundle: %(text)r"
 msgstr ""
 
-#: bzrlib/errors.py:2408
+#: bzrlib/errors.py:2423
 msgid "Malformed footer in bzr revision-bundle: %(text)r"
 msgstr ""
 
-#: bzrlib/errors.py:2413
+#: bzrlib/errors.py:2428
 msgid "End of line marker was not \\n in bzr revision-bundle"
 msgstr ""
 
-#: bzrlib/errors.py:2423
+#: bzrlib/errors.py:2438
 msgid "Bundle format %(bundle_format)s is incompatible with %(other)s"
 msgstr ""
 
-#: bzrlib/errors.py:2433
+#: bzrlib/errors.py:2448
 msgid "Root class for inventory serialization errors"
 msgstr ""
 
-#: bzrlib/errors.py:2437
+#: bzrlib/errors.py:2452
 msgid ""
 "The inventory was not in the expected format:\n"
 " %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:2446
+#: bzrlib/errors.py:2461
 msgid "This operation requires rich root data storage"
 msgstr ""
 
-#: bzrlib/errors.py:2459
+#: bzrlib/errors.py:2474
 msgid "Unrecognised value for BZR_SSH environment variable: %(vendor)s"
 msgstr ""
 
-#: bzrlib/errors.py:2468
+#: bzrlib/errors.py:2483
 msgid ""
 "Don't know how to handle SSH connections. Please set BZR_SSH environment "
 "variable."
 msgstr ""
 
-#: bzrlib/errors.py:2475
+#: bzrlib/errors.py:2490
 msgid ""
 "Could not determine revno for {%(revision_id)s} because its ancestry shows a "
 "ghost at {%(ghost_revision_id)s}"
 msgstr ""
 
-#: bzrlib/errors.py:2485
+#: bzrlib/errors.py:2500
 msgid "Ghost revision {%(revision_id)s} cannot be used here."
 msgstr ""
 
-#: bzrlib/errors.py:2536
+#: bzrlib/errors.py:2551
 msgid ""
 "A merge directive must provide either a bundle or a public branch location."
 msgstr ""
 
-#: bzrlib/errors.py:2543
+#: bzrlib/errors.py:2558
 msgid "Bad merge directive payload %(start)r"
 msgstr ""
 
-#: bzrlib/errors.py:2553
+#: bzrlib/errors.py:2568
 msgid "Preview patch does not match requested changes."
 msgstr ""
 
-#: bzrlib/errors.py:2559
+#: bzrlib/errors.py:2574
 msgid "Patch_type was %(patch_type)s, but no patch was supplied."
 msgstr ""
 
-#: bzrlib/errors.py:2569
+#: bzrlib/errors.py:2584
 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:2581
+#: bzrlib/errors.py:2596
 msgid "Unsupported entry kind %(kind)s"
 msgstr ""
 
-#: bzrlib/errors.py:2589
+#: bzrlib/errors.py:2604
 msgid "Can't subsume %(other_tree)s into %(tree)s. %(reason)s"
 msgstr ""
 
-#: bzrlib/errors.py:2599
+#: bzrlib/errors.py:2614
 msgid "Subsume target %(other_tree)s needs to be upgraded."
 msgstr ""
 
-#: bzrlib/errors.py:2618
+#: bzrlib/errors.py:2633
 msgid "No such tag: %(tag_name)s"
 msgstr ""
 
-#: bzrlib/errors.py:2626
+#: bzrlib/errors.py:2641
 msgid "Tags not supported by %(branch)s; you may be able to use bzr upgrade."
 msgstr ""
 
-#: bzrlib/errors.py:2635
+#: bzrlib/errors.py:2650
 msgid "Tag %(tag_name)s already exists."
 msgstr ""
 
-#: bzrlib/errors.py:2643
+#: bzrlib/errors.py:2658
 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:2653
+#: bzrlib/errors.py:2668
 msgid ""
 "The URL for bug tracker \"%(abbreviation)s\" doesn't contain {id}: %(url)s"
 msgstr ""
 
-#: bzrlib/errors.py:2663
+#: bzrlib/errors.py:2678
 msgid ""
 "Cannot find registered bug tracker called %(abbreviation)s on %(branch)s"
 msgstr ""
 
-#: bzrlib/errors.py:2673
+#: bzrlib/errors.py:2688
 msgid "Invalid line in bugs property: '%(line)s'"
 msgstr ""
 
-#: bzrlib/errors.py:2681
+#: bzrlib/errors.py:2696
 msgid "Invalid bug status: '%(status)s'"
 msgstr ""
 
-#: bzrlib/errors.py:2689
+#: bzrlib/errors.py:2704
 msgid "Could not understand response from smart server: %(response_tuple)r"
 msgstr ""
 
-#: bzrlib/errors.py:2728
+#: bzrlib/errors.py:2743
 msgid "Server sent an unexpected error: %(error_tuple)r"
 msgstr ""
 
-#: bzrlib/errors.py:2747
+#: bzrlib/errors.py:2762
 msgid "Unrecognised container format: %(container_format)r"
 msgstr ""
 
-#: bzrlib/errors.py:2755
+#: bzrlib/errors.py:2770
 msgid "Unexpected end of container stream"
 msgstr ""
 
-#: bzrlib/errors.py:2760
+#: bzrlib/errors.py:2775
 msgid "Unknown record type: %(record_type)r"
 msgstr ""
 
-#: bzrlib/errors.py:2768
+#: bzrlib/errors.py:2783
 msgid "Invalid record: %(reason)s"
 msgstr ""
 
-#: bzrlib/errors.py:2776
+#: bzrlib/errors.py:2791
 msgid "Container has data after end marker: %(excess)r"
 msgstr ""
 
-#: bzrlib/errors.py:2784
+#: bzrlib/errors.py:2799
 msgid "Container has multiple records with the same name: %(name)s"
 msgstr ""
 
-#: bzrlib/errors.py:2797
+#: bzrlib/errors.py:2812
 msgid "Corrupt or incompatible data stream: %(reason)s"
 msgstr ""
 
-#: bzrlib/errors.py:2805
+#: bzrlib/errors.py:2820
 msgid "SMTP error: %(error)s"
 msgstr ""
 
-#: bzrlib/errors.py:2813
+#: bzrlib/errors.py:2828
 msgid "No message supplied."
 msgstr ""
 
-#: bzrlib/errors.py:2818
+#: bzrlib/errors.py:2833
 msgid "No mail-to address (--mail-to) or output (-o) specified."
 msgstr ""
 
-#: bzrlib/errors.py:2823
+#: bzrlib/errors.py:2838
 msgid "Unknown mail client: %(mail_client)s"
 msgstr ""
 
-#: bzrlib/errors.py:2831
+#: bzrlib/errors.py:2846
 msgid ""
 "Unable to find mail client with the following names: "
 "%(mail_command_list_string)s"
 msgstr ""
 
-#: bzrlib/errors.py:2841
+#: bzrlib/errors.py:2856
 msgid "SMTP connection to %(host)s refused"
 msgstr ""
 
-#: bzrlib/errors.py:2850
+#: bzrlib/errors.py:2865
 msgid "Please specify smtp_server.  No server at default %(host)s."
 msgstr ""
 
-#: bzrlib/errors.py:2864
+#: bzrlib/errors.py:2879
 msgid ""
 "'%(display_url)s' is not in sync with %(target_url)s.  See bzr help sync-for-"
 "reconfigure."
 msgstr ""
 
-#: bzrlib/errors.py:2876
+#: bzrlib/errors.py:2891
 msgid "'%(display_url)s' is already a branch."
 msgstr ""
 
-#: bzrlib/errors.py:2881
+#: bzrlib/errors.py:2896
 msgid "'%(display_url)s' is already a tree."
 msgstr ""
 
-#: bzrlib/errors.py:2886
+#: bzrlib/errors.py:2901
 msgid "'%(display_url)s' is already a checkout."
 msgstr ""
 
-#: bzrlib/errors.py:2891
+#: bzrlib/errors.py:2906
 msgid "'%(display_url)s' is already a lightweight checkout."
 msgstr ""
 
-#: bzrlib/errors.py:2896
+#: bzrlib/errors.py:2911
 msgid "'%(display_url)s' is already using a shared repository."
 msgstr ""
 
-#: bzrlib/errors.py:2901
+#: bzrlib/errors.py:2916
 msgid "'%(display_url)s' is already standalone."
 msgstr ""
 
-#: bzrlib/errors.py:2906
+#: bzrlib/errors.py:2921
 msgid "Shared repository '%(display_url)s' already creates working trees."
 msgstr ""
 
-#: bzrlib/errors.py:2912
+#: bzrlib/errors.py:2927
 msgid ""
 "Shared repository '%(display_url)s' already doesn't create working trees."
 msgstr ""
 
-#: bzrlib/errors.py:2918
+#: bzrlib/errors.py:2933
 msgid "Requested reconfiguration of '%(display_url)s' is not supported."
 msgstr ""
 
-#: bzrlib/errors.py:2923
+#: bzrlib/errors.py:2938
 msgid "No location could be found to bind to at %(display_url)s."
 msgstr ""
 
-#: bzrlib/errors.py:2928
+#: bzrlib/errors.py:2943
 msgid ""
 "Working tree \"%(display_url)s\" has uncommitted changes (See bzr status)."
 "%(more)s"
 msgstr ""
 
-#: bzrlib/errors.py:2947
+#: bzrlib/errors.py:2962
 msgid ""
 "Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
 "%(more)s"
 msgstr ""
 
-#: bzrlib/errors.py:2953
+#: bzrlib/errors.py:2968
 msgid "Variable {%(name)s} is not available."
 msgstr ""
 
-#: bzrlib/errors.py:2961
+#: bzrlib/errors.py:2976
 msgid "No template specified."
 msgstr ""
 
-#: bzrlib/errors.py:2966
+#: bzrlib/errors.py:2981
 msgid "Unable to create symlink %(path_str)son this platform"
 msgstr ""
 
-#: bzrlib/errors.py:2981
+#: bzrlib/errors.py:2996
 msgid ""
 "Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
 "\", \"local\"."
 msgstr ""
 
-#: bzrlib/errors.py:3015
+#: bzrlib/errors.py:3030
 msgid ""
 "Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
 msgstr ""
 
-#: bzrlib/errors.py:3027
+#: bzrlib/errors.py:3042
 msgid "The \"%(config_id)s\" configuration does not exist."
 msgstr ""
 
-#: bzrlib/errors.py:3035
+#: bzrlib/errors.py:3050
 msgid "The \"%(option_name)s\" configuration option does not exist."
 msgstr ""
 
-#: bzrlib/errors.py:3043
+#: bzrlib/errors.py:3058
 msgid "The alias \"%(alias_name)s\" does not exist."
 msgstr ""
 
-#: bzrlib/errors.py:3057
+#: bzrlib/errors.py:3072
 msgid "\"%(alias_name)s\" is not a valid location alias."
 msgstr ""