From: Georg Baum <baum@lyx.org>
Date: Sun, 24 Apr 2016 19:06:12 +0000 (+0200)
Subject: Update fuzzy translations without -o
X-Git-Tag: 2.2.0~50
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=05ef47f47ce281bfaaa5141aace5823ca61afb18;p=features.git

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.
---

diff --git a/development/tools/mergepo.py b/development/tools/mergepo.py
index 577f348778..a86b75d844 100755
--- a/development/tools/mergepo.py
+++ b/development/tools/mergepo.py
@@ -67,7 +67,7 @@ def translate(msgid, flags, msgstr_lines, po2, options):
         if msgstr == other.msgstr:
             return 0
     else:
-        if msgstr != '':
+        if msgstr != '' and not u'fuzzy' in flags:
             return 0
         other = po2.find(msgid)
         if not other: