From: Georg Baum <baum@lyx.org>
Date: Thu, 3 Dec 2015 19:52:43 +0000 (+0100)
Subject: Parse obsolete entries correctly
X-Git-Tag: 2.2.0beta1~481
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2041920ce01890471fe26f23321c9c3406889dfe;p=features.git

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

diff --git a/development/tools/mergepo.py b/development/tools/mergepo.py
index 5296052860..c5e1f16172 100644
--- a/development/tools/mergepo.py
+++ b/development/tools/mergepo.py
@@ -52,7 +52,10 @@ def parse_msg(lines):
         return ''
     msg = lines[0][i:].strip('"')
     for i in range(1, len(lines)):
-        msg = msg + lines[i].strip('"')
+        j = lines[i].find('"')
+        if j < 0:
+            return ''
+        msg = msg + lines[i][j:].strip('"')
     return msg