Add support for mixed-encoded biblatex files

[lyx.git] / development / tools / mergepo.py

diff --git a/development/tools/mergepo.py b/development/tools/mergepo.py
index 577f348778bf0913f473e57c02dd117684d03898..c54448c261d8ad0827d4bbf42d5d04d22768dd76 100755 (executable)
--- a/development/tools/mergepo.py
+++ b/development/tools/mergepo.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python3
 # -*- coding: utf-8 -*-
 
 # file 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: