pidgin: 58514aa6: Revert some Simplified Chinese string tr...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: 58514aa6bb9f8d75a15189d17a20092ce638fbca
Ancestor: a47f88caa774782909f05a086d8c3d215464417b
Author: qulogic at pidgin.im
Date: 2009-09-05T00:34:53
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/58514aa6bb9f8d75a15189d17a20092ce638fbca

Modified files:
        po/zh_CN.po

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- po/zh_CN.po	f60779ec212022d01f90fc25d54fcc8d7a32b2cb
+++ po/zh_CN.po	d22827bb99ac17a8389588a3f19d14686135bb99
@@ -7359,27 +7359,27 @@ msgid "<b>Sent</b>: %lu<br>\n"
 
 #, 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 @@ msgid "%s is trying to send you a group 
 
 #, 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_plural ""
 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 "