From 2ffa8acc1a1975b60d8b0feac1921b90c28ea03f Mon Sep 17 00:00:00 2001 From: Julien Palard Date: Tue, 28 May 2019 15:53:33 +0200 Subject: [PATCH] Make good use of pomerge --mark-as-fuzzy and --no-overwrite. --- README.rst | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.rst b/README.rst index d2b887b9..dfbc8967 100644 --- a/README.rst +++ b/README.rst @@ -446,7 +446,7 @@ Propagez d'abord les traductions connues localement : .. code-block:: bash - pomerge --from-files **/*.po --to-files **/*.po + pomerge --no-overwrite --from-files **/*.po --to-files **/*.po powrap --modified git commit -m "Propagating known translations." @@ -455,12 +455,11 @@ Ensuite récupérez les changements depuis Transifex : .. code-block:: bash - pomerge --from-files **/*.po tx pull -f - pomerge --to-files **/*.po pomerge --from-files **/*.po git checkout -- . - pomerge --to-files **/*.po + pomerge --to-files --no-overwrite --mark-as-fuzzy **/*.po powrap --modified + git add -p git commit -m "tx pull" - tx push -t -f + tx push -t -f --no-interactive