Merge lp:~songofacandy/bzr/i18n into lp:bzr

[methane]

i18n implementation for bzr.

[lp:~songofacandy/bzr/i18n]

5819. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Don't load working tree implementations during 'bzr serve'. (Jelmer
 Vernooij)

5820. By Canonical.com Patch Queue Manager <email address hidden> on 2011-05-04

(jelmer) Small fixes to developer documentation. (Jonathan Riddell)

[Vincent Ladeuil (vila)]

Thanks for working on that !

12852 lines, you beat the record :-)

I'm afraid this makes this proposal very hard to review (lp just cut your proposal at 5.000 lines) :-/

Can you find a way to split it into several ones and use the pre-requisite branches in the mps to simplify their reviews ?

You may want to use bzr-pipeline or bzr-loom to simplify the work on your side so you can iterate on each part during the review.

A couple of remarks for the parts I was able to read:
- in bzrlib/utextwrap.py, you have tests protected by if __name == 'main', better put that in a proper file under bzrlib/tests

- in the same file you use width=70, how does that interact with th rest of bzrlib (osutils.terminal_width for example) ?

- you seem to import code from the qbzr project, I think our policy to put these kind of files under bzrlib/util, not bzrlib/extras (I'd also like a second opinion about whether this kind of copy is appropriate, IANAL, etc),

- extras/msgfmt.py doesn't specify a license at all 8-/ There I have no idea about whether we are even allowed to add this to the bzr code...

- extras/polib.py MIT license and the file says the LICENSE file is provided, again no idea about what to do with that :-(

I wonder if we are importing a lot of stuff that may be available in proper packages that we can then only requires as build dependencies.

From a higher level, we should make sure that we can use launchpad and its translation services and focus on the minimal infrastructure we need to provide.

review: Needs Information

[methane (songofacandy)]

Thank you for reviewing.

>12852 lines, you beat the record :-)

9966 lines of 12852 is bzr.pot and bzr-ja.po.
These files can be ignored before i18n is merged. I'll remove these files.

> I'm afraid this makes this proposal very hard to review (lp just cut your proposal at 5.000 lines) :-/

OK, I'll split this changes to some branches. Should I make merge request for each branch?
Or the Launchpad provides any feature about handling for this situation?

= About bzrlib/utextwrap =
> - in bzrlib/utextwrap.py, you have tests protected by if __name == 'main', better put that in a proper file under bzrlib/tests
> - in the same file you use width=70, how does that interact with th rest of bzrlib (osutils.terminal_width for example) ?
I'll do these soon.

= About license and copyright. =
> - you seem to import code from the qbzr project, I think our policy to put these kind of files under bzrlib/util, not bzrlib/extras (I'd also like a second opinion about whether this kind of copy is appropriate, IANAL, etc),

extras/ directory (not in bzrlib/ directory) contains files only for building pot file.
I think 'tools/' directory is contains 3rd party tools that is required while building.
So I'll move extras/* into tools/, OK?

> - extras/msgfmt.py doesn't specify a license at all 8-/ There I have no idea about whether we are even allowed to add this to the bzr code...
Oh, that file is distributed with Python. So no license spec means it is PSF license. I'll check it and add header.

> - extras/polib.py MIT license and the file says the LICENSE file is provided, again no idea about what to do with that :-(

polib is needed by posplit.
In current workflow, bzrgettext and xgettext extracts docstring and marked strings, then posplit
splits each message into paragraph.
I think messages extracted by xgettext doesn't include long message. So, I'll add splitting feature
to bzrgettext and remove posplit and polib.

> I wonder if we are importing a lot of stuff that may be available in proper packages that we can then only requires as build dependencies.

polib is distributed in PyPI so we may be able to use it as a build dependency. But currently, I'll remove it first.
Another possible 3rd party utility is Babel. It contains many tools for i18n.

> From a higher level, we should make sure that we can use launchpad and its translation services and focus on the minimal infrastructure we need to provide.

qbzr, bzr-explorer and TortoiseBZR uses setup.py import-po command that imports from tar file exported from Launchpad.
Launchpad may be able to put po files into branch directly, but I don't know about the feature much.

[lp:~songofacandy/bzr/i18n]

5821. By methane on 2011-05-04

Add utextwrap that is same to textwrap but supports double width characters in east asia.

5822. By methane on 2011-05-04

bzrlib.utextwrap uses bzrlib.osutils.terminal_width() when width is not specified.

5823. By methane on 2011-05-04

Move tests for utextwrap from the module to bzrlib.tests.

[methane (songofacandy)]

> > - in bzrlib/utextwrap.py, you have tests protected by if __name == 'main',
> better put that in a proper file under bzrlib/tests
> > - in the same file you use width=70, how does that interact with th rest of
> bzrlib (osutils.terminal_width for example) ?
> I'll do these soon.
>

Done. I've request merge in:
https://code.launchpad.net/~songofacandy/bzr/i18n-utextwrap/+merge/59950

[lp:~songofacandy/bzr/i18n]

5824. By methane on 2011-05-04

bzr help commands uses utextwrap for wrapping. (Prepare to i18n)

[Vincent Ladeuil (vila)]

> Thank you for reviewing.
>
> >12852 lines, you beat the record :-)
>
> 9966 lines of 12852 is bzr.pot and bzr-ja.po.
> These files can be ignored before i18n is merged. I'll remove these files.

Good, I think we need to find some lp i18n wizard to help us here as I have very little experience there, I think the best guy for that is David Planella, I'll try to drag him there ;)

>
> > I'm afraid this makes this proposal very hard to review (lp just cut your
> proposal at 5.000 lines) :-/
>
> OK, I'll split this changes to some branches. Should I make merge request for
> each branch?

Yup.

> Or the Launchpad provides any feature about handling for this situation?
>

A merge proposal can specify a pre-requisite branch, so building several branches on top of each other and mentioning them as pre-requisite makes the merge proposals display only the patch that each branch is proposing.

>
> = About bzrlib/utextwrap =
> > - in bzrlib/utextwrap.py, you have tests protected by if __name == 'main',
> better put that in a proper file under bzrlib/tests
> > - in the same file you use width=70, how does that interact with th rest of
> bzrlib (osutils.terminal_width for example) ?
> I'll do these soon.

Great, I've reviewed your other branch.

>
>
> = About license and copyright. =
> > - you seem to import code from the qbzr project, I think our policy to put
> these kind of files under bzrlib/util, not bzrlib/extras (I'd also like a
> second opinion about whether this kind of copy is appropriate, IANAL, etc),
>
> extras/ directory (not in bzrlib/ directory) contains files only for building
> pot file.
> I think 'tools/' directory is contains 3rd party tools that is required while
> building.
> So I'll move extras/* into tools/, OK?

Sounds far more appropriate yes, we still need to be careful about the license/copyright but it's a bit less worrying than in bzrlib itself.

>
> > - extras/msgfmt.py doesn't specify a license at all 8-/ There I have no idea
> about whether we are even allowed to add this to the bzr code...
> Oh, that file is distributed with Python. So no license spec means it is PSF
> license. I'll check it and add header.
>
> > - extras/polib.py MIT license and the file says the LICENSE file is
> provided, again no idea about what to do with that :-(
>
> polib is needed by posplit.
> In current workflow, bzrgettext and xgettext extracts docstring and marked
> strings, then posplit
> splits each message into paragraph.
> I think messages extracted by xgettext doesn't include long message. So, I'll
> add splitting feature
> to bzrgettext and remove posplit and polib.
>
> > I wonder if we are importing a lot of stuff that may be available in proper
> packages that we can then only requires as build dependencies.
>
> polib is distributed in PyPI so we may be able to use it as a build
> dependency. But currently, I'll remove it first.

Great. That's exactly the idea with multiple proposals, it makes it easier to separate the issues and progress on the ones that are not controversial while allowing discussion on the others.

> Another possible 3rd party utility is Babel. It contains many tools for i18n.
>
> > From a higher level...

[lp:~songofacandy/bzr/i18n]

5825. By methane on 2011-05-04

Make UTextWrapper support byte string and add tests including Python's
test_textwrap as a regression test.

5826. By methane on 2011-05-04

Don't fill up terminal width because console may shows extra blank line.

5827. By methane on 2011-05-04

Add test for fill.

5828. By methane on 2011-05-04

Add two tests for fill demonstrates complicated cases. The second test fails
so needs more fixing.

5829. By methane on 2011-05-05

Default width of UTextWrapper is also osutils.terminal_widtth() and
use osutils.default_terminal_width when it returns None.

5830. By methane on 2011-05-05

utextwrap: Change a way to split between CJK characters.
_split() splits each double width character into a single chunk.
This way is simpler but slower.

5831. By methane on 2011-05-05

Add some test cases.

[Alexander Belchenko (bialix)]

INADA Naoki пишет:
> = About license and copyright. =
>> - you seem to import code from the qbzr project, I think our policy to put these kind of files under bzrlib/util, not bzrlib/extras (I'd also like a second opinion about whether this kind of copy is appropriate, IANAL, etc),
>
> extras/ directory (not in bzrlib/ directory) contains files only for building pot file.
> I think 'tools/' directory is contains 3rd party tools that is required while building.
> So I'll move extras/* into tools/, OK?

I think tools is more appropriate for that stuff in bzr.dev

>> From a higher level, we should make sure that we can use launchpad and its translation services and focus on the minimal infrastructure we need to provide.
>
> qbzr, bzr-explorer and TortoiseBZR uses setup.py import-po command that imports from tar file exported from Launchpad.
> Launchpad may be able to put po files into branch directly, but I don't know about the feature much.

As I can say somebody already set up translations imports for
TortoiseBzr. I thought that was you.

I'm a bit lazy to play with automatic imports/exports on LP, although
those are promoted as preferred way now. But in my understanding it's
better to have separate branch for import/export and merge from it
regularly into trunk.

--
All the dude wanted was his rug back

[lp:~songofacandy/bzr/i18n]

5832. By Vincent Ladeuil on 2011-05-05

Use assert(expected, actual) style and split some tests.

5833. By Vincent Ladeuil on 2011-05-05

Use a dedicated class for 'fill' tests.

5834. By Vincent Ladeuil on 2011-05-05

Properly override test symbols in the imported test module so they are restored after the tests are run.

[David Planella (dpm)]

Hi Inada,

First of all, thanks for the excellent work in making bzr speak everyone's language :)

I've been asked to provide some feedback and answer any questions, so I'll focus on those rather than reviewing the actual code.

Here are a couple of things that caught my eye:

Standard i18n Tools Integration
-------------------------------

It strikes me that you seem to rewrite much of the functionality provided by gettext and other tools already. Is there a reason why you are not using something like intltool and python-distutils-extra (e.g. using the build_i18n command from p-d-e instead of writing extras/build_mo.py), which are used by most OSS Python projects implementing i18n support? Is it because of platform compatibility issues?

Why do you use the gettext() call directly instead of the more usual _()?

Why is extras/bzrgettext needed? The file is very well documented, but I'm not sure I can follow why standard gettext cannot be used. May I ask you to ellaborate on this?

The same with bzrlib/utextwrap.py, what's its purpose?

Note that I'm not arguing that you are doing anything wrong, I'm just wondering if we could make use of more standard practices in the internationalization world.

Integration with Launchpad
--------------------------

It just makes sense to have bzr use all the Launchpad integration features regarding translations. For this, at the code level the only thing that is needed is to:

* Have a tool in the build system that can extract translatable strings from the code and merge them into a bzr.pot template file
* Have the right source tree layout:

po/bzr.pot
po/jp.po
po/de.po
po/pt_BR.po
...

Where translations are in the same directory as the .pot file and are named with iso 639 2-letter or 3-letter codes, with an optional country code name.

The rest can be done at the Launchpad project level and it's up to the bzr project admins:

* Set up the translation focus and permissions: my recommendation would be Restricted or Structured, assigned to the Launchpad Translators group
* Set up automatic translation imports, so that on every commit of the bzr.pot file translations are exposed in Launchpad
* Set up automatic exports, so that translations can be exported to a branch of your choice automatically (currently daily). My recommendation would be to use the same branch for imports and exports, so that the manual intervention in managing translations is reduced to 0 in this aspect.

[Alexander Belchenko (bialix)]

David Planella пишет:

David, please participate in that discussion too:
https://lists.ubuntu.com/archives/bazaar/2011q2/072452.html

--
All the dude wanted was his rug back

[Alexander Belchenko (bialix)]

David Planella пишет:
> I've been asked to provide some feedback and answer any questions, so I'll focus on those rather than reviewing the actual code.
>
> Here are a couple of things that caught my eye:
>
> Standard i18n Tools Integration
> -------------------------------
>
> It strikes me that you seem to rewrite much of the functionality provided by gettext and other tools already.
 > Is there a reason why you are not using something like intltool

What's intltool? That's one: https://launchpad.net/intltool ?
Is it work on Windows? Mac?

> and python-distutils-extra (e.g. using the build_i18n command from p-d-e instead of writing extras/build_mo.py),
> which are used by most OSS Python projects implementing i18n support? Is it because of platform compatibility issues?

What is restrictions of the build_i18n? Can it be extended/customized?

> Why do you use the gettext() call directly instead of the more usual _()?

Because _ has special meaning in PDB. Why does it matter?

> Why is extras/bzrgettext needed?
 > The file is very well documented, but I'm not sure I can follow
 > why standard gettext cannot be used.

What is standard gettext? xgettext? This one is unable to extract
docstrings without wrapping them into gettext() calls.

> May I ask you to ellaborate on this?
>
> The same with bzrlib/utextwrap.py, what's its purpose?

This is one is required to deal with multibyte characters. Some
(Japanese) unicode characters are actually require 2 positions on the
screen, so if you need to wrap long string using the width of the
terminal then you need to take care of multibyte characters, because
len(string) != len(visible characters).

> Note that I'm not arguing that you are doing anything wrong,
 > I'm just wondering if we could make use of more standard practices
 > in the internationalization world.

Can you provide some guidelines or hints/tips then?

> Integration with Launchpad
> --------------------------
>
> It just makes sense to have bzr use all the Launchpad integration
 > features regarding translations.
 > For this, at the code level the only thing that is needed is to:
>
> * Have a tool in the build system that can extract translatable strings from the code and merge them into a bzr.pot template file
> * Have the right source tree layout:
>
> po/bzr.pot
> po/jp.po
> po/de.po
> po/pt_BR.po
> ...
>
> Where translations are in the same directory as the .pot file and are named with iso 639 2-letter or 3-letter codes, with an optional country code name.
>
> The rest can be done at the Launchpad project level and it's up to the bzr project admins:
>
> * Set up the translation focus and permissions: my recommendation would be Restricted or Structured, assigned to the Launchpad Translators group
> * Set up automatic translation imports, so that on every commit of the bzr.pot file translations are exposed in Launchpad
> * Set up automatic exports, so that translations can be exported to a branch of your choice automatically (currently daily). My recommendation would be to use the same branch for imports and exports, so that the manual intervention in managing translations is reduced to 0 in this aspect.

Can you te...

[methane (songofacandy)]

I'm sorry about misreading.
I'm afraid deleting this merge request deletes discussion. So I leave
this merge request.

My work is split to some branches and this branch is abandoned.

1. TextWrap supporting CJK.
lp:~songofacandy/bzr/i18n-utextwrap
https://code.launchpad.net/~songofacandy/bzr/i18n-utextwrap/+merge/59950

2. message extraction.
lp:~songofacandy/bzr/i18n-msgextract
https://code.launchpad.net/~songofacandy/bzr/i18n-msgextract/+merge/60033

3. Building message object.
lp:~songofacandy/bzr/i18n-msgfmt
(merge request will be issued when message extraction is merged)

And future:
* l10n implementation of command help
* l10n implemen of Error Message

Discussed on ML:
* How to translate help topics.

Please join us and make bzr-2.4 better for non English speakers.

[lp:~songofacandy/bzr/i18n]

5835. By Martin Packman on 2011-05-07

Cope with lack of TextWrapper.drop_whitespace before Python 2.6

5836. By methane on 2011-05-08

Split calculating width of char logic into separated function.

5837. By methane on 2011-05-08

Drop supporting byte string in private functions.

5838. By methane on 2011-05-08

Add copyright for some function.

5839. By methane on 2011-05-08

Add keyword parameter 'ambiguous_width' that specifies width for character
when unicodedata.east_asian_width(c)=='A'.

5840. By methane on 2011-05-08

Stop using utextwrap until i18n is implemented.

5841. By methane on 2011-05-08

Change default value of ambiguous_width from 2 to 1.

5842. By methane on 2011-05-10

Add document of some limitations in docstring.

[David Planella (dpm)]

> David Planella пишет:
> > I've been asked to provide some feedback and answer any questions, so I'll
> focus on those rather than reviewing the actual code.
> >
> > Here are a couple of things that caught my eye:
> >
> > Standard i18n Tools Integration
> > -------------------------------
> >
> > It strikes me that you seem to rewrite much of the functionality provided by
> gettext and other tools already.
> > Is there a reason why you are not using something like intltool
>
> What's intltool? That's one: https://launchpad.net/intltool ?
> Is it work on Windows? Mac?
>

Yeah, that's intltool. Intltool is a higher level tool that adds functionality to gettext by allowing the extraction of translatable strings from a variety of file formats, and provides some extra functionality. It is a standard tool used for many translatable projects and a dependency from python-distutils-extra.

It's a perl script, so it should run on any platform where perl can be run.

> > and python-distutils-extra (e.g. using the build_i18n command from p-d-e
> instead of writing extras/build_mo.py),
> > which are used by most OSS Python projects implementing i18n support? Is it
> because of platform compatibility issues?
>
> What is restrictions of the build_i18n? Can it be extended/customized?
>

I'm not sure I understand the question on restrictions, but in any case, here's the code:

http://bazaar.launchpad.net/~python-distutils-extra-hackers/python-distutils-extra/debian/view/head:/DistUtilsExtra/auto.py#L505

> > Why do you use the gettext() call directly instead of the more usual _()?
>
> Because _ has special meaning in PDB. Why does it matter?
>

This is not a real issue, just a cosmetic one.

The feedback I get is that developers prefer writing the shorter _() to a translatable message than the longer and perhaps less readable gettext(). This has been the standard practice for nearly all localizable Open Source projects I've seen. The only exception that I can think of off the top of my head is bzr-gtk, where i18n() is used.

Why is is an issue in bzr but not in all other Python projects that make use of gettext?

> > Why is extras/bzrgettext needed?
> > The file is very well documented, but I'm not sure I can follow
> > why standard gettext cannot be used.
>
> What is standard gettext? xgettext? This one is unable to extract
> docstrings without wrapping them into gettext() calls.
>

Sorry, I should have been a bit clearer. By standard gettext I mean bot the gettext API and the set of developer tools provided by the gettext package. xgettext is part of the gettext package.

Could you tell me more about how are docstrings used in the bzr context and why should they be translatable? (I'm not against this, the more translatable the better, but I'd suggest sticking to standard tools from now and focus on translating the strings that are exposed to users first, e.g. the command line).

> > May I ask you to ellaborate on this?
> >
> > The same with bzrlib/utextwrap.py, what's its purpose?
>
> This is one is required to deal with multibyte characters. Some
> (Japanese) unicode characters are actually require 2 positions on the
> screen, so if you need t...

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

...
> This is not a real issue, just a cosmetic one.
>
> The feedback I get is that developers prefer writing the shorter _() to a translatable message than the longer and perhaps less readable gettext(). This has been the standard practice for nearly all localizable Open Source projects I've seen. The only exception that I can think of off the top of my head is bzr-gtk, where i18n() is used.
>
> Why is is an issue in bzr but not in all other Python projects that make use of gettext?

Because developers (such as myself) have a higher tendency to break into
the debugger in the middle of an active session (because we trap SIGQUIT
to do just that), and once you have done so _() breaks all future
running of the program because the builtin _() gets overridden.

Going further, I don't think bzr directly gains by putting i18n around
the code base. We generally *don't* want to be handing around translated
strings. We just want to translate at the point we display to the user
(as much as possible).

Also, why write _() in your code everywhere when there are very
deterministic locations where translatable strings reside. (Such as
Command.__doc__.)

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk3JJdsACgkQJdeBCYSNAAO4HgCgw+pdJVwBXHySlLUIaPCTSYBt
u8QAn3jS+r2QP7di9ZM+RmTmZX5b7jey
=9APd
-----END PGP SIGNATURE-----

[Andrew Bennetts (spiv)]

John A Meinel wrote:
[…]
> > This is not a real issue, just a cosmetic one.
> >
> > The feedback I get is that developers prefer writing the shorter _() to a
> > translatable message than the longer and perhaps less readable gettext().
> > This has been the standard practice for nearly all localizable Open Source
> > projects I've seen. The only exception that I can think of off the top of my
> > head is bzr-gtk, where i18n() is used.
> >
> > Why is is an issue in bzr but not in all other Python projects that make use
> > of gettext?
>
>
> Because developers (such as myself) have a higher tendency to break into
> the debugger in the middle of an active session (because we trap SIGQUIT
> to do just that), and once you have done so _() breaks all future
> running of the program because the builtin _() gets overridden.

That's really a bug in pdb, though. It might be possible to monkey-patch

[lp:~songofacandy/bzr/i18n]

5843. By methane on 2011-05-10

merge i18n-msgextract

5844. By methane on 2011-05-10

merge i18n-msgfmt

5845. By methane on 2011-05-10

Add first version of pot

5846. By methane on 2011-05-12

merge i18n-msgextract.

5847. By methane on 2011-05-12

Update pot

5848. By methane on 2011-05-12

merge some files from lp:~songofacandy/bzr/i18n

5849. By methane on 2011-05-12

Fix import

5850. By methane on 2011-05-12

Cleanup

5851. By methane on 2011-05-12

Fix line of command help in pot.

5852. By methane on 2011-05-12

Fix lineno of error formats in bzr.pot.

5853. By methane on 2011-05-12

Update pot

5854. By methane on 2011-05-14

merge i18n-utextwrap

5855. By methane on 2011-05-14

Enable extracting messages from help topics.

5856. By methane on 2011-05-14

Update pot file.

5857. By methane on 2011-05-14

Translate help topics.

5858. By methane on 2011-05-14

Disable too verbose mutter.

5859. By methane on 2011-05-14

Don't skip help topics that is not found in bzrlib.help_topics.__init__.
This allows to export help topics registered from plugins.

5860. By methane on 2011-05-14

Update pot

Unmerged revisions

5860. By methane on 2011-05-14

Update pot

5859. By methane on 2011-05-14

Don't skip help topics that is not found in bzrlib.help_topics.__init__.
This allows to export help topics registered from plugins.

5858. By methane on 2011-05-14

Disable too verbose mutter.

5857. By methane on 2011-05-14

Translate help topics.

5856. By methane on 2011-05-14

Update pot file.

5855. By methane on 2011-05-14

Enable extracting messages from help topics.

5854. By methane on 2011-05-14

merge i18n-utextwrap

5853. By methane on 2011-05-12

Update pot

5852. By methane on 2011-05-12

Fix lineno of error formats in bzr.pot.

5851. By methane on 2011-05-12

Fix line of command help in pot.

=== modified file 'Makefile'
--- Makefile	2011-04-18 00:44:08 +0000
+++ Makefile	2011-05-14 03:14:26 +0000
@@ -420,6 +420,26 @@
 	$(PYTHON) tools/win32/ostools.py remove dist
 
 
+# i18n targets
+
+.PHONY: update-pot po/bzr.pot
+update-pot: po/bzr.pot
+
+TRANSLATABLE_PYFILES:=$(shell find bzrlib -name '*.py' \
+    		| grep -v 'bzrlib/tests/' \
+    		| grep -v 'bzrlib/doc' \
+		)
+
+po/bzr.pot: $(PYFILES) $(DOCFILES)
+	BZR_PLUGIN_PATH='-site' $(PYTHON) ./bzr export-pot > po/bzr.pot
+	echo $(TRANSLATABLE_PYFILES) | xargs \
+	  xgettext --package-name "bzr" \
+	  --msgid-bugs-address "<[e-mail]>" \
+	  --copyright-holder "Canonical" \
+	  --from-code ISO-8859-1 --join --sort-by-file --add-comments=i18n: \
+	  -d bzr -p po -o bzr.pot
+
+
 ### Packaging Targets ###
 
 .PHONY: dist check-dist-tarball

=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2011-05-03 13:53:46 +0000
+++ bzrlib/builtins.py	2011-05-14 03:14:26 +0000
@@ -6154,6 +6154,16 @@
             self.outf.write('%s %s\n' % (path, location))
 
 
+class cmd_export_pot(Command):
+    __doc__ = """Export command helps and error messages in po format."""
+
+    hidden = True
+
+    def run(self):
+        from bzrlib.export_pot import export_pot
+        export_pot(self.outf)
+
+
 def _register_lazy_builtins():
     # register lazy builtins from other modules; called at startup and should
     # be only called once.

=== modified file 'bzrlib/commands.py'
--- bzrlib/commands.py	2011-04-19 04:37:48 +0000
+++ bzrlib/commands.py	2011-05-14 03:14:26 +0000
@@ -41,6 +41,12 @@
     trace,
     ui,
     )
+from bzrlib.i18n import (
+    gettext,
+    N_,
+    install,
+    install_zzz,
+    )
 """)
 
 from bzrlib.hooks import Hooks
@@ -507,11 +513,11 @@
 
         # The header is the purpose and usage
         result = ""
-        result += ':Purpose: %s\n' % purpose
+        result += ':%s: %s\n' % (gettext('Purpose'), purpose)
         if usage.find('\n') >= 0:
-            result += ':Usage:\n%s\n' % usage
+            result += ':%s:\n%s\n' % (gettext('Usage'), usage)
         else:
-            result += ':Usage:   %s\n' % usage
+            result += ':%s:   %s\n' % (gettext('Usage'), usage)
         result += '\n'
 
         # Add the options
@@ -527,11 +533,9 @@
         # block.
         if not plain and options.find('  --1.9  ') != -1:
             options = options.replace(' format:\n', ' format::\n\n', 1)
-        if options.startswith('Options:'):
-            result += ':' + options
-        elif options.startswith('options:'):
-            # Python 2.4 version of optparse
-            result += ':Options:' + options[len('options:'):]
+        if options.startswith('Options:') or options.startswith('options:'):
+            # Python 2.4 version of optparse uses 'options'.
+            result += ':%s:%s' % (gettext('Options'), options[len('options:'):])
         else:
             result += options
         result += '\n'
@@ -542,7 +546,7 @@
             if sections.has_key(None):
                 text = sections.pop(None)
                 text = '\n  '.join(text.splitlines())
-                result += ':%s:\n  %s\n\n' % ('Description',text)
+                result += ':%s:\n  %s\n\n' % (gettext('Description'),text)
 
             # Add the custom sections (e.g. Examples). Note that there's no need
             # to indent these as they must be indented already in the source.
@@ -557,7 +561,7 @@
 
         # Add the aliases, source (plug-in) and see also links, if any
         if self.aliases:
-            result += ':Aliases:  '
+            result += ':%s:  ' % gettext('Aliases')
             result += ', '.join(self.aliases) + '\n'
         plugin_name = self.plugin_name()
         if plugin_name is not None:
@@ -576,7 +580,7 @@
                         link_text = ":doc:`%s <%s-help>`" % (item, item)
                         see_also_links.append(link_text)
                 see_also = see_also_links
-            result += ':See also: '
+            result += ':%s: ' % gettext('See also')
             result += ', '.join(see_also) + '\n'
 
         # If this will be rendered as plain text, convert it
@@ -667,7 +671,8 @@
 
         # Process the standard options
         if 'help' in opts:  # e.g. bzr add --help
-            sys.stdout.write(self.get_help_text())
+            self._setup_outf()
+            self.outf.write(self.get_help_text())
             return 0
         if 'usage' in opts:  # e.g. bzr add --usage
             sys.stdout.write(self.get_help_text(verbose=False))
@@ -755,7 +760,7 @@
         from inspect import getdoc
         if self.__doc__ is Command.__doc__:
             return None
-        return getdoc(self)
+        return gettext(getdoc(self))
 
     def name(self):
         """Return the canonical name for this command.
@@ -1088,6 +1093,10 @@
         i += 1
 
     debug.set_debug_flags_from_config()
+    if 'i18n' in debug.debug_flags:
+        install_zzz()
+    else:
+        install()
 
     if not opt_no_plugins:
         load_plugins()

=== modified file 'bzrlib/errors.py'
--- bzrlib/errors.py	2011-05-08 12:42:43 +0000
+++ bzrlib/errors.py	2011-05-14 03:14:26 +0000
@@ -18,6 +18,7 @@
 """
 
 from bzrlib import (
+    i18n,
     osutils,
     symbol_versioning,
     )
@@ -93,6 +94,21 @@
             for key, value in kwds.items():
                 setattr(self, key, value)
 
+    def i18n(self):
+        """Returns translated message in user encoding"""
+        try:
+            fmt = self._get_format_string()
+            if fmt:
+                fmt = i18n.gettext(fmt)
+                return fmt % dict(self.__dict__)
+        except (AttributeError, TypeError, NameError, ValueError, KeyError), e:
+            return 'Unprintable exception %s: dict=%r, fmt=%r, error=%r' \
+                % (self.__class__.__name__,
+                   self.__dict__,
+                   getattr(self, '_fmt', None),
+                   e)
+
+
     def _format(self):
         s = getattr(self, '_preformatted_string', None)
         if s is not None:

=== added file 'bzrlib/export_pot.py'
--- bzrlib/export_pot.py	1970-01-01 00:00:00 +0000
+++ bzrlib/export_pot.py	2011-05-14 03:14:26 +0000
@@ -0,0 +1,250 @@
+# Copyright (C) 2011 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+# The normalize function is taken from pygettext which is distributed
+# with Python under the Python License, which is GPL compatible.
+
+"""Extract docstrings from Bazaar commands.
+"""
+
+import inspect
+import os
+
+from bzrlib import (
+    commands as _mod_commands,
+    errors,
+    help_topics,
+    plugin,
+    )
+from bzrlib.trace import (
+    mutter,
+    note,
+    )
+
+
+def _escape(s):
+    s = (s.replace('\\', '\\\\')
+        .replace('\n', '\\n')
+        .replace('\r', '\\r')
+        .replace('\t', '\\t')
+        .replace('"', '\\"')
+        )
+    return s
+
+def _normalize(s):
+    # This converts the various Python string types into a format that
+    # is appropriate for .po files, namely much closer to C style.
+    lines = s.split('\n')
+    if len(lines) == 1:
+        s = '"' + _escape(s) + '"'
+    else:
+        if not lines[-1]:
+            del lines[-1]
+            lines[-1] = lines[-1] + '\n'
+        lines = map(_escape, lines)
+        lineterm = '\\n"\n"'
+        s = '""\n"' + lineterm.join(lines) + '"'
+    return s
+
+
+_FOUND_MSGID = None # set by entry function.
+
+def _poentry(outf, path, lineno, s, comment=None):
+    if s in _FOUND_MSGID:
+        return
+    _FOUND_MSGID.add(s)
+    if comment is None:
+        comment = ''
+    else:
+        comment = "# %s\n" % comment
+    print >>outf, ('#: %s:%d\n' % (path, lineno) +
+           comment+
+           'msgid %s\n' % _normalize(s) +
+           'msgstr ""\n')
+
+def _poentry_per_paragraph(outf, path, lineno, msgid):
+    # TODO: How to split long help?
+    paragraphs = msgid.split('\n\n')
+    for p in paragraphs:
+        _poentry(outf, path, lineno, p)
+        lineno += p.count('\n') + 2
+
+_LAST_CACHE = _LAST_CACHED_SRC = None
+
+def _offsets_of_literal(src):
+    global _LAST_CACHE, _LAST_CACHED_SRC
+    if src == _LAST_CACHED_SRC:
+        return _LAST_CACHE.copy()
+
+    import ast
+    root = ast.parse(src)
+    offsets = {}
+    for node in ast.walk(root):
+        if not isinstance(node, ast.Str):
+            continue
+        offsets[node.s] = node.lineno - node.s.count('\n')
+
+    _LAST_CACHED_SRC = src
+    _LAST_CACHE = offsets.copy()
+    return offsets
+
+def _standard_options(outf):
+    from bzrlib.option import Option
+    src = inspect.findsource(Option)[0]
+    src = ''.join(src)
+    path = 'bzrlib/option.py'
+    offsets = _offsets_of_literal(src)
+
+    for name in sorted(Option.OPTIONS.keys()):
+        opt = Option.OPTIONS[name]
+        if getattr(opt, 'hidden', False):
+            continue
+        if getattr(opt, 'title', None):
+            lineno = offsets.get(opt.title, 9999)
+            if lineno == 9999:
+                note("%r is not found in bzrlib/option.py" % opt.title)
+            _poentry(outf, path, lineno, opt.title,
+                     'title of %r option' % name)
+        if getattr(opt, 'help', None):
+            lineno = offsets.get(opt.help, 9999)
+            if lineno == 9999:
+                note("%r is not found in bzrlib/option.py" % opt.help)
+            _poentry(outf, path, lineno, opt.help,
+                     'help of %r option' % name)
+
+def _command_options(outf, path, cmd):
+    src, default_lineno = inspect.findsource(cmd.__class__)
+    offsets = _offsets_of_literal(''.join(src))
+    for opt in cmd.takes_options:
+        if isinstance(opt, str):
+            continue
+        if getattr(opt, 'hidden', False):
+            continue
+        name = opt.name
+        if getattr(opt, 'title', None):
+            lineno = offsets.get(opt.title, default_lineno)
+            _poentry(outf, path, lineno, opt.title,
+                     'title of %r option of %r command' % (name, cmd.name()))
+        if getattr(opt, 'help', None):
+            lineno = offsets.get(opt.help, default_lineno)
+            _poentry(outf, path, lineno, opt.help,
+                     'help of %r option of %r command' % (name, cmd.name()))
+
+
+def _write_command_help(outf, cmd_name, cmd):
+    path = inspect.getfile(cmd.__class__)
+    if path.endswith('.pyc'):
+        path = path[:-1]
+    path = os.path.relpath(path)
+    src, lineno = inspect.findsource(cmd.__class__)
+    offsets = _offsets_of_literal(''.join(src))
+    lineno = offsets[cmd.__doc__]
+    doc = inspect.getdoc(cmd)
+
+    _poentry_per_paragraph(outf, path, lineno, doc)
+    _command_options(outf, path, cmd)
+
+def _command_helps(outf):
+    """Extract docstrings from path.
+
+    This respects the Bazaar cmdtable/table convention and will
+    only extract docstrings from functions mentioned in these tables.
+    """
+    from glob import glob
+
+    # builtin commands
+    for cmd_name in _mod_commands.builtin_command_names():
+        command = _mod_commands.get_cmd_object(cmd_name, False)
+        if command.hidden:
+            continue
+        note("Exporting messages from builtin command: %s", cmd_name)
+        _write_command_help(outf, cmd_name, command)
+
+    plugin_path = plugin.get_core_plugin_path()
+    core_plugins = glob(plugin_path + '/*/__init__.py')
+    core_plugins = [os.path.basename(os.path.dirname(p))
+                        for p in core_plugins]
+    # core plugins
+    for cmd_name in _mod_commands.plugin_command_names():
+        command = _mod_commands.get_cmd_object(cmd_name, False)
+        if command.hidden:
+            continue
+        if command.plugin_name() not in core_plugins:
+            # skip non-core plugins
+            # TODO: Support extracting from third party plugins.
+            continue
+        note("Exporting messages from plugin command: %s in %s",
+             cmd_name, command.plugin_name())
+        _write_command_help(outf, cmd_name, command)
+
+
+def _error_messages(outf):
+    """Extract fmt string from bzrlib.errors."""
+    path = errors.__file__
+    if path.endswith('.pyc'):
+        path = path[:-1]
+    offsets = _offsets_of_literal(open(path).read())
+
+    base_klass = errors.BzrError
+    for name in dir(errors):
+        klass = getattr(errors, name)
+        if not inspect.isclass(klass):
+            continue
+        if not issubclass(klass, base_klass):
+            continue
+        if klass is base_klass:
+            continue
+        if klass.internal_error:
+            continue
+        fmt = getattr(klass, "_fmt", None)
+        if fmt:
+            note("Exporting message from error: %s", name)
+            _poentry(outf, 'bzrlib/errors.py',
+                     offsets.get(fmt, 9999), fmt)
+
+def _help_topics(outf):
+    topic_registry = help_topics.topic_registry
+    offsets = _offsets_of_literal(inspect.getsource(help_topics))
+
+    for key in topic_registry.keys():
+        summary = topic_registry.get_summary(key)
+        if summary is not None:
+            lineno = offsets.get(summary, 9999)
+            _poentry(outf, 'bzrlib/help_topics/__init__.py',
+                     lineno, summary)
+
+        doc = topic_registry.get(key)
+        if isinstance(doc, basestring):
+            lineno = offsets.get(doc, 9999)
+            _poentry_per_paragraph(
+                    outf,
+                    'bzrlib/help_topics/__init__.py', lineno,
+                    doc)
+        elif doc == help_topics._load_from_file:
+            _poentry_per_paragraph(
+                    outf,
+                    'bzrlib/help_topics/en/%s.txt' % (key,), 1,
+                    topic_registry.get_detail(key)
+                    )
+
+
+def export_pot(outf):
+    global _FOUND_MSGID
+    _FOUND_MSGID = set()
+    _standard_options(outf)
+    _command_helps(outf)
+    _error_messages(outf)
+    _help_topics(outf)

=== modified file 'bzrlib/help.py'
--- bzrlib/help.py	2010-05-26 07:19:50 +0000
+++ bzrlib/help.py	2011-05-14 03:14:26 +0000
@@ -22,7 +22,6 @@
 # TODO: `help commands --all` should show hidden commands
 
 import sys
-import textwrap
 
 from bzrlib import (
     commands as _mod_commands,
@@ -30,8 +29,11 @@
     help_topics,
     osutils,
     plugin,
+    utextwrap,
     )
 
+from bzrlib.i18n import gettext
+
 
 def help(topic=None, outfile=None):
     """Write the help for the specific topic to outfile"""
@@ -96,7 +98,7 @@
         else:
             firstline = ''
         helpstring = '%-*s %s%s' % (max_name, cmd_name, firstline, plugin_name)
-        lines = textwrap.wrap(
+        lines = utextwrap.wrap(
             helpstring, subsequent_indent=indent,
             width=width,
             break_long_words=False)

=== modified file 'bzrlib/help_topics/__init__.py'
--- bzrlib/help_topics/__init__.py	2010-11-06 10:55:58 +0000
+++ bzrlib/help_topics/__init__.py	2011-05-14 03:14:26 +0000
@@ -863,7 +863,8 @@
         :param plain: if False, raw help (reStructuredText) is
             returned instead of plain text.
         """
-        result = topic_registry.get_detail(self.topic)
+        from bzrlib.i18n import gettext
+        result = gettext(topic_registry.get_detail(self.topic))
         # there is code duplicated here and in bzrlib/plugin.py's
         # matching Topic code. This should probably be factored in
         # to a helper function and a common base class.

=== modified file 'bzrlib/help_topics/en/debug-flags.txt'
--- bzrlib/help_topics/en/debug-flags.txt	2010-10-06 03:20:28 +0000
+++ bzrlib/help_topics/en/debug-flags.txt	2011-05-14 03:14:26 +0000
@@ -21,6 +21,7 @@
 -Dhpssdetail      More hpss details.
 -Dhpssvfs         Traceback on vfs access to Remote objects.
 -Dhttp            Trace http connections, requests and responses.
+-Di18n            Use "zz{{msg}}" for translated message.
 -Dindex           Trace major index operations.
 -Dknit            Trace knit operations.
 -Dlock            Trace when lockdir locks are taken or released.

=== added file 'bzrlib/i18n.py'
--- bzrlib/i18n.py	1970-01-01 00:00:00 +0000
+++ bzrlib/i18n.py	2011-05-14 03:14:26 +0000
@@ -0,0 +1,129 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2007 Lukáš Lalinský <[e-mail]>
+# Copyright (C) 2007,2009 Alexander Belchenko <[e-mail]>
+# Copyright (C) 2011 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# This module is copied from Bazaar Explorer and modified for bzr.
+
+"""i18n and l10n support for Bazaar."""
+
+import gettext as _gettext
+import os
+import sys
+
+_translation = _null_translation = _gettext.NullTranslations()
+
+
+def install():
+    global _translation
+    get_current_locale()
+    _translation = _gettext.translation(
+            'bzr', localedir=_get_locale_dir(), fallback=True)
+
+def uninstall():
+    global _translation
+    _translation = _null_translation
+
+
+def _get_locale_dir():
+    if hasattr(sys, 'frozen'):
+        base = os.path.dirname(
+                unicode(sys.executable, sys.getfilesystemencoding()))
+        return os.path.join(base, u'locale')
+    else:
+        base = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
+        return os.path.realpath(os.path.join(base, u'locale'))
+
+
+def _check_win32_locale():
+    for i in ('LANGUAGE','LC_ALL','LC_MESSAGES','LANG'):
+        if os.environ.get(i):
+            break
+    else:
+        lang = None
+        import locale
+        try:
+            import ctypes
+        except ImportError:
+            # use only user's default locale
+            lang = locale.getdefaultlocale()[0]
+        else:
+            # using ctypes to determine all locales
+            lcid_user = ctypes.windll.kernel32.GetUserDefaultLCID()
+            lcid_system = ctypes.windll.kernel32.GetSystemDefaultLCID()
+            if lcid_user != lcid_system:
+                lcid = [lcid_user, lcid_system]
+            else:
+                lcid = [lcid_user]
+            lang = [locale.windows_locale.get(i) for i in lcid]
+            lang = ':'.join([i for i in lang if i])
+        # set lang code for gettext
+        if lang:
+            os.environ['LANGUAGE'] = lang
+
+
+def get_current_locale():
+    if not os.environ.get('LANGUAGE'):
+        from bzrlib import config
+        lang = config.GlobalConfig().get_user_option('language')
+        if lang:
+            os.environ['LANGUAGE'] = lang
+            return lang
+    if sys.platform == 'win32':
+        _check_win32_locale()
+    for i in ('LANGUAGE','LC_ALL','LC_MESSAGES','LANG'):
+        lang = os.environ.get(i)
+        if lang:
+            return lang
+    return None
+
+# special zzz translation for debugging i18n stuff
+class _ZzzTranslations(object):
+
+    def zzz(self, s):
+        return 'zz{{%s}}' % s
+
+    def ugettext(self, s):
+        return self.zzz(_null_translation.ugettext(s))
+
+    def ungettext(self, s, p, n):
+        return self.zzz(_null_translation.ungettext(s, p, n))
+
+def install_zzz():
+    global _translation
+    _translation = _ZzzTranslations()
+
+def gettext(message):
+    """Translate message. 
+    Returns translated message as unicode."""
+    paragraphs = message.split(u'\n\n')
+    ugettext = _translation.ugettext
+    # Be careful not to translate the empty string -- it holds the
+    # meta data of the .po file.
+    return u'\n\n'.join([ugettext(p) if p else u'' for p in paragraphs])
+
+def ngettext(s, p, n):
+    return gettext(s if n == 1 else p)
+
+def N_(s):
+    """Pass through function.
+
+    This function is used to mark the string that may be translated later.
+    """
+    return s
+

=== added directory 'bzrlib/locale'
=== modified file 'bzrlib/option.py'
--- bzrlib/option.py	2011-01-14 05:14:04 +0000
+++ bzrlib/option.py	2011-05-14 03:14:26 +0000
@@ -205,13 +205,14 @@
 
     def add_option(self, parser, short_name):
         """Add this option to an Optparse parser"""
+        from bzrlib.i18n import gettext
         option_strings = ['--%s' % self.name]
         if short_name is not None:
             option_strings.append('-%s' % short_name)
         if self.hidden:
             help = optparse.SUPPRESS_HELP
         else:
-            help = self.help
+            help = gettext(self.help)
         optargfn = self.type
         if optargfn is None:
             parser.add_option(action='callback',
@@ -428,6 +429,7 @@
 
 def get_optparser(options):
     """Generate an optparse parser for bzrlib-style options"""
+    from bzrlib.i18n import gettext
 
     parser = OptionParser()
     parser.remove_option('--help')

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2011-05-13 12:51:05 +0000
+++ bzrlib/tests/__init__.py	2011-05-14 03:14:26 +0000
@@ -3783,6 +3783,7 @@
         'bzrlib.tests.test_eol_filters',
         'bzrlib.tests.test_errors',
         'bzrlib.tests.test_export',
+        'bzrlib.tests.test_export_pot',
         'bzrlib.tests.test_extract',
         'bzrlib.tests.test_fetch',
         'bzrlib.tests.test_fixtures',
@@ -3899,6 +3900,7 @@
         'bzrlib.tests.test_upgrade',
         'bzrlib.tests.test_upgrade_stacked',
         'bzrlib.tests.test_urlutils',
+        'bzrlib.tests.test_utextwrap',
         'bzrlib.tests.test_version',
         'bzrlib.tests.test_version_info',
         'bzrlib.tests.test_versionedfile',

=== added file 'bzrlib/tests/test_export_pot.py'
--- bzrlib/tests/test_export_pot.py	1970-01-01 00:00:00 +0000
+++ bzrlib/tests/test_export_pot.py	2011-05-14 03:14:26 +0000
@@ -0,0 +1,147 @@
+# Copyright (C) 2011 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+from cStringIO import StringIO
+import textwrap
+
+from bzrlib import (
+    export_pot,
+    tests,
+    )
+
+class TestEscape(tests.TestCase):
+
+    def test_simple_escape(self):
+        self.assertEqual(
+                export_pot._escape('foobar'),
+                'foobar')
+
+        s = '''foo\nbar\r\tbaz\\"spam"'''
+        e = '''foo\\nbar\\r\\tbaz\\\\\\"spam\\"'''
+        self.assertEqual(export_pot._escape(s), e)
+
+    def test_complex_escape(self):
+        s = '''\\r \\\n'''
+        e = '''\\\\r \\\\\\n'''
+        self.assertEqual(export_pot._escape(s), e)
+
+
+class TestNormalize(tests.TestCase):
+
+    def test_single_line(self):
+        s = 'foobar'
+        e = '"foobar"'
+        self.assertEqual(export_pot._normalize(s), e)
+
+        s = 'foo"bar'
+        e = '"foo\\"bar"'
+        self.assertEqual(export_pot._normalize(s), e)
+
+    def test_multi_lines(self):
+        s = 'foo\nbar\n'
+        e = '""\n"foo\\n"\n"bar\\n"'
+        self.assertEqual(export_pot._normalize(s), e)
+
+        s = '\nfoo\nbar\n'
+        e = ('""\n'
+             '"\\n"\n'
+             '"foo\\n"\n'
+             '"bar\\n"')
+        self.assertEqual(export_pot._normalize(s), e)
+
+
+class PoEntryTestCase(tests.TestCase):
+
+    def setUp(self):
+        self.overrideAttr(export_pot, '_FOUND_MSGID', set())
+        self._outf = StringIO()
+        super(PoEntryTestCase, self).setUp()
+
+    def check_output(self, expected):
+        self.assertEqual(
+                self._outf.getvalue(),
+                textwrap.dedent(expected)
+                )
+
+class TestPoEntry(PoEntryTestCase):
+
+    def test_simple(self):
+        export_pot._poentry(self._outf, 'dummy', 1, "spam")
+        export_pot._poentry(self._outf, 'dummy', 2, "ham", 'EGG')
+        self.check_output('''\
+                #: dummy:1
+                msgid "spam"
+                msgstr ""
+
+                #: dummy:2
+                # EGG
+                msgid "ham"
+                msgstr ""
+
+                ''')
+
+    def test_duplicate(self):
+        export_pot._poentry(self._outf, 'dummy', 1, "spam")
+        # This should be ignored.
+        export_pot._poentry(self._outf, 'dummy', 2, "spam", 'EGG')
+
+        self.check_output('''\
+                #: dummy:1
+                msgid "spam"
+                msgstr ""\n
+                ''')
+
+
+class TestPoentryPerPergraph(PoEntryTestCase):
+
+    def test_single(self):
+        export_pot._poentry_per_paragraph(
+                self._outf,
+                'dummy',
+                10,
+                '''foo\nbar\nbaz\n'''
+                )
+        self.check_output('''\
+                #: dummy:10
+                msgid ""
+                "foo\\n"
+                "bar\\n"
+                "baz\\n"
+                msgstr ""\n
+                ''')
+
+    def test_multi(self):
+        export_pot._poentry_per_paragraph(
+                self._outf,
+                'dummy',
+                10,
+                '''spam\nham\negg\n\nSPAM\nHAM\nEGG\n'''
+                )
+        self.check_output('''\
+                #: dummy:10
+                msgid ""
+                "spam\\n"
+                "ham\\n"
+                "egg"
+                msgstr ""
+
+                #: dummy:14
+                msgid ""
+                "SPAM\\n"
+                "HAM\\n"
+                "EGG\\n"
+                msgstr ""\n
+                ''')

=== added file 'bzrlib/tests/test_utextwrap.py'
--- bzrlib/tests/test_utextwrap.py	1970-01-01 00:00:00 +0000
+++ bzrlib/tests/test_utextwrap.py	2011-05-14 03:14:26 +0000
@@ -0,0 +1,192 @@
+# Copyright (C) 2011 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+#
+
+"""Tests of the bzrlib.utextwrap."""
+
+from bzrlib import tests, utextwrap
+
+# Japanese "Good morning".
+# Each character have double width. So total 8 width on console.
+_str_D = u'\u304a\u306f\u3088\u3046'
+
+_str_S = u"hello"
+
+# Combine single width characters and double width characters.
+_str_SD = _str_S + _str_D
+_str_DS = _str_D + _str_S
+
+class TestUTextWrap(tests.TestCase):
+
+    def check_width(self, text, expected_width):
+        w = utextwrap.UTextWrapper()
+        self.assertEqual(
+                w._width(text),
+                expected_width,
+                "Width of %r should be %d" % (text, expected_width))
+
+    def test_width(self):
+        self.check_width(_str_D, 8)
+        self.check_width(_str_SD, 13)
+
+    def check_cut(self, text, width, pos):
+        w = utextwrap.UTextWrapper()
+        self.assertEqual((text[:pos], text[pos:]), w._cut(text, width))
+
+    def test_cut(self):
+        s = _str_SD
+        self.check_cut(s, 0, 0)
+        self.check_cut(s, 1, 1)
+        self.check_cut(s, 5, 5)
+        self.check_cut(s, 6, 5)
+        self.check_cut(s, 7, 6)
+        self.check_cut(s, 12, 8)
+        self.check_cut(s, 13, 9)
+        self.check_cut(s, 14, 9)
+        self.check_cut(u'A'*5, 3, 3)
+
+    def test_split(self):
+        w = utextwrap.UTextWrapper()
+        self.assertEqual(list(_str_D), w._split(_str_D))
+        self.assertEqual([_str_S]+list(_str_D), w._split(_str_SD))
+        self.assertEqual(list(_str_D)+[_str_S], w._split(_str_DS))
+
+    def test_wrap(self):
+        self.assertEqual(list(_str_D), utextwrap.wrap(_str_D, 1))
+        self.assertEqual(list(_str_D), utextwrap.wrap(_str_D, 2))
+        self.assertEqual(list(_str_D), utextwrap.wrap(_str_D, 3))
+        self.assertEqual(list(_str_D),
+                         utextwrap.wrap(_str_D, 3, break_long_words=False))
+
+class TestUTextFill(tests.TestCase):
+
+    def test_fill_simple(self):
+        # Test only can call fill() because it's just '\n'.join(wrap(text)).
+        self.assertEqual("%s\n%s" % (_str_D[:2], _str_D[2:]),
+                         utextwrap.fill(_str_D, 4))
+
+    def test_fill_with_breaks(self):
+        # Demonstrate complicated case.
+        text = u"spam ham egg spamhamegg" + _str_D + u" spam" + _str_D*2
+        self.assertEqual(u'\n'.join(["spam ham",
+                                     "egg spam",
+                                     "hamegg" + _str_D[0],
+                                     _str_D[1:],
+                                     "spam" + _str_D[:2],
+                                     _str_D[2:]+_str_D[:2],
+                                     _str_D[2:]]),
+                         utextwrap.fill(text, 8))
+
+    def test_fill_without_breaks(self):
+        text = u"spam ham egg spamhamegg" + _str_D + u" spam" + _str_D*2
+        self.assertEqual(u'\n'.join(["spam ham",
+                                     "egg",
+                                     "spamhamegg", 
+                                     # border between single width and double
+                                     # width.
+                                     _str_D,
+                                     "spam" + _str_D[:2],
+                                     _str_D[2:]+_str_D[:2],
+                                     _str_D[2:]]),
+                         utextwrap.fill(text, 8, break_long_words=False))
+
+    def test_fill_indent_with_breaks(self):
+        w = utextwrap.UTextWrapper(8, initial_indent=' '*4,
+                                   subsequent_indent=' '*4)
+        self.assertEqual(u'\n'.join(["    hell",
+                                     "    o" + _str_D[0],
+                                     "    " + _str_D[1:3],
+                                     "    " + _str_D[3]
+                                     ]),
+                         w.fill(_str_SD))
+
+    def test_fill_indent_without_breaks(self):
+        w = utextwrap.UTextWrapper(8, initial_indent=' '*4,
+                                   subsequent_indent=' '*4)
+        w.break_long_words = False
+        self.assertEqual(u'\n'.join(["    hello",
+                                     "    " + _str_D[:2],
+                                     "    " + _str_D[2:],
+                                     ]),
+                         w.fill(_str_SD))
+
+    def test_fill_indent_without_breaks_with_fixed_width(self):
+        w = utextwrap.UTextWrapper(8, initial_indent=' '*4,
+                                   subsequent_indent=' '*4)
+        w.break_long_words = False
+        w.width = 3
+        self.assertEqual(u'\n'.join(["    hello",
+                                     "    " + _str_D[0],
+                                     "    " + _str_D[1],
+                                     "    " + _str_D[2],
+                                     "    " + _str_D[3],
+                                     ]),
+                         w.fill(_str_SD))
+
+class TestUTextWrapAmbiWidth(tests.TestCase):
+    _cyrill_char = u"\u0410" # east_asian_width() == 'A'
+
+    def test_ambiwidth1(self):
+        w = utextwrap.UTextWrapper(4, ambiguous_width=1)
+        s = self._cyrill_char*8
+        self.assertEqual([self._cyrill_char*4]*2, w.wrap(s))
+
+    def test_ambiwidth2(self):
+        w = utextwrap.UTextWrapper(4, ambiguous_width=2)
+        s = self._cyrill_char*8
+        self.assertEqual([self._cyrill_char*2]*4, w.wrap(s))
+
+
+# Regression test with Python's test_textwrap
+# Note that some distribution including Ubuntu doesn't install
+# Python's test suite.
+try:
+    from test import test_textwrap
+
+    def override_textwrap_symbols(testcase):
+        # Override the symbols imported by test_textwrap so it uses our own
+        # replacements.
+        testcase.overrideAttr(test_textwrap, 'TextWrapper',
+                              utextwrap.UTextWrapper)
+        testcase.overrideAttr(test_textwrap, 'wrap', utextwrap.wrap)
+        testcase.overrideAttr(test_textwrap, 'fill', utextwrap.fill)
+
+
+    def setup_both(testcase, base_class, reused_class):
+        super(base_class, testcase).setUp()
+        override_textwrap_symbols(testcase)
+        reused_class.setUp(testcase)
+
+
+    class TestWrap(tests.TestCase, test_textwrap.WrapTestCase):
+
+        def setUp(self):
+            setup_both(self, TestWrap, test_textwrap.WrapTestCase)
+
+
+    class TestLongWord(tests.TestCase, test_textwrap.LongWordTestCase):
+
+        def setUp(self):
+            setup_both(self, TestLongWord, test_textwrap.LongWordTestCase)
+
+
+    class TestIndent(tests.TestCase, test_textwrap.IndentTestCases):
+
+        def setUp(self):
+            setup_both(self, TestIndent, test_textwrap.IndentTestCases)
+
+except ImportError:
+    pass

=== modified file 'bzrlib/trace.py'
--- bzrlib/trace.py	2011-04-07 10:36:24 +0000
+++ bzrlib/trace.py	2011-05-14 03:14:26 +0000
@@ -566,7 +566,11 @@
     :param advice: Extra advice to the user to be printed following the
         exception.
     """
-    err_file.write("bzr: ERROR: %s\n" % (exc_info[1],))
+    e = exc_info[1]
+    if isinstance(e, errors.BzrError):
+        err_file.write("bzr: ERROR: %s\n" % (e.i18n(),))
+    else:
+        err_file.write("bzr: ERROR: %s\n" % (e,))
     if advice:
         err_file.write("%s\n" % (advice,))
 

=== added file 'bzrlib/utextwrap.py'
--- bzrlib/utextwrap.py	1970-01-01 00:00:00 +0000
+++ bzrlib/utextwrap.py	2011-05-14 03:14:26 +0000
@@ -0,0 +1,243 @@
+# Copyright (C) 2011 Canonical Ltd
+#
+# UTextWrapper._handle_long_word, UTextWrapper._wrap_chunks,
+# wrap and fill is copied from Python's textwrap module
+# (under PSF license) and modified for support CJK.
+# Original Copyright for these functions:
+#
+# Copyright (C) 1999-2001 Gregory P. Ward.
+# Copyright (C) 2002, 2003 Python Software Foundation.
+#
+# Written by Greg Ward <[e-mail]>
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import sys
+import textwrap
+from unicodedata import east_asian_width as _eawidth
+
+from bzrlib import osutils
+
+__all__ = ["UTextWrapper", "fill", "wrap"]
+
+class UTextWrapper(textwrap.TextWrapper):
+    """
+    Extend TextWrapper for Unicode.
+
+    This textwrapper handles east asian double width and split word
+    even if !break_long_words when word contains double width
+    characters.
+
+    :param ambiguous_width: (keyword argument) width for character when
+                            unicodedata.east_asian_width(c) == 'A'
+                            (default: 1)
+
+    Limitations:
+    * expand_tabs doesn't fixed. It uses len() for calculating width
+      of string on left of TAB.
+    * Handles one codeunit as a single character having 1 or 2 width.
+      This is not correct when there are surrogate pairs, combined
+      characters or zero-width characters.
+    * Treats all asian character are line breakable. But it is not
+      true because line breaking is prohibited around some characters.
+      (For example, breaking before punctation mark is prohibited.)
+      See UAX # 14 "UNICODE LINE BREAKING ALGORITHM"
+    """
+
+    def __init__(self, width=None, **kwargs):
+        if width is None:
+            width = (osutils.terminal_width() or
+                        osutils.default_terminal_width) - 1
+
+        ambi_width = kwargs.pop('ambiguous_width', 1)
+        if ambi_width == 1:
+            self._east_asian_doublewidth = 'FW'
+        elif ambi_width == 2:
+            self._east_asian_doublewidth = 'FWA'
+        else:
+            raise ValueError("ambiguous_width should be 1 or 2")
+
+        # No drop_whitespace param before Python 2.6 it was always dropped
+        if sys.version_info < (2, 6):
+            self.drop_whitespace = kwargs.pop("drop_whitespace", True)
+            if not self.drop_whitespace:
+                raise ValueError("TextWrapper version must drop whitespace")
+        textwrap.TextWrapper.__init__(self, width, **kwargs)
+
+    def _unicode_char_width(self, uc):
+        """Return width of character `uc`.
+
+        :param:     uc      Single unicode character.
+        """
+        # 'A' means width of the character is not be able to determine.
+        # We assume that it's width is 2 because longer wrap may over
+        # terminal width but shorter wrap may be acceptable.
+        return (_eawidth(uc) in self._east_asian_doublewidth and 2) or 1
+
+    def _width(self, s):
+        """Returns width for s.
+        
+        When s is unicode, take care of east asian width.
+        When s is bytes, treat all byte is single width character.
+        """
+        charwidth = self._unicode_char_width
+        return sum(charwidth(c) for c in s)
+
+    def _cut(self, s, width):
+        """Returns head and rest of s. (head+rest == s)
+
+        Head is large as long as _width(head) <= width.
+        """
+        w = 0
+        charwidth = self._unicode_char_width
+        for pos, c in enumerate(s):
+            w += charwidth(c)
+            if w > width:
+                return s[:pos], s[pos:]
+        return s, u''
+
+    def _handle_long_word(self, chunks, cur_line, cur_len, width):
+        # Figure out when indent is larger than the specified width, and make
+        # sure at least one character is stripped off on every pass
+        if width < 2:
+            space_left = chunks[-1] and self._width(chunks[-1][0]) or 1
+        else:
+            space_left = width - cur_len
+
+        # If we're allowed to break long words, then do so: put as much
+        # of the next chunk onto the current line as will fit.
+        if self.break_long_words:
+            head, rest = self._cut(chunks[-1], space_left)
+            cur_line.append(head)
+            if rest:
+                chunks[-1] = rest
+            else:
+                del chunks[-1]
+
+        # Otherwise, we have to preserve the long word intact.  Only add
+        # it to the current line if there's nothing already there --
+        # that minimizes how much we violate the width constraint.
+        elif not cur_line:
+            cur_line.append(chunks.pop())
+
+        # If we're not allowed to break long words, and there's already
+        # text on the current line, do nothing.  Next time through the
+        # main loop of _wrap_chunks(), we'll wind up here again, but
+        # cur_len will be zero, so the next line will be entirely
+        # devoted to the long word that we can't handle right now.
+
+    def _wrap_chunks(self, chunks):
+        lines = []
+        if self.width <= 0:
+            raise ValueError("invalid width %r (must be > 0)" % self.width)
+
+        # Arrange in reverse order so items can be efficiently popped
+        # from a stack of chucks.
+        chunks.reverse()
+
+        while chunks:
+
+            # Start the list of chunks that will make up the current line.
+            # cur_len is just the length of all the chunks in cur_line.
+            cur_line = []
+            cur_len = 0
+
+            # Figure out which static string will prefix this line.
+            if lines:
+                indent = self.subsequent_indent
+            else:
+                indent = self.initial_indent
+
+            # Maximum width for this line.
+            width = self.width - len(indent)
+
+            # First chunk on line is whitespace -- drop it, unless this
+            # is the very beginning of the text (ie. no lines started yet).
+            if self.drop_whitespace and chunks[-1].strip() == '' and lines:
+                del chunks[-1]
+
+            while chunks:
+                # Use _width instead of len for east asian width
+                l = self._width(chunks[-1])
+
+                # Can at least squeeze this chunk onto the current line.
+                if cur_len + l <= width:
+                    cur_line.append(chunks.pop())
+                    cur_len += l
+
+                # Nope, this line is full.
+                else:
+                    break
+
+            # The current line is full, and the next chunk is too big to
+            # fit on *any* line (not just this one).
+            if chunks and self._width(chunks[-1]) > width:
+                self._handle_long_word(chunks, cur_line, cur_len, width)
+
+            # If the last chunk on this line is all whitespace, drop it.
+            if self.drop_whitespace and cur_line and cur_line[-1].strip() == '':
+                del cur_line[-1]
+
+            # Convert current line back to a string and store it in list
+            # of all lines (return value).
+            if cur_line:
+                lines.append(indent + ''.join(cur_line))
+
+        return lines
+
+    def _split(self, text):
+        chunks = textwrap.TextWrapper._split(self, unicode(text))
+        cjk_split_chunks = []
+        for chunk in chunks:
+            assert chunk # TextWrapper._split removes empty chunk
+            prev_pos = 0
+            for pos, char in enumerate(chunk):
+                if _eawidth(char) in 'FWA':
+                    if prev_pos < pos:
+                        cjk_split_chunks.append(chunk[prev_pos:pos])
+                    cjk_split_chunks.append(char)
+                    prev_pos = pos+1
+            if prev_pos < len(chunk):
+                cjk_split_chunks.append(chunk[prev_pos:])
+        return cjk_split_chunks
+
+    def wrap(self, text):
+        # ensure text is unicode
+        return textwrap.TextWrapper.wrap(self, unicode(text))
+
+# -- Convenience interface ---------------------------------------------
+
+def wrap(text, width=None, **kwargs):
+    """Wrap a single paragraph of text, returning a list of wrapped lines.
+
+    Reformat the single paragraph in 'text' so it fits in lines of no
+    more than 'width' columns, and return a list of wrapped lines.  By
+    default, tabs in 'text' are expanded with string.expandtabs(), and
+    all other whitespace characters (including newline) are converted to
+    space.  See TextWrapper class for available keyword args to customize
+    wrapping behaviour.
+    """
+    return UTextWrapper(width=width, **kwargs).wrap(text)
+
+def fill(text, width=None, **kwargs):
+    """Fill a single paragraph of text, returning a new string.
+
+    Reformat the single paragraph in 'text' to fit in lines of no more
+    than 'width' columns, and return a new string containing the entire
+    wrapped paragraph.  As with wrap(), tabs are expanded and other
+    whitespace characters converted to space.  See TextWrapper class for
+    available keyword args to customize wrapping behaviour.
+    """
+    return UTextWrapper(width=width, **kwargs).fill(text)
+

=== added directory 'po'
=== added file 'po/bzr.pot'
--- po/bzr.pot	1970-01-01 00:00:00 +0000
+++ po/bzr.pot	2011-05-14 03:14:26 +0000
@@ -0,0 +1,8931 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Canonical
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: bzr\n"
+"Report-Msgid-Bugs-To: <[e-mail]>\n"
+"POT-Creation-Date: 2011-05-14 12:05+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: bzrlib/builtins.py:206
+msgid "Display status summary."
+msgstr ""
+
+#: bzrlib/builtins.py:208
+msgid ""
+"This reports on versioned and unknown files, reporting them\n"
+"grouped by state.  Possible states are:"
+msgstr ""
+
+#: bzrlib/builtins.py:211
+msgid ""
+"added\n"
+"    Versioned in the working copy but not in the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:214
+msgid ""
+"removed\n"
+"    Versioned in the previous revision but removed or deleted\n"
+"    in the working copy."
+msgstr ""
+
+#: bzrlib/builtins.py:218
+msgid ""
+"renamed\n"
+"    Path of this file changed from the previous revision;\n"
+"    the text may also have changed.  This includes files whose\n"
+"    parent directory was renamed."
+msgstr ""
+
+#: bzrlib/builtins.py:223
+msgid ""
+"modified\n"
+"    Text has changed since the previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:226
+msgid ""
+"kind changed\n"
+"    File kind has been changed (e.g. from file to directory)."
+msgstr ""
+
+#: bzrlib/builtins.py:229
+msgid ""
+"unknown\n"
+"    Not versioned and not matching an ignore pattern."
+msgstr ""
+
+#: bzrlib/builtins.py:232
+msgid ""
+"Additionally for directories, symlinks and files with an executable\n"
+"bit, Bazaar indicates their type using a trailing character: '/', '@'\n"
+"or '*' respectively."
+msgstr ""
+
+#: bzrlib/builtins.py:236
+msgid ""
+"To see ignored files use 'bzr ignored'.  For details on the\n"
+"changes to file texts, use 'bzr diff'."
+msgstr ""
+
+#: bzrlib/builtins.py:239
+msgid ""
+"Note that --short or -S gives status flags for each item, similar\n"
+"to Subversion's status command. To get output similar to svn -q,\n"
+"use bzr status -SV."
+msgstr ""
+
+#: bzrlib/builtins.py:243
+msgid ""
+"If no arguments are specified, the status of the entire working\n"
+"directory is shown.  Otherwise, only the status of the specified\n"
+"files or directories is reported.  If a directory is given, status\n"
+"is reported for everything inside that directory."
+msgstr ""
+
+#: bzrlib/builtins.py:248
+msgid ""
+"Before merges are committed, the pending merge tip revisions are\n"
+"shown. To see all pending merge revisions, use the -v option.\n"
+"To skip the display of pending merge information altogether, use\n"
+"the no-pending option or specify a file/directory."
+msgstr ""
+
+#: bzrlib/builtins.py:253
+msgid ""
+"To compare the working directory to a specific revision, pass a\n"
+"single revision to the revision argument."
+msgstr ""
+
+#: bzrlib/builtins.py:256
+msgid ""
+"To see which files have changed in a specific revision, or between\n"
+"two revisions, pass a revision range to the revision argument.\n"
+"This will produce the same results as calling 'bzr diff --summarize'."
+msgstr ""
+
+# help of 'short' option of 'status' command
+#: bzrlib/builtins.py:265
+msgid "Use short status indicators."
+msgstr ""
+
+# help of 'versioned' option of 'status' command
+#: bzrlib/builtins.py:267
+msgid "Only show versioned files."
+msgstr ""
+
+# help of 'no-pending' option of 'status' command
+#: bzrlib/builtins.py:269
+msgid "Don't show pending merges."
+msgstr ""
+
+#: bzrlib/builtins.py:446
+msgid "Remove the working tree from a given branch/checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:448
+msgid ""
+"Since a lightweight checkout is little more than a working tree\n"
+"this will refuse to run against one."
+msgstr ""
+
+#: bzrlib/builtins.py:451
+msgid "To re-create the working tree, use \"bzr checkout\"."
+msgstr ""
+
+# help of 'force' option of 'remove-tree' command
+#: bzrlib/builtins.py:457
+msgid "Remove the working tree even if it has uncommitted or shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:542
+msgid "Show current revision number."
+msgstr ""
+
+#: bzrlib/builtins.py:544
+msgid "This is equal to the number of revisions on this branch."
+msgstr ""
+
+# help of 'tree' option of 'revno' command
+#: bzrlib/builtins.py:585
+msgid "Show revno of working tree"
+msgstr ""
+
+#: bzrlib/builtins.py:633
+msgid "Add specified files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:635
+msgid ""
+"In non-recursive mode, all the named items are added, regardless\n"
+"of whether they were previously ignored.  A warning is given if\n"
+"any of the named files are already versioned."
+msgstr ""
+
+#: bzrlib/builtins.py:639
+msgid ""
+"In recursive mode (the default), files are treated the same way\n"
+"but the behaviour for directories is different.  Directories that\n"
+"are already versioned do not give a warning.  All directories,\n"
+"whether already versioned or not, are searched for files or\n"
+"subdirectories that are neither versioned or ignored, and these\n"
+"are added.  This search proceeds recursively into versioned\n"
+"directories.  If no names are given '.' is assumed."
+msgstr ""
+
+#: bzrlib/builtins.py:647
+msgid ""
+"Therefore simply saying 'bzr add' will version all files that\n"
+"are currently unknown."
+msgstr ""
+
+#: bzrlib/builtins.py:650
+msgid ""
+"Adding a file whose parent directory is not versioned will\n"
+"implicitly add the parent, and so on up to the root. This means\n"
+"you should never need to explicitly add a directory, they'll just\n"
+"get added when you add a file in the directory."
+msgstr ""
+
+#: bzrlib/builtins.py:655
+msgid ""
+"--dry-run will show which files would be added, but not actually\n"
+"add them."
+msgstr ""
+
+#: bzrlib/builtins.py:658
+msgid ""
+"--file-ids-from will try to use the file ids from the supplied path.\n"
+"It looks up ids trying to find a matching parent directory with the\n"
+"same filename, and then by pure path. This option is rarely needed\n"
+"but can be useful when adding the same logical file into two\n"
+"branches that will be merged later (without showing the two different\n"
+"adds as a conflict). It is also useful when merging another project\n"
+"into a subdirectory of this one."
+msgstr ""
+
+#: bzrlib/builtins.py:666
+msgid ""
+"Any files matching patterns in the ignore list will not be added\n"
+"unless they are explicitly mentioned."
+msgstr ""
+
+# help of 'no-recurse' option of 'add' command
+#: bzrlib/builtins.py:672
+msgid "Don't recursively add the contents of directories."
+msgstr ""
+
+# help of 'file-ids-from' option of 'add' command
+#: bzrlib/builtins.py:678
+msgid "Lookup file ids from this tree."
+msgstr ""
+
+#: bzrlib/builtins.py:718
+msgid "Create a new versioned directory."
+msgstr ""
+
+#: bzrlib/builtins.py:720
+msgid "This is equivalent to creating the directory and then adding it."
+msgstr ""
+
+#: bzrlib/builtins.py:814
+msgid "Move or rename a file."
+msgstr ""
+
+#: bzrlib/builtins.py:816
+msgid ""
+":Usage:\n"
+"    bzr mv OLDNAME NEWNAME"
+msgstr ""
+
+#: bzrlib/builtins.py:819
+msgid "    bzr mv SOURCE... DESTINATION"
+msgstr ""
+
+#: bzrlib/builtins.py:821
+msgid ""
+"If the last argument is a versioned directory, all the other names\n"
+"are moved into it.  Otherwise, there must be exactly two arguments\n"
+"and the file is changed to a new name."
+msgstr ""
+
+#: bzrlib/builtins.py:825
+msgid ""
+"If OLDNAME does not exist on the filesystem but is versioned and\n"
+"NEWNAME does exist on the filesystem but is not versioned, mv\n"
+"assumes that the file has been manually moved and only updates\n"
+"its internal inventory to reflect that change.\n"
+"The same is valid when moving many SOURCE files to a DESTINATION."
+msgstr ""
+
+#: bzrlib/builtins.py:831
+msgid "Files cannot be moved between branches."
+msgstr ""
+
+# help of 'after' option of 'mv' command
+#: bzrlib/builtins.py:835
+msgid ""
+"Move only the bzr identifier of the file, because the file has already been "
+"moved."
+msgstr ""
+
+# help of 'auto' option of 'mv' command
+#: bzrlib/builtins.py:837
+msgid "Automatically guess renames."
+msgstr ""
+
+# help of 'dry-run' option of 'mv' command
+#: bzrlib/builtins.py:838
+msgid "Avoid making changes when guessing renames."
+msgstr ""
+
+#: bzrlib/builtins.py:950
+msgid "Turn this branch into a mirror of another branch."
+msgstr ""
+
+#: bzrlib/builtins.py:952
+msgid ""
+"By default, this command only works on branches that have not diverged.\n"
+"Branches are considered diverged if the destination branch's most recent \n"
+"commit is one that has not been merged (directly or indirectly) into the \n"
+"parent."
+msgstr ""
+
+#: bzrlib/builtins.py:957
+msgid ""
+"If branches have diverged, you can use 'bzr merge' to integrate the changes\n"
+"from one into the other.  Once one branch has merged, the other should\n"
+"be able to pull it again."
+msgstr ""
+
+#: bzrlib/builtins.py:961
+msgid ""
+"If you want to replace your local changes and just want your branch to\n"
+"match the remote one, use pull --overwrite. This will work even if the two\n"
+"branches have diverged."
+msgstr ""
+
+#: bzrlib/builtins.py:965
+msgid ""
+"If there is no default location set, the first pull will set it.  After\n"
+"that, you can omit the location to use the default.  To change the\n"
+"default, use --remember. The value will only be saved if the remote\n"
+"location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:970
+msgid ""
+"Note: The location can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send."
+msgstr ""
+
+# help of 'verbose' option of 'pull' command
+#: bzrlib/builtins.py:978
+msgid "Show logs of pulled revisions."
+msgstr ""
+
+# help of 'directory' option of 'pull' command
+#: bzrlib/builtins.py:980
+msgid ""
+"Branch to pull into, rather than the one containing the working directory."
+msgstr ""
+
+# help of 'local' option of 'pull' command
+#: bzrlib/builtins.py:983
+msgid ""
+"Perform a local pull in a bound branch.  Local pulls are not applied to the "
+"master branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1082
+msgid "Update a mirror of this branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1084
+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:1087
+msgid ""
+"Some smart servers or protocols *may* put the working tree in place in\n"
+"the future."
+msgstr ""
+
+#: bzrlib/builtins.py:1090
+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:1094
+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:1097
+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:1101
+msgid ""
+"If there is no default push location set, the first push will set it.\n"
+"After that, you can omit the location to use the default.  To change the\n"
+"default, use --remember. The value will only be saved if the remote\n"
+"location can be accessed."
+msgstr ""
+
+# help of 'directory' option of 'push' command
+#: bzrlib/builtins.py:1113
+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:1116
+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:1121
+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:1124
+msgid ""
+"Create a stacked branch that refers to another branch for the commit "
+"history. Only the work not present in the referenced branch is included in "
+"the branch created."
+msgstr ""
+
+# help of 'strict' option of 'push' command
+#: bzrlib/builtins.py:1129
+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:1132
+msgid "Don't populate the working tree, even for protocols that support it."
+msgstr ""
+
+#: bzrlib/builtins.py:1197
+msgid "Create a new branch that is a copy of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1199
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the FROM_LOCATION will\n"
+"be used.  In other words, \"branch ../foo/bar\" will attempt to create ./"
+"bar.\n"
+"If the FROM_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the FROM_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"branch lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1206
+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:1209
+msgid "The synonyms 'clone' and 'get' for this command are deprecated."
+msgstr ""
+
+# help of 'no-tree' option of 'branch' command
+#: bzrlib/builtins.py:1219
+msgid "Create a branch without a working-tree."
+msgstr ""
+
+# help of 'switch' option of 'branch' command
+#: bzrlib/builtins.py:1221
+msgid "Switch the checkout in the current directory to the new branch."
+msgstr ""
+
+# help of 'stacked' option of 'branch' command
+#: bzrlib/builtins.py:1224
+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:1228
+msgid "Do not use a shared repository, even if available."
+msgstr ""
+
+# help of 'use-existing-dir' option of 'branch' command
+#: bzrlib/builtins.py:1230
+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:1235
+msgid "Bind new branch to from location."
+msgstr ""
+
+#: bzrlib/builtins.py:1327
+msgid "Create a new checkout of an existing branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1329
+msgid ""
+"If BRANCH_LOCATION is omitted, checkout will reconstitute a working tree "
+"for\n"
+"the branch found in '.'. This is useful if you have removed the working "
+"tree\n"
+"or if it was never created - i.e. if you pushed the branch to its current\n"
+"location using SFTP."
+msgstr ""
+
+#: bzrlib/builtins.py:1334
+msgid ""
+"If the TO_LOCATION is omitted, the last component of the BRANCH_LOCATION "
+"will\n"
+"be used.  In other words, \"checkout ../foo/bar\" will attempt to create ./"
+"bar.\n"
+"If the BRANCH_LOCATION has no / or path separator embedded, the TO_LOCATION\n"
+"is derived from the BRANCH_LOCATION by stripping a leading scheme or drive\n"
+"identifier, if any. For example, \"checkout lp:foo-bar\" will attempt to\n"
+"create ./foo-bar."
+msgstr ""
+
+#: bzrlib/builtins.py:1341
+msgid ""
+"To retrieve the branch as of a particular revision, supply the --revision\n"
+"parameter, as in \"checkout foo/bar -r 5\". Note that this will be "
+"immediately\n"
+"out of date [so you cannot commit] but it may be useful (i.e. to examine "
+"old\n"
+"code.)"
+msgstr ""
+
+# help of 'lightweight' option of 'checkout' command
+#: bzrlib/builtins.py:1351
+msgid ""
+"Perform a lightweight checkout.  Lightweight checkouts depend on access to "
+"the branch for every operation.  Normal checkouts can perform common "
+"operations like diff and status without such access, and also support local "
+"commits."
+msgstr ""
+
+# help of 'files-from' option of 'branch' command
+#: bzrlib/builtins.py:1358
+msgid "Get file contents from this tree."
+msgstr ""
+
+# help of 'hardlink' option of 'branch' command
+#: bzrlib/builtins.py:1360
+msgid "Hard-link working tree files where possible."
+msgstr ""
+
+#: bzrlib/builtins.py:1401
+msgid ""
+"Show list of renamed files.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:1431
+msgid "Update a tree to have the latest code committed to its branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1433
+msgid ""
+"This will perform a merge into the working tree, and may generate\n"
+"conflicts. If you have any local changes, you will still\n"
+"need to commit them after the update for the update to be complete."
+msgstr ""
+
+#: bzrlib/builtins.py:1437
+msgid ""
+"If you want to discard your local changes, you can just do a\n"
+"'bzr revert' instead of 'bzr commit' after the update."
+msgstr ""
+
+#: bzrlib/builtins.py:1440
+msgid ""
+"If you want to restore a file that has been removed locally, use\n"
+"'bzr revert' instead of 'bzr update'."
+msgstr ""
+
+#: bzrlib/builtins.py:1443
+msgid ""
+"If the tree's branch is bound to a master branch, it will also update\n"
+"the branch from the master."
+msgstr ""
+
+#: bzrlib/builtins.py:1524
+msgid "Show information about a working tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1526
+msgid ""
+"This command will show all known locations and formats associated to the\n"
+"tree, branch or repository."
+msgstr ""
+
+#: bzrlib/builtins.py:1529
+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:1533
+msgid "Branches and working trees will also report any missing revisions."
+msgstr ""
+
+#: bzrlib/builtins.py:1537
+msgid "  Display information on the format and related locations:"
+msgstr ""
+
+#: bzrlib/builtins.py:1539
+msgid "    bzr info"
+msgstr ""
+
+#: bzrlib/builtins.py:1541
+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:1545
+msgid "    bzr info -v"
+msgstr ""
+
+#: bzrlib/builtins.py:1547
+msgid "  Display the above together with number of committers to the branch:"
+msgstr ""
+
+#: bzrlib/builtins.py:1549
+msgid "    bzr info -vv"
+msgstr ""
+
+#: bzrlib/builtins.py:1568
+msgid "Remove files or directories."
+msgstr ""
+
+#: bzrlib/builtins.py:1570
+msgid ""
+"This makes Bazaar stop tracking changes to the specified files. Bazaar will\n"
+"delete them if they can easily be recovered using revert otherwise they\n"
+"will be backed up (adding an extention of the form .~#~). If no options or\n"
+"parameters are given Bazaar will scan for files that are being tracked by\n"
+"Bazaar but missing in your tree and stop tracking them for you."
+msgstr ""
+
+# help of 'new' option of 'remove' command
+#: bzrlib/builtins.py:1578
+msgid "Only remove files that have never been committed."
+msgstr ""
+
+# help of 'file-deletion-strategy' option of 'remove' command
+#: bzrlib/builtins.py:1580
+msgid "The file deletion mode to be used."
+msgstr ""
+
+# title of 'file-deletion-strategy' option of 'remove' command
+#: bzrlib/builtins.py:1581
+msgid "Deletion Strategy"
+msgstr ""
+
+#: bzrlib/builtins.py:1672
+msgid "Reconcile bzr metadata in a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1674
+msgid ""
+"This can correct data mismatches that may have been caused by\n"
+"previous ghost operations or bzr upgrades. You should only\n"
+"need to run this command if 'bzr check' or a bzr developer\n"
+"advises you to run it."
+msgstr ""
+
+#: bzrlib/builtins.py:1679
+msgid ""
+"If a second branch is provided, cross-branch reconciliation is\n"
+"also attempted, which will check that data like the tree root\n"
+"id which was not present in very early bzr versions is represented\n"
+"correctly in both branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1684
+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:1687
+msgid "The branch *MUST* be on a listable system such as local disk or sftp."
+msgstr ""
+
+#: bzrlib/builtins.py:1747
+msgid "Make a directory into a versioned branch."
+msgstr ""
+
+#: bzrlib/builtins.py:1749
+msgid ""
+"Use this to create an empty branch, or before importing an\n"
+"existing project."
+msgstr ""
+
+#: bzrlib/builtins.py:1752
+msgid ""
+"If there is a repository in a parent directory of the location, then\n"
+"the history of the branch will be stored in the repository.  Otherwise\n"
+"init creates a standalone branch which carries its own history\n"
+"in the .bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:1757
+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:1760
+msgid "Recipe for importing a tree of files::"
+msgstr ""
+
+#: bzrlib/builtins.py:1762
+msgid ""
+"    cd ~/project\n"
+"    bzr init\n"
+"    bzr add .\n"
+"    bzr status\n"
+"    bzr commit -m \"imported project\""
+msgstr ""
+
+# help of 'create-prefix' option of 'init' command
+#: bzrlib/builtins.py:1773
+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:1776
+msgid "Specify a format for this branch. See \"help formats\"."
+msgstr ""
+
+# help of 'append-revisions-only' option of 'init' command
+#: bzrlib/builtins.py:1784
+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:1787
+msgid "Create a branch without a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1864
+msgid "Create a shared repository for branches to share storage space."
+msgstr ""
+
+#: bzrlib/builtins.py:1866
+msgid ""
+"New branches created under the repository directory will store their\n"
+"revisions in the repository, not in the branch directory.  For branches\n"
+"with shared history, this reduces the amount of storage needed and \n"
+"speeds up the creation of new branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1871
+msgid ""
+"If the --no-trees option is given then the branches in the repository\n"
+"will not have working trees by default.  They will still exist as \n"
+"directories on disk, but they will not have separate copies of the \n"
+"files at a certain revision.  This can be useful for repositories that\n"
+"store branches which are interacted with through checkouts or remote\n"
+"branches, such as on a server."
+msgstr ""
+
+#: bzrlib/builtins.py:1878
+msgid ""
+":Examples:\n"
+"    Create a shared repository holding just branches::"
+msgstr ""
+
+#: bzrlib/builtins.py:1881
+msgid ""
+"        bzr init-repo --no-trees repo\n"
+"        bzr init repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:1884
+msgid "    Make a lightweight checkout elsewhere::"
+msgstr ""
+
+#: bzrlib/builtins.py:1886
+msgid ""
+"        bzr checkout --lightweight repo/trunk trunk-checkout\n"
+"        cd trunk-checkout\n"
+"        (add files here)"
+msgstr ""
+
+# help of 'format' option of 'init-repository' command
+#: bzrlib/builtins.py:1894
+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:1898
+msgid "Repository format"
+msgstr ""
+
+# help of 'no-trees' option of 'init-repository' command
+#: bzrlib/builtins.py:1900
+msgid "Branches in the repository will default to not having a working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:1924
+msgid "Show differences in the working tree, between revisions or branches."
+msgstr ""
+
+#: bzrlib/builtins.py:1926
+msgid ""
+"If no arguments are given, all changes for the current tree are listed.\n"
+"If files are given, only the changes in those files are listed.\n"
+"Remote and multiple branches can be compared by using the --old and\n"
+"--new options. If not provided, the default for both is derived from\n"
+"the first argument, if any, or the current tree if no arguments are\n"
+"given."
+msgstr ""
+
+#: bzrlib/builtins.py:1933
+msgid ""
+"\"bzr diff -p1\" is equivalent to \"bzr diff --prefix old/:new/\", and\n"
+"produces patches suitable for \"patch -p1\"."
+msgstr ""
+
+#: bzrlib/builtins.py:1936
+msgid ""
+"Note that when using the -r argument with a range of revisions, the\n"
+"differences are computed between the two specified revisions.  That\n"
+"is, the command does not show the changes introduced by the first \n"
+"revision in the range.  This differs from the interpretation of \n"
+"revision ranges used by \"bzr log\" which includes the first revision\n"
+"in the range."
+msgstr ""
+
+#: bzrlib/builtins.py:1943
+msgid ""
+":Exit values:\n"
+"    1 - changed\n"
+"    2 - unrepresentable changes\n"
+"    3 - error\n"
+"    0 - no change"
+msgstr ""
+
+#: bzrlib/builtins.py:1949
+msgid ""
+":Examples:\n"
+"    Shows the difference in the working tree versus the last commit::"
+msgstr ""
+
+#: bzrlib/builtins.py:1952
+msgid "        bzr diff"
+msgstr ""
+
+#: bzrlib/builtins.py:1954
+msgid "    Difference between the working tree and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:1956
+msgid "        bzr diff -r1"
+msgstr ""
+
+#: bzrlib/builtins.py:1958
+msgid "    Difference between revision 3 and revision 1::"
+msgstr ""
+
+#: bzrlib/builtins.py:1960
+msgid "        bzr diff -r1..3"
+msgstr ""
+
+#: bzrlib/builtins.py:1962
+msgid "    Difference between revision 3 and revision 1 for branch xxx::"
+msgstr ""
+
+#: bzrlib/builtins.py:1964
+msgid "        bzr diff -r1..3 xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:1966
+msgid "    The changes introduced by revision 2 (equivalent to -r1..2)::"
+msgstr ""
+
+#: bzrlib/builtins.py:1968
+msgid "        bzr diff -c2"
+msgstr ""
+
+#: bzrlib/builtins.py:1970
+msgid ""
+"    To see the changes introduced by revision X::\n"
+"    \n"
+"        bzr diff -cX"
+msgstr ""
+
+#: bzrlib/builtins.py:1974
+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:1978
+msgid "        bzr diff -r<chosen_parent>..X"
+msgstr ""
+
+#: bzrlib/builtins.py:1980
+msgid ""
+"    The changes between the current revision and the previous revision\n"
+"    (equivalent to -c-1 and -r-2..-1)"
+msgstr ""
+
+#: bzrlib/builtins.py:1983
+msgid "        bzr diff -r-2.."
+msgstr ""
+
+#: bzrlib/builtins.py:1985
+msgid "    Show just the differences for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:1987
+msgid "        bzr diff NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:1989
+msgid "    Show the differences in working tree xxx for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:1991
+msgid "        bzr diff xxx/NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:1993
+msgid "    Show the differences from branch xxx to this working tree:"
+msgstr ""
+
+#: bzrlib/builtins.py:1995
+msgid "        bzr diff --old xxx"
+msgstr ""
+
+#: bzrlib/builtins.py:1997
+msgid "    Show the differences between two branches for file NEWS::"
+msgstr ""
+
+#: bzrlib/builtins.py:1999
+msgid "        bzr diff --old xxx --new yyy NEWS"
+msgstr ""
+
+#: bzrlib/builtins.py:2001
+msgid "    Same as 'bzr diff' but prefix paths with old/ and new/::"
+msgstr ""
+
+#: bzrlib/builtins.py:2003
+msgid ""
+"        bzr diff --prefix old/:new/\n"
+"        \n"
+"    Show the differences using a custom diff program with options::\n"
+"    \n"
+"        bzr diff --using /usr/bin/diff --diff-options -wu"
+msgstr ""
+
+# help of 'diff-options' option of 'diff' command
+#: bzrlib/builtins.py:2013
+msgid "Pass these options to the external diff program."
+msgstr ""
+
+# help of 'prefix' option of 'diff' command
+#: bzrlib/builtins.py:2016
+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:2019
+msgid "Branch/tree to compare from."
+msgstr ""
+
+# help of 'new' option of 'diff' command
+#: bzrlib/builtins.py:2023
+msgid "Branch/tree to compare to."
+msgstr ""
+
+# help of 'using' option of 'diff' command
+#: bzrlib/builtins.py:2029
+msgid "Use this command to compare files."
+msgstr ""
+
+# help of 'format' option of 'diff' command
+#: bzrlib/builtins.py:2034
+msgid "Diff format to use."
+msgstr ""
+
+# title of 'format' option of 'diff' command
+#: bzrlib/builtins.py:2036
+msgid "Diff format"
+msgstr ""
+
+#: bzrlib/builtins.py:2086
+msgid ""
+"List files deleted in the working tree.\n"
+"    "
+msgstr ""
+
+#: bzrlib/builtins.py:2164
+msgid "Show the tree root directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2166
+msgid ""
+"The root is the nearest enclosing directory with a .bzr control\n"
+"directory."
+msgstr ""
+
+#: bzrlib/builtins.py:2194
+msgid "Show historical log for a branch or subset of a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:2196
+msgid ""
+"log is bzr's default tool for exploring the history of a branch.\n"
+"The branch to use is taken from the first parameter. If no parameters\n"
+"are given, the branch containing the working directory is logged.\n"
+"Here are some simple examples::"
+msgstr ""
+
+#: bzrlib/builtins.py:2201
+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:2205
+msgid ""
+"The filtering, ordering and information shown for each revision can\n"
+"be controlled as explained below. By default, all revisions are\n"
+"shown sorted (topologically) so that newer revisions appear before\n"
+"older ones and descendants always appear before ancestors. If displayed,\n"
+"merged revisions are shown indented under the revision in which they\n"
+"were merged."
+msgstr ""
+
+#: bzrlib/builtins.py:2212
+msgid ":Output control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2214
+msgid ""
+"  The log format controls how information about each revision is\n"
+"  displayed. The standard log formats are called ``long``, ``short``\n"
+"  and ``line``. The default is long. See ``bzr help log-formats``\n"
+"  for more details on log formats."
+msgstr ""
+
+#: bzrlib/builtins.py:2219
+msgid ""
+"  The following options can be used to control what information is\n"
+"  displayed::"
+msgstr ""
+
+#: bzrlib/builtins.py:2222
+msgid ""
+"    -l N        display a maximum of N revisions\n"
+"    -n N        display N levels of revisions (0 for all, 1 for collapsed)\n"
+"    -v          display a status summary (delta) for each revision\n"
+"    -p          display a diff (patch) for each revision\n"
+"    --show-ids  display revision-ids (and file-ids), not just revnos"
+msgstr ""
+
+#: bzrlib/builtins.py:2228
+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:2232
+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:2236
+msgid ":Ordering control:"
+msgstr ""
+
+#: bzrlib/builtins.py:2238
+msgid ""
+"  To display revisions from oldest to newest, use the --forward option.\n"
+"  In most cases, using this option will have little impact on the total\n"
+"  time taken to produce a log, though --forward does not incrementally\n"
+"  display revisions like --reverse does when it can."
+msgstr ""
+
+#: bzrlib/builtins.py:2243
+msgid ":Revision filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2245
+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:2248
+msgid ""
+"    -rX      display revision X\n"
+"    -rX..    display revision X and later\n"
+"    -r..Y    display up to and including revision Y\n"
+"    -rX..Y   display from X to Y inclusive"
+msgstr ""
+
+#: bzrlib/builtins.py:2253
+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:2256
+msgid ""
+"    -r-1                show just the tip\n"
+"    -r-10..             show the last 10 mainline revisions\n"
+"    -rsubmit:..         show what's new on this branch\n"
+"    -rancestor:path..   show changes since the common ancestor of this\n"
+"                        branch and the one at location path\n"
+"    -rdate:yesterday..  show changes since yesterday"
+msgstr ""
+
+#: bzrlib/builtins.py:2263
+msgid ""
+"  When logging a range of revisions using -rX..Y, log starts at\n"
+"  revision Y and searches back in history through the primary\n"
+"  (\"left-hand\") parents until it finds X. When logging just the\n"
+"  top level (using -n1), an error is reported if X is not found\n"
+"  along the way. If multi-level logging is used (-n0), X may be\n"
+"  a nested merge revision and the log will be truncated accordingly."
+msgstr ""
+
+#: bzrlib/builtins.py:2270
+msgid ":Path filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2272
+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:2276
+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:2280
+msgid ""
+"  Historical context is also important when interpreting pathnames of\n"
+"  renamed files/directories. Consider the following example:"
+msgstr ""
+
+#: bzrlib/builtins.py:2283
+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:2287
+msgid "  In this case:"
+msgstr ""
+
+#: bzrlib/builtins.py:2289
+msgid "  * ``bzr log guide.txt`` will log the file added in revision 1"
+msgstr ""
+
+#: bzrlib/builtins.py:2291
+msgid "  * ``bzr log tutorial.txt`` will log the new file added in revision 3"
+msgstr ""
+
+#: bzrlib/builtins.py:2293
+msgid ""
+"  * ``bzr log -r2 -p tutorial.txt`` will show the changes made to\n"
+"    the original file in revision 2."
+msgstr ""
+
+#: bzrlib/builtins.py:2296
+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:2299
+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:2303
+msgid ":Other filtering:"
+msgstr ""
+
+#: bzrlib/builtins.py:2305
+msgid ""
+"  The --message option can be used for finding revisions that match a\n"
+"  regular expression in a commit message."
+msgstr ""
+
+#: bzrlib/builtins.py:2308
+msgid ":Tips & tricks:"
+msgstr ""
+
+#: bzrlib/builtins.py:2310
+msgid ""
+"  GUI tools and IDEs are often better at exploring history than command\n"
+"  line tools: you may prefer qlog or viz from qbzr or bzr-gtk, the\n"
+"  bzr-explorer shell, or the Loggerhead web interface.  See the Plugin\n"
+"  Guide <http://doc.bazaar.canonical.com/plugins/en/> and\n"
+"  <http://wiki.bazaar.canonical.com/IDEIntegration>.  "
+msgstr ""
+
+#: bzrlib/builtins.py:2316
+msgid "  You may find it useful to add the aliases below to ``bazaar.conf``::"
+msgstr ""
+
+#: bzrlib/builtins.py:2318
+msgid ""
+"    [ALIASES]\n"
+"    tip = log -r-1\n"
+"    top = log -l10 --line\n"
+"    show = log -v -p"
+msgstr ""
+
+#: bzrlib/builtins.py:2323
+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:2327
+msgid ""
+"  If you are interested in looking deeper into a particular merge X,\n"
+"  use ``bzr log -n0 -rX``."
+msgstr ""
+
+#: bzrlib/builtins.py:2330
+msgid ""
+"  ``bzr log -v`` on a branch with lots of history is currently\n"
+"  very slow. A fix for this issue is currently under development.\n"
+"  With or without that fix, it is recommended that a revision range\n"
+"  be given when using the -v option."
+msgstr ""
+
+#: bzrlib/builtins.py:2335
+msgid ""
+"  bzr has a generic full-text matching plugin, bzr-search, that can be\n"
+"  used to find revisions matching user names, commit messages, etc.\n"
+"  Among other features, this plugin can find all revisions containing\n"
+"  a list of words but not others."
+msgstr ""
+
+#: bzrlib/builtins.py:2340
+msgid ""
+"  When exploring non-mainline history on large projects with deep\n"
+"  history, the performance of log can be greatly improved by installing\n"
+"  the historycache plugin. This plugin buffers historical information\n"
+"  trading disk space for faster speed."
+msgstr ""
+
+# help of 'forward' option of 'log' command
+#: bzrlib/builtins.py:2349
+msgid "Show from oldest to newest."
+msgstr ""
+
+# help of 'verbose' option of 'log' command
+#: bzrlib/builtins.py:2352
+msgid "Show files changed in each revision."
+msgstr ""
+
+# help of 'change' option of 'log' command
+#: bzrlib/builtins.py:2358
+msgid "Show just the specified revision. See also \"help revisionspec\"."
+msgstr ""
+
+# help of 'authors' option of 'log' command
+#: bzrlib/builtins.py:2362
+msgid "What names to list as authors - first, all or committer."
+msgstr ""
+
+# title of 'authors' option of 'log' command
+#: bzrlib/builtins.py:2363
+msgid "Authors"
+msgstr ""
+
+# help of 'levels' option of 'log' command
+#: bzrlib/builtins.py:2368
+msgid "Number of levels to display - 0 for all, 1 for flat."
+msgstr ""
+
+# help of 'message' option of 'log' command
+#: bzrlib/builtins.py:2373
+msgid "Show revisions whose message matches this regular expression."
+msgstr ""
+
+# help of 'limit' option of 'log' command
+#: bzrlib/builtins.py:2378
+msgid "Limit the output to the first N revisions."
+msgstr ""
+
+# help of 'show-diff' option of 'log' command
+#: bzrlib/builtins.py:2383
+msgid "Show changes made in each revision as a patch."
+msgstr ""
+
+# help of 'include-merges' option of 'log' command
+#: bzrlib/builtins.py:2385
+msgid "Show merged revisions like --levels 0 does."
+msgstr ""
+
+# help of 'exclude-common-ancestry' option of 'log' command
+#: bzrlib/builtins.py:2387
+msgid ""
+"Display only the revisions that are not part of both ancestries (require -"
+"rX..Y)"
+msgstr ""
+
+#: bzrlib/builtins.py:2602
+msgid ""
+"List files in a tree.\n"
+"    "
+msgstr ""
+
+# help of 'recursive' option of 'ls' command
+#: bzrlib/builtins.py:2611
+msgid "Recurse into subdirectories."
+msgstr ""
+
+# help of 'from-root' option of 'ls' command
+#: bzrlib/builtins.py:2613
+msgid "Print paths relative to the root of the branch."
+msgstr ""
+
+# help of 'unknown' option of 'ls' command
+#: bzrlib/builtins.py:2615
+msgid "Print unknown files."
+msgstr ""
+
+# help of 'versioned' option of 'ls' command
+#: bzrlib/builtins.py:2616
+msgid "Print versioned files."
+msgstr ""
+
+# help of 'ignored' option of 'ls' command
+#: bzrlib/builtins.py:2619
+msgid "Print ignored files."
+msgstr ""
+
+# help of 'kind' option of 'ls' command
+#: bzrlib/builtins.py:2621
+msgid "List entries of a particular kind: file, directory, symlink."
+msgstr ""
+
+#: bzrlib/builtins.py:2733
+msgid "Ignore specified files or patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:2735
+msgid "See ``bzr help patterns`` for details on the syntax of patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:2737
+msgid ""
+"If a .bzrignore file does not exist, the ignore command\n"
+"will create one and add the specified files or patterns to the newly\n"
+"created file. The ignore command will also automatically add the \n"
+".bzrignore file to be versioned. Creating a .bzrignore file without\n"
+"the use of the ignore command will require an explicit add command."
+msgstr ""
+
+#: bzrlib/builtins.py:2743
+msgid ""
+"To remove patterns from the ignore list, edit the .bzrignore file.\n"
+"After adding, editing or deleting that file either indirectly by\n"
+"using this command or directly by using an editor, be sure to commit\n"
+"it."
+msgstr ""
+
+#: bzrlib/builtins.py:2748
+msgid ""
+"Bazaar also supports a global ignore file ~/.bazaar/ignore. On Windows\n"
+"the global ignore file can be found in the application data directory as\n"
+"C:\\Documents and Settings\\<user>\\Application Data\\Bazaar\\2.0\\ignore.\n"
+"Global ignores are not touched by this command. The global ignore file\n"
+"can be edited directly using an editor."
+msgstr ""
+
+#: bzrlib/builtins.py:2754
+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:2758
+msgid ""
+"Patterns prefixed with '!!' act as regular ignore patterns, but have\n"
+"precedence over the '!' exception patterns."
+msgstr ""
+
+#: bzrlib/builtins.py:2761
+msgid ""
+":Notes: \n"
+"    \n"
+"* Ignore patterns containing shell wildcards must be quoted from\n"
+"  the shell on Unix."
+msgstr ""
+
+#: bzrlib/builtins.py:2766
+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:2769
+msgid ""
+":Examples:\n"
+"    Ignore the top level Makefile::"
+msgstr ""
+
+#: bzrlib/builtins.py:2772
+msgid "        bzr ignore ./Makefile"
+msgstr ""
+
+#: bzrlib/builtins.py:2774
+msgid "    Ignore .class files in all directories...::"
+msgstr ""
+
+#: bzrlib/builtins.py:2776
+msgid "        bzr ignore \"*.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:2778
+msgid "    ...but do not ignore \"special.class\"::"
+msgstr ""
+
+#: bzrlib/builtins.py:2780
+msgid "        bzr ignore \"!special.class\""
+msgstr ""
+
+#: bzrlib/builtins.py:2782
+msgid "    Ignore files whose name begins with the \"#\" character::"
+msgstr ""
+
+#: bzrlib/builtins.py:2784
+msgid "        bzr ignore \"RE:^#\""
+msgstr ""
+
+#: bzrlib/builtins.py:2786
+msgid "    Ignore .o files under the lib directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:2788
+msgid "        bzr ignore \"lib/**/*.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:2792
+msgid "        bzr ignore \"RE:lib/.*\\.o\""
+msgstr ""
+
+#: bzrlib/builtins.py:2794
+msgid "    Ignore everything but the \"debian\" toplevel directory::"
+msgstr ""
+
+#: bzrlib/builtins.py:2796
+msgid ""
+"        bzr ignore \"RE:(?!debian/).*\"\n"
+"    \n"
+"    Ignore everything except the \"local\" toplevel directory,\n"
+"    but always ignore autosave files ending in ~, even under local/::\n"
+"    \n"
+"        bzr ignore \"*\"\n"
+"        bzr ignore \"!./local\"\n"
+"        bzr ignore \"!!*~\""
+msgstr ""
+
+# help of 'default-rules' option of 'ignore' command
+#: bzrlib/builtins.py:2810
+msgid "Display the default ignore rules that bzr uses."
+msgstr ""
+
+#: bzrlib/builtins.py:2858
+msgid "List ignored files and the patterns that matched them."
+msgstr ""
+
+#: bzrlib/builtins.py:2860
+msgid ""
+"List all the ignored files and the ignore pattern that caused the file to\n"
+"be ignored."
+msgstr ""
+
+#: bzrlib/builtins.py:2863
+msgid "Alternatively, to list just the files::"
+msgstr ""
+
+#: bzrlib/builtins.py:2865
+msgid "    bzr ls --ignored"
+msgstr ""
+
+#: bzrlib/builtins.py:2906
+msgid "Export current or past revision to a destination directory or archive."
+msgstr ""
+
+#: bzrlib/builtins.py:2908
+msgid "If no revision is specified this exports the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:2910
+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:2914
+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:2918
+msgid ""
+"If branch is omitted then the branch containing the current working\n"
+"directory will be used."
+msgstr ""
+
+#: bzrlib/builtins.py:2921
+msgid "Note: Export of tree with non-ASCII filenames to zip is not supported."
+msgstr ""
+
+#: bzrlib/builtins.py:2923
+msgid ""
+"  =================       =========================\n"
+"  Supported formats       Autodetected by extension\n"
+"  =================       =========================\n"
+"     dir                         (none)\n"
+"     tar                          .tar\n"
+"     tbz2                    .tar.bz2, .tbz2\n"
+"     tgz                      .tar.gz, .tgz\n"
+"     zip                          .zip\n"
+"  =================       ========================="
+msgstr ""
+
+# help of 'format' option of 'export' command
+#: bzrlib/builtins.py:2937
+msgid "Type of file to export to."
+msgstr ""
+
+# help of 'filters' option of 'export' command
+#: bzrlib/builtins.py:2940
+msgid "Apply content filters to export the convenient form."
+msgstr ""
+
+# help of 'root' option of 'export' command
+#: bzrlib/builtins.py:2944
+msgid "Name of the root directory inside the exported file."
+msgstr ""
+
+# help of 'per-file-timestamps' option of 'export' command
+#: bzrlib/builtins.py:2946
+msgid ""
+"Set modification time of files to that of the last revision in which it was "
+"changed."
+msgstr ""
+
+#: bzrlib/builtins.py:2970
+msgid "Write the contents of a file as of a given revision to standard output."
+msgstr ""
+
+#: bzrlib/builtins.py:2972
+msgid "If no revision is nominated, the last revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:2974
+msgid ""
+"Note: Take care to redirect standard output when using this command on a\n"
+"binary file."
+msgstr ""
+
+# help of 'filters' option of 'cat' command
+#: bzrlib/builtins.py:2981
+msgid "Apply content filters to display the convenience form."
+msgstr ""
+
+#: bzrlib/builtins.py:3063
+msgid "Commit changes into a new revision."
+msgstr ""
+
+#: bzrlib/builtins.py:3065
+msgid ""
+"An explanatory message needs to be given for each commit. This is\n"
+"often done by using the --message option (getting the message from the\n"
+"command line) or by using the --file option (getting the message from\n"
+"a file). If neither of these options is given, an editor is opened for\n"
+"the user to enter the message. To see the changed files in the\n"
+"boilerplate text loaded into the editor, use the --show-diff option."
+msgstr ""
+
+#: bzrlib/builtins.py:3072
+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:3076
+msgid ":Selective commits:"
+msgstr ""
+
+#: bzrlib/builtins.py:3078
+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:3082
+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:3086
+msgid "    bzr commit foo -x foo/bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3088
+msgid "  A selective commit after a merge is not yet supported."
+msgstr ""
+
+#: bzrlib/builtins.py:3090
+msgid ":Custom authors:"
+msgstr ""
+
+#: bzrlib/builtins.py:3092
+msgid ""
+"  If the author of the change is not the same person as the committer,\n"
+"  you can specify the author's name using the --author option. The\n"
+"  name should be in the same format as a committer-id, e.g.\n"
+"  \"John Doe <[e-mail]>\". If there is more than one author of\n"
+"  the change you can specify the option multiple times, once for each\n"
+"  author."
+msgstr ""
+
+#: bzrlib/builtins.py:3099
+msgid ":Checks:"
+msgstr ""
+
+#: bzrlib/builtins.py:3101
+msgid ""
+"  A common mistake is to forget to add a new file or directory before\n"
+"  running the commit command. The --strict option checks for unknown\n"
+"  files and aborts the commit if any are found. More advanced pre-commit\n"
+"  checks can be implemented by defining hooks. See ``bzr help hooks``\n"
+"  for details."
+msgstr ""
+
+#: bzrlib/builtins.py:3107
+msgid ":Things to note:"
+msgstr ""
+
+#: bzrlib/builtins.py:3109
+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:3113
+msgid ""
+"  Hooks can also be configured to run after a commit. This allows you\n"
+"  to trigger updates to external systems like bug trackers. The --fixes\n"
+"  option can be used to record the association between a revision and\n"
+"  one or more bugs. See ``bzr help bugs`` for details."
+msgstr ""
+
+# help of 'exclude' option of 'commit' command
+#: bzrlib/builtins.py:3123
+msgid "Do not consider changes made to a given path."
+msgstr ""
+
+# help of 'message' option of 'commit' command
+#: bzrlib/builtins.py:3126
+msgid "Description of the new revision."
+msgstr ""
+
+# help of 'unchanged' option of 'commit' command
+#: bzrlib/builtins.py:3129
+msgid "Commit even if nothing has changed."
+msgstr ""
+
+# help of 'file' option of 'commit' command
+#: bzrlib/builtins.py:3133
+msgid "Take commit message from this file."
+msgstr ""
+
+# help of 'strict' option of 'commit' command
+#: bzrlib/builtins.py:3135
+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:3138
+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:3141
+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:3144
+msgid "Set the author's name, if it's different from the committer."
+msgstr ""
+
+# help of 'local' option of 'commit' command
+#: bzrlib/builtins.py:3147
+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:3153
+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:3156
+msgid ""
+"When committing to a foreign version control system do not push data that "
+"can not be natively represented."
+msgstr ""
+
+#: bzrlib/builtins.py:3308
+msgid ""
+"Validate working tree structure, branch consistency and repository history."
+msgstr ""
+
+#: bzrlib/builtins.py:3310
+msgid ""
+"This command checks various invariants about branch and repository storage\n"
+"to detect data corruption or bzr bugs."
+msgstr ""
+
+#: bzrlib/builtins.py:3313
+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:3316
+msgid ""
+"revisions\n"
+"    This is just the number of revisions checked.  It doesn't\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3320
+msgid ""
+"versionedfiles\n"
+"    This is just the number of versionedfiles checked.  It\n"
+"    doesn't indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3324
+msgid ""
+"unreferenced ancestors\n"
+"    Texts that are ancestors of other texts, but\n"
+"    are not properly referenced by the revision ancestry.  This is a\n"
+"    subtle problem that Bazaar can work around."
+msgstr ""
+
+#: bzrlib/builtins.py:3329
+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:3333
+msgid ""
+"repeated file texts\n"
+"    This is the total number of repeated texts seen\n"
+"    in the checked revisions.  Texts can be repeated when their file\n"
+"    entries are modified, but the file contents are not.  It does not\n"
+"    indicate a problem."
+msgstr ""
+
+#: bzrlib/builtins.py:3339
+msgid ""
+"If no restrictions are specified, all Bazaar data that is found at the "
+"given\n"
+"location will be checked."
+msgstr ""
+
+#: bzrlib/builtins.py:3342
+msgid ":Examples:"
+msgstr ""
+
+#: bzrlib/builtins.py:3344
+msgid "    Check the tree and branch at 'foo'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3346
+msgid "        bzr check --tree --branch foo"
+msgstr ""
+
+#: bzrlib/builtins.py:3348
+msgid "    Check only the repository at 'bar'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3350
+msgid "        bzr check --repo bar"
+msgstr ""
+
+#: bzrlib/builtins.py:3352
+msgid "    Check everything at 'baz'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3354
+msgid "        bzr check baz"
+msgstr ""
+
+# help of 'branch' option of 'check' command
+#: bzrlib/builtins.py:3360
+msgid "Check the branch related to the current directory."
+msgstr ""
+
+# help of 'repo' option of 'check' command
+#: bzrlib/builtins.py:3362
+msgid "Check the repository related to the current directory."
+msgstr ""
+
+# help of 'tree' option of 'check' command
+#: bzrlib/builtins.py:3364
+msgid "Check the working tree related to the current directory."
+msgstr ""
+
+#: bzrlib/builtins.py:3378
+msgid "Upgrade a repository, branch or working tree to a newer format."
+msgstr ""
+
+#: bzrlib/builtins.py:3380
+msgid ""
+"When the default format has changed after a major new release of\n"
+"Bazaar, you may be informed during certain operations that you\n"
+"should upgrade. Upgrading to a newer format may improve performance\n"
+"or make new features available. It may however limit interoperability\n"
+"with older repositories or with older versions of Bazaar."
+msgstr ""
+
+#: bzrlib/builtins.py:3386
+msgid ""
+"If you wish to upgrade to a particular format rather than the\n"
+"current default, that can be specified using the --format option.\n"
+"As a consequence, you can use the upgrade command this way to\n"
+"\"downgrade\" to an earlier format, though some conversions are\n"
+"a one way process (e.g. changing from the 1.x default to the\n"
+"2.x default) so downgrading is not always possible."
+msgstr ""
+
+#: bzrlib/builtins.py:3393
+msgid ""
+"A backup.bzr.~#~ directory is created at the start of the conversion\n"
+"process (where # is a number). By default, this is left there on\n"
+"completion. If the conversion fails, delete the new .bzr directory\n"
+"and rename this one back in its place. Use the --clean option to ask\n"
+"for the backup.bzr directory to be removed on successful conversion.\n"
+"Alternatively, you can delete it by hand if everything looks good\n"
+"afterwards."
+msgstr ""
+
+#: bzrlib/builtins.py:3401
+msgid ""
+"If the location given is a shared repository, dependent branches\n"
+"are also converted provided the repository converts successfully.\n"
+"If the conversion of a branch fails, remaining branches are still\n"
+"tried."
+msgstr ""
+
+#: bzrlib/builtins.py:3406
+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:3414
+msgid "Upgrade to a specific format.  See \"bzr help formats\" for details."
+msgstr ""
+
+# title of 'format' option of 'init' command
+#: bzrlib/builtins.py:3418
+msgid "Branch format"
+msgstr ""
+
+# help of 'clean' option of 'upgrade' command
+#: bzrlib/builtins.py:3420
+msgid "Remove the backup.bzr directory if successful."
+msgstr ""
+
+#: bzrlib/builtins.py:3437
+msgid "Show or set bzr user id."
+msgstr ""
+
+#: bzrlib/builtins.py:3439
+msgid ""
+":Examples:\n"
+"    Show the email of the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3442
+msgid "        bzr whoami --email"
+msgstr ""
+
+#: bzrlib/builtins.py:3444
+msgid "    Set the current user::"
+msgstr ""
+
+#: bzrlib/builtins.py:3446
+msgid "        bzr whoami \"Frank Chu <[e-mail]>\""
+msgstr ""
+
+# help of 'email' option of 'whoami' command
+#: bzrlib/builtins.py:3450
+msgid "Display email address only."
+msgstr ""
+
+# help of 'branch' option of 'whoami' command
+#: bzrlib/builtins.py:3452
+msgid "Set identity for the current branch instead of globally."
+msgstr ""
+
+#: bzrlib/builtins.py:3498
+msgid "Print or set the branch nickname."
+msgstr ""
+
+#: bzrlib/builtins.py:3500
+msgid ""
+"If unset, the tree root directory name is used as the nickname.\n"
+"To print the current nickname, execute with no argument."
+msgstr ""
+
+#: bzrlib/builtins.py:3503
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally."
+msgstr ""
+
+#: bzrlib/builtins.py:3523
+msgid "Set/unset and display aliases."
+msgstr ""
+
+#: bzrlib/builtins.py:3525
+msgid ""
+":Examples:\n"
+"    Show the current aliases::"
+msgstr ""
+
+#: bzrlib/builtins.py:3528
+msgid "        bzr alias"
+msgstr ""
+
+#: bzrlib/builtins.py:3530
+msgid "    Show the alias specified for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3532
+msgid "        bzr alias ll"
+msgstr ""
+
+#: bzrlib/builtins.py:3534
+msgid "    Set an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3536
+msgid "        bzr alias ll=\"log --line -r-10..-1\""
+msgstr ""
+
+#: bzrlib/builtins.py:3538
+msgid "    To remove an alias for 'll'::"
+msgstr ""
+
+#: bzrlib/builtins.py:3540
+msgid "        bzr alias --remove ll"
+msgstr ""
+
+# help of 'remove' option of 'alias' command
+#: bzrlib/builtins.py:3545
+msgid "Remove the alias."
+msgstr ""
+
+#: bzrlib/builtins.py:3780
+msgid "Show version of bzr."
+msgstr ""
+
+# help of 'short' option of 'version' command
+#: bzrlib/builtins.py:3784
+msgid "Print just the version number."
+msgstr ""
+
+#: bzrlib/builtins.py:3831
+msgid "Perform a three-way merge."
+msgstr ""
+
+#: bzrlib/builtins.py:3833
+msgid ""
+"The source of the merge can be specified either in the form of a branch,\n"
+"or in the form of a path to a file containing a merge directive generated\n"
+"with bzr send. If neither is specified, the default is the upstream branch\n"
+"or the branch most recently merged using --remember."
+msgstr ""
+
+#: bzrlib/builtins.py:3838
+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:3842
+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:3845
+msgid ""
+"If you specify two values, \"--revision BASE..OTHER\", only revisions BASE\n"
+"through OTHER, excluding BASE but including OTHER, will be merged.  If this\n"
+"causes some revisions to be skipped, i.e. if the destination branch does\n"
+"not already contain revision BASE, such a merge is commonly referred to as\n"
+"a \"cherrypick\"."
+msgstr ""
+
+#: bzrlib/builtins.py:3851
+msgid "Revision numbers are always relative to the source branch."
+msgstr ""
+
+#: bzrlib/builtins.py:3858
+msgid "Use bzr resolve when you have fixed a problem.  See also bzr conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:3860
+msgid ""
+"If there is no default branch set, the first merge will set it. After\n"
+"that, you can omit the branch to use the default.  To change the\n"
+"default, use --remember. The value will only be saved if the remote\n"
+"location can be accessed."
+msgstr ""
+
+#: bzrlib/builtins.py:3865
+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:3869
+msgid ""
+"merge refuses to run if there are any uncommitted changes, unless\n"
+"--force is given. The --force option can also be used to create a\n"
+"merge revision which has more than two parents."
+msgstr ""
+
+#: bzrlib/builtins.py:3873
+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:3877
+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:3880
+msgid ""
+":Examples:\n"
+"    To merge all new revisions from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:3883
+msgid "        bzr merge ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:3885
+msgid "    To merge changes up to and including revision 82 from bzr.dev::"
+msgstr ""
+
+#: bzrlib/builtins.py:3887
+msgid "        bzr merge -r 82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:3889
+msgid "    To merge the changes introduced by 82, without previous changes::"
+msgstr ""
+
+#: bzrlib/builtins.py:3891
+msgid "        bzr merge -r 81..82 ../bzr.dev"
+msgstr ""
+
+#: bzrlib/builtins.py:3893
+msgid "    To apply a merge directive contained in /tmp/merge::"
+msgstr ""
+
+#: bzrlib/builtins.py:3895
+msgid "        bzr merge /tmp/merge"
+msgstr ""
+
+#: bzrlib/builtins.py:3897
+msgid ""
+"    To create a merge revision with three parents from two branches\n"
+"    feature1a and feature1b:"
+msgstr ""
+
+#: bzrlib/builtins.py:3900
+msgid ""
+"        bzr merge ../feature1a\n"
+"        bzr merge ../feature1b --force\n"
+"        bzr commit -m 'revision with three parents'"
+msgstr ""
+
+# help of 'force' option of 'merge' command
+#: bzrlib/builtins.py:3912
+msgid "Merge even if the destination tree has uncommitted changes."
+msgstr ""
+
+# help of 'uncommitted' option of 'merge' command
+#: bzrlib/builtins.py:3918
+msgid ""
+"Apply uncommitted changes from a working copy, instead of branch changes."
+msgstr ""
+
+# help of 'pull' option of 'merge' command
+#: bzrlib/builtins.py:3920
+msgid ""
+"If the destination is already completely merged into the source, pull from "
+"the source rather than merging.  When this happens, you do not need to "
+"commit the result."
+msgstr ""
+
+# help of 'directory' option of 'merge' command
+#: bzrlib/builtins.py:3925
+msgid ""
+"Branch to merge into, rather than the one containing the working directory."
+msgstr ""
+
+# help of 'preview' option of 'merge' command
+#: bzrlib/builtins.py:3927
+msgid "Instead of merging, show a diff of the merge."
+msgstr ""
+
+# help of 'interactive' option of 'merge' command
+#: bzrlib/builtins.py:3929
+msgid "Select changes interactively."
+msgstr ""
+
+#: bzrlib/builtins.py:4196
+msgid "Redo a merge."
+msgstr ""
+
+#: bzrlib/builtins.py:4198
+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:4202
+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:4206
+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:4210
+msgid "        bzr remerge --show-base"
+msgstr ""
+
+#: bzrlib/builtins.py:4212
+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:4215
+msgid "        bzr remerge --merge-type weave --reprocess foobar"
+msgstr ""
+
+# help of 'show-base' option of 'merge' command
+#: bzrlib/builtins.py:4222
+msgid "Show base revision text in conflicts."
+msgstr ""
+
+#: bzrlib/builtins.py:4290
+msgid "Revert files to a previous revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4292
+msgid ""
+"Giving a list of files will revert only those files.  Otherwise, all files\n"
+"will be reverted.  If the revision is not specified with '--revision', the\n"
+"last committed revision is used."
+msgstr ""
+
+#: bzrlib/builtins.py:4296
+msgid ""
+"To remove only some changes, without reverting to a prior version, use\n"
+"merge instead.  For example, \"merge . -r -2..-3\" (don't forget the \".\")\n"
+"will remove the changes introduced by the second last commit (-2), without\n"
+"affecting the changes introduced by the last commit (-1).  To remove\n"
+"certain changes on a hunk-by-hunk basis, see the shelve command."
+msgstr ""
+
+#: bzrlib/builtins.py:4302
+msgid ""
+"By default, any files that have been manually changed will be backed up\n"
+"first.  (Files changed only by merge are not backed up.)  Backup files have\n"
+"'.~#~' appended to their name, where # is a number."
+msgstr ""
+
+#: bzrlib/builtins.py:4306
+msgid ""
+"When you provide files, you can use their current pathname or the pathname\n"
+"from the target revision.  So you can use revert to \"undelete\" a file by\n"
+"name.  If you name a directory, all the contents of that directory will be\n"
+"reverted."
+msgstr ""
+
+#: bzrlib/builtins.py:4311
+msgid ""
+"If you have newly added files since the target revision, they will be\n"
+"removed.  If the files to be removed have been changed, backups will be\n"
+"created as above.  Directories containing unknown files will not be\n"
+"deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:4316
+msgid ""
+"The working tree contains a list of revisions that have been merged but\n"
+"not yet committed. These revisions will be included as additional parents\n"
+"of the next commit.  Normally, using revert clears that list as well as\n"
+"reverting the files.  If any files are specified, revert leaves the list\n"
+"of uncommitted merges alone and reverts only the files.  Use ``bzr revert\n"
+".`` in the tree root to revert all files but keep the recorded merges,\n"
+"and ``bzr revert --forget-merges`` to clear the pending merge list without\n"
+"reverting any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4325
+msgid ""
+"Using \"bzr revert --forget-merges\", it is possible to apply all of the\n"
+"changes from a branch in a single revision.  To do this, perform the merge\n"
+"as desired.  Then doing revert with the \"--forget-merges\" option will "
+"keep\n"
+"the content of the tree as it was, but it will clear the list of pending\n"
+"merges.  The next commit will then contain all of the changes that are\n"
+"present in the other branch, but without any other parent revisions.\n"
+"Because this technique forgets where these changes originated, it may\n"
+"cause additional conflicts on later merges involving the same source and\n"
+"target branches."
+msgstr ""
+
+# help of 'no-backup' option of 'revert' command
+#: bzrlib/builtins.py:4339
+msgid "Do not save backups of reverted files."
+msgstr ""
+
+# help of 'forget-merges' option of 'revert' command
+#: bzrlib/builtins.py:4341
+msgid "Remove pending merge marker, without changing any files."
+msgstr ""
+
+#: bzrlib/builtins.py:4372
+msgid ""
+"Show help on a command or other topic.\n"
+"    "
+msgstr ""
+
+# help of 'long' option of 'help' command
+#: bzrlib/builtins.py:4377
+msgid "Show help on all commands."
+msgstr ""
+
+#: bzrlib/builtins.py:4406
+msgid "Show unmerged/unpulled revisions between two branches."
+msgstr ""
+
+#: bzrlib/builtins.py:4408
+msgid "OTHER_BRANCH may be local or remote."
+msgstr ""
+
+#: bzrlib/builtins.py:4410
+msgid ""
+"To filter on a range of revisions, you can use the command -r begin..end\n"
+"-r revision requests a specific revision, -r ..end or -r begin.. are\n"
+"also valid.\n"
+"        \n"
+":Exit values:\n"
+"    1 - some missing revisions\n"
+"    0 - no missing revisions"
+msgstr ""
+
+#: bzrlib/builtins.py:4420
+msgid ""
+"    Determine the missing revisions between this and the branch at the\n"
+"    remembered pull location::"
+msgstr ""
+
+#: bzrlib/builtins.py:4423
+msgid "        bzr missing"
+msgstr ""
+
+#: bzrlib/builtins.py:4425
+msgid "    Determine the missing revisions between this and another branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4427
+msgid "        bzr missing http://server/branch"
+msgstr ""
+
+#: bzrlib/builtins.py:4429
+msgid ""
+"    Determine the missing revisions up to a specific revision on the other\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4432
+msgid "        bzr missing -r ..-10"
+msgstr ""
+
+#: bzrlib/builtins.py:4434
+msgid ""
+"    Determine the missing revisions up to a specific revision on this\n"
+"    branch::"
+msgstr ""
+
+#: bzrlib/builtins.py:4437
+msgid "        bzr missing --my-revision ..-10"
+msgstr ""
+
+# help of 'reverse' option of 'missing' command
+#: bzrlib/builtins.py:4444
+msgid "Reverse the order of revisions."
+msgstr ""
+
+# help of 'mine-only' option of 'missing' command
+#: bzrlib/builtins.py:4446
+msgid "Display changes in the local branch only."
+msgstr ""
+
+# help of 'this' option of 'missing' command
+#: bzrlib/builtins.py:4447
+msgid "Same as --mine-only."
+msgstr ""
+
+# help of 'theirs-only' option of 'missing' command
+#: bzrlib/builtins.py:4449
+msgid "Display changes in the remote branch only."
+msgstr ""
+
+# help of 'other' option of 'missing' command
+#: bzrlib/builtins.py:4450
+msgid "Same as --theirs-only."
+msgstr ""
+
+# help of 'revision' option of 'missing' command
+#: bzrlib/builtins.py:4455
+msgid ""
+"Filter on other branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+# help of 'my-revision' option of 'missing' command
+#: bzrlib/builtins.py:4459
+msgid ""
+"Filter on local branch revisions (inclusive). See \"help revisionspec\" for "
+"details."
+msgstr ""
+
+# help of 'include-merges' option of 'missing' command
+#: bzrlib/builtins.py:4462
+msgid "Show all revisions in addition to the mainline ones."
+msgstr ""
+
+#: bzrlib/builtins.py:4578
+msgid "Compress the data within a repository."
+msgstr ""
+
+#: bzrlib/builtins.py:4580
+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:4584
+msgid ""
+"During the pack operation, bazaar takes a backup of existing repository\n"
+"data, i.e. pack files. This backup is eventually removed by bazaar\n"
+"automatically when it is safe to do so. To save disk space by removing\n"
+"the backed up pack files, the --clean-obsolete-packs option may be\n"
+"used."
+msgstr ""
+
+#: bzrlib/builtins.py:4590
+msgid ""
+"Warning: If you use --clean-obsolete-packs and your machine crashes\n"
+"during or immediately after repacking, you may be left with a state\n"
+"where the deletion has been written to disk but the new packs have not\n"
+"been. In this case the repository may be unusable."
+msgstr ""
+
+# help of 'clean-obsolete-packs' option of 'pack' command
+#: bzrlib/builtins.py:4599
+msgid "Delete obsolete packs to save disk space."
+msgstr ""
+
+#: bzrlib/builtins.py:4613
+msgid "List the installed plugins."
+msgstr ""
+
+#: bzrlib/builtins.py:4615
+msgid ""
+"This command displays the list of installed plugins including\n"
+"version of plugin and a short description of each."
+msgstr ""
+
+#: bzrlib/builtins.py:4618
+msgid "--verbose shows the path where each plugin is located."
+msgstr ""
+
+#: bzrlib/builtins.py:4620
+msgid ""
+"A plugin is an external component for Bazaar that extends the\n"
+"revision control system, by adding or replacing code in Bazaar.\n"
+"Plugins can do a variety of things, including overriding commands,\n"
+"adding new commands, providing additional network transports and\n"
+"customizing log output."
+msgstr ""
+
+#: bzrlib/builtins.py:4626
+msgid ""
+"See the Bazaar Plugin Guide <http://doc.bazaar.canonical.com/plugins/en/>\n"
+"for further information on plugins including where to find them and how to\n"
+"install them. Instructions are also provided there on how to write new\n"
+"plugins using the Python programming language."
+msgstr ""
+
+#: bzrlib/builtins.py:4641
+msgid "Show testament (signing-form) of a revision."
+msgstr ""
+
+# help of 'long' option of 'testament' command
+#: bzrlib/builtins.py:4644
+msgid "Produce long-format testament."
+msgstr ""
+
+# help of 'strict' option of 'testament' command
+#: bzrlib/builtins.py:4646
+msgid "Produce a strict-format testament."
+msgstr ""
+
+#: bzrlib/builtins.py:4672
+msgid "Show the origin of each line in a file."
+msgstr ""
+
+#: bzrlib/builtins.py:4674
+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:4677
+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:4685
+msgid "Show annotations on all lines."
+msgstr ""
+
+# help of 'long' option of 'annotate' command
+#: bzrlib/builtins.py:4686
+msgid "Show commit date in annotations."
+msgstr ""
+
+#: bzrlib/builtins.py:4789
+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:4792
+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:4795
+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:4830
+msgid "Convert the current checkout into a regular branch."
+msgstr ""
+
+#: bzrlib/builtins.py:4832
+msgid ""
+"After unbinding, the local branch is considered independent and subsequent\n"
+"commits will be local only."
+msgstr ""
+
+#: bzrlib/builtins.py:4847
+msgid "Remove the last committed revision."
+msgstr ""
+
+#: bzrlib/builtins.py:4849
+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:4853
+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:4857
+msgid ""
+"Uncommit leaves the working tree ready for a new commit.  The only change\n"
+"it may make is to restore any pending merges that were present before\n"
+"the commit."
+msgstr ""
+
+# help of 'dry-run' option of 'uncommit' command
+#: bzrlib/builtins.py:4868
+msgid "Don't actually make changes."
+msgstr ""
+
+# help of 'force' option of 'uncommit' command
+#: bzrlib/builtins.py:4869
+msgid "Say yes to all questions."
+msgstr ""
+
+# help of 'local' option of 'uncommit' command
+#: bzrlib/builtins.py:4871
+msgid "Only remove the commits from the local branch when in a checkout."
+msgstr ""
+
+#: bzrlib/builtins.py:4956
+msgid "Break a dead lock."
+msgstr ""
+
+#: bzrlib/builtins.py:4958
+msgid ""
+"This command breaks a lock on a repository, branch, working directory or\n"
+"config file."
+msgstr ""
+
+#: bzrlib/builtins.py:4961
+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:4964
+msgid ""
+"You can get information on what locks are open via the 'bzr info\n"
+"[location]' command."
+msgstr ""
+
+#: bzrlib/builtins.py:4967
+msgid ""
+":Examples:\n"
+"    bzr break-lock\n"
+"    bzr break-lock bzr+ssh://example.com/bzr/foo\n"
+"    bzr break-lock --conf ~/.bazaar"
+msgstr ""
+
+# help of 'config' option of 'break-lock' command
+#: bzrlib/builtins.py:4976
+msgid "LOCATION is the directory where the config lock is."
+msgstr ""
+
+# help of 'force' option of 'break-lock' command
+#: bzrlib/builtins.py:4978
+msgid "Do not ask for confirmation before breaking the lock."
+msgstr ""
+
+#: bzrlib/builtins.py:5014
+msgid "Run the bzr server."
+msgstr ""
+
+# help of 'inet' option of 'serve' command
+#: bzrlib/builtins.py:5020
+msgid "Serve on stdin/out for use from inetd or sshd."
+msgstr ""
+
+# title of 'protocol' option of 'serve' command
+#: bzrlib/builtins.py:5021
+msgid "protocol"
+msgstr ""
+
+# help of 'protocol' option of 'serve' command
+#: bzrlib/builtins.py:5022
+msgid "Protocol to serve."
+msgstr ""
+
+# help of 'port' option of 'serve' command
+#: bzrlib/builtins.py:5026
+msgid ""
+"Listen for connections on nominated port of the form [hostname:]portnumber.  "
+"Passing 0 as the port number will result in a dynamically allocated port.  "
+"The default port depends on the protocol."
+msgstr ""
+
+# help of 'directory' option of 'serve' command
+#: bzrlib/builtins.py:5032
+msgid "Serve contents of this directory."
+msgstr ""
+
+# help of 'allow-writes' option of 'serve' command
+#: bzrlib/builtins.py:5034
+msgid ""
+"By default the server is a readonly server.  Supplying --allow-writes "
+"enables write access to the contents of the served directory and below.  "
+"Note that ``bzr serve`` does not perform authentication, so unless some form "
+"of external authentication is arranged supplying this option leads to global "
+"uncontrolled write access to your file system."
+msgstr ""
+
+#: bzrlib/builtins.py:5079
+msgid "Combine a tree into its containing tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5081
+msgid "This command requires the target tree to be in a rich-root format."
+msgstr ""
+
+#: bzrlib/builtins.py:5083
+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:5087
+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:5125
+msgid "Split a subdirectory of a tree into a separate tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5127
+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:5131
+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:5252
+msgid "Mail or create a merge-directive for submitting changes."
+msgstr ""
+
+#: bzrlib/builtins.py:5254
+msgid "A merge directive provides many things needed for requesting merges:"
+msgstr ""
+
+#: bzrlib/builtins.py:5256
+msgid "* A machine-readable description of the merge to perform"
+msgstr ""
+
+#: bzrlib/builtins.py:5258
+msgid "* An optional patch that is a preview of the changes requested"
+msgstr ""
+
+#: bzrlib/builtins.py:5260
+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:5264
+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:5267
+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:5271
+msgid ""
+"If --no-bundle is specified, then Bazaar doesn't send the contents of the\n"
+"revisions, but only a structured request to merge from the\n"
+"public_location.  In that case the public_branch is needed and it must be\n"
+"up-to-date and accessible to the recipient.  The public_branch is always\n"
+"included if known, so that people can check it later."
+msgstr ""
+
+#: bzrlib/builtins.py:5277
+msgid ""
+"The submit branch defaults to the parent of the source branch, but can be\n"
+"overridden.  Both submit branch and public branch will be remembered in\n"
+"branch.conf the first time they are used for a particular branch.  The\n"
+"source branch defaults to that containing the working directory, but can\n"
+"be changed using --from."
+msgstr ""
+
+#: bzrlib/builtins.py:5283
+msgid ""
+"In order to calculate those changes, bzr must analyse the submit branch.\n"
+"Therefore it is most efficient for the submit branch to be a local mirror.\n"
+"If a public location is known for the submit_branch, that location is used\n"
+"in the merge directive."
+msgstr ""
+
+#: bzrlib/builtins.py:5288
+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:5291
+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:5295
+msgid ""
+"To use a specific mail program, set the mail_client configuration option.\n"
+"(For Thunderbird 1.5, this works around some bugs.)  Supported values for\n"
+"specific clients are \"claws\", \"evolution\", \"kmail\", \"mail.app"
+"\" (MacOS X's\n"
+"Mail.app), \"mutt\", and \"thunderbird\"; generic options are \"default\",\n"
+"\"editor\", \"emacsclient\", \"mapi\", and \"xdg-email\".  Plugins may also "
+"add\n"
+"supported clients."
+msgstr ""
+
+#: bzrlib/builtins.py:5302
+msgid ""
+"If mail is being sent, a to address is required.  This can be supplied\n"
+"either on the commandline, by setting the submit_to configuration\n"
+"option in the branch itself or the child_submit_to configuration option\n"
+"in the submit branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5307
+msgid ""
+"Two formats are currently supported: \"4\" uses revision bundle format 4 "
+"and\n"
+"merge directive format 2.  It is significantly faster and smaller than\n"
+"older formats.  It is compatible with Bazaar 0.19 and later.  It is the\n"
+"default.  \"0.9\" uses revision bundle format 0.9 and merge directive\n"
+"format 1.  It is compatible with Bazaar 0.12 - 0.18."
+msgstr ""
+
+#: bzrlib/builtins.py:5313
+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:5316
+msgid ""
+"bzr send makes extensive use of public locations to map local locations "
+"into\n"
+"URLs that can be used by other people.  See `bzr help configuration` to\n"
+"set them, and use `bzr info` to display them."
+msgstr ""
+
+# help of 'output' option of 'send' command
+#: bzrlib/builtins.py:5340
+msgid "Write merge directive to this file or directory; use - for stdout."
+msgstr ""
+
+# help of 'strict' option of 'send' command
+#: bzrlib/builtins.py:5344
+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:5346
+msgid "Mail the request to this address."
+msgstr ""
+
+# help of 'body' option of 'send' command
+#: bzrlib/builtins.py:5350
+msgid "Body for the email."
+msgstr ""
+
+# help of 'no-bundle' option of 'send' command
+#: bzrlib/builtins.py:5403
+msgid "Do not include a bundle in the merge directive."
+msgstr ""
+
+# help of 'no-patch' option of 'send' command
+#: bzrlib/builtins.py:5404
+msgid "Do not include a preview patch in the merge directive."
+msgstr ""
+
+# help of 'remember' option of 'send' command
+#: bzrlib/builtins.py:5407
+msgid "Remember submit and public branch."
+msgstr ""
+
+# help of 'from' option of 'send' command
+#: bzrlib/builtins.py:5409
+msgid ""
+"Branch to generate the submission from, rather than the one containing the "
+"working directory."
+msgstr ""
+
+# title of 'format' option of 'send' command
+#: bzrlib/builtins.py:5419
+msgid "format"
+msgstr ""
+
+# help of 'format' option of 'send' command
+#: bzrlib/builtins.py:5420
+msgid "Use the specified output format."
+msgstr ""
+
+#: bzrlib/builtins.py:5442
+msgid "Create, remove or modify a tag naming a revision."
+msgstr ""
+
+#: bzrlib/builtins.py:5444
+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:5448
+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:5451
+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:5454
+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:5457
+msgid ""
+"If no tag name is specified it will be determined through the \n"
+"'automatic_tag_name' hook. This can e.g. be used to automatically tag\n"
+"upstream releases by reading configure.ac. See ``bzr help hooks`` for\n"
+"details."
+msgstr ""
+
+# help of 'delete' option of 'tag' command
+#: bzrlib/builtins.py:5467
+msgid "Delete this tag rather than placing it."
+msgstr ""
+
+# help of 'directory' option of 'tag' command
+#: bzrlib/builtins.py:5470
+msgid "Branch in which to place the tag."
+msgstr ""
+
+# help of 'force' option of 'tag' command
+#: bzrlib/builtins.py:5472
+msgid "Replace existing tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5511
+msgid "List tags."
+msgstr ""
+
+#: bzrlib/builtins.py:5513
+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:5519
+msgid "Branch whose tags should be displayed."
+msgstr ""
+
+# help of 'sort' option of 'tags' command
+#: bzrlib/builtins.py:5521
+msgid "Sort tags by different criteria."
+msgstr ""
+
+# title of 'sort' option of 'tags' command
+#: bzrlib/builtins.py:5521
+msgid "Sorting"
+msgstr ""
+
+#: bzrlib/builtins.py:5566
+msgid "Reconfigure the type of a bzr directory."
+msgstr ""
+
+#: bzrlib/builtins.py:5568
+msgid "A target configuration must be specified."
+msgstr ""
+
+#: bzrlib/builtins.py:5570
+msgid ""
+"For checkouts, the bind-to location will be auto-detected if not specified.\n"
+"The order of preference is\n"
+"1. For a lightweight checkout, the current bound location.\n"
+"2. For branches that used to be checkouts, the previously-bound location.\n"
+"3. The push location.\n"
+"4. The parent location.\n"
+"If none of these is available, --bind-to must be specified."
+msgstr ""
+
+# title of 'target_type' option of 'reconfigure' command
+#: bzrlib/builtins.py:5584
+msgid "Target type"
+msgstr ""
+
+# help of 'target_type' option of 'reconfigure' command
+#: bzrlib/builtins.py:5585
+msgid "The type to reconfigure the directory to."
+msgstr ""
+
+# help of 'bind-to' option of 'reconfigure' command
+#: bzrlib/builtins.py:5600
+msgid "Branch to bind checkout to."
+msgstr ""
+
+# help of 'force' option of 'reconfigure' command
+#: bzrlib/builtins.py:5602
+msgid "Perform reconfiguration even if local changes will be lost."
+msgstr ""
+
+# help of 'stacked-on' option of 'reconfigure' command
+#: bzrlib/builtins.py:5605
+msgid "Reconfigure a branch to be stacked on another branch."
+msgstr ""
+
+# help of 'unstacked' option of 'reconfigure' command
+#: bzrlib/builtins.py:5609
+msgid ""
+"Reconfigure a branch to be unstacked.  This may require copying substantial "
+"data into it."
+msgstr ""
+
+#: bzrlib/builtins.py:5657
+msgid "Set the branch of a checkout and update."
+msgstr ""
+
+#: bzrlib/builtins.py:5659
+msgid ""
+"For lightweight checkouts, this changes the branch being referenced.\n"
+"For heavyweight checkouts, this checks that there are no local commits\n"
+"versus the current bound branch, then it makes the local branch a mirror\n"
+"of the new location and binds to it."
+msgstr ""
+
+#: bzrlib/builtins.py:5664
+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:5667
+msgid "Pending merges need to be committed or reverted before using switch."
+msgstr ""
+
+#: bzrlib/builtins.py:5669
+msgid ""
+"The path to the branch to switch to can be specified relative to the parent\n"
+"directory of the current branch. For example, if you are currently in a\n"
+"checkout of /path/to/branch, specifying 'newbranch' will find a branch at\n"
+"/path/to/newbranch."
+msgstr ""
+
+#: bzrlib/builtins.py:5674
+msgid ""
+"Bound branches use the nickname of its master branch unless it is set\n"
+"locally, in which case switching will update the local nickname to be\n"
+"that of the master."
+msgstr ""
+
+# help of 'force' option of 'switch' command
+#: bzrlib/builtins.py:5682
+msgid "Switch even if local commits will be lost."
+msgstr ""
+
+# help of 'create-branch' option of 'switch' command
+#: bzrlib/builtins.py:5685
+msgid "Create the target branch from this one before switching to it."
+msgstr ""
+
+#: bzrlib/builtins.py:5754
+msgid "Manage filtered views."
+msgstr ""
+
+#: bzrlib/builtins.py:5756
+msgid ""
+"Views provide a mask over the tree so that users can focus on\n"
+"a subset of a tree when doing their work. After creating a view,\n"
+"commands that support a list of files - status, diff, commit, etc -\n"
+"effectively have that list of files implicitly given each time.\n"
+"An explicit list of files can still be given but those files\n"
+"must be within the current view."
+msgstr ""
+
+#: bzrlib/builtins.py:5763
+msgid ""
+"In most cases, a view has a short life-span: it is created to make\n"
+"a selected change and is deleted once that change is committed.\n"
+"At other times, you may wish to create one or more named views\n"
+"and switch between them."
+msgstr ""
+
+#: bzrlib/builtins.py:5768
+msgid ""
+"To disable the current view without deleting it, you can switch to\n"
+"the pseudo view called ``off``. This can be useful when you need\n"
+"to see the whole tree for an operation or two (e.g. merge) but\n"
+"want to switch back to your view after that."
+msgstr ""
+
+#: bzrlib/builtins.py:5773
+msgid ""
+":Examples:\n"
+"  To define the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:5776
+msgid "    bzr view file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:5778
+msgid "  To list the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:5780
+msgid "    bzr view"
+msgstr ""
+
+#: bzrlib/builtins.py:5782
+msgid "  To delete the current view::"
+msgstr ""
+
+#: bzrlib/builtins.py:5784
+msgid "    bzr view --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:5786
+msgid "  To disable the current view without deleting it::"
+msgstr ""
+
+#: bzrlib/builtins.py:5788
+msgid "    bzr view --switch off"
+msgstr ""
+
+#: bzrlib/builtins.py:5790
+msgid "  To define a named view and switch to it::"
+msgstr ""
+
+#: bzrlib/builtins.py:5792
+msgid "    bzr view --name view-name file1 dir1 ..."
+msgstr ""
+
+#: bzrlib/builtins.py:5794
+msgid "  To list a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:5796
+msgid "    bzr view --name view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:5798
+msgid "  To delete a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:5800
+msgid "    bzr view --name view-name --delete"
+msgstr ""
+
+#: bzrlib/builtins.py:5802
+msgid "  To switch to a named view::"
+msgstr ""
+
+#: bzrlib/builtins.py:5804
+msgid "    bzr view --switch view-name"
+msgstr ""
+
+#: bzrlib/builtins.py:5806
+msgid "  To list all views defined::"
+msgstr ""
+
+#: bzrlib/builtins.py:5808
+msgid "    bzr view --all"
+msgstr ""
+
+#: bzrlib/builtins.py:5810
+msgid "  To delete all views::"
+msgstr ""
+
+#: bzrlib/builtins.py:5812
+msgid "    bzr view --delete --all"
+msgstr ""
+
+# help of 'all' option of 'view' command
+#: bzrlib/builtins.py:5819
+msgid "Apply list or delete action to all views."
+msgstr ""
+
+# help of 'delete' option of 'view' command
+#: bzrlib/builtins.py:5822
+msgid "Delete the view."
+msgstr ""
+
+# help of 'name' option of 'view' command
+#: bzrlib/builtins.py:5825
+msgid "Name of the view to define, list or delete."
+msgstr ""
+
+# help of 'switch' option of 'view' command
+#: bzrlib/builtins.py:5829
+msgid "Name of the view to switch to."
+msgstr ""
+
+#: bzrlib/builtins.py:5929
+msgid "Remove a branch."
+msgstr ""
+
+#: bzrlib/builtins.py:5931
+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:5936
+msgid "  Remove the branch at repo/trunk::"
+msgstr ""
+
+#: bzrlib/builtins.py:5938
+msgid "    bzr remove-branch repo/trunk"
+msgstr ""
+
+#: bzrlib/builtins.py:5954
+msgid "Temporarily set aside some changes from the current tree."
+msgstr ""
+
+#: bzrlib/builtins.py:5956
+msgid ""
+"Shelve allows you to temporarily put changes you've made \"on the shelf\",\n"
+"ie. out of the way, until a later time when you can bring them back from\n"
+"the shelf with the 'unshelve' command.  The changes are stored alongside\n"
+"your working tree, and so they aren't propagated along with your branch nor\n"
+"will they survive its deletion."
+msgstr ""
+
+#: bzrlib/builtins.py:5962
+msgid "If shelve --list is specified, previously-shelved changes are listed."
+msgstr ""
+
+#: bzrlib/builtins.py:5964
+msgid ""
+"Shelve is intended to help separate several sets of changes that have\n"
+"been inappropriately mingled.  If you just want to get rid of all changes\n"
+"and you don't need to restore them later, use revert.  If you want to\n"
+"shelve all text changes at once, use shelve --all."
+msgstr ""
+
+#: bzrlib/builtins.py:5969
+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:5972
+msgid ""
+"If a revision is specified, changes since that revision will be shelved."
+msgstr ""
+
+#: bzrlib/builtins.py:5974
+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:5977
+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:5981
+msgid "    change_editor = PROGRAM @new_path @old_path"
+msgstr ""
+
+#: bzrlib/builtins.py:5983
+msgid ""
+"where @new_path is replaced with the path of the new version of the \n"
+"file and @old_path is replaced with the path of the old version of \n"
+"the file.  The PROGRAM should save the new file with the desired \n"
+"contents of the file in the working tree.\n"
+"    "
+msgstr ""
+
+# help of 'all' option of 'shelve' command
+#: bzrlib/builtins.py:5995
+msgid "Shelve all changes."
+msgstr ""
+
+# help of 'writer' option of 'shelve' command
+#: bzrlib/builtins.py:5997
+msgid "Method to use for writing diffs."
+msgstr ""
+
+# title of 'writer' option of 'shelve' command
+#: bzrlib/builtins.py:5997
+msgid "writer"
+msgstr ""
+
+# help of 'list' option of 'shelve' command
+#: bzrlib/builtins.py:6001
+msgid "List shelved changes."
+msgstr ""
+
+# help of 'destroy' option of 'shelve' command
+#: bzrlib/builtins.py:6003
+msgid "Destroy removed changes instead of shelving them."
+msgstr ""
+
+#: bzrlib/builtins.py:6043
+msgid "Restore shelved changes."
+msgstr ""
+
+#: bzrlib/builtins.py:6045
+msgid ""
+"By default, the most recently shelved changes are restored. However if you\n"
+"specify a shelf by id those changes will be restored instead.  This works\n"
+"best when the changes don't depend on each other."
+msgstr ""
+
+# help of 'action' option of 'unshelve' command
+#: bzrlib/builtins.py:6054
+msgid "The action to perform."
+msgstr ""
+
+#: bzrlib/builtins.py:6076
+msgid "Remove unwanted files from working tree."
+msgstr ""
+
+#: bzrlib/builtins.py:6078
+msgid ""
+"By default, only unknown files, not ignored files, are deleted.  Versioned\n"
+"files are never deleted."
+msgstr ""
+
+#: bzrlib/builtins.py:6081
+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:6085
+msgid ""
+"If no options are specified, unknown files are deleted.  Otherwise, option\n"
+"flags are respected, and may be combined."
+msgstr ""
+
+#: bzrlib/builtins.py:6088
+msgid "To check what clean-tree will do, use --dry-run."
+msgstr ""
+
+# help of 'ignored' option of 'clean-tree' command
+#: bzrlib/builtins.py:6091
+msgid "Delete all ignored files."
+msgstr ""
+
+# help of 'detritus' option of 'clean-tree' command
+#: bzrlib/builtins.py:6092
+msgid ""
+"Delete conflict files, merge and revert backups, and failed selftest dirs."
+msgstr ""
+
+# help of 'unknown' option of 'clean-tree' command
+#: bzrlib/builtins.py:6095
+msgid "Delete files unknown to bzr (default)."
+msgstr ""
+
+# help of 'dry-run' option of 'clean-tree' command
+#: bzrlib/builtins.py:6096
+msgid "Show files to delete instead of deleting them."
+msgstr ""
+
+# help of 'force' option of 'clean-tree' command
+#: bzrlib/builtins.py:6098
+msgid "Do not prompt before deleting."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:50
+msgid "Show version information about this tree."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:52
+msgid ""
+"You can use this command to add information about version into\n"
+"source code of an application. The output can be in one of the\n"
+"supported formats or in a custom format based on a template."
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:56
+msgid "For example::"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:58
+msgid ""
+"  bzr version-info --custom \\\n"
+"    --template=\"#define VERSION_INFO \\\"Project 1.2.3 (r{revno})\\\"\\n\""
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:61
+msgid ""
+"will produce a C header file with formatted string containing the\n"
+"current revision number. Other supported variables in templates are:"
+msgstr ""
+
+#: bzrlib/cmd_version_info.py:64
+msgid ""
+"  * {date} - date of the last revision\n"
+"  * {build_date} - current date\n"
+"  * {revno} - revision number\n"
+"  * {revision_id} - revision id\n"
+"  * {branch_nick} - branch nickname\n"
+"  * {clean} - 0 if the source tree contains uncommitted changes,\n"
+"              otherwise 1"
+msgstr ""
+
+# help of 'format' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:74
+msgid "Select the output format."
+msgstr ""
+
+# help of 'all' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:78
+msgid "Include all possible information."
+msgstr ""
+
+# help of 'check-clean' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:79
+msgid "Check if tree is clean."
+msgstr ""
+
+# help of 'include-history' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:81
+msgid "Include the revision-history."
+msgstr ""
+
+# help of 'include-file-revisions' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:83
+msgid "Include the last revision for each file."
+msgstr ""
+
+# help of 'template' option of 'version-info' command
+#: bzrlib/cmd_version_info.py:84
+msgid "Template for the output."
+msgstr ""
+
+#: bzrlib/commands.py:516
+msgid "Purpose"
+msgstr ""
+
+#: bzrlib/commands.py:518 bzrlib/commands.py:520
+msgid "Usage"
+msgstr ""
+
+#: bzrlib/commands.py:538
+msgid "Options"
+msgstr ""
+
+#: bzrlib/commands.py:549
+msgid "Description"
+msgstr ""
+
+#: bzrlib/commands.py:564
+msgid "Aliases"
+msgstr ""
+
+#: bzrlib/commands.py:583
+msgid "See also"
+msgstr ""
+
+#: bzrlib/config.py:2098
+msgid "Display, set or remove a configuration option."
+msgstr ""
+
+#: bzrlib/config.py:2100
+msgid "Display the active value for a given option."
+msgstr ""
+
+#: bzrlib/config.py:2102
+msgid ""
+"If --all is specified, NAME is interpreted as a regular expression and all\n"
+"matching options are displayed mentioning their scope. The active value\n"
+"that bzr will take into account is the first one displayed for each option."
+msgstr ""
+
+#: bzrlib/config.py:2106
+msgid "If no NAME is given, --all .* is implied."
+msgstr ""
+
+#: bzrlib/config.py:2108
+msgid ""
+"Setting a value is achieved by using name=value without spaces. The value\n"
+"is set in the most relevant scope and can be checked by displaying the\n"
+"option again."
+msgstr ""
+
+# help of 'scope' option of 'config' command
+#: bzrlib/config.py:2119
+msgid "Reduce the scope to the specified configuration file"
+msgstr ""
+
+# help of 'all' option of 'config' command
+#: bzrlib/config.py:2123
+msgid "Display all the defined values for the matching options."
+msgstr ""
+
+# help of 'remove' option of 'config' command
+#: bzrlib/config.py:2125
+msgid "Remove the option from the configuration file"
+msgstr ""
+
+#: bzrlib/conflicts.py:47
+msgid "List files with conflicts."
+msgstr ""
+
+#: bzrlib/conflicts.py:49
+msgid ""
+"Merge will do its best to combine the changes in two branches, but there\n"
+"are some kinds of problems only a human can fix.  When it encounters those,\n"
+"it will mark a conflict.  A conflict means that you need to fix something,\n"
+"before you should commit."
+msgstr ""
+
+#: bzrlib/conflicts.py:54
+msgid ""
+"Conflicts normally are listed as short, human-readable messages.  If --text\n"
+"is supplied, the pathnames of files with text conflicts are listed,\n"
+"instead.  (This is useful for editing all files with text conflicts.)"
+msgstr ""
+
+#: bzrlib/conflicts.py:58
+msgid "Use bzr resolve when you have fixed a problem."
+msgstr ""
+
+# help of 'text' option of 'conflicts' command
+#: bzrlib/conflicts.py:63
+msgid "List paths of files with text conflicts."
+msgstr ""
+
+# help of 'action' option of 'resolve' command
+#: bzrlib/conflicts.py:95
+msgid "How to resolve the conflict."
+msgstr ""
+
+#: bzrlib/conflicts.py:101
+msgid "Mark a conflict as resolved."
+msgstr ""
+
+#: bzrlib/conflicts.py:108
+msgid ""
+"Once you have fixed a problem, use \"bzr resolve\" to automatically mark\n"
+"text conflicts as fixed, \"bzr resolve FILE\" to mark a specific conflict "
+"as\n"
+"resolved, or \"bzr resolve --all\" to mark all conflicts as resolved."
+msgstr ""
+
+# help of 'all' option of 'resolve' command
+#: bzrlib/conflicts.py:116
+msgid "Resolve all conflicts in this tree."
+msgstr ""
+
+# title of 'action' option of 'resolve' command
+#: bzrlib/conflicts.py:678
+msgid "action"
+msgstr ""
+
+#: bzrlib/errors.py:224
+msgid "The tree builder is already building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:245
+msgid "The dirstate file (%(state)s) appears to be corrupt: %(msg)s"
+msgstr ""
+
+#: bzrlib/errors.py:264
+msgid ""
+"The API for \"%(api)s\" is not compatible with \"%(wanted)s\". It supports "
+"versions \"%(minimum)s\" to \"%(current)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:276
+msgid "The transport '%(transport)s' is only accessible within this process."
+msgstr ""
+
+#: bzrlib/errors.py:294
+msgid "Invalid revision number %(revno)s"
+msgstr ""
+
+#: bzrlib/errors.py:303
+msgid "Invalid revision-id {%(revision_id)s} in %(branch)s"
+msgstr ""
+
+#: bzrlib/errors.py:314
+msgid "Reserved revision-id {%(revision_id)s}"
+msgstr ""
+
+#: bzrlib/errors.py:328
+msgid "There is no public branch set for \"%(branch_url)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:338
+msgid ""
+"No help could be found for '%(topic)s'. Please use 'bzr help topics' to "
+"obtain a list of topics."
+msgstr ""
+
+#: bzrlib/errors.py:347
+msgid "The file id \"%(file_id)s\" is not present in the tree %(tree)s."
+msgstr ""
+
+#: bzrlib/errors.py:357
+msgid ""
+"The file id \"%(file_id)s\" is not present in the repository %(repository)r"
+msgstr ""
+
+#: bzrlib/errors.py:366
+msgid "The branch '%(branch)s' is not stacked."
+msgstr ""
+
+#: bzrlib/errors.py:380
+msgid "No WorkingTree exists for \"%(base)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:389
+msgid "Not currently building a tree."
+msgstr ""
+
+#: bzrlib/errors.py:394
+msgid "%(url)s is not a local path."
+msgstr ""
+
+#: bzrlib/errors.py:422
+msgid "%(not_locked)r is not write locked but needs to be."
+msgstr ""
+
+#: bzrlib/errors.py:430
+msgid "Error in command line options"
+msgstr ""
+
+#: bzrlib/errors.py:435
+msgid "%(value)s is not an index of type %(_type)s."
+msgstr ""
+
+#: bzrlib/errors.py:445
+msgid "Error in data for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:454
+msgid "The key '%(key)s' is already in index '%(index)s'."
+msgstr ""
+
+#: bzrlib/errors.py:464
+msgid "The key '%(key)s' is not a valid key."
+msgstr ""
+
+#: bzrlib/errors.py:473
+msgid "Could not parse options for index %(value)s."
+msgstr ""
+
+#: bzrlib/errors.py:482
+msgid "The value '%(value)s' is not a valid value."
+msgstr ""
+
+#: bzrlib/errors.py:491
+msgid "Bad value \"%(value)s\" for option \"%(name)s\"."
+msgstr ""
+
+#: bzrlib/errors.py:510
+msgid "Generic path error: %(path)r%(extra)s)"
+msgstr ""
+
+#: bzrlib/errors.py:523
+msgid "No such file: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:528
+msgid "File exists: %(path)r%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:534
+msgid ""
+"Could not rename %(source)s => %(dest)s because both files exist. (Use --"
+"after to tell bzr about a rename that has already happened)%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:550
+msgid "\"%(path)s\" is not a directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:555
+msgid "\"%(path)s\" is not in the working directory %(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:560
+msgid "Directory not empty: \"%(path)s\"%(extra)s"
+msgstr ""
+
+#: bzrlib/errors.py:565
+msgid "Hard-linking \"%(path)s\" is not supported"
+msgstr ""
+
+#: bzrlib/errors.py:580
+msgid "Device or resource busy: \"%(path)s\"%(extra)s"
+msgstr ""
+