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 failed to verify"
-msgstr "Échec de vérification du jeton de la validation en deux étapes"
+#: journalist.py:237 journalist.py:455
+#, fuzzy
+#| msgid "Reset Two-Factor Authentication"
+msgid "Could not verify token in two-factor authentication."
+msgstr "Réinitialiser la validation en deux étapes"
which incorrectly associates "Reset Two-Factor Authentication" as the previous
version of the "Could not verify token in two-factor authentication." string
and therefore swaps the translations. The messages.po file has the following
entry, unmodified in messages.po.updated
#: journalist_templates/edit_account.html:53
msgid "Reset Two-Factor Authentication"
msgstr "Réinitialiser la validation en deux étapes"
The correct behavior would be to keep the original translation. It is always
incorrect to assume two different phrases (in this case "Could not verify token
in two-factor authentication." and "Reset Two-Factor Authentication") have
exactly the same translation.
Cheers
[1] http://dachary.org/loic/messages.pot
[2] http://dachary.org/loic/messages.po
[3] http://dachary.org/loic/messages.po.updated
--
Loïc Dachary, Artisan Logiciel Libre
