Scott,
thanks for the summary. I could not follow most of these issues, so I do not
comment.
Scott Kostyshak wrote:
>
> What am I missing?
I would like to merge all changes to mergepo.py from 2.3-staging to master
(see attached). The users won't see this script at all, but it will make
updating translations easier, especially since most translators work on the
rc1 .po files that have been generated before the latest remerge (which
caused a resorting of entries).
Georg
commit dae9f6a83df37576fbb3753492fe6a1094d92248
Author: Georg Baum <b...@lyx.org>
Date: Sun Apr 24 21:06:12 2016 +0200
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.
commit d6590d5c4c8b201c0e9327732669a7fcc9f7277f
Author: Georg Baum <b...@lyx.org>
Date: Sun Apr 24 19:35:38 2016 +0200
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.
commit 73d6cfecfa4d86c771cc40453c0905277771bb24
Author: Georg Baum <b...@lyx.org>
Date: Sun Apr 24 16:54:04 2016 +0200
Make mergepo.py python3 compatible
This follows the same recipe (by José) as 262ae8264a for po/lyx_pot.py.
commit 8125c9403425d2a9a4d63d8b7ce459a2310cdc80
Author: Georg Baum <b...@lyx.org>
Date: Sun Apr 24 16:37:54 2016 +0200
polib has more names than UTF-8 for utf8
In case of id.po it returns utf-8.
