Mercurial > pidgin
diff po/zh_CN.po @ 31291:b9dc45392feb
propagate from branch 'im.pidgin.pidgin' (head 665e2d641cdd2b6cca3bca378641f8345572146f)
to branch 'im.pidgin.pidgin.mxit' (head 20a7b36a8dc242edd143675b69a3e2864a11afbe)
author | pieter.loubser@mxit.com |
---|---|
date | Wed, 15 Sep 2010 08:28:39 +0000 |
parents | 1cdae196aac8 |
children | a95e7ed3d7d2 |
line wrap: on
line diff
--- a/po/zh_CN.po Fri Aug 20 08:35:27 2010 +0000 +++ b/po/zh_CN.po Wed Sep 15 08:28:39 2010 +0000 @@ -777,7 +777,7 @@ msgid "Waiting for transfer to begin" msgstr "正在等待传送开始" -msgid "Canceled" +msgid "Cancelled" msgstr "已取消" msgid "Failed" @@ -15530,7 +15530,7 @@ #~ msgid "Could not open %s for writing!" #~ msgstr "无法打开 %s 写入!" -#~ msgid "File transfer failed; other side probably canceled." +#~ msgid "File transfer failed; other side probably cancelled." #~ msgstr "文件传送失败;可能其中一端取消了传送。" #~ msgid "Could not connect for transfer."