changeset 28162:f3f057b06840

Updated Simplified Chinese translation and email update. Closes #10165. In committing this, I fixed these "fatal errors": ./zh_CN.po:2941: `msgid' and `msgstr' entries do not both end with '\n' ./zh_CN.po:4526: `msgid' and `msgstr' entries do not both end with '\n' ./zh_CN.po:8848: `msgid' and `msgstr' entries do not both end with '\n' ./zh_CN.po:9303: `msgid' and `msgstr' entries do not both end with '\n' ./zh_CN.po:9545: `msgid' and `msgstr' entries do not both end with '\n' ./zh_CN.po:10358: `msgid' and `msgstr[0]' entries do not both end with '\n' ./zh_CN.po:12888: `msgid' and `msgstr' entries do not both begin with '\n' msgfmt: found 7 fatal error
author Paul Aurich <paul@darkrain42.org>
date Tue, 01 Sep 2009 02:54:01 +0000
parents 8aa7df246e13
children a5fcfbc6f3f9
files pidgin/gtkdialogs.c po/ChangeLog po/zh_CN.po
diffstat 3 files changed, 1964 insertions(+), 2113 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/gtkdialogs.c	Mon Aug 31 20:27:04 2009 +0000
+++ b/pidgin/gtkdialogs.c	Tue Sep 01 02:54:01 2009 +0000
@@ -230,7 +230,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", "Aron Xu", "aronmalache@163.com"},
+	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "happyaron.xu@gmail.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"},
--- a/po/ChangeLog	Mon Aug 31 20:27:04 2009 +0000
+++ b/po/ChangeLog	Tue Sep 01 02:54:01 2009 +0000
@@ -2,6 +2,7 @@
 
 version 2.6.2
 	* Basque translation updated (Mikel Pascual Aldabaldetreku)
+	* Chinese (Simplified) translation updated (Aron Xu)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (Éric Boumaour)
 	* German translation updated (Jochen Kemnade)
--- a/po/zh_CN.po	Mon Aug 31 20:27:04 2009 +0000
+++ b/po/zh_CN.po	Tue Sep 01 02:54:01 2009 +0000
@@ -4,18 +4,20 @@
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
 # liyuekui <liyuekui@gmail.com>, 2009.
 # Aron Xu <aronmalache@163.com>, 2009.
+# fujianwzh <fujianwzh@gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-04-23 00:32+0800\n"
+"POT-Creation-Date: 2009-08-31 19:52-0700\n"
+"PO-Revision-Date: 2009-08-23 22:12+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.
@@ -24,7 +26,7 @@
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s。试试“%s -h”查看帮助。\n"
+msgstr "%s。试试“%s -h”以获取更多信息。\n"
 
 #, c-format
 msgid ""
@@ -40,10 +42,10 @@
 "%s\n"
 "用法: %s [选项]...\n"
 "\n"
-"  -c, --config=目录   使用“目录”存储配置文件\n"
+"  -c, --config=目录   使用指定目录存储配置文件\n"
 "  -d, --debug         将调试信息打印到标准输出\n"
 "  -h, --help          显示帮助并退出\n"
-"  -n, --nologin       不自动登入\n"
+"  -n, --nologin       不自动登录\n"
 "  -v, --version       显示当前版本并退出\n"
 
 #, c-format
@@ -74,7 +76,7 @@
 msgstr "未安装协议插件。"
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(您可能忘记运行“make install”。)"
+msgstr "(您可能忘记运行“make install”了。)"
 
 msgid "Modify Account"
 msgstr "修改账户"
@@ -86,7 +88,7 @@
 msgstr "协议:"
 
 msgid "Username:"
-msgstr "用户名:"
+msgstr "用户名:"
 
 msgid "Password:"
 msgstr "密码:"
@@ -96,7 +98,7 @@
 
 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "在服务器上创建此新帐户"
+msgstr "在服务器上创建新帐户"
 
 #. Cancel button
 #. Cancel
@@ -138,14 +140,14 @@
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s"
 
 msgid "Add buddy to your list?"
-msgstr "将用户加为好友吗?"
+msgstr "将该用户加为好友吗?"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s 想要将 %s 添加为好友%s%s"
 
 msgid "Authorize buddy?"
-msgstr "同意吗?"
+msgstr "同意吗?"
 
 msgid "Authorize"
 msgstr "同意"
@@ -158,12 +160,12 @@
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-"在线: %d\n"
-"总计: %d"
+"在线:%d\n"
+"总计:%d"
 
 #, c-format
 msgid "Account: %s (%s)"
-msgstr "账户:%s(%s)"
+msgstr "账户:%s (%s)"
 
 #, c-format
 msgid ""
@@ -171,7 +173,7 @@
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"上次看见:%s前"
+"上次看见:%s 前"
 
 msgid "Default"
 msgstr "默认"
@@ -195,7 +197,7 @@
 msgstr "用户名"
 
 msgid "Alias (optional)"
-msgstr "联系人别名(可选)"
+msgstr "别名(可选)"
 
 msgid "Add in group"
 msgstr "添加到组"
@@ -229,7 +231,7 @@
 msgstr "添加聊天"
 
 msgid "You can edit more information from the context menu later."
-msgstr "您可以稍候从快捷菜单中编辑更多信息。"
+msgstr "稍后您可以从快捷菜单中编辑更多信息。"
 
 msgid "Error adding group"
 msgstr "添加组出错"
@@ -262,7 +264,7 @@
 msgstr "正在获取..."
 
 msgid "Get Info"
-msgstr "信息"
+msgstr "获取信息"
 
 msgid "Add Buddy Pounce"
 msgstr "添加好友千里眼"
@@ -284,16 +286,16 @@
 msgstr "重命名"
 
 msgid "Set Alias"
-msgstr "设定别名"
+msgstr "设置别名"
 
 msgid "Enter empty string to reset the name."
 msgstr "输入空字符串可重置名称。"
 
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "删除此联系人也将删除该联系人中的全部好友"
+msgstr "删除此通讯录将同时删除该通讯录中的全部好友"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "删除此组也将删除该组中的全部好友"
+msgstr "删除此组将同时删除该组中的全部好友"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -317,7 +319,7 @@
 msgstr "切换标记"
 
 msgid "View Log"
-msgstr "查看日志"
+msgstr "查看聊天记录"
 
 #. General
 msgid "Nickname"
@@ -329,7 +331,7 @@
 msgstr "发呆"
 
 msgid "On Mobile"
-msgstr "移动"
+msgstr "正在使用手机"
 
 msgid "New..."
 msgstr "新建..."
@@ -352,7 +354,7 @@
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "清输入你想要屏蔽/解除屏蔽的用户名活别名。"
+msgstr "清输入您想要屏蔽/解除屏蔽的用户名或别名。"
 
 #. Not multiline
 #. Not masked?
@@ -361,10 +363,10 @@
 msgstr "确定"
 
 msgid "New Instant Message"
-msgstr "新即时消息"
+msgstr "新建聊天"
 
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
+msgstr "您想要跟谁聊?请输入他或她的用户名或别名。"
 
 msgid "Channel"
 msgstr "频道"
@@ -381,7 +383,7 @@
 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"
@@ -397,10 +399,10 @@
 msgstr "加入聊天..."
 
 msgid "View Log..."
-msgstr "查看日志..."
+msgstr "查看聊天记录..."
 
 msgid "View All Logs"
-msgstr "查看全部日志"
+msgstr "查看全部聊天记录"
 
 msgid "Show"
 msgstr "显示"
@@ -421,7 +423,7 @@
 msgstr "按字母序"
 
 msgid "By Log Size"
-msgstr "按日志大小"
+msgstr "按聊天记录大小"
 
 msgid "Buddy"
 msgstr "好友"
@@ -453,7 +455,7 @@
 msgstr "证书导入错误"
 
 msgid "X.509 certificate import failed"
-msgstr "X.509 证书导入失败"
+msgstr "导入 X.509 证书失败"
 
 msgid "Select a PEM certificate"
 msgstr "选择 PEM 证书"
@@ -470,10 +472,10 @@
 msgstr "证书导出出错"
 
 msgid "X.509 certificate export failed"
-msgstr "X.509 证书导出失败"
+msgstr "导出 X.509 证书失败"
 
 msgid "PEM X.509 Certificate Export"
-msgstr "PEM X.509 证书导出"
+msgstr "导出 PEM X.509 证书"
 
 #, c-format
 msgid "Certificate for %s"
@@ -486,6 +488,10 @@
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"通用名:%s\n"
+"\n"
+"SHA1 指纹:\n"
+"%s"
 
 msgid "SSL Host Certificate"
 msgstr "SSL 主机证书"
@@ -513,7 +519,7 @@
 
 #, c-format
 msgid "%s (%s)"
-msgstr "%s(%s)"
+msgstr "%s (%s)"
 
 #, c-format
 msgid "%s disconnected."
@@ -528,7 +534,7 @@
 msgstr ""
 "%s\n"
 "\n"
-"Finch 将不会尝试重新连接账户,除非您纠正了错误然后重新启用账户。"
+"Finch 不会尝试重新连接账户,除非您纠正了错误然后重新启用账户。"
 
 msgid "Re-enable Account"
 msgstr "重新启用账户"
@@ -536,13 +542,13 @@
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
-msgstr ""
+msgstr "帐号已禁用,您已退出此会话。当帐号重新连接时您将自动重新加入此会话。"
 
 msgid "No such command."
-msgstr "没有这样的命令。"
+msgstr "无此命令。"
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "系统错误: 您给命令传送的参数个数不对。"
+msgstr "系统错误:您给命令传送的参数个数不对。"
 
 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败,原因未知。"
@@ -557,7 +563,7 @@
 msgstr "命令无法在此协议下工作。"
 
 msgid "Message was not sent, because you are not signed on."
-msgstr "消息未发出,因为您尚未登入。"
+msgstr "消息未发出,因为您尚未登录。"
 
 #, c-format
 msgid "%s (%s -- %s)"
@@ -579,7 +585,7 @@
 msgstr "您已经离开了此聊天。"
 
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "日志已启动。此会话中的后续消息将会被自动记录。"
+msgstr "聊天记录已启动。此会话中的后续消息将会被自动记录。"
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
@@ -604,7 +610,7 @@
 msgstr "邀请"
 
 msgid "Enable Logging"
-msgstr "允许记录"
+msgstr "启用聊天记录"
 
 msgid "Enable Sounds"
 msgstr "启用声音"
@@ -612,74 +618,73 @@
 msgid "<AUTO-REPLY> "
 msgstr "<自动回复> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "%d 个用户的列表:\n"
-msgstr[1] "%d 个用户的列表:\n"
+msgstr[0] "%d 个用户的列表:\n"
 
 msgid "Supported debug options are:  version"
-msgstr "支持的调试选项有: version"
+msgstr "支持的调试选项有:version"
 
 msgid "No such command (in this context)."
-msgstr "没有这样的命令(在此环境中)。"
+msgstr "在此环境中无此命令。"
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
-"此环境下可使用下列命令:\n"
+"此环境下可使用下列命令:\n"
 
 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
-msgstr "%s 不是有效的信息类型。查看'/help msgcolor' 已查找有效的信息"
+msgstr "%s 不是有效的信息类型。请查看“/help msgcolor”以查找有效的信息"
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
-msgstr ""
+msgstr "%s 不是有效的颜色。请查看\"/help msgcolor\"以查找有效的颜色。"
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
-msgstr "say &lt;消息&gt;: 发送普通消息,就好像您未使用命令。"
+msgstr "say &lt;消息&gt;:发送普通消息,就好像您未使用命令。"
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
+msgstr "me &lt;动作&gt;:向好友或聊天发送 IRC 风格的动作。"
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
+msgstr "debug &lt;选项&gt;:在当前对话中发送各种调试信息。"
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "clear: 清除对话回滚。"
+msgstr "clear:清除对话回滚。"
 
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
+msgstr "help &lt;命令&gt;:关于具体命令的帮助。"
 
 msgid "users:  Show the list of users in the chat."
-msgstr "users: 在聊天中显示用户列表。"
+msgstr "users:在聊天中显示用户列表。"
 
 msgid "plugins: Show the plugins window."
-msgstr "plugins: 显示插件窗口。"
+msgstr "plugins:显示插件窗口。"
 
 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: 显示好友列表。"
+msgstr "buddylist:显示好友列表。"
 
 msgid "accounts: Show the accounts window."
 msgstr "accounts:显示账户窗口。"
 
 msgid "debugwin: Show the debug window."
-msgstr ""
+msgstr "debug窗口:显示调试窗口。"
 
 msgid "prefs: Show the preference window."
-msgstr ""
+msgstr "prefs:显示首选项窗口。"
 
 msgid "statuses: Show the savedstatuses window."
-msgstr ""
+msgstr "statuses:显示已存状态窗口。"
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -688,6 +693,13 @@
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
+"msgcolor &lt;类型&gt; &lt;前景&gt; &lt;背景&gt;:设置会话窗口中不同类型消息的"
+"颜色。<br>   \n"
+"&lt;类型&gt;:receive(接受),send(发送),highlight(高亮),action(动作),"
+"timestamp(时间戳)<br>   \n"
+"&lt;前景/背景&gt;:black(黑),red(红),green(绿),blue(蓝),white(白),gray"
+"(灰),darkgray(暗灰),magenta(瑰),cyan(青),default(默认)<br><br>\n"
+"例如:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
 msgstr "无法打开文件。"
@@ -703,16 +715,15 @@
 msgstr "清除"
 
 msgid "Filter:"
-msgstr "过滤:"
+msgstr "过滤器:"
 
 msgid "Pause"
 msgstr "暂停"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "文件传送 - 已完成 %d%%,共 %d 个文件"
-msgstr[1] "文件传送 - 已完成 %d%%,共 %d 个文件"
+msgstr[0] "文件传送 - %2$d 个文件中的 %1$d%%"
 
 #. Create the window.
 msgid "File Transfers"
@@ -741,29 +752,29 @@
 msgstr "全部传送完成时关闭此窗口"
 
 msgid "Clear finished transfers"
-msgstr "清除未完成的传送"
+msgstr "清除已完成的传送"
 
 msgid "Stop"
 msgstr "停止"
 
 msgid "Waiting for transfer to begin"
-msgstr "正在传送开始"
+msgstr "正在等待传送开始"
 
 msgid "Canceled"
 msgstr "已取消"
 
 msgid "Failed"
-msgstr "已失败"
+msgstr "失败"
 
 #, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KB/秒"
+msgstr "%.2f KiB/秒"
 
 msgid "Sent"
 msgstr "已发送"
 
 msgid "Received"
-msgstr "已收到"
+msgstr "已接收"
 
 msgid "Finished"
 msgstr "已完成"
@@ -805,10 +816,10 @@
 msgstr "仅当启用了“记录所有聊天”首选项时才会记录聊天。"
 
 msgid "No logs were found"
-msgstr "未找到日志。"
+msgstr "未找到聊天记录。"
 
 msgid "Total log size:"
-msgstr "总计日志大小:"
+msgstr "总计聊天记录大小:"
 
 #. Search box *********
 msgid "Scroll/Search: "
@@ -816,7 +827,7 @@
 
 #, c-format
 msgid "Conversations in %s"
-msgstr "与 %s 的对话"
+msgstr "在 %s 中的会话"
 
 #, c-format
 msgid "Conversations with %s"
@@ -828,11 +839,11 @@
 msgid "System Log"
 msgstr "系统日志"
 
-msgid "Calling ... "
+msgid "Calling..."
 msgstr "正在呼叫..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "挂断"
 
 #. Number of actions
 msgid "Accept"
@@ -842,42 +853,41 @@
 msgstr "拒绝"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "正在呼叫。"
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "呼叫被终止。"
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s 希望与您进行语音聊天。"
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "%s 正尝试与您建立不支持的媒体类型的会话。"
 
 msgid "You have rejected the call."
-msgstr "您已经拒绝呼叫"
+msgstr "您已经拒绝呼叫。"
 
 msgid "call: Make an audio call."
-msgstr "呼叫:音频呼叫。"
+msgstr "呼叫:语音聊天。"
 
 msgid "Emails"
 msgstr "电子邮件"
 
 msgid "You have mail!"
-msgstr "您有邮件了!"
+msgstr "来邮件了!"
 
 msgid "Sender"
-msgstr "发送方"
+msgstr "发送者"
 
 msgid "Subject"
 msgstr "主题"
 
-#, fuzzy, c-format
+#, 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 封新邮件。"
+msgstr[0] "%s (%s) 有 %d 个新消息。"
 
 msgid "New Mail"
 msgstr "新邮件"
@@ -893,7 +903,7 @@
 msgstr "继续"
 
 msgid "IM"
-msgstr "开聊"
+msgstr "聊天"
 
 msgid "Invite"
 msgstr "邀请"
@@ -911,7 +921,7 @@
 msgstr "载入插件失败"
 
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "卸载插件失败"
 
 #, c-format
 msgid ""
@@ -922,28 +932,28 @@
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
-"名称: %s\n"
-"版本: %s\n"
-"描述: %s\n"
-"作者: %s\n"
-"网站: %s\n"
-"文件名: %s\n"
+"名称:%s\n"
+"版本:%s\n"
+"描述:%s\n"
+"作者:%s\n"
+"网站:%s\n"
+"文件名:%s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "在您配置插件之前必须先装入它。"
+msgstr "在您配置插件之前必须先载入它。"
 
 msgid "No configuration options for this plugin."
 msgstr "此插件无配置选项。"
 
 msgid "Error loading plugin"
-msgstr "装入插件时出错"
+msgstr "载入插件时出错"
 
 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "选中的文件不是可用的插件。"
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
-msgstr ""
+msgstr "请打开调试窗口并再试一次以查看错误信息。"
 
 msgid "Select plugin to install"
 msgstr "选择插件以安装"
@@ -966,7 +976,7 @@
 msgstr "首选项"
 
 msgid "Please enter a buddy to pounce."
-msgstr "请输入要监视的好友。"
+msgstr "请输入要添加千里眼的好友。"
 
 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
@@ -975,7 +985,7 @@
 msgstr "编辑好友千里眼"
 
 msgid "Pounce Who"
-msgstr "监视对象"
+msgstr "千里眼查看对象"
 
 #. Account:
 msgid "Account:"
@@ -986,13 +996,13 @@
 
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "监视好友的行动..."
+msgstr "当好友有何动作时提示..."
 
 msgid "Signs on"
-msgstr "登入"
+msgstr "登录"
 
 msgid "Signs off"
-msgstr "登出"
+msgstr "退出"
 
 msgid "Goes away"
 msgstr "离开"
@@ -1010,7 +1020,7 @@
 msgstr "开始打字"
 
 msgid "Pauses while typing"
-msgstr "输入时暂停"
+msgstr "暂停打字"
 
 msgid "Stops typing"
 msgstr "停止打字"
@@ -1023,7 +1033,7 @@
 msgstr "动作"
 
 msgid "Open an IM window"
-msgstr "打开即时消息窗口"
+msgstr "打开聊天窗口"
 
 msgid "Pop up a notification"
 msgstr "弹出通知"
@@ -1038,69 +1048,69 @@
 msgstr "播放声音"
 
 msgid "Pounce only when my status is not Available"
-msgstr "仅当我的状态不可用时才监视"
+msgstr "仅当我的状态不可用时才提示"
 
 msgid "Recurring"
-msgstr "再现"
+msgstr "返回"
 
 msgid "Cannot create pounce"
-msgstr "无法创建监视"
+msgstr "无法创建千里眼"
 
 msgid "You do not have any accounts."
 msgstr "您没有帐户。"
 
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "在创建好友千里眼前您必须创建一个帐户。"
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "您真的想要删除 %s 在 %s 上的千里眼吗?"
+msgstr "您真的想要删除 %s 在 %s 上的好友千里眼吗?"
 
 msgid "Buddy Pounces"
 msgstr "好友千里眼"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s 开始向您打字(%s)"
+msgstr "%s 开始给您打字 (%s)"
 
 #, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s 在给您打字时停了下来(%s)"
+msgstr "%s 在给您打字时停了下来 (%s)"
 
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%s 已登入(%s)"
+msgstr "%s 已登录 (%s)"
 
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s 发完呆了(%s)"
+msgstr "%s 发完呆了 (%s)"
 
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%s 回来了(%s)"
+msgstr "%s 回来了 (%s)"
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s 停止了给您打字(%s)"
+msgstr "%s 停止了给您打字 (%s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr "%s 已登出(%s)"
+msgstr "%s 已退出 (%s)"
 
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s 发起了呆(%s)"
+msgstr "%s 发起了呆 (%s)"
 
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s 走了。(%s)"
+msgstr "%s 离开了。(%s)"
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 给您发送了消息。(%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "未知的千里眼。请报告此错误!"
+msgstr "未知的好友千里眼动作。请报告此错误!"
 
 msgid "Based on keyboard use"
 msgstr "基于键盘使用"
@@ -1118,10 +1128,10 @@
 msgstr "显示离线好友"
 
 msgid "Notify buddies when you are typing"
-msgstr "提醒好友您正在打字给他们"
+msgstr "提醒好友您正在打字"
 
 msgid "Log format"
-msgstr "日志格式"
+msgstr "聊天记录格式"
 
 msgid "Log IMs"
 msgstr "记录对话"
@@ -1145,19 +1155,19 @@
 msgstr "将状态更改为"
 
 msgid "Conversations"
-msgstr "对话"
+msgstr "会话"
 
 msgid "Logging"
-msgstr "日志"
+msgstr "聊天记录"
 
 msgid "You must fill all the required fields."
-msgstr "您必须填入注册字段。"
+msgstr "请填写所有必须填写的区域。"
 
 msgid "The required fields are underlined."
-msgstr "所需区域已用下划线标出。"
+msgstr "必须填写的区域已用下划线标出。"
 
 msgid "Not implemented yet."
-msgstr "未实现。"
+msgstr "此功能尚未实现。"
 
 msgid "Save File..."
 msgstr "保存文件..."
@@ -1169,29 +1179,29 @@
 msgstr "选择位置..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr "按'Enter'以寻找更多此分类下的聊天室。"
+msgstr "按回车键以寻找更多该类别的聊天室。"
 
 msgid "Get"
 msgstr "获取"
 
 #. Create the window.
 msgid "Room List"
-msgstr "房间列表"
+msgstr "聊天室列表"
 
 msgid "Buddy logs in"
-msgstr "好友登入"
+msgstr "好友登录"
 
 msgid "Buddy logs out"
-msgstr "好友登出"
+msgstr "好友退出"
 
 msgid "Message received"
-msgstr "消息已收到"
+msgstr "收到消息"
 
 msgid "Message received begins conversation"
-msgstr "收到的消息开始对话"
+msgstr "收到消息时开始对话"
 
 msgid "Message sent"
-msgstr "消息已送出"
+msgstr "发送消息"
 
 msgid "Person enters chat"
 msgstr "有人进入聊天"
@@ -1209,7 +1219,7 @@
 msgstr "有人在聊天中提到您的名字"
 
 msgid "GStreamer Failure"
-msgstr "GStreamer 失败"
+msgstr "GStreamer 错误"
 
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失败。"
@@ -1230,13 +1240,13 @@
 msgstr "自动"
 
 msgid "Console Beep"
-msgstr "控制台响铃"
+msgstr "终端响铃"
 
 msgid "Command"
 msgstr "命令"
 
 msgid "No Sound"
-msgstr "无声音"
+msgstr "无声"
 
 msgid "Sound Method"
 msgstr "声音方式"
@@ -1249,7 +1259,7 @@
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"声音命令(_O):\n"
+"声音命令:\n"
 "(%s 代表文件名)"
 
 #. Sound options
@@ -1325,13 +1335,13 @@
 msgstr "无效的标题"
 
 msgid "Please enter a non-empty title for the status."
-msgstr "请为状态输入非空标题。"
+msgstr "请为状态输入非空的标题。"
 
 msgid "Duplicate title"
 msgstr "重复标题"
 
 msgid "Please enter a different title for the status."
-msgstr "为下列状态使用不同的标题。"
+msgstr "请为状态输入不同的标题。"
 
 msgid "Substatus"
 msgstr "子状态"
@@ -1362,7 +1372,7 @@
 msgstr "状态"
 
 msgid "Error loading the plugin."
-msgstr "装入插件时出错。"
+msgstr "载入插件时出错。"
 
 msgid "Couldn't find X display"
 msgstr "找不到 X 显示"
@@ -1371,7 +1381,7 @@
 msgstr "找不到窗口"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "无法载入此插件,因为它没有加入 X11 支持。"
 
 msgid "GntClipboard"
 msgstr ""
@@ -1386,11 +1396,11 @@
 
 #, c-format
 msgid "%s just signed on"
-msgstr "%s 刚刚登入"
+msgstr "%s 刚刚登录"
 
 #, c-format
 msgid "%s just signed off"
-msgstr "%s 刚刚登出"
+msgstr "%s 刚刚退出"
 
 #, c-format
 msgid "%s sent you a message"
@@ -1405,38 +1415,38 @@
 msgstr "%s 在 %s 中发送了消息"
 
 msgid "Buddy signs on/off"
-msgstr "好友登入/登出"
+msgstr "好友登录/退出"
 
 msgid "You receive an IM"
-msgstr "您接受了 IM"
+msgstr "您接到了一条消息"
 
 msgid "Someone speaks in a chat"
-msgstr "有人在聊天中别人在聊天中提到您的名字"
+msgstr "有人在聊天中发言"
 
 msgid "Someone says your name in a chat"
-msgstr "别人在聊天中提到您的名字"
+msgstr "有人在聊天中提到了您的名字"
 
 msgid "Notify with a toaster when"
 msgstr ""
 
 msgid "Beep too!"
-msgstr ""
+msgstr "同时发出声音!"
 
 msgid "Set URGENT for the terminal window."
 msgstr ""
 
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
 msgid "Toaster plugin"
 msgstr ""
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>与 %s 在 %s 的谈话</b><br>"
+msgstr "<b>与 %s 在 %s 的会话</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr "历史插件请求登录"
+msgstr "历史插件需要聊天记录"
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1444,18 +1454,46 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
+"聊天记录可以从 工具->首选项->聊天记录 中开启\n"
+"\n"
+"启用聊天记录会同时启用针对该类型的历史记录功能。"
 
 msgid "GntHistory"
 msgstr "GntHistory"
 
 msgid "Shows recently logged conversations in new conversations."
-msgstr "在新对话中显示显示最近记录的对话。"
+msgstr "在新对话中显示显示最近记录的聊天记录。"
 
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr "打开新对话时,此插件将会将上次对话插入当前对话。"
 
+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"正在获取 TinyURL..."
+
+#, fuzzy
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "只为等于或超过此长度的 URL 创建 TinyURL"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (或其他)地址前缀"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL 插件"
+
+#, fuzzy
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr "当接收到带有 URL 的消息时将其转换到 TinyURL 以方便复制"
+
 msgid "Online"
 msgstr "在线"
 
@@ -1478,54 +1516,32 @@
 msgstr "未分组"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "嵌套子组"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "嵌套组(试验性)"
 
 msgid "Provides alternate buddylist grouping options."
 msgstr "提供其他分组选项。"
 
 msgid "Lastlog"
-msgstr "最近日志"
+msgstr "最近聊天记录"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#, fuzzy
 msgid "GntLastlog"
-msgstr "历史"
+msgstr "GntLastlog"
 
 msgid "Lastlog plugin."
 msgstr "Lastlog 插件。"
 
-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
-
-msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "TinyURL 插件"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
-
 msgid "accounts"
 msgstr "账户"
 
 msgid "Password is required to sign on."
-msgstr "需要密码才能登入。"
+msgstr "需要密码才能登录。"
 
 #, c-format
 msgid "Enter password for %s (%s)"
@@ -1582,8 +1598,43 @@
 msgid "buddy list"
 msgstr "好友列表"
 
+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#, fuzzy
+msgid "The certificate is not valid yet."
+msgstr "选中的文件不是可用的插件。"
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr ""
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr ""
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr "您没有根证书数据库,所以无法验证此证书。"
+
+#, fuzzy
+msgid "The certificate chain presented is invalid."
+msgstr "指定的用户名无效。"
+
+#, fuzzy
+msgid "The certificate has been revoked."
+msgstr "呼叫被终止。"
+
+#, fuzzy
+msgid "An unknown certificate error occurred."
+msgstr "发生了未知登录错误: %s。"
+
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(不匹配)"
 
 #. Make messages
 #, c-format
@@ -1598,7 +1649,7 @@
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "单用途证书验证"
 
 #. Scheme name
 #. Pool name
@@ -1622,59 +1673,22 @@
 msgid "_View Certificate..."
 msgstr "查看证书(_V)..."
 
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr ""
-
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr ""
+
 #. TODO: Probably wrong.
-#. TODO: Probably wrong
 msgid "SSL Certificate Error"
 msgstr "SSL 证书错误"
 
 #, fuzzy
-msgid "Invalid certificate chain"
-msgstr "无效的标题"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-
-msgid "Invalid certificate authority signature"
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
+msgid "Unable to validate certificate"
+msgstr "无法通过身份验证: %s"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
 msgstr ""
 
 #. Make messages
@@ -1700,14 +1714,13 @@
 
 #, c-format
 msgid "+++ %s signed on"
-msgstr "+++ %s 已登入"
+msgstr "+++ %s 已登录"
 
 #, c-format
 msgid "+++ %s signed off"
-msgstr "+++ %s 已登出"
+msgstr "+++ %s 已退出"
 
 #. Unknown error
-#. Unknown error!
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -1740,11 +1753,11 @@
 
 #, c-format
 msgid "You are now known as %s"
-msgstr "您现在叫做 %s"
+msgstr "您已改名为 %s"
 
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s 现在叫做 %s。"
+msgstr "%s 已改名为 %s。"
 
 #, c-format
 msgid "%s left the room."
@@ -1755,7 +1768,7 @@
 msgstr "%s 离开了聊天室(%s)。"
 
 msgid "Invite to chat"
-msgstr "邀请会议"
+msgstr "邀请聊天"
 
 #. Put our happy label in it.
 msgid ""
@@ -1765,7 +1778,7 @@
 
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "获得连接失败: %s"
+msgstr "建立连接失败: %s"
 
 #, c-format
 msgid "Failed to get name: %s"
@@ -1809,7 +1822,7 @@
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "解析器进程在应答请求前退出"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1846,7 +1859,7 @@
 msgstr "目录不可写。"
 
 msgid "Cannot send a file of 0 bytes."
-msgstr "无法发送 0 字节的文件。"
+msgstr "无法发送 0 字节文件。"
 
 msgid "Cannot send a directory."
 msgstr "无法发送目录。"
@@ -1894,25 +1907,29 @@
 msgstr "开始来自 %2$s 的 %1$s 传送"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "文件 %s 传送完成"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"
 
 msgid "File transfer complete"
 msgstr "文件传送完成"
 
-#, c-format
-msgid "You canceled the transfer of %s"
+#, fuzzy, c-format
+msgid "You cancelled the transfer of %s"
 msgstr "您取消了 %s 的传送"
 
 msgid "File transfer cancelled"
-msgstr "文件传送已取消"
-
-#, c-format
-msgid "%s canceled the transfer of %s"
+msgstr "已取消文件传送"
+
+#, fuzzy, c-format
+msgid "%s cancelled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"
 
-#, c-format
-msgid "%s canceled the file transfer"
+#, fuzzy, c-format
+msgid "%s cancelled the file transfer"
 msgstr "%s 取消了文件传送"
 
 #, c-format
@@ -1960,19 +1977,19 @@
 msgstr "“icq”URL 的处理程序"
 
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "“irc”URL 的处理程序"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "“msnim”URL 的处理程序"
 
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "“sip”URL 的处理程序"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "“xmpp”URL 的处理程序"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "“ymsgr”URL 的处理程序"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
@@ -2056,7 +2073,7 @@
 msgstr ""
 
 msgid "Logging of this conversation failed."
-msgstr "此对话的记录失败。"
+msgstr "记录此对话的失败。"
 
 msgid "XML"
 msgstr "XML"
@@ -2078,7 +2095,7 @@
 "</b></font> %s<br/>\n"
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>找不到日志路径!</b></font>"
+msgstr "<font color=\"red\"><b>找不到聊天记录路径!</b></font>"
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
@@ -2088,16 +2105,42 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
-#, fuzzy
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+
+#, fuzzy
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "发生了未知登录错误: %s。"
+
+#, fuzzy
+msgid "Conference error."
+msgstr "会议已关闭"
+
+msgid "Error with your microphone."
+msgstr ""
+
+msgid "Error with your webcam."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error creating session: %s"
+msgstr "创建连接出错"
+
 msgid "Error creating conference."
-msgstr "创建连接出错"
+msgstr "创建会议出错"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "您正在使用 %s,但插件需要 %s。"
 
 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "此插件没有定义 ID。"
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
@@ -2118,14 +2161,14 @@
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"
 
 msgid "Unable to load the plugin"
-msgstr "无法装入插件"
+msgstr "无法载入插件"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "所需插件 %s 无法装入。"
+msgstr "所需插件 %s 无法载入。"
 
 msgid "Unable to load your plugin."
-msgstr "无法装入您的插件。"
+msgstr "无法载入您的插件。"
 
 #, c-format
 msgid "%s requires %s, but it failed to unload."
@@ -2337,17 +2380,18 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "测试插件 IPC 支持,作为服务器。这将注册 IPC 命令。"
 
-msgid "Join/Part Hiding Configuration"
-msgstr "加入/离开隐藏配置"
-
-msgid "Minimum Room Size"
-msgstr ""
-
-msgid "User Inactivity Timeout (in minutes)"
+msgid "Hide Joins/Parts"
+msgstr ""
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr ""
+
+msgid "If user has not spoken in this many minutes"
 msgstr ""
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "对好友应用隐藏规则"
 
 #. *< type
 #. *< ui_requirement
@@ -2385,7 +2429,7 @@
 
 #, c-format
 msgid "%s has signed off."
-msgstr "%s 已登出。"
+msgstr "%s 已退出。"
 
 msgid "One or more messages may have been undeliverable."
 msgstr ""
@@ -2448,7 +2492,7 @@
 
 #. Add general preferences.
 msgid "General Log Reading Configuration"
-msgstr "常规日志读取配置"
+msgstr "常规聊天记录读取配置"
 
 msgid "Fast size calculations"
 msgstr "快速计算大小"
@@ -2458,7 +2502,7 @@
 
 #. Add Log Directory preferences.
 msgid "Log Directory"
-msgstr "日志目录"
+msgstr "聊天记录目录"
 
 #. *< type
 #. *< ui_requirement
@@ -2467,16 +2511,15 @@
 #. *< priority
 #. *< id
 msgid "Log Reader"
-msgstr "日志读取器"
+msgstr "聊天记录读取器"
 
 #. *< name
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "在日志查看器中包含其它即时通讯客户的日志。"
+msgstr "在聊天记录查看器中包含其它即时通讯客户的聊天记录。"
 
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2484,23 +2527,22 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"查看日志时,此插件将包含其它即时通讯客户端的日志。目前支持的即时通讯客户端包"
-"括 Adium、Fire、Messenger Plus!、MSN Messenger 和 Trillian。\n"
+"查看聊天记录时,此插件将包含其它即时通讯客户端的聊天记录。目前支持的即时通讯"
+"客户端包括 Adium、Fire、Messenger Plus!、MSN Messenger 和 Trillian。\n"
 "\n"
-"警告:此插件仍处于内测阶段,可能会经常崩溃。请小心使用!"
+"警告:此插件仍处于 alpha 测试阶段,可能会经常崩溃。请小心使用!"
 
 msgid "Mono Plugin Loader"
-msgstr "Mono 插件装入器"
+msgstr "Mono 插件载入器"
 
 msgid "Loads .NET plugins with Mono."
-msgstr "装入 Mono 编写的 .NET 插件。"
+msgstr "载入 Mono 编写的 .NET 插件。"
 
 msgid "Add new line in IMs"
 msgstr ""
 
-#, fuzzy
 msgid "Add new line in Chats"
-msgstr "在聊天中应用"
+msgstr "在聊天中加入新行"
 
 #. *< magic
 #. *< major version
@@ -2560,9 +2602,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "输入密码"
+msgstr "一次性密码"
 
 #. *< type
 #. *< ui_requirement
@@ -2571,7 +2612,7 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "一次性密码支持"
 
 #. *< name
 #. *< version
@@ -2593,13 +2634,13 @@
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "Perl 插件装入器"
+msgstr "Perl 插件载入器"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "提供装入 Perl 插件的支持。"
+msgstr "提供载入 Perl 插件的支持。"
 
 msgid "Psychic Mode"
 msgstr ""
@@ -2624,9 +2665,8 @@
 msgid "Display notification message in conversations"
 msgstr "对话时显示通知消息"
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "于隐藏对话"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -2642,7 +2682,7 @@
 #. *  summary
 #. *  description
 msgid "Test to see that all signals are working properly."
-msgstr "测试看看所有的信号是否都工作正确。"
+msgstr "测试看看所有的信号是否工作正常。"
 
 #. *< type
 #. *< ui_requirement
@@ -2662,7 +2702,7 @@
 
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 证书"
 
 #. *< type
 #. *< ui_requirement
@@ -2730,7 +2770,7 @@
 
 #, c-format
 msgid "%s has signed on."
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"
 
 msgid "Notify When"
 msgstr "通知情况"
@@ -2742,7 +2782,7 @@
 msgstr "好友发呆(_I)"
 
 msgid "Buddy _Signs On/Off"
-msgstr "好友登入/登出(_S)"
+msgstr "好友登录/退出(_S)"
 
 #. *< type
 #. *< ui_requirement
@@ -2763,10 +2803,10 @@
 msgstr "好友离开/返回或发呆/睡醒时在对话窗口给出通知。"
 
 msgid "Tcl Plugin Loader"
-msgstr "Tcl 插件装入器"
+msgstr "Tcl 插件载入器"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "提供装入 Tcl 插件的支持"
+msgstr "提供载入 Tcl 插件的支持"
 
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
@@ -2778,9 +2818,8 @@
 "im/BonjourWindows for more information."
 msgstr ""
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "无法监听连入的 IM 连接\n"
+msgstr "无法监听连入的 IM 连接"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2831,24 +2870,24 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "无法发送消息,无法开始对话。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
 msgstr ""
 "无法创建套接字:\n"
 "%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to bind socket to port: %s"
 msgstr "无法将套接字绑定到端口"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to listen on socket: %s"
 msgstr ""
 "无法创建套接字:\n"
 "%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "与本地 DNS 服务通讯出错"
+msgstr "与本地 mDNSResponder 服务通讯出错"
 
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
@@ -2878,31 +2917,28 @@
 msgstr "无法为 %s 写入 %s 好友列表"
 
 msgid "Couldn't load buddylist"
-msgstr "无法装入好友列表"
+msgstr "无法载入好友列表"
 
 msgid "Load Buddylist..."
-msgstr "装入好友列表..."
+msgstr "载入好友列表..."
 
 msgid "Buddylist loaded successfully!"
-msgstr "好友列表成功装入!"
+msgstr "好友列表成功载入!"
 
 msgid "Save buddylist..."
 msgstr "保存好友列表..."
 
 msgid "Load buddylist from file..."
-msgstr "从文件装入好友列表..."
-
-#, fuzzy
+msgstr "从文件载入好友列表..."
+
 msgid "You must fill in all registration fields"
 msgstr "填入注册字段。"
 
-#, fuzzy
 msgid "Passwords do not match"
 msgstr "密码不匹配。"
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "无法创建新账户。发生了错误。\n"
+msgstr "无法创建新账户。发生了错误。"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "注册了新的 Gadu-Gadu 账户"
@@ -2919,7 +2955,6 @@
 msgid "Enter captcha text"
 msgstr ""
 
-#, fuzzy
 msgid "Captcha"
 msgstr "保存图像"
 
@@ -2948,7 +2983,7 @@
 msgstr "女"
 
 msgid "Only online"
-msgstr "只在线"
+msgstr "仅在线"
 
 msgid "Find buddies"
 msgstr "查找好友"
@@ -3060,14 +3095,14 @@
 msgid "Chat _name:"
 msgstr "聊天名(_N):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "无法连接到服务器。"
+msgstr "无法解析服务器"
 
 #. 1. connect to server
 #. connect to the server
 msgid "Connecting"
-msgstr "正连接"
+msgstr "正在连接"
 
 msgid "Chat error"
 msgstr "聊天错误"
@@ -3075,7 +3110,6 @@
 msgid "This chat name is already in use"
 msgstr "此聊天名已经在使用中"
 
-#, fuzzy
 msgid "Not connected to the server"
 msgstr "未连接到服务器。"
 
@@ -3118,9 +3152,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 用户"
 
-#, fuzzy
 msgid "GG server"
-msgstr "设置用户信息..."
+msgstr ""
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3136,7 +3169,6 @@
 msgid "File Transfer Failed"
 msgstr "文件传送失败"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "无法打开监听端口。"
 
@@ -3160,10 +3192,10 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
 msgstr ""
-"失去与服务器的连接:\n"
+"与服务器失去连接:\n"
 "%s"
 
 msgid "View MOTD"
@@ -3175,9 +3207,8 @@
 msgid "_Password:"
 msgstr "密码(_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC 昵称不能包含空格"
+msgstr "IRC 昵称和服务器不能包含空格"
 
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
@@ -3186,11 +3217,11 @@
 msgstr "无法连接"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
 msgstr "无法连接到 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接。"
 
@@ -3251,7 +3282,7 @@
 msgstr "屏蔽: %s"
 
 msgid "End of ban list"
-msgstr "屏蔽列表结束"
+msgstr "屏蔽列表结尾"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3290,7 +3321,7 @@
 
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s 将话题改为: %s"
+msgstr "%s 将话题改为:%s"
 
 #, c-format
 msgid "%s has cleared the topic."
@@ -3298,7 +3329,7 @@
 
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "%s 的话题为: %s"
+msgstr "%s 的话题为:%s"
 
 #, c-format
 msgid "Unknown message '%s'"
@@ -3321,14 +3352,14 @@
 msgstr "IRC 服务器的本地时间为:"
 
 msgid "No such channel"
-msgstr "没有这样的频道"
+msgstr "无此频道"
 
 #. does this happen?
 msgid "no such channel"
 msgstr "没有这样的频道"
 
 msgid "User is not logged in"
-msgstr "用户未登入"
+msgstr "用户未登录"
 
 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
@@ -3341,20 +3372,20 @@
 msgstr "加入 %s 需要邀请。"
 
 msgid "Invitation only"
-msgstr "只邀请"
+msgstr "仅邀请"
 
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "您被 %s: %s 踢出了"
+msgstr "您被已 %s 踢出 (%s)"
 
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "被 %s (%s) 踢出"
+msgstr "被 %s 踢出 (%s) "
 
 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr "由 %3$s 管理(%1$s %2$s)"
+msgstr "由 %3$s 设定模式 (%1$s %2$s)"
 
 msgid "Invalid nickname"
 msgstr "无效的昵称"
@@ -3394,11 +3425,11 @@
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "PING 响应 -- 延后: %lu 秒"
+msgstr "PING 响应 -- 延迟: %lu 秒"
 
 #, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "无法加入 %s:需要注册"
+msgstr "无法加入 %s:需要注册。"
 
 msgid "Cannot join channel"
 msgstr "无法加入频道"
@@ -3419,7 +3450,7 @@
 msgstr "away [消息]: 设置离开消息,不尾随消息则代表离开。"
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <nick> <msg>:向指定昵称发送 CTCP 消息。"
 
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: 向 chanserv 发送命令"
@@ -3435,27 +3466,27 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态,使其无法在频道被管理"
+"devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道发言权,使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr "invite &lt;昵称&gt; [房间]: 邀请某人加入您指定的频道,或者当前频道。"
+msgstr "invite &lt;昵称&gt; [聊天室]: 邀请某人加入您指定的频道,或者当前频道。"
 
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需要"
-"的话可选提供频道密钥。"
+"j &lt;聊天室1&gt;[,聊天室][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如"
+"需要的话可选提供频道密钥。"
 
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,如需"
-"要的话可选提供频道密钥。"
+"join &lt;聊天室1&gt;[,聊天室][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道,"
+"如需要的话可选提供频道密钥。"
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
@@ -3466,7 +3497,7 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list: 显示网络上的聊天式列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
+"list:显示网络上的聊天室列表。<i>警告,某些服务器可能因此而断开您的连接。</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要执行的动作&gt;: 执行动作。"
@@ -3494,9 +3525,8 @@
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: 向 nickserv 发送命令"
 
-#, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
+msgstr "notice &lt;目标&gt;: 向好友或频道发送提示。"
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3515,7 +3545,7 @@
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [房间] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
+msgstr "part [聊天室] [消息]: 离开当前频道或指定频道,并留下可选的消息。"
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
@@ -3525,18 +3555,18 @@
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
+msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私人消息(与频道相对)。"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]: 断开与服务器的连接,并留下可选的消息。"
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quot [……]: 向服务器发送原始命令。"
+msgstr "quote [……]: 向服务器发送原始命令。"
 
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr "remove &lt;昵称&gt; [消息]: 从房间删除某人。您必须是频道管理员。"
+msgstr "remove &lt;昵称&gt; [消息]: 从聊天室删除某人。您必须是频道管理员。"
 
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: 显示 IRC 服务器上当前的本地时间。"
@@ -3553,8 +3583,7 @@
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
-msgstr ""
-"voice &lt;昵称1&gt; [昵称2]: 为某人授予频道语音状态。您必须是频道管理员。"
+msgstr "voice &lt;昵称1&gt; [昵称2] ...:授予频道发言权。您必须是频道管理员。"
 
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
@@ -3562,11 +3591,10 @@
 msgstr "wallops &lt;消息&gt;: 如果您不知道这是什么功能,请不要使用。"
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
-
-#, fuzzy
+msgstr "whois [服务器] &lt;昵称&gt;:获得用户信息。"
+
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
+msgstr "whois [服务器] &lt;昵称&gt;:获得用户信息。"
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -3584,39 +3612,33 @@
 msgid "Unknown Error"
 msgstr "未知错误"
 
-#, fuzzy
 msgid "Ad-Hoc Command Failed"
 msgstr "命令已禁用"
 
-#, fuzzy
 msgid "execute"
-msgstr "未期待"
-
-#, fuzzy
+msgstr "执行"
+
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
-
-#, fuzzy
+msgstr "服务器需要 TLS/SSL 才能登录。未找到 TLS/SSL 支持。"
+
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "您要求 TLS/SSL 登录,但没有找到 TLS/SSL 支持。"
+msgstr "您要求 TLS/SSL 登录,但未找到 TLS/SSL 支持。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
-msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
+msgstr "%s 需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
 
 msgid "Plaintext Authentication"
 msgstr "纯文本认证"
 
-#, fuzzy
 msgid "SASL authentication failed"
 msgstr "认证失败"
 
-#, fuzzy
 msgid "Invalid response from server"
 msgstr "服务器的响应无效。"
 
@@ -3624,12 +3646,12 @@
 msgstr "服务器未使用任何支持的身份验证方法"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "您请求加密,但服务器不支持"
 
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
 msgstr "SASL 错误"
 
@@ -3645,7 +3667,7 @@
 msgid "Unable to establish a connection with the server"
 msgstr "无法与服务器建立连接"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
 msgstr "无法与服务器建立连接"
 
@@ -3667,6 +3689,11 @@
 msgid "Street Address"
 msgstr "街道地址"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "额外地址"
 
@@ -3727,14 +3754,13 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s 前"
+
 msgid "Logged Off"
-msgstr "已登入"
+msgstr "已退出"
 
 msgid "Middle Name"
-msgstr "中名"
+msgstr "教名"
 
 msgid "Address"
 msgstr "地址"
@@ -3746,7 +3772,16 @@
 msgstr "相片"
 
 msgid "Logo"
-msgstr "图符"
+msgstr "Logo"
+
+#, fuzzy, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗?"
+
+msgid "Cancel Presence Notification"
+msgstr "取消目前的通知"
 
 msgid "Un-hide From"
 msgstr "取消隐身"
@@ -3754,14 +3789,9 @@
 msgid "Temporarily Hide From"
 msgstr "临时隐身"
 
-#. && NOT ME
-msgid "Cancel Presence Notification"
-msgstr "取消目前的通知"
-
 msgid "(Re-)Request authorization"
 msgstr "(重新)请求认证"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3774,10 +3804,10 @@
 msgstr "退出"
 
 msgid "Chatty"
-msgstr "唠叨"
+msgstr "找我聊聊吧"
 
 msgid "Extended Away"
-msgstr "远远离开"
+msgstr "离开"
 
 msgid "Do Not Disturb"
 msgstr "请勿打扰"
@@ -3811,9 +3841,8 @@
 msgid "Server Instructions: %s"
 msgstr "服务器指令:%s"
 
-#, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "填入输入框可以搜索匹配的 Jabber 用户。"
+msgstr "填入输入框可以搜索匹配的 XMPP 用户。"
 
 msgid "Email Address"
 msgstr "电子邮件地址"
@@ -3838,7 +3867,7 @@
 msgstr "搜索目录"
 
 msgid "_Room:"
-msgstr "房间(_R):"
+msgstr "聊天室(_R):"
 
 msgid "_Server:"
 msgstr "服务器(_S):"
@@ -3848,10 +3877,10 @@
 
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s 不是有效的房间名"
+msgstr "%s 不是有效的聊天室名"
 
 msgid "Invalid Room Name"
-msgstr "无效的房间名"
+msgstr "无效的聊天室名"
 
 #, c-format
 msgid "%s is not a valid server name"
@@ -3862,10 +3891,10 @@
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s 不是有效的房间昵称"
+msgstr "%s 不是有效的聊天室昵称"
 
 msgid "Invalid Room Handle"
-msgstr "无效的房间门昵称"
+msgstr "无效的聊天室昵称"
 
 msgid "Configuration error"
 msgstr "配置错误"
@@ -3874,10 +3903,10 @@
 msgstr "无法配置"
 
 msgid "Room Configuration Error"
-msgstr "房间配置错误"
+msgstr "聊天室配置错误"
 
 msgid "This room is not capable of being configured"
-msgstr "此房间无法进行配置"
+msgstr "此聊天室无法进行配置"
 
 msgid "Registration error"
 msgstr "注册错误"
@@ -3886,7 +3915,7 @@
 msgstr "不支持在非 MUC 聊天室中更改昵称"
 
 msgid "Error retrieving room list"
-msgstr "收取房间列表时出错"
+msgstr "收取聊天室列表时出错"
 
 msgid "Invalid Server"
 msgstr "无效的服务器"
@@ -3898,19 +3927,17 @@
 msgstr "选择要查询的会议服务器"
 
 msgid "Find Rooms"
-msgstr "查找房间"
-
-#, fuzzy
+msgstr "查找聊天室"
+
 msgid "Affiliations:"
-msgstr "别名:"
+msgstr "友好关系:"
 
 msgid "No users found"
 msgstr "未找到匹配的用户"
 
 msgid "Roles:"
-msgstr "角色:"
-
-#, fuzzy
+msgstr "职务:"
+
 msgid "Ping timed out"
 msgstr "Ping 超时"
 
@@ -3925,9 +3952,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "连接到服务器失败。"
+msgstr ""
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -3954,7 +3980,7 @@
 msgstr "取消注册失败"
 
 msgid "State"
-msgstr "州/省"
+msgstr "省/州"
 
 msgid "Postal code"
 msgstr "邮政编码"
@@ -3995,11 +4021,6 @@
 msgid "Change Registration"
 msgstr "更改帐户"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "连接到服务器失败。"
-
-#, fuzzy
 msgid "Error unregistering account"
 msgstr "更改账户信息出错"
 
@@ -4028,7 +4049,7 @@
 msgstr "心情"
 
 msgid "Now Listening"
-msgstr ""
+msgstr "正在收听"
 
 msgid "Both"
 msgstr "双向"
@@ -4051,19 +4072,15 @@
 msgid "Subscription"
 msgstr "订阅"
 
-#, fuzzy
 msgid "Mood Text"
 msgstr "血型"
 
-#, fuzzy
 msgid "Allow Buzz"
 msgstr "允许"
 
-#, fuzzy
 msgid "Tune Artist"
 msgstr "美工"
 
-#, fuzzy
 msgid "Tune Title"
 msgstr "标题"
 
@@ -4073,7 +4090,6 @@
 msgid "Tune Genre"
 msgstr ""
 
-#, fuzzy
 msgid "Tune Comment"
 msgstr "好友注释"
 
@@ -4136,9 +4152,8 @@
 msgid "Item Not Found"
 msgstr "项目未找到"
 
-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "Jabber ID 格式错误"
+msgstr "XMPP ID 格式错误"
 
 msgid "Not Acceptable"
 msgstr "不可接受"
@@ -4267,21 +4282,21 @@
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "未知的错误代码: %s"
-
-#, fuzzy, c-format
+msgstr "未知的友好关系:%s"
+
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "无法邀请用户(%s)。"
+msgstr "无法邀请用户%s 成为“%s”。"
 
 #, c-format
 msgid "Unknown role: \"%s\""
-msgstr "未知角色:“%s”"
-
-#, fuzzy, c-format
+msgstr "未知职务:“%s”"
+
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "无法发送消息: %s"
+msgstr "无法为用户%2$s 设置“%1$s”职务"
 
 #, c-format
 msgid "Unable to kick user %s"
@@ -4291,15 +4306,15 @@
 msgid "Unable to ping user %s"
 msgstr "无法 ping 用户 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "无法给 %s 发送文件,用户不支持文件传送"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr "无法给 %s 发送文件,用户不支持文件传送"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
@@ -4312,60 +4327,56 @@
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "屏幕震动"
+
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "%s 已经将您[%s]添加为好友"
-
-#, fuzzy, c-format
+msgstr "%s 给您发送了屏幕震动!"
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "无法给 %s 发送消息。"
-
-#, fuzzy, c-format
+msgstr "无法同 %s 创建多媒体会话:无效的 JID。"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "无法给 %s 发送文件,用户不支持文件传送"
-
-#, fuzzy, c-format
+msgstr "无法同 %s 创建多媒体会话:用户不在线"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "无法给 %s 发送文件,用户不支持文件传送"
-
-#, fuzzy
+msgstr "无法同 %s 创建多媒体会话:没有添加用户监视"
+
 msgid "Media Initiation Failed"
-msgstr "注册失败"
-
-#, fuzzy, c-format
+msgstr "创建多媒体会话失败"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
 
-#, fuzzy
 msgid "Select a Resource"
-msgstr "选择文件"
-
-#, fuzzy
+msgstr "选择资源"
+
 msgid "Initiate Media"
-msgstr "发起聊天(_C)"
+msgstr "创建多媒体会话"
 
 msgid "config:  Configure a chat room."
-msgstr "config: 配置聊天室。"
+msgstr "配置:配置聊天室。"
 
 msgid "configure:  Configure a chat room."
-msgstr "configure: 配置聊天室。"
+msgstr "配置:配置聊天室。"
 
 msgid "part [room]:  Leave the room."
-msgstr "part [房间]: 离开聊天室。"
+msgstr "part [聊天室]: 离聊天天室。"
 
 msgid "register:  Register with a chat room."
-msgstr "register: 注册聊天室。"
+msgstr "注册:注册聊天室。"
 
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"
 
-#, fuzzy
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
+msgstr "ban &lt;用户&gt; [原因]: 在聊天室中屏蔽一个用户。"
 
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
@@ -4375,21 +4386,19 @@
 #, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
-msgstr ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: 设置用户在房间"
-"中的角色。"
+"users with a role or set users' role with the room."
+msgstr ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: 设置用户在聊天"
+"室中的职务。"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入房间。"
-
-#, fuzzy
+msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入聊天室。"
+
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
-
-#, fuzzy
+msgstr "join: &lt;聊天室&gt; [密码]: 加入此服务器上的聊天聊天室。"
+
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
+msgstr "kick &lt;用户&gt; [原因]: 从聊天室中踢出一个用户。"
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
@@ -4419,7 +4428,7 @@
 msgstr "域"
 
 msgid "Require SSL/TLS"
-msgstr ""
+msgstr "需要 SSL/TLS"
 
 msgid "Force old (port 5223) SSL"
 msgstr "强制旧 SSL(5223 端口)"
@@ -4472,7 +4481,7 @@
 
 #, c-format
 msgid "(Code %s)"
-msgstr " (代码 %s)"
+msgstr "(代码 %s)"
 
 msgid "XML Parse error"
 msgstr "XML 分析错误"
@@ -4489,42 +4498,35 @@
 msgstr "聊天 %s 出错"
 
 msgid "Create New Room"
-msgstr "创建新房间"
+msgstr "创建新聊天室"
 
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
-msgstr "您正在创建新房间。您是想要进行配置,还是想要接受默认设置?"
+msgstr "您正在创建新聊天室。您是想要进行配置,还是想要接受默认设置?"
 
 msgid "_Configure Room"
-msgstr "配置房间(_C)"
+msgstr "配置聊天室(_C)"
 
 msgid "_Accept Defaults"
 msgstr "接受默认值(_A)"
 
-#, fuzzy
 msgid "No reason"
 msgstr "没有给出理由。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "您被 %s: %s 踢出了"
-
-#, fuzzy, c-format
+msgstr "您被已 %s 踢出 (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "被 %s (%s) 踢出"
-
-#, fuzzy
+msgstr "被 %s 踢出 (%s) "
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "打开文件时发生了错误。"
-
-#, fuzzy
+msgstr "打开文件时发生了错误。\n"
+
 msgid "Transfer was closed."
-msgstr "文件传送失败"
-
-#, fuzzy
-msgid "Failed to open the file"
-msgstr "打开文件“%s”:%s"
+msgstr "文件传送连接已关闭。"
 
 msgid "Failed to open in-band bytestream"
 msgstr ""
@@ -4536,61 +4538,53 @@
 msgid "File Send Failed"
 msgstr "发送文件失败"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "无法给 %s 发送消息。"
-
-#, fuzzy, c-format
+msgstr "无法给 %s 发送文件:无效的 JID"
+
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "无法给 %s 发送文件,用户不支持文件传送"
-
-#, fuzzy, c-format
+msgstr "无法给 %s 发送文件:用户不在线"
+
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "无法给 %s 发送文件,用户不支持文件传送"
-
-#, fuzzy, c-format
+msgstr "无法给 %s 发送文件:未添加用户监视"
+
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
 
-#, fuzzy
 msgid "Edit User Mood"
-msgstr "用户模式"
+msgstr "编辑用户心情"
 
 msgid "Please select your mood from the list."
 msgstr ""
 
-#, fuzzy
 msgid "Set"
-msgstr "设置(_S)"
-
-#, fuzzy
+msgstr "设置"
+
 msgid "Set Mood..."
-msgstr "发送消息..."
-
-#, fuzzy
+msgstr "设置心情..."
+
 msgid "Set User Nickname"
-msgstr "设置用户限制"
-
-#, fuzzy
+msgstr "设置用户昵称"
+
 msgid "Please specify a new nickname for you."
-msgstr "请输入 %s 的新名称"
+msgstr "请您为自己指定新的昵称。"
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
 
-#, fuzzy
 msgid "Set Nickname..."
-msgstr "昵称"
-
-#, fuzzy
+msgstr "设置昵称..."
+
 msgid "Actions"
 msgstr "动作"
 
-#, fuzzy
 msgid "Select an action"
-msgstr "选择文件"
+msgstr "选择一个动作"
 
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
@@ -4600,15 +4594,14 @@
 msgstr "无法添加“%s”。"
 
 msgid "Buddy Add error"
-msgstr ""
-
-#, fuzzy
+msgstr "添加好友出错"
+
 msgid "The username specified does not exist."
-msgstr "指定的用户名无效。"
+msgstr "指定的用户名不存在。"
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "%s (%s) 的好友列表同步问题"
+msgstr "%s 上的好友列表同步问题(%s)"
 
 #, c-format
 msgid ""
@@ -4625,11 +4618,11 @@
 
 #, c-format
 msgid "Unable to parse message"
-msgstr "无法处理消息"
+msgstr "无法解析消息"
 
 #, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "错误(可能是客户端的 bug)"
+msgstr "语法错误(可能是客户端的 bug)"
 
 #, c-format
 msgid "Invalid email address"
@@ -4645,11 +4638,11 @@
 
 #, c-format
 msgid "Already logged in"
-msgstr "已登入"
-
-#, fuzzy, c-format
+msgstr "已登录"
+
+#, c-format
 msgid "Invalid username"
-msgstr "名称无效"
+msgstr "无效用户名"
 
 #, c-format
 msgid "Invalid friendly name"
@@ -4721,7 +4714,7 @@
 
 #, c-format
 msgid "Not logged in"
-msgstr "未登入"
+msgstr "未登录"
 
 #, c-format
 msgid "Service temporarily unavailable"
@@ -4793,7 +4786,7 @@
 
 #, c-format
 msgid "Passport not verified"
-msgstr "Passport 未验证"
+msgstr "通行证未验证"
 
 #, c-format
 msgid "Bad friend file"
@@ -4803,8 +4796,8 @@
 msgid "Not expected"
 msgstr "未期待"
 
-#, c-format
-msgid "Friendly name changes too rapidly"
+#, fuzzy
+msgid "Friendly name is changing too rapidly"
 msgstr "友好的名称更改太频繁"
 
 #, c-format
@@ -4825,15 +4818,14 @@
 
 #, c-format
 msgid "Kids Passport without parental consent"
-msgstr "没有父母在的儿童 Passport"
+msgstr "没有父母在的儿童通行证"
 
 #, c-format
 msgid "Passport account not yet verified"
-msgstr "Passport 账户未验证"
-
-#, fuzzy
+msgstr "通行证账户未验证"
+
 msgid "Passport account suspended"
-msgstr "Passport 账户未验证"
+msgstr "通行证账户已被取代"
 
 #, c-format
 msgid "Bad ticket"
@@ -4847,32 +4839,45 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "首选联系人"
-
-#, fuzzy
+msgstr "其他联系人"
+
 msgid "Non-IM Contacts"
-msgstr "删除联系人"
-
-#, fuzzy, c-format
+msgstr "非即时消息联系人"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s 向您发送了语音聊天邀请,但尚不支持。"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s 向您发送了摄像头邀请,但尚不支持。"
+msgstr "%s 向您发送了语音聊天邀请,但尚不支持。"
 
 msgid "Nudge"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "引起注意"
+
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s 已经将您[%s]添加为好友"
+msgstr "%s 轻轻地推了您一下,希望您注意他!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
-
-#, fuzzy
+msgstr "正在轻轻地推 %s ,以引起他对您的注意..."
+
 msgid "Email Address..."
-msgstr "电子邮件地址"
+msgstr "电子邮件地址..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
@@ -4908,11 +4913,10 @@
 msgid "Disallow"
 msgstr "禁止"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
 msgstr "%s 的好友注释"
 
-#, fuzzy
 msgid "No text is blocked for this account."
 msgstr "此账户使用此好友图标(_I):"
 
@@ -4921,37 +4925,32 @@
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr ""
 
-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "此 Hotmail 账户可能未激活。"
+msgstr "此账户没有启用电子邮件。"
 
 msgid "Send a mobile message."
 msgstr "发送移动消息。"
 
 msgid "Page"
-msgstr "寻呼"
+msgstr ""
 
 msgid "Playing a game"
-msgstr ""
-
-#, fuzzy
+msgstr "正在玩游戏"
+
 msgid "Working"
-msgstr "工作"
+msgstr "正在工作"
 
 msgid "Has you"
 msgstr ""
 
-#, fuzzy
 msgid "Home Phone Number"
-msgstr "设置家庭电话号码..."
-
-#, fuzzy
+msgstr "家庭电话号码"
+
 msgid "Work Phone Number"
-msgstr "设置工作电话号码..."
-
-#, fuzzy
+msgstr "工作电话号码"
+
 msgid "Mobile Phone Number"
-msgstr "设置移动电话号码..."
+msgstr "移动电话号码"
 
 msgid "Be Right Back"
 msgstr "马上回来"
@@ -4971,21 +4970,17 @@
 #. saveable
 #. should be user_settable some day
 #. independent
-#, fuzzy
 msgid "Artist"
 msgstr "美工"
 
-#, fuzzy
 msgid "Album"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "相册"
+
 msgid "Game Title"
-msgstr "标题"
-
-#, fuzzy
+msgstr "游戏标题"
+
 msgid "Office Title"
-msgstr "标题"
+msgstr "办公标题"
 
 msgid "Set Friendly Name..."
 msgstr "设置友好的名称..."
@@ -5020,6 +5015,29 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。"
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"无法添加好友 %s,原因是用户名无效。用户名必须是有效的电子邮件地址,或者以字母"
+"开头,且只能包含字母、数字和空格,或者只包含数字。"
+
+msgid "Unable to Add"
+msgstr "无法添加"
+
+msgid "Authorization Request Message:"
+msgstr "认证请求消息:"
+
+msgid "Please authorize me!"
+msgstr "请同意我将您加入好友!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "确定(_O)"
+
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
@@ -5036,13 +5054,13 @@
 msgstr "位置"
 
 msgid "Hobbies and Interests"
-msgstr "嗜好和兴趣"
+msgstr "兴趣爱好"
 
 msgid "A Little About Me"
-msgstr "自我介绍"
+msgstr "自我简介"
 
 msgid "Social"
-msgstr "社会"
+msgstr "社会关系"
 
 msgid "Marital Status"
 msgstr "婚姻状况"
@@ -5063,7 +5081,7 @@
 msgstr "时尚"
 
 msgid "Humor"
-msgstr ""
+msgstr "心情"
 
 msgid "Music"
 msgstr "音乐"
@@ -5075,7 +5093,7 @@
 msgstr "联系信息"
 
 msgid "Personal"
-msgstr "个人"
+msgstr "个人信息"
 
 msgid "Significant Other"
 msgstr ""
@@ -5164,17 +5182,16 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-"MSN 报告找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的"
-"个人资料。"
+"MSN 找不到用户的个人资料。这可能是因为用户不存在,或者用户没有创建公开的个人"
+"资料。"
 
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr "在用户的个人资料中找不到任何信息。用户可能不存在。"
 
-#, fuzzy
 msgid "View web profile"
-msgstr "离线时隐藏"
+msgstr "查看 Web 配置文件"
 
 #. *< type
 #. *< ui_requirement
@@ -5191,9 +5208,8 @@
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"
 
-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "IPC 测试服务器"
+msgstr "HTTP 方式服务器"
 
 msgid "Show custom smileys"
 msgstr "显示自定义如下:"
@@ -5201,38 +5217,35 @@
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:向用户发送闪屏震动,以便引起他的注意"
 
-#, fuzzy
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "失败: 身份验证失败"
-
-#, fuzzy
+msgstr "Windows Live ID 验证:无法连接"
+
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "失败: 身份验证失败"
+msgstr "Windows Live ID 验证:无效应答"
 
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 刚刚给您发送了闪屏振动!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "未知错误"
+msgstr "未知错误 (%d): %s"
 
 msgid "Unable to add user"
 msgstr "无法添加用户"
 
-#, fuzzy, c-format
+#. Unknown error!
+#, c-format
 msgid "Unknown error (%d)"
-msgstr "未知错误"
-
-#, fuzzy
+msgstr "未知错误 (%d)"
+
 msgid "The following users are missing from your addressbook"
-msgstr "下面是您搜索的结果"
-
-#, fuzzy
+msgstr "以下用户不在您的通讯录中"
+
 msgid "Mobile message was not sent because it was too long."
-msgstr "消息未发出,因为您尚未登入。"
-
-#, fuzzy, c-format
+msgstr "消息未发出,因为消息太长。"
+
+#, 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 "
@@ -5247,33 +5260,21 @@
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr[0] ""
-"MSN 服务器即将于 %d 分钟后关闭进行维护。到那时,您将会被自动登出。请尽快关闭"
-"现在进行中的对话。\n"
-"\n"
-"维护完成后,您将能够成功登入。"
-msgstr[1] ""
-"MSN 服务器即将于 %d 分钟后关闭进行维护。到那时,您将会被自动登出。请尽快关闭"
-"现在进行中的对话。\n"
-"\n"
-"维护完成后,您将能够成功登入。"
+msgstr[0] "消息未发出,因为消息太长。"
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""
 
-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "消息未发出,因为发送的频率太高:"
-
-#, fuzzy
+msgstr "消息未发出,因为发送的频率太高。"
+
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "消息未发出,因为发生了未知错误:"
-
-#, fuzzy
+msgstr "消息未发出,因为发生了未知编码错误。"
+
 msgid "Message was not sent because an unknown error occurred."
-msgstr "消息未发出,因为发生了未知错误:"
+msgstr "消息未发出,因为发生了未知错误。"
 
 msgid "Writing error"
 msgstr "写入错误"
@@ -5289,22 +5290,18 @@
 "%s 服务器的连接错误:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
 msgstr "服务器不支持此协议。"
 
-#, fuzzy
 msgid "Error parsing HTTP"
 msgstr "分析 HTTP 出错。"
 
-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "您在其它位置用此用户名登入了。"
+msgstr "您在其它位置用此用户名登录了。"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "MSN 服务器临时不可用。请稍候再试一次。"
-
-#, fuzzy
+msgstr "MSN 服务器临时不可用。请稍候再试。"
+
 msgid "The MSN servers are going down temporarily"
 msgstr "MSN 服务器目前维护中。"
 
@@ -5314,7 +5311,7 @@
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
+msgstr "您的 MSN 好友列表临时不可用。请稍候再试。"
 
 msgid "Handshaking"
 msgstr "握手"
@@ -5334,16 +5331,16 @@
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s 向您发送了摄像头邀请,但尚不支持。"
-
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s 向您发送了摄像头邀请,但尚不支持。"
+msgstr "%s 向您发送了视频聊天邀请,但尚不支持。"
+
+#, fuzzy, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr "%s 向您发送了视频聊天邀请,但尚不支持。"
 
 msgid "Away From Computer"
-msgstr "远离电脑"
+msgstr "离开"
 
 msgid "On The Phone"
 msgstr "接听电话"
@@ -5378,18 +5375,19 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "消息未发出,因为发生了未知错误:"
 
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "添加到地址簿"
-
-#, fuzzy
+msgstr "从通讯录删除好友?"
+
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "您是否想要将此人加为好友?"
-
-#, fuzzy
+msgstr "您是否要将这个好友也从通讯录中删除?"
+
 msgid "The username specified is invalid."
 msgstr "指定的用户名无效。"
 
+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "友好的名称更改太频繁"
+
 msgid "This Hotmail account may not be active."
 msgstr "此 Hotmail 账户可能未激活。"
 
@@ -5406,9 +5404,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "MSN Protocol Plugin"
-msgstr "AIM 协议插件"
+msgstr "MSN 协议插件"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5419,19 +5416,19 @@
 
 #, c-format
 msgid "%s on %s (%s)"
-msgstr "%2$s(%3$s) 上的 %1$s"
+msgstr "%2$s 上的 %1$s (%3$s)"
 
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "无法在 %s(%s) 上添加用户"
+msgstr "无法在 %s 上添加用户 (%s)"
 
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "无法在 %s(%s) 上屏蔽用户"
+msgstr "无法在 %s 上屏蔽用户 (%s)"
 
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "无法允许 %s(%s) 上的拥护"
+msgstr "无法允许 %s 上的用户 (%s)"
 
 #, c-format
 msgid "%s could not be added because your buddy list is full."
@@ -5462,62 +5459,53 @@
 msgid "No such user: %s"
 msgstr ""
 
-#, fuzzy
 msgid "User lookup"
-msgstr "用户房间"
+msgstr "用户查找"
 
 msgid "Reading challenge"
 msgstr "读取挑战"
 
-#, fuzzy
 msgid "Unexpected challenge length from server"
 msgstr "服务器的挑战无效"
 
-#, fuzzy
 msgid "Logging in"
-msgstr "日志"
-
-#, fuzzy
+msgstr "登录"
+
 msgid "MySpaceIM - No Username Set"
-msgstr "无名称"
+msgstr "MySpaceIM - 未设定用户名"
 
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "您没有 MySpace 用户名。"
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
-
-#, fuzzy
+msgstr "您是否想立即设置?(注意:不可更改!)"
+
 msgid "Lost connection with server"
-msgstr ""
-"丢失与服务器的连接\n"
-"%s"
+msgstr "与服务器失去连接"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
 #. used
-#, fuzzy
 msgid "New mail messages"
-msgstr "发送消息"
+msgstr "新的邮件"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "新博客评论"
 
 msgid "New profile comments"
 msgstr ""
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "好友请求!"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "新图片评论"
 
 msgid "MySpace"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpace"
+
 msgid "IM Friends"
-msgstr "即时消息窗口(_I)"
+msgstr "即时消息朋友"
 
 #, c-format
 msgid ""
@@ -5526,15 +5514,14 @@
 msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr[0] ""
-
-#, fuzzy
+msgstr[0] "即时消息朋友"
+
 msgid "Add contacts from server"
-msgstr "服务器的响应无效。"
-
-#, fuzzy, c-format
+msgstr "从服务器添加联系人"
+
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "进程返回了错误代码 %d"
+msgstr "协议错误,代码 %d: %s"
 
 #, c-format
 msgid ""
@@ -5543,37 +5530,30 @@
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
 
-#, fuzzy
 msgid "Incorrect username or password"
-msgstr "昵称或密码不对"
+msgstr "用户名或密码错误"
 
 msgid "MySpaceIM Error"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM 错误"
+
 msgid "Invalid input condition"
-msgstr "完成连接"
-
-#, fuzzy
+msgstr "无效的输入条件"
+
 msgid "Failed to add buddy"
-msgstr "在聊天中加入好友失败"
-
-#, fuzzy
+msgstr "添加好友失败"
+
 msgid "'addbuddy' command failed."
-msgstr "从文件装入好友列表..."
-
-#, fuzzy
+msgstr "“添加好友” 命令失败。"
+
 msgid "persist command failed"
 msgstr "切换板失败"
 
-#, fuzzy
 msgid "Failed to remove buddy"
-msgstr "在聊天中加入好友失败"
+msgstr "移除好友失败"
 
 msgid "'delbuddy' command failed"
 msgstr ""
 
-#, fuzzy
 msgid "blocklist command failed"
 msgstr "切换板失败"
 
@@ -5589,19 +5569,17 @@
 msgstr ""
 
 msgid "Add friends from MySpace.com"
-msgstr ""
-
-#, fuzzy
+msgstr "从 MySpace.com 添加好友"
+
 msgid "Importing friends failed"
 msgstr "无效的好友文件"
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr "查找好友..."
-
-#, fuzzy
+msgstr "查找..."
+
 msgid "Change IM name..."
-msgstr "更改密码..."
+msgstr "更改 IM 名称..."
 
 msgid "myim URL handler"
 msgstr ""
@@ -5616,35 +5594,31 @@
 msgstr ""
 
 msgid "Show headline in status text"
-msgstr ""
+msgstr "在状态文本显示新闻提要"
 
 msgid "Send emoticons"
 msgstr "发送表情"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
-
-#, fuzzy
+msgstr "屏幕分辨率(每英寸点数)"
+
 msgid "Base font size (points)"
 msgstr "较大字体"
 
 msgid "User"
 msgstr "用户"
 
-#, fuzzy
 msgid "Headline"
 msgstr "昵称(_H):"
 
-#, fuzzy
 msgid "Song"
 msgstr "声音"
 
 msgid "Total Friends"
-msgstr ""
-
-#, fuzzy
+msgstr "好友总计"
+
 msgid "Client Version"
-msgstr "关闭对话"
+msgstr "客户端版本"
 
 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
@@ -5652,31 +5626,27 @@
 "to set your username."
 msgstr ""
 
-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "服务不可用"
+msgstr "MySpaceIM - 用户名可用"
 
 msgid "This username is available. Would you like to set it?"
-msgstr ""
+msgstr "此用户名可用。您是否想设置为这个用户名?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "一旦设置,将不可更改!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM - 请设置一个用户名"
+
 msgid "This username is unavailable."
-msgstr "此主题没有可用的表情。"
-
-#, fuzzy
+msgstr "该用户名不可用。"
+
 msgid "Please try another username:"
-msgstr "请输入 %s 的新名称"
+msgstr "请尝试另外的用户名:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "无名称"
+msgstr "未设定用户名"
 
 msgid "Please enter a username to check its availability:"
 msgstr ""
@@ -5690,7 +5660,7 @@
 msgid "Zap"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
 msgstr "%s 已经将您[%s]添加为好友"
 
@@ -5702,7 +5672,7 @@
 msgid "Whack"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
 msgstr "%s 已经将您[%s]添加为好友"
 
@@ -5713,11 +5683,10 @@
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
 msgstr "话题"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
 msgstr "用户已经屏蔽了您"
 
@@ -5729,9 +5698,9 @@
 msgid "Smooch"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"
 
 #, c-format
 msgid "Smooching %s..."
@@ -5741,20 +5710,19 @@
 msgid "Hug"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"
 
 #, c-format
 msgid "Hugging %s..."
 msgstr ""
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
 msgstr "打盹"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
 msgstr "%s 已经将您[%s]添加为好友"
 
@@ -5763,15 +5731,14 @@
 msgstr ""
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
 msgstr "已走"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
 msgstr "%s 走了。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Goosing %s..."
 msgstr "查阅 %s"
 
@@ -5781,9 +5748,9 @@
 msgid "High-five"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"
 
 #, c-format
 msgid "High-fiving %s..."
@@ -5795,9 +5762,9 @@
 msgid "Punk"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"
 
 #, c-format
 msgid "Punking %s..."
@@ -5813,9 +5780,9 @@
 msgid "Raspberry"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"
 
 #, c-format
 msgid "Raspberrying %s..."
@@ -5875,7 +5842,6 @@
 msgid "Master archive is misconfigured"
 msgstr "主存档配置错误"
 
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "无法识别您输入用户名的主机"
 
@@ -5890,9 +5856,8 @@
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您达到了所允许联系人的最大数目"
 
-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "您输入了无效的用户名"
+msgstr "您输入了错误的用户名"
 
 msgid "An error occurred while updating the directory"
 msgstr "更新目录时发生了错误"
@@ -5915,7 +5880,7 @@
 msgid "Unknown error: 0x%X"
 msgstr "未知错误: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
 msgstr "无法 ping 用户 %s"
 
@@ -6043,7 +6008,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 显示为离线,因此未接受到您刚刚发出的消息。"
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6071,8 +6035,9 @@
 msgid "Server port"
 msgstr "服务器端口"
 
-#, fuzzy
-msgid "Received unexpected response from "
+#. Note to translators: %s in this string is a URL
+#, fuzzy, c-format
+msgid "Received unexpected response from %s"
 msgstr "从服务器收到了意外的 HTTP 响应。"
 
 #. username connecting too frequently
@@ -6083,22 +6048,21 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
 #, fuzzy, c-format
-msgid "Error requesting "
-msgstr "请求登录令牌出错"
+msgid "Error requesting %s: %s"
+msgstr "请求时出错"
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
-
-#, fuzzy
+msgstr "AOL 不允许通过此站点认证您的屏幕名称。"
+
 msgid "Could not join chat room"
-msgstr "无法连接"
-
-#, fuzzy
+msgstr "无法进入聊天室"
+
 msgid "Invalid chat room name"
-msgstr "无效的房间名"
-
-#, fuzzy
+msgstr "无效的聊天室名称"
+
 msgid "Received invalid data on connection with server"
 msgstr "在与服务器的连接中收到了无效的数据。"
 
@@ -6147,12 +6111,11 @@
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "无法建立与远程用户的连接。"
 
 msgid "Direct IM established"
-msgstr "二人世界已建立"
+msgstr "二人世界直连聊天已建立"
 
 #, c-format
 msgid ""
@@ -6213,10 +6176,10 @@
 msgstr "本地许可/禁止"
 
 msgid "Warning level too high (sender)"
-msgstr ""
+msgstr "发送者警告级别过高"
 
 msgid "Warning level too high (receiver)"
-msgstr ""
+msgstr "接收者警告级别过高"
 
 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
@@ -6243,7 +6206,7 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
@@ -6313,7 +6276,6 @@
 msgid "Camera"
 msgstr "相机"
 
-#, fuzzy
 msgid "Screen Sharing"
 msgstr "用户名"
 
@@ -6341,17 +6303,16 @@
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "无法连接到身份验证服务器:\n"
 "%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
 msgstr "无法连接到服务器。"
 
-#, fuzzy
 msgid "Username sent"
 msgstr "无名称"
 
@@ -6362,16 +6323,16 @@
 msgid "Finalizing connection"
 msgstr "完成连接"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"无法登入: 无法以 %s 登入,原因是用户名无效。用户名必须是有效的电子邮件地址,"
+"无法登录: 无法以 %s 登录,原因是用户名无效。用户名必须是有效的电子邮件地址,"
 "或者以字母开头,且只能包含字母、数字和空格,或者只包含数字。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr "您即将被断开。请检查 %s 上的更新。"
 
@@ -6387,12 +6348,10 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "用户不存在"
+msgstr "用户名不存在"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
 msgstr "您的账户被停用。"
 
@@ -6400,12 +6359,12 @@
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您使用的客户版本太老。请在 %s 升级"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
@@ -6413,7 +6372,6 @@
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
 msgstr "输入的 SecurID 密钥无效。"
 
@@ -6423,12 +6381,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "输入所显示的六位数字。"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "确定(_O)"
-
 msgid "Password sent"
 msgstr "密码已送出"
 
@@ -6438,12 +6390,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "请同意我将您加入好友。"
 
-msgid "Authorization Request Message:"
-msgstr "认证请求消息:"
-
-msgid "Please authorize me!"
-msgstr "请同意我将您加入好友!"
-
 msgid "No reason given."
 msgstr "没有给出理由。"
 
@@ -6516,46 +6462,40 @@
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#, fuzzy, c-format
+#, 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 条消息,原因是这些消息无效。"
-msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
-
-#, fuzzy, c-format
+msgstr[0] "拒绝(_D)"
+
+#, 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 条消息,原因是这些消息太大。"
-msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
-
-#, fuzzy, c-format
+msgstr[0] "拒绝(_D)"
+
+#, 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
+msgstr[0] "拒绝(_D)"
+
+#, 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[1] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她的警告级别过高。"
-
-#, fuzzy, c-format
+msgstr[0] "拒绝(_D)"
+
+#, 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 条消息,原因是您的警告级别过高。"
-msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是您的警告级别过高。"
-
-#, fuzzy, c-format
+msgstr[0] "拒绝(_D)"
+
+#, 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 条消息,原因未知。"
+msgstr[0] "拒绝(_D)"
 
 #. Data is assumed to be the destination bn
 #, c-format
@@ -6580,7 +6520,7 @@
 msgstr "注册时间"
 
 msgid "Capabilities"
-msgstr "能力"
+msgstr "容量"
 
 msgid "Profile"
 msgstr "个人资料"
@@ -6634,10 +6574,10 @@
 msgid "Pop-Up Message"
 msgstr "弹出消息"
 
-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "下列用户名已经和 %s 关联"
+msgstr[0] "弹出消息"
 
 #, c-format
 msgid "No results found for email address %s"
@@ -6650,29 +6590,29 @@
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名与原始用户名不符。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr "错误 0x%04x:无法格式化用户名,原因是用户名无效。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr "错误 0x%04x:无法格式化用户名,原因是请求的用户名太长。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr "错误 0x%04x:无法更改电子邮件地址,原因是此用户名已经有被推后的请求。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
@@ -6713,33 +6653,33 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
-msgstr[1] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
+msgstr[0] ""
+"您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
+"再试一次。"
 
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
-msgstr[1] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
+msgstr[0] "配置文件太长。"
 
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
@@ -6748,15 +6688,9 @@
 "无法添加好友 %s,原因是用户名无效。用户名必须是有效的电子邮件地址,或者以字母"
 "开头,且只能包含字母、数字和空格,或者只包含数字。"
 
-#, fuzzy
-msgid "Unable to Add"
-msgstr "无法添加"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "无法获取好友列表"
 
-#, fuzzy
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
@@ -6767,7 +6701,7 @@
 msgid "Orphans"
 msgstr "孤儿"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
@@ -6777,11 +6711,11 @@
 msgid "(no name)"
 msgstr "(无名称)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
@@ -6829,7 +6763,7 @@
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "您选择了与 %s 进行二人世界连接。"
+msgstr "您选择了与 %s 进行二人世界直连聊天。"
 
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
@@ -6840,6 +6774,10 @@
 msgid "C_onnect"
 msgstr "连接(_O)"
 
+#, fuzzy
+msgid "You closed the connection."
+msgstr "服务器关闭了连接。"
+
 msgid "Get AIM Info"
 msgstr "获得 AIM 信息"
 
@@ -6850,6 +6788,10 @@
 msgid "Get Status Msg"
 msgstr "获取状态消息"
 
+#, fuzzy
+msgid "End Direct IM Session"
+msgstr "二人世界直连聊天已建立"
+
 msgid "Direct IM"
 msgstr "二人世界"
 
@@ -6868,7 +6810,6 @@
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"
 
-#, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"
 
@@ -6900,22 +6841,19 @@
 msgid "_Search"
 msgstr "搜索(_S)"
 
-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "设置用户信息(URL)..."
+msgstr "设置用户信息(web)..."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "更改密码(URL)"
-
-#, fuzzy
+msgstr "更改密码(web)"
+
 msgid "Configure IM Forwarding (web)"
-msgstr "配置 IM 转发(URL)"
+msgstr "配置聊天转发(web)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "显示隐私选项..."
+msgstr "设置隐私选项..."
 
 #. AIM actions
 msgid "Confirm Account"
@@ -6936,11 +6874,9 @@
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "用户未登入"
-
-#, fuzzy
+msgstr "使用客户端登录"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6954,18 +6890,18 @@
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
+msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
 
 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "正在试图连接到 %s:%hu。"
+msgstr "正在试图连接到 %s:%hu。"
 
 msgid "Attempting to connect via proxy server."
 msgstr "正在试图通过代理服务器连接。"
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s 刚刚请求和 %s 二人世界"
+msgstr "%s 刚刚请求于 %s 进行二人世界直连聊天"
 
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
@@ -7050,16 +6986,14 @@
 msgid "Other"
 msgstr "其它"
 
-#, fuzzy
 msgid "Visible"
-msgstr "隐身"
+msgstr "可见"
 
 msgid "Friend Only"
-msgstr ""
-
-#, fuzzy
+msgstr "仅好友可见"
+
 msgid "Private"
-msgstr "隐私"
+msgstr "私有"
 
 msgid "QQ Number"
 msgstr "QQ 号码"
@@ -7068,7 +7002,7 @@
 msgstr "国家/地区"
 
 msgid "Province/State"
-msgstr "省"
+msgstr "省/州"
 
 msgid "Zipcode"
 msgstr "邮政编码"
@@ -7076,9 +7010,8 @@
 msgid "Phone Number"
 msgstr "电话号码"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "同意吗?"
+msgstr "同意吗添加吗?"
 
 msgid "Cellphone Number"
 msgstr "手机号码"
@@ -7086,64 +7019,50 @@
 msgid "Personal Introduction"
 msgstr "个人简介"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "城市"
-
-#, fuzzy
+msgstr "城市/地区"
+
 msgid "Publish Mobile"
-msgstr "个人手机"
-
-#, fuzzy
+msgstr "公开手机"
+
 msgid "Publish Contact"
-msgstr "给联系人起名"
+msgstr "公开联系方式"
 
 msgid "College"
 msgstr "大学"
 
-#, fuzzy
 msgid "Horoscope"
 msgstr "星座"
 
-#, fuzzy
 msgid "Zodiac"
-msgstr "属相"
-
-#, fuzzy
+msgstr "生肖"
+
 msgid "Blood"
-msgstr "被屏蔽"
-
-#, fuzzy
+msgstr "血型"
+
 msgid "True"
-msgstr "金牛座"
-
-#, fuzzy
+msgstr "真"
+
 msgid "False"
-msgstr "已失败"
-
-#, fuzzy
+msgstr "假"
+
 msgid "Modify Contact"
-msgstr "修改账户"
-
-#, fuzzy
+msgstr "修改联系人"
+
 msgid "Modify Address"
-msgstr "家庭住址"
-
-#, fuzzy
+msgstr "修改地址"
+
 msgid "Modify Extended Information"
-msgstr "修改我的信息"
-
-#, fuzzy
+msgstr "修改扩展信息"
+
 msgid "Modify Information"
-msgstr "修改我的信息"
-
-#, fuzzy
+msgstr "修改信息"
+
 msgid "Update"
-msgstr "上次更新"
-
-#, fuzzy
+msgstr "更新"
+
 msgid "Could not change buddy information."
-msgstr "请输入好友信息。"
+msgstr "无法更改好友信息。"
 
 msgid "Mobile"
 msgstr "移动"
@@ -7152,97 +7071,82 @@
 msgstr "备注"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "好友图标"
+msgstr "好友备注"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "修改他/她的备注"
+
 msgid "_Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "修改(_M)"
+
 msgid "Memo Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "备注修改"
+
 msgid "Server says:"
-msgstr "服务器忙"
+msgstr "服务器回答:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "您的请求被接受。"
 
 msgid "Your request was rejected."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "您的请求被拒绝。"
+
+#, c-format
 msgid "%u requires verification"
-msgstr "请求认证"
-
-#, fuzzy
+msgstr "%u 请求验证"
+
 msgid "Add buddy question"
-msgstr "将用户加为好友吗?"
-
-#, fuzzy
+msgstr "添加好友问题"
+
 msgid "Enter answer here"
-msgstr "在此输入请求"
+msgstr "在此输入回答"
 
 msgid "Send"
 msgstr "发送"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "名称无效"
+msgstr "无效的回答。"
 
 msgid "Authorization denied message:"
 msgstr "认证拒绝消息:"
 
-#, fuzzy
 msgid "Sorry, you're not my style."
-msgstr "抱歉,我不接受好友..."
-
-#, fuzzy, c-format
+msgstr "对不起,我不接受好友..."
+
+#, c-format
 msgid "%u needs authorization"
-msgstr "用户 %d 需要身份验证"
-
-#, fuzzy
+msgstr "%u 需要身份验证"
+
 msgid "Add buddy authorize"
-msgstr "将用户加为好友吗?"
-
-#, fuzzy
+msgstr "添加好友验证"
+
 msgid "Enter request here"
 msgstr "在此输入请求"
 
 msgid "Would you be my friend?"
-msgstr "您是否想要和我交朋友?"
-
-#, fuzzy
+msgstr "您是否愿意和我交朋友?"
+
 msgid "QQ Buddy"
-msgstr "添加好友"
-
-#, fuzzy
+msgstr "QQ 好友"
+
 msgid "Add buddy"
 msgstr "添加好友"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "无效的 QQ 头像"
-
-#, fuzzy
+msgstr "无效的 QQ 号码"
+
 msgid "Failed sending authorize"
-msgstr "请同意我将您加入好友!"
-
-#, fuzzy, c-format
+msgstr "发送验证失败"
+
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "在聊天中加入好友失败"
-
-#, fuzzy, c-format
+msgstr "移除好友 %u 失败"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s 已经将您从好友名单中删除。"
-
-#, fuzzy
+msgstr "%d 已经将您从好友名单中删除。"
+
 msgid "No reason given"
 msgstr "没有给出理由。"
 
@@ -7254,9 +7158,9 @@
 msgid "Would you like to add him?"
 msgstr "您是否想要添加他?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "拒绝"
+msgstr "被 %s 拒绝"
 
 #, c-format
 msgid "Message: %s"
@@ -7271,89 +7175,73 @@
 msgid "QQ Qun"
 msgstr "QQ 群"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "请输入 %s 的新名称"
-
-#, fuzzy
+msgstr "请输入群的号码"
+
 msgid "You can only search for permanent Qun\n"
-msgstr "您只能搜索永久 QQ 群\n"
-
-#, fuzzy
+msgstr "您可以只搜索永久群\n"
+
 msgid "(Invalid UTF-8 string)"
-msgstr "无效的代理设置"
-
-#, fuzzy
+msgstr "(无效的 UTF-8 字符串)"
+
 msgid "Not member"
-msgstr "我不是成员"
-
-#, fuzzy
+msgstr "非成员"
+
 msgid "Member"
-msgstr "注册时间"
-
-#, fuzzy
+msgstr "成员"
+
 msgid "Requesting"
-msgstr "请求对话框"
-
-#, fuzzy
+msgstr "正在发送请求"
+
 msgid "Admin"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "管理员"
+
 msgid "Notice"
 msgstr "备注"
 
-#, fuzzy
 msgid "Detail"
-msgstr "默认"
+msgstr "详细信息"
 
 msgid "Creator"
 msgstr "创始人"
 
-#, fuzzy
 msgid "About me"
-msgstr "关于 %s"
-
-#, fuzzy
+msgstr "关于我"
+
 msgid "Category"
-msgstr "聊天错误"
-
-#, fuzzy
+msgstr "分类"
+
 msgid "The Qun does not allow others to join"
-msgstr "此群不允许其他人加入"
-
-#, fuzzy
+msgstr "该群不允许其他人加入"
+
 msgid "Join QQ Qun"
-msgstr "加入聊天"
+msgstr "加入 QQ 群"
 
 msgid "Input request here"
 msgstr "在此输入请求"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "您成功修改了群成员"
-
-#, fuzzy
+msgstr "成功加入群 %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "您成功修改了群成员"
+msgstr "成功加入群"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "群 %u 拒绝加入"
 
 msgid "QQ Qun Operation"
 msgstr "QQ 群操作"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "已失败"
+msgstr "失败:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "加入群,未知的回复"
+
 msgid "Quit Qun"
-msgstr "QQ 群"
+msgstr "退出群"
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -7362,51 +7250,47 @@
 "请注意,如果您是创始人,\n"
 "此操作将永久删除此群。"
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "抱歉,我不接受好友..."
-
-#, fuzzy
+msgstr "对不起,我们不接受加入申请..."
+
 msgid "Successfully changed Qun members"
-msgstr "您成功修改了群成员"
-
-#, fuzzy
+msgstr "成功修改了群成员"
+
 msgid "Successfully changed Qun information"
-msgstr "您成功修改了群信息"
+msgstr "成功修改了群信息"
 
 msgid "You have successfully created a Qun"
 msgstr "您成功创建了一个群"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "您现在是否想要设置群资料?"
+msgstr "您现在是否要设置详细信息?"
 
 msgid "Setup"
 msgstr "设置"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "用户 %d 申请加入 %d 群"
-
-#, fuzzy, c-format
+msgstr "用户 %u 申请加入 %u 群,验证信息为:%s"
+
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "用户 %d 申请加入 %d 群"
-
-#, fuzzy, c-format
+msgstr "用户 %u 申请加入 %u 群"
+
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "在聊天中加入好友失败"
+msgstr "管理员 %u 拒绝了您加入 %u 的请求"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "删除好友"
-
-#, fuzzy, c-format
+msgstr "<b>删除好友 %u。</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "删除好友"
+msgstr "<b>新好友 %u 已加入。</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7416,24 +7300,20 @@
 msgstr "等级"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
-
-#, fuzzy
+msgstr " TCP"
+
 msgid " FromMobile"
 msgstr "移动"
 
-#, fuzzy
 msgid " BindMobile"
 msgstr "移动"
 
-#, fuzzy
 msgid " Video"
-msgstr "实时视频"
-
-#, fuzzy
+msgstr "视频"
+
 msgid " Zone"
 msgstr "无"
 
@@ -7446,27 +7326,26 @@
 msgid "Invalid name"
 msgstr "名称无效"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "选择文件夹..."
-
-#, fuzzy, c-format
+msgstr "选择图标..."
+
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>登录时间</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>登录时间</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>目前在线人数</b>: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>总计在线好友</b>: %d<br>\n"
+
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>上次刷新</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>上次刷新</b>:: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>服务器 IP</b>: %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>服务器</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
 msgstr "<b>登录时间</b>: %s<br>\n"
 
@@ -7474,56 +7353,53 @@
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>连接方式</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>连接方式</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>我的 Internet IP</b>: %s:%d<br>\n"
+
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
 msgstr "<b>目前在线人数</b>: %d<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
 msgstr "<b>我的公网 IP</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgstr "<b>登录时间</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>服务器 IP</b>: %s: %d<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "登录信息"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>原始作者</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
-
-#, fuzzy
+msgstr "<p><b>代码贡献者</b>:<br>\n"
+
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>目前在线人数</b>: %d<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"
 
@@ -7536,31 +7412,27 @@
 msgid "<i>Feel free to join us!</i> :)"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "About OpenQ %s"
-msgstr "关于 %s"
-
-#, fuzzy
+msgstr "关于 OpenQ %s"
+
 msgid "Change Icon"
-msgstr "保存图标"
+msgstr "更改图标"
 
 msgid "Change Password"
 msgstr "更改密码"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "登录信息"
+msgstr "帐户信息"
 
 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "更新全部 QQ 群"
+
 msgid "About OpenQ"
-msgstr "关于 %s"
-
-#, fuzzy
+msgstr "关于 OpenQ"
+
 msgid "Modify Buddy Memo"
-msgstr "家庭住址"
+msgstr "修改好友备注"
 
 #. *< type
 #. *< ui_requirement
@@ -7572,59 +7444,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "QQ 协议插件"
 
-#, fuzzy
 msgid "Auto"
-msgstr "同意"
-
-#, fuzzy
+msgstr "自动"
+
 msgid "Select Server"
-msgstr "选择用户"
+msgstr "选择服务器"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ2008"
+
 msgid "Connect by TCP"
-msgstr "正连接"
-
-#, fuzzy
+msgstr "通过 TCP 连接"
+
 msgid "Show server notice"
-msgstr "服务器端口"
-
-#, fuzzy
+msgstr "显示服务器通知"
+
 msgid "Show server news"
-msgstr "服务器地址"
+msgstr "显示服务器新闻"
 
 msgid "Show chat room when msg comes"
-msgstr ""
-
-#, fuzzy
+msgstr "当消息到来时显示聊天室"
+
 msgid "Keep alive interval (seconds)"
 msgstr "保持在线错误"
 
-#, fuzzy
 msgid "Update interval (seconds)"
 msgstr "保持在线错误"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "无法获取服务器信息"
+msgstr "无法解密服务器回复"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
 msgstr "无效的标题"
 
@@ -7635,40 +7498,33 @@
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "需要注册"
+msgstr "需要激活"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""
 
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "正在请求 %s 的注意..."
 
-#, fuzzy
 msgid "Checking captcha"
 msgstr "正在请求 %s 的注意..."
 
-#, fuzzy
 msgid "Failed captcha verification"
 msgstr "Yahoo! 认证失败"
 
-#, fuzzy
 msgid "Captcha Image"
 msgstr "保存图像"
 
-#, fuzzy
 msgid "Enter code"
-msgstr "输入密码"
+msgstr "输入代码"
 
 msgid "QQ Captcha Verification"
 msgstr ""
 
-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "请输入组名称"
+msgstr "输入图像显示的文本"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
@@ -7683,31 +7539,25 @@
 msgid "Socket error"
 msgstr "套接字错误"
 
-#, fuzzy
 msgid "Getting server"
 msgstr "设置用户信息..."
 
-#, fuzzy
 msgid "Requesting token"
 msgstr "请求被禁止"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "无法连接到服务器。"
-
-#, fuzzy
+msgstr "无法解析服务器"
+
 msgid "Invalid server or port"
-msgstr "无效错误"
-
-#, fuzzy
+msgstr "无效服务器或端口"
+
 msgid "Connecting to server"
-msgstr "连接到 SILC 服务器"
-
-#, fuzzy
+msgstr "正在连接到服务器"
+
 msgid "QQ Error"
-msgstr "QQ 号错误"
-
-#, fuzzy, c-format
+msgstr "QQ 错误"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
@@ -7715,23 +7565,22 @@
 "%s"
 msgstr "ICQ 服务器转发"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s:%s"
-msgstr "%s(%s)"
-
-#, fuzzy, c-format
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "来自"
-
-#, fuzzy, c-format
+msgstr "来自 %s:"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
 msgstr "服务器指令:%s"
 
-#, fuzzy
 msgid "Unknown SERVER CMD"
-msgstr "未知原因"
+msgstr "未知服务器命令"
 
 #, c-format
 msgid ""
@@ -7739,21 +7588,17 @@
 "Room %u, reply 0x%02X"
 msgstr ""
 
-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "命令"
-
-#, fuzzy
+msgstr "QQ 群命令"
+
 msgid "Unable to decrypt login reply"
-msgstr "无法获取服务器信息"
-
-#, fuzzy
+msgstr "无法解密服务器登录回复"
+
 msgid "Unknown LOGIN CMD"
-msgstr "未知原因"
-
-#, fuzzy
+msgstr "未知登录命令"
+
 msgid "Unknown CLIENT CMD"
-msgstr "未知原因"
+msgstr "未知客户端命令"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7762,8 +7607,8 @@
 msgid "File Send"
 msgstr "发送文件"
 
-#, c-format
-msgid "%d canceled the transfer of %s"
+#, fuzzy, c-format
+msgid "%d cancelled the transfer of %s"
 msgstr "%d 取消了 %s 的传送"
 
 #, c-format
@@ -7779,13 +7624,13 @@
 msgstr "组 %s 的信息"
 
 msgid "Notes Address Book Information"
-msgstr "Notes 地址簿信息"
+msgstr "Notes 通讯录信息"
 
 msgid "Invite Group to Conference..."
 msgstr "邀请组加入会议..."
 
 msgid "Get Notes Address Book Info"
-msgstr "获得 Notes 地址簿信息"
+msgstr "获得 Notes 通讯录信息"
 
 msgid "Sending Handshake"
 msgstr "发送握手"
@@ -7794,16 +7639,16 @@
 msgstr "等候握手应答"
 
 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "握手成功,发送登录信息"
 
 msgid "Waiting for Login Acknowledgement"
-msgstr ""
+msgstr "正在等待登录确认"
 
 msgid "Login Redirected"
 msgstr "登录被重定向"
 
 msgid "Forcing Login"
-msgstr "强制登入"
+msgstr "强制登录"
 
 msgid "Login Acknowledged"
 msgstr "登录被接受"
@@ -7829,7 +7674,6 @@
 msgid "Unable to send message: "
 msgstr "无法发送消息: "
 
-#, fuzzy
 msgid "Place Closed"
 msgstr "已取消"
 
@@ -7916,7 +7760,6 @@
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知 (0x%04x)<br>"
 
-#, fuzzy
 msgid "Last Known Client"
 msgstr "客户等级"
 
@@ -7929,7 +7772,7 @@
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
@@ -7996,7 +7839,7 @@
 msgstr "可能的匹配"
 
 msgid "Notes Address Book group results"
-msgstr "Notes 地址簿组结果"
+msgstr "Notes 通讯录组结果"
 
 #, c-format
 msgid ""
@@ -8006,7 +7849,7 @@
 msgstr ""
 
 msgid "Select Notes Address Book"
-msgstr "选择 Notes 地址簿"
+msgstr "选择 Notes 通讯录"
 
 msgid "Unable to add group: group not found"
 msgstr "无法从添加组:组未找到"
@@ -8018,7 +7861,7 @@
 msgstr ""
 
 msgid "Notes Address Book Group"
-msgstr "Notes 地址簿组"
+msgstr "Notes 通讯录组"
 
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
@@ -8067,7 +7910,7 @@
 msgstr "导出 Sametime 列表..."
 
 msgid "Add Notes Address Book Group..."
-msgstr "添加 Notes 地址簿组..."
+msgstr "添加 Notes 通讯录组..."
 
 msgid "User Search..."
 msgstr "用户搜索..."
@@ -8130,7 +7973,7 @@
 msgstr "密钥协议请求"
 
 msgid "IM With Password"
-msgstr "带密码开聊"
+msgstr "带密码聊天"
 
 msgid "Cannot set IM key"
 msgstr "无法设定聊天密钥"
@@ -8148,7 +7991,7 @@
 msgstr "显示公钥"
 
 msgid "Could not load public key"
-msgstr "无法装入公钥"
+msgstr "无法载入公钥"
 
 msgid "User Information"
 msgstr "用户信息"
@@ -8268,10 +8111,10 @@
 msgstr "重置聊天密钥"
 
 msgid "IM with Key Exchange"
-msgstr "带密钥交换开聊"
+msgstr "带密钥交换聊天"
 
 msgid "IM with Password"
-msgstr "带密码开聊"
+msgstr "带密码聊天"
 
 msgid "Get Public Key..."
 msgstr "获取公钥..."
@@ -8283,7 +8126,7 @@
 msgstr "在白板上绘画"
 
 msgid "_Passphrase:"
-msgstr "密码句(_P):"
+msgstr "密码(_P):"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
@@ -8309,7 +8152,7 @@
 
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>频道密码句:</b> %s"
+msgstr "<br><b>频道密码:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
 #, c-format
@@ -8340,7 +8183,7 @@
 msgstr "打开公钥..."
 
 msgid "Channel Passphrase"
-msgstr "频道密码句"
+msgstr "频道密码"
 
 msgid "Channel Public Keys List"
 msgstr "频道公钥列表"
@@ -8353,9 +8196,9 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"频道身份验证用于根据未经验证的访问保卫频道。身份验证可基于密码句和数字签名。"
-"如果设定了密码句,那么需要提供密码句才能加入。如果设定了频道公钥,那么只有那"
-"些公钥已经列出的用户才能加入。"
+"频道身份验证用于根据未经验证的访问保卫频道。身份验证可基于密码和数字签名。如"
+"果设定了密码,那么需要提供密码才能加入。如果设定了频道公钥,那么只有那些公钥"
+"已经列出的用户才能加入。"
 
 msgid "Channel Authentication"
 msgstr "频道认证"
@@ -8367,11 +8210,11 @@
 msgstr "组名称"
 
 msgid "Passphrase"
-msgstr "密码句"
+msgstr "密码"
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "请输入 %s 频道私有组的名称和密码句。"
+msgstr "请输入 %s 频道私有组的名称和密码。"
 
 msgid "Add Channel Private Group"
 msgstr "添加频道私有组"
@@ -8413,10 +8256,10 @@
 msgstr "设定私有频道"
 
 msgid "Reset Secret Channel"
-msgstr "重置绝密频道"
+msgstr "重置秘密频道"
 
 msgid "Set Secret Channel"
-msgstr "设定绝密频道"
+msgstr "设定秘密频道"
 
 #, c-format
 msgid ""
@@ -8513,7 +8356,7 @@
 msgstr "被 %s (%s) 杀死"
 
 msgid "Server signoff"
-msgstr "服务器登出"
+msgstr "服务器退出"
 
 msgid "Personal Information"
 msgstr "个人信息"
@@ -8522,7 +8365,7 @@
 msgstr "生日"
 
 msgid "Job Role"
-msgstr "职位"
+msgstr "职务"
 
 msgid "Organization"
 msgstr "组织"
@@ -8569,10 +8412,10 @@
 msgstr "更改昵称失败"
 
 msgid "Roomlist"
-msgstr "房间列表"
+msgstr "聊天室列表"
 
 msgid "Cannot get room list"
-msgstr "无法获取房间列表"
+msgstr "无法获取聊天室列表"
 
 msgid "Network is empty"
 msgstr "网络为空"
@@ -8657,7 +8500,7 @@
 msgstr "校验服务器公钥"
 
 msgid "Passphrase required"
-msgstr "请求密码句"
+msgstr "需要密码"
 
 #, c-format
 msgid ""
@@ -8693,7 +8536,6 @@
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
@@ -8707,34 +8549,28 @@
 msgid "Performing key exchange"
 msgstr "执行密钥交换"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "无法装入 SILC 密钥对"
+msgstr "无法载入 SILC 密钥对"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "连接到 SILC 服务器"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "无法装入 SILC 密钥对"
-
 msgid "Out of memory"
 msgstr "内存溢出"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "无法初始化 SILC 协议"
 
 msgid "Error loading SILC key pair"
-msgstr "装入 SILC 密钥对出错"
-
-#, fuzzy, c-format
+msgstr "载入 SILC 密钥对出错"
+
+#, c-format
 msgid "Download %s: %s"
-msgstr "%s 上的用户数: %s"
+msgstr "下载 %s:%s"
 
 msgid "Your Current Mood"
-msgstr "您目前的心情"
+msgstr "您现在的心情"
 
 #, c-format
 msgid "Normal"
@@ -8772,7 +8608,7 @@
 msgstr "让其它人看到您正在使用哪台计算机"
 
 msgid "Your VCard File"
-msgstr "您的 VCard 文件"
+msgstr "您的 vCard 文件"
 
 msgid "Timezone (UTC)"
 msgstr "时区(UTC)"
@@ -8801,7 +8637,7 @@
 msgstr "创建新的 SILC 密钥对"
 
 msgid "Passphrases do not match"
-msgstr "密码句不匹配"
+msgstr "密码不匹配"
 
 msgid "Key Pair Generation failed"
 msgstr "密钥对生成失败"
@@ -8816,7 +8652,7 @@
 msgstr "私钥文件"
 
 msgid "Passphrase (retype)"
-msgstr "密码句(重输)"
+msgstr "密码(重输)"
 
 msgid "Generate Key Pair"
 msgstr "创建密钥对"
@@ -8861,16 +8697,16 @@
 msgstr "未知命令: %s,(可能是客户端 bug)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr "part [频道]: 离开聊天"
+msgstr "part [频道]: 离聊天天"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [频道]: 离开聊天"
+msgstr "leave [频道]: 离聊天天"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
+msgstr "join: &lt;聊天室&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
 
 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
@@ -8920,7 +8756,7 @@
 msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
+msgstr "oper &lt;昵称&gt; [-pubkey]:获得服务器管理员权限"
 
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
@@ -8938,7 +8774,7 @@
 msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
+msgstr "getkey &lt;昵称|服务器&gt;:获取客户或服务器的公钥"
 
 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
@@ -9008,9 +8844,8 @@
 msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "创建 SILC 密钥对..."
+msgstr "无法创建 SILC 密钥对"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9047,9 +8882,9 @@
 msgid "Key Length: \t%d bits\n"
 msgstr "密钥长度:\t%d 位\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "原因: %s"
+msgstr "版本:\t%s\n"
 
 #, c-format
 msgid ""
@@ -9146,33 +8981,28 @@
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"
 
 msgid "John Noname"
 msgstr "张三"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "无法装入 SILC 密钥对: %s"
+msgstr "无法载入 SILC 密钥对: %s"
 
 msgid "Unable to create connection"
 msgstr "无法创建连接"
 
-#, fuzzy
 msgid "Unknown server response"
 msgstr "未知的服务器响应。"
 
-#, fuzzy
 msgid "Unable to create listen socket"
 msgstr "无法创建套接字"
 
-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 用户名不能包含空格或 @ 符号"
 
-#, fuzzy
 msgid "SIP connect server not specified"
 msgstr "服务器端口"
 
@@ -9210,17 +9040,16 @@
 msgstr "认证域"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
+msgstr "join: &lt;聊天室&gt;: 加入 Yahoo 网络上的聊天室"
 
 msgid "list: List rooms on the Yahoo network"
-msgstr "list: 列出 Yahoo 网络上的房间"
+msgstr "list: 列出 Yahoo 网络上的聊天室"
 
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
-#, fuzzy
 msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9232,7 +9061,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
@@ -9249,13 +9077,16 @@
 msgstr "文件传送端口"
 
 msgid "Chat room locale"
-msgstr "聊天房间语系"
+msgstr "聊天聊天室语系"
 
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略会议和聊天室邀请"
 
+msgid "Use account proxy for SSL connections"
+msgstr ""
+
 msgid "Chat room list URL"
-msgstr "聊天房间列表 URL"
+msgstr "聊天聊天室列表 URL"
 
 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天服务器"
@@ -9263,9 +9094,8 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天端口"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo! ID"
+msgstr "Yahoo ID..."
 
 #. *< type
 #. *< ui_requirement
@@ -9277,12 +9107,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Yahoo 协议插件"
 
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s 向您发送了视频聊天邀请,但尚不支持。"
+
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "您的 SMS 未被递送"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
@@ -9305,26 +9138,22 @@
 msgstr "添加拒绝的好友"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "在与服务器的连接中收到了无效的数据。"
+msgstr "接收到无效的数据。"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
 msgstr "昵称或密码不对"
 
@@ -9334,7 +9163,7 @@
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"Yahoo 服务器请求使用未识别的认证方式。您可能无法成功登入 Yahoo。请检查 %s 上"
+"Yahoo 服务器请求使用未识别的认证方式。您可能无法成功登录 Yahoo。请检查 %s 上"
 "的更新。"
 
 msgid "Failed Yahoo! Authentication"
@@ -9350,18 +9179,33 @@
 msgid "Ignore buddy?"
 msgstr "忽略好友?"
 
-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
+#, fuzzy
+msgid "Invalid username or password"
+msgstr "用户名或密码错误"
+
+#, fuzzy
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr ""
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
@@ -9369,17 +9213,16 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
 msgstr "从服务器收到了意外的 HTTP 响应。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
 msgstr ""
 "失去与 %s 的连接:\n"
 "%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr "无法与服务器建立连接"
 
@@ -9407,15 +9250,14 @@
 msgid "Appear Permanently Offline"
 msgstr "显示为临时离线"
 
-#, fuzzy
 msgid "Presence"
-msgstr "首选项"
+msgstr ""
 
 msgid "Appear Offline"
 msgstr "显示为离线"
 
 msgid "Don't Appear Permanently Offline"
-msgstr "不显示临时离线"
+msgstr "不显示永久离线"
 
 msgid "Join in Chat"
 msgstr "加入聊天"
@@ -9423,7 +9265,6 @@
 msgid "Initiate Conference"
 msgstr "发起会议"
 
-#, fuzzy
 msgid "Presence Settings"
 msgstr "使用环境设置"
 
@@ -9431,7 +9272,7 @@
 msgstr ""
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "选择您要激活的 ID"
 
 msgid "Join whom in chat?"
 msgstr "将谁加入聊天?"
@@ -9457,15 +9298,15 @@
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s 正在发送文件 %s"
+msgstr "%s 正在发送文件 %s\n"
 
 msgid "Write Error"
 msgstr "写错误"
 
 msgid "Yahoo! Japan Profile"
-msgstr "Yahoo 日本资料"
+msgstr "Yahoo! 日本资料"
 
 msgid "Yahoo! Profile"
 msgstr "Yahoo! 资料"
@@ -9473,7 +9314,7 @@
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "抱歉,标为含有成人内容的个人资料目前不被支持。"
+msgstr "对不起,标为含有成人内容的个人资料目前不被支持。"
 
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
@@ -9504,10 +9345,9 @@
 msgid "Last Update"
 msgstr "上次更新"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr "抱歉,此配置文件似乎是目前并不支持的语言或格式。"
+msgstr "对不起,此配置文件似乎是目前并不支持的语言或格式。"
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -9526,22 +9366,19 @@
 msgstr "用户的配置文件为空。"
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 拒绝您加入房间“%s”的会议邀请,原因为“%s”。"
-
-msgid "Invitation Rejected"
-msgstr "邀请已拒绝"
+msgid "%s has declined to join."
+msgstr "%s 已登录。"
 
 msgid "Failed to join chat"
 msgstr "加入聊天失败"
 
 #. -6
 msgid "Unknown room"
-msgstr "未知房间"
+msgstr "未知聊天室"
 
 #. -15
 msgid "Maybe the room is full"
-msgstr "可能房间已满"
+msgstr "可能聊天室已满"
 
 #. -35
 msgid "Not available"
@@ -9563,7 +9400,7 @@
 msgstr "可能他们未在聊天中?"
 
 msgid "Fetching the room list failed."
-msgstr "获取房间列表失败。"
+msgstr "获取聊天室列表失败。"
 
 msgid "Voices"
 msgstr "语音"
@@ -9575,12 +9412,11 @@
 msgstr "连接问题"
 
 msgid "Unable to fetch room list."
-msgstr "无法获取房间列表。"
+msgstr "无法获取聊天室列表。"
 
 msgid "User Rooms"
-msgstr "用户房间"
-
-#, fuzzy
+msgstr "用户聊天室"
+
 msgid "Connection problem with the YCHT server"
 msgstr "YCHT 服务器连接出现问题。"
 
@@ -9594,7 +9430,7 @@
 msgstr "无法发送给聊天 %s,%s,%s"
 
 msgid "Hidden or not logged-in"
-msgstr "隐身或未登入"
+msgstr "隐身或未登录"
 
 #, c-format
 msgid "<br>At %s since %s"
@@ -9704,15 +9540,15 @@
 msgid "Exposure"
 msgstr "暴露"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "无法从 HTTP 代理分析响应:%s\n"
+msgstr "无法从 HTTP 代理分析响应:%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理服务器连接错误 %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "访问被禁止: HTTP 代理服务器禁止端口 %d 流过。"
 
@@ -9772,18 +9608,15 @@
 msgstr "接受聊天邀请吗?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "排序"
-
-#, fuzzy
+msgstr "快捷方式"
+
 msgid "The text-shortcut for the smiley"
-msgstr "GTK+ 文字快捷方式主题"
+msgstr "表情的文字快捷方式"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "保存图像"
+msgstr "保存的图像"
 
 msgid "Stored Image. (that'll have to do for now)"
 msgstr ""
@@ -9810,11 +9643,11 @@
 msgstr "远远离开"
 
 msgid "Listening to music"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "正在听音乐"
+
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s 将状态从 %s 更改为 %s"
+msgstr "%s (%s) 将状态从 %s 更改为 %s"
 
 #, c-format
 msgid "%s (%s) is now %s"
@@ -9856,41 +9689,35 @@
 msgid "Unknown."
 msgstr "未知。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "%d 秒"
-msgstr[1] "%d 秒"
-
-#, fuzzy, c-format
+msgstr[0] "未知。"
+
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "%d 天"
-msgstr[1] "%d 天"
-
-#, fuzzy, c-format
+msgstr[0] "未知。"
+
+#, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] "%s %d 小时"
-msgstr[1] "%s %d 小时"
-
-#, fuzzy, c-format
+msgstr[0] "未知。"
+
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "%d 小时"
-msgstr[1] "%d 小时"
-
-#, fuzzy, c-format
+msgstr[0] "未知。"
+
+#, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "%s %d 分"
-msgstr[1] "%s %d 分"
-
-#, fuzzy, c-format
+msgstr[0] "未知。"
+
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "%d 分"
-msgstr[1] "%d 分"
+msgstr[0] "未知。"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -9900,7 +9727,7 @@
 msgid "Unable to connect to %s"
 msgstr "无法连接到 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
 msgstr "从套接字读取时出错。"
 
@@ -9910,9 +9737,9 @@
 "server may be trying something malicious."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr "从套接字读取时出错。"
+msgstr "从 %s 读取出错:%s"
 
 #, c-format
 msgid "Error writing to %s: %s"
@@ -9926,44 +9753,44 @@
 msgid " - %s"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid " (%s)"
-msgstr "%s(%s)"
+msgstr " (%s)"
 
 #. 10053
 #, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr ""
+msgstr "连接被您计算机上的其他软件中断。"
 
 #. 10054
-#, fuzzy, c-format
+#, c-format
 msgid "Remote host closed connection."
-msgstr "远程用户关闭了连接。"
+msgstr "远程主机关闭了连接。"
 
 #. 10060
-#, fuzzy, c-format
+#, c-format
 msgid "Connection timed out."
-msgstr "连接超时"
+msgstr "连接超时。"
 
 #. 10061
-#, fuzzy, c-format
+#, c-format
 msgid "Connection refused."
-msgstr "连接重置"
+msgstr "连接被拒绝。"
 
 #. 10048
-#, fuzzy, c-format
+#, c-format
 msgid "Address already in use."
-msgstr "此聊天名已经在使用中"
+msgstr "此地址已被使用。"
 
 #, c-format
 msgid "Error Reading %s"
 msgstr "读取 %s 出错"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
-msgstr "读取您的 %s 时遇到了错误。该文件未装入,旧文件被移动到 %s~ 中了。"
+msgstr "读取您的 %s 时遇到了错误。该文件未载入,旧文件被移动到 %s~ 中了。"
 
 msgid "Internet Messenger"
 msgstr "互联网通讯程序"
@@ -9982,7 +9809,7 @@
 
 #. Build the login options frame.
 msgid "Login Options"
-msgstr "登入选项"
+msgstr "登录选项"
 
 msgid "Pro_tocol:"
 msgstr "协议(_T):"
@@ -10007,7 +9834,7 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "用作当前账户头像(_I):"
 
-msgid "_Advanced"
+msgid "Ad_vanced"
 msgstr "高级(_A)"
 
 msgid "Use GNOME Proxy Settings"
@@ -10067,12 +9894,10 @@
 msgid "_Basic"
 msgstr "基本(_B)"
 
-#, fuzzy
 msgid "Create _this new account on the server"
-msgstr "在服务器上创建此新帐户"
-
-#, fuzzy
-msgid "_Proxy"
+msgstr "在服务器上创建此新帐户(_T)"
+
+msgid "P_roxy"
 msgstr "代理"
 
 msgid "Enabled"
@@ -10081,7 +9906,7 @@
 msgid "Protocol"
 msgstr "协议"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -10102,12 +9927,130 @@
 "如果您想要回到此窗口以便添加、编辑或删除帐户,可以从好友列表中窗口中选择<b>帐"
 "户->添加/编辑</b>"
 
-#, fuzzy, c-format
+#. Buddy List
+msgid "Background Color"
+msgstr "背景颜色"
+
+msgid "The background color for the buddy list"
+msgstr "此好友列表的背景色"
+
+msgid "Layout"
+msgstr "样式"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr ""
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "背景颜色"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "展开文本"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "选择背景颜色"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "折叠文本(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "联系人/聊天背景颜色"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "联系人文字"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+#, fuzzy
+msgid "Online Text"
+msgstr "在线文字"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "离开文字"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+#, fuzzy
+msgid "Offline Text"
+msgstr "离线文字"
+
+#, fuzzy
+msgid "The text information for when a buddy is offline"
+msgstr "更改 %s 的用户信息"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "发呆文字"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "消息文本"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr "更改 %s 的用户信息"
+
+#, 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 位联系人。您是否想要合并?"
+msgstr[0] "更改 %s 的用户信息"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10128,9 +10071,8 @@
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-#, fuzzy
 msgid "Room _List"
-msgstr "房间列表"
+msgstr "聊天室列表(_L)"
 
 msgid "_Block"
 msgstr "屏蔽(_B)"
@@ -10142,21 +10084,19 @@
 msgstr "移至"
 
 msgid "Get _Info"
-msgstr "资料(_I)"
+msgstr "获取信息(_I)"
 
 msgid "I_M"
-msgstr "开聊(_M)"
-
-#, fuzzy
+msgstr "聊天(_M)"
+
 msgid "_Audio Call"
-msgstr "添加聊天(_A)"
+msgstr "音频聊天(_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "音频/视频 呼叫(_V)"
+
 msgid "_Video Call"
-msgstr "可视聊天"
+msgstr "视频聊天(_V)"
 
 msgid "_Send File..."
 msgstr "发送文件(_S)..."
@@ -10165,13 +10105,11 @@
 msgstr "添加好友千里眼(_P)..."
 
 msgid "View _Log"
-msgstr "查看日志(_L)"
-
-#, fuzzy
+msgstr "查看聊天记录(_L)"
+
 msgid "Hide When Offline"
 msgstr "离线时隐藏"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "离线时显示"
 
@@ -10181,9 +10119,8 @@
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "设置自定义图标..."
+msgstr "设置自定义图标"
 
 msgid "Remove Custom Icon"
 msgstr "删除自定义图标"
@@ -10210,9 +10147,8 @@
 msgid "Persistent"
 msgstr "永久"
 
-#, fuzzy
 msgid "_Edit Settings..."
-msgstr "编辑设置"
+msgstr "编辑设置(_E)..."
 
 msgid "_Collapse"
 msgstr "折叠(_C)"
@@ -10221,16 +10157,15 @@
 msgstr "展开(_E)"
 
 msgid "/Tools/Mute Sounds"
-msgstr "/工具(T)/静音(S)"
+msgstr "/工具/静音"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
-msgstr "您目前登入的协议中没有一个可以添加好友的。"
+msgstr "您目前登录的协议中没有一个可以添加好友的。"
 
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#, fuzzy
 msgid "Unknown node type"
 msgstr "未知的错误代码 %d"
 
@@ -10248,7 +10183,7 @@
 msgstr "/好友(B)/获取用户信息(_I)..."
 
 msgid "/Buddies/View User _Log..."
-msgstr "/好友(B)/查看用户日志(_L)..."
+msgstr "/好友(B)/查看用户聊天记录(_L)..."
 
 msgid "/Buddies/Sh_ow"
 msgstr "/好友(B)/显示(_O)"
@@ -10287,89 +10222,84 @@
 msgid "/_Accounts"
 msgstr "/账户(_A)"
 
-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/账户(A)/管理"
+msgstr "/账户/管理帐户"
 
 #. Tools
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/工具(T)/好友千里眼(_P)"
+msgstr "/工具/好友千里眼(_P)"
 
 msgid "/Tools/_Certificates"
-msgstr "/工具(T)/证书(_C)"
-
-#, fuzzy
+msgstr "/工具/证书(_C)"
+
 msgid "/Tools/Custom Smile_ys"
-msgstr "/工具(T)/隐私(I)"
+msgstr "/工具/自定义表情(_Y)"
 
 msgid "/Tools/Plu_gins"
-msgstr "/工具(T)/插件(_G)"
+msgstr "/工具/插件(_G)"
 
 msgid "/Tools/Pr_eferences"
-msgstr "/工具(T)/首选项(_E)"
+msgstr "/工具/首选项(_E)"
 
 msgid "/Tools/Pr_ivacy"
-msgstr "/工具(T)/隐私(_I)"
+msgstr "/工具/隐私(_I)"
 
 msgid "/Tools/_File Transfers"
-msgstr "/工具(T)/文件传送(_F)"
+msgstr "/工具/文件传送(_F)"
 
 msgid "/Tools/R_oom List"
-msgstr "/工具(T)/房间列表(_O)"
+msgstr "/工具/聊天室列表(_O)"
 
 msgid "/Tools/System _Log"
-msgstr "/工具(T)/系统日志(_L)"
+msgstr "/工具/系统日志(_L)"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/工具(T)/静音(_S)"
+msgstr "/工具/静音(_S)"
 
 #. Help
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
 msgid "/Help/Online _Help"
-msgstr "/帮助(H)/在线帮助(_H)"
+msgstr "/帮助/在线帮助(_H)"
 
 msgid "/Help/_Debug Window"
-msgstr "/帮助(H)/调试窗口(_D)"
+msgstr "/帮助/调试窗口(_D)"
 
 msgid "/Help/_About"
-msgstr "/帮助(H)/关于(_A)"
-
-#, fuzzy, c-format
+msgstr "/帮助/关于(_A)"
+
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>账户:</b>%s"
-
-#, fuzzy, c-format
+msgstr "<b>账户:</b>%s"
+
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>账户:</b>%s"
-
-#, fuzzy, c-format
+"<b>成员:</b>%d"
+
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>账户:</b>%s"
-
-#, fuzzy
+"<b>主题:</b>%s"
+
 msgid "(no topic set)"
-msgstr "未设定话题"
+msgstr "(未设定话题)"
 
 msgid "Buddy Alias"
 msgstr "好友别名"
 
 msgid "Logged In"
-msgstr "已登入"
+msgstr "已登录"
 
 msgid "Last Seen"
 msgstr "上次见面"
@@ -10383,9 +10313,8 @@
 msgid "Rockin'"
 msgstr ""
 
-#, fuzzy
 msgid "Total Buddies"
-msgstr "好友"
+msgstr "全部好友"
 
 #, c-format
 msgid "Idle %dd %dh %02dm"
@@ -10400,34 +10329,33 @@
 msgstr "发呆 %d分"
 
 msgid "/Buddies/New Instant Message..."
-msgstr "/好友(B)/新即时消息(M)..."
+msgstr "/好友/新即时消息..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/好友(B)/加入聊天(C)..."
+msgstr "/好友/加入聊天..."
 
 msgid "/Buddies/Get User Info..."
-msgstr "/好友(B)/获取用户信息(I)..."
+msgstr "/好友/获取用户信息..."
 
 msgid "/Buddies/Add Buddy..."
-msgstr "/好友(B)/添加好友(A)..."
+msgstr "/好友/添加好友..."
 
 msgid "/Buddies/Add Chat..."
-msgstr "/好友(B)/添加聊天(H)..."
+msgstr "/好友/添加聊天..."
 
 msgid "/Buddies/Add Group..."
-msgstr "/好友(B)/添加组(G)..."
+msgstr "/好友/添加组..."
 
 msgid "/Tools/Privacy"
-msgstr "/工具(T)/隐私(I)"
+msgstr "/工具/隐私"
 
 msgid "/Tools/Room List"
-msgstr "/工具(T)/房间列表(O)"
-
-#, fuzzy, c-format
+msgstr "/工具/聊天室列表"
+
+#, 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"
+msgstr[0] "/工具/聊天室列表\n"
 
 msgid "Manually"
 msgstr "手动"
@@ -10436,35 +10364,33 @@
 msgstr "按状态"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "按最近活跃度"
 
 #, c-format
 msgid "%s disconnected"
 msgstr "%s 已断开连接"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s disabled"
-msgstr "命令已禁用"
-
-#, fuzzy
+msgstr "%s 已禁用"
+
 msgid "Reconnect"
-msgstr "连接"
-
-#, fuzzy
+msgstr "重新连接"
+
 msgid "Re-enable"
-msgstr "重新启用账户"
+msgstr "重新启用"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL 常见问题"
 
 msgid "Welcome back!"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "欢迎回来!"
+
+#, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "您在其它位置用此用户名登入了。"
+msgstr[0] "欢迎回来!"
 
 msgid "<b>Username:</b>"
 msgstr "<b>用户名:</b>"
@@ -10479,7 +10405,7 @@
 msgstr "/账户(A)"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
@@ -10496,35 +10422,31 @@
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/好友(B)/显示(O)//离线好友(O)"
+msgstr "/好友/显示/离线好友"
 
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/好友(B)/显示(O)//空组(E)"
+msgstr "/好友/显示/空组"
 
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/好友(B)/显示(O)//好友详细资料(D)"
+msgstr "/好友/显示/好友详细资料"
 
 msgid "/Buddies/Show/Idle Times"
-msgstr "/好友(B)/显示(O)/发呆时间(T)"
+msgstr "/好友/显示/发呆时间"
 
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/好友(B)/显示(O)/协议图标(P)"
-
-#, fuzzy
+msgstr "/好友/显示/协议图标"
+
 msgid "Add a buddy.\n"
-msgstr "添加好友"
-
-#, fuzzy
+msgstr "添加好友。\n"
+
 msgid "Buddy's _username:"
-msgstr "好友名称:"
-
-#, fuzzy
+msgstr "好友名称(_U):"
+
 msgid "(Optional) A_lias:"
-msgstr "额外信息:"
-
-#, fuzzy
+msgstr "别名(可选):"
+
 msgid "Add buddy to _group:"
-msgstr "将用户加为好友吗?"
+msgstr "将用户添加到组:"
 
 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
@@ -10532,7 +10454,7 @@
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "您目前登入的协议中没有一个可以聊天的。"
+msgstr "您目前登录的协议中没有一个可以聊天的。"
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
@@ -10546,10 +10468,9 @@
 msgstr "组(_G):"
 
 #, fuzzy
-msgid "Auto_join when account becomes online."
+msgid "Auto_join when account connects."
 msgstr "帐户在线时自动加入。"
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
 msgstr "窗口关闭时隐藏聊天。"
 
@@ -10560,10 +10481,10 @@
 msgstr "启用账户"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/帐户(A)/启用帐户"
+msgstr "<PurpleMain>/帐户/启用帐户"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/账户(A)/"
+msgstr "<PurpleMain>/账户/"
 
 msgid "_Edit Account"
 msgstr "编辑账户(_E)"
@@ -10575,118 +10496,11 @@
 msgstr "禁用(_D)"
 
 msgid "/Tools"
-msgstr "/工具(T)"
+msgstr "/工具"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/好友(B)/好友排序(S)"
-
-#. Buddy List
-msgid "Background Color"
-msgstr "背景颜色"
-
-#, fuzzy
-msgid "The background color for the buddy list"
-msgstr "您已经将此群添加到好友"
-
-#, fuzzy
-msgid "Layout"
-msgstr "狮子座"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr ""
-
-#. Group
-#, fuzzy
-msgid "Expanded Background Color"
-msgstr "背景颜色"
-
-msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
-msgid "Expanded Text"
-msgstr "展开(_E)"
-
-msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
-msgid "Collapsed Background Color"
-msgstr "选择背景颜色"
-
-msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
-msgid "Collapsed Text"
-msgstr "折叠(_C)"
-
-msgid "The text information for when a group is collapsed"
-msgstr ""
-
-#. Buddy
-#, fuzzy
-msgid "Contact/Chat Background Color"
-msgstr "选择背景颜色"
-
-msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
-msgid "Contact Text"
-msgstr "排序"
-
-msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
-msgid "On-line Text"
-msgstr "在线"
-
-msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
-msgid "Away Text"
-msgstr "离开"
-
-msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
-msgid "Off-line Text"
-msgstr "离线"
-
-msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
-msgid "Idle Text"
-msgstr "血型"
-
-msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
-msgid "Message Text"
-msgstr "消息已送出"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr ""
-
-msgid "Message (Nick Said) Text"
-msgstr ""
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-
-#, fuzzy
-msgid "The text information for a buddy's status"
-msgstr "更改 %s 的用户信息"
-
-#, fuzzy
+msgstr "/好友/好友排序"
+
 msgid "Type the host name for this certificate."
 msgstr "输入此证书所适用的主机名。"
 
@@ -10702,7 +10516,7 @@
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
-msgstr "您目前登入的协议中没有一个可以邀请好友的。"
+msgstr "您目前登录的协议中没有一个可以邀请好友的。"
 
 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
@@ -10715,7 +10529,7 @@
 
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>与 %s 的谈话</h1>\n"
+msgstr "<h1>与 %s 的会话</h1>\n"
 
 msgid "Save Conversation"
 msgstr "保存对话"
@@ -10735,7 +10549,6 @@
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "上次说道"
 
@@ -10757,9 +10570,8 @@
 msgid "Set Custom Icon..."
 msgstr "设置自定义图标..."
 
-#, fuzzy
 msgid "Change Size"
-msgstr "更改状态"
+msgstr "更改大小"
 
 msgid "Show All"
 msgstr "全部显示"
@@ -10769,96 +10581,96 @@
 msgstr "/对话(_C)"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/对话(C)/新即时消息(_M)..."
+msgstr "/对话/新即时消息(_M)..."
+
+#, fuzzy
+msgid "/Conversation/Join a _Chat..."
+msgstr "/对话/邀请(_V)..."
 
 msgid "/Conversation/_Find..."
-msgstr "/对话(C)/查找(_F)..."
+msgstr "/对话/查找(_F)..."
 
 msgid "/Conversation/View _Log"
-msgstr "/对话(C)/查看日志(_L)"
+msgstr "/对话/查看聊天记录(_L)"
 
 msgid "/Conversation/_Save As..."
-msgstr "/对话(C)/另存为(_S)..."
+msgstr "/对话/另存为(_S)..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/对话(C)/清除回滚(_R)"
-
-#, fuzzy
+msgstr "/对话/清除回滚(_R)"
+
 msgid "/Conversation/M_edia"
-msgstr "/对话(C)/更多(_O)"
-
-#, fuzzy
+msgstr "/对话/媒体(_E)"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/对话(C)/更多(_O)"
-
-#, fuzzy
+msgstr "/对话/媒体/语音聊天(_A)"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/对话(C)/更多(_O)"
-
-#, fuzzy
+msgstr "/对话/媒体/视频聊天(_V)"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/对话(C)/查看日志(_L)"
+msgstr "/对话/媒体/音频\\/视频聊天(_C)"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/对话(C)/发送文件(_N)..."
+msgstr "/对话/发送文件(_N)..."
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/对话(C)/添加好友千里眼(_P)..."
+msgstr "/对话/添加好友千里眼(_P)..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/对话(C)/获取信息(_G)"
+msgstr "/对话/获取信息(_G)"
 
 msgid "/Conversation/In_vite..."
-msgstr "/对话(C)/邀请(_V)..."
+msgstr "/对话/邀请(_V)..."
 
 msgid "/Conversation/M_ore"
-msgstr "/对话(C)/更多(_O)"
+msgstr "/对话/更多(_O)"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/对话(C)/别名(_L)..."
+msgstr "/对话/别名(_L)..."
 
 msgid "/Conversation/_Block..."
-msgstr "/对话(C)/屏蔽(_B)..."
+msgstr "/对话/屏蔽(_B)..."
 
 msgid "/Conversation/_Unblock..."
-msgstr "/对话(C)/取消屏蔽(_U)..."
+msgstr "/对话/取消屏蔽(_U)..."
 
 msgid "/Conversation/_Add..."
-msgstr "/对话(C)/添加(_A)..."
+msgstr "/对话/添加(_A)..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/对话(C)/删除(_R)..."
+msgstr "/对话/删除(_R)..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/对话(C)/插入链接(_K)..."
+msgstr "/对话/插入链接(_K)..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/对话(C)/插入图像(_E)..."
+msgstr "/对话/插入图像(_E)..."
 
 msgid "/Conversation/_Close"
-msgstr "/对话(C)/关闭(_C)"
+msgstr "/对话/关闭(_C)"
 
 #. Options
 msgid "/_Options"
 msgstr "/选项(_O)"
 
 msgid "/Options/Enable _Logging"
-msgstr "/选项(O)/允许记录日志(_L)"
+msgstr "/选项/启用聊天记录(_L)"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/选项(O)/允许声音(_S)"
+msgstr "/选项/启用声音(_S)"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/选项(O)/显示格式工具栏(_T)"
+msgstr "/选项/显示格式工具栏(_T)"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/选项(O)/显示时间戳(_I)"
+msgstr "/选项/显示时间戳(_M)"
 
 msgid "/Conversation/More"
-msgstr "/对话(C)/更多(O)"
+msgstr "/对话/更多"
 
 msgid "/Options"
-msgstr "/选项(O)"
+msgstr "/选项"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
@@ -10866,76 +10678,75 @@
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
 msgid "/Conversation"
-msgstr "/对话(C)"
+msgstr "/对话"
 
 msgid "/Conversation/View Log"
-msgstr "/对话(C)/查看日志(L)"
-
-#, fuzzy
+msgstr "/对话/查看聊天记录"
+
 msgid "/Conversation/Media/Audio Call"
-msgstr "/对话(C)/更多(O)"
-
-#, fuzzy
+msgstr "/对话/媒体/音频聊天"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/对话(C)/查看日志(L)"
-
-#, fuzzy
+msgstr "/对话/媒体/视频聊天"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/对话(C)/更多(O)"
+msgstr "/对话/媒体/音频\\/视频聊天"
 
 msgid "/Conversation/Send File..."
-msgstr "/对话(C)/发送文件(N)..."
+msgstr "/对话/发送文件..."
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/对话(C)/添加好友千里眼(P)..."
+msgstr "/对话/添加好友千里眼..."
 
 msgid "/Conversation/Get Info"
-msgstr "/对话(C)/获取信息(G)"
+msgstr "/对话/获取信息"
 
 msgid "/Conversation/Invite..."
-msgstr "/对话(C)/邀请(V)..."
+msgstr "/对话/邀请..."
 
 msgid "/Conversation/Alias..."
-msgstr "/对话(C)/别名(L)..."
+msgstr "/对话/别名..."
 
 msgid "/Conversation/Block..."
-msgstr "/对话(C)/屏蔽(B)..."
+msgstr "/对话/屏蔽..."
 
 msgid "/Conversation/Unblock..."
-msgstr "/对话(C)/取消屏蔽(U)..."
+msgstr "/对话/取消屏蔽..."
 
 msgid "/Conversation/Add..."
-msgstr "/对话(C)/添加(A)..."
+msgstr "/对话/添加..."
 
 msgid "/Conversation/Remove..."
-msgstr "/对话(C)/删除(R)..."
+msgstr "/对话/删除..."
 
 msgid "/Conversation/Insert Link..."
-msgstr "/对话(C)/插入链接(K)..."
+msgstr "/对话/插入链接..."
 
 msgid "/Conversation/Insert Image..."
-msgstr "/对话(C)/插入图像(E)..."
+msgstr "/对话/插入图像..."
 
 msgid "/Options/Enable Logging"
-msgstr "/选项(O)/允许记录(L)"
+msgstr "/选项/启用聊天记录"
 
 msgid "/Options/Enable Sounds"
-msgstr "/选项(O)/允许声音(S)"
+msgstr "/选项/启用声音"
 
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/选项(O)/显示格式工具栏(T)"
+msgstr "/选项/显示格式工具栏"
 
 msgid "/Options/Show Timestamps"
-msgstr "/选项(O)/显示时间戳(I)"
+msgstr "/选项/显示时间戳"
 
 msgid "User is typing..."
 msgstr "用户正在打字..."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s 停止了给您打字(%s)"
+msgstr ""
+"\n"
+"%s 停止了打字(%s)"
 
 #. Build the Send To menu
 msgid "S_end To"
@@ -10948,17 +10759,16 @@
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "聊天室里有 %d 个人"
-msgstr[1] "聊天室里有 %d 个人"
+msgstr[0] "聊天室里没有人"
 
 msgid "Typing"
-msgstr "正打字"
+msgstr "正在打字"
 
 msgid "Stopped Typing"
-msgstr "停止打字"
+msgstr "停止了打字"
 
 msgid "Nick Said"
 msgstr "昵称说"
@@ -11009,19 +10819,19 @@
 msgstr "按账户"
 
 msgid "Save Debug Log"
-msgstr "保存调试日志"
+msgstr "保存调试聊天记录"
 
 msgid "Invert"
-msgstr "反转"
+msgstr "反选"
 
 msgid "Highlight matches"
 msgstr "突出显示匹配项"
 
 msgid "_Icon Only"
-msgstr "只有图标(_I)"
+msgstr "仅图标(_I)"
 
 msgid "_Text Only"
-msgstr "只有文本(_T)"
+msgstr "仅文本(_T)"
 
 msgid "_Both Icon & Text"
 msgstr "图标和文本(_B)"
@@ -11042,7 +10852,7 @@
 msgstr "全部"
 
 msgid "Misc"
-msgstr "杂类"
+msgstr "杂项"
 
 msgid "Warning"
 msgstr "警告"
@@ -11051,12 +10861,11 @@
 msgstr "错误 "
 
 msgid "Fatal Error"
-msgstr "严重错误"
+msgstr "致命错误"
 
 msgid "bug master"
-msgstr ""
-
-#, fuzzy
+msgstr "Bug 主管"
+
 msgid "artist"
 msgstr "美工"
 
@@ -11065,17 +10874,16 @@
 msgstr "张家兴"
 
 msgid "voice and video"
-msgstr ""
+msgstr "声音和视频"
 
 msgid "support"
 msgstr "支持"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "开发者和网管"
+msgstr "网络管理员"
 
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "其他贡献者/质量保证"
 
 msgid "win32 port"
 msgstr "Win32 移植"
@@ -11094,22 +10902,22 @@
 msgstr "支持/质控"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "原作者"
 
 msgid "lead developer"
-msgstr "领导开发者"
+msgstr "开发领导者"
 
 msgid "Afrikaans"
-msgstr ""
+msgstr "南非荷兰语"
 
 msgid "Arabic"
 msgstr "阿拉伯语"
 
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "白俄罗斯拉丁语"
 
 msgid "Bulgarian"
 msgstr "保加利亚语"
@@ -11156,11 +10964,10 @@
 msgid "Spanish"
 msgstr "西班牙语"
 
-#, fuzzy
 msgid "Estonian"
-msgstr "波斯尼亚语"
-
-msgid "Euskera(Basque)"
+msgstr "爱沙尼亚语"
+
+msgid "Basque"
 msgstr ""
 
 msgid "Persian"
@@ -11172,9 +10979,8 @@
 msgid "French"
 msgstr "法语"
 
-#, fuzzy
 msgid "Irish"
-msgstr "库得语"
+msgstr "爱尔兰语"
 
 msgid "Galician"
 msgstr "加利西亚语"
@@ -11183,7 +10989,7 @@
 msgstr "古吉拉特语"
 
 msgid "Gujarati Language Team"
-msgstr "古吉拉特语团队"
+msgstr "古吉拉特语小组"
 
 msgid "Hebrew"
 msgstr "希伯莱语"
@@ -11194,9 +11000,8 @@
 msgid "Hungarian"
 msgstr "匈牙利语"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "罗马尼亚语"
+msgstr "亚美尼亚语"
 
 msgid "Indonesian"
 msgstr "印度尼西亚语"
@@ -11211,17 +11016,16 @@
 msgstr "乔治亚语"
 
 msgid "Ubuntu Georgian Translators"
-msgstr "Ubuntu 乔治亚语翻译者"
-
-#, fuzzy
+msgstr "Ubuntu 乔治亚语翻译组"
+
 msgid "Khmer"
-msgstr "其它"
+msgstr "高棉语"
 
 msgid "Kannada"
-msgstr ""
+msgstr "坎纳达语"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "坎纳达语翻译小组"
 
 msgid "Korean"
 msgstr "朝鲜语"
@@ -11229,9 +11033,8 @@
 msgid "Kurdish"
 msgstr "库得语"
 
-#, fuzzy
 msgid "Lao"
-msgstr "狮子座"
+msgstr "老挝语"
 
 msgid "Lithuanian"
 msgstr "立陶宛语"
@@ -11239,30 +11042,26 @@
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "马其顿语"
-
-#, fuzzy
+msgstr "蒙古语"
+
 msgid "Bokmål Norwegian"
-msgstr "挪威语"
+msgstr "书面挪威语"
 
 msgid "Nepali"
 msgstr "尼泊尔语"
 
-#, fuzzy
 msgid "Dutch, Flemish"
-msgstr "荷兰语"
-
-#, fuzzy
+msgstr "荷兰弗拉芒语"
+
 msgid "Norwegian Nynorsk"
-msgstr "挪威语"
+msgstr "挪威尼诺斯克语"
 
 msgid "Occitan"
-msgstr ""
+msgstr "奥克西唐语"
 
 msgid "Punjabi"
-msgstr ""
+msgstr "旁遮普语"
 
 msgid "Polish"
 msgstr "波兰语"
@@ -11273,9 +11072,8 @@
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"
 
-#, fuzzy
 msgid "Pashto"
-msgstr "相片"
+msgstr "普什图语"
 
 msgid "Romanian"
 msgstr "罗马尼亚语"
@@ -11295,15 +11093,14 @@
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#, fuzzy
 msgid "Sinhala"
-msgstr "社会"
+msgstr "僧伽罗语"
 
 msgid "Swedish"
 msgstr "瑞典语"
 
 msgid "Swahili"
-msgstr ""
+msgstr "斯瓦希里语"
 
 msgid "Tamil"
 msgstr "泰米尔语"
@@ -11318,22 +11115,22 @@
 msgstr "土耳其语"
 
 msgid "Urdu"
-msgstr ""
+msgstr "乌尔都语"
 
 msgid "Vietnamese"
 msgstr "越南语"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh 及 Gnome 越南语团队"
+msgstr "T.M.Thanh 及Gnome 越南语小组"
 
 msgid "Simplified Chinese"
-msgstr "简体中文"
+msgstr "中文(中国)"
 
 msgid "Hong Kong Chinese"
-msgstr "香港地区中文"
+msgstr "中文(香港)"
 
 msgid "Traditional Chinese"
-msgstr "繁体中文"
+msgstr "中文(台湾)"
 
 msgid "Amharic"
 msgstr "阿姆哈拉语"
@@ -11354,27 +11151,40 @@
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
+"%s 是一个基于 libpurple 的图形化模块消息客户端,支持同时连接到 AIM,MSN,"
+"Yahoo!,XMPP,ICQ, IRC,SILC,SIP/SIMPLE,Novell GroupWise,Lotus Sametime,"
+"Bonjour,Zephyr,MySpaceIM,Gadu-Gadu 以及 QQ。它使用 GTK+ 编写。<BR><BR>您可"
+"以在 GNU 通用公共许可证第二版或任意更高版本的许可下修改并重新发布此软件。在发"
+"行的 %s 中应有一个 'COPYING' 文件包含 GPL 正文。%s 的版权由其贡献者所有,在 "
+"'COPYING'文件中给出了所有贡献这的列表。我们不对此软件做任何保证。<BR><BR>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
-
-#, c-format
-msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-
-#, fuzzy, c-format
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+#, c-format
+msgid ""
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin<BR><BR>"
-
-#, fuzzy, c-format
+msgstr ""
+"<FONT SIZE=\"4\">IRC 聊天室:</FONT> irc.freenode.net 上的 #pidgin<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "当前开发者"
@@ -11406,14 +11216,13 @@
 msgid "Get User Info"
 msgstr "获取用户信息"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr "您想要查看谁的信息?请输入他/她的用户名或别名。"
 
 msgid "View User Log"
-msgstr "查看用户日志"
+msgstr "查看用户聊天记录"
 
 msgid "Alias Contact"
 msgstr "给联系人起名"
@@ -11434,19 +11243,14 @@
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#, fuzzy, c-format
+#, 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?"
 msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
-"吗?"
-msgstr[1] ""
-"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
-"吗?"
+msgstr[0] "请输入此聊天的别名。"
 
 msgid "Remove Contact"
 msgstr "删除联系人"
@@ -11504,45 +11308,35 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "用鼠标右键单击可查看更多未读消息...\n"
 
-#, fuzzy
 msgid "_Change Status"
-msgstr "更改状态"
-
-#, fuzzy
+msgstr "更改状态(_C)"
+
 msgid "Show Buddy _List"
-msgstr "显示好友列表"
-
-#, fuzzy
+msgstr "显示好友列表(_L)"
+
 msgid "_Unread Messages"
-msgstr "未读消息"
-
-#, fuzzy
+msgstr "未读消息(_U)"
+
 msgid "New _Message..."
-msgstr "新消息..."
-
-#, fuzzy
+msgstr "新消息(_M)..."
+
 msgid "_Accounts"
-msgstr "/账户(_A)"
-
-#, fuzzy
+msgstr "账户(_A)"
+
 msgid "Plu_gins"
-msgstr "插件"
-
-#, fuzzy
+msgstr "插件(_G)"
+
 msgid "Pr_eferences"
-msgstr "首选项"
-
-#, fuzzy
+msgstr "首选项(_E)"
+
 msgid "Mute _Sounds"
-msgstr "静音"
-
-#, fuzzy
+msgstr "静音(_S)"
+
 msgid "_Blink on New Message"
-msgstr "有新信息时闪烁"
-
-#, fuzzy
+msgstr "有新信息时闪烁(_B)"
+
 msgid "_Quit"
-msgstr "退出"
+msgstr "退出(_Q)"
 
 msgid "Not started"
 msgstr "未开始"
@@ -11596,20 +11390,12 @@
 msgstr "全部传送完成时关闭此窗口(_F)"
 
 msgid "C_lear finished transfers"
-msgstr "清除未完成的传送(_L)"
+msgstr "清除已完成的传送(_L)"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
 msgstr "文件传送细节(_D)"
 
-#. Pause button
-msgid "_Pause"
-msgstr "暂停(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "继续(_R)"
-
 msgid "Paste as Plain _Text"
 msgstr "粘贴为纯文本(_T)"
 
@@ -11625,11 +11411,9 @@
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"
 
-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "超级链接颜色"
-
-#, fuzzy
+msgstr "已访问超级链接的颜色"
+
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "绘制超级链接悬停时的颜色。"
 
@@ -11639,14 +11423,12 @@
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "绘制超级链接悬停时的颜色。"
 
-#, fuzzy
 msgid "Sent Message Name Color"
 msgstr "已发消息"
 
 msgid "Color to draw the name of a message you sent."
 msgstr ""
 
-#, fuzzy
 msgid "Received Message Name Color"
 msgstr "收到的消息"
 
@@ -11677,24 +11459,20 @@
 msgid "Color to draw the name of a whispered message."
 msgstr ""
 
-#, fuzzy
 msgid "Typing notification color"
-msgstr "通知删除"
-
-#, fuzzy
+msgstr "打字通知颜色"
+
 msgid "The color to use for the typing notification"
-msgstr "新邮件通知"
-
-#, fuzzy
+msgstr "此颜色用于打字通知"
+
 msgid "Typing notification font"
-msgstr "弹出通知"
+msgstr "打字通知字体"
 
 msgid "The font to use for the typing notification"
 msgstr ""
 
-#, fuzzy
 msgid "Enable typing notification"
-msgstr "新邮件通知"
+msgstr "启用打字通知"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -11740,9 +11518,8 @@
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#, fuzzy
 msgid "_Add Custom Smiley..."
-msgstr "显示自定义如下:"
+msgstr "添加自定义表情(_A)..."
 
 msgid "Select Font"
 msgstr "选择字体"
@@ -11789,9 +11566,8 @@
 msgid "Smile!"
 msgstr "表情"
 
-#, fuzzy
 msgid "_Manage custom smileys"
-msgstr "显示自定义如下:"
+msgstr "管理自定义表情(_M)"
 
 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的表情。"
@@ -11883,24 +11659,23 @@
 msgid "_Smile!"
 msgstr "表情(_S)"
 
-#, fuzzy
 msgid "Log Deletion Failed"
-msgstr "SSL 连接失败"
+msgstr "删除日志失败"
 
 msgid "Check permissions and try again."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "检查许可并重试。"
+
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
-msgstr "您真的想要永久删除自 %2$s 起与 %1$s 的对话日志吗?"
+msgstr "您真的想要永久删除自 %2$s 起与 %1$s 的聊天记录吗?"
 
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
-msgstr "您真的想要永久删除自 %2$s 起在 %1$s 的对话日志吗?"
+msgstr "您真的想要永久删除自 %2$s 起在 %1$s 的对话聊天记录吗?"
 
 #, c-format
 msgid ""
@@ -11908,13 +11683,11 @@
 "s?"
 msgstr "您真的想要永久删除自 %s 起的系统日志吗?"
 
-#, fuzzy
 msgid "Delete Log?"
-msgstr "删除"
-
-#, fuzzy
+msgstr "要删除记录吗?"
+
 msgid "Delete Log..."
-msgstr "删除"
+msgstr "删除记录..."
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -11926,64 +11699,49 @@
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr "浏览日志文件夹(_B)"
+msgstr "浏览聊天记录文件夹(_B)"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。试试“%s -h”查看帮助。\n"
 
-#, fuzzy, c-format
-msgid ""
-"%s %s\n"
+#, c-format
+msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"用法: %s [选项]...\n"
-"\n"
-"  -c, --config=目录   使用“目录”存储配置文件\n"
-"  -d, --debug         将调试信息打印到标准输出\n"
-"  -h, --help          显示帮助并退出\n"
-"  -n, --nologin       不自动登入\n"
-"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
-"  -v, --version       显示当前版本并退出\n"
-
-#, fuzzy, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"用法: %s [选项]...\n"
-"\n"
-"  -c, --config=目录   使用“目录”存储配置文件\n"
-"  -d, --debug         将调试信息打印到标准输出\n"
-"  -h, --help          显示帮助并退出\n"
-"  -n, --nologin       不自动登入\n"
-"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户,用逗号分隔)\n"
-"  -v, --version       显示当前版本并退出\n"
+msgstr ""
+
+msgid "use DIR for config files"
+msgstr ""
+
+msgid "print debugging messages to stdout"
+msgstr ""
+
+msgid "force online, regardless of network status"
+msgstr ""
+
+msgid "display this help and exit"
+msgstr ""
+
+msgid "allow multiple instances"
+msgstr ""
+
+msgid "don't automatically login"
+msgstr ""
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+
+msgid "Without this only the first account will be enabled)."
+msgstr ""
+
+msgid "X display to use"
+msgstr ""
+
+msgid "display the current version and exit"
+msgstr ""
 
 #, c-format
 msgid ""
@@ -12008,37 +11766,37 @@
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "退出,因为另一个 libpurple 客户端已运行。\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/媒体(_M)"
 
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
-msgid "Calling..."
-msgstr "正在计算..."
+msgstr "/媒体/挂起(_H)"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s 希望于您进行音频/视频聊天。"
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%s 希望于您进行视频聊天。"
+
+msgid "Incoming Call"
+msgstr ""
+
+msgid "_Pause"
+msgstr "暂停(_P)"
+
+#, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s 有 %d 封新邮件。"
-msgstr[1] "%s 有 %d 封新邮件。"
-
-#, fuzzy, c-format
+msgstr[0] "暂停(_P)"
+
+#, 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>"
+msgstr[0] "暂停(_P)"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12055,9 +11813,8 @@
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
-#, fuzzy
 msgid "No message"
-msgstr "未知信息"
+msgstr "无消息"
 
 msgid "Open All Messages"
 msgstr "打开全部消息"
@@ -12065,14 +11822,12 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
 
-#, fuzzy
 msgid "New Pounces"
 msgstr "新建好友千里眼"
 
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "解散"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
 
@@ -12085,39 +11840,33 @@
 msgid "Unload Plugins"
 msgstr "卸载插件"
 
-#, fuzzy
 msgid "Could not unload plugin"
-msgstr "无法装入公钥"
+msgstr "无法卸载插件"
 
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "插件无法立即卸载,将在下次启动时禁用"
+
+#, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
 "<span foreground=\"#ff0000\" weight=\"bold\">错误:%s\n"
 "请检查插件网站中的更新。</span>"
 
-#, fuzzy
 msgid "Author"
-msgstr "同意"
-
-#, fuzzy
+msgstr "作者"
+
 msgid "<b>Written by:</b>"
-msgstr "<b>接收方:</b>"
-
-#, fuzzy
+msgstr "<b>开发:</b>"
+
 msgid "<b>Web site:</b>"
-msgstr "<b>发送为:</b>"
-
-#, fuzzy
+msgstr "<b>网站:</b>"
+
 msgid "<b>Filename:</b>"
-msgstr "<b>用户名:</b>"
+msgstr "<b>文件名:</b>"
 
 msgid "Configure Pl_ugin"
 msgstr "配置插件(_U)"
@@ -12128,7 +11877,6 @@
 msgid "Select a file"
 msgstr "选择文件"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "编辑好友千里眼"
 
@@ -12143,10 +11891,10 @@
 msgstr "好友名称(_B):"
 
 msgid "Si_gns on"
-msgstr "登入(_G)"
+msgstr "登录(_G)"
 
 msgid "Signs o_ff"
-msgstr "登出(_F)"
+msgstr "退出(_F)"
 
 msgid "Goes a_way"
 msgstr "离开(_W)"
@@ -12164,7 +11912,7 @@
 msgstr "开始打字(_T)"
 
 msgid "P_auses while typing"
-msgstr "输入时暂停(_A)"
+msgstr "暂停打字(_A)"
 
 msgid "Stops t_yping"
 msgstr "停止打字(_Y)"
@@ -12205,61 +11953,58 @@
 msgid "Pounce Target"
 msgstr "监视目标"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
 msgstr "开始打字"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
-msgstr "输入时暂停"
-
-#, fuzzy, c-format
+msgstr "暂停打字"
+
+#, c-format
 msgid "Signed on"
-msgstr "登入"
-
-#, fuzzy, c-format
+msgstr "登录"
+
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s 发完呆了(%s)"
-
-#, fuzzy, c-format
+msgstr "发完呆了"
+
+#, c-format
 msgid "Returned from being away"
 msgstr "回来"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Stopped typing"
 msgstr "停止打字"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
-msgstr "登出"
-
-#, fuzzy, c-format
+msgstr "退出"
+
+#, c-format
 msgid "Became idle"
 msgstr "发起了呆"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Went away"
-msgstr "离开时"
-
-#, fuzzy, c-format
+msgstr "离开"
+
+#, c-format
 msgid "Sent a message"
 msgstr "发送消息"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown.... Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "表情主题解包失败。"
-
-#, fuzzy
+msgstr "主题解包失败。"
+
 msgid "Theme failed to load."
-msgstr "表情主题解包失败。"
-
-#, fuzzy
+msgstr "主题加载失败。"
+
 msgid "Theme failed to copy."
-msgstr "表情主题解包失败。"
+msgstr "主题复制失败。"
 
 msgid "Install Theme"
 msgstr "安装主题"
@@ -12273,16 +12018,14 @@
 msgstr "图标"
 
 msgid "Keyboard Shortcuts"
-msgstr ""
-
-#, fuzzy
+msgstr "键盘快捷键"
+
 msgid "Cl_ose conversations with the Escape key"
-msgstr "与 %s 的对话"
+msgstr "使用 ESC 键关闭会话(_O)"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "好友列表"
+msgstr "好友列表主题"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12294,7 +12037,6 @@
 msgid "On unread messages"
 msgstr "有未读消息时"
 
-#, fuzzy
 msgid "Conversation Window"
 msgstr "即时消息对话窗口"
 
@@ -12366,7 +12108,7 @@
 msgstr "收到信息时闪烁窗口(_L)"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "输入区最小行数:"
 
 msgid "Font"
 msgstr "字体"
@@ -12389,18 +12131,17 @@
 msgstr "当您使用的协议支持格式时,您送出的信息将会显示为这样。"
 
 msgid "Cannot start proxy configuration program."
-msgstr ""
-
-#, fuzzy
+msgstr "无法启动代理配置程序。"
+
 msgid "Cannot start browser configuration program."
-msgstr "无法获取用户信息"
+msgstr "无法启动浏览器配置程序。"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "自动检测 IP 地址(_A)"
+msgstr "自动检测 IP 地址(_A):%s"
 
 msgid "Public _IP:"
 msgstr "公网 _IP:"
@@ -12409,7 +12150,7 @@
 msgstr "端口"
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "启用自动路由器端口转发(_E)"
 
 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
@@ -12422,30 +12163,27 @@
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
-
-#, fuzzy
+msgstr "中继服务器(转)"
+
 msgid "Proxy Server &amp; Browser"
-msgstr "代理服务器"
+msgstr "代理服务器 &amp; 浏览器"
 
 msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
+msgstr "<b>未发现代理设定程序。</b>"
 
 msgid "<b>Browser configuration program was not found.</b>"
-msgstr ""
+msgstr "<b>未发现浏览器配置程序。</b>"
 
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
 
-#, fuzzy
 msgid "Configure _Proxy"
-msgstr "配置房间(_C)"
-
-#, fuzzy
+msgstr "配置代理服务器(_P)"
+
 msgid "Configure _Browser"
-msgstr "配置房间(_C)"
+msgstr "配置浏览器(_B)"
 
 msgid "Proxy Server"
 msgstr "代理服务器"
@@ -12455,7 +12193,7 @@
 
 #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
 msgid "Use remote DNS with SOCKS4 proxies"
-msgstr ""
+msgstr "通过 SOCKS4 代理使用远程 DNS"
 
 msgid "_User:"
 msgstr "用户(_U):"
@@ -12475,9 +12213,8 @@
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#, fuzzy
 msgid "Desktop Default"
-msgstr "接受默认值(_A)"
+msgstr "桌面默认值"
 
 msgid "GNOME Default"
 msgstr "GNOME 默认"
@@ -12495,7 +12232,7 @@
 msgstr "Epiphany"
 
 msgid "Manual"
-msgstr "手动"
+msgstr "手工设置"
 
 msgid "Browser Selection"
 msgstr "浏览器选择"
@@ -12524,7 +12261,7 @@
 "(%s 代表 URL)"
 
 msgid "Log _format:"
-msgstr "日志格式(_F):"
+msgstr "聊天记录格式(_F):"
 
 msgid "Log all _instant messages"
 msgstr "记录所有即时消息(_I)"
@@ -12576,7 +12313,7 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"声音命令(_O):\n"
+"声音命令(_O):\n"
 "(%s 代表文件名)"
 
 msgid "M_ute sounds"
@@ -12777,9 +12514,8 @@
 msgid "Custom Smiley"
 msgstr "自定义表情"
 
-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "重复更正"
+msgstr "重复的快捷方式"
 
 msgid "Edit Smiley"
 msgstr "修改表情"
@@ -12791,24 +12527,20 @@
 msgstr "图像(_I):"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "排序"
-
-#, fuzzy
+msgstr "快捷方式文本:"
+
 msgid "Smiley"
 msgstr "表情"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "排序"
+msgstr "快捷方式文本"
 
 msgid "Custom Smiley Manager"
-msgstr ""
-
-#, fuzzy
+msgstr "自定义表情管理器"
+
 msgid "Select Buddy Icon"
-msgstr "选择好友"
+msgstr "选择好友图标"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "点此修改当前账户所用图标。"
@@ -12823,21 +12555,20 @@
 msgstr "新状态..."
 
 msgid "Saved statuses..."
-msgstr "已存状态"
-
-#, fuzzy
+msgstr "已存状态..."
+
 msgid "Status Selector"
-msgstr "状态文本"
+msgstr "状态选择器"
 
 msgid "Google Talk"
 msgstr "Google Talk"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "装入 %s 时发生了下列错误: %s。"
+msgstr "载入 %s 时发生了下列错误: %s。"
 
 msgid "Failed to load image"
-msgstr "装入图像失败"
+msgstr "载入图像失败"
 
 #, c-format
 msgid "Cannot send folder %s."
@@ -12888,7 +12619,6 @@
 msgid "Cannot send launcher"
 msgstr "无法发送启动器"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -12923,11 +12653,10 @@
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "装入图像“%s”失败:原因位置,可能是图像文件已损坏"
-
-#, fuzzy
+msgstr "载入图像“%s”失败:原因位置,可能是图像文件已损坏"
+
 msgid "_Open Link"
-msgstr "打开链接(_O):"
+msgstr "打开链接(_O)"
 
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
@@ -12935,9 +12664,21 @@
 msgid "_Copy Email Address"
 msgstr "复制电子邮件地址(_C)"
 
+msgid "_Open File"
+msgstr "打开文件..."
+
+msgid "Open _Containing Directory"
+msgstr "聊天记录目录"
+
 msgid "Save File"
 msgstr "保存文件"
 
+msgid "_Play Sound"
+msgstr "播放声音"
+
+msgid "_Save File"
+msgstr "保存文件"
+
 msgid "Select color"
 msgstr "选择颜色"
 
@@ -13025,77 +12766,6 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
 
-#, fuzzy
-msgid "Server name request"
-msgstr "服务器地址"
-
-#, fuzzy
-msgid "Enter an XMPP Server"
-msgstr "进入会议服务器"
-
-#, fuzzy
-msgid "Select an XMPP server to query"
-msgstr "选择要查询的会议服务器"
-
-#, fuzzy
-msgid "Find Services"
-msgstr "在线服务"
-
-#, fuzzy
-msgid "Add to Buddy List"
-msgstr "发送好友列表"
-
-#, fuzzy
-msgid "Gateway"
-msgstr "离开"
-
-#, fuzzy
-msgid "Directory"
-msgstr "日志目录"
-
-#, fuzzy
-msgid "PubSub Collection"
-msgstr "声音选择"
-
-msgid "PubSub Leaf"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr "描述"
-
-#. Create the window.
-#, fuzzy
-msgid "Service Discovery"
-msgstr "服务目录信息"
-
-#, fuzzy
-msgid "_Browse"
-msgstr "浏览器(_B):"
-
-#, fuzzy
-msgid "Server does not exist"
-msgstr "用户不存在"
-
-#, fuzzy
-msgid "Server does not support service discovery"
-msgstr "服务器未使用任何支持的身份验证方法"
-
-#, fuzzy
-msgid "XMPP Service Discovery"
-msgstr "服务目录信息"
-
-msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr "此插件用于调试 XMPP 服务器或客户端。"
-
 msgid "Buddy is idle"
 msgstr "好友正发呆"
 
@@ -13182,6 +12852,67 @@
 msgid "Apply in IMs"
 msgstr "在对话中应用"
 
+# ## Forward to here.
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "服务器地址"
+
+msgid "Enter an XMPP Server"
+msgstr "进入会议服务器"
+
+msgid "Select an XMPP server to query"
+msgstr "选择要查询的会议服务器"
+
+msgid "Find Services"
+msgstr "在线服务"
+
+msgid "Add to Buddy List"
+msgstr "发送好友列表"
+
+msgid "Gateway"
+msgstr "离开"
+
+msgid "Directory"
+msgstr "聊天记录目录"
+
+msgid "PubSub Collection"
+msgstr "声音选择"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"描述"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "服务目录信息"
+
+msgid "_Browse"
+msgstr "浏览器(_B):"
+
+msgid "Server does not exist"
+msgstr "用户不存在"
+
+msgid "Server does not support service discovery"
+msgstr "服务器未使用任何支持的身份验证方法"
+
+msgid "XMPP Service Discovery"
+msgstr "服务目录信息"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "此插件用于调试 XMPP 服务器或客户端。"
+
 msgid "By conversation count"
 msgstr "按对话计数"
 
@@ -13270,7 +13001,7 @@
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
-msgstr "下面是您的地址簿,请从中选择一个人,或者另外添加一个人。"
+msgstr "下面是您的通讯录,请从中选择一个人,或者另外添加一个人。"
 
 msgid "Group:"
 msgstr "组:"
@@ -13287,7 +13018,7 @@
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
-msgstr "从您的地址簿中选择一个人可将其加为好友,您也可以创建一个新联系人。"
+msgstr "从您的通讯录中选择一个人可将其加为好友,您也可以创建一个新联系人。"
 
 #. Add the expander
 msgid "User _details"
@@ -13307,7 +13038,7 @@
 msgstr "此好友未发现电子邮件地址。"
 
 msgid "Add to Address Book"
-msgstr "添加到地址簿"
+msgstr "添加到通讯录"
 
 msgid "Send Email"
 msgstr "发送电子邮件"
@@ -13470,7 +13201,6 @@
 msgstr "合作作曲的音乐信使插件。"
 
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -13579,9 +13309,9 @@
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 "这个插件非常酷,它可以完成以下功能:\n"
-"- 在您登入后告诉您谁写的这个程序\n"
+"- 在您登录后告诉您谁写的这个程序\n"
 "- 颠倒所有收到的文本\n"
-"- 当您的好友登入后立即给他们发送信息"
+"- 当您的好友登录后立即给他们发送信息"
 
 msgid "Hyperlink Color"
 msgstr "超级链接颜色"
@@ -13589,11 +13319,9 @@
 msgid "Visited Hyperlink Color"
 msgstr "访问过的超级链接颜色"
 
-#, fuzzy
 msgid "Highlighted Message Name Color"
 msgstr "突出显示的消息"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "通知删除"
 
@@ -13626,15 +13354,12 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ 文字快捷方式主题"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
 msgstr "新邮件通知"
 
-#, fuzzy
 msgid "GTK+ Theme Control Settings"
 msgstr "Pidgin GTK+ 主题控制"
 
-#, fuzzy
 msgid "Colors"
 msgstr "关闭"
 
@@ -13675,7 +13400,7 @@
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "您今天可以升级到 %s %s 。"
 
 msgid "New Version Available"
 msgstr "新版本可用"
@@ -13724,7 +13449,6 @@
 msgstr "对话窗口的发送按钮"
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -13779,94 +13503,79 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "未登入"
-
-#, fuzzy
+msgstr "未登录"
+
 msgid "Just logged out"
-msgstr "未登入"
+msgstr "未登录"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
 
-#, fuzzy
 msgid "Icon for Chat"
 msgstr "加入聊天"
 
-#, fuzzy
 msgid "Ignored"
 msgstr "忽略"
 
-#, fuzzy
 msgid "Founder"
 msgstr "较大"
 
-#, fuzzy
+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "Opera"
 
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr ""
 
-#, fuzzy
 msgid "Authorization dialog"
 msgstr "给出的认证"
 
-#, fuzzy
 msgid "Error dialog"
 msgstr "错误 "
 
-#, fuzzy
 msgid "Information dialog"
 msgstr "信息"
 
 msgid "Mail dialog"
 msgstr ""
 
-#, fuzzy
 msgid "Question dialog"
 msgstr "请求对话框"
 
-#, fuzzy
 msgid "Warning dialog"
 msgstr "警告级别"
 
 msgid "What kind of dialog is this?"
 msgstr ""
 
-#, fuzzy
 msgid "Status Icons"
-msgstr "%s 的状态"
-
-#, fuzzy
+msgstr "状态图标"
+
 msgid "Chatroom Emblems"
-msgstr "聊天房间语系"
-
-#, fuzzy
+msgstr "聊天聊天室语系"
+
 msgid "Dialog Icons"
 msgstr "保存图标"
 
-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
 msgstr "Pidgin GTK+ 主题控制"
 
-#, fuzzy
 msgid "Contact"
 msgstr "联系信息"
 
-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
 msgstr "好友列表"
 
-#, fuzzy
 msgid "Edit Buddylist Theme"
 msgstr "好友列表"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "编辑图标主题"
 
 #. *< type
 #. *< ui_requirement
@@ -13875,14 +13584,12 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
 msgstr "Pidgin GTK+ 主题控制"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
 msgstr "Pidgin GTK+ 主题控制"
 
@@ -13944,7 +13651,7 @@
 msgstr "对迟发的消息和聊天"
 
 msgid "_Message Logs:"
-msgstr "消息日志(_M):"
+msgstr "消息聊天记录(_M):"
 
 #. *< type
 #. *< ui_requirement
@@ -13965,7 +13672,59 @@
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
-msgstr "此插件允许用户自定义会话和日志消息的时间戳格式。"
+msgstr "此插件允许用户自定义会话和聊天记录消息的时间戳格式。"
+
+#, fuzzy
+msgid "Audio"
+msgstr "自动"
+
+#, fuzzy
+msgid "Video"
+msgstr "视频"
+
+msgid "Output"
+msgstr ""
+
+#, fuzzy
+msgid "_Plugin"
+msgstr "插件"
+
+#, fuzzy
+msgid "_Device"
+msgstr "设备"
+
+msgid "Input"
+msgstr ""
+
+#, fuzzy
+msgid "P_lugin"
+msgstr "插件"
+
+#, fuzzy
+msgid "D_evice"
+msgstr "设备"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "Voice/Video Settings"
+msgstr "编辑设置"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr ""
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
 
 msgid "Opacity:"
 msgstr "不透明度:"
@@ -14050,7 +13809,6 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Pidgin for Windows 特定的选项。"
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Pidgin for Windows 特定的选项,比如好友列表停靠。"
@@ -14092,6 +13850,89 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "此插件用于调试 XMPP 服务器或客户端。"
 
+#~ msgid "Calling ... "
+#~ msgstr "正在呼叫..."
+
+#~ msgid "Invalid certificate chain"
+#~ msgstr "无效的标题"
+
+#~ msgid "Join/Part Hiding Configuration"
+#~ msgstr "加入/离开隐藏配置"
+
+#~ msgid "User Inactivity Timeout (in minutes)"
+#~ msgstr "用户非活跃超时(以分钟计)"
+
+#~ msgid "Your account is locked, please log in to the Yahoo! website."
+#~ msgstr "您的账户已锁定,请登录到 Yahoo! 网站。"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  --display=DISPLAY   X display to use\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "用法: %s [选项]...\n"
+#~ "\n"
+#~ "  -c, --config=目录\t使用指定目录存储配置文件\n"
+#~ "  -d, --debug\t\t将调试信息输出到标准输出\n"
+#~ "  -f, --force-online\t强制为在线状态而不顾网络状态\n"
+#~ "  -h, --help\t\t显示帮助并退出\n"
+#~ "  -m, --multiple\t不确认单个事例\n"
+#~ "  -n, --nologin\t不自动登录\n"
+#~ "  -l, --login[=名称]\t自动登录(可选“名称”指定要使用的账户,用逗号分隔)\n"
+#~ "  --display=DISPLAY\t要使用的 X 显示\n"
+#~ "  -v, --version\t显示当前版本并退出\n"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "用法: %s [选项]...\n"
+#~ "\n"
+#~ "  -c, --config=目录\t使用指定目录存储配置文件\n"
+#~ "  -d, --debug\t\t将调试信息输出到标准输出\n"
+#~ "  -f, --force-online\t强制为在线状态而不顾网络状态\n"
+#~ "  -h, --help\t\t显示帮助并退出\n"
+#~ "  -m, --multiple\t不确认单个事例\n"
+#~ "  -n, --nologin\t不自动登录\n"
+#~ "  -l, --login[=名称]\t自动登录(可选“名称”指定要使用的账户,用逗号分隔)\n"
+#~ "  --display=DISPLAY\t要使用的 X 显示\n"
+#~ "  -v, --version\t显示当前版本并退出\n"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "无法打开套接字"
 
@@ -14187,41 +14028,35 @@
 
 #, fuzzy
 #~ msgid "Roster Item Exchange"
-#~ msgstr "带密钥交换开聊"
-
-#, fuzzy
+#~ msgstr "带密钥交换聊天"
+
 #~ msgid "Reachability Address"
-#~ msgstr "电子邮件地址"
+#~ msgstr "可用地址"
 
 #~ msgid "User Profile"
 #~ msgstr "用户资料"
 
-#, fuzzy
 #~ msgid "Jingle"
-#~ msgstr "加入"
+#~ msgstr "Jingle"
 
 #~ msgid "User Nickname"
 #~ msgstr "用户昵称"
 
-#, fuzzy
 #~ msgid "Jingle Video"
-#~ msgstr "实时视频"
+#~ msgstr "Jingle 视频"
 
 #, fuzzy
 #~ msgid "Message Receipts"
 #~ msgstr "消息已收到"
 
-#, fuzzy
 #~ msgid "Public Key Publishing"
-#~ msgstr "公钥漏印"
-
-#, fuzzy
+#~ msgstr "公钥发布"
+
 #~ msgid "User Chatting"
-#~ msgstr "用户选项"
-
-#, fuzzy
+#~ msgstr "用户聊天"
+
 #~ msgid "User Browsing"
-#~ msgstr "用户模式"
+#~ msgstr "用户浏览"
 
 #, fuzzy
 #~ msgid "User Gaming"
@@ -14231,27 +14066,36 @@
 #~ msgid "User Viewing"
 #~ msgstr "允许限制"
 
-#, fuzzy
 #~ msgid "Stanza Encryption"
-#~ msgstr "Trillian 加密"
+#~ msgstr "Stanza 加密"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "投递延迟"
+
+#~ msgid "Hop Check"
+#~ msgstr "跃点检查"
 
 #~ msgid "Read Error"
 #~ msgstr "读取错误"
 
+#, fuzzy
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "连接到服务器失败。"
+
+#~ msgid "Failed to open the file"
+#~ msgstr "打开文件失败"
+
 #~ msgid "Failed to connect to server."
 #~ msgstr "连接到服务器失败。"
 
-#, fuzzy
 #~ msgid "Read buffer full (2)"
-#~ msgstr "队列满"
-
-#, fuzzy
+#~ msgstr "读取缓冲区已满 (2)"
+
 #~ msgid "Unparseable message"
-#~ msgstr "无法处理消息"
-
-#, fuzzy
+#~ msgstr "无法解析消息"
+
 #~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "无法连接到主机"
+#~ msgstr "无法连接到主机:%s (%d)"
 
 #~ msgid "Login failed (%s)."
 #~ msgstr "登录失败(%s)。"
@@ -14282,13 +14126,11 @@
 #~ msgid "Could Not Connect"
 #~ msgstr "无法连接"
 
-#, fuzzy
 #~ msgid "Could not decrypt server reply"
-#~ msgstr "无法获取服务器信息"
-
-#, fuzzy
+#~ msgstr "无法解密服务器回复"
+
 #~ msgid "Invalid username."
-#~ msgstr "名称无效"
+#~ msgstr "无效的用户名。"
 
 #~ msgid "Connection lost"
 #~ msgstr "连接丢失"
@@ -14320,9 +14162,8 @@
 #~ msgid "Could not resolve hostname"
 #~ msgstr "无法解析主机名"
 
-#, fuzzy
 #~ msgid "Incorrect Password"
-#~ msgstr "密码不对"
+#~ msgstr "密码错误"
 
 #, fuzzy
 #~ msgid ""
@@ -14342,6 +14183,13 @@
 #~ msgstr "日本文件传送服务器"
 
 #~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s 拒绝您加入聊天室“%s”的会议邀请,原因为“%s”。"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "邀请已拒绝"
+
+#~ msgid ""
 #~ "Lost connection with server\n"
 #~ "%s"
 #~ msgstr ""
@@ -14351,11 +14199,16 @@
 #~ msgid "Could not resolve host name"
 #~ msgstr "无法解析主机名"
 
-#, fuzzy
 #~ msgid ""
 #~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
 #~ "was found."
-#~ msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
+#~ msgstr "无法连接到 %s:服务器需要 TLS/SSL 才能登录。未找到 TLS/SSL 支持。"
+
+#~ msgid "_Proxy"
+#~ msgstr "代理(_P)"
+
+#~ msgid "_Resume"
+#~ msgstr "继续(_R)"
 
 #~ msgid "Conversation Window Hiding"
 #~ msgstr "对话窗口隐藏"
@@ -14390,7 +14243,7 @@
 
 #, fuzzy
 #~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "选择 Notes 地址簿"
+#~ msgstr "选择 Notes 通讯录"
 
 #~ msgid ""
 #~ "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -14443,7 +14296,7 @@
 #~ msgstr "消息太长,最后 %s 字节被截断。"
 
 #~ msgid "%s not currently logged in."
-#~ msgstr "%s 目前未登入。"
+#~ msgstr "%s 目前未登录。"
 
 #~ msgid "Warning of %s not allowed."
 #~ msgstr "不允许对 %s 发出警告。"
@@ -14502,7 +14355,7 @@
 #~ msgstr "服务暂时不可用。"
 
 #~ msgid "Your warning level is currently too high to log in."
-#~ msgstr "您的警告级别太高,无法登入。"
+#~ msgstr "您的警告级别太高,无法登录。"
 
 #~ msgid ""
 #~ "You have been connecting and disconnecting too frequently.  Wait ten "
@@ -14512,9 +14365,6 @@
 #~ "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间"
 #~ "可能会更长。"
 
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "发生了未知登入错误: %s。"
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "发生了未知错误 %d。信息: %s"
 
@@ -14574,7 +14424,7 @@
 #~ msgstr "代理选项"
 
 #~ msgid "By log size"
-#~ msgstr "按日志大小"
+#~ msgstr "按聊天记录大小"
 
 #~ msgid "_Open Link in Browser"
 #~ msgstr "在浏览器中打开链接(_O)"
@@ -14625,7 +14475,7 @@
 
 #, fuzzy
 #~ msgid "Add into %d's buddy list"
-#~ msgstr "无法装入好友列表"
+#~ msgstr "无法载入好友列表"
 
 #, fuzzy
 #~ msgid "QQ Number Error"
@@ -14899,7 +14749,7 @@
 #~ msgstr "输入您的原因:"
 
 #~ msgid "Unable to login, check debug log"
-#~ msgstr "无法登录,请检查调试日志"
+#~ msgstr "无法登录,请检查调试聊天记录"
 
 #~ msgid "TCP Address"
 #~ msgstr "TCP 地址"