mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
Fix merging of obsolete entries
Thanks Kornel for spotting this.
This commit is contained in:
parent
8a73992a49
commit
124be71cb9
@ -115,7 +115,7 @@ def mergepo_minimaldiff(target, source):
|
|||||||
msgid = ''
|
msgid = ''
|
||||||
for line in oldlines:
|
for line in oldlines:
|
||||||
if in_msgid:
|
if in_msgid:
|
||||||
if line.find('"') == 0:
|
if line.find('"') == 0 or line.find('#~ "') == 0:
|
||||||
msgid_lines.append(line)
|
msgid_lines.append(line)
|
||||||
else:
|
else:
|
||||||
in_msgid = False
|
in_msgid = False
|
||||||
@ -123,7 +123,7 @@ def mergepo_minimaldiff(target, source):
|
|||||||
newlines.extend(msgid_lines)
|
newlines.extend(msgid_lines)
|
||||||
msgid_lines = []
|
msgid_lines = []
|
||||||
elif in_msgstr:
|
elif in_msgstr:
|
||||||
if line.find('"') == 0:
|
if line.find('"') == 0 or line.find('#~ "') == 0:
|
||||||
msgstr_lines.append(line)
|
msgstr_lines.append(line)
|
||||||
else:
|
else:
|
||||||
in_msgstr = False
|
in_msgstr = False
|
||||||
|
Loading…
Reference in New Issue
Block a user