Mercurial > kallithea
changeset 7562:cd3684d086d0
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.
| author | Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
|---|---|
| date | Sun, 10 Mar 2019 21:41:57 +0100 |
| parents | f4fa8e9b6783 |
| children | 9326edf6bcf0 |
| files | kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Sun Mar 10 21:23:35 2019 +0100 +++ b/kallithea/i18n/zh_CN/LC_MESSAGES/kallithea.po Sun Mar 10 21:41:57 2019 +0100 @@ -6924,7 +6924,7 @@ #~ 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"