# HG changeset patch # User Elliott Sales de Andrade <qulogic@pidgin.im> # 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 "<b>Sent</b>: %lu<br>\n" -msgstr "<b>������鎖篋堺��</b>: %d<br>\n" +msgstr "<b>������鎖篋堺��</b>: %lu<br>\n" #, c-format msgid "<b>Resend</b>: %lu<br>\n" -msgstr "<b>筝�罨≦�傑��</b>: %s<br>\n" +msgstr "<b>筝�罨≦�傑��</b>: %lu<br>\n" #, c-format msgid "<b>Lost</b>: %lu<br>\n" -msgstr "<b>筝�罨≦�傑��</b>: %s<br>\n" +msgstr "<b>筝�罨≦�傑��</b>: %lu<br>\n" #, c-format msgid "<b>Received</b>: %lu<br>\n" -msgstr "<b>筝�罨≦�傑��</b>: %s<br>\n" +msgstr "<b>筝�罨≦�傑��</b>: %lu<br>\n" #, c-format msgid "<b>Received Duplicate</b>: %lu<br>\n" -msgstr "<b>������� IP</b>: %s<br>\n" +msgstr "<b>������� IP</b>: %lu<br>\n" #, c-format msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n" -msgstr "<b>�糸��狗��</b>: %s<br>\n" +msgstr "<b>�糸��狗��</b>: %d-%d-%d, %d:%d:%d<br>\n" #, c-format msgid "<b>IP</b>: %s<br>\n" @@ -9300,7 +9300,7 @@ #, c-format msgid "%s is trying to send you a group of %d files.\n" -msgstr "%s 罩e�������篁� %s\n" +msgstr "%s 罩e�������篁� %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 "