From 42106896cb3c41324e1773defbed1e24070512aa Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Mon, 23 Oct 2017 22:39:18 +0200 Subject: [PATCH] Update readme --- README.rst | 13 ++++++++++++- setup.py | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index fa6765e..da6d6f4 100644 --- a/README.rst +++ b/README.rst @@ -19,11 +19,22 @@ To merge translations from contributors to your files:: To merge translations from inside a single repository, usefull when simple strings can appear in multiple .po files:: - pomerge --from *.po **.*.po --to *.po **/*.po + pomerge --from **.*.po --to **/*.po Note that ``pomerge`` does not care about po file names, a translation from one file can land in another as long as their msgid are identical. +``--from`` and ``--to`` are optional, when not given, pomerge will use +a temporay file. So:: + + pomerge --from a/**/*.po --to b/**/*.po + +and:: + + pomerge --from a/**/*.po + pomerge --to b/**/*.po + +are equivalent. The style in your ``.po`` files may change a lot, completly destroying the readability of git diffs, to fix this I use diff --git a/setup.py b/setup.py index 5a7cfe8..c35c90f 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ with open('README.rst') as readme_file: setup( name='pomerge', - version='0.1.0', + version='0.1.1', description="Merge known translations between .po files.", long_description=readme, author="Julien Palard",