[LyX/master] polib has more names than UTF-8 for utf8

[Georg Baum]

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

diff --git a/development/tools/mergepo.py b/development/tools/mergepo.py
index cacf0e4..f7eb3b7 100755
--- a/development/tools/mergepo.py
+++ b/development/tools/mergepo.py
@@ -130,7 +130,7 @@ def mergepo_minimaldiff(target, source, options):
     target_enc = polib.detect_encoding(target)
     # for utf8 files we can use our self written parser to minimize diffs,
     # otherwise we need to use polib
-    if target_enc != 'UTF-8':
+    if not target_enc in ['UTF-8', 'utf-8', 'utf_8']:
         raise
     po1 = open(target, 'rb')
     oldlines = read(po1)