anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix merging of obsolete entries

Browse Source 
Thanks Kornel for spotting this.
This commit is contained in:
Georg Baum 2015-11-29 20:14:54 +01:00
parent 8a73992a49
commit 124be71cb9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/tools/mergepo.py
View File

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