[PATCH 2 of 7] i18n: zh_CN: fix 'duplicate message definition'

Thomas De Schampheleire patrickdepinguin at gmail.com
Sun Mar 10 21:19:22 UTC 2019


# HG changeset patch
# User Thomas De Schampheleire <thomas.de_schampheleire at nokia.com>
# Date 1552250517 -3600
#      Sun Mar 10 21:41:57 2019 +0100
# Node ID cd3684d086d0594335d1ad2629262edaa6842807
# Parent  f4fa8e9b6783235d2eb7fa01fadba3ac6a8ab2e8
i18n: zh_CN: fix 'duplicate message definition'

Error reported by Weblate:

    msgmerge --no-wrap --backup=none --previous --update /home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po /home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/kallithea.pot

    /home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po:6927: duplicate message definition...
    /home/www-data/weblate-hosted/vcs/kallithea/kallithea/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po:9: ...this is the location of the first definition
    msgmerge: found 1 fatal error


Problem is introduced with commit 880e2f07651b3eaf88d01e71ac7f3cbf88df163c.

diff --git a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
+++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po
@@ -6924,7 +6924,7 @@ msgstr ""
 #~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL"
 #~ msgstr "无效的克隆地址,提供一个有效的克隆 http(s)或svn+http(s)地址"
 
-#~ msgid ""
+#~ msgid "Revisions %(revs)s are already part of pull request or have set status"
 #~ msgstr "修订%(revs)s已经包含在拉取请求中或者或者已经设置状态"
 
 #~ msgid "Defaults"


More information about the kallithea-general mailing list