Re: [bug-gettext] msgmerge confuses unrelated entries

2017-09-14 Thread Loic Dachary
Hi Bruno, >> The original file has: >> >> ... >> #: journalist.py:237 journalist.py:453 >> msgid "Two-factor token failed to verify" >> msgstr "Échec de vérification du jeton de la validation en deux étapes" >> ... >> #: journalist_templates/edit_account.html:53 >> msgid "Reset Two-Factor Authenti

Re: [bug-gettext] msgmerge confuses unrelated entries

2017-09-14 Thread Bruno Haible
Hi Loïc, > It is a great feeling, when filing a bug, to get an immediate response... It's a great feeling to get a bug report by someone who has a wikipedia entry and who, on top of it, is working on a globally important project (SecureDrop) :-) > These files are fed to weblate ( > https://webl

Re: [bug-gettext] msgmerge confuses unrelated entries

2017-09-14 Thread Loic Dachary
Hi Bruno ! It is a great feeling, when filing a bug, to get an immediate response that shows a great attention to details :-) On 09/14/2017 10:06 PM, Bruno Haible wrote: > Hello dear Loïc, > >> Given the attached messages.pot and messages.po, when calling: >> >> msgmerge --previous --update

Re: [bug-gettext] msgmerge confuses unrelated entries

2017-09-14 Thread Bruno Haible
Hello dear Loïc, > Given the attached messages.pot and messages.po, when calling: > > msgmerge --previous --update messages.po messages.pot > > it produces the attached messages.po.updated file. A diff between messages.po > and messages.po.update shows: > > -#: journalist.py:237 journalist

[bug-gettext] msgmerge confuses unrelated entries

2017-09-14 Thread Loic Dachary
Hi, Given the messages.pot[1] and messages.po[2], when calling: msgmerge --previous --update messages.po messages.pot it produces the messages.po.updated[3] file. A diff between messages.po and messages.po.update shows: -#: journalist.py:237 journalist.py:453 -msgid "Two-factor token faile