diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/bzr bzr-2.6.0~bzr6583.6311~ppa4073~precise1/bzr
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/bzr	2013-07-14 19:58:01.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/bzr	2013-07-27 18:29:06.000000000 +0000
@@ -25,7 +25,7 @@
 import warnings
 
 # update this on each release
-_script_version = (2, 6, 0)
+_script_version = (2, 7, 0)
 
 NEED_VERS = (2, 6)
 
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/bzrlib/__init__.py bzr-2.6.0~bzr6583.6311~ppa4073~precise1/bzrlib/__init__.py
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/bzrlib/__init__.py	2013-07-14 19:58:01.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/bzrlib/__init__.py	2013-07-27 18:29:06.000000000 +0000
@@ -55,7 +55,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (2, 6, 0, 'dev', 3)
+version_info = (2, 7, 0, 'dev', 1)
 
 # API compatibility version
 api_minimum_version = (2, 4, 0)
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/bzrlib/tests/blackbox/test_ping.py bzr-2.6.0~bzr6583.6311~ppa4073~precise1/bzrlib/tests/blackbox/test_ping.py
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/bzrlib/tests/blackbox/test_ping.py	2013-07-14 19:58:01.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/bzrlib/tests/blackbox/test_ping.py	2013-07-27 18:29:06.000000000 +0000
@@ -16,6 +16,7 @@
 
 """External tests of 'bzr ping'"""
 
+import bzrlib
 from bzrlib import tests
 
 
@@ -33,5 +34,5 @@
         self.assertLength(1, self.hpss_connections)
         self.assertEquals(out,
             "Response: ('ok', '2')\n"
-            "Headers: {'Software version': '2.6.0dev3'}\n")
+            "Headers: {'Software version': '%s'}\n" % (bzrlib.version_string,))
         self.assertEquals(err, "")
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/debian/bzr-builder.manifest bzr-2.6.0~bzr6583.6311~ppa4073~precise1/debian/bzr-builder.manifest
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/debian/bzr-builder.manifest	2013-07-14 20:00:59.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/debian/bzr-builder.manifest	2013-07-27 18:32:27.000000000 +0000
@@ -1,4 +1,4 @@
-# bzr-builder format 0.3 deb-version {debupstream-base}bzr6581.6311~ppa4073
-lp:bzr revid:pqm@pqm.ubuntu.com-20130714105928-78j748r1djstxmo1
+# bzr-builder format 0.3 deb-version {debupstream-base}bzr6583.6311~ppa4073
+lp:bzr revid:pqm@pqm.ubuntu.com-20130727135535-q57c30gcaxa784mf
 merge packaging lp:~debian-bazaar/bzr/2.6 revid:a.starr.b@gmail.com-20130520231704-wssi5p6ovc8zt3p3
 merge translations lp:~bzr-core/bzr/bzr-translations-export revid:launchpad_translations_on_behalf_of_bzr-core-20130711043039-h25jh448w7lqi3p7
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/debian/changelog bzr-2.6.0~bzr6583.6311~ppa4073~precise1/debian/changelog
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/debian/changelog	2013-07-14 20:00:59.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/debian/changelog	2013-07-27 18:32:27.000000000 +0000
@@ -1,8 +1,8 @@
-bzr (2.6.0~bzr6581.6311~ppa4073~precise1) precise; urgency=low
+bzr (2.6.0~bzr6583.6311~ppa4073~precise1) precise; urgency=low
 
   * Auto build.
 
- -- Launchpad Package Builder <noreply@launchpad.net>  Sun, 14 Jul 2013 20:00:59 +0000
+ -- Launchpad Package Builder <noreply@launchpad.net>  Sat, 27 Jul 2013 18:32:27 +0000
 
 bzr (2.6.0~bzr6574-1) unstable; urgency=low
 
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/developers/releasing.txt bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/developers/releasing.txt
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/developers/releasing.txt	2013-07-14 19:58:01.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/developers/releasing.txt	2013-07-27 18:29:06.000000000 +0000
@@ -53,7 +53,7 @@
    or improvements.
 
 #. stable releases: name ``x.y.z`` where ``x.y.`` is the series and ``z``
-   starts at 1 and is incremented. These releases are targeted at people
+   starts at 0 and is incremented. These releases are targeted at people
    that want bugfixes only and no new features.
 
 
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/en/index.txt bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/en/index.txt
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/en/index.txt	2013-07-14 19:58:01.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/en/index.txt	2013-07-27 18:29:06.000000000 +0000
@@ -10,7 +10,7 @@
 .. toctree::
    :maxdepth: 1
 
-   whats-new/whats-new-in-2.6
+   whats-new/whats-new-in-2.7
    user-guide/index
    tutorials/index
    quick-reference/index
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/en/release-notes/bzr-2.6.txt bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/en/release-notes/bzr-2.6.txt
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/en/release-notes/bzr-2.6.txt	2013-07-14 19:58:01.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/en/release-notes/bzr-2.6.txt	2013-07-27 18:29:06.000000000 +0000
@@ -8,13 +8,23 @@
 bzr 2.6b3
 #########
 
-:2.6b3: NOT RELEASED YET
+:Codename: Surprise
+:2.6.0: 2013-07-27
+
+This release marks the start of a new long-term-stable series. From here, we
+will only make bugfix releases on the 2.6 series (2.6.1, etc), while 2.7
+will become our new development series.
+
+This is a bugfix and polish release over the 2.5 series, with a large number
+of bugs fixed (~50 for the 2.6 series alone).
+
+All known fixed bugs are included here.
+
+Users are encouraged to upgrade from the other stable series.
 
 External Compatibility Breaks
 *****************************
 
-.. These may require users to change the way they use Bazaar.
-
 * ``bzr lp-propose --approve`` now also adds an "Approve" vote to the merge
   proposal.  (Jonathan Lange)
 
@@ -28,6 +38,8 @@
   context (i.e. showing lines that have not changed).  Also available as the 
   named parameter 'context_lines' to bzrlib.diff.internal_diff(). (Paul Nixon)
 
+* The 'grep' plugin is now shipped with bzr. (Jelmer Vernooij)
+
 * The 'ping' plugin is now shipped with bzr. (Jelmer Vernooij)
 
 Improvements
@@ -80,7 +92,7 @@
   instead of failing. It's useless but harmless. (Vincent Ladeuil, #1022160)
 
 * When a missing referenced chk root error is encountered, bzr now suggests
-  running ``bzr reconcile --canonicalize-chks``. (Jelmer Vernooij, #1021537)
+  running ``bzr reconcile --canonicalize-chks``. (Jelmer Vernooij)
 
 * When pushing a specific revision, create the new working tree at
   that revision. (#484516, Neil Martinsen-Burrell)
@@ -88,16 +100,13 @@
 Documentation
 *************
 
-.. Improved or updated documentation.
-
 * Clarify ``bzr config`` usages especially around other option references
   expansion. (Vincent Ladeuil, #996401)
 
 API Changes
 ***********
 
-.. Changes that may require updates in plugins or other code that uses
-   bzrlib.
+* None.
 
 Internals
 *********
@@ -147,8 +156,6 @@
 * New option ``--overwrite-tags`` for ``bzr pull`` and ``bzr push``.
   (Jelmer Vernooij, #681792)
 
-* The 'grep' plugin is now shipped with bzr. (Jelmer Vernooij)
-
 Improvements
 ************
 
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/en/release-notes/bzr-2.7.txt bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/en/release-notes/bzr-2.7.txt
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/en/release-notes/bzr-2.7.txt	1970-01-01 00:00:00.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/en/release-notes/bzr-2.7.txt	2013-07-27 18:29:06.000000000 +0000
@@ -0,0 +1,61 @@
+####################
+Bazaar Release Notes
+####################
+
+.. toctree::
+   :maxdepth: 1
+
+bzr 2.7b1
+#########
+
+:2.7b1: NOT RELEASED YET
+
+External Compatibility Breaks
+*****************************
+
+.. These may require users to change the way they use Bazaar.
+
+New Features
+************
+
+.. New commands, options, etc that users may wish to try out.
+
+Improvements
+************
+
+.. Improvements to existing commands, especially improved performance 
+   or memory usage, or better results.
+
+Bug Fixes
+*********
+
+.. Fixes for situations where bzr would previously crash or give incorrect
+   or undesirable results.
+
+Documentation
+*************
+
+.. Improved or updated documentation.
+
+API Changes
+***********
+
+.. Changes that may require updates in plugins or other code that uses
+   bzrlib.
+
+Internals
+*********
+
+.. Major internal changes, unlikely to be visible to users or plugin 
+   developers, but interesting for bzr developers.
+
+Testing
+*******
+
+.. Fixes and changes that are only relevant to bzr's test framework and 
+   suite.  This can include new facilities for writing tests, fixes to 
+   spurious test failures and changes to the way things should be tested.
+
+
+..
+   vim: tw=74 ft=rst ff=unix
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/en/whats-new/whats-new-in-2.6.txt bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/en/whats-new/whats-new-in-2.6.txt
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/en/whats-new/whats-new-in-2.6.txt	2013-07-14 19:58:01.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/en/whats-new/whats-new-in-2.6.txt	2013-07-27 18:29:06.000000000 +0000
@@ -2,7 +2,12 @@
 What's New in Bazaar 2.6?
 *************************
 
-Bazaar 2.6 is still under development, and will be released in Auguest 2012.
+Bazaar 2.6 has been released on the 27th of July 2013 and marks the start of
+a new long-trem stable series. From here, we will only make bugfix releases
+on the 2.6 series (2.6.1, etc)d), while 2.7 will become our new development
+series.
+
+
 This document accumulates a high level summary of what's changed.  See the
 :doc:`../release-notes/index` for a full list.
 
@@ -12,12 +17,10 @@
 enhancements within the broader Bazaar world of potential interest to those
 upgrading.
 
-Bazaar 2.5.0 is fully compatible both locally and on the network with 2.0,
+Bazaar 2.6.0 is fully compatible both locally and on the network with 2.0,
 2.1, 2.2, 2.3, 2.4 and 2.5, and can read and write repositories generated by
 all previous versions.
 
-<topics of interest here>
-
 Further information
 *******************
 
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/en/whats-new/whats-new-in-2.7.txt bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/en/whats-new/whats-new-in-2.7.txt
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/doc/en/whats-new/whats-new-in-2.7.txt	1970-01-01 00:00:00.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/doc/en/whats-new/whats-new-in-2.7.txt	2013-07-27 18:29:06.000000000 +0000
@@ -0,0 +1,27 @@
+*************************
+What's New in Bazaar 2.7?
+*************************
+
+Bazaar 2.7 is still under development, and will be released when ready.
+This document accumulates a high level summary of what's changed.  See the
+:doc:`../release-notes/index` for a full list.
+
+<topics of interest here>
+
+Further information
+*******************
+
+For more detailed information on the changes made, see the the
+:doc:`../release-notes/index` for:
+
+* the interim bzr `milestones <https://launchpad.net/bzr/2.7>`_
+* the plugins you use.
+
+For a summary of changes made in earlier releases, see:
+
+* :doc:`whats-new-in-2.1`
+* :doc:`whats-new-in-2.2`
+* :doc:`whats-new-in-2.3`
+* :doc:`whats-new-in-2.4`
+* :doc:`whats-new-in-2.5`
+* :doc:`whats-new-in-2.6`
diff -Nru bzr-2.6.0~bzr6581.6311~ppa4073~precise1/po/bzr.pot bzr-2.6.0~bzr6583.6311~ppa4073~precise1/po/bzr.pot
--- bzr-2.6.0~bzr6581.6311~ppa4073~precise1/po/bzr.pot	2013-07-14 19:58:01.000000000 +0000
+++ bzr-2.6.0~bzr6583.6311~ppa4073~precise1/po/bzr.pot	2013-07-27 18:29:06.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: bzr\n"
 "Report-Msgid-Bugs-To: <bazaar@canonical.com>\n"
-"POT-Creation-Date: 2012-07-10 11:35+0200\n"
+"POT-Creation-Date: 2013-07-27 12:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,40 +22,40 @@
 msgid "skipping {0} (larger than {1} of {2} bytes)"
 msgstr ""
 
-#: bzrlib/branch.py:854
+#: bzrlib/branch.py:872
 msgid "Unstacking"
 msgstr ""
 
-#: bzrlib/branch.py:2955
+#: bzrlib/branch.py:3012
 #, python-format
 msgid "Pushed up to revision %d."
 msgstr ""
 
-#: bzrlib/branch.py:2957
+#: bzrlib/branch.py:3014
 #, python-format
 msgid "%d tag updated."
 msgid_plural "%d tags updated."
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/branch.py:2960
+#: bzrlib/branch.py:3017
 msgid "No new revisions or tags to push."
 msgstr ""
 
-#: bzrlib/branch.py:2962
+#: bzrlib/branch.py:3019
 msgid "No new revisions to push."
 msgstr ""
 
-#: bzrlib/branch.py:2982
+#: bzrlib/branch.py:3039
 msgid "checked branch {0} format {1}"
 msgstr ""
 
-#: bzrlib/branch.py:2985
+#: bzrlib/branch.py:3042
 #, python-format
 msgid "found error:%s"
 msgstr ""
 
-#: bzrlib/builtins.py:251 bzrlib/builtins.py:3045 bzrlib/workingtree.py:323
+#: bzrlib/builtins.py:251 bzrlib/builtins.py:3043 bzrlib/workingtree.py:324
 #, python-format
 msgid "Ignoring files outside view. View is %s"
 msgstr ""
@@ -188,11 +188,11 @@
 msgid "bzr status --revision takes exactly one or two revision specifiers"
 msgstr ""
 
-#: bzrlib/builtins.py:441 bzrlib/builtins.py:5230
+#: bzrlib/builtins.py:441 bzrlib/builtins.py:5229
 msgid "You can only supply one of revision_id or --revision"
 msgstr ""
 
-#: bzrlib/builtins.py:444 bzrlib/builtins.py:5232
+#: bzrlib/builtins.py:444 bzrlib/builtins.py:5231
 msgid "You must supply either --revision or a revision_id"
 msgstr ""
 
@@ -268,8 +268,8 @@
 msgid "--tree and --revision can not be used together"
 msgstr ""
 
-#: bzrlib/builtins.py:688 bzrlib/builtins.py:5986
-msgid "Tags can only be placed on a single revision, not on a range"
+#: bzrlib/builtins.py:688
+msgid "Revision numbers only make sense for single revisions, not ranges"
 msgstr ""
 
 # help of 'tree' option of 'revno' command
@@ -521,60 +521,60 @@
 "master branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1189
-msgid "Need working tree for --show-base."
+#: bzrlib/builtins.py:1188
+msgid "No working tree, ignoring --show-base"
 msgstr ""
 
-#: bzrlib/builtins.py:1205
+#: bzrlib/builtins.py:1204
 msgid "No pull location known or specified."
 msgstr ""
 
-#: bzrlib/builtins.py:1211
+#: bzrlib/builtins.py:1210
 #, python-format
 msgid "Using saved parent location: %s\n"
 msgstr ""
 
-#: bzrlib/builtins.py:1218 bzrlib/builtins.py:4425
+#: bzrlib/builtins.py:1217 bzrlib/builtins.py:4423
 msgid "Cannot use -r with merge directives or bundles"
 msgstr ""
 
-#: bzrlib/builtins.py:1261
+#: bzrlib/builtins.py:1260
 msgid "Update a mirror of this branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1263
+#: bzrlib/builtins.py:1262
 msgid ""
 "The target branch will not have its working tree populated because this\n"
 "is both expensive, and is not supported on remote file systems."
 msgstr ""
 
-#: bzrlib/builtins.py:1266
+#: bzrlib/builtins.py:1265
 msgid ""
 "Some smart servers or protocols *may* put the working tree in place in\n"
 "the future."
 msgstr ""
 
-#: bzrlib/builtins.py:1269
+#: bzrlib/builtins.py:1268
 msgid ""
 "This command only works on branches that have not diverged.  Branches are\n"
 "considered diverged if the destination branch's most recent commit is one\n"
 "that has not been merged (directly or indirectly) by the source branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1273
+#: bzrlib/builtins.py:1272
 msgid ""
 "If branches have diverged, you can use 'bzr push --overwrite' to replace\n"
 "the other branch completely, discarding its unmerged changes."
 msgstr ""
 
-#: bzrlib/builtins.py:1276
+#: bzrlib/builtins.py:1275
 msgid ""
 "If you want to ensure you have the different changes in the other branch,\n"
 "do a merge (see bzr help merge) from the other branch, and commit that.\n"
 "After that you will be able to do a push without '--overwrite'."
 msgstr ""
 
-#: bzrlib/builtins.py:1280
+#: bzrlib/builtins.py:1279
 msgid ""
 "If there is no default push location set, the first push will set it (use\n"
 "--no-remember to avoid setting it).  After that, you can omit the\n"
@@ -582,7 +582,7 @@
 "value will only be saved if the remote location can be accessed."
 msgstr ""
 
-#: bzrlib/builtins.py:1285
+#: bzrlib/builtins.py:1284
 msgid ""
 "The --verbose option will display the revisions pushed using the log_format\n"
 "configuration option. You can use a different format by overriding it with\n"
@@ -591,27 +591,27 @@
 
 # help of 'directory' option of 'dpush' command
 # help of 'directory' option of 'push' command
-#: bzrlib/builtins.py:1296 bzrlib/foreign.py:272
+#: bzrlib/builtins.py:1295 bzrlib/foreign.py:272
 msgid ""
 "Branch to push from, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'use-existing-dir' option of 'push' command
-#: bzrlib/builtins.py:1299
+#: bzrlib/builtins.py:1298
 msgid ""
 "By default push will fail if the target directory exists, but does not "
 "already have a control directory.  This flag will allow push to proceed."
 msgstr ""
 
 # help of 'stacked' option of 'push' command
-#: bzrlib/builtins.py:1304
+#: bzrlib/builtins.py:1303
 msgid ""
 "Create a stacked branch that references the public location of the parent "
 "branch."
 msgstr ""
 
 # help of 'stacked-on' option of 'push' command
-#: bzrlib/builtins.py:1307
+#: bzrlib/builtins.py:1306
 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 "
@@ -620,48 +620,48 @@
 
 # help of 'strict' option of 'dpush' command
 # help of 'strict' option of 'push' command
-#: bzrlib/builtins.py:1312 bzrlib/foreign.py:279
+#: bzrlib/builtins.py:1311 bzrlib/foreign.py:279
 msgid ""
 "Refuse to push if there are uncommitted changes in the working tree, --no-"
 "strict disables the check."
 msgstr ""
 
 # help of 'no-tree' option of 'push' command
-#: bzrlib/builtins.py:1315
+#: bzrlib/builtins.py:1314
 msgid "Don't populate the working tree, even for protocols that support it."
 msgstr ""
 
 # help of 'overwrite-tags' option of 'pull' command
 # help of 'overwrite-tags' option of 'push' command
-#: bzrlib/builtins.py:1318
+#: bzrlib/builtins.py:1317
 msgid "Overwrite tags only."
 msgstr ""
 
-#: bzrlib/builtins.py:1369
+#: bzrlib/builtins.py:1368
 msgid "Could not determine branch to refer to."
 msgstr ""
 
-#: bzrlib/builtins.py:1378
+#: bzrlib/builtins.py:1377
 #, python-format
 msgid ""
 "No push location known or specified. To push to the parent branch (at %s), "
 "use 'bzr push :parent'."
 msgstr ""
 
-#: bzrlib/builtins.py:1384 bzrlib/foreign.py:306
+#: bzrlib/builtins.py:1383 bzrlib/foreign.py:306
 msgid "No push location known or specified."
 msgstr ""
 
-#: bzrlib/builtins.py:1388
+#: bzrlib/builtins.py:1387
 #, python-format
 msgid "Using saved push location: %s"
 msgstr ""
 
-#: bzrlib/builtins.py:1398
+#: bzrlib/builtins.py:1397
 msgid "Create a new branch that is a copy of an existing branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1400
+#: bzrlib/builtins.py:1399
 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 ./"
@@ -672,112 +672,112 @@
 "create ./foo-bar."
 msgstr ""
 
-#: bzrlib/builtins.py:1407
+#: bzrlib/builtins.py:1406
 msgid ""
 "To retrieve the branch as of a particular revision, supply the --revision\n"
 "parameter, as in \"branch foo/bar -r 5\"."
 msgstr ""
 
-#: bzrlib/builtins.py:1410
+#: bzrlib/builtins.py:1409
 msgid "The synonyms 'clone' and 'get' for this command are deprecated."
 msgstr ""
 
 # help of 'no-tree' option of 'branch' command
-#: bzrlib/builtins.py:1420
+#: bzrlib/builtins.py:1419
 msgid "Create a branch without a working-tree."
 msgstr ""
 
 # help of 'switch' option of 'branch' command
-#: bzrlib/builtins.py:1422
+#: bzrlib/builtins.py:1421
 msgid "Switch the checkout in the current directory to the new branch."
 msgstr ""
 
 # help of 'stacked' option of 'branch' command
-#: bzrlib/builtins.py:1425
+#: bzrlib/builtins.py:1424
 msgid ""
 "Create a stacked branch referring to the source branch. The new branch will "
 "depend on the availability of the source branch for all operations."
 msgstr ""
 
 # help of 'standalone' option of 'branch' command
-#: bzrlib/builtins.py:1429
+#: bzrlib/builtins.py:1428
 msgid "Do not use a shared repository, even if available."
 msgstr ""
 
 # help of 'use-existing-dir' option of 'branch' command
-#: bzrlib/builtins.py:1431
+#: bzrlib/builtins.py:1430
 msgid ""
 "By default branch will fail if the target directory exists, but does not "
 "already have a control directory.  This flag will allow branch to proceed."
 msgstr ""
 
 # help of 'bind' option of 'branch' command
-#: bzrlib/builtins.py:1436
+#: bzrlib/builtins.py:1435
 msgid "Bind new branch to from location."
 msgstr ""
 
-#: bzrlib/builtins.py:1483
+#: bzrlib/builtins.py:1482
 #, python-format
 msgid "Target directory \"%s\" already exists."
 msgstr ""
 
-#: bzrlib/builtins.py:1495
+#: bzrlib/builtins.py:1494
 #, python-format
 msgid "Parent of \"%s\" does not exist."
 msgstr ""
 
-#: bzrlib/builtins.py:1514
+#: bzrlib/builtins.py:1513
 msgid "The branch {0} has no revision {1}."
 msgstr ""
 
-#: bzrlib/builtins.py:1529 bzrlib/push.py:53
+#: bzrlib/builtins.py:1528 bzrlib/push.py:53
 #, python-format
 msgid "Created new stacked branch referring to %s."
 msgstr ""
 
-#: bzrlib/builtins.py:1533
+#: bzrlib/builtins.py:1532
 #, python-format
 msgid "Branched %d revision."
 msgid_plural "Branched %d revisions."
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/builtins.py:1538
+#: bzrlib/builtins.py:1537
 #, python-format
 msgid "New branch bound to %s"
 msgstr ""
 
-#: bzrlib/builtins.py:1543 bzrlib/builtins.py:6280
+#: bzrlib/builtins.py:1542 bzrlib/builtins.py:6283
 #, python-format
 msgid "Switched to branch: %s"
 msgstr ""
 
-#: bzrlib/builtins.py:1548
+#: bzrlib/builtins.py:1547
 msgid "List the branches available at the current location."
 msgstr ""
 
-#: bzrlib/builtins.py:1550
+#: bzrlib/builtins.py:1549
 msgid ""
 "This command will print the names of all the branches at the current\n"
 "location."
 msgstr ""
 
 # help of 'recursive' option of 'branches' command
-#: bzrlib/builtins.py:1557
+#: bzrlib/builtins.py:1556
 msgid ""
 "Recursively scan for branches rather than just looking in the specified "
 "location."
 msgstr ""
 
-#: bzrlib/builtins.py:1586
+#: bzrlib/builtins.py:1585
 msgid "(default)"
 msgstr ""
 
-#: bzrlib/builtins.py:1598
+#: bzrlib/builtins.py:1597
 msgid "Create a new checkout of an existing branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1600
+#: bzrlib/builtins.py:1599
 msgid ""
 "If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
 "for\n"
@@ -787,7 +787,7 @@
 "location using SFTP."
 msgstr ""
 
-#: bzrlib/builtins.py:1605
+#: bzrlib/builtins.py:1604
 msgid ""
 "If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
 "will\n"
@@ -799,7 +799,7 @@
 "create ./foo-bar."
 msgstr ""
 
-#: bzrlib/builtins.py:1612
+#: bzrlib/builtins.py:1611
 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 "
@@ -810,7 +810,7 @@
 msgstr ""
 
 # help of 'lightweight' option of 'checkout' command
-#: bzrlib/builtins.py:1622
+#: bzrlib/builtins.py:1621
 msgid ""
 "Perform a lightweight checkout.  Lightweight checkouts depend on access to "
 "the branch for every operation.  Normal checkouts can perform common "
@@ -820,40 +820,40 @@
 
 # help of 'files-from' option of 'branch' command
 # help of 'files-from' option of 'checkout' command
-#: bzrlib/builtins.py:1629
+#: bzrlib/builtins.py:1628
 msgid "Get file contents from this tree."
 msgstr ""
 
 # help of 'hardlink' option of 'branch' command
 # help of 'hardlink' option of 'checkout' command
-#: bzrlib/builtins.py:1631
+#: bzrlib/builtins.py:1630
 msgid "Hard-link working tree files where possible."
 msgstr ""
 
-#: bzrlib/builtins.py:1672
+#: bzrlib/builtins.py:1671
 msgid ""
 "Show list of renamed files.\n"
 "    "
 msgstr ""
 
-#: bzrlib/builtins.py:1700
+#: bzrlib/builtins.py:1699
 msgid "Update a working tree to a new revision."
 msgstr ""
 
-#: bzrlib/builtins.py:1702
+#: bzrlib/builtins.py:1701
 msgid ""
 "This will perform a merge of the destination revision (the tip of the\n"
 "branch, or the specified revision) into the working tree, and then make\n"
 "that revision the basis revision for the working tree.  "
 msgstr ""
 
-#: bzrlib/builtins.py:1706
+#: bzrlib/builtins.py:1705
 msgid ""
 "You can use this to visit an older revision, or to update a working tree\n"
 "that is out of date from its branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1709
+#: bzrlib/builtins.py:1708
 msgid ""
 "If there are any uncommitted changes in the tree, they will be carried\n"
 "across and remain as uncommitted changes after the update.  To discard\n"
@@ -861,13 +861,13 @@
 "with the changes brought in by the change in basis revision."
 msgstr ""
 
-#: bzrlib/builtins.py:1714
+#: bzrlib/builtins.py:1713
 msgid ""
 "If the tree's branch is bound to a master branch, bzr will also update\n"
 "the branch from the master."
 msgstr ""
 
-#: bzrlib/builtins.py:1717
+#: bzrlib/builtins.py:1716
 msgid ""
 "You cannot update just a single file or directory, because each Bazaar\n"
 "working tree has just a single basis revision.  If you want to restore a\n"
@@ -877,100 +877,100 @@
 "out the old content of that file to a new location."
 msgstr ""
 
-#: bzrlib/builtins.py:1724
+#: bzrlib/builtins.py:1723
 msgid ""
 "The 'dir' argument, if given, must be the location of the root of a\n"
 "working tree to update.  By default, the working tree that contains the \n"
 "current working directory is used."
 msgstr ""
 
-#: bzrlib/builtins.py:1740
+#: bzrlib/builtins.py:1739
 msgid "bzr update --revision takes exactly one revision"
 msgstr ""
 
-#: bzrlib/builtins.py:1748
+#: bzrlib/builtins.py:1747
 msgid "bzr update can only update a whole tree, not a file or subdirectory"
 msgstr ""
 
-#: bzrlib/builtins.py:1779
+#: bzrlib/builtins.py:1778
 msgid "Tree is up to date at revision {0} of branch {1}"
 msgstr ""
 
-#: bzrlib/builtins.py:1795
+#: bzrlib/builtins.py:1794
 #, python-format
 msgid ""
 "branch has no revision %s\n"
 "bzr update --revision only works for a revision in the branch history"
 msgstr ""
 
-#: bzrlib/builtins.py:1801
+#: bzrlib/builtins.py:1800
 msgid "Updated to revision {0} of branch {1}"
 msgstr ""
 
-#: bzrlib/builtins.py:1805
+#: bzrlib/builtins.py:1804
 msgid ""
 "Your local commits will now show as pending merges with 'bzr status', and "
 "can be committed with 'bzr commit'."
 msgstr ""
 
-#: bzrlib/builtins.py:1814
+#: bzrlib/builtins.py:1813
 msgid "Show information about a working tree, branch or repository."
 msgstr ""
 
-#: bzrlib/builtins.py:1816
+#: bzrlib/builtins.py:1815
 msgid ""
 "This command will show all known locations and formats associated to the\n"
 "tree, branch or repository."
 msgstr ""
 
-#: bzrlib/builtins.py:1819
+#: bzrlib/builtins.py:1818
 msgid ""
 "In verbose mode, statistical information is included with each report.\n"
 "To see extended statistic information, use a verbosity level of 2 or\n"
 "higher by specifying the verbose option multiple times, e.g. -vv."
 msgstr ""
 
-#: bzrlib/builtins.py:1823
+#: bzrlib/builtins.py:1822
 msgid "Branches and working trees will also report any missing revisions."
 msgstr ""
 
-#: bzrlib/builtins.py:1825 bzrlib/builtins.py:3744 bzrlib/builtins.py:4885
-#: bzrlib/builtins.py:6466
+#: bzrlib/builtins.py:1824 bzrlib/builtins.py:3742 bzrlib/builtins.py:4883
+#: bzrlib/builtins.py:6469
 msgid ":Examples:"
 msgstr ""
 
-#: bzrlib/builtins.py:1827
+#: bzrlib/builtins.py:1826
 msgid "  Display information on the format and related locations:"
 msgstr ""
 
-#: bzrlib/builtins.py:1829
+#: bzrlib/builtins.py:1828
 msgid "    bzr info"
 msgstr ""
 
-#: bzrlib/builtins.py:1831
+#: bzrlib/builtins.py:1830
 msgid ""
 "  Display the above together with extended format information and\n"
 "  basic statistics (like the number of files in the working tree and\n"
 "  number of revisions in the branch and repository):"
 msgstr ""
 
-#: bzrlib/builtins.py:1835
+#: bzrlib/builtins.py:1834
 msgid "    bzr info -v"
 msgstr ""
 
-#: bzrlib/builtins.py:1837
+#: bzrlib/builtins.py:1836
 msgid "  Display the above together with number of committers to the branch:"
 msgstr ""
 
-#: bzrlib/builtins.py:1839
+#: bzrlib/builtins.py:1838
 msgid "    bzr info -vv"
 msgstr ""
 
-#: bzrlib/builtins.py:1858
+#: bzrlib/builtins.py:1857
 msgid "Remove files or directories."
 msgstr ""
 
-#: bzrlib/builtins.py:1860
+#: bzrlib/builtins.py:1859
 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"
@@ -980,55 +980,44 @@
 msgstr ""
 
 # help of 'new' option of 'remove' command
-#: bzrlib/builtins.py:1868
+#: bzrlib/builtins.py:1867
 msgid "Only remove files that have never been committed."
 msgstr ""
 
 # help of 'file-deletion-strategy' option of 'remove' command
-#: bzrlib/builtins.py:1870
+#: bzrlib/builtins.py:1869
 msgid "The file deletion mode to be used."
 msgstr ""
 
 # title of 'file-deletion-strategy' option of 'remove' command
-#: bzrlib/builtins.py:1871
+#: bzrlib/builtins.py:1870
 msgid "Deletion Strategy"
 msgstr ""
 
 # help of 'file-deletion-strategy=safe' option of 'remove' command
-#: bzrlib/builtins.py:1872
+#: bzrlib/builtins.py:1871
 msgid "Backup changed files (default)."
 msgstr ""
 
 # help of 'file-deletion-strategy=keep' option of 'remove' command
-#: bzrlib/builtins.py:1873
+#: bzrlib/builtins.py:1872
 msgid "Delete from bzr but leave the working copy."
 msgstr ""
 
 # help of 'file-deletion-strategy=no-backup' option of 'remove' command
-#: bzrlib/builtins.py:1874
+#: bzrlib/builtins.py:1873
 msgid "Don't backup changed files."
 msgstr ""
 
-# help of 'file-deletion-strategy=force' option of 'remove' command
-#: bzrlib/builtins.py:1875
-msgid ""
-"Delete all the specified files, even if they can not be recovered and even "
-"if they are non-empty directories. (deprecated, use no-backup)"
-msgstr ""
-
-#: bzrlib/builtins.py:1884
-msgid "(The --force option is deprecated, rather use --no-backup in future.)"
-msgstr ""
-
-#: bzrlib/builtins.py:1901
+#: bzrlib/builtins.py:1894
 msgid "No matching files."
 msgstr ""
 
-#: bzrlib/builtins.py:1962
+#: bzrlib/builtins.py:1955
 msgid "Reconcile bzr metadata in a branch."
 msgstr ""
 
-#: bzrlib/builtins.py:1964
+#: bzrlib/builtins.py:1957
 msgid ""
 "This can correct data mismatches that may have been caused by\n"
 "previous ghost operations or bzr upgrades. You should only\n"
@@ -1036,7 +1025,7 @@
 "advises you to run it."
 msgstr ""
 
-#: bzrlib/builtins.py:1969
+#: bzrlib/builtins.py:1962
 msgid ""
 "If a second branch is provided, cross-branch reconciliation is\n"
 "also attempted, which will check that data like the tree root\n"
@@ -1044,13 +1033,13 @@
 "correctly in both branches."
 msgstr ""
 
-#: bzrlib/builtins.py:1974
+#: bzrlib/builtins.py:1967
 msgid ""
 "At the same time it is run it may recompress data resulting in\n"
 "a potential saving in disk space or performance gain."
 msgstr ""
 
-#: bzrlib/builtins.py:1977
+#: bzrlib/builtins.py:1970
 msgid "The branch *MUST* be on a listable system such as local disk or sftp."
 msgstr ""
 
@@ -1060,7 +1049,7 @@
 # help of 'format=default' option of 'init-repository' command
 # help of 'format=2a' option of 'upgrade' command
 # help of 'format=default' option of 'upgrade' command
-#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
+#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
 msgid ""
 "Format for the bzr 2.0 series.\n"
 "Uses group-compress storage.\n"
@@ -1070,7 +1059,7 @@
 # help of 'format=pack-0.92' option of 'init' command
 # help of 'format=pack-0.92' option of 'init-repository' command
 # help of 'format=pack-0.92' option of 'upgrade' command
-#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
+#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
 msgid ""
 "Pack-based format used in 1.x series. Introduced in 0.92. Interoperates with "
 "bzr repositories before 0.92 but cannot be read by bzr < 0.92. "
@@ -1079,21 +1068,21 @@
 # help of 'format=development-colo' option of 'init' command
 # help of 'format=development-colo' option of 'init-repository' command
 # help of 'format=development-colo' option of 'upgrade' command
-#: bzrlib/builtins.py:2044 bzrlib/builtins.py:2162 bzrlib/builtins.py:3779
+#: bzrlib/builtins.py:2037 bzrlib/builtins.py:2155 bzrlib/builtins.py:3777
 msgid "The 2a format with experimental support for colocated branches.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:2045
+#: bzrlib/builtins.py:2038
 msgid "Make a directory into a versioned branch."
 msgstr ""
 
-#: bzrlib/builtins.py:2047
+#: bzrlib/builtins.py:2040
 msgid ""
 "Use this to create an empty branch, or before importing an\n"
 "existing project."
 msgstr ""
 
-#: bzrlib/builtins.py:2050
+#: bzrlib/builtins.py:2043
 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"
@@ -1101,17 +1090,17 @@
 "in the .bzr directory."
 msgstr ""
 
-#: bzrlib/builtins.py:2055
+#: bzrlib/builtins.py:2048
 msgid ""
 "If there is already a branch at the location but it has no working tree,\n"
 "the tree can be populated with 'bzr checkout'."
 msgstr ""
 
-#: bzrlib/builtins.py:2058
+#: bzrlib/builtins.py:2051
 msgid "Recipe for importing a tree of files::"
 msgstr ""
 
-#: bzrlib/builtins.py:2060
+#: bzrlib/builtins.py:2053
 msgid ""
 "    cd ~/project\n"
 "    bzr init\n"
@@ -1122,51 +1111,51 @@
 
 # help of 'create-prefix' option of 'init' command
 # help of 'create-prefix' option of 'push' command
-#: bzrlib/builtins.py:2071
+#: bzrlib/builtins.py:2064
 msgid "Create the path leading up to the branch if it does not already exist."
 msgstr ""
 
 # help of 'format' option of 'init' command
-#: bzrlib/builtins.py:2074
+#: bzrlib/builtins.py:2067
 msgid "Specify a format for this branch. See \"help formats\"."
 msgstr ""
 
 # help of 'append-revisions-only' option of 'init' command
-#: bzrlib/builtins.py:2082
+#: bzrlib/builtins.py:2075
 msgid "Never change revnos or the existing log.  Append revisions to it only."
 msgstr ""
 
 # help of 'no-tree' option of 'init' command
-#: bzrlib/builtins.py:2085
+#: bzrlib/builtins.py:2078
 msgid "Create a branch without a working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:2105 bzrlib/push.py:110
+#: bzrlib/builtins.py:2098 bzrlib/push.py:110
 #, python-format
 msgid ""
 "Parent directory of %s does not exist.\n"
 "You may supply --create-prefix to create all leading parent directories."
 msgstr ""
 
-#: bzrlib/builtins.py:2139
+#: bzrlib/builtins.py:2132
 msgid ""
 "This branch format cannot be set to append-revisions-only.  Try --default."
 msgstr ""
 
-#: bzrlib/builtins.py:2150
+#: bzrlib/builtins.py:2143
 msgid "Created a {0} (format: {1})\n"
 msgstr ""
 
-#: bzrlib/builtins.py:2159
+#: bzrlib/builtins.py:2152
 #, python-format
 msgid "Using shared repository: %s\n"
 msgstr ""
 
-#: bzrlib/builtins.py:2163
+#: bzrlib/builtins.py:2156
 msgid "Create a shared repository for branches to share storage space."
 msgstr ""
 
-#: bzrlib/builtins.py:2165
+#: bzrlib/builtins.py:2158
 msgid ""
 "New branches created under the repository directory will store their\n"
 "revisions in the repository, not in the branch directory.  For branches\n"
@@ -1174,7 +1163,7 @@
 "speeds up the creation of new branches."
 msgstr ""
 
-#: bzrlib/builtins.py:2170
+#: bzrlib/builtins.py:2163
 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"
@@ -1184,23 +1173,23 @@
 "branches, such as on a server."
 msgstr ""
 
-#: bzrlib/builtins.py:2177
+#: bzrlib/builtins.py:2170
 msgid ""
 ":Examples:\n"
 "    Create a shared repository holding just branches::"
 msgstr ""
 
-#: bzrlib/builtins.py:2180
+#: bzrlib/builtins.py:2173
 msgid ""
 "        bzr init-repo --no-trees repo\n"
 "        bzr init repo/trunk"
 msgstr ""
 
-#: bzrlib/builtins.py:2183
+#: bzrlib/builtins.py:2176
 msgid "    Make a lightweight checkout elsewhere::"
 msgstr ""
 
-#: bzrlib/builtins.py:2185
+#: bzrlib/builtins.py:2178
 msgid ""
 "        bzr checkout --lightweight repo/trunk trunk-checkout\n"
 "        cd trunk-checkout\n"
@@ -1208,26 +1197,26 @@
 msgstr ""
 
 # help of 'format' option of 'init-repository' command
-#: bzrlib/builtins.py:2193
+#: bzrlib/builtins.py:2186
 msgid ""
 "Specify a format for this repository. See \"bzr help formats\" for details."
 msgstr ""
 
 # title of 'format' option of 'init-repository' command
-#: bzrlib/builtins.py:2197
+#: bzrlib/builtins.py:2190
 msgid "Repository format"
 msgstr ""
 
 # help of 'no-trees' option of 'init-repository' command
-#: bzrlib/builtins.py:2199
+#: bzrlib/builtins.py:2192
 msgid "Branches in the repository will default to not having a working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:2225
+#: bzrlib/builtins.py:2218
 msgid "Show differences in the working tree, between revisions or branches."
 msgstr ""
 
-#: bzrlib/builtins.py:2227
+#: bzrlib/builtins.py:2220
 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"
@@ -1237,13 +1226,13 @@
 "given."
 msgstr ""
 
-#: bzrlib/builtins.py:2234
+#: bzrlib/builtins.py:2227
 msgid ""
 "\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
 "produces patches suitable for \"patch -p1\"."
 msgstr ""
 
-#: bzrlib/builtins.py:2237
+#: bzrlib/builtins.py:2230
 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"
@@ -1253,7 +1242,7 @@
 "in the range."
 msgstr ""
 
-#: bzrlib/builtins.py:2244
+#: bzrlib/builtins.py:2237
 msgid ""
 ":Exit values:\n"
 "    1 - changed\n"
@@ -1262,113 +1251,113 @@
 "    0 - no change"
 msgstr ""
 
-#: bzrlib/builtins.py:2250
+#: bzrlib/builtins.py:2243
 msgid ""
 ":Examples:\n"
 "    Shows the difference in the working tree versus the last commit::"
 msgstr ""
 
-#: bzrlib/builtins.py:2253
+#: bzrlib/builtins.py:2246
 msgid "        bzr diff"
 msgstr ""
 
-#: bzrlib/builtins.py:2255
+#: bzrlib/builtins.py:2248
 msgid "    Difference between the working tree and revision 1::"
 msgstr ""
 
-#: bzrlib/builtins.py:2257
+#: bzrlib/builtins.py:2250
 msgid "        bzr diff -r1"
 msgstr ""
 
-#: bzrlib/builtins.py:2259
+#: bzrlib/builtins.py:2252
 msgid "    Difference between revision 3 and revision 1::"
 msgstr ""
 
-#: bzrlib/builtins.py:2261
+#: bzrlib/builtins.py:2254
 msgid "        bzr diff -r1..3"
 msgstr ""
 
-#: bzrlib/builtins.py:2263
+#: bzrlib/builtins.py:2256
 msgid "    Difference between revision 3 and revision 1 for branch xxx::"
 msgstr ""
 
-#: bzrlib/builtins.py:2265
+#: bzrlib/builtins.py:2258
 msgid "        bzr diff -r1..3 xxx"
 msgstr ""
 
-#: bzrlib/builtins.py:2267
+#: bzrlib/builtins.py:2260
 msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
 msgstr ""
 
-#: bzrlib/builtins.py:2269
+#: bzrlib/builtins.py:2262
 msgid "        bzr diff -c2"
 msgstr ""
 
-#: bzrlib/builtins.py:2271
+#: bzrlib/builtins.py:2264
 msgid ""
 "    To see the changes introduced by revision X::\n"
 "    \n"
 "        bzr diff -cX"
 msgstr ""
 
-#: bzrlib/builtins.py:2275
+#: bzrlib/builtins.py:2268
 msgid ""
 "    Note that in the case of a merge, the -c option shows the changes\n"
 "    compared to the left hand parent. To see the changes against\n"
 "    another parent, use::"
 msgstr ""
 
-#: bzrlib/builtins.py:2279
+#: bzrlib/builtins.py:2272
 msgid "        bzr diff -r<chosen_parent>..X"
 msgstr ""
 
-#: bzrlib/builtins.py:2281
+#: bzrlib/builtins.py:2274
 msgid ""
 "    The changes between the current revision and the previous revision\n"
 "    (equivalent to -c-1 and -r-2..-1)"
 msgstr ""
 
-#: bzrlib/builtins.py:2284
+#: bzrlib/builtins.py:2277
 msgid "        bzr diff -r-2.."
 msgstr ""
 
-#: bzrlib/builtins.py:2286
+#: bzrlib/builtins.py:2279
 msgid "    Show just the differences for file NEWS::"
 msgstr ""
 
-#: bzrlib/builtins.py:2288
+#: bzrlib/builtins.py:2281
 msgid "        bzr diff NEWS"
 msgstr ""
 
-#: bzrlib/builtins.py:2290
+#: bzrlib/builtins.py:2283
 msgid "    Show the differences in working tree xxx for file NEWS::"
 msgstr ""
 
-#: bzrlib/builtins.py:2292
+#: bzrlib/builtins.py:2285
 msgid "        bzr diff xxx/NEWS"
 msgstr ""
 
-#: bzrlib/builtins.py:2294
+#: bzrlib/builtins.py:2287
 msgid "    Show the differences from branch xxx to this working tree:"
 msgstr ""
 
-#: bzrlib/builtins.py:2296
+#: bzrlib/builtins.py:2289
 msgid "        bzr diff --old xxx"
 msgstr ""
 
-#: bzrlib/builtins.py:2298
+#: bzrlib/builtins.py:2291
 msgid "    Show the differences between two branches for file NEWS::"
 msgstr ""
 
-#: bzrlib/builtins.py:2300
+#: bzrlib/builtins.py:2293
 msgid "        bzr diff --old xxx --new yyy NEWS"
 msgstr ""
 
-#: bzrlib/builtins.py:2302
+#: bzrlib/builtins.py:2295
 msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
 msgstr ""
 
-#: bzrlib/builtins.py:2304
+#: bzrlib/builtins.py:2297
 msgid ""
 "        bzr diff --prefix old/:new/\n"
 "        \n"
@@ -1378,84 +1367,89 @@
 msgstr ""
 
 # help of 'diff-options' option of 'diff' command
-#: bzrlib/builtins.py:2314
+#: bzrlib/builtins.py:2307
 msgid "Pass these options to the external diff program."
 msgstr ""
 
 # help of 'prefix' option of 'diff' command
-#: bzrlib/builtins.py:2317
+#: bzrlib/builtins.py:2310
 msgid ""
 "Set prefixes added to old and new filenames, as two values separated by a "
 "colon. (eg \"old/:new/\")."
 msgstr ""
 
 # help of 'old' option of 'diff' command
-#: bzrlib/builtins.py:2320
+#: bzrlib/builtins.py:2313
 msgid "Branch/tree to compare from."
 msgstr ""
 
 # help of 'new' option of 'diff' command
-#: bzrlib/builtins.py:2324
+#: bzrlib/builtins.py:2317
 msgid "Branch/tree to compare to."
 msgstr ""
 
 # help of 'using' option of 'diff' command
-#: bzrlib/builtins.py:2330
+#: bzrlib/builtins.py:2323
 msgid "Use this command to compare files."
 msgstr ""
 
 # help of 'format' option of 'diff' command
-#: bzrlib/builtins.py:2335
+#: bzrlib/builtins.py:2328
 msgid "Diff format to use."
 msgstr ""
 
 # title of 'format' option of 'diff' command
-#: bzrlib/builtins.py:2337
+#: bzrlib/builtins.py:2330
 msgid "Diff format"
 msgstr ""
 
-#: bzrlib/builtins.py:2359
+# help of 'context' option of 'diff' command
+#: bzrlib/builtins.py:2332
+msgid "How many lines of context to show."
+msgstr ""
+
+#: bzrlib/builtins.py:2357
 msgid "--prefix expects two values separated by a colon (eg \"old/:new/\")"
 msgstr ""
 
-#: bzrlib/builtins.py:2363
+#: bzrlib/builtins.py:2361
 msgid "bzr diff --revision takes exactly one or two revision specifiers"
 msgstr ""
 
-#: bzrlib/builtins.py:2368 bzrlib/builtins.py:2765 bzrlib/builtins.py:2778
-#: bzrlib/builtins.py:2786 bzrlib/builtins.py:4959
+#: bzrlib/builtins.py:2366 bzrlib/builtins.py:2763 bzrlib/builtins.py:2776
+#: bzrlib/builtins.py:2784 bzrlib/builtins.py:4957
 msgid "{0} and {1} are mutually exclusive"
 msgstr ""
 
-#: bzrlib/builtins.py:2388
+#: bzrlib/builtins.py:2386
 msgid ""
 "List files deleted in the working tree.\n"
 "    "
 msgstr ""
 
-#: bzrlib/builtins.py:2465
+#: bzrlib/builtins.py:2463
 msgid "Show the tree root directory."
 msgstr ""
 
-#: bzrlib/builtins.py:2467
+#: bzrlib/builtins.py:2465
 msgid ""
 "The root is the nearest enclosing directory with a .bzr control\n"
 "directory."
 msgstr ""
 
-#: bzrlib/builtins.py:2482
+#: bzrlib/builtins.py:2480
 msgid "The limit argument must be an integer."
 msgstr ""
 
-#: bzrlib/builtins.py:2490
+#: bzrlib/builtins.py:2488
 msgid "The levels argument must be an integer."
 msgstr ""
 
-#: bzrlib/builtins.py:2495
+#: bzrlib/builtins.py:2493
 msgid "Show historical log for a branch or subset of a branch."
 msgstr ""
 
-#: bzrlib/builtins.py:2497
+#: bzrlib/builtins.py:2495
 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"
@@ -1463,14 +1457,14 @@
 "Here are some simple examples::"
 msgstr ""
 
-#: bzrlib/builtins.py:2502
+#: bzrlib/builtins.py:2500
 msgid ""
 "  bzr log                       log the current branch\n"
 "  bzr log foo.py                log a file in its branch\n"
 "  bzr log http://server/branch  log a branch on a server"
 msgstr ""
 
-#: bzrlib/builtins.py:2506
+#: bzrlib/builtins.py:2504
 msgid ""
 "The filtering, ordering and information shown for each revision can\n"
 "be controlled as explained below. By default, all revisions are\n"
@@ -1480,11 +1474,11 @@
 "were merged."
 msgstr ""
 
-#: bzrlib/builtins.py:2513
+#: bzrlib/builtins.py:2511
 msgid ":Output control:"
 msgstr ""
 
-#: bzrlib/builtins.py:2515
+#: bzrlib/builtins.py:2513
 msgid ""
 "  The log format controls how information about each revision is\n"
 "  displayed. The standard log formats are called ``long``, ``short``\n"
@@ -1492,13 +1486,13 @@
 "  for more details on log formats."
 msgstr ""
 
-#: bzrlib/builtins.py:2520
+#: bzrlib/builtins.py:2518
 msgid ""
 "  The following options can be used to control what information is\n"
 "  displayed::"
 msgstr ""
 
-#: bzrlib/builtins.py:2523
+#: bzrlib/builtins.py:2521
 msgid ""
 "    -l N        display a maximum of N revisions\n"
 "    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
@@ -1507,25 +1501,25 @@
 "    --show-ids  display revision-ids (and file-ids), not just revnos"
 msgstr ""
 
-#: bzrlib/builtins.py:2529
+#: bzrlib/builtins.py:2527
 msgid ""
 "  Note that the default number of levels to display is a function of the\n"
 "  log format. If the -n option is not used, the standard log formats show\n"
 "  just the top level (mainline)."
 msgstr ""
 
-#: bzrlib/builtins.py:2533
+#: bzrlib/builtins.py:2531
 msgid ""
 "  Status summaries are shown using status flags like A, M, etc. To see\n"
 "  the changes explained using words like ``added`` and ``modified``\n"
 "  instead, use the -vv option."
 msgstr ""
 
-#: bzrlib/builtins.py:2537
+#: bzrlib/builtins.py:2535
 msgid ":Ordering control:"
 msgstr ""
 
-#: bzrlib/builtins.py:2539
+#: bzrlib/builtins.py:2537
 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"
@@ -1533,17 +1527,17 @@
 "  display revisions like --reverse does when it can."
 msgstr ""
 
-#: bzrlib/builtins.py:2544
+#: bzrlib/builtins.py:2542
 msgid ":Revision filtering:"
 msgstr ""
 
-#: bzrlib/builtins.py:2546
+#: bzrlib/builtins.py:2544
 msgid ""
 "  The -r option can be used to specify what revision or range of revisions\n"
 "  to filter against. The various forms are shown below::"
 msgstr ""
 
-#: bzrlib/builtins.py:2549
+#: bzrlib/builtins.py:2547
 msgid ""
 "    -rX      display revision X\n"
 "    -rX..    display revision X and later\n"
@@ -1551,13 +1545,13 @@
 "    -rX..Y   display from X to Y inclusive"
 msgstr ""
 
-#: bzrlib/builtins.py:2554
+#: bzrlib/builtins.py:2552
 msgid ""
 "  See ``bzr help revisionspec`` for details on how to specify X and Y.\n"
 "  Some common examples are given below::"
 msgstr ""
 
-#: bzrlib/builtins.py:2557
+#: bzrlib/builtins.py:2555
 msgid ""
 "    -r-1                show just the tip\n"
 "    -r-10..             show the last 10 mainline revisions\n"
@@ -1567,7 +1561,7 @@
 "    -rdate:yesterday..  show changes since yesterday"
 msgstr ""
 
-#: bzrlib/builtins.py:2564
+#: bzrlib/builtins.py:2562
 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"
@@ -1577,73 +1571,73 @@
 "  a nested merge revision and the log will be truncated accordingly."
 msgstr ""
 
-#: bzrlib/builtins.py:2571
+#: bzrlib/builtins.py:2569
 msgid ":Path filtering:"
 msgstr ""
 
-#: bzrlib/builtins.py:2573
+#: bzrlib/builtins.py:2571
 msgid ""
 "  If parameters are given and the first one is not a branch, the log\n"
 "  will be filtered to show only those revisions that changed the\n"
 "  nominated files or directories."
 msgstr ""
 
-#: bzrlib/builtins.py:2577
+#: bzrlib/builtins.py:2575
 msgid ""
 "  Filenames are interpreted within their historical context. To log a\n"
 "  deleted file, specify a revision range so that the file existed at\n"
 "  the end or start of the range."
 msgstr ""
 
-#: bzrlib/builtins.py:2581
+#: bzrlib/builtins.py:2579
 msgid ""
 "  Historical context is also important when interpreting pathnames of\n"
 "  renamed files/directories. Consider the following example:"
 msgstr ""
 
-#: bzrlib/builtins.py:2584
+#: bzrlib/builtins.py:2582
 msgid ""
 "  * revision 1: add tutorial.txt\n"
 "  * revision 2: modify tutorial.txt\n"
 "  * revision 3: rename tutorial.txt to guide.txt; add tutorial.txt"
 msgstr ""
 
-#: bzrlib/builtins.py:2588
+#: bzrlib/builtins.py:2586
 msgid "  In this case:"
 msgstr ""
 
-#: bzrlib/builtins.py:2590
+#: bzrlib/builtins.py:2588
 msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
 msgstr ""
 
-#: bzrlib/builtins.py:2592
+#: bzrlib/builtins.py:2590
 msgid "  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
 msgstr ""
 
-#: bzrlib/builtins.py:2594
+#: bzrlib/builtins.py:2592
 msgid ""
 "  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
 "    the original file in revision 2."
 msgstr ""
 
-#: bzrlib/builtins.py:2597
+#: bzrlib/builtins.py:2595
 msgid ""
 "  * ``bzr log -r2 -p guide.txt`` will display an error message as there\n"
 "    was no file called guide.txt in revision 2."
 msgstr ""
 
-#: bzrlib/builtins.py:2600
+#: bzrlib/builtins.py:2598
 msgid ""
 "  Renames are always followed by log. By design, there is no need to\n"
 "  explicitly ask for this (and no way to stop logging a file back\n"
 "  until it was last renamed)."
 msgstr ""
 
-#: bzrlib/builtins.py:2604
+#: bzrlib/builtins.py:2602
 msgid ":Other filtering:"
 msgstr ""
 
-#: bzrlib/builtins.py:2606
+#: bzrlib/builtins.py:2604
 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"
@@ -1652,11 +1646,11 @@
 "  --match-message can be used to only match a specific field."
 msgstr ""
 
-#: bzrlib/builtins.py:2612
+#: bzrlib/builtins.py:2610
 msgid ":Tips & tricks:"
 msgstr ""
 
-#: bzrlib/builtins.py:2614
+#: bzrlib/builtins.py:2612
 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"
@@ -1665,11 +1659,11 @@
 "  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
 msgstr ""
 
-#: bzrlib/builtins.py:2620
+#: bzrlib/builtins.py:2618
 msgid "  You may find it useful to add the aliases below to ``bazaar.conf``::"
 msgstr ""
 
-#: bzrlib/builtins.py:2622
+#: bzrlib/builtins.py:2620
 msgid ""
 "    [ALIASES]\n"
 "    tip = log -r-1\n"
@@ -1677,20 +1671,20 @@
 "    show = log -v -p"
 msgstr ""
 
-#: bzrlib/builtins.py:2627
+#: bzrlib/builtins.py:2625
 msgid ""
 "  ``bzr tip`` will then show the latest revision while ``bzr top``\n"
 "  will show the last 10 mainline revisions. To see the details of a\n"
 "  particular revision X,  ``bzr show -rX``."
 msgstr ""
 
-#: bzrlib/builtins.py:2631
+#: bzrlib/builtins.py:2629
 msgid ""
 "  If you are interested in looking deeper into a particular merge X,\n"
 "  use ``bzr log -n0 -rX``."
 msgstr ""
 
-#: bzrlib/builtins.py:2634
+#: bzrlib/builtins.py:2632
 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"
@@ -1698,7 +1692,7 @@
 "  be given when using the -v option."
 msgstr ""
 
-#: bzrlib/builtins.py:2639
+#: bzrlib/builtins.py:2637
 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"
@@ -1706,7 +1700,7 @@
 "  a list of words but not others."
 msgstr ""
 
-#: bzrlib/builtins.py:2644
+#: bzrlib/builtins.py:2642
 msgid ""
 "  When exploring non-mainline history on large projects with deep\n"
 "  history, the performance of log can be greatly improved by installing\n"
@@ -1715,168 +1709,168 @@
 msgstr ""
 
 # help of 'forward' option of 'log' command
-#: bzrlib/builtins.py:2653
+#: bzrlib/builtins.py:2651
 msgid "Show from oldest to newest."
 msgstr ""
 
 # help of 'verbose' option of 'log' command
-#: bzrlib/builtins.py:2656
+#: bzrlib/builtins.py:2654
 msgid "Show files changed in each revision."
 msgstr ""
 
 # help of 'change' option of 'log' command
-#: bzrlib/builtins.py:2662
+#: bzrlib/builtins.py:2660
 msgid "Show just the specified revision. See also \"help revisionspec\"."
 msgstr ""
 
 # help of 'authors' option of 'log' command
-#: bzrlib/builtins.py:2666
+#: bzrlib/builtins.py:2664
 msgid "What names to list as authors - first, all or committer."
 msgstr ""
 
 # title of 'authors' option of 'log' command
-#: bzrlib/builtins.py:2667
+#: bzrlib/builtins.py:2665
 msgid "Authors"
 msgstr ""
 
 # help of 'levels' option of 'log' command
-#: bzrlib/builtins.py:2672
+#: bzrlib/builtins.py:2670
 msgid "Number of levels to display - 0 for all, 1 for flat."
 msgstr ""
 
 # help of 'limit' option of 'log' command
-#: bzrlib/builtins.py:2682
+#: bzrlib/builtins.py:2680
 msgid "Limit the output to the first N revisions."
 msgstr ""
 
 # help of 'show-diff' option of 'log' command
-#: bzrlib/builtins.py:2687
+#: bzrlib/builtins.py:2685
 msgid "Show changes made in each revision as a patch."
 msgstr ""
 
 # help of 'include-merged' option of 'log' command
-#: bzrlib/builtins.py:2689
+#: bzrlib/builtins.py:2687
 msgid "Show merged revisions like --levels 0 does."
 msgstr ""
 
 # help of 'omit-merges' option of 'log' command
-#: bzrlib/builtins.py:2693
+#: bzrlib/builtins.py:2691
 msgid "Do not report commits with more than one parent."
 msgstr ""
 
 # help of 'exclude-common-ancestry' option of 'log' command
-#: bzrlib/builtins.py:2695
+#: bzrlib/builtins.py:2693
 msgid ""
 "Display only the revisions that are not part of both ancestries (require -"
 "rX..Y)."
 msgstr ""
 
 # help of 'signatures' option of 'log' command
-#: bzrlib/builtins.py:2699
+#: bzrlib/builtins.py:2697
 msgid "Show digital signature validity."
 msgstr ""
 
 # help of 'match' option of 'log' command
-#: bzrlib/builtins.py:2702
+#: bzrlib/builtins.py:2700
 msgid "Show revisions whose properties match this expression."
 msgstr ""
 
 # help of 'match-message' option of 'log' command
-#: bzrlib/builtins.py:2706
+#: bzrlib/builtins.py:2704
 msgid "Show revisions whose message matches this expression."
 msgstr ""
 
 # help of 'match-committer' option of 'log' command
-#: bzrlib/builtins.py:2710
+#: bzrlib/builtins.py:2708
 msgid "Show revisions whose committer matches this expression."
 msgstr ""
 
 # help of 'match-author' option of 'log' command
-#: bzrlib/builtins.py:2714
+#: bzrlib/builtins.py:2712
 msgid "Show revisions whose authors match this expression."
 msgstr ""
 
 # help of 'match-bugs' option of 'log' command
-#: bzrlib/builtins.py:2718
+#: bzrlib/builtins.py:2716
 msgid "Show revisions whose bugs match this expression."
 msgstr ""
 
-#: bzrlib/builtins.py:2772
+#: bzrlib/builtins.py:2770
 msgid "--exclude-common-ancestry requires -r with two revisions"
 msgstr ""
 
-#: bzrlib/builtins.py:2800
+#: bzrlib/builtins.py:2798
 #, python-format
 msgid "Path unknown at end or start of revision range: %s"
 msgstr ""
 
-#: bzrlib/builtins.py:2917
+#: bzrlib/builtins.py:2915
 #, python-format
 msgid "bzr %s doesn't accept two revisions in different branches."
 msgstr ""
 
-#: bzrlib/builtins.py:2933
+#: bzrlib/builtins.py:2931
 #, python-format
 msgid "bzr %s --revision takes one or two values."
 msgstr ""
 
-#: bzrlib/builtins.py:2978
+#: bzrlib/builtins.py:2976
 msgid ""
 "List files in a tree.\n"
 "    "
 msgstr ""
 
 # help of 'recursive' option of 'ls' command
-#: bzrlib/builtins.py:2987
+#: bzrlib/builtins.py:2985
 msgid "Recurse into subdirectories."
 msgstr ""
 
 # help of 'from-root' option of 'ls' command
-#: bzrlib/builtins.py:2989
+#: bzrlib/builtins.py:2987
 msgid "Print paths relative to the root of the branch."
 msgstr ""
 
 # help of 'unknown' option of 'ls' command
-#: bzrlib/builtins.py:2991
+#: bzrlib/builtins.py:2989
 msgid "Print unknown files."
 msgstr ""
 
 # help of 'versioned' option of 'ls' command
-#: bzrlib/builtins.py:2992
+#: bzrlib/builtins.py:2990
 msgid "Print versioned files."
 msgstr ""
 
 # help of 'ignored' option of 'ls' command
-#: bzrlib/builtins.py:2995
+#: bzrlib/builtins.py:2993
 msgid "Print ignored files."
 msgstr ""
 
 # help of 'kind' option of 'ls' command
-#: bzrlib/builtins.py:2997
+#: bzrlib/builtins.py:2995
 msgid "List entries of a particular kind: file, directory, symlink."
 msgstr ""
 
-#: bzrlib/builtins.py:3010
+#: bzrlib/builtins.py:3008
 msgid "invalid kind specified"
 msgstr ""
 
-#: bzrlib/builtins.py:3013
+#: bzrlib/builtins.py:3011
 msgid "Cannot set both --verbose and --null"
 msgstr ""
 
-#: bzrlib/builtins.py:3022
+#: bzrlib/builtins.py:3020
 msgid "cannot specify both --from-root and PATH"
 msgstr ""
 
-#: bzrlib/builtins.py:3109
+#: bzrlib/builtins.py:3107
 msgid "Ignore specified files or patterns."
 msgstr ""
 
-#: bzrlib/builtins.py:3111
+#: bzrlib/builtins.py:3109
 msgid "See ``bzr help patterns`` for details on the syntax of patterns."
 msgstr ""
 
-#: bzrlib/builtins.py:3113
+#: bzrlib/builtins.py:3111
 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"
@@ -1885,7 +1879,7 @@
 "the use of the ignore command will require an explicit add command."
 msgstr ""
 
-#: bzrlib/builtins.py:3119
+#: bzrlib/builtins.py:3117
 msgid ""
 "To remove patterns from the ignore list, edit the .bzrignore file.\n"
 "After adding, editing or deleting that file either indirectly by\n"
@@ -1893,7 +1887,7 @@
 "it."
 msgstr ""
 
-#: bzrlib/builtins.py:3124
+#: bzrlib/builtins.py:3122
 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"
@@ -1902,20 +1896,20 @@
 "can be edited directly using an editor."
 msgstr ""
 
-#: bzrlib/builtins.py:3130
+#: bzrlib/builtins.py:3128
 msgid ""
 "Patterns prefixed with '!' are exceptions to ignore patterns and take\n"
 "precedence over regular ignores.  Such exceptions are used to specify\n"
 "files that should be versioned which would otherwise be ignored."
 msgstr ""
 
-#: bzrlib/builtins.py:3134
+#: bzrlib/builtins.py:3132
 msgid ""
 "Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
 "precedence over the '!' exception patterns."
 msgstr ""
 
-#: bzrlib/builtins.py:3137
+#: bzrlib/builtins.py:3135
 msgid ""
 ":Notes: \n"
 "    \n"
@@ -1923,63 +1917,63 @@
 "  the shell on Unix."
 msgstr ""
 
-#: bzrlib/builtins.py:3142
+#: bzrlib/builtins.py:3140
 msgid ""
 "* Ignore patterns starting with \"#\" act as comments in the ignore file.\n"
 "  To ignore patterns that begin with that character, use the \"RE:\" prefix."
 msgstr ""
 
-#: bzrlib/builtins.py:3145
+#: bzrlib/builtins.py:3143
 msgid ""
 ":Examples:\n"
 "    Ignore the top level Makefile::"
 msgstr ""
 
-#: bzrlib/builtins.py:3148
+#: bzrlib/builtins.py:3146
 msgid "        bzr ignore ./Makefile"
 msgstr ""
 
-#: bzrlib/builtins.py:3150
+#: bzrlib/builtins.py:3148
 msgid "    Ignore .class files in all directories...::"
 msgstr ""
 
-#: bzrlib/builtins.py:3152
+#: bzrlib/builtins.py:3150
 msgid "        bzr ignore \"*.class\""
 msgstr ""
 
-#: bzrlib/builtins.py:3154
+#: bzrlib/builtins.py:3152
 msgid "    ...but do not ignore \"special.class\"::"
 msgstr ""
 
-#: bzrlib/builtins.py:3156
+#: bzrlib/builtins.py:3154
 msgid "        bzr ignore \"!special.class\""
 msgstr ""
 
-#: bzrlib/builtins.py:3158
+#: bzrlib/builtins.py:3156
 msgid "    Ignore files whose name begins with the \"#\" character::"
 msgstr ""
 
-#: bzrlib/builtins.py:3160
+#: bzrlib/builtins.py:3158
 msgid "        bzr ignore \"RE:^#\""
 msgstr ""
 
-#: bzrlib/builtins.py:3162 bzrlib/builtins.py:3166
+#: bzrlib/builtins.py:3160 bzrlib/builtins.py:3164
 msgid "    Ignore .o files under the lib directory::"
 msgstr ""
 
-#: bzrlib/builtins.py:3164
+#: bzrlib/builtins.py:3162
 msgid "        bzr ignore \"lib/**/*.o\""
 msgstr ""
 
-#: bzrlib/builtins.py:3168
+#: bzrlib/builtins.py:3166
 msgid "        bzr ignore \"RE:lib/.*\\.o\""
 msgstr ""
 
-#: bzrlib/builtins.py:3170
+#: bzrlib/builtins.py:3168
 msgid "    Ignore everything but the \"debian\" toplevel directory::"
 msgstr ""
 
-#: bzrlib/builtins.py:3172
+#: bzrlib/builtins.py:3170
 msgid ""
 "        bzr ignore \"RE:(?!debian/).*\"\n"
 "    \n"
@@ -1992,26 +1986,26 @@
 msgstr ""
 
 # help of 'default-rules' option of 'ignore' command
-#: bzrlib/builtins.py:3186
+#: bzrlib/builtins.py:3184
 msgid "Display the default ignore rules that bzr uses."
 msgstr ""
 
-#: bzrlib/builtins.py:3198
+#: bzrlib/builtins.py:3196
 msgid "ignore requires at least one NAME_PATTERN or --default-rules."
 msgstr ""
 
-#: bzrlib/builtins.py:3209
+#: bzrlib/builtins.py:3207
 #, python-format
 msgid "Invalid ignore pattern found. %s"
 msgid_plural "Invalid ignore patterns found. %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/builtins.py:3218
+#: bzrlib/builtins.py:3216
 msgid "NAME_PATTERN should not be an absolute path"
 msgstr ""
 
-#: bzrlib/builtins.py:3231
+#: bzrlib/builtins.py:3229
 #, python-format
 msgid ""
 "Warning: the following files are version controlled and match your ignore "
@@ -2021,62 +2015,62 @@
 "them.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:3238
+#: bzrlib/builtins.py:3236
 msgid "List ignored files and the patterns that matched them."
 msgstr ""
 
-#: bzrlib/builtins.py:3240
+#: bzrlib/builtins.py:3238
 msgid ""
 "List all the ignored files and the ignore pattern that caused the file to\n"
 "be ignored."
 msgstr ""
 
-#: bzrlib/builtins.py:3243
+#: bzrlib/builtins.py:3241
 msgid "Alternatively, to list just the files::"
 msgstr ""
 
-#: bzrlib/builtins.py:3245
+#: bzrlib/builtins.py:3243
 msgid "    bzr ls --ignored"
 msgstr ""
 
-#: bzrlib/builtins.py:3279
+#: bzrlib/builtins.py:3277
 #, python-format
 msgid "not a valid revision-number: %r"
 msgstr ""
 
-#: bzrlib/builtins.py:3286
+#: bzrlib/builtins.py:3284
 msgid "Export current or past revision to a destination directory or archive."
 msgstr ""
 
-#: bzrlib/builtins.py:3288
+#: bzrlib/builtins.py:3286
 msgid "If no revision is specified this exports the last committed revision."
 msgstr ""
 
-#: bzrlib/builtins.py:3290
+#: bzrlib/builtins.py:3288
 msgid ""
 "Format may be an \"exporter\" name, such as tar, tgz, tbz2.  If none is\n"
 "given, try to find the format with the extension. If no extension\n"
 "is found exports to a directory (equivalent to --format=dir)."
 msgstr ""
 
-#: bzrlib/builtins.py:3294
+#: bzrlib/builtins.py:3292
 msgid ""
 "If root is supplied, it will be used as the root directory inside\n"
 "container formats (tar, zip, etc). If it is not supplied it will default\n"
 "to the exported filename. The root option has no effect for 'dir' format."
 msgstr ""
 
-#: bzrlib/builtins.py:3298
+#: bzrlib/builtins.py:3296
 msgid ""
 "If branch is omitted then the branch containing the current working\n"
 "directory will be used."
 msgstr ""
 
-#: bzrlib/builtins.py:3301
+#: bzrlib/builtins.py:3299
 msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
 msgstr ""
 
-#: bzrlib/builtins.py:3303
+#: bzrlib/builtins.py:3301
 msgid ""
 "  =================       =========================\n"
 "  Supported formats       Autodetected by extension\n"
@@ -2090,78 +2084,78 @@
 msgstr ""
 
 # help of 'format' option of 'export' command
-#: bzrlib/builtins.py:3317
+#: bzrlib/builtins.py:3315
 msgid "Type of file to export to."
 msgstr ""
 
 # help of 'filters' option of 'export' command
-#: bzrlib/builtins.py:3320
+#: bzrlib/builtins.py:3318
 msgid "Apply content filters to export the convenient form."
 msgstr ""
 
 # help of 'root' option of 'export' command
-#: bzrlib/builtins.py:3324
+#: bzrlib/builtins.py:3322
 msgid "Name of the root directory inside the exported file."
 msgstr ""
 
 # help of 'per-file-timestamps' option of 'export' command
-#: bzrlib/builtins.py:3326
+#: bzrlib/builtins.py:3324
 msgid ""
 "Set modification time of files to that of the last revision in which it was "
 "changed."
 msgstr ""
 
 # help of 'uncommitted' option of 'export' command
-#: bzrlib/builtins.py:3329
+#: bzrlib/builtins.py:3327
 msgid "Export the working tree contents rather than that of the last revision."
 msgstr ""
 
-#: bzrlib/builtins.py:3348
+#: bzrlib/builtins.py:3346
 msgid "--uncommitted requires a working tree"
 msgstr ""
 
-#: bzrlib/builtins.py:3357
+#: bzrlib/builtins.py:3355
 #, python-format
 msgid "Unsupported export format: %s"
 msgstr ""
 
-#: bzrlib/builtins.py:3361
+#: bzrlib/builtins.py:3359
 msgid "Write the contents of a file as of a given revision to standard output."
 msgstr ""
 
-#: bzrlib/builtins.py:3363
+#: bzrlib/builtins.py:3361
 msgid "If no revision is nominated, the last revision is used."
 msgstr ""
 
-#: bzrlib/builtins.py:3365
+#: bzrlib/builtins.py:3363
 msgid ""
 "Note: Take care to redirect standard output when using this command on a\n"
 "binary file."
 msgstr ""
 
 # help of 'name-from-revision' option of 'cat' command
-#: bzrlib/builtins.py:3371
+#: bzrlib/builtins.py:3369
 msgid "The path name in the old tree."
 msgstr ""
 
 # help of 'filters' option of 'cat' command
-#: bzrlib/builtins.py:3372
+#: bzrlib/builtins.py:3370
 msgid "Apply content filters to display the convenience form."
 msgstr ""
 
-#: bzrlib/builtins.py:3383
+#: bzrlib/builtins.py:3381
 msgid "bzr cat --revision takes exactly one revision specifier"
 msgstr ""
 
-#: bzrlib/builtins.py:3408 bzrlib/builtins.py:3420
+#: bzrlib/builtins.py:3406 bzrlib/builtins.py:3418
 msgid "{0!r} is not present in revision {1}"
 msgstr ""
 
-#: bzrlib/builtins.py:3443
+#: bzrlib/builtins.py:3441
 msgid "Commit changes into a new revision."
 msgstr ""
 
-#: bzrlib/builtins.py:3445
+#: bzrlib/builtins.py:3443
 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"
@@ -2171,44 +2165,44 @@
 "boilerplate text loaded into the editor, use the --show-diff option."
 msgstr ""
 
-#: bzrlib/builtins.py:3452
+#: bzrlib/builtins.py:3450
 msgid ""
 "By default, the entire tree is committed and the person doing the\n"
 "commit is assumed to be the author. These defaults can be overridden\n"
 "as explained below."
 msgstr ""
 
-#: bzrlib/builtins.py:3456
+#: bzrlib/builtins.py:3454
 msgid ":Selective commits:"
 msgstr ""
 
-#: bzrlib/builtins.py:3458
+#: bzrlib/builtins.py:3456
 msgid ""
 "  If selected files are specified, only changes to those files are\n"
 "  committed.  If a directory is specified then the directory and\n"
 "  everything within it is committed."
 msgstr ""
 
-#: bzrlib/builtins.py:3462
+#: bzrlib/builtins.py:3460
 msgid ""
 "  When excludes are given, they take precedence over selected files.\n"
 "  For example, to commit only changes within foo, but not changes\n"
 "  within foo/bar::"
 msgstr ""
 
-#: bzrlib/builtins.py:3466
+#: bzrlib/builtins.py:3464
 msgid "    bzr commit foo -x foo/bar"
 msgstr ""
 
-#: bzrlib/builtins.py:3468
+#: bzrlib/builtins.py:3466
 msgid "  A selective commit after a merge is not yet supported."
 msgstr ""
 
-#: bzrlib/builtins.py:3470
+#: bzrlib/builtins.py:3468
 msgid ":Custom authors:"
 msgstr ""
 
-#: bzrlib/builtins.py:3472
+#: bzrlib/builtins.py:3470
 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"
@@ -2218,11 +2212,11 @@
 "  author."
 msgstr ""
 
-#: bzrlib/builtins.py:3479
+#: bzrlib/builtins.py:3477
 msgid ":Checks:"
 msgstr ""
 
-#: bzrlib/builtins.py:3481
+#: bzrlib/builtins.py:3479
 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"
@@ -2231,18 +2225,18 @@
 "  for details."
 msgstr ""
 
-#: bzrlib/builtins.py:3487
+#: bzrlib/builtins.py:3485
 msgid ":Things to note:"
 msgstr ""
 
-#: bzrlib/builtins.py:3489
+#: bzrlib/builtins.py:3487
 msgid ""
 "  If you accidentially commit the wrong changes or make a spelling\n"
 "  mistake in the commit message say, you can use the uncommit command\n"
 "  to undo it. See ``bzr help uncommit`` for details."
 msgstr ""
 
-#: bzrlib/builtins.py:3493
+#: bzrlib/builtins.py:3491
 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"
@@ -2251,69 +2245,69 @@
 msgstr ""
 
 # help of 'exclude' option of 'commit' command
-#: bzrlib/builtins.py:3503
+#: bzrlib/builtins.py:3501
 msgid "Do not consider changes made to a given path."
 msgstr ""
 
 # help of 'message' option of 'commit' command
-#: bzrlib/builtins.py:3506
+#: bzrlib/builtins.py:3504
 msgid "Description of the new revision."
 msgstr ""
 
 # help of 'unchanged' option of 'commit' command
-#: bzrlib/builtins.py:3509
+#: bzrlib/builtins.py:3507
 msgid "Commit even if nothing has changed."
 msgstr ""
 
 # help of 'file' option of 'commit' command
-#: bzrlib/builtins.py:3513
+#: bzrlib/builtins.py:3511
 msgid "Take commit message from this file."
 msgstr ""
 
 # help of 'strict' option of 'commit' command
-#: bzrlib/builtins.py:3515
+#: bzrlib/builtins.py:3513
 msgid "Refuse to commit if there are unknown files in the working tree."
 msgstr ""
 
 # help of 'commit-time' option of 'commit' command
-#: bzrlib/builtins.py:3518
+#: bzrlib/builtins.py:3516
 msgid ""
 "Manually set a commit time using commit date format, e.g. '2009-10-10 "
 "08:00:00 +0100'."
 msgstr ""
 
 # help of 'fixes' option of 'commit' command
-#: bzrlib/builtins.py:3521
+#: bzrlib/builtins.py:3519
 msgid "Mark a bug as being fixed by this revision (see \"bzr help bugs\")."
 msgstr ""
 
 # help of 'author' option of 'commit' command
-#: bzrlib/builtins.py:3524
+#: bzrlib/builtins.py:3522
 msgid "Set the author's name, if it's different from the committer."
 msgstr ""
 
 # help of 'local' option of 'commit' command
-#: bzrlib/builtins.py:3527
+#: bzrlib/builtins.py:3525
 msgid ""
 "Perform a local commit in a bound branch.  Local commits are not pushed to "
 "the master branch until a normal commit is performed."
 msgstr ""
 
 # help of 'show-diff' option of 'commit' command
-#: bzrlib/builtins.py:3533
+#: bzrlib/builtins.py:3531
 msgid ""
 "When no message is supplied, show the diff along with the status summary in "
 "the message editor."
 msgstr ""
 
 # help of 'lossy' option of 'commit' command
-#: bzrlib/builtins.py:3536
+#: bzrlib/builtins.py:3534
 msgid ""
 "When committing to a foreign version control system do not push data that "
 "can not be natively represented."
 msgstr ""
 
-#: bzrlib/builtins.py:3554
+#: bzrlib/builtins.py:3552
 #, python-format
 msgid ""
 "No tracker specified for bug %s. Use the form 'tracker:id' or specify a "
@@ -2321,7 +2315,7 @@
 "See \"bzr help bugs\" for more information on this feature. Commit refused."
 msgstr ""
 
-#: bzrlib/builtins.py:3563
+#: bzrlib/builtins.py:3561
 #, python-format
 msgid ""
 "Invalid bug %s. Must be in the form of 'tracker:id'. See \"bzr help bugs\" "
@@ -2329,91 +2323,91 @@
 "Commit refused."
 msgstr ""
 
-#: bzrlib/builtins.py:3572
+#: bzrlib/builtins.py:3570
 #, python-format
 msgid "Unrecognized bug %s. Commit refused."
 msgstr ""
 
-#: bzrlib/builtins.py:3575
+#: bzrlib/builtins.py:3573
 #, python-format
 msgid ""
 "%s\n"
 "Commit refused."
 msgstr ""
 
-#: bzrlib/builtins.py:3599
+#: bzrlib/builtins.py:3597
 msgid "Could not parse --commit-time: "
 msgstr ""
 
-#: bzrlib/builtins.py:3639
+#: bzrlib/builtins.py:3637
 msgid "please specify either --message or --file"
 msgstr ""
 
-#: bzrlib/builtins.py:3668
+#: bzrlib/builtins.py:3666
 msgid "please specify a commit message with either --message or --file"
 msgstr ""
 
-#: bzrlib/builtins.py:3671
+#: bzrlib/builtins.py:3669
 msgid ""
 "Empty commit message specified. Please specify a commit message with either "
 "--message or --file or leave a blank message with --message \"\"."
 msgstr ""
 
-#: bzrlib/builtins.py:3691
+#: bzrlib/builtins.py:3689
 msgid ""
 "No changes to commit. Please 'bzr add' the files you want to commit, or use "
 "--unchanged to force an empty commit."
 msgstr ""
 
-#: bzrlib/builtins.py:3695
+#: bzrlib/builtins.py:3693
 msgid ""
 "Conflicts detected in working tree.  Use \"bzr conflicts\" to list, \"bzr "
 "resolve FILE\" to resolve."
 msgstr ""
 
-#: bzrlib/builtins.py:3699
+#: bzrlib/builtins.py:3697
 msgid "Commit refused because there are unknown files in the working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:3702
+#: bzrlib/builtins.py:3700
 msgid ""
 "\n"
 "To commit to master branch, run update and then commit.\n"
 "You can also pass --local to commit to continue working disconnected."
 msgstr ""
 
-#: bzrlib/builtins.py:3710
+#: bzrlib/builtins.py:3708
 msgid ""
 "Validate working tree structure, branch consistency and repository history."
 msgstr ""
 
-#: bzrlib/builtins.py:3712
+#: bzrlib/builtins.py:3710
 msgid ""
 "This command checks various invariants about branch and repository storage\n"
 "to detect data corruption or bzr bugs."
 msgstr ""
 
-#: bzrlib/builtins.py:3715
+#: bzrlib/builtins.py:3713
 msgid ""
 "The working tree and branch checks will only give output if a problem is\n"
 "detected. The output fields of the repository check are:"
 msgstr ""
 
-#: bzrlib/builtins.py:3718
+#: bzrlib/builtins.py:3716
 msgid ""
 "revisions\n"
 "    This is just the number of revisions checked.  It doesn't\n"
 "    indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3722
+#: bzrlib/builtins.py:3720
 msgid ""
 "versionedfiles\n"
 "    This is just the number of versionedfiles checked.  It\n"
 "    doesn't indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3726
+#: bzrlib/builtins.py:3724
 msgid ""
 "unreferenced ancestors\n"
 "    Texts that are ancestors of other texts, but\n"
@@ -2421,14 +2415,14 @@
 "    subtle problem that Bazaar can work around."
 msgstr ""
 
-#: bzrlib/builtins.py:3731
+#: bzrlib/builtins.py:3729
 msgid ""
 "unique file texts\n"
 "    This is the total number of unique file contents\n"
 "    seen in the checked revisions.  It does not indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3735
+#: bzrlib/builtins.py:3733
 msgid ""
 "repeated file texts\n"
 "    This is the total number of repeated texts seen\n"
@@ -2437,57 +2431,57 @@
 "    indicate a problem."
 msgstr ""
 
-#: bzrlib/builtins.py:3741
+#: bzrlib/builtins.py:3739
 msgid ""
 "If no restrictions are specified, all Bazaar data that is found at the "
 "given\n"
 "location will be checked."
 msgstr ""
 
-#: bzrlib/builtins.py:3746
+#: bzrlib/builtins.py:3744
 msgid "    Check the tree and branch at 'foo'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3748
+#: bzrlib/builtins.py:3746
 msgid "        bzr check --tree --branch foo"
 msgstr ""
 
-#: bzrlib/builtins.py:3750
+#: bzrlib/builtins.py:3748
 msgid "    Check only the repository at 'bar'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3752
+#: bzrlib/builtins.py:3750
 msgid "        bzr check --repo bar"
 msgstr ""
 
-#: bzrlib/builtins.py:3754
+#: bzrlib/builtins.py:3752
 msgid "    Check everything at 'baz'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3756
+#: bzrlib/builtins.py:3754
 msgid "        bzr check baz"
 msgstr ""
 
 # help of 'branch' option of 'check' command
-#: bzrlib/builtins.py:3762
+#: bzrlib/builtins.py:3760
 msgid "Check the branch related to the current directory."
 msgstr ""
 
 # help of 'repo' option of 'check' command
-#: bzrlib/builtins.py:3764
+#: bzrlib/builtins.py:3762
 msgid "Check the repository related to the current directory."
 msgstr ""
 
 # help of 'tree' option of 'check' command
-#: bzrlib/builtins.py:3766
+#: bzrlib/builtins.py:3764
 msgid "Check the working tree related to the current directory."
 msgstr ""
 
-#: bzrlib/builtins.py:3780
+#: bzrlib/builtins.py:3778
 msgid "Upgrade a repository, branch or working tree to a newer format."
 msgstr ""
 
-#: bzrlib/builtins.py:3782
+#: bzrlib/builtins.py:3780
 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"
@@ -2496,7 +2490,7 @@
 "with older repositories or with older versions of Bazaar."
 msgstr ""
 
-#: bzrlib/builtins.py:3788
+#: bzrlib/builtins.py:3786
 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"
@@ -2506,7 +2500,7 @@
 "2.x default) so downgrading is not always possible."
 msgstr ""
 
-#: bzrlib/builtins.py:3795
+#: bzrlib/builtins.py:3793
 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"
@@ -2517,7 +2511,7 @@
 "afterwards."
 msgstr ""
 
-#: bzrlib/builtins.py:3803
+#: bzrlib/builtins.py:3801
 msgid ""
 "If the location given is a shared repository, dependent branches\n"
 "are also converted provided the repository converts successfully.\n"
@@ -2525,166 +2519,166 @@
 "tried."
 msgstr ""
 
-#: bzrlib/builtins.py:3808
+#: bzrlib/builtins.py:3806
 msgid ""
 "For more information on upgrades, see the Bazaar Upgrade Guide,\n"
 "http://doc.bazaar.canonical.com/latest/en/upgrade-guide/."
 msgstr ""
 
 # help of 'format' option of 'upgrade' command
-#: bzrlib/builtins.py:3816
+#: bzrlib/builtins.py:3814
 msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
 msgstr ""
 
 # title of 'format' option of 'init' command
 # title of 'format' option of 'upgrade' command
-#: bzrlib/builtins.py:3820
+#: bzrlib/builtins.py:3818
 msgid "Branch format"
 msgstr ""
 
 # help of 'clean' option of 'upgrade' command
-#: bzrlib/builtins.py:3822
+#: bzrlib/builtins.py:3820
 msgid "Remove the backup.bzr directory if successful."
 msgstr ""
 
 # help of 'dry-run' option of 'add' command
 # help of 'dry-run' option of 'upgrade' command
-#: bzrlib/builtins.py:3824
+#: bzrlib/builtins.py:3822
 msgid "Show what would be done, but don't actually do anything."
 msgstr ""
 
-#: bzrlib/builtins.py:3839
+#: bzrlib/builtins.py:3837
 msgid "Show or set bzr user id."
 msgstr ""
 
-#: bzrlib/builtins.py:3841
+#: bzrlib/builtins.py:3839
 msgid ""
 ":Examples:\n"
 "    Show the email of the current user::"
 msgstr ""
 
-#: bzrlib/builtins.py:3844
+#: bzrlib/builtins.py:3842
 msgid "        bzr whoami --email"
 msgstr ""
 
-#: bzrlib/builtins.py:3846
+#: bzrlib/builtins.py:3844
 msgid "    Set the current user::"
 msgstr ""
 
-#: bzrlib/builtins.py:3848
+#: bzrlib/builtins.py:3846
 msgid "        bzr whoami \"Frank Chu <fchu@example.com>\""
 msgstr ""
 
 # help of 'email' option of 'whoami' command
-#: bzrlib/builtins.py:3852
+#: bzrlib/builtins.py:3850
 msgid "Display email address only."
 msgstr ""
 
 # help of 'branch' option of 'whoami' command
-#: bzrlib/builtins.py:3854
+#: bzrlib/builtins.py:3852
 msgid "Set identity for the current branch instead of globally."
 msgstr ""
 
-#: bzrlib/builtins.py:3880
+#: bzrlib/builtins.py:3878
 msgid "--email can only be used to display existing identity"
 msgstr ""
 
-#: bzrlib/builtins.py:3904
+#: bzrlib/builtins.py:3902
 msgid "Print or set the branch nickname."
 msgstr ""
 
-#: bzrlib/builtins.py:3906
+#: bzrlib/builtins.py:3904
 msgid ""
 "If unset, the colocated branch name is used for colocated branches, and\n"
 "the branch directory name is used for other branches.  To print the\n"
 "current nickname, execute with no argument."
 msgstr ""
 
-#: bzrlib/builtins.py:3910
+#: bzrlib/builtins.py:3908
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally."
 msgstr ""
 
-#: bzrlib/builtins.py:3930
+#: bzrlib/builtins.py:3928
 msgid "Set/unset and display aliases."
 msgstr ""
 
-#: bzrlib/builtins.py:3932
+#: bzrlib/builtins.py:3930
 msgid ""
 ":Examples:\n"
 "    Show the current aliases::"
 msgstr ""
 
-#: bzrlib/builtins.py:3935
+#: bzrlib/builtins.py:3933
 msgid "        bzr alias"
 msgstr ""
 
-#: bzrlib/builtins.py:3937
+#: bzrlib/builtins.py:3935
 msgid "    Show the alias specified for 'll'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3939
+#: bzrlib/builtins.py:3937
 msgid "        bzr alias ll"
 msgstr ""
 
-#: bzrlib/builtins.py:3941
+#: bzrlib/builtins.py:3939
 msgid "    Set an alias for 'll'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3943
+#: bzrlib/builtins.py:3941
 msgid "        bzr alias ll=\"log --line -r-10..-1\""
 msgstr ""
 
-#: bzrlib/builtins.py:3945
+#: bzrlib/builtins.py:3943
 msgid "    To remove an alias for 'll'::"
 msgstr ""
 
-#: bzrlib/builtins.py:3947
+#: bzrlib/builtins.py:3945
 msgid "        bzr alias --remove ll"
 msgstr ""
 
 # help of 'remove' option of 'alias' command
-#: bzrlib/builtins.py:3952
+#: bzrlib/builtins.py:3950
 msgid "Remove the alias."
 msgstr ""
 
-#: bzrlib/builtins.py:3970
+#: bzrlib/builtins.py:3968
 msgid "bzr alias --remove expects an alias to remove."
 msgstr ""
 
-#: bzrlib/builtins.py:4151
+#: bzrlib/builtins.py:4149
 msgid "subunit not available. subunit needs to be installed to use --subunit."
 msgstr ""
 
-#: bzrlib/builtins.py:4168
+#: bzrlib/builtins.py:4166
 msgid ""
 "--benchmark is no longer supported from bzr 2.2; use bzr-usertest instead"
 msgstr ""
 
-#: bzrlib/builtins.py:4215
+#: bzrlib/builtins.py:4213
 msgid "Show version of bzr."
 msgstr ""
 
 # help of 'short' option of 'version' command
-#: bzrlib/builtins.py:4219
+#: bzrlib/builtins.py:4217
 msgid "Print just the version number."
 msgstr ""
 
-#: bzrlib/builtins.py:4238
+#: bzrlib/builtins.py:4236
 msgid "It sure does!\n"
 msgstr ""
 
-#: bzrlib/builtins.py:4262
+#: bzrlib/builtins.py:4260
 #, python-format
 msgid "merge base is revision %s\n"
 msgstr ""
 
-#: bzrlib/builtins.py:4266
+#: bzrlib/builtins.py:4264
 msgid "Perform a three-way merge."
 msgstr ""
 
-#: bzrlib/builtins.py:4268
+#: bzrlib/builtins.py:4266
 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"
@@ -2695,20 +2689,20 @@
 "the current working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:4276
+#: bzrlib/builtins.py:4274
 msgid ""
 "When merging from a branch, by default bzr will try to merge in all new\n"
 "work from the other branch, automatically determining an appropriate base\n"
 "revision.  If this fails, you may need to give an explicit base."
 msgstr ""
 
-#: bzrlib/builtins.py:4280
+#: bzrlib/builtins.py:4278
 msgid ""
 "To pick a different ending revision, pass \"--revision OTHER\".  bzr will\n"
 "try to merge in all new work up to and including revision OTHER."
 msgstr ""
 
-#: bzrlib/builtins.py:4283
+#: bzrlib/builtins.py:4281
 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"
@@ -2719,11 +2713,11 @@
 "changes from the other branch is not stored in the commit."
 msgstr ""
 
-#: bzrlib/builtins.py:4291
+#: bzrlib/builtins.py:4289
 msgid "Revision numbers are always relative to the source branch."
 msgstr ""
 
-#: bzrlib/builtins.py:4293 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
+#: bzrlib/builtins.py:4291 bzrlib/conflicts.py:52 bzrlib/conflicts.py:106
 msgid ""
 "Merge will do its best to combine the changes in two branches, but there\n"
 "are some kinds of problems only a human can fix.  When it encounters those,\n"
@@ -2731,11 +2725,11 @@
 "before you can commit."
 msgstr ""
 
-#: bzrlib/builtins.py:4298
+#: bzrlib/builtins.py:4296
 msgid "Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
 msgstr ""
 
-#: bzrlib/builtins.py:4300
+#: bzrlib/builtins.py:4298
 msgid ""
 "If there is no default branch set, the first merge will set it (use\n"
 "--no-remember to avoid setting it). After that, you can omit the branch\n"
@@ -2743,14 +2737,14 @@
 "only be saved if the remote location can be accessed."
 msgstr ""
 
-#: bzrlib/builtins.py:4305
+#: bzrlib/builtins.py:4303
 msgid ""
 "The results of the merge are placed into the destination working\n"
 "directory, where they can be reviewed (with bzr diff), tested, and then\n"
 "committed to record the result of the merge."
 msgstr ""
 
-#: bzrlib/builtins.py:4309
+#: bzrlib/builtins.py:4307
 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"
@@ -2759,60 +2753,60 @@
 "merge revision which has more than two parents."
 msgstr ""
 
-#: bzrlib/builtins.py:4315
+#: bzrlib/builtins.py:4313
 msgid ""
 "If one would like to merge changes from the working tree of the other\n"
 "branch without merging any committed revisions, the --uncommitted option\n"
 "can be given."
 msgstr ""
 
-#: bzrlib/builtins.py:4319
+#: bzrlib/builtins.py:4317
 msgid ""
 "To select only some changes to merge, use \"merge -i\", which will prompt\n"
 "you to apply each diff hunk and file change, similar to \"shelve\"."
 msgstr ""
 
-#: bzrlib/builtins.py:4322
+#: bzrlib/builtins.py:4320
 msgid ""
 ":Examples:\n"
 "    To merge all new revisions from bzr.dev::"
 msgstr ""
 
-#: bzrlib/builtins.py:4325
+#: bzrlib/builtins.py:4323
 msgid "        bzr merge ../bzr.dev"
 msgstr ""
 
-#: bzrlib/builtins.py:4327
+#: bzrlib/builtins.py:4325
 msgid "    To merge changes up to and including revision 82 from bzr.dev::"
 msgstr ""
 
-#: bzrlib/builtins.py:4329
+#: bzrlib/builtins.py:4327
 msgid "        bzr merge -r 82 ../bzr.dev"
 msgstr ""
 
-#: bzrlib/builtins.py:4331
+#: bzrlib/builtins.py:4329
 msgid "    To merge the changes introduced by 82, without previous changes::"
 msgstr ""
 
-#: bzrlib/builtins.py:4333
+#: bzrlib/builtins.py:4331
 msgid "        bzr merge -r 81..82 ../bzr.dev"
 msgstr ""
 
-#: bzrlib/builtins.py:4335
+#: bzrlib/builtins.py:4333
 msgid "    To apply a merge directive contained in /tmp/merge::"
 msgstr ""
 
-#: bzrlib/builtins.py:4337
+#: bzrlib/builtins.py:4335
 msgid "        bzr merge /tmp/merge"
 msgstr ""
 
-#: bzrlib/builtins.py:4339
+#: bzrlib/builtins.py:4337
 msgid ""
 "    To create a merge revision with three parents from two branches\n"
 "    feature1a and feature1b:"
 msgstr ""
 
-#: bzrlib/builtins.py:4342
+#: bzrlib/builtins.py:4340
 msgid ""
 "        bzr merge ../feature1a\n"
 "        bzr merge ../feature1b --force\n"
@@ -2820,18 +2814,18 @@
 msgstr ""
 
 # help of 'force' option of 'merge' command
-#: bzrlib/builtins.py:4354
+#: bzrlib/builtins.py:4352
 msgid "Merge even if the destination tree has uncommitted changes."
 msgstr ""
 
 # help of 'uncommitted' option of 'merge' command
-#: bzrlib/builtins.py:4360
+#: bzrlib/builtins.py:4358
 msgid ""
 "Apply uncommitted changes from a working copy, instead of branch changes."
 msgstr ""
 
 # help of 'pull' option of 'merge' command
-#: bzrlib/builtins.py:4362
+#: bzrlib/builtins.py:4360
 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 "
@@ -2839,109 +2833,109 @@
 msgstr ""
 
 # help of 'directory' option of 'merge' command
-#: bzrlib/builtins.py:4367
+#: bzrlib/builtins.py:4365
 msgid ""
 "Branch to merge into, rather than the one containing the working directory."
 msgstr ""
 
 # help of 'preview' option of 'merge' command
-#: bzrlib/builtins.py:4369
+#: bzrlib/builtins.py:4367
 msgid "Instead of merging, show a diff of the merge."
 msgstr ""
 
 # help of 'interactive' option of 'merge' command
-#: bzrlib/builtins.py:4371
+#: bzrlib/builtins.py:4369
 msgid "Select changes interactively."
 msgstr ""
 
-#: bzrlib/builtins.py:4393
+#: bzrlib/builtins.py:4391
 msgid ""
 "Merging into empty branches not currently supported, https://bugs.launchpad."
 "net/bzr/+bug/308562"
 msgstr ""
 
-#: bzrlib/builtins.py:4420
+#: bzrlib/builtins.py:4418
 msgid "Cannot use --uncommitted with bundles or merge directives."
 msgstr ""
 
-#: bzrlib/builtins.py:4431
+#: bzrlib/builtins.py:4429
 msgid "Cannot use --uncommitted and --revision at the same time."
 msgstr ""
 
-#: bzrlib/builtins.py:4451
+#: bzrlib/builtins.py:4449
 msgid "merger: "
 msgstr ""
 
-#: bzrlib/builtins.py:4453 bzrlib/bundle/apply_bundle.py:71
+#: bzrlib/builtins.py:4451 bzrlib/bundle/apply_bundle.py:71
 msgid "Nothing to do."
 msgstr ""
 
-#: bzrlib/builtins.py:4457
+#: bzrlib/builtins.py:4455
 msgid "Cannot pull individual files"
 msgstr ""
 
-#: bzrlib/builtins.py:4465
+#: bzrlib/builtins.py:4463
 msgid "This branch has no commits. (perhaps you would prefer 'bzr pull')"
 msgstr ""
 
-#: bzrlib/builtins.py:4523
+#: bzrlib/builtins.py:4521
 #, python-format
 msgid "Show-base is not supported for this merge type. %s"
 msgstr ""
 
-#: bzrlib/builtins.py:4532
+#: bzrlib/builtins.py:4530
 #, python-format
 msgid "Conflict reduction is not supported for merge type %s."
 msgstr ""
 
-#: bzrlib/builtins.py:4536
+#: bzrlib/builtins.py:4534
 msgid "Cannot do conflict reduction and show base."
 msgstr ""
 
-#: bzrlib/builtins.py:4647
+#: bzrlib/builtins.py:4645
 msgid "No location specified or remembered"
 msgstr ""
 
-#: bzrlib/builtins.py:4649
+#: bzrlib/builtins.py:4647
 msgid "{0} remembered {1} location {2}"
 msgstr ""
 
-#: bzrlib/builtins.py:4655
+#: bzrlib/builtins.py:4653
 msgid "Redo a merge."
 msgstr ""
 
-#: bzrlib/builtins.py:4657
+#: bzrlib/builtins.py:4655
 msgid ""
 "Use this if you want to try a different merge technique while resolving\n"
 "conflicts.  Some merge techniques are better than others, and remerge\n"
 "lets you try different ones on different files."
 msgstr ""
 
-#: bzrlib/builtins.py:4661
+#: bzrlib/builtins.py:4659
 msgid ""
 "The options for remerge have the same meaning and defaults as the ones for\n"
 "merge.  The difference is that remerge can (only) be run when there is a\n"
 "pending merge, and it lets you specify particular files."
 msgstr ""
 
-#: bzrlib/builtins.py:4665
+#: bzrlib/builtins.py:4663
 msgid ""
 ":Examples:\n"
 "    Re-do the merge of all conflicted files, and show the base text in\n"
 "    conflict regions, in addition to the usual THIS and OTHER texts::"
 msgstr ""
 
-#: bzrlib/builtins.py:4669
+#: bzrlib/builtins.py:4667
 msgid "        bzr remerge --show-base"
 msgstr ""
 
-#: bzrlib/builtins.py:4671
+#: bzrlib/builtins.py:4669
 msgid ""
 "    Re-do the merge of \"foobar\", using the weave merge algorithm, with\n"
 "    additional processing to reduce the size of conflict regions::"
 msgstr ""
 
-#: bzrlib/builtins.py:4674
+#: bzrlib/builtins.py:4672
 msgid "        bzr remerge --merge-type weave --reprocess foobar"
 msgstr ""
 
@@ -2949,22 +2943,22 @@
 # help of 'show-base' option of 'pull' command
 # help of 'show-base' option of 'remerge' command
 # help of 'show-base' option of 'update' command
-#: bzrlib/builtins.py:4681
+#: bzrlib/builtins.py:4679
 msgid "Show base revision text in conflicts."
 msgstr ""
 
-#: bzrlib/builtins.py:4693
+#: bzrlib/builtins.py:4691
 msgid ""
 "Sorry, remerge only works after normal merges.  Not cherrypicking or multi-"
 "merges."
 msgstr ""
 
-#: bzrlib/builtins.py:4751
+#: bzrlib/builtins.py:4749
 msgid ""
 "Set files in the working tree back to the contents of a previous revision."
 msgstr ""
 
-#: bzrlib/builtins.py:4753
+#: bzrlib/builtins.py:4751
 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"
@@ -2973,7 +2967,7 @@
 "the working tree basis revision."
 msgstr ""
 
-#: bzrlib/builtins.py:4759
+#: bzrlib/builtins.py:4757
 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"
@@ -2985,7 +2979,7 @@
 "update command."
 msgstr ""
 
-#: bzrlib/builtins.py:4768
+#: bzrlib/builtins.py:4766
 msgid ""
 "Uncommitted changes to files that are reverted will be discarded.\n"
 "Howver, by default, any files that have been manually changed will be\n"
@@ -2993,7 +2987,7 @@
 "files have '.~#~' appended to their name, where # is a number."
 msgstr ""
 
-#: bzrlib/builtins.py:4773
+#: bzrlib/builtins.py:4771
 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"
@@ -3001,7 +2995,7 @@
 "reverted."
 msgstr ""
 
-#: bzrlib/builtins.py:4778
+#: bzrlib/builtins.py:4776
 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"
@@ -3009,7 +3003,7 @@
 "deleted."
 msgstr ""
 
-#: bzrlib/builtins.py:4783
+#: bzrlib/builtins.py:4781
 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"
@@ -3021,7 +3015,7 @@
 "reverting any files."
 msgstr ""
 
-#: bzrlib/builtins.py:4792
+#: bzrlib/builtins.py:4790
 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"
@@ -3036,35 +3030,35 @@
 msgstr ""
 
 # help of 'no-backup' option of 'revert' command
-#: bzrlib/builtins.py:4806
+#: bzrlib/builtins.py:4804
 msgid "Do not save backups of reverted files."
 msgstr ""
 
 # help of 'forget-merges' option of 'revert' command
-#: bzrlib/builtins.py:4808
+#: bzrlib/builtins.py:4806
 msgid "Remove pending merge marker, without changing any files."
 msgstr ""
 
-#: bzrlib/builtins.py:4839
+#: bzrlib/builtins.py:4837
 msgid ""
 "Show help on a command or other topic.\n"
 "    "
 msgstr ""
 
 # help of 'long' option of 'help' command
-#: bzrlib/builtins.py:4844
+#: bzrlib/builtins.py:4842
 msgid "Show help on all commands."
 msgstr ""
 
-#: bzrlib/builtins.py:4873
+#: bzrlib/builtins.py:4871
 msgid "Show unmerged/unpulled revisions between two branches."
 msgstr ""
 
-#: bzrlib/builtins.py:4875
+#: bzrlib/builtins.py:4873
 msgid "OTHER_BRANCH may be local or remote."
 msgstr ""
 
-#: bzrlib/builtins.py:4877
+#: bzrlib/builtins.py:4875
 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"
@@ -3075,134 +3069,134 @@
 "    0 - no missing revisions"
 msgstr ""
 
-#: bzrlib/builtins.py:4887
+#: bzrlib/builtins.py:4885
 msgid ""
 "    Determine the missing revisions between this and the branch at the\n"
 "    remembered pull location::"
 msgstr ""
 
-#: bzrlib/builtins.py:4890
+#: bzrlib/builtins.py:4888
 msgid "        bzr missing"
 msgstr ""
 
-#: bzrlib/builtins.py:4892
+#: bzrlib/builtins.py:4890
 msgid "    Determine the missing revisions between this and another branch::"
 msgstr ""
 
-#: bzrlib/builtins.py:4894
+#: bzrlib/builtins.py:4892
 msgid "        bzr missing http://server/branch"
 msgstr ""
 
-#: bzrlib/builtins.py:4896
+#: bzrlib/builtins.py:4894
 msgid ""
 "    Determine the missing revisions up to a specific revision on the other\n"
 "    branch::"
 msgstr ""
 
-#: bzrlib/builtins.py:4899
+#: bzrlib/builtins.py:4897
 msgid "        bzr missing -r ..-10"
 msgstr ""
 
-#: bzrlib/builtins.py:4901
+#: bzrlib/builtins.py:4899
 msgid ""
 "    Determine the missing revisions up to a specific revision on this\n"
 "    branch::"
 msgstr ""
 
-#: bzrlib/builtins.py:4904
+#: bzrlib/builtins.py:4902
 msgid "        bzr missing --my-revision ..-10"
 msgstr ""
 
 # help of 'reverse' option of 'missing' command
-#: bzrlib/builtins.py:4911
+#: bzrlib/builtins.py:4909
 msgid "Reverse the order of revisions."
 msgstr ""
 
 # help of 'mine-only' option of 'missing' command
-#: bzrlib/builtins.py:4913
+#: bzrlib/builtins.py:4911
 msgid "Display changes in the local branch only."
 msgstr ""
 
 # help of 'this' option of 'missing' command
-#: bzrlib/builtins.py:4914
+#: bzrlib/builtins.py:4912
 msgid "Same as --mine-only."
 msgstr ""
 
 # help of 'theirs-only' option of 'missing' command
-#: bzrlib/builtins.py:4916
+#: bzrlib/builtins.py:4914
 msgid "Display changes in the remote branch only."
 msgstr ""
 
 # help of 'other' option of 'missing' command
-#: bzrlib/builtins.py:4917
+#: bzrlib/builtins.py:4915
 msgid "Same as --theirs-only."
 msgstr ""
 
 # help of 'revision' option of 'missing' command
-#: bzrlib/builtins.py:4922
+#: bzrlib/builtins.py:4920
 msgid ""
 "Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
 # help of 'my-revision' option of 'missing' command
-#: bzrlib/builtins.py:4926
+#: bzrlib/builtins.py:4924
 msgid ""
 "Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
 "details."
 msgstr ""
 
 # help of 'include-merged' option of 'missing' command
-#: bzrlib/builtins.py:4929
+#: bzrlib/builtins.py:4927
 msgid "Show all revisions in addition to the mainline ones."
 msgstr ""
 
-#: bzrlib/builtins.py:4983
+#: bzrlib/builtins.py:4981
 msgid "No peer location known or specified."
 msgstr ""
 
-#: bzrlib/builtins.py:4987
+#: bzrlib/builtins.py:4985
 msgid "Using saved parent location: {0}\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5020
+#: bzrlib/builtins.py:5018
 #, python-format
 msgid "You have %d extra revision:\n"
 msgid_plural "You have %d extra revisions:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/builtins.py:5040
+#: bzrlib/builtins.py:5038
 #, python-format
 msgid "You are missing %d revision:\n"
 msgid_plural "You are missing %d revisions:\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: bzrlib/builtins.py:5055
+#: bzrlib/builtins.py:5053
 msgid "This branch has no new revisions.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5058
+#: bzrlib/builtins.py:5056
 msgid "Other branch has no new revisions.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5063
+#: bzrlib/builtins.py:5061
 msgid "Branches are up to date.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5074
+#: bzrlib/builtins.py:5072
 msgid "Compress the data within a repository."
 msgstr ""
 
-#: bzrlib/builtins.py:5076
+#: bzrlib/builtins.py:5074
 msgid ""
 "This operation compresses the data within a bazaar repository. As\n"
 "bazaar supports automatic packing of repository, this operation is\n"
 "normally not required to be done manually."
 msgstr ""
 
-#: bzrlib/builtins.py:5080
+#: bzrlib/builtins.py:5078
 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"
@@ -3211,7 +3205,7 @@
 "used."
 msgstr ""
 
-#: bzrlib/builtins.py:5086
+#: bzrlib/builtins.py:5084
 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"
@@ -3220,25 +3214,25 @@
 msgstr ""
 
 # help of 'clean-obsolete-packs' option of 'pack' command
-#: bzrlib/builtins.py:5095
+#: bzrlib/builtins.py:5093
 msgid "Delete obsolete packs to save disk space."
 msgstr ""
 
-#: bzrlib/builtins.py:5109
+#: bzrlib/builtins.py:5107
 msgid "List the installed plugins."
 msgstr ""
 
-#: bzrlib/builtins.py:5111
+#: bzrlib/builtins.py:5109
 msgid ""
 "This command displays the list of installed plugins including\n"
 "version of plugin and a short description of each."
 msgstr ""
 
-#: bzrlib/builtins.py:5114
+#: bzrlib/builtins.py:5112
 msgid "--verbose shows the path where each plugin is located."
 msgstr ""
 
-#: bzrlib/builtins.py:5116
+#: bzrlib/builtins.py:5114
 msgid ""
 "A plugin is an external component for Bazaar that extends the\n"
 "revision control system, by adding or replacing code in Bazaar.\n"
@@ -3247,7 +3241,7 @@
 "customizing log output."
 msgstr ""
 
-#: bzrlib/builtins.py:5122
+#: bzrlib/builtins.py:5120
 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"
@@ -3255,122 +3249,122 @@
 "plugins using the Python programming language."
 msgstr ""
 
-#: bzrlib/builtins.py:5138
+#: bzrlib/builtins.py:5136
 msgid "Show testament (signing-form) of a revision."
 msgstr ""
 
 # help of 'long' option of 'testament' command
-#: bzrlib/builtins.py:5141
+#: bzrlib/builtins.py:5139
 msgid "Produce long-format testament."
 msgstr ""
 
 # help of 'strict' option of 'testament' command
-#: bzrlib/builtins.py:5143
+#: bzrlib/builtins.py:5141
 msgid "Produce a strict-format testament."
 msgstr ""
 
-#: bzrlib/builtins.py:5169
+#: bzrlib/builtins.py:5168
 msgid "Show the origin of each line in a file."
 msgstr ""
 
-#: bzrlib/builtins.py:5171
+#: bzrlib/builtins.py:5170
 msgid ""
 "This prints out the given file with an annotation on the left side\n"
 "indicating which revision, author and date introduced the change."
 msgstr ""
 
-#: bzrlib/builtins.py:5174
+#: bzrlib/builtins.py:5173
 msgid ""
 "If the origin is the same for a run of consecutive lines, it is\n"
 "shown only at the top, unless the --all option is given."
 msgstr ""
 
 # help of 'all' option of 'annotate' command
-#: bzrlib/builtins.py:5182
+#: bzrlib/builtins.py:5181
 msgid "Show annotations on all lines."
 msgstr ""
 
 # help of 'long' option of 'annotate' command
-#: bzrlib/builtins.py:5183
+#: bzrlib/builtins.py:5182
 msgid "Show commit date in annotations."
 msgstr ""
 
-#: bzrlib/builtins.py:5270
+#: bzrlib/builtins.py:5269
 msgid "Cannot sign a range of non-revision-history revisions"
 msgstr ""
 
-#: bzrlib/builtins.py:5282
+#: bzrlib/builtins.py:5281
 msgid "Please supply either one revision, or a range."
 msgstr ""
 
-#: bzrlib/builtins.py:5286
+#: bzrlib/builtins.py:5285
 msgid ""
 "Convert the current branch into a checkout of the supplied branch.\n"
 "If no branch is supplied, rebind to the last bound location."
 msgstr ""
 
-#: bzrlib/builtins.py:5289
+#: bzrlib/builtins.py:5288
 msgid ""
 "Once converted into a checkout, commits must succeed on the master branch\n"
 "before they will be applied to the local branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5292
+#: bzrlib/builtins.py:5291
 msgid ""
 "Bound branches use the nickname of its master branch unless it is set\n"
 "locally, in which case binding will update the local nickname to be\n"
 "that of the master."
 msgstr ""
 
-#: bzrlib/builtins.py:5307
+#: bzrlib/builtins.py:5306
 msgid "No location supplied.  This format does not remember old locations."
 msgstr ""
 
-#: bzrlib/builtins.py:5313
+#: bzrlib/builtins.py:5312
 msgid "Branch is already bound"
 msgstr ""
 
-#: bzrlib/builtins.py:5316
+#: bzrlib/builtins.py:5315
 msgid "No location supplied and no previous location known"
 msgstr ""
 
-#: bzrlib/builtins.py:5322
+#: bzrlib/builtins.py:5321
 msgid "These branches have diverged. Try merging, and then bind again."
 msgstr ""
 
-#: bzrlib/builtins.py:5329
+#: bzrlib/builtins.py:5328
 msgid "Convert the current checkout into a regular branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5331
+#: bzrlib/builtins.py:5330
 msgid ""
 "After unbinding, the local branch is considered independent and subsequent\n"
 "commits will be local only."
 msgstr ""
 
-#: bzrlib/builtins.py:5342
+#: bzrlib/builtins.py:5341
 msgid "Local branch is not bound"
 msgstr ""
 
-#: bzrlib/builtins.py:5346
+#: bzrlib/builtins.py:5345
 msgid "Remove the last committed revision."
 msgstr ""
 
-#: bzrlib/builtins.py:5348
+#: bzrlib/builtins.py:5347
 msgid ""
 "--verbose will print out what is being removed.\n"
 "--dry-run will go through all the motions, but not actually\n"
 "remove anything."
 msgstr ""
 
-#: bzrlib/builtins.py:5352
+#: bzrlib/builtins.py:5351
 msgid ""
 "If --revision is specified, uncommit revisions to leave the branch at the\n"
 "specified revision.  For example, \"bzr uncommit -r 15\" will leave the\n"
 "branch at revision 15."
 msgstr ""
 
-#: bzrlib/builtins.py:5356
+#: bzrlib/builtins.py:5355
 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"
@@ -3378,75 +3372,75 @@
 msgstr ""
 
 # help of 'dry-run' option of 'uncommit' command
-#: bzrlib/builtins.py:5367
+#: bzrlib/builtins.py:5366
 msgid "Don't actually make changes."
 msgstr ""
 
 # help of 'force' option of 'uncommit' command
-#: bzrlib/builtins.py:5368
+#: bzrlib/builtins.py:5367
 msgid "Say yes to all questions."
 msgstr ""
 
 # help of 'keep-tags' option of 'uncommit' command
-#: bzrlib/builtins.py:5370
+#: bzrlib/builtins.py:5369
 msgid "Keep tags that point to removed revisions."
 msgstr ""
 
 # help of 'local' option of 'uncommit' command
-#: bzrlib/builtins.py:5372
+#: bzrlib/builtins.py:5371
 msgid "Only remove the commits from the local branch when in a checkout."
 msgstr ""
 
-#: bzrlib/builtins.py:5421
+#: bzrlib/builtins.py:5420
 msgid "No revisions to uncommit.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5436
+#: bzrlib/builtins.py:5435
 msgid "Dry-run, pretending to remove the above revisions.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5439
+#: bzrlib/builtins.py:5438
 msgid "The above revision(s) will be removed.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5443
+#: bzrlib/builtins.py:5442
 msgid "Uncommit these revisions"
 msgstr ""
 
-#: bzrlib/builtins.py:5446
+#: bzrlib/builtins.py:5445
 msgid "Canceled\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5453
+#: bzrlib/builtins.py:5452
 #, python-format
 msgid ""
 "You can restore the old tip by running:\n"
 "  bzr pull . -r revid:%s\n"
 msgstr ""
 
-#: bzrlib/builtins.py:5458
+#: bzrlib/builtins.py:5457
 msgid "Break a dead lock."
 msgstr ""
 
-#: bzrlib/builtins.py:5460
+#: bzrlib/builtins.py:5459
 msgid ""
 "This command breaks a lock on a repository, branch, working directory or\n"
 "config file."
 msgstr ""
 
-#: bzrlib/builtins.py:5463
+#: bzrlib/builtins.py:5462
 msgid ""
 "CAUTION: Locks should only be broken when you are sure that the process\n"
 "holding the lock has been stopped."
 msgstr ""
 
-#: bzrlib/builtins.py:5466
+#: bzrlib/builtins.py:5465
 msgid ""
 "You can get information on what locks are open via the 'bzr info\n"
 "[location]' command."
 msgstr ""
 
-#: bzrlib/builtins.py:5469
+#: bzrlib/builtins.py:5468
 msgid ""
 ":Examples:\n"
 "    bzr break-lock\n"
@@ -3455,46 +3449,46 @@
 msgstr ""
 
 # help of 'config' option of 'break-lock' command
-#: bzrlib/builtins.py:5478
+#: bzrlib/builtins.py:5477
 msgid "LOCATION is the directory where the config lock is."
 msgstr ""
 
 # help of 'force' option of 'break-lock' command
-#: bzrlib/builtins.py:5480
+#: bzrlib/builtins.py:5479
 msgid "Do not ask for confirmation before breaking the lock."
 msgstr ""
 
 # help of 'protocol=bzr' option of 'serve' command
-#: bzrlib/builtins.py:5515
+#: bzrlib/builtins.py:5514
 msgid "The Bazaar smart server protocol over TCP. (default port: 4155)"
 msgstr ""
 
-#: bzrlib/builtins.py:5516
+#: bzrlib/builtins.py:5515
 msgid "Run the bzr server."
 msgstr ""
 
 # help of 'inet' option of 'serve' command
-#: bzrlib/builtins.py:5522
+#: bzrlib/builtins.py:5521
 msgid "Serve on stdin/out for use from inetd or sshd."
 msgstr ""
 
 # title of 'protocol' option of 'serve' command
-#: bzrlib/builtins.py:5523
+#: bzrlib/builtins.py:5522
 msgid "protocol"
 msgstr ""
 
 # help of 'protocol' option of 'serve' command
-#: bzrlib/builtins.py:5524
+#: bzrlib/builtins.py:5523
 msgid "Protocol to serve."
 msgstr ""
 
 # help of 'listen' option of 'serve' command
-#: bzrlib/builtins.py:5528
+#: bzrlib/builtins.py:5527
 msgid "Listen for connections on nominated address."
 msgstr ""
 
 # help of 'port' option of 'serve' command
-#: bzrlib/builtins.py:5530
+#: bzrlib/builtins.py:5529
 msgid ""
 "Listen for connections on nominated port.  Passing 0 as the port number will "
 "result in a dynamically allocated port.  The default port depends on the "
@@ -3502,12 +3496,12 @@
 msgstr ""
 
 # help of 'directory' option of 'serve' command
-#: bzrlib/builtins.py:5535
+#: bzrlib/builtins.py:5534
 msgid "Serve contents of this directory."
 msgstr ""
 
 # help of 'allow-writes' option of 'serve' command
-#: bzrlib/builtins.py:5537
+#: bzrlib/builtins.py:5536
 msgid ""
 "By default the server is a readonly server.  Supplying --allow-writes "
 "enables write access to the contents of the served directory and below.  "
@@ -3517,114 +3511,114 @@
 msgstr ""
 
 # help of 'client-timeout' option of 'serve' command
-#: bzrlib/builtins.py:5546
+#: bzrlib/builtins.py:5545
 msgid "Override the default idle client timeout (5min)."
 msgstr ""
 
-#: bzrlib/builtins.py:5564
+#: bzrlib/builtins.py:5563
 msgid "Combine a tree into its containing tree."
 msgstr ""
 
-#: bzrlib/builtins.py:5566
+#: bzrlib/builtins.py:5565
 msgid "This command requires the target tree to be in a rich-root format."
 msgstr ""
 
-#: bzrlib/builtins.py:5568
+#: bzrlib/builtins.py:5567
 msgid ""
 "The TREE argument should be an independent tree, inside another tree, but\n"
 "not part of it.  (Such trees can be produced by \"bzr split\", but also by\n"
 "running \"bzr branch\" with the target inside a tree.)"
 msgstr ""
 
-#: bzrlib/builtins.py:5572
+#: bzrlib/builtins.py:5571
 msgid ""
 "The result is a combined tree, with the subtree no longer an independent\n"
 "part.  This is marked as a merge of the subtree into the containing tree,\n"
 "and all history is preserved."
 msgstr ""
 
-#: bzrlib/builtins.py:5590
+#: bzrlib/builtins.py:5589
 #, python-format
 msgid ""
 "Can't join trees because %s doesn't support rich root data.\n"
 "You can use bzr upgrade on the repository."
 msgstr ""
 
-#: bzrlib/builtins.py:5600 bzrlib/builtins.py:5606
+#: bzrlib/builtins.py:5599 bzrlib/builtins.py:5605
 msgid "Cannot join {0}.  {1}"
 msgstr ""
 
-#: bzrlib/builtins.py:5610
+#: bzrlib/builtins.py:5609
 msgid "Split a subdirectory of a tree into a separate tree."
 msgstr ""
 
-#: bzrlib/builtins.py:5612
+#: bzrlib/builtins.py:5611
 msgid ""
 "This command will produce a target tree in a format that supports\n"
 "rich roots, like 'rich-root' or 'rich-root-pack'.  These formats cannot be\n"
 "converted into earlier formats like 'dirstate-tags'."
 msgstr ""
 
-#: bzrlib/builtins.py:5616
+#: bzrlib/builtins.py:5615
 msgid ""
 "The TREE argument should be a subdirectory of a working tree.  That\n"
 "subdirectory will be converted into an independent tree, with its own\n"
 "branch.  Commits in the top-level tree will not apply to the new subtree."
 msgstr ""
 
-#: bzrlib/builtins.py:5696
+#: bzrlib/builtins.py:5695
 msgid "No submit branch specified or known"
 msgstr ""
 
-#: bzrlib/builtins.py:5705 bzrlib/send.py:109
+#: bzrlib/builtins.py:5704 bzrlib/send.py:109
 msgid "No public branch specified or known"
 msgstr ""
 
-#: bzrlib/builtins.py:5710
+#: bzrlib/builtins.py:5709
 msgid "bzr merge-directive takes at most two one revision identifiers"
 msgstr ""
 
-#: bzrlib/builtins.py:5719
+#: bzrlib/builtins.py:5718
 msgid "No revisions to bundle."
 msgstr ""
 
-#: bzrlib/builtins.py:5738
+#: bzrlib/builtins.py:5737
 msgid "Mail or create a merge-directive for submitting changes."
 msgstr ""
 
-#: bzrlib/builtins.py:5740
+#: bzrlib/builtins.py:5739
 msgid "A merge directive provides many things needed for requesting merges:"
 msgstr ""
 
-#: bzrlib/builtins.py:5742
+#: bzrlib/builtins.py:5741
 msgid "* A machine-readable description of the merge to perform"
 msgstr ""
 
-#: bzrlib/builtins.py:5744
+#: bzrlib/builtins.py:5743
 msgid "* An optional patch that is a preview of the changes requested"
 msgstr ""
 
-#: bzrlib/builtins.py:5746
+#: bzrlib/builtins.py:5745
 msgid ""
 "* An optional bundle of revision data, so that the changes can be applied\n"
 "  directly from the merge directive, without retrieving data from a\n"
 "  branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5750
+#: bzrlib/builtins.py:5749
 msgid ""
 "`bzr send` creates a compact data set that, when applied using bzr\n"
 "merge, has the same effect as merging from the source branch.  "
 msgstr ""
 
-#: bzrlib/builtins.py:5753
+#: bzrlib/builtins.py:5752
 msgid ""
 "By default the merge directive is self-contained and can be applied to any\n"
 "branch containing submit_branch in its ancestory without needing access to\n"
 "the source branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5757
+#: bzrlib/builtins.py:5756
 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"
@@ -3633,7 +3627,7 @@
 "included if known, so that people can check it later."
 msgstr ""
 
-#: bzrlib/builtins.py:5763
+#: bzrlib/builtins.py:5762
 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"
@@ -3642,7 +3636,7 @@
 "be changed using --from."
 msgstr ""
 
-#: bzrlib/builtins.py:5769
+#: bzrlib/builtins.py:5768
 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"
@@ -3651,7 +3645,7 @@
 "--remember. The value will only be saved if the location can be accessed."
 msgstr ""
 
-#: bzrlib/builtins.py:5775
+#: bzrlib/builtins.py:5774
 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"
@@ -3659,20 +3653,20 @@
 "in the merge directive."
 msgstr ""
 
-#: bzrlib/builtins.py:5780
+#: bzrlib/builtins.py:5779
 msgid ""
 "The default behaviour is to send the merge directive by mail, unless -o is\n"
 "given, in which case it is sent to a file."
 msgstr ""
 
-#: bzrlib/builtins.py:5783
+#: bzrlib/builtins.py:5782
 msgid ""
 "Mail is sent using your preferred mail program.  This should be transparent\n"
 "on Windows (it uses MAPI).  On Unix, it requires the xdg-email utility.\n"
 "If the preferred client can't be found (or used), your editor will be used."
 msgstr ""
 
-#: bzrlib/builtins.py:5787
+#: bzrlib/builtins.py:5786
 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"
@@ -3684,7 +3678,7 @@
 "supported clients."
 msgstr ""
 
-#: bzrlib/builtins.py:5794
+#: bzrlib/builtins.py:5793
 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"
@@ -3692,7 +3686,7 @@
 "in the submit branch."
 msgstr ""
 
-#: bzrlib/builtins.py:5799
+#: bzrlib/builtins.py:5798
 msgid ""
 "Two formats are currently supported: \"4\" uses revision bundle format 4 "
 "and\n"
@@ -3702,13 +3696,13 @@
 "format 1.  It is compatible with Bazaar 0.12 - 0.18."
 msgstr ""
 
-#: bzrlib/builtins.py:5805
+#: bzrlib/builtins.py:5804
 msgid ""
 "The merge directives created by bzr send may be applied using bzr merge or\n"
 "bzr pull by specifying a file containing a merge directive as the location."
 msgstr ""
 
-#: bzrlib/builtins.py:5808
+#: bzrlib/builtins.py:5807
 msgid ""
 "bzr send makes extensive use of public locations to map local locations "
 "into\n"
@@ -3717,44 +3711,44 @@
 msgstr ""
 
 # help of 'output' option of 'send' command
-#: bzrlib/builtins.py:5832
+#: bzrlib/builtins.py:5831
 msgid "Write merge directive to this file or directory; use - for stdout."
 msgstr ""
 
 # help of 'strict' option of 'send' command
-#: bzrlib/builtins.py:5836
+#: bzrlib/builtins.py:5835
 msgid ""
 "Refuse to send if there are uncommitted changes in the working tree, --no-"
 "strict disables the check."
 msgstr ""
 
 # help of 'mail-to' option of 'send' command
-#: bzrlib/builtins.py:5838
+#: bzrlib/builtins.py:5837
 msgid "Mail the request to this address."
 msgstr ""
 
 # help of 'body' option of 'send' command
-#: bzrlib/builtins.py:5842
+#: bzrlib/builtins.py:5841
 msgid "Body for the email."
 msgstr ""
 
 # help of 'no-bundle' option of 'send' command
-#: bzrlib/builtins.py:5895
+#: bzrlib/builtins.py:5894
 msgid "Do not include a bundle in the merge directive."
 msgstr ""
 
 # help of 'no-patch' option of 'send' command
-#: bzrlib/builtins.py:5896
+#: bzrlib/builtins.py:5895
 msgid "Do not include a preview patch in the merge directive."
 msgstr ""
 
 # help of 'remember' option of 'send' command
-#: bzrlib/builtins.py:5899
+#: bzrlib/builtins.py:5898
 msgid "Remember submit and public branch."
 msgstr ""
 
 # help of 'from' option of 'send' command
-#: bzrlib/builtins.py:5901
+#: bzrlib/builtins.py:5900
 msgid ""
 "Branch to generate the submission from, rather than the one containing the "
 "working directory."
@@ -3762,46 +3756,46 @@
 
 # title of 'format' option of 'send' command
 # title of 'format' option of 'version-info' command
-#: bzrlib/builtins.py:5911 bzrlib/cmd_version_info.py:76
+#: bzrlib/builtins.py:5910 bzrlib/cmd_version_info.py:76
 msgid "format"
 msgstr ""
 
 # help of 'format' option of 'send' command
-#: bzrlib/builtins.py:5912
+#: bzrlib/builtins.py:5911
 msgid "Use the specified output format."
 msgstr ""
 
-#: bzrlib/builtins.py:5934
+#: bzrlib/builtins.py:5933
 msgid "Create, remove or modify a tag naming a revision."
 msgstr ""
 
-#: bzrlib/builtins.py:5936
+#: bzrlib/builtins.py:5935
 msgid ""
 "Tags give human-meaningful names to revisions.  Commands that take a -r\n"
 "(--revision) option can be given -rtag:X, where X is any previously\n"
 "created tag."
 msgstr ""
 
-#: bzrlib/builtins.py:5940
+#: bzrlib/builtins.py:5939
 msgid ""
 "Tags are stored in the branch.  Tags are copied from one branch to another\n"
 "along when you branch, push, pull or merge."
 msgstr ""
 
-#: bzrlib/builtins.py:5943
+#: bzrlib/builtins.py:5942
 msgid ""
 "It is an error to give a tag name that already exists unless you pass\n"
 "--force, in which case the tag is moved to point to the new revision."
 msgstr ""
 
-#: bzrlib/builtins.py:5946
+#: bzrlib/builtins.py:5945
 msgid ""
 "To rename a tag (change the name but keep it on the same revsion), run "
 "``bzr\n"
 "tag new-name -r tag:old-name`` and then ``bzr tag --delete oldname``."
 msgstr ""
 
-#: bzrlib/builtins.py:5949
+#: bzrlib/builtins.py:5948
 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"
@@ -3810,81 +3804,85 @@
 msgstr ""
 
 # help of 'delete' option of 'tag' command
-#: bzrlib/builtins.py:5959
+#: bzrlib/builtins.py:5958
 msgid "Delete this tag rather than placing it."
 msgstr ""
 
 # help of 'directory' option of 'tag' command
-#: bzrlib/builtins.py:5962
+#: bzrlib/builtins.py:5961
 msgid "Branch in which to place the tag."
 msgstr ""
 
 # help of 'force' option of 'tag' command
-#: bzrlib/builtins.py:5964
+#: bzrlib/builtins.py:5963
 msgid "Replace existing tags."
 msgstr ""
 
-#: bzrlib/builtins.py:5979
+#: bzrlib/builtins.py:5978
 msgid "No tag specified to delete."
 msgstr ""
 
-#: bzrlib/builtins.py:5981
+#: bzrlib/builtins.py:5980
 #, python-format
 msgid "Deleted tag %s."
 msgstr ""
 
-#: bzrlib/builtins.py:5995
+#: bzrlib/builtins.py:5985
+msgid "Tags can only be placed on a single revision, not on a range"
+msgstr ""
+
+#: bzrlib/builtins.py:5994
 msgid "Please specify a tag name."
 msgstr ""
 
-#: bzrlib/builtins.py:6003
+#: bzrlib/builtins.py:6002
 #, python-format
 msgid "Tag %s already exists for that revision."
 msgstr ""
 
-#: bzrlib/builtins.py:6007
+#: bzrlib/builtins.py:6006
 #, python-format
 msgid "Created tag %s."
 msgstr ""
 
-#: bzrlib/builtins.py:6009
+#: bzrlib/builtins.py:6008
 #, python-format
 msgid "Updated tag %s."
 msgstr ""
 
-#: bzrlib/builtins.py:6013
+#: bzrlib/builtins.py:6012
 msgid "List tags."
 msgstr ""
 
-#: bzrlib/builtins.py:6015
+#: bzrlib/builtins.py:6014
 msgid ""
 "This command shows a table of tag names and the revisions they reference."
 msgstr ""
 
 # help of 'directory' option of 'tags' command
-#: bzrlib/builtins.py:6021
+#: bzrlib/builtins.py:6020
 msgid "Branch whose tags should be displayed."
 msgstr ""
 
 # help of 'sort' option of 'tags' command
-#: bzrlib/builtins.py:6023
+#: bzrlib/builtins.py:6022
 msgid "Sort tags by different criteria."
 msgstr ""
 
 # title of 'sort' option of 'tags' command
-#: bzrlib/builtins.py:6023
+#: bzrlib/builtins.py:6022
 msgid "Sorting"
 msgstr ""
 
-#: bzrlib/builtins.py:6092
+#: bzrlib/builtins.py:6091
 msgid "Reconfigure the type of a bzr directory."
 msgstr ""
 
-#: bzrlib/builtins.py:6094
+#: bzrlib/builtins.py:6093
 msgid "A target configuration must be specified."
 msgstr ""
 
-#: bzrlib/builtins.py:6096
+#: bzrlib/builtins.py:6095
 msgid ""
 "For checkouts, the bind-to location will be auto-detected if not specified.\n"
 "The order of preference is\n"
@@ -3896,112 +3894,112 @@
 msgstr ""
 
 # title of 'tree_type' option of 'reconfigure' command
-#: bzrlib/builtins.py:6110
+#: bzrlib/builtins.py:6109
 msgid "Tree type"
 msgstr ""
 
 # help of 'tree_type' option of 'reconfigure' command
-#: bzrlib/builtins.py:6111
+#: bzrlib/builtins.py:6110
 msgid "The relation between branch and tree."
 msgstr ""
 
 # help of 'tree_type=branch' option of 'reconfigure' command
-#: bzrlib/builtins.py:6113
+#: bzrlib/builtins.py:6112
 msgid "Reconfigure to be an unbound branch with no working tree."
 msgstr ""
 
 # help of 'tree_type=tree' option of 'reconfigure' command
-#: bzrlib/builtins.py:6114
+#: bzrlib/builtins.py:6113
 msgid "Reconfigure to be an unbound branch with a working tree."
 msgstr ""
 
 # help of 'tree_type=checkout' option of 'reconfigure' command
-#: bzrlib/builtins.py:6115
+#: bzrlib/builtins.py:6114
 msgid "Reconfigure to be a bound branch with a working tree."
 msgstr ""
 
 # help of 'tree_type=lightweight-checkout' option of 'reconfigure' command
-#: bzrlib/builtins.py:6116
+#: bzrlib/builtins.py:6115
 msgid "Reconfigure to be a lightweight checkout (with no local history)."
 msgstr ""
 
 # title of 'repository_type' option of 'reconfigure' command
-#: bzrlib/builtins.py:6121
+#: bzrlib/builtins.py:6120
 msgid "Repository type"
 msgstr ""
 
 # help of 'repository_type' option of 'reconfigure' command
-#: bzrlib/builtins.py:6122
+#: bzrlib/builtins.py:6121
 msgid "Location fo the repository."
 msgstr ""
 
 # help of 'repository_type=standalone' option of 'reconfigure' command
-#: bzrlib/builtins.py:6124
+#: bzrlib/builtins.py:6123
 msgid ""
 "Reconfigure to be a standalone branch (i.e. stop using shared repository)."
 msgstr ""
 
 # help of 'repository_type=use-shared' option of 'reconfigure' command
-#: bzrlib/builtins.py:6126
+#: bzrlib/builtins.py:6125
 msgid "Reconfigure to use a shared repository."
 msgstr ""
 
 # title of 'repository_trees' option of 'reconfigure' command
-#: bzrlib/builtins.py:6130
+#: bzrlib/builtins.py:6129
 msgid "Trees in Repository"
 msgstr ""
 
 # help of 'repository_trees' option of 'reconfigure' command
-#: bzrlib/builtins.py:6131
+#: bzrlib/builtins.py:6130
 msgid "Whether new branches in the repository have trees."
 msgstr ""
 
 # help of 'repository_trees=with-trees' option of 'reconfigure' command
-#: bzrlib/builtins.py:6133
+#: bzrlib/builtins.py:6132
 msgid "Reconfigure repository to create working trees on branches by default."
 msgstr ""
 
 # help of 'repository_trees=with-no-trees' option of 'reconfigure' command
-#: bzrlib/builtins.py:6135
+#: bzrlib/builtins.py:6134
 msgid ""
 "Reconfigure repository to not create working trees on branches by default."
 msgstr ""
 
 # help of 'bind-to' option of 'reconfigure' command
-#: bzrlib/builtins.py:6138
+#: bzrlib/builtins.py:6137
 msgid "Branch to bind checkout to."
 msgstr ""
 
 # help of 'force' option of 'reconfigure' command
-#: bzrlib/builtins.py:6140
+#: bzrlib/builtins.py:6139
 msgid "Perform reconfiguration even if local changes will be lost."
 msgstr ""
 
 # help of 'stacked-on' option of 'reconfigure' command
-#: bzrlib/builtins.py:6143
+#: bzrlib/builtins.py:6142
 msgid "Reconfigure a branch to be stacked on another branch."
 msgstr ""
 
 # help of 'unstacked' option of 'reconfigure' command
-#: bzrlib/builtins.py:6147
+#: bzrlib/builtins.py:6146
 msgid ""
 "Reconfigure a branch to be unstacked.  This may require copying substantial "
 "data into it."
 msgstr ""
 
-#: bzrlib/builtins.py:6157
+#: bzrlib/builtins.py:6156
 msgid "Can't use both --stacked-on and --unstacked"
 msgstr ""
 
-#: bzrlib/builtins.py:6171
+#: bzrlib/builtins.py:6170
 msgid "No target configuration specified"
 msgstr ""
 
-#: bzrlib/builtins.py:6206
+#: bzrlib/builtins.py:6205
 msgid "Set the branch of a checkout and update."
 msgstr ""
 
-#: bzrlib/builtins.py:6208
+#: bzrlib/builtins.py:6207
 msgid ""
 "For lightweight checkouts, this changes the branch being referenced.\n"
 "For heavyweight checkouts, this checks that there are no local commits\n"
@@ -4009,17 +4007,17 @@
 "of the new location and binds to it."
 msgstr ""
 
-#: bzrlib/builtins.py:6213
+#: bzrlib/builtins.py:6212
 msgid ""
 "In both cases, the working tree is updated and uncommitted changes\n"
 "are merged. The user can commit or revert these as they desire."
 msgstr ""
 
-#: bzrlib/builtins.py:6216
+#: bzrlib/builtins.py:6215
 msgid "Pending merges need to be committed or reverted before using switch."
 msgstr ""
 
-#: bzrlib/builtins.py:6218
+#: bzrlib/builtins.py:6217
 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"
@@ -4027,7 +4025,7 @@
 "/path/to/newbranch."
 msgstr ""
 
-#: bzrlib/builtins.py:6223
+#: bzrlib/builtins.py:6222
 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"
@@ -4035,28 +4033,33 @@
 msgstr ""
 
 # help of 'force' option of 'switch' command
-#: bzrlib/builtins.py:6231
+#: bzrlib/builtins.py:6230
 msgid "Switch even if local commits will be lost."
 msgstr ""
 
 # help of 'create-branch' option of 'switch' command
-#: bzrlib/builtins.py:6234
+#: bzrlib/builtins.py:6233
 msgid "Create the target branch from this one before switching to it."
 msgstr ""
 
-#: bzrlib/builtins.py:6248
+# help of 'store' option of 'switch' command
+#: bzrlib/builtins.py:6236
+msgid "Store and restore uncommitted changes in the branch."
+msgstr ""
+
+#: bzrlib/builtins.py:6250
 msgid "You must supply either a revision or a location"
 msgstr ""
 
-#: bzrlib/builtins.py:6261
+#: bzrlib/builtins.py:6263
 msgid "cannot create branch without source branch"
 msgstr ""
 
-#: bzrlib/builtins.py:6286
+#: bzrlib/builtins.py:6289
 msgid "Manage filtered views."
 msgstr ""
 
-#: bzrlib/builtins.py:6288
+#: bzrlib/builtins.py:6291
 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"
@@ -4066,7 +4069,7 @@
 "must be within the current view."
 msgstr ""
 
-#: bzrlib/builtins.py:6295
+#: bzrlib/builtins.py:6298
 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"
@@ -4074,7 +4077,7 @@
 "and switch between them."
 msgstr ""
 
-#: bzrlib/builtins.py:6300
+#: bzrlib/builtins.py:6303
 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"
@@ -4082,211 +4085,211 @@
 "want to switch back to your view after that."
 msgstr ""
 
-#: bzrlib/builtins.py:6305
+#: bzrlib/builtins.py:6308
 msgid ""
 ":Examples:\n"
 "  To define the current view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6308
+#: bzrlib/builtins.py:6311
 msgid "    bzr view file1 dir1 ..."
 msgstr ""
 
-#: bzrlib/builtins.py:6310
+#: bzrlib/builtins.py:6313
 msgid "  To list the current view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6312
+#: bzrlib/builtins.py:6315
 msgid "    bzr view"
 msgstr ""
 
-#: bzrlib/builtins.py:6314
+#: bzrlib/builtins.py:6317
 msgid "  To delete the current view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6316
+#: bzrlib/builtins.py:6319
 msgid "    bzr view --delete"
 msgstr ""
 
-#: bzrlib/builtins.py:6318
+#: bzrlib/builtins.py:6321
 msgid "  To disable the current view without deleting it::"
 msgstr ""
 
-#: bzrlib/builtins.py:6320
+#: bzrlib/builtins.py:6323
 msgid "    bzr view --switch off"
 msgstr ""
 
-#: bzrlib/builtins.py:6322
+#: bzrlib/builtins.py:6325
 msgid "  To define a named view and switch to it::"
 msgstr ""
 
-#: bzrlib/builtins.py:6324
+#: bzrlib/builtins.py:6327
 msgid "    bzr view --name view-name file1 dir1 ..."
 msgstr ""
 
-#: bzrlib/builtins.py:6326
+#: bzrlib/builtins.py:6329
 msgid "  To list a named view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6328
+#: bzrlib/builtins.py:6331
 msgid "    bzr view --name view-name"
 msgstr ""
 
-#: bzrlib/builtins.py:6330
+#: bzrlib/builtins.py:6333
 msgid "  To delete a named view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6332
+#: bzrlib/builtins.py:6335
 msgid "    bzr view --name view-name --delete"
 msgstr ""
 
-#: bzrlib/builtins.py:6334
+#: bzrlib/builtins.py:6337
 msgid "  To switch to a named view::"
 msgstr ""
 
-#: bzrlib/builtins.py:6336
+#: bzrlib/builtins.py:6339
 msgid "    bzr view --switch view-name"
 msgstr ""
 
-#: bzrlib/builtins.py:6338
+#: bzrlib/builtins.py:6341
 msgid "  To list all views defined::"
 msgstr ""
 
-#: bzrlib/builtins.py:6340
+#: bzrlib/builtins.py:6343
 msgid "    bzr view --all"
 msgstr ""
 
-#: bzrlib/builtins.py:6342
+#: bzrlib/builtins.py:6345
 msgid "  To delete all views::"
 msgstr ""
 
-#: bzrlib/builtins.py:6344
+#: bzrlib/builtins.py:6347
 msgid "    bzr view --delete --all"
 msgstr ""
 
 # help of 'all' option of 'view' command
-#: bzrlib/builtins.py:6351
+#: bzrlib/builtins.py:6354
 msgid "Apply list or delete action to all views."
 msgstr ""
 
 # help of 'delete' option of 'view' command
-#: bzrlib/builtins.py:6354
+#: bzrlib/builtins.py:6357
 msgid "Delete the view."
 msgstr ""
 
 # help of 'name' option of 'view' command
-#: bzrlib/builtins.py:6357
+#: bzrlib/builtins.py:6360
 msgid "Name of the view to define, list or delete."
 msgstr ""
 
 # help of 'switch' option of 'view' command
-#: bzrlib/builtins.py:6361
+#: bzrlib/builtins.py:6364
 msgid "Name of the view to switch to."
 msgstr ""
 
-#: bzrlib/builtins.py:6380
+#: bzrlib/builtins.py:6383
 msgid "Both --delete and a file list specified"
 msgstr ""
 
-#: bzrlib/builtins.py:6383
+#: bzrlib/builtins.py:6386
 msgid "Both --delete and --switch specified"
 msgstr ""
 
-#: bzrlib/builtins.py:6386
+#: bzrlib/builtins.py:6389
 msgid "Deleted all views.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6388
+#: bzrlib/builtins.py:6391
 msgid "No current view to delete"
 msgstr ""
 
-#: bzrlib/builtins.py:6391
+#: bzrlib/builtins.py:6394
 #, python-format
 msgid "Deleted '%s' view.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6395
+#: bzrlib/builtins.py:6398
 msgid "Both --switch and a file list specified"
 msgstr ""
 
-#: bzrlib/builtins.py:6398
+#: bzrlib/builtins.py:6401
 msgid "Both --switch and --all specified"
 msgstr ""
 
-#: bzrlib/builtins.py:6401
+#: bzrlib/builtins.py:6404
 msgid "No current view to disable"
 msgstr ""
 
-#: bzrlib/builtins.py:6403
+#: bzrlib/builtins.py:6406
 #, python-format
 msgid "Disabled '%s' view.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6407 bzrlib/builtins.py:6429
+#: bzrlib/builtins.py:6410 bzrlib/builtins.py:6432
 msgid "Using '{0}' view: {1}\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6410
+#: bzrlib/builtins.py:6413
 msgid "Views defined:\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6419
+#: bzrlib/builtins.py:6422
 msgid "No views defined.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6426
+#: bzrlib/builtins.py:6429
 msgid "Cannot change the 'off' pseudo view"
 msgstr ""
 
-#: bzrlib/builtins.py:6434
+#: bzrlib/builtins.py:6437
 msgid "No current view.\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6437
+#: bzrlib/builtins.py:6440
 msgid "'{0}' view is: {1}\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6457
+#: bzrlib/builtins.py:6460
 msgid "    <no hooks installed>\n"
 msgstr ""
 
-#: bzrlib/builtins.py:6461
+#: bzrlib/builtins.py:6464
 msgid "Remove a branch."
 msgstr ""
 
-#: bzrlib/builtins.py:6463
+#: bzrlib/builtins.py:6466
 msgid ""
 "This will remove the branch from the specified location but \n"
 "will keep any working tree or repository in place."
 msgstr ""
 
-#: bzrlib/builtins.py:6468
+#: bzrlib/builtins.py:6471
 msgid "  Remove the branch at repo/trunk::"
 msgstr ""
 
-#: bzrlib/builtins.py:6470
+#: bzrlib/builtins.py:6473
 msgid "    bzr remove-branch repo/trunk"
 msgstr ""
 
 # help of 'force' option of 'remove-branch' command
-#: bzrlib/builtins.py:6477
+#: bzrlib/builtins.py:6480
 msgid "Remove branch even if it is the active branch."
 msgstr ""
 
-#: bzrlib/builtins.py:6491
+#: bzrlib/builtins.py:6494
 msgid "Branch is active. Use --force to remove it."
 msgstr ""
 
 # help of 'writer=plain' option of 'shelve' command
-#: bzrlib/builtins.py:6495
+#: bzrlib/builtins.py:6498
 msgid "Plaintext diff output."
 msgstr ""
 
-#: bzrlib/builtins.py:6496
+#: bzrlib/builtins.py:6499
 msgid "Temporarily set aside some changes from the current tree."
 msgstr ""
 
-#: bzrlib/builtins.py:6498
+#: bzrlib/builtins.py:6501
 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"
@@ -4295,11 +4298,11 @@
 "will they survive its deletion."
 msgstr ""
 
-#: bzrlib/builtins.py:6504
+#: bzrlib/builtins.py:6507
 msgid "If shelve --list is specified, previously-shelved changes are listed."
 msgstr ""
 
-#: bzrlib/builtins.py:6506
+#: bzrlib/builtins.py:6509
 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"
@@ -4307,35 +4310,35 @@
 "shelve all text changes at once, use shelve --all."
 msgstr ""
 
-#: bzrlib/builtins.py:6511
+#: bzrlib/builtins.py:6514
 msgid ""
 "If filenames are specified, only the changes to those files will be\n"
 "shelved. Other files will be left untouched."
 msgstr ""
 
-#: bzrlib/builtins.py:6514
+#: bzrlib/builtins.py:6517
 msgid ""
 "If a revision is specified, changes since that revision will be shelved."
 msgstr ""
 
-#: bzrlib/builtins.py:6516
+#: bzrlib/builtins.py:6519
 msgid ""
 "You can put multiple items on the shelf, and by default, 'unshelve' will\n"
 "restore the most recently shelved changes."
 msgstr ""
 
-#: bzrlib/builtins.py:6519
+#: bzrlib/builtins.py:6522
 msgid ""
 "For complicated changes, it is possible to edit the changes in a separate\n"
 "editor program to decide what the file remaining in the working copy\n"
 "should look like.  To do this, add the configuration option"
 msgstr ""
 
-#: bzrlib/builtins.py:6523
+#: bzrlib/builtins.py:6526
 msgid "    change_editor = PROGRAM @new_path @old_path"
 msgstr ""
 
-#: bzrlib/builtins.py:6525
+#: bzrlib/builtins.py:6528
 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"
@@ -4345,39 +4348,39 @@
 msgstr ""
 
 # help of 'all' option of 'shelve' command
-#: bzrlib/builtins.py:6537
+#: bzrlib/builtins.py:6540
 msgid "Shelve all changes."
 msgstr ""
 
 # help of 'writer' option of 'shelve' command
-#: bzrlib/builtins.py:6539
+#: bzrlib/builtins.py:6542
 msgid "Method to use for writing diffs."
 msgstr ""
 
 # title of 'writer' option of 'shelve' command
-#: bzrlib/builtins.py:6539
+#: bzrlib/builtins.py:6542
 msgid "writer"
 msgstr ""
 
 # help of 'list' option of 'shelve' command
-#: bzrlib/builtins.py:6543
+#: bzrlib/builtins.py:6546
 msgid "List shelved changes."
 msgstr ""
 
 # help of 'destroy' option of 'shelve' command
-#: bzrlib/builtins.py:6545
+#: bzrlib/builtins.py:6548
 msgid "Destroy removed changes instead of shelving them."
 msgstr ""
 
-#: bzrlib/builtins.py:6574
+#: bzrlib/builtins.py:6577
 msgid "No shelved changes."
 msgstr ""
 
-#: bzrlib/builtins.py:6585
+#: bzrlib/builtins.py:6588
 msgid "Restore shelved changes."
 msgstr ""
 
-#: bzrlib/builtins.py:6587
+#: bzrlib/builtins.py:6590
 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"
@@ -4385,93 +4388,93 @@
 msgstr ""
 
 # help of 'action' option of 'unshelve' command
-#: bzrlib/builtins.py:6596
+#: bzrlib/builtins.py:6599
 msgid "The action to perform."
 msgstr ""
 
 # title of 'action' option of 'resolve' command
 # title of 'action' option of 'unshelve' command
-#: bzrlib/builtins.py:6596 bzrlib/conflicts.py:694
+#: bzrlib/builtins.py:6599 bzrlib/conflicts.py:694
 msgid "action"
 msgstr ""
 
 # help of 'action=apply' option of 'unshelve' command
-#: bzrlib/builtins.py:6598
+#: bzrlib/builtins.py:6601
 msgid "Apply changes and remove from the shelf."
 msgstr ""
 
 # help of 'action=dry-run' option of 'unshelve' command
-#: bzrlib/builtins.py:6599
+#: bzrlib/builtins.py:6602
 msgid "Show changes, but do not apply or remove them."
 msgstr ""
 
 # help of 'action=preview' option of 'unshelve' command
-#: bzrlib/builtins.py:6600
+#: bzrlib/builtins.py:6603
 msgid ""
 "Instead of unshelving the changes, show the diff that would result from "
 "unshelving."
 msgstr ""
 
 # help of 'action=delete-only' option of 'unshelve' command
-#: bzrlib/builtins.py:6602
+#: bzrlib/builtins.py:6605
 msgid "Delete changes without applying them."
 msgstr ""
 
 # help of 'action=keep' option of 'unshelve' command
-#: bzrlib/builtins.py:6603
+#: bzrlib/builtins.py:6606
 msgid "Apply changes but don't delete them."
 msgstr ""
 
-#: bzrlib/builtins.py:6618
+#: bzrlib/builtins.py:6621
 msgid "Remove unwanted files from working tree."
 msgstr ""
 
-#: bzrlib/builtins.py:6620
+#: bzrlib/builtins.py:6623
 msgid ""
 "By default, only unknown files, not ignored files, are deleted.  Versioned\n"
 "files are never deleted."
 msgstr ""
 
-#: bzrlib/builtins.py:6623
+#: bzrlib/builtins.py:6626
 msgid ""
 "Another class is 'detritus', which includes files emitted by bzr during\n"
 "normal operations and selftests.  (The value of these files decreases with\n"
 "time.)"
 msgstr ""
 
-#: bzrlib/builtins.py:6627
+#: bzrlib/builtins.py:6630
 msgid ""
 "If no options are specified, unknown files are deleted.  Otherwise, option\n"
 "flags are respected, and may be combined."
 msgstr ""
 
-#: bzrlib/builtins.py:6630
+#: bzrlib/builtins.py:6633
 msgid "To check what clean-tree will do, use --dry-run."
 msgstr ""
 
 # help of 'ignored' option of 'clean-tree' command
-#: bzrlib/builtins.py:6633
+#: bzrlib/builtins.py:6636
 msgid "Delete all ignored files."
 msgstr ""
 
 # help of 'detritus' option of 'clean-tree' command
-#: bzrlib/builtins.py:6634
+#: bzrlib/builtins.py:6637
 msgid ""
 "Delete conflict files, merge and revert backups, and failed selftest dirs."
 msgstr ""
 
 # help of 'unknown' option of 'clean-tree' command
-#: bzrlib/builtins.py:6637
+#: bzrlib/builtins.py:6640
 msgid "Delete files unknown to bzr (default)."
 msgstr ""
 
 # help of 'dry-run' option of 'clean-tree' command
-#: bzrlib/builtins.py:6638
+#: bzrlib/builtins.py:6641
 msgid "Show files to delete instead of deleting them."
 msgstr ""
 
 # help of 'force' option of 'clean-tree' command
-#: bzrlib/builtins.py:6640
+#: bzrlib/builtins.py:6643
 msgid "Do not prompt before deleting."
 msgstr ""
 
@@ -4746,7 +4749,7 @@
 msgstr ""
 
 #: bzrlib/cmd_version_info.py:59 en/help_topics/configuration.txt:712
-#: en/help_topics/configuration.txt:722
+#: en/help_topics/configuration.txt:738
 msgid "For example::"
 msgstr ""
 
@@ -4887,7 +4890,7 @@
 msgid "extra argument to command {0}: {1}"
 msgstr ""
 
-#: bzrlib/commands.py:972
+#: bzrlib/commands.py:952
 #, python-format
 msgid "Profile data written to \"%s\"."
 msgstr ""
@@ -4993,63 +4996,71 @@
 msgid "All commits signed with verifiable keys"
 msgstr ""
 
-#: bzrlib/config.py:436
+#: bzrlib/config.py:438
 msgid "Invalid config value for \"{0}\"  value {1!r} is not an SI unit."
 msgstr ""
 
-#: bzrlib/config.py:2452
+#: bzrlib/config.py:2468
 msgid "{0} is not an SI unit."
 msgstr ""
 
-#: bzrlib/config.py:2971
+#: bzrlib/config.py:2989
 msgid ""
 "Option {0} in section {1} of {2} was changed from {3} to {4}. The {5} value "
 "will be saved."
 msgstr ""
 
-#: bzrlib/config.py:3116
+#: bzrlib/config.py:3134
 #, python-format
 msgid "Invalid '%s', should be of the form 'name=value'"
 msgstr ""
 
-#: bzrlib/config.py:4018
+#: bzrlib/config.py:4089
 msgid "Display, set or remove a configuration option."
 msgstr ""
 
-#: bzrlib/config.py:4020
-msgid "Display the active value for a given option."
+#: bzrlib/config.py:4091
+msgid "Display the active value for option NAME."
 msgstr ""
 
-#: bzrlib/config.py:4022
+#: bzrlib/config.py:4093
 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."
+"matching options are displayed mentioning their scope and without resolving\n"
+"option references in the value). The active value that bzr will take into\n"
+"account is the first one displayed for each option."
 msgstr ""
 
-#: bzrlib/config.py:4026
-msgid "If no NAME is given, --all .* is implied."
+#: bzrlib/config.py:4098
+msgid ""
+"If NAME is not given, --all .* is implied (all options are displayed for "
+"the\n"
+"current scope)."
 msgstr ""
 
-#: bzrlib/config.py:4028
+#: bzrlib/config.py:4101
 msgid ""
-"Setting a value is achieved by using name=value without spaces. The value\n"
+"Setting a value is achieved by using NAME=value without spaces. The value\n"
 "is set in the most relevant scope and can be checked by displaying the\n"
 "option again."
 msgstr ""
 
+#: bzrlib/config.py:4105
+msgid "Removing a value is achieved by using --remove NAME."
+msgstr ""
+
 # help of 'scope' option of 'config' command
-#: bzrlib/config.py:4040
+#: bzrlib/config.py:4115
 msgid "Reduce the scope to the specified configuration file."
 msgstr ""
 
 # help of 'all' option of 'config' command
-#: bzrlib/config.py:4044
+#: bzrlib/config.py:4119
 msgid "Display all the defined values for the matching options."
 msgstr ""
 
 # help of 'remove' option of 'config' command
-#: bzrlib/config.py:4046
+#: bzrlib/config.py:4121
 msgid "Remove the option from the configuration file."
 msgstr ""
 
@@ -5139,7 +5150,7 @@
 msgid "{0} is{1} redirected to {2}"
 msgstr ""
 
-#: bzrlib/diff.py:399
+#: bzrlib/diff.py:400
 #, python-format
 msgid "*** Ignoring files outside view. View is %s"
 msgstr ""
@@ -6207,192 +6218,203 @@
 
 #: bzrlib/errors.py:2898
 msgid ""
+"Branch \"%(display_url)s\" does not support storing uncommitted changes."
+msgstr ""
+
+#: bzrlib/errors.py:2913
+msgid ""
 "Working tree \"%(display_url)s\" has shelved changes (See bzr shelve --list)."
 "%(more)s"
 msgstr ""
 
-#: bzrlib/errors.py:2904
+#: bzrlib/errors.py:2919
 msgid "Variable {%(name)s} is not available."
 msgstr ""
 
-#: bzrlib/errors.py:2912
+#: bzrlib/errors.py:2927
 msgid "No template specified."
 msgstr ""
 
-#: bzrlib/errors.py:2917
+#: bzrlib/errors.py:2932
 msgid "Unable to create symlink %(path_str)son this platform"
 msgstr ""
 
-#: bzrlib/errors.py:2932
+#: bzrlib/errors.py:2947
 msgid ""
 "Unsupported timezone format \"%(timezone)s\", options are \"utc\", \"original"
 "\", \"local\"."
 msgstr ""
 
-#: bzrlib/errors.py:2966
+#: bzrlib/errors.py:2981
 msgid ""
 "Unable to encode %(kind)s path %(path)r in user encoding %(user_encoding)s"
 msgstr ""
 
-#: bzrlib/errors.py:2978
+#: bzrlib/errors.py:2993
 msgid "The \"%(config_id)s\" configuration does not exist."
 msgstr ""
 
-#: bzrlib/errors.py:2986
+#: bzrlib/errors.py:3001
 msgid "The \"%(option_name)s\" configuration option does not exist."
 msgstr ""
 
-#: bzrlib/errors.py:2994
+#: bzrlib/errors.py:3009
 msgid "The alias \"%(alias_name)s\" does not exist."
 msgstr ""
 
-#: bzrlib/errors.py:3008
+#: bzrlib/errors.py:3023
 msgid "\"%(alias_name)s\" is not a valid location alias."
 msgstr ""
 
-#: bzrlib/errors.py:3016
+#: bzrlib/errors.py:3031
 msgid "No %(alias_name)s location assigned."
 msgstr ""
 
-#: bzrlib/errors.py:3024
+#: bzrlib/errors.py:3039
 msgid "Cannot bind address \"%(host)s:%(port)i\": %(orig_error)s."
 msgstr ""
 
-#: bzrlib/errors.py:3034
+#: bzrlib/errors.py:3049
 msgid "Unknown rules detected: %(unknowns_str)s."
 msgstr ""
 
-#: bzrlib/errors.py:3045
+#: bzrlib/errors.py:3060
 msgid "Tip change rejected: %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:3053
+#: bzrlib/errors.py:3068
 msgid "Shelf corrupt."
 msgstr ""
 
-#: bzrlib/errors.py:3058
+#: bzrlib/errors.py:3073
 msgid "Corruption while decompressing repository file%(orig_error)s"
 msgstr ""
 
-#: bzrlib/errors.py:3070
+#: bzrlib/errors.py:3085
 msgid "No changes are shelved with id \"%(shelf_id)d\"."
 msgstr ""
 
-#: bzrlib/errors.py:3078
+#: bzrlib/errors.py:3093
 msgid "\"%(invalid_id)s\" is not a valid shelf id, try a number instead."
 msgstr ""
 
-#: bzrlib/errors.py:3086
+#: bzrlib/errors.py:3101
 msgid "An attempt to access a url outside the server jail was made: '%(url)s'."
 msgstr ""
 
-#: bzrlib/errors.py:3094
+#: bzrlib/errors.py:3109
 msgid "The user aborted the operation."
 msgstr ""
 
-#: bzrlib/errors.py:3099
+#: bzrlib/errors.py:3114
 msgid "Branching '%(url)s'(%(format)s) must create a working tree."
 msgstr ""
 
-#: bzrlib/errors.py:3109
+#: bzrlib/errors.py:3124
 msgid "No such view: %(view_name)s."
 msgstr ""
 
-#: bzrlib/errors.py:3119
+#: bzrlib/errors.py:3134
 msgid ""
 "Views are not supported by %(tree)s; use 'bzr upgrade' to change your tree "
 "to a later format."
 msgstr ""
 
-#: bzrlib/errors.py:3128
+#: bzrlib/errors.py:3143
 msgid ""
 "Specified file \"%(file_name)s\" is outside the current view: %(view_str)s"
 msgstr ""
 
-#: bzrlib/errors.py:3195
+#: bzrlib/errors.py:3210
 msgid "%(bzrdir)r does not support co-located branches."
 msgstr ""
 
-#: bzrlib/errors.py:3201
+#: bzrlib/errors.py:3216
 msgid ""
 "Unable to determine your name.\n"
 "Please, set your name with the 'whoami' command.\n"
 "E.g. bzr whoami \"Your Name <name@example.com>\""
 msgstr ""
 
-#: bzrlib/errors.py:3210
+#: bzrlib/errors.py:3225
 msgid "Invalid pattern(s) found. %(msg)s"
 msgstr ""
 
-#: bzrlib/errors.py:3218
+#: bzrlib/errors.py:3233
 msgid ""
 "Branch \"%(branch_url)s\" appears to be bound to itself. Please use `bzr "
 "unbind` to fix."
 msgstr ""
 
-#: bzrlib/errors.py:3229
+#: bzrlib/errors.py:3244
 msgid "Loop involving %(refs)r while expanding \"%(string)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:3238
+#: bzrlib/errors.py:3253
 msgid "Option %(name)s is not defined while expanding \"%(string)s\"."
 msgstr ""
 
-#: bzrlib/errors.py:3247
+#: bzrlib/errors.py:3262
 msgid ""
 "No compatible object available for operations from %(source)r to %(target)r."
 msgstr ""
 
-#: bzrlib/errors.py:3257
+#: bzrlib/errors.py:3272
 msgid ""
 "VFS requests over the smart server are not allowed. Encountered: %(method)s, "
 "%(arguments)s."
 msgstr ""
 
-#: bzrlib/errors.py:3267
+#: bzrlib/errors.py:3282
 msgid ""
 "Kind change from %(from_kind)s to %(to_kind)s for %(path)s not supported by "
 "format %(format)r"
 msgstr ""
 
-#: bzrlib/errors.py:3279
+#: bzrlib/errors.py:3294
 msgid ""
 "Missing feature %(feature)s not provided by this version of Bazaar or any "
 "plugin."
 msgstr ""
 
-#: bzrlib/errors.py:3292
+#: bzrlib/errors.py:3307
 msgid "Binary files section encountered."
 msgstr ""
 
-#: bzrlib/errors.py:3300
+#: bzrlib/errors.py:3315
 msgid ""
 "Malformed patch header.  %(desc)s\n"
 "%(line)r"
 msgstr ""
 
-#: bzrlib/errors.py:3309
+#: bzrlib/errors.py:3324
 msgid ""
 "Malformed hunk header.  %(desc)s\n"
 "%(line)r"
 msgstr ""
 
-#: bzrlib/errors.py:3318
+#: bzrlib/errors.py:3333
 msgid ""
 "Malformed line.  %(desc)s\n"
 "%(line)r"
 msgstr ""
 
-#: bzrlib/errors.py:3328
+#: bzrlib/errors.py:3343
 msgid ""
 "Text contents mismatch at line %(line_no)d.  Original has \"%(orig_line)s\", "
 "but patch says it should be \"%(patch_line)s\""
 msgstr ""
 
-#: bzrlib/errors.py:3339
+#: bzrlib/errors.py:3354
 msgid "The feature %(feature)s has already been registered."
 msgstr ""
 
+#: bzrlib/errors.py:3362
+msgid ""
+"Cannot store uncommitted changes because this branch already stores "
+"uncommitted changes."
+msgstr ""
+
 #: bzrlib/export_pot.py:252
 #, python-format
 msgid "Exporting messages from builtin command: %s"
@@ -6521,7 +6543,7 @@
 msgid "annotating"
 msgstr ""
 
-#: bzrlib/lock.py:548
+#: bzrlib/lock.py:549
 msgid "{0!r} was {1} locked again"
 msgstr ""
 
@@ -6793,28 +6815,142 @@
 msgid "Generate only the shell function, don't enable it"
 msgstr ""
 
+#: bzrlib/plugins/grep/cmds.py:77
+msgid "Print lines matching PATTERN for specified files and revisions."
+msgstr ""
+
+#: bzrlib/plugins/grep/cmds.py:79
+msgid ""
+"This command searches the specified files and revisions for a given\n"
+"pattern.  The pattern is specified as a Python regular expressions[1]."
+msgstr ""
+
+#: bzrlib/plugins/grep/cmds.py:82
+msgid ""
+"If the file name is not specified, the revisions starting with the\n"
+"current directory are searched recursively. If the revision number is\n"
+"not specified, the working copy is searched. To search the last committed\n"
+"revision, use the '-r -1' or '-r last:1' option."
+msgstr ""
+
+#: bzrlib/plugins/grep/cmds.py:87
+msgid ""
+"Unversioned files are not searched unless explicitly specified on the\n"
+"command line. Unversioned directores are not searched."
+msgstr ""
+
+#: bzrlib/plugins/grep/cmds.py:90
+msgid ""
+"When searching a pattern, the output is shown in the 'filepath:string'\n"
+"format. If a revision is explicitly searched, the output is shown as\n"
+"'filepath~N:string', where N is the revision number."
+msgstr ""
+
+#: bzrlib/plugins/grep/cmds.py:94
+msgid ""
+"--include and --exclude options can be used to search only (or exclude\n"
+"from search) files with base name matches the specified Unix style GLOB\n"
+"pattern.  The GLOB pattern an use *, ?, and [...] as wildcards, and \\\n"
+"to quote wildcard or backslash character literally. Note that the glob\n"
+"pattern is not a regular expression."
+msgstr ""
+
+#: bzrlib/plugins/grep/cmds.py:100
+msgid "[1] http://docs.python.org/library/re.html#regular-expression-syntax"
+msgstr ""
+
+# help of 'color' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:109
+msgid "Show match in color. WHEN is never, always or auto."
+msgstr ""
+
+# help of 'diff' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:111
+msgid "Grep for pattern in changeset for each revision."
+msgstr ""
+
+# help of 'exclude' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:113
+msgid "Skip files whose base name matches GLOB."
+msgstr ""
+
+# help of 'include' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:115
+msgid "Search only files whose base name matches GLOB."
+msgstr ""
+
+# help of 'files-with-matches' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:117
+msgid "Print only the name of each input file in which PATTERN is found."
+msgstr ""
+
+# help of 'files-without-match' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:120
+msgid "Print only the name of each input file in which PATTERN is not found."
+msgstr ""
+
+# help of 'fixed-string' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:123
+msgid "Interpret PATTERN is a single fixed string (not regex)."
+msgstr ""
+
+# help of 'from-root' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:125
+msgid ""
+"Search for pattern starting from the root of the branch. (implies --"
+"recursive)"
+msgstr ""
+
+# help of 'ignore-case' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:128
+msgid "ignore case distinctions while matching."
+msgstr ""
+
+# help of 'levels' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:130
+msgid ""
+"Number of levels to display - 0 for all, 1 for collapsed (1 is default)."
+msgstr ""
+
+# help of 'line-number' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:135
+msgid "show 1-based line number."
+msgstr ""
+
+# help of 'no-recursive' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:137
+msgid "Don't recurse into subdirectories. (default is --recursive)"
+msgstr ""
+
+# help of 'null' option of 'grep' command
+#: bzrlib/plugins/grep/cmds.py:139
+msgid ""
+"Write an ASCII NUL (\\0) separator between output lines rather than a "
+"newline."
+msgstr ""
+
 #: bzrlib/plugins/launchpad/account.py:66
 msgid "Setting ssh/sftp usernames for launchpad.net."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:44
+#: bzrlib/plugins/launchpad/cmds.py:43
 msgid "Register a branch with launchpad.net."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:46
+#: bzrlib/plugins/launchpad/cmds.py:45
 msgid ""
 "This command lists a bzr branch in the directory of branches on\n"
 "launchpad.net.  Registration allows the branch to be associated with\n"
 "bugs or specifications."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:50
+#: bzrlib/plugins/launchpad/cmds.py:49
 msgid ""
 "Before using this command you must register the project to which the\n"
 "branch belongs, and create an account for yourself on launchpad.net."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:53
+#: bzrlib/plugins/launchpad/cmds.py:52
 msgid ""
 "arguments:\n"
 "    public_url: The publicly visible url for the branch to register.\n"
@@ -6826,7 +6962,7 @@
 "                otherwise error."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:62
+#: bzrlib/plugins/launchpad/cmds.py:61
 msgid ""
 "example:\n"
 "    bzr register-branch http://foo.com/bzr/fooproject.mine \\\n"
@@ -6834,134 +6970,134 @@
 msgstr ""
 
 # help of 'project' option of 'register-branch' command
-#: bzrlib/plugins/launchpad/cmds.py:69
+#: bzrlib/plugins/launchpad/cmds.py:68
 msgid "Launchpad project short name to associate with the branch."
 msgstr ""
 
 # help of 'branch-name' option of 'register-branch' command
-#: bzrlib/plugins/launchpad/cmds.py:76
+#: bzrlib/plugins/launchpad/cmds.py:75
 msgid ""
 "Short name for the branch; by default taken from the last component of the "
 "url."
 msgstr ""
 
 # help of 'branch-title' option of 'register-branch' command
-#: bzrlib/plugins/launchpad/cmds.py:80
+#: bzrlib/plugins/launchpad/cmds.py:79
 msgid "One-sentence description of the branch."
 msgstr ""
 
 # help of 'branch-description' option of 'register-branch' command
-#: bzrlib/plugins/launchpad/cmds.py:83
+#: bzrlib/plugins/launchpad/cmds.py:82
 msgid "Longer description of the purpose or contents of the branch."
 msgstr ""
 
 # help of 'author' option of 'register-branch' command
-#: bzrlib/plugins/launchpad/cmds.py:86
+#: bzrlib/plugins/launchpad/cmds.py:85
 msgid "Branch author's email address, if not yourself."
 msgstr ""
 
 # help of 'link-bug' option of 'register-branch' command
-#: bzrlib/plugins/launchpad/cmds.py:89
+#: bzrlib/plugins/launchpad/cmds.py:88
 msgid "The bug this branch fixes."
 msgstr ""
 
 # help of 'dry-run' option of 'register-branch' command
-#: bzrlib/plugins/launchpad/cmds.py:92
+#: bzrlib/plugins/launchpad/cmds.py:91
 msgid "Prepare the request but don't actually send it."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:114
+#: bzrlib/plugins/launchpad/cmds.py:113
 msgid ""
 "register-branch requires a public branch url - see bzr help register-branch."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:122
+#: bzrlib/plugins/launchpad/cmds.py:121
 msgid "--product is deprecated; please use --project."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:152
+#: bzrlib/plugins/launchpad/cmds.py:151
 msgid "Open a Launchpad branch page in your web browser."
 msgstr ""
 
 # help of 'dry-run' option of 'launchpad-open' command
-#: bzrlib/plugins/launchpad/cmds.py:157
+#: bzrlib/plugins/launchpad/cmds.py:156
 msgid "Do not actually open the browser. Just say the URL we would use."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:192
+#: bzrlib/plugins/launchpad/cmds.py:191
 #, python-format
 msgid "Opening %s in web browser"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:200
+#: bzrlib/plugins/launchpad/cmds.py:199
 msgid "Show or set the Launchpad user ID."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:202
+#: bzrlib/plugins/launchpad/cmds.py:201
 msgid ""
 "When communicating with Launchpad, some commands need to know your\n"
 "Launchpad user ID.  This command can be used to set or show the\n"
 "user ID that Bazaar will use for such communication."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:206
+#: bzrlib/plugins/launchpad/cmds.py:205
 msgid ""
 ":Examples:\n"
 "  Show the Launchpad ID of the current user::"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:209
+#: bzrlib/plugins/launchpad/cmds.py:208
 msgid "      bzr launchpad-login"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:211
+#: bzrlib/plugins/launchpad/cmds.py:210
 msgid "  Set the Launchpad ID of the current user to 'bob'::"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:213
+#: bzrlib/plugins/launchpad/cmds.py:212
 msgid "      bzr launchpad-login bob"
 msgstr ""
 
 # help of 'no-check' option of 'launchpad-login' command
-#: bzrlib/plugins/launchpad/cmds.py:220
+#: bzrlib/plugins/launchpad/cmds.py:219
 msgid "Don't check that the user name is valid."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:235 bzrlib/plugins/launchpad/cmds.py:246
+#: bzrlib/plugins/launchpad/cmds.py:234 bzrlib/plugins/launchpad/cmds.py:245
 msgid "Launchpad user ID exists and has SSH keys.\n"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:238
+#: bzrlib/plugins/launchpad/cmds.py:237
 msgid "No Launchpad user ID configured.\n"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:249
+#: bzrlib/plugins/launchpad/cmds.py:248
 #, python-format
 msgid "Launchpad user ID set to '%s'.\n"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:255
+#: bzrlib/plugins/launchpad/cmds.py:254
 msgid "Ask Launchpad to mirror a branch now."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:272
+#: bzrlib/plugins/launchpad/cmds.py:271
 msgid "Propose merging a branch on Launchpad."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:274
+#: bzrlib/plugins/launchpad/cmds.py:273
 msgid ""
 "This will open your usual editor to provide the initial comment.  When it\n"
 "has created the proposal, it will open it in your default web browser."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:277
+#: bzrlib/plugins/launchpad/cmds.py:276
 msgid ""
 "The branch will be proposed to merge into SUBMIT_BRANCH.  If SUBMIT_BRANCH\n"
 "is not supplied, the remembered submit branch will be used.  If no submit\n"
 "branch is remembered, the development focus will be used."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:281
+#: bzrlib/plugins/launchpad/cmds.py:280
 msgid ""
 "By default, the SUBMIT_BRANCH's review team will be requested to review\n"
 "the merge proposal.  This can be overriden by specifying --review (-R).\n"
@@ -6969,29 +7105,31 @@
 "may optionally be followed by '=' and the review type.  For example:"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:286
+#: bzrlib/plugins/launchpad/cmds.py:285
 msgid "  bzr lp-propose-merge --review jrandom --review review-team=qa"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:288
+#: bzrlib/plugins/launchpad/cmds.py:287
 msgid ""
 "This will propose a merge,  request \"jrandom\" to perform a review of\n"
 "unspecified type, and request \"review-team\" to perform a \"qa\" review."
 msgstr ""
 
 # help of 'staging' option of 'lp-propose-merge' command
-#: bzrlib/plugins/launchpad/cmds.py:293
+#: bzrlib/plugins/launchpad/cmds.py:292
 msgid "Propose the merge on staging."
 msgstr ""
 
 # help of 'message' option of 'lp-propose-merge' command
-#: bzrlib/plugins/launchpad/cmds.py:295
+#: bzrlib/plugins/launchpad/cmds.py:294
 msgid "Commit message."
 msgstr ""
 
 # help of 'approve' option of 'lp-propose-merge' command
-#: bzrlib/plugins/launchpad/cmds.py:297
-msgid "Mark the proposal as approved immediately."
+#: bzrlib/plugins/launchpad/cmds.py:296
+msgid ""
+"Mark the proposal as approved immediately, setting the approved revision to "
+"tip."
 msgstr ""
 
 # help of 'fixes' option of 'lp-propose-merge' command
@@ -7011,86 +7149,69 @@
 #: bzrlib/plugins/launchpad/cmds.py:337
 msgid ""
 "Finds the merge proposal(s) that discussed landing the specified revision.\n"
-"This works only if the selected branch was the merge proposal target, and\n"
-"if the merged_revno is recorded for the merge proposal.  The proposal(s)\n"
-"are opened in a web browser."
+"This works only if the if the merged_revno was recorded for the merge\n"
+"proposal.  The proposal(s) are opened in a web browser."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:342
+#: bzrlib/plugins/launchpad/cmds.py:341
 msgid ""
-"Any revision involved in the merge may be specified-- the revision in\n"
-"which the merge was performed, or one of the revisions that was merged."
+"Only the revision specified is searched for.  To find the mainline\n"
+"revision that merged it into mainline, use the \"mainline\" revision spec."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:345
+#: bzrlib/plugins/launchpad/cmds.py:344
 msgid "So, to find the merge proposal that reviewed line 1 of README::"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:347
-msgid "  bzr lp-find-proposal -r annotate:README:1"
+#: bzrlib/plugins/launchpad/cmds.py:346
+msgid "  bzr lp-find-proposal -r mainline:annotate:README:1"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:363
+#: bzrlib/plugins/launchpad/cmds.py:365
 msgid "No review found."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:364
+#: bzrlib/plugins/launchpad/cmds.py:366
 #, python-format
 msgid "%d proposals(s) found."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/cmds.py:374
-msgid "Finding revision-id"
-msgstr ""
-
-#: bzrlib/plugins/launchpad/cmds.py:381
-msgid "Finding merge"
-msgstr ""
-
-#: bzrlib/plugins/launchpad/cmds.py:386
-msgid "Finding revno"
-msgstr ""
-
-#: bzrlib/plugins/launchpad/cmds.py:392
-msgid "Finding Launchpad branch"
-msgstr ""
-
-#: bzrlib/plugins/launchpad/cmds.py:395
+#: bzrlib/plugins/launchpad/cmds.py:378
 msgid "Finding proposals"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:241
-#: bzrlib/plugins/launchpad/lp_api.py:246
+#: bzrlib/plugins/launchpad/lp_api.py:228
+#: bzrlib/plugins/launchpad/lp_api.py:233
 #, python-format
 msgid "%s is not registered on Launchpad"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:256
+#: bzrlib/plugins/launchpad/lp_api.py:243
 #, python-format
 msgid "%s has no development focus."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:261
+#: bzrlib/plugins/launchpad/lp_api.py:248
 #, python-format
 msgid "development focus %s has no branch."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:266
+#: bzrlib/plugins/launchpad/lp_api.py:253
 #, python-format
 msgid "source package %s has no branch."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:270
+#: bzrlib/plugins/launchpad/lp_api.py:257
 #, python-format
 msgid "%s has no associated product or source package."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:282
+#: bzrlib/plugins/launchpad/lp_api.py:269
 #, python-format
 msgid "%s is already up-to-date."
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_api.py:289
+#: bzrlib/plugins/launchpad/lp_api.py:276
 #, python-format
 msgid "Pushing to %s"
 msgstr ""
@@ -7102,7 +7223,7 @@
 " remote: {2}"
 msgstr ""
 
-#: bzrlib/plugins/launchpad/lp_propose.py:150
+#: bzrlib/plugins/launchpad/lp_propose.py:159
 #, python-format
 msgid "There is already a branch merge proposal: %s"
 msgstr ""
@@ -7538,6 +7659,16 @@
 msgid "HPSS calls: {0} ({1} vfs) {2}"
 msgstr ""
 
+#: bzrlib/smart/ping.py:32
+msgid "Pings a Bazaar smart server."
+msgstr ""
+
+#: bzrlib/smart/ping.py:34
+msgid ""
+"This command sends a 'hello' request to the given location using the bzr\n"
+"smart protocol, and reports the response."
+msgstr ""
+
 #: bzrlib/smart/server.py:169
 msgid "Requested to stop gracefully"
 msgstr ""
@@ -7562,33 +7693,33 @@
 msgid "listening on port: %s"
 msgstr ""
 
-#: bzrlib/switch.py:73
+#: bzrlib/switch.py:84
 msgid "Pending merges must be committed or reverted before using switch."
 msgstr ""
 
-#: bzrlib/switch.py:100
+#: bzrlib/switch.py:111
 msgid ""
 "Cannot switch as local commits found in the checkout. Commit these to the "
 "bound branch or use --force to throw them away."
 msgstr ""
 
-#: bzrlib/switch.py:105
+#: bzrlib/switch.py:116
 #, python-format
 msgid ""
 "Unable to connect to current master branch %(target)s: %(error)s To switch "
 "anyway, use --force."
 msgstr ""
 
-#: bzrlib/switch.py:129
+#: bzrlib/switch.py:140
 msgid "Cannot switch a branch, only a checkout."
 msgstr ""
 
-#: bzrlib/switch.py:167
+#: bzrlib/switch.py:183
 #, python-format
 msgid "Tree is up to date at revision %d."
 msgstr ""
 
-#: bzrlib/switch.py:173
+#: bzrlib/switch.py:190
 #, python-format
 msgid "Updated to revision %d."
 msgstr ""
@@ -7752,7 +7883,7 @@
 msgid "PageFaultCount    %8d"
 msgstr ""
 
-#: bzrlib/workingtree.py:1482
+#: bzrlib/workingtree.py:1516
 msgid "Rerun update after fixing the conflicts."
 msgstr ""
 
@@ -7762,7 +7893,7 @@
 
 #: dummy/help_topics/basic/detail.txt:1
 msgid ""
-"Bazaar 2.6b2 -- a free distributed version-control tool\n"
+"Bazaar 2.6.0 -- a free distributed version-control tool\n"
 "http://bazaar.canonical.com/"
 msgstr ""
 
@@ -9278,6 +9409,8 @@
 "export            Export current or past revision to a destination directory "
 "or\n"
 "                  archive.\n"
+"grep              Print lines matching PATTERN for specified files and\n"
+"                  revisions. [grep]\n"
 "help              Show help on a command or other topic.\n"
 "ignore            Ignore specified files or patterns.\n"
 "ignored           List ignored files and the patterns that matched them.\n"
@@ -9301,6 +9434,7 @@
 "mv                Move or rename a file.\n"
 "nick              Print or set the branch nickname.\n"
 "pack              Compress the data within a repository.\n"
+"ping              Pings a Bazaar smart server.\n"
 "plugins           List the installed plugins.\n"
 "pull              Turn this branch into a mirror of another branch.\n"
 "push              Update a mirror of this branch.\n"
@@ -10690,18 +10824,48 @@
 
 #: en/help_topics/configuration.txt:716
 msgid ""
+"Because ``mergetool`` and ``config`` itself both use curly braces as\n"
+"interpolation markers, trying to display the mergetool line results in the\n"
+"following problem::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:720
+msgid ""
+"\n"
+"  $ bzr config bzr.mergetool.kdiff3='kdiff3 {base} {this} {other} -o "
+"{result}'\n"
+"  $ bzr config bzr.mergetool.kdiff3\n"
+"  bzr: ERROR: Option base is not defined while expanding \"kdiff3 {base} "
+"{this} {other} -o {result}\"."
+msgstr ""
+
+#: en/help_topics/configuration.txt:725
+msgid ""
+"To avoid this, ``config`` can be instructed not to try expanding variables::"
+msgstr ""
+
+#: en/help_topics/configuration.txt:727
+msgid ""
+"  $ bzr config --all bzr.mergetool.kdiff3\n"
+"  branch:\n"
+"    bzr.mergetool.kdiff3 = kdiff3 {base} {this} {other} -o {result}"
+msgstr ""
+
+#: en/help_topics/configuration.txt:731
+msgid ""
+"\n"
 "bzr.default_mergetool\n"
 "~~~~~~~~~~~~~~~~~~~~~"
 msgstr ""
 
-#: en/help_topics/configuration.txt:719
+#: en/help_topics/configuration.txt:735
 msgid ""
 "Specifies which external merge tool (as defined above) should be selected "
 "by\n"
 "default in tools such as ``bzr qconflicts``."
 msgstr ""
 
-#: en/help_topics/configuration.txt:724
+#: en/help_topics/configuration.txt:740
 msgid "  bzr.default_mergetool = kdiff3\n"
 msgstr ""
 
@@ -11656,6 +11820,10 @@
 msgstr ""
 
 #: en/help_topics/env-variables.txt:3
+msgid "See bzr help configuration for more details."
+msgstr ""
+
+#: en/help_topics/env-variables.txt:5
 msgid ""
 "=================== "
 "===========================================================\n"