Commit Graph

12 Commits

Author SHA1 Message Date
Georg Baum
05ef47f47c Update fuzzy translations without -o
This is what the polib version does already. If a translation is marked
fuzzy then it is not used, so if the other file contains a non-fuzzy
translation we do not throw away useful information if we overtake it.
2016-05-07 10:21:24 +02:00
Georg Baum
499ffc3c13 Merge fuzzy translations correctly
If the -o option is given, we may overwrite existing translations with
translations from the other .po file. In this case, we have to delete or set
the fuzzy flag accoring to the updated translation.
2016-05-07 10:21:12 +02:00
Georg Baum
6a4503ac33 Make mergepo.py python3 compatible
This follows the same recipe (by José) as 262ae8264a for po/lyx_pot.py.
2016-05-07 10:21:00 +02:00
Georg Baum
bc53fc53f8 polib has more names than UTF-8 for utf8
In case of id.po it returns utf-8.
2016-05-07 10:20:38 +02:00
Guillaume Munch
a8ad43d4fd Check that we have bash before running updatelfuns.sh
Also set executable bits on the devel scripts.
2016-01-11 16:26:13 +00:00
Georg Baum
9aa43290db Add option to skip null translations
he.po in branch contains a number of translations where the translation is
identical with the original text (e.g. for encoding names) which look suspicios
to me. Therefore I did not want to merge these and leave the decision to the
translator. No information is lost, since these "translations" can easily be
recreated from the original texts by copy-paste.
2015-12-06 11:27:48 +01:00
Georg Baum
a6b5c72820 Add option to overwrite existing translations
This is useful if you know that the translation of a particular language has
not been updated at all in master, but the stable version has been worked on.
2015-12-03 21:02:47 +01:00
Georg Baum
be7df4a13c Handle escaped characters correctly
Some characters (like ") are escaped in .po files. These are handled correctly
by polib, but the self written parser did not yet take them into account.
2015-12-03 20:56:51 +01:00
Georg Baum
2041920ce0 Parse obsolete entries correctly
We need to remove the #~ prefix of each line, since it is re-added after
wrapping, and because otherwise the comparison with entries from polib
does not work.
2015-12-03 20:52:43 +01:00
Georg Baum
99b3928e6f Use a proper command line parser
Now it is possible to specify the target directory, and the command line syntax
follows the standard rules: It uses options for optional arguments, and one
positional argument for the single required argument.
2015-12-03 20:25:06 +01:00
Georg Baum
124be71cb9 Fix merging of obsolete entries
Thanks Kornel for spotting this.
2015-11-29 20:16:59 +01:00
Georg Baum
4db3169fbc Add utility to merge po files
Surprisingly I could not find a tool that merges updated translations into a
.po file in a way that

a) merges only missing translations (does not overwrite existing ones)
b) produces a minimal diff so that there is a chance to manually check the result

Therefore I wrote my own. You can use it for a single language

python development/tools/mergepo.py ../lyx-2.1/po fr

or for all languages:

python development/tools/mergepo.py ../lyx-2.1/po

The python code is not the most elegant one, but it works. What is missing is
a command line switch to merge changed translations as well. This is useful
for languages that have not yet received any translation update in the
development branch, only in the stable branch: In this case we know that
translations that are not identical in both branches should be overtaken from
the stabkle one.
2015-11-29 18:14:06 +01:00