From 2041920ce01890471fe26f23321c9c3406889dfe Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Thu, 3 Dec 2015 20:52:43 +0100 Subject: [PATCH] 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. --- development/tools/mergepo.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 -- 2.39.5