changeset 27305:5f62aa791648

Updated Simplified Translation from Aron Xu, new translator. Closes #9243.
author Paul Aurich <paul@darkrain42.org>
date Sat, 04 Jul 2009 22:23:30 +0000
parents 120943c3f5a8
children 07dcbda77127
files pidgin/gtkdialogs.c po/ChangeLog po/zh_CN.po
diffstat 3 files changed, 317 insertions(+), 392 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkdialogs.c	Sat Jul 04 22:09:55 2009 +0000
+++ b/pidgin/gtkdialogs.c	Sat Jul 04 22:23:30 2009 +0000
@@ -231,7 +231,7 @@
 	{N_("Turkish"),             "tr", "Serdar Soytetir", "tulliana@gmail.com"},
 	{N_("Urdu"),                "ur", "RKVS Raman", "rkvsraman@gmail.com"},
 	{N_("Vietnamese"),          "vi", N_("T.M.Thanh and the Gnome-Vi Team"), "gnomevi-list@lists.sf.net"},
-	{N_("Simplified Chinese"),  "zh_CN", "Funda Wang", "fundawang@linux.net.cn"},
+	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "aronmalache@163.com"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Abel Cheung", "abelindsay@gmail.com"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Ambrose C. Li", "acli@ada.dhs.org"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Paladin R. Liu", "paladin@ms1.hinet.net"},
@@ -294,6 +294,7 @@
 	{N_("Swedish"),             "sv", "Christian Rose", NULL},
 	{N_("Turkish"),             "tr", "Ahmet Alp BALKAN", NULL},
 	{N_("Simplified Chinese"),  "zh_CN", "Hashao, Rocky S. Lee", NULL},
+	{N_("Simplified Chinese"),  "zh_CN", "Funda Wang", "fundawang@linux.net.cn"},
 	{N_("Traditional Chinese"), "zh_TW", "Hashao, Rocky S. Lee", NULL},
 	{NULL, NULL, NULL, NULL}
 };
--- a/po/ChangeLog	Sat Jul 04 22:09:55 2009 +0000
+++ b/po/ChangeLog	Sat Jul 04 22:23:30 2009 +0000
@@ -5,6 +5,7 @@
 	* Lao translation updated (Anousak Souphavah)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Swahili translation added (Paul Msegeya)
+	* Simplified Chinese translation updated under new translator (Aron Xu)
 
 version 2.5.8
 	* No changes
--- a/po/zh_CN.po	Sat Jul 04 22:09:55 2009 +0000
+++ b/po/zh_CN.po	Sat Jul 04 22:23:30 2009 +0000
@@ -1,20 +1,21 @@
-# pidgin 软件包的简体中文翻译。
-# Copyright (C) 2003 pidgin team.
+# Pidgin 软件包的简体中文翻译。
+# Copyright (C) 2009 pidgin team.
 # This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
+# liyuekui <liyuekui@gmail.com>, 2009.
+# Aron Xu <aronmalache@163.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-02 01:34-0700\n"
-"PO-Revision-Date: 2007-05-20 20:22+0800\n"
-"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2009-07-04 15:17-0700\n"
+"PO-Revision-Date: 2009-04-23 00:32+0800\n"
+"Last-Translator: Aron Xu <aronmalache@163.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -25,7 +26,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s。试试“%s -h”查看帮助。\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -60,7 +61,6 @@
 msgid "Account was not added"
 msgstr "账户未添加"
 
-#, fuzzy
 msgid "Username of an account must be non-empty."
 msgstr "账户的用户名必须非空。"
 
@@ -70,7 +70,6 @@
 msgid "Remember password"
 msgstr "记住密码"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
 msgstr "未安装协议插件。"
 
@@ -86,9 +85,8 @@
 msgid "Protocol:"
 msgstr "协议:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "用户名(_U):"
+msgstr "用户名:"
 
 msgid "Password:"
 msgstr "密码:"
@@ -97,7 +95,6 @@
 msgstr "别名:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
 msgstr "在服务器上创建此新帐户"
 
@@ -179,7 +176,6 @@
 msgid "Default"
 msgstr "默认"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
 msgstr "您必须提供好友的用户名。"
 
@@ -198,13 +194,11 @@
 msgid "Username"
 msgstr "用户名"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "给联系人起名"
-
-#, fuzzy
+msgstr "联系人别名(可选)"
+
 msgid "Add in group"
-msgstr "添加组"
+msgstr "添加到组"
 
 msgid "Account"
 msgstr "账户"
@@ -346,9 +340,8 @@
 msgid "Plugins"
 msgstr "插件"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "取消屏蔽"
+msgstr "屏蔽/取消屏蔽"
 
 msgid "Block"
 msgstr "屏蔽"
@@ -356,11 +349,10 @@
 msgid "Unblock"
 msgstr "取消屏蔽"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
+msgstr "清输入你想要屏蔽/解除屏蔽的用户名活别名。"
 
 #. Not multiline
 #. Not masked?
@@ -371,7 +363,6 @@
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
 
@@ -387,11 +378,10 @@
 msgid "Join"
 msgstr "加入"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
-msgstr "您想要查看谁的日志?请输入他/她的用户名或别名。"
+msgstr "您想要查看和谁聊天的日志?请输入他/她的用户名或别名。"
 
 #. Create the "Options" frame.
 msgid "Options"
@@ -400,20 +390,17 @@
 msgid "Send IM..."
 msgstr "发送消息..."
 
-#, fuzzy
 msgid "Block/Unblock..."
-msgstr "取消屏蔽"
+msgstr "屏蔽/取消屏蔽..."
 
 msgid "Join Chat..."
 msgstr "加入聊天..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "查看日志"
-
-#, fuzzy
+msgstr "查看日志..."
+
 msgid "View All Logs"
-msgstr "查看日志"
+msgstr "查看全部日志"
 
 msgid "Show"
 msgstr "显示"
@@ -436,19 +423,17 @@
 msgid "By Log Size"
 msgstr "按日志大小"
 
-#, fuzzy
 msgid "Buddy"
-msgstr "好友(_B):"
+msgstr "好友"
 
 msgid "Chat"
 msgstr "聊天"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "组"
+msgstr "分组"
 
 msgid "Certificate Import"
-msgstr "证书导入"
+msgstr "导入证书"
 
 msgid "Specify a hostname"
 msgstr "指定主机名"
@@ -503,17 +488,17 @@
 msgstr ""
 
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL 主机证书"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "确实要删除 %s 的证书吗?"
 
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "确认删除证书"
 
 msgid "Certificate Manager"
-msgstr ""
+msgstr "证书管理器"
 
 #. Creating the user splits
 msgid "Hostname"
@@ -615,7 +600,6 @@
 msgid "Add Buddy Pounce..."
 msgstr "添加好友千里眼..."
 
-#, fuzzy
 msgid "Invite..."
 msgstr "邀请"
 
@@ -631,7 +615,8 @@
 #, fuzzy, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "用户列表:\n"
+msgstr[0] "%d 个用户的列表:\n"
+msgstr[1] "%d 个用户的列表:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
@@ -650,7 +635,7 @@
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
-msgstr ""
+msgstr "%s 不是有效的信息类型。查看'/help msgcolor' 已查找有效的信息"
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
@@ -727,6 +712,7 @@
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
 msgstr[0] "文件传送 - 已完成 %d%%,共 %d 个文件"
+msgstr[1] "文件传送 - 已完成 %d%%,共 %d 个文件"
 
 #. Create the window.
 msgid "File Transfers"
@@ -773,13 +759,11 @@
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/秒"
 
-#, fuzzy
 msgid "Sent"
-msgstr "设置(_S)"
-
-#, fuzzy
+msgstr "已发送"
+
 msgid "Received"
-msgstr "收到的消息"
+msgstr "已收到"
 
 msgid "Finished"
 msgstr "已完成"
@@ -788,21 +772,20 @@
 msgid "The file was saved as %s."
 msgstr "文件已另存为 %s。"
 
-#, fuzzy
 msgid "Sending"
-msgstr "发送"
-
-#, fuzzy
+msgstr "正在发送"
+
 msgid "Receiving"
-msgstr "剩余"
-
-#, fuzzy, c-format
+msgstr "正在接收"
+
+# c-format
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "与 %s 的对话"
-
-#, fuzzy, c-format
+msgstr "在 %s 中与 %s 的对话"
+
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "与 %s 的对话"
+msgstr "与 %s 在 %s 的对话"
 
 msgid "%B %Y"
 msgstr "%Y年%m月"
@@ -839,16 +822,14 @@
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "对话"
+msgstr "全部对话"
 
 msgid "System Log"
 msgstr "系统日志"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "正在计算..."
+msgstr "正在呼叫..."
 
 msgid "Hangup"
 msgstr ""
@@ -874,12 +855,11 @@
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "您已经参与了频道%s%s"
+msgstr "您已经拒绝呼叫"
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "呼叫:音频呼叫。"
 
 msgid "Emails"
 msgstr "电子邮件"
@@ -893,10 +873,11 @@
 msgid "Subject"
 msgstr "主题"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s(%s) 有 %d 封新邮件。"
+msgstr[1] "%s(%s) 有 %d 封新邮件。"
 
 msgid "New Mail"
 msgstr "新邮件"
@@ -920,16 +901,14 @@
 msgid "(none)"
 msgstr "(无)"
 
-#, fuzzy
 msgid "URI"
-msgstr "UIN"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
-
-#, fuzzy
+msgstr "错误"
+
 msgid "loading plugin failed"
-msgstr "Ping 失败"
+msgstr "载入插件失败"
 
 msgid "unloading plugin failed"
 msgstr ""
@@ -966,9 +945,8 @@
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 
-#, fuzzy
 msgid "Select plugin to install"
-msgstr "选择文件"
+msgstr "选择插件以安装"
 
 msgid "You can (un)load plugins from the following list."
 msgstr "您可以卸载以下列表中的插件。"
@@ -1059,16 +1037,14 @@
 msgid "Play a sound"
 msgstr "播放声音"
 
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "仅当我的状态不可用时才监视(_O)"
+msgstr "仅当我的状态不可用时才监视"
 
 msgid "Recurring"
 msgstr "再现"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "无法更改昵称"
+msgstr "无法创建监视"
 
 msgid "You do not have any accounts."
 msgstr "您没有帐户。"
@@ -1174,13 +1150,11 @@
 msgid "Logging"
 msgstr "日志"
 
-#, fuzzy
 msgid "You must fill all the required fields."
-msgstr "填入注册字段。"
-
-#, fuzzy
+msgstr "您必须填入注册字段。"
+
 msgid "The required fields are underlined."
-msgstr "所需插件 %s 无法装入。"
+msgstr "所需区域已用下划线标出。"
 
 msgid "Not implemented yet."
 msgstr "未实现。"
@@ -1191,16 +1165,14 @@
 msgid "Open File..."
 msgstr "打开文件..."
 
-#, fuzzy
 msgid "Choose Location..."
-msgstr "位置"
+msgstr "选择位置..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
-
-#, fuzzy
+msgstr "按'Enter'以寻找更多此分类下的聊天室。"
+
 msgid "Get"
-msgstr "设置(_S)"
+msgstr "获取"
 
 #. Create the window.
 msgid "Room List"
@@ -1233,9 +1205,8 @@
 msgid "Others talk in chat"
 msgstr "别人在聊天中发言"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "别人在聊天中提到您的名字"
+msgstr "有人在聊天中提到您的名字"
 
 msgid "GStreamer Failure"
 msgstr "GStreamer 失败"
@@ -1273,7 +1244,7 @@
 msgid "Method: "
 msgstr "方式:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
@@ -1297,9 +1268,8 @@
 msgid "Only when not available"
 msgstr "仅当不可用时"
 
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "音量:"
+msgstr "音量(0-100):"
 
 #. Sound events
 msgid "Sound Events"
@@ -1492,24 +1462,20 @@
 msgid "Offline"
 msgstr "离线"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "离线好友"
-
-#, fuzzy
+msgstr "在线好友"
+
 msgid "Offline Buddies"
 msgstr "离线好友"
 
-#, fuzzy
 msgid "Online/Offline"
-msgstr "上线时间"
+msgstr "在线/离线"
 
 msgid "Meebo"
 msgstr ""
 
-#, fuzzy
 msgid "No Grouping"
-msgstr "无声音"
+msgstr "未分组"
 
 msgid "Nested Subgroup"
 msgstr ""
@@ -1517,12 +1483,11 @@
 msgid "Nested Grouping (experimental)"
 msgstr ""
 
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "提供与 Evolution 的集成。"
+msgstr "提供其他分组选项。"
 
 msgid "Lastlog"
-msgstr "Lastlog"
+msgstr "最近日志"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
@@ -1547,12 +1512,11 @@
 msgid "TinyURL (or other) address prefix"
 msgstr ""
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL 插件"
 
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
 msgstr ""
@@ -1647,13 +1611,13 @@
 msgstr ""
 
 #. Make messages
-#, fuzzy, c-format
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "接受聊天邀请吗?"
+msgstr "接受 %s 的聊天邀请吗?"
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "SSL 证书验证"
 
 msgid "_View Certificate..."
 msgstr "查看证书(_V)..."
@@ -1725,16 +1689,14 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "服务器信息"
+msgstr "证书信息"
 
 msgid "Registration Error"
 msgstr "注册错误"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "注册错误"
+msgstr "解除注册错误"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -1792,7 +1754,6 @@
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#, fuzzy
 msgid "Invite to chat"
 msgstr "邀请会议"
 
@@ -2166,9 +2127,9 @@
 msgid "Unable to load your plugin."
 msgstr "无法装入您的插件。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "依赖的插件 %s 装入失败。"
+msgstr "%s 依赖的插件 %s 卸载失败。"
 
 msgid "Autoaccept"
 msgstr "自动接受"
@@ -2224,9 +2185,8 @@
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "选择要搜索的用户目录"
+msgstr "为每个用户创建新目录"
 
 msgid "Notes"
 msgstr "备注"
@@ -2516,9 +2476,10 @@
 msgstr "在日志查看器中包含其它即时通讯客户的日志。"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2571,7 +2532,7 @@
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2856,9 +2817,8 @@
 msgstr "Purple 联系人"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "地区"
+msgstr "本地端口"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2879,9 +2839,8 @@
 msgid "Could not listen on socket"
 msgstr "无法在套接字上监听"
 
-#, fuzzy
 msgid "Error communicating with local mDNSResponder."
-msgstr "与服务器通讯出错"
+msgstr "与本地 DNS 服务通讯出错"
 
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
@@ -2906,9 +2865,9 @@
 msgid "Buddylist saved successfully!"
 msgstr "好友列表成功保存!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "无法装入好友列表"
+msgstr "无法为 %s 写入 %s 好友列表"
 
 msgid "Couldn't load buddylist"
 msgstr "无法装入好友列表"
@@ -3246,13 +3205,12 @@
 msgid "Ban on %s by %s, set %s ago"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s"
-msgstr "原因: %s"
-
-#, fuzzy
+msgstr "屏蔽: %s"
+
 msgid "End of ban list"
-msgstr "未列出"
+msgstr "屏蔽列表结束"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3373,13 +3331,12 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "此聊天名已经在使用中"
-
-#, fuzzy
+msgstr "昵称 \"%s\" 已被使用。"
+
 msgid "Nickname in use"
-msgstr "昵称"
+msgstr "昵称已被使用"
 
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
@@ -3398,9 +3355,9 @@
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "需要注册"
+msgstr "无法加入 %s:需要注册"
 
 msgid "Cannot join channel"
 msgstr "无法加入频道"
@@ -3597,9 +3554,8 @@
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
 
-#, fuzzy
 msgid "You require encryption, but no TLS/SSL support found."
-msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
+msgstr "您要求 TLS/SSL 登录,但没有找到 TLS/SSL 支持。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
@@ -3631,19 +3587,14 @@
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
-#, fuzzy
 msgid "No session ID given"
-msgstr "没有给出理由。"
-
-#, fuzzy
+msgstr "没有给出会话 ID"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "不支持的版本"
-
-#, fuzzy
+msgstr "不支持 BOSH 协议的版本"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"无法建立与服务器:\n"
-"%s"
+msgstr "无法与服务器建立连接"
 
 #, c-format
 msgid ""
@@ -3653,9 +3604,8 @@
 "无法建立与服务器:\n"
 "%s"
 
-#, fuzzy
 msgid "Unable to establish SSL connection"
-msgstr "无法初始化连接"
+msgstr "无法建立 SSL 连接"
 
 msgid "Unable to create socket"
 msgstr "无法创建套接字"
@@ -3727,12 +3677,11 @@
 msgid "Operating System"
 msgstr "操作系统"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "本地文件:"
+msgstr "本地时间"
 
 msgid "Last Activity"
-msgstr ""
+msgstr "最近活动"
 
 msgid "Service Discovery Info"
 msgstr "服务目录信息"
@@ -3744,9 +3693,8 @@
 msgid "Extended Stanza Addressing"
 msgstr "额外地址"
 
-#, fuzzy
 msgid "Multi-User Chat"
-msgstr "给聊天起名"
+msgstr "多用户聊天"
 
 #, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
@@ -3775,17 +3723,15 @@
 msgid "In-Band Registration"
 msgstr "注册错误"
 
-#, fuzzy
 msgid "User Location"
-msgstr "位置"
+msgstr "用户位置"
 
 #, fuzzy
 msgid "User Avatar"
 msgstr "用户搜索"
 
-#, fuzzy
 msgid "Chat State Notifications"
-msgstr "好友状态通知"
+msgstr "聊天状态通知"
 
 msgid "Software Version"
 msgstr "软件版本"
@@ -3822,9 +3768,8 @@
 msgid "Reachability Address"
 msgstr "电子邮件地址"
 
-#, fuzzy
 msgid "User Profile"
-msgstr "个人资料"
+msgstr "用户资料"
 
 #, fuzzy
 msgid "Jingle"
@@ -3833,9 +3778,8 @@
 msgid "Jingle Audio"
 msgstr ""
 
-#, fuzzy
 msgid "User Nickname"
-msgstr "用户名"
+msgstr "用户昵称"
 
 msgid "Jingle ICE UDP"
 msgstr ""
@@ -3956,13 +3900,11 @@
 msgid "Unsubscribe"
 msgstr "退订"
 
-#, fuzzy
 msgid "Log In"
-msgstr "已登入"
-
-#, fuzzy
+msgstr "登录"
+
 msgid "Log Out"
-msgstr "记录聊天"
+msgstr "退出"
 
 msgid "Chatty"
 msgstr "唠叨"
@@ -4009,9 +3951,8 @@
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "搜索用户"
+msgstr "搜索 XMPP 用户"
 
 #. "Search"
 msgid "Search"
@@ -4096,17 +4037,14 @@
 msgid "Affiliations:"
 msgstr "别名:"
 
-#, fuzzy
 msgid "No users found"
 msgstr "未找到匹配的用户"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "职务"
-
-#, fuzzy
+msgstr "角色:"
+
 msgid "Ping timeout"
-msgstr "纯文本"
+msgstr "Ping 超时"
 
 msgid "Read Error"
 msgstr "读取错误"
@@ -4131,9 +4069,9 @@
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "%s@%s 注册成功"
+msgstr "%s 注册成功"
 
 msgid "Registration Successful"
 msgstr "注册成功"
@@ -4141,17 +4079,15 @@
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "%s@%s 注册成功"
-
-#, fuzzy
+msgstr "%s 取消注册成功"
+
 msgid "Unregistration Successful"
-msgstr "注册成功"
-
-#, fuzzy
+msgstr "取消注册成功"
+
 msgid "Unregistration Failed"
-msgstr "注册失败"
+msgstr "取消注册失败"
 
 msgid "State"
 msgstr "州/省"
@@ -4171,7 +4107,6 @@
 msgid "Unregister"
 msgstr "取消注册"
 
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "请在下面填入信息以注册您新的账户。"
@@ -4179,24 +4114,22 @@
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "注册新的 Jabber 账户"
+msgstr "注册新的 XMPP 账户"
 
 msgid "Register"
 msgstr "注册"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "更改 %s 的用户信息"
-
-#, fuzzy, c-format
+msgstr "更改在 %s 的用户信息"
+
+#, c-format
 msgid "Register New Account at %s"
-msgstr "注册新的 Jabber 账户"
-
-#, fuzzy
+msgstr "在 %s 注册新账户"
+
 msgid "Change Registration"
-msgstr "注册错误"
+msgstr "更改帐户"
 
 #, fuzzy
 msgid "Malformed BOSH Connect Server"
@@ -4206,16 +4139,14 @@
 msgid "Error unregistering account"
 msgstr "更改账户信息出错"
 
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "您成功创建了一个群"
+msgstr "取消帐户注册成功"
 
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "初始化流"
+msgstr "初始化 SSL/TLS"
 
 msgid "Authenticating"
 msgstr "正在认证"
@@ -4306,9 +4237,8 @@
 msgid "Password (again)"
 msgstr "再次输入新密码"
 
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "更改密码"
+msgstr "更改 XMPP 密码"
 
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
@@ -4496,9 +4426,9 @@
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "无法屏蔽用户 %s"
+msgstr "无法 ping 用户 %s"
 
 #, fuzzy, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
@@ -4620,14 +4550,12 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "MSN 协议插件"
+msgstr "XMPP 协议插件"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#, fuzzy
 msgid "Domain"
-msgstr "罗马尼亚语"
+msgstr "域"
 
 msgid "Require SSL/TLS"
 msgstr ""
@@ -4647,22 +4575,20 @@
 msgid "Connect server"
 msgstr "连接服务器"
 
-#, fuzzy
 msgid "File transfer proxies"
-msgstr "文件传送端口"
+msgstr "文件传送代理"
 
 msgid "BOSH URL"
 msgstr ""
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "显示自定义如下:"
-
-#, fuzzy, c-format
+msgstr "显示自定义表情"
+
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s 已经关闭了对话。"
+msgstr "%s 已经离开了对话。"
 
 #, c-format
 msgid "Message from %s"
@@ -4680,11 +4606,10 @@
 msgid "Message delivery to %s failed: %s"
 msgstr "投递到 %s 的消息失败: %s"
 
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "Jabber 消息错误"
-
-#, fuzzy, c-format
+msgstr "XMPP 消息错误"
+
+#, c-format
 msgid "(Code %s)"
 msgstr " (代码 %s)"
 
@@ -4717,7 +4642,7 @@
 msgstr "聊天 %s 出错"
 
 #, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "打开文件时发生了错误。"
 
 #, fuzzy
@@ -5437,7 +5362,7 @@
 msgid "Mobile message was not sent because it was too long."
 msgstr "消息未发出,因为您尚未登入。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
 "automatically be signed out at that time.  Please finish any conversations "
@@ -5457,6 +5382,11 @@
 "现在进行中的对话。\n"
 "\n"
 "维护完成后,您将能够成功登入。"
+msgstr[1] ""
+"MSN 服务器即将于 %d 分钟后关闭进行维护。到那时,您将会被自动登出。请尽快关闭"
+"现在进行中的对话。\n"
+"\n"
+"维护完成后,您将能够成功登入。"
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
@@ -6260,9 +6190,10 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 显示为离线,因此未接受到您刚刚发出的消息。"
 
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+#, fuzzy
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
 msgid "Error. SSL support is not installed."
@@ -6482,7 +6413,7 @@
 
 #. Label
 msgid "Buddy Icon"
-msgstr "好友图标"
+msgstr "用户头像"
 
 msgid "Voice"
 msgstr "语音"
@@ -6629,10 +6560,10 @@
 msgstr "收到的认证"
 
 #. Unregistered username
-#. uid is not exist
-#, fuzzy
-msgid "Invalid username."
-msgstr "名称无效"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "用户不存在"
 
 #. Suspended account
 msgid "Your account is currently suspended."
@@ -6757,40 +6688,46 @@
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#, c-format
+#, fuzzy, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
-
-#, c-format
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
+
+#, fuzzy, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
-
-#, c-format
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
+
+#, fuzzy, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
 #, fuzzy, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
+msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她的警告级别过高。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她的警告级别过高。"
 
 #, fuzzy, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
-
-#, c-format
+msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是您的警告级别过高。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是您的警告级别过高。"
+
+#, fuzzy, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
 
 #. Data is assumed to be the destination bn
 #, c-format
@@ -6945,7 +6882,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -6953,11 +6890,12 @@
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
+msgstr[1] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
 
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -6965,6 +6903,7 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
+msgstr[1] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
 
 msgid "Away message too long."
 msgstr "离开消息太长。"
@@ -7904,6 +7843,11 @@
 msgid "Enter the text from the image"
 msgstr "请输入组名称"
 
+#. uid is not exist
+#, fuzzy
+msgid "Invalid username."
+msgstr "名称无效"
+
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
 msgstr ""
@@ -9489,7 +9433,6 @@
 msgid "Received invalid data"
 msgstr "在与服务器的连接中收到了无效的数据。"
 
-#. Password incorrect
 #, fuzzy
 msgid "Incorrect Password"
 msgstr "密码不对"
@@ -9501,11 +9444,6 @@
 "Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#. the username does not exist
-#, fuzzy
-msgid "Username does not exist"
-msgstr "用户不存在"
-
 #. indicates a lock of some description
 #, fuzzy
 msgid ""
@@ -10124,35 +10062,41 @@
 msgid "Unknown."
 msgstr "未知。"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
-
-#, c-format
+msgstr[1] "%d 秒"
+
+#, fuzzy, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
-
-#, c-format
+msgstr[1] "%d 天"
+
+#, fuzzy, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小时"
-
-#, c-format
+msgstr[1] "%s %d 小时"
+
+#, fuzzy, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
-
-#, c-format
+msgstr[1] "%d 小时"
+
+#, fuzzy, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
-
-#, c-format
+msgstr[1] "%s %d 分"
+
+#, fuzzy, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
+msgstr[1] "%d 分"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -10273,7 +10217,7 @@
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "此账户使用此好友图标(_I):"
+msgstr "用作当前账户头像(_I):"
 
 msgid "_Advanced"
 msgstr "高级(_A)"
@@ -10370,11 +10314,12 @@
 "如果您想要回到此窗口以便添加、编辑或删除帐户,可以从好友列表中窗口中选择<b>帐"
 "户->添加/编辑</b>"
 
-#, c-format
+#, fuzzy, c-format
 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] "您已经有名为 %2$s 的 %1$d 位联系人。您是否想要合并?"
+msgstr[1] "您已经有名为 %2$s 的 %1$d 位联系人。您是否想要合并?"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10384,11 +10329,9 @@
 "合并联系人将会使得这些联系人在好友列表中只显示单一的一项,并且使用单一的对话"
 "窗口。如果您想再解散合并后的联系人,可以从联系人的快捷菜单中选择“展开”"
 
-#, fuzzy
 msgid "Please update the necessary fields."
 msgstr "请更新必要的字段。"
 
-#, fuzzy
 msgid "A_ccount"
 msgstr "账户(_C):"
 
@@ -10687,10 +10630,11 @@
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "来自 %2$s 的 %1$d 条未读消息\n"
+msgstr[1] "来自 %2$s 的 %1$d 条未读消息\n"
 
 msgid "Manually"
 msgstr "手动"
@@ -10949,6 +10893,10 @@
 msgid "The text information for a buddy's status"
 msgstr "更改 %s 的用户信息"
 
+#, fuzzy
+msgid "Type the host name for this certificate."
+msgstr "输入此证书所适用的主机名。"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL 服务器"
@@ -11206,10 +11154,11 @@
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
+msgstr[1] "聊天室里有 %d 个人"
 
 msgid "Typing"
 msgstr "正打字"
@@ -11691,7 +11640,7 @@
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
@@ -11701,6 +11650,9 @@
 msgstr[0] ""
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
+msgstr[1] ""
+"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
+"吗?"
 
 msgid "Remove Contact"
 msgstr "删除联系人"
@@ -11884,7 +11836,7 @@
 msgstr "超级链接颜色"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "绘制超级链接悬停时的颜色。"
 
 msgid "Hyperlink prelight color"
@@ -11922,15 +11874,22 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "通知删除"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "新邮件通知"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -12275,15 +12234,17 @@
 msgid "%s wishes to start a video session with you."
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
-
-#, c-format
+msgstr[1] "%s 有 %d 封新邮件。"
+
+#, fuzzy, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d 封新邮件。</b>"
+msgstr[1] "<b>%d 封新邮件。</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12300,6 +12261,10 @@
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
+#, fuzzy
+msgid "No message"
+msgstr "未知信息"
+
 msgid "Open All Messages"
 msgstr "打开全部消息"
 
@@ -12317,10 +12282,6 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "未知信息"
-
 msgid "The following plugins will be unloaded."
 msgstr "下列插件将会被卸载。"
 
@@ -12642,7 +12603,8 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "自动检测 IP 地址(_A)"
 
 msgid "Public _IP:"
@@ -12822,31 +12784,26 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "静音"
+msgstr "静音(_U)"
 
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "启用声音:"
-
-#, fuzzy
+msgstr "开启声音(_E):"
+
 msgid "V_olume:"
-msgstr "音量:"
+msgstr "音量(_O):"
 
 msgid "Play"
 msgstr "播放"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "浏览(_E)..."
-
-#, fuzzy
+msgstr "浏览(_B)..."
+
 msgid "_Reset"
-msgstr "重置"
+msgstr "重置(_R)"
 
 msgid "_Report idle time:"
 msgstr "报告发呆时间(_R):"
@@ -12920,9 +12877,8 @@
 msgstr "设置隐私的账户:"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "删除"
+msgstr "全部删除(_L)"
 
 msgid "Permit User"
 msgstr "允许用户"
@@ -13018,46 +12974,26 @@
 msgid "Status for %s"
 msgstr "%s 的状态"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "插入表情"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
+msgid "Custom Smiley"
+msgstr "自定义表情"
+
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "重复更正"
 
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "请输入 %s 的新名称"
-
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "插入表情"
-
-#, fuzzy
+msgstr "修改表情"
+
 msgid "Add Smiley"
-msgstr "表情"
-
-#, fuzzy
+msgstr "添加表情"
+
 msgid "_Image:"
-msgstr "图像(_I)"
+msgstr "图像(_I):"
 
 #. Shortcut text
 #, fuzzy
@@ -13079,22 +13015,18 @@
 msgid "Select Buddy Icon"
 msgstr "选择好友"
 
-#, fuzzy
 msgid "Click to change your buddyicon for this account."
-msgstr "此账户使用此好友图标(_I):"
-
-#, fuzzy
+msgstr "点此修改当前账户所用图标。"
+
 msgid "Click to change your buddyicon for all accounts."
-msgstr "此账户使用此好友图标(_I):"
+msgstr "点此修改所有账户所用图标。"
 
 msgid "Waiting for network connection"
 msgstr "正在等待网络连接"
 
-#, fuzzy
 msgid "New status..."
-msgstr "新消息..."
-
-#, fuzzy
+msgstr "新状态..."
+
 msgid "Saved statuses..."
 msgstr "已存状态"
 
@@ -13132,7 +13064,7 @@
 "您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
 
 msgid "Set as buddy icon"
-msgstr "设置为好友头像"
+msgstr "设置为用户头像"
 
 msgid "Send image file"
 msgstr "发送图像文件"
@@ -13146,12 +13078,12 @@
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
-msgstr "您可以通过文件传送发送此图像,或者将其用作此用户的头像。"
+msgstr "您可以通过文件传送发送该图片,或者将其用作此用户的头像。"
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr "您可以通过文件传送发送此图像,或者将其用作此用户的头像。"
+msgstr "您可以在消息中插入该图片,或者将其用作此用户的头像。"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -13161,9 +13093,10 @@
 msgid "Cannot send launcher"
 msgstr "无法发送启动器"
 
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+#, fuzzy
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "您拖曳的是桌面启动器。在大多数情况下,您可能想要发送此启动器所指向的文件,而"
 "非启动器自身。"
@@ -13199,7 +13132,7 @@
 
 #, fuzzy
 msgid "_Open Link"
-msgstr "打开链接的方式(_O):"
+msgstr "打开链接(_O):"
 
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
@@ -13225,24 +13158,20 @@
 msgid "_Invite"
 msgstr "邀请(_I)"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "修改(_M)"
-
-#, fuzzy
+msgstr "修改(_M)..."
+
 msgid "_Add..."
-msgstr "添加(_A)"
+msgstr "添加(_A)..."
 
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "编辑"
-
-#, fuzzy
+msgstr "编辑(_E)"
+
 msgid "Pidgin Tooltip"
-msgstr "Pidgin"
+msgstr "Pidgin 工具提示"
 
 msgid "Pidgin smileys"
 msgstr "Pidgin 表情"
@@ -13256,9 +13185,8 @@
 msgid "none"
 msgstr "无"
 
-#, fuzzy
 msgid "Small"
-msgstr "电子邮件"
+msgstr "小"
 
 msgid "Smaller versions of the default smilies"
 msgstr ""
@@ -13528,7 +13456,6 @@
 msgstr "提供鼠标手势的支持"
 
 #. *  description
-#, fuzzy
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -13539,9 +13466,9 @@
 "允许在对话窗口中支持鼠标手势。\n"
 "拖曳鼠标中键可执行特定操作:\n"
 "\n"
-"向下再向右可关闭对话。\n"
-"向上再向左可切换到上个对话。\n"
-"向上再向右可切换到下个对话。"
+"·向下再向右可关闭对话。\n"
+"·向上再向左可切换到上个对话。\n"
+"·向上再向右可切换到下个对话。"
 
 msgid "Instant Messaging"
 msgstr "即时通讯"
@@ -13617,7 +13544,6 @@
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
@@ -13653,11 +13579,13 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "测试看看所有的 UI 信号是否都工作正确。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
-msgstr "好友备注"
+msgstr ""
+"\n"
+"<b>好友备注</b>: %s"
 
 msgid "History"
 msgstr "历史"
@@ -13687,20 +13615,17 @@
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
-#, fuzzy
 msgid "Markerline"
-msgstr "下划线"
-
-#, fuzzy
+msgstr "分割线"
+
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "对话时显示通知消息"
-
-#, fuzzy
+msgstr "在对话中以分割线突出显示新消息。"
+
 msgid "Jump to markerline"
-msgstr "下划线"
+msgstr "跳至分割线"
 
 msgid "Draw Markerline in "
-msgstr ""
+msgstr "分割线使用在"
 
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
@@ -13750,18 +13675,18 @@
 msgstr "合作作曲的音乐信使插件。"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr "音乐信使插件允许多个用户同时在同一份曲谱上工作。"
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
 msgstr "提醒"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "\t仅当别人在聊天中提到您的名字(_O)"
+msgstr "\t仅当别人提到您的名字时(_O)"
 
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
@@ -13785,18 +13710,16 @@
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "聊天窗口(_H)"
+msgstr "闪烁窗口(_F)"
 
 #. Raise window method button
 msgid "R_aise conversation window"
 msgstr "升起对话窗口(_A)"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "升起对话窗口(_A)"
+msgstr "当前对话窗口(_P)"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -13868,9 +13791,8 @@
 msgid "Hyperlink Color"
 msgstr "超级链接颜色"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "超级链接颜色"
+msgstr "访问过的超级链接颜色"
 
 #, fuzzy
 msgid "Highlighted Message Name Color"
@@ -13963,13 +13885,11 @@
 msgid "New Version Available"
 msgstr "新版本可用"
 
-#, fuzzy
 msgid "Later"
-msgstr "日期"
-
-#, fuzzy
+msgstr "稍后"
+
 msgid "Download Now"
-msgstr "%s 上的用户数: %s"
+msgstr "立即下载"
 
 #. *< type
 #. *< ui_requirement
@@ -14000,21 +13920,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "发送到"
+msgstr "发送按钮"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "对话窗口隐藏"
+msgstr "对话窗口的发送按钮"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
-msgstr ""
+"for use when no physical keyboard is present."
+msgstr "在对话窗口的输入栏添加一个发送按钮,适用于非键盘输入。"
 
 msgid "Duplicate Correction"
 msgstr "重复更正"
@@ -14336,8 +14255,9 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Pidgin for Windows 特定的选项。"
 
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+#, fuzzy
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Pidgin for Windows 特定的选项,比如好友列表停靠。"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14380,6 +14300,9 @@
 #~ msgid "Activate which ID?"
 #~ msgstr "激活哪个 ID?"
 
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "请给这个表情选择一个图片"
+
 #~ msgid "Cursor Color"
 #~ msgstr "光标颜色"