# HG changeset patch # User Elliott Sales de Andrade # Date 1252110893 0 # Node ID 75a045c056ed3ff9726af5eb392b20da00289cd5 # Parent 9ab9e5f1eec2ea36499ea3ce0a05e3eaaeb7c7af Revert some Simplified Chinese string translations. These were clearly wrong since they replace %d with %s, and would crash. check_po.pl still complains about some MySpaceIM strings, but I don't know what to do with them as they've apparently been broken since before this update. References #10165. diff -r 9ab9e5f1eec2 -r 75a045c056ed po/zh_CN.po --- a/po/zh_CN.po Fri Sep 04 23:08:30 2009 +0000 +++ b/po/zh_CN.po Sat Sep 05 00:34:53 2009 +0000 @@ -7359,27 +7359,27 @@ #, c-format msgid "Sent: %lu
\n" -msgstr "目前在线人数: %d
\n" +msgstr "目前在线人数: %lu
\n" #, c-format msgid "Resend: %lu
\n" -msgstr "上次刷新: %s
\n" +msgstr "上次刷新: %lu
\n" #, c-format msgid "Lost: %lu
\n" -msgstr "上次刷新: %s
\n" +msgstr "上次刷新: %lu
\n" #, c-format msgid "Received: %lu
\n" -msgstr "上次刷新: %s
\n" +msgstr "上次刷新: %lu
\n" #, c-format msgid "Received Duplicate: %lu
\n" -msgstr "我的公网 IP: %s
\n" +msgstr "我的公网 IP: %lu
\n" #, c-format msgid "Time: %d-%d-%d, %d:%d:%d
\n" -msgstr "登录时间: %s
\n" +msgstr "登录时间: %d-%d-%d, %d:%d:%d
\n" #, c-format msgid "IP: %s
\n" @@ -9300,7 +9300,7 @@ #, c-format msgid "%s is trying to send you a group of %d files.\n" -msgstr "%s 正在发送文件 %s\n" +msgstr "%s 正在发送文件 %d\n" msgid "Write Error" msgstr "写错误" @@ -10050,7 +10050,7 @@ msgid "You have %d contact named %s. Would you like to merge them?" msgid_plural "" "You currently have %d contacts named %s. Would you like to merge them?" -msgstr[0] "更改 %s 的用户信息" +msgstr[0] "您已经有名为 %2$s 的 %1$d 位联系人。您是否想要合并?" msgid "" "Merging these contacts will cause them to share a single entry on the buddy "