From 124be71cb98685e868316b1b5c24f4bccedfdc9f Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Sun, 29 Nov 2015 20:14:54 +0100 Subject: [PATCH] Fix merging of obsolete entries Thanks Kornel for spotting this. --- development/tools/mergepo.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/development/tools/mergepo.py b/development/tools/mergepo.py index 84eec1ca22..c4d402cbe4 100644 --- a/development/tools/mergepo.py +++ b/development/tools/mergepo.py @@ -115,7 +115,7 @@ def mergepo_minimaldiff(target, source): msgid = '' for line in oldlines: if in_msgid: - if line.find('"') == 0: + if line.find('"') == 0 or line.find('#~ "') == 0: msgid_lines.append(line) else: in_msgid = False @@ -123,7 +123,7 @@ def mergepo_minimaldiff(target, source): newlines.extend(msgid_lines) msgid_lines = [] elif in_msgstr: - if line.find('"') == 0: + if line.find('"') == 0 or line.find('#~ "') == 0: msgstr_lines.append(line) else: in_msgstr = False