[LyX/master] Parse obsolete entries correctly

[Georg Baum]

commit 2041920ce01890471fe26f23321c9c3406889dfe
Author: Georg Baum <b...@lyx.org>
Date:   Thu Dec 3 20:52:43 2015 +0100

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