diff po/zh_CN.po @ 27666:a08e84032814

merge of '2348ff22f0ff3453774b8b25b36238465580c609' and 'e76f11543c2a4aa05bdf584f087cbe3439029661'
author Paul Aurich <paul@darkrain42.org>
date Sun, 12 Jul 2009 05:43:38 +0000
parents b9790d3e2a0a
children f3f057b06840
line wrap: on
line diff
--- a/po/zh_CN.po	Sun Jul 12 05:42:40 2009 +0000
+++ b/po/zh_CN.po	Sun Jul 12 05:43:38 2009 +0000
@@ -1,20 +1,21 @@
-# pidgin 软件包的简体中文翻译。
-# Copyright (C) 2003 pidgin team.
+# Pidgin 软件包的简体中文翻译。
+# Copyright (C) 2009 pidgin team.
 # This file is distributed under the same license as the pidgin package.
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
+# liyuekui <liyuekui@gmail.com>, 2009.
+# Aron Xu <aronmalache@163.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-30 10:41-0400\n"
-"PO-Revision-Date: 2007-05-20 20:22+0800\n"
-"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2009-07-06 15:04-0700\n"
+"PO-Revision-Date: 2009-04-23 00:32+0800\n"
+"Last-Translator: Aron Xu <aronmalache@163.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -25,7 +26,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s。试试“%s -h”查看帮助。\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -60,7 +61,6 @@
 msgid "Account was not added"
 msgstr "账户未添加"
 
-#, fuzzy
 msgid "Username of an account must be non-empty."
 msgstr "账户的用户名必须非空。"
 
@@ -70,7 +70,6 @@
 msgid "Remember password"
 msgstr "记住密码"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
 msgstr "未安装协议插件。"
 
@@ -86,9 +85,8 @@
 msgid "Protocol:"
 msgstr "协议:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "用户名(_U):"
+msgstr "用户名:"
 
 msgid "Password:"
 msgstr "密码:"
@@ -97,7 +95,6 @@
 msgstr "别名:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
 msgstr "在服务器上创建此新帐户"
 
@@ -179,7 +176,6 @@
 msgid "Default"
 msgstr "默认"
 
-#, fuzzy
 msgid "You must provide a username for the buddy."
 msgstr "您必须提供好友的用户名。"
 
@@ -198,13 +194,11 @@
 msgid "Username"
 msgstr "用户名"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "给联系人起名"
-
-#, fuzzy
+msgstr "联系人别名(可选)"
+
 msgid "Add in group"
-msgstr "添加组"
+msgstr "添加到组"
 
 msgid "Account"
 msgstr "账户"
@@ -346,9 +340,8 @@
 msgid "Plugins"
 msgstr "插件"
 
-#, fuzzy
 msgid "Block/Unblock"
-msgstr "取消屏蔽"
+msgstr "屏蔽/取消屏蔽"
 
 msgid "Block"
 msgstr "屏蔽"
@@ -356,11 +349,10 @@
 msgid "Unblock"
 msgstr "取消屏蔽"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
+msgstr "清输入你想要屏蔽/解除屏蔽的用户名活别名。"
 
 #. Not multiline
 #. Not masked?
@@ -371,7 +363,6 @@
 msgid "New Instant Message"
 msgstr "新即时消息"
 
-#, fuzzy
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr "您想要跟谁聊?请输入他/她的用户名或别名。"
 
@@ -387,11 +378,10 @@
 msgid "Join"
 msgstr "加入"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
-msgstr "您想要查看谁的日志?请输入他/她的用户名或别名。"
+msgstr "您想要查看和谁聊天的日志?请输入他/她的用户名或别名。"
 
 #. Create the "Options" frame.
 msgid "Options"
@@ -400,20 +390,17 @@
 msgid "Send IM..."
 msgstr "发送消息..."
 
-#, fuzzy
 msgid "Block/Unblock..."
-msgstr "取消屏蔽"
+msgstr "屏蔽/取消屏蔽..."
 
 msgid "Join Chat..."
 msgstr "加入聊天..."
 
-#, fuzzy
 msgid "View Log..."
-msgstr "查看日志"
-
-#, fuzzy
+msgstr "查看日志..."
+
 msgid "View All Logs"
-msgstr "查看日志"
+msgstr "查看全部日志"
 
 msgid "Show"
 msgstr "显示"
@@ -436,19 +423,17 @@
 msgid "By Log Size"
 msgstr "按日志大小"
 
-#, fuzzy
 msgid "Buddy"
-msgstr "好友(_B):"
+msgstr "好友"
 
 msgid "Chat"
 msgstr "聊天"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "组"
+msgstr "分组"
 
 msgid "Certificate Import"
-msgstr "证书导入"
+msgstr "导入证书"
 
 msgid "Specify a hostname"
 msgstr "指定主机名"
@@ -503,17 +488,17 @@
 msgstr ""
 
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL 主机证书"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "确实要删除 %s 的证书吗?"
 
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "确认删除证书"
 
 msgid "Certificate Manager"
-msgstr ""
+msgstr "证书管理器"
 
 #. Creating the user splits
 msgid "Hostname"
@@ -615,7 +600,6 @@
 msgid "Add Buddy Pounce..."
 msgstr "添加好友千里眼..."
 
-#, fuzzy
 msgid "Invite..."
 msgstr "邀请"
 
@@ -631,7 +615,8 @@
 #, fuzzy, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "用户列表:\n"
+msgstr[0] "%d 个用户的列表:\n"
+msgstr[1] "%d 个用户的列表:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "支持的调试选项有: version"
@@ -650,7 +635,7 @@
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
-msgstr ""
+msgstr "%s 不是有效的信息类型。查看'/help msgcolor' 已查找有效的信息"
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
@@ -727,6 +712,7 @@
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
 msgstr[0] "文件传送 - 已完成 %d%%,共 %d 个文件"
+msgstr[1] "文件传送 - 已完成 %d%%,共 %d 个文件"
 
 #. Create the window.
 msgid "File Transfers"
@@ -773,13 +759,11 @@
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/秒"
 
-#, fuzzy
 msgid "Sent"
-msgstr "设置(_S)"
-
-#, fuzzy
+msgstr "已发送"
+
 msgid "Received"
-msgstr "收到的消息"
+msgstr "已收到"
 
 msgid "Finished"
 msgstr "已完成"
@@ -788,21 +772,20 @@
 msgid "The file was saved as %s."
 msgstr "文件已另存为 %s。"
 
-#, fuzzy
 msgid "Sending"
-msgstr "发送"
-
-#, fuzzy
+msgstr "正在发送"
+
 msgid "Receiving"
-msgstr "剩余"
-
-#, fuzzy, c-format
+msgstr "正在接收"
+
+# c-format
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "与 %s 的对话"
-
-#, fuzzy, c-format
+msgstr "在 %s 中与 %s 的对话"
+
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "与 %s 的对话"
+msgstr "与 %s 在 %s 的对话"
 
 msgid "%B %Y"
 msgstr "%Y年%m月"
@@ -839,16 +822,14 @@
 msgid "Conversations with %s"
 msgstr "与 %s 的对话"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "对话"
+msgstr "全部对话"
 
 msgid "System Log"
 msgstr "系统日志"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "正在计算..."
+msgstr "正在呼叫..."
 
 msgid "Hangup"
 msgstr ""
@@ -874,12 +855,11 @@
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "您已经参与了频道%s%s"
+msgstr "您已经拒绝呼叫"
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "呼叫:音频呼叫。"
 
 msgid "Emails"
 msgstr "电子邮件"
@@ -893,10 +873,11 @@
 msgid "Subject"
 msgstr "主题"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s(%s) 有 %d 封新邮件。"
+msgstr[1] "%s(%s) 有 %d 封新邮件。"
 
 msgid "New Mail"
 msgstr "新邮件"
@@ -920,16 +901,14 @@
 msgid "(none)"
 msgstr "(无)"
 
-#, fuzzy
 msgid "URI"
-msgstr "UIN"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
-
-#, fuzzy
+msgstr "错误"
+
 msgid "loading plugin failed"
-msgstr "Ping 失败"
+msgstr "载入插件失败"
 
 msgid "unloading plugin failed"
 msgstr ""
@@ -966,9 +945,8 @@
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 
-#, fuzzy
 msgid "Select plugin to install"
-msgstr "选择文件"
+msgstr "选择插件以安装"
 
 msgid "You can (un)load plugins from the following list."
 msgstr "您可以卸载以下列表中的插件。"
@@ -1059,16 +1037,14 @@
 msgid "Play a sound"
 msgstr "播放声音"
 
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "仅当我的状态不可用时才监视(_O)"
+msgstr "仅当我的状态不可用时才监视"
 
 msgid "Recurring"
 msgstr "再现"
 
-#, fuzzy
 msgid "Cannot create pounce"
-msgstr "无法更改昵称"
+msgstr "无法创建监视"
 
 msgid "You do not have any accounts."
 msgstr "您没有帐户。"
@@ -1174,13 +1150,11 @@
 msgid "Logging"
 msgstr "日志"
 
-#, fuzzy
 msgid "You must fill all the required fields."
-msgstr "填入注册字段。"
-
-#, fuzzy
+msgstr "您必须填入注册字段。"
+
 msgid "The required fields are underlined."
-msgstr "所需插件 %s 无法装入。"
+msgstr "所需区域已用下划线标出。"
 
 msgid "Not implemented yet."
 msgstr "未实现。"
@@ -1191,16 +1165,14 @@
 msgid "Open File..."
 msgstr "打开文件..."
 
-#, fuzzy
 msgid "Choose Location..."
-msgstr "位置"
+msgstr "选择位置..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
-
-#, fuzzy
+msgstr "按'Enter'以寻找更多此分类下的聊天室。"
+
 msgid "Get"
-msgstr "设置(_S)"
+msgstr "获取"
 
 #. Create the window.
 msgid "Room List"
@@ -1233,9 +1205,8 @@
 msgid "Others talk in chat"
 msgstr "别人在聊天中发言"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "别人在聊天中提到您的名字"
+msgstr "有人在聊天中提到您的名字"
 
 msgid "GStreamer Failure"
 msgstr "GStreamer 失败"
@@ -1273,7 +1244,7 @@
 msgid "Method: "
 msgstr "方式:"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
@@ -1297,9 +1268,8 @@
 msgid "Only when not available"
 msgstr "仅当不可用时"
 
-#, fuzzy
 msgid "Volume(0-100):"
-msgstr "音量:"
+msgstr "音量(0-100):"
 
 #. Sound events
 msgid "Sound Events"
@@ -1492,24 +1462,20 @@
 msgid "Offline"
 msgstr "离线"
 
-#, fuzzy
 msgid "Online Buddies"
-msgstr "离线好友"
-
-#, fuzzy
+msgstr "在线好友"
+
 msgid "Offline Buddies"
 msgstr "离线好友"
 
-#, fuzzy
 msgid "Online/Offline"
-msgstr "上线时间"
+msgstr "在线/离线"
 
 msgid "Meebo"
 msgstr ""
 
-#, fuzzy
 msgid "No Grouping"
-msgstr "无声音"
+msgstr "未分组"
 
 msgid "Nested Subgroup"
 msgstr ""
@@ -1517,12 +1483,11 @@
 msgid "Nested Grouping (experimental)"
 msgstr ""
 
-#, fuzzy
 msgid "Provides alternate buddylist grouping options."
-msgstr "提供与 Evolution 的集成。"
+msgstr "提供其他分组选项。"
 
 msgid "Lastlog"
-msgstr "Lastlog"
+msgstr "最近日志"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
@@ -1547,12 +1512,11 @@
 msgid "TinyURL (or other) address prefix"
 msgstr ""
 
-#, fuzzy
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL 插件"
 
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
 msgstr ""
@@ -1647,13 +1611,13 @@
 msgstr ""
 
 #. Make messages
-#, fuzzy, c-format
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "接受聊天邀请吗?"
+msgstr "接受 %s 的聊天邀请吗?"
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "SSL 证书验证"
 
 msgid "_View Certificate..."
 msgstr "查看证书(_V)..."
@@ -1725,16 +1689,14 @@
 msgstr ""
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "服务器信息"
+msgstr "证书信息"
 
 msgid "Registration Error"
 msgstr "注册错误"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "注册错误"
+msgstr "解除注册错误"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -1744,6 +1706,8 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s 已登出"
 
+#. Unknown error
+#. Unknown error!
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -1790,7 +1754,6 @@
 msgid "%s left the room (%s)."
 msgstr "%s 离开了聊天室(%s)。"
 
-#, fuzzy
 msgid "Invite to chat"
 msgstr "邀请会议"
 
@@ -2125,6 +2088,10 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"
 
+#, fuzzy
+msgid "Error creating conference."
+msgstr "创建连接出错"
+
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "您正在使用 %s,但插件需要 %s。"
@@ -2160,9 +2127,9 @@
 msgid "Unable to load your plugin."
 msgstr "无法装入您的插件。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "依赖的插件 %s 装入失败。"
+msgstr "%s 依赖的插件 %s 卸载失败。"
 
 msgid "Autoaccept"
 msgstr "自动接受"
@@ -2218,9 +2185,8 @@
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "选择要搜索的用户目录"
+msgstr "为每个用户创建新目录"
 
 msgid "Notes"
 msgstr "备注"
@@ -2510,9 +2476,10 @@
 msgstr "在日志查看器中包含其它即时通讯客户的日志。"
 
 #. * description
+#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
-"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
 "\n"
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
@@ -2565,7 +2532,7 @@
 msgstr ""
 
 msgid ""
-"The rest of the messages will be saved as pounce. You can edit/delete the "
+"The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
@@ -2807,11 +2774,12 @@
 msgstr ""
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
-"pidgin.im/BonjourWindows for more information."
-msgstr ""
-
-msgid "Unable to listen for incoming IM connections\n"
+"Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
+"im/BonjourWindows for more information."
+msgstr ""
+
+#, fuzzy
+msgid "Unable to listen for incoming IM connections"
 msgstr "无法监听连入的 IM 连接\n"
 
 msgid ""
@@ -2850,9 +2818,8 @@
 msgstr "Purple 联系人"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "地区"
+msgstr "本地端口"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2864,18 +2831,24 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "无法发送消息,无法开始对话。"
 
-msgid "Cannot open socket"
-msgstr "无法打开套接字"
-
-msgid "Could not bind socket to port"
+#, fuzzy, c-format
+msgid "Unable to create socket: %s"
+msgstr ""
+"无法创建套接字:\n"
+"%s"
+
+#, fuzzy, c-format
+msgid "Unable to bind socket to port: %s"
 msgstr "无法将套接字绑定到端口"
 
-msgid "Could not listen on socket"
-msgstr "无法在套接字上监听"
-
-#, fuzzy
+#, fuzzy, c-format
+msgid "Unable to listen on socket: %s"
+msgstr ""
+"无法创建套接字:\n"
+"%s"
+
 msgid "Error communicating with local mDNSResponder."
-msgstr "与服务器通讯出错"
+msgstr "与本地 DNS 服务通讯出错"
 
 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
@@ -2900,9 +2873,9 @@
 msgid "Buddylist saved successfully!"
 msgstr "好友列表成功保存!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "无法装入好友列表"
+msgstr "无法为 %s 写入 %s 好友列表"
 
 msgid "Couldn't load buddylist"
 msgstr "无法装入好友列表"
@@ -2919,13 +2892,16 @@
 msgid "Load buddylist from file..."
 msgstr "从文件装入好友列表..."
 
-msgid "Fill in the registration fields."
+#, fuzzy
+msgid "You must fill in all registration fields"
 msgstr "填入注册字段。"
 
-msgid "Passwords do not match."
+#, fuzzy
+msgid "Passwords do not match"
 msgstr "密码不匹配。"
 
-msgid "Unable to register new account. Error occurred.\n"
+#, fuzzy
+msgid "Unable to register new account.  An unknown error occurred."
 msgstr "无法创建新账户。发生了错误。\n"
 
 msgid "New Gadu-Gadu Account Registered"
@@ -2937,14 +2913,15 @@
 msgid "Password"
 msgstr "密码"
 
-msgid "Password (retype)"
-msgstr "密码(重新输入)"
-
-msgid "Enter current token"
-msgstr "输入当前令牌"
-
-msgid "Current token"
-msgstr "当前令牌"
+msgid "Password (again)"
+msgstr "再次输入新密码"
+
+msgid "Enter captcha text"
+msgstr ""
+
+#, fuzzy
+msgid "Captcha"
+msgstr "保存图像"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "注册新的 Gadu-Gadu 账户"
@@ -2997,6 +2974,15 @@
 msgid "Current password"
 msgstr "当前密码"
 
+msgid "Password (retype)"
+msgstr "密码(重新输入)"
+
+msgid "Enter current token"
+msgstr "输入当前令牌"
+
+msgid "Current token"
+msgstr "当前令牌"
+
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "请输入您目前 UIN 的密码和新密码:"
 
@@ -3044,7 +3030,7 @@
 msgid "There are no users matching your search criteria."
 msgstr "没有与您的搜索条件匹配的用户。"
 
-msgid "Unable to read socket"
+msgid "Unable to read from socket"
 msgstr "无法读取套接字"
 
 msgid "Buddy list downloaded"
@@ -3059,8 +3045,14 @@
 msgid "Your buddy list was stored on the server."
 msgstr "您的好友列表存储于服务器上。"
 
-msgid "Connection failed."
-msgstr "连接失败。"
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "已连接"
+
+msgid "Connection failed"
+msgstr "连接失败"
 
 msgid "Add to chat"
 msgstr "添加到聊天"
@@ -3068,13 +3060,23 @@
 msgid "Chat _name:"
 msgstr "聊天名(_N):"
 
+#, fuzzy, c-format
+msgid "Unable to resolve hostname '%s': %s"
+msgstr "无法连接到服务器。"
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "正连接"
+
 msgid "Chat error"
 msgstr "聊天错误"
 
 msgid "This chat name is already in use"
 msgstr "此聊天名已经在使用中"
 
-msgid "Not connected to the server."
+#, fuzzy
+msgid "Not connected to the server"
 msgstr "未连接到服务器。"
 
 msgid "Find buddies..."
@@ -3116,6 +3118,10 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 用户"
 
+#, fuzzy
+msgid "GG server"
+msgstr "设置用户信息..."
+
 #, c-format
 msgid "Unknown command: %s"
 msgstr "未知的错误代码: %s"
@@ -3130,7 +3136,8 @@
 msgid "File Transfer Failed"
 msgstr "文件传送失败"
 
-msgid "Could not open a listening port."
+#, fuzzy
+msgid "Unable to open a listening port."
 msgstr "无法打开监听端口。"
 
 msgid "Error displaying MOTD"
@@ -3146,8 +3153,18 @@
 msgid "MOTD for %s"
 msgstr "%s 的 MOTD"
 
-msgid "Server has disconnected"
-msgstr "服务器已断开连接"
+#.
+#. * TODO: Handle this better. Probably requires a PurpleBOSHConnection
+#. * buffer that stores what is "being sent" until the
+#. * PurpleHTTPConnection reports it is fully sent.
+#.
+#. 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
+msgid "Lost connection with server: %s"
+msgstr ""
+"失去与服务器的连接:\n"
+"%s"
 
 msgid "View MOTD"
 msgstr "查看 MOTD"
@@ -3158,25 +3175,24 @@
 msgid "_Password:"
 msgstr "密码(_P):"
 
-msgid "IRC nicks may not contain whitespace"
+#, fuzzy
+msgid "IRC nick and server may not contain whitespace"
 msgstr "IRC 昵称不能包含空格"
 
-#. 1. connect to server
-#. connect to the server
-msgid "Connecting"
-msgstr "正连接"
-
 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
 
-msgid "Couldn't create socket"
-msgstr "无法创建套接字"
-
-msgid "Couldn't connect to host"
-msgstr "无法连接到主机"
-
-msgid "Read error"
-msgstr "读取错误"
+msgid "Unable to connect"
+msgstr "无法连接"
+
+#. this is a regular connect, error out
+#, fuzzy, c-format
+msgid "Unable to connect: %s"
+msgstr "无法连接到 %s"
+
+#, fuzzy, c-format
+msgid "Server closed the connection"
+msgstr "服务器关闭了连接。"
 
 msgid "Users"
 msgstr "用户"
@@ -3230,13 +3246,12 @@
 msgid "Ban on %s by %s, set %s ago"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s"
-msgstr "原因: %s"
-
-#, fuzzy
+msgstr "屏蔽: %s"
+
 msgid "End of ban list"
-msgstr "未列出"
+msgstr "屏蔽列表结束"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3357,13 +3372,12 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "此聊天名已经在使用中"
-
-#, fuzzy
+msgstr "昵称 \"%s\" 已被使用。"
+
 msgid "Nickname in use"
-msgstr "昵称"
+msgstr "昵称已被使用"
 
 msgid "Cannot change nick"
 msgstr "无法更改昵称"
@@ -3382,9 +3396,9 @@
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING 响应 -- 延后: %lu 秒"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "需要注册"
+msgstr "无法加入 %s:需要注册"
 
 msgid "Cannot join channel"
 msgstr "无法加入频道"
@@ -3578,12 +3592,13 @@
 msgid "execute"
 msgstr "未期待"
 
-msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+#, fuzzy
+msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
 
 #, fuzzy
-msgid "You require encryption, but no TLS/SSL support found."
-msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
+msgid "You require encryption, but no TLS/SSL support was found."
+msgstr "您要求 TLS/SSL 登录,但没有找到 TLS/SSL 支持。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"
@@ -3597,52 +3612,45 @@
 msgid "Plaintext Authentication"
 msgstr "纯文本认证"
 
-msgid "Invalid response from server."
+#, fuzzy
+msgid "SASL authentication failed"
+msgstr "认证失败"
+
+#, fuzzy
+msgid "Invalid response from server"
 msgstr "服务器的响应无效。"
 
 msgid "Server does not use any supported authentication method"
 msgstr "服务器未使用任何支持的身份验证方法"
 
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"
 
-msgid "SASL error"
+#, fuzzy, c-format
+msgid "SASL error: %s"
 msgstr "SASL 错误"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr ""
 
-#, fuzzy
 msgid "No session ID given"
-msgstr "没有给出理由。"
-
-#, fuzzy
+msgstr "没有给出会话 ID"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "不支持的版本"
-
-#, fuzzy
+msgstr "不支持 BOSH 协议的版本"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"无法建立与服务器:\n"
-"%s"
-
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"无法建立与服务器:\n"
-"%s"
-
-#, fuzzy
+msgstr "无法与服务器建立连接"
+
+#, fuzzy, c-format
+msgid "Unable to establish a connection with the server: %s"
+msgstr "无法与服务器建立连接"
+
 msgid "Unable to establish SSL connection"
-msgstr "无法初始化连接"
-
-msgid "Unable to create socket"
-msgstr "无法创建套接字"
-
-msgid "Write error"
-msgstr "写错误"
+msgstr "无法建立 SSL 连接"
 
 msgid "Full Name"
 msgstr "全名"
@@ -3708,186 +3716,8 @@
 msgid "Operating System"
 msgstr "操作系统"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "本地文件:"
-
-msgid "Last Activity"
-msgstr ""
-
-msgid "Service Discovery Info"
-msgstr "服务目录信息"
-
-msgid "Service Discovery Items"
-msgstr ""
-
-#, fuzzy
-msgid "Extended Stanza Addressing"
-msgstr "额外地址"
-
-#, fuzzy
-msgid "Multi-User Chat"
-msgstr "给聊天起名"
-
-#, fuzzy
-msgid "Multi-User Chat Extended Presence Information"
-msgstr "用户没有目录信息。"
-
-msgid "In-Band Bytestreams"
-msgstr ""
-
-#, fuzzy
-msgid "Ad-Hoc Commands"
-msgstr "命令"
-
-msgid "PubSub Service"
-msgstr ""
-
-msgid "SOCKS5 Bytestreams"
-msgstr ""
-
-msgid "Out of Band Data"
-msgstr ""
-
-msgid "XHTML-IM"
-msgstr "XHTML-IM"
-
-#, fuzzy
-msgid "In-Band Registration"
-msgstr "注册错误"
-
-#, fuzzy
-msgid "User Location"
-msgstr "位置"
-
-#, fuzzy
-msgid "User Avatar"
-msgstr "用户搜索"
-
-#, fuzzy
-msgid "Chat State Notifications"
-msgstr "好友状态通知"
-
-msgid "Software Version"
-msgstr "软件版本"
-
-#, fuzzy
-msgid "Stream Initiation"
-msgstr "方向"
-
-msgid "File Transfer"
-msgstr "文件传送"
-
-msgid "User Mood"
-msgstr "用户心情"
-
-msgid "User Activity"
-msgstr "用户活动"
-
-#, fuzzy
-msgid "Entity Capabilities"
-msgstr "能力"
-
-msgid "Encrypted Session Negotiations"
-msgstr ""
-
-#, fuzzy
-msgid "User Tune"
-msgstr "用户名"
-
-#, fuzzy
-msgid "Roster Item Exchange"
-msgstr "带密钥交换开聊"
-
-#, fuzzy
-msgid "Reachability Address"
-msgstr "电子邮件地址"
-
-#, fuzzy
-msgid "User Profile"
-msgstr "个人资料"
-
-#, fuzzy
-msgid "Jingle"
-msgstr "加入"
-
-msgid "Jingle Audio"
-msgstr ""
-
-#, fuzzy
-msgid "User Nickname"
-msgstr "用户名"
-
-msgid "Jingle ICE UDP"
-msgstr ""
-
-msgid "Jingle ICE TCP"
-msgstr ""
-
-msgid "Jingle Raw UDP"
-msgstr ""
-
-#, fuzzy
-msgid "Jingle Video"
-msgstr "实时视频"
-
-msgid "Jingle DTMF"
-msgstr ""
-
-#, fuzzy
-msgid "Message Receipts"
-msgstr "消息已收到"
-
-#, fuzzy
-msgid "Public Key Publishing"
-msgstr "公钥漏印"
-
-#, fuzzy
-msgid "User Chatting"
-msgstr "用户选项"
-
-#, fuzzy
-msgid "User Browsing"
-msgstr "用户模式"
-
-#, fuzzy
-msgid "User Gaming"
-msgstr "用户名"
-
-#, fuzzy
-msgid "User Viewing"
-msgstr "允许限制"
-
-msgid "Ping"
-msgstr "Ping"
-
-#, fuzzy
-msgid "Stanza Encryption"
-msgstr "Trillian 加密"
-
-msgid "Entity Time"
-msgstr ""
-
-msgid "Delayed Delivery"
-msgstr ""
-
-msgid "Collaborative Data Objects"
-msgstr ""
-
-msgid "File Repository and Sharing"
-msgstr ""
-
-msgid "STUN Service Discovery for Jingle"
-msgstr ""
-
-msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
-
-msgid "Hop Check"
-msgstr ""
-
-msgid "Capabilities"
-msgstr "能力"
+msgstr "本地时间"
 
 msgid "Priority"
 msgstr "优先级"
@@ -3895,6 +3725,14 @@
 msgid "Resource"
 msgstr "资源"
 
+#, c-format
+msgid "%s ago"
+msgstr ""
+
+#, fuzzy
+msgid "Logged Off"
+msgstr "已登入"
+
 msgid "Middle Name"
 msgstr "中名"
 
@@ -3929,13 +3767,11 @@
 msgid "Unsubscribe"
 msgstr "退订"
 
-#, fuzzy
 msgid "Log In"
-msgstr "已登入"
-
-#, fuzzy
+msgstr "登录"
+
 msgid "Log Out"
-msgstr "记录聊天"
+msgstr "退出"
 
 msgid "Chatty"
 msgstr "唠叨"
@@ -3982,9 +3818,8 @@
 msgid "Email Address"
 msgstr "电子邮件地址"
 
-#, fuzzy
 msgid "Search for XMPP users"
-msgstr "搜索用户"
+msgstr "搜索 XMPP 用户"
 
 #. "Search"
 msgid "Search"
@@ -4065,20 +3900,23 @@
 msgid "Find Rooms"
 msgstr "查找房间"
 
-msgid "You require encryption, but it is not available on this server."
-msgstr ""
-
-#, fuzzy
-msgid "Ping timeout"
-msgstr "纯文本"
-
-msgid "Read Error"
-msgstr "读取错误"
-
-#, c-format
-msgid ""
-"Could not find alternative XMPP connection methods after failing to connect "
-"directly.\n"
+#, fuzzy
+msgid "Affiliations:"
+msgstr "别名:"
+
+msgid "No users found"
+msgstr "未找到匹配的用户"
+
+msgid "Roles:"
+msgstr "角色:"
+
+#, fuzzy
+msgid "Ping timed out"
+msgstr "Ping 超时"
+
+msgid ""
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr ""
 
 msgid "Invalid XMPP ID"
@@ -4088,16 +3926,16 @@
 msgstr ""
 
 #, fuzzy
-msgid "Malformed BOSH Connect Server"
+msgid "Malformed BOSH URL"
 msgstr "连接到服务器失败。"
 
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s 注册成功"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration to %s successful"
-msgstr "%s@%s 注册成功"
+msgstr "%s 注册成功"
 
 msgid "Registration Successful"
 msgstr "注册成功"
@@ -4105,20 +3943,15 @@
 msgid "Registration Failed"
 msgstr "注册失败"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "%s@%s 注册成功"
-
-#, fuzzy
+msgstr "%s 取消注册成功"
+
 msgid "Unregistration Successful"
-msgstr "注册成功"
-
-#, fuzzy
+msgstr "取消注册成功"
+
 msgid "Unregistration Failed"
-msgstr "注册失败"
-
-msgid "Already Registered"
-msgstr "已注册"
+msgstr "取消注册失败"
 
 msgid "State"
 msgstr "州/省"
@@ -4132,10 +3965,12 @@
 msgid "Date"
 msgstr "日期"
 
+msgid "Already Registered"
+msgstr "已注册"
+
 msgid "Unregister"
 msgstr "取消注册"
 
-#, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "请在下面填入信息以注册您新的账户。"
@@ -4143,39 +3978,39 @@
 msgid "Please fill out the information below to register your new account."
 msgstr "请在下面填入信息以注册您新的账户。"
 
-#, fuzzy
 msgid "Register New XMPP Account"
-msgstr "注册新的 Jabber 账户"
+msgstr "注册新的 XMPP 账户"
 
 msgid "Register"
 msgstr "注册"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "更改 %s 的用户信息"
-
-#, fuzzy, c-format
+msgstr "更改在 %s 的用户信息"
+
+#, c-format
 msgid "Register New Account at %s"
-msgstr "注册新的 Jabber 账户"
-
-#, fuzzy
+msgstr "在 %s 注册新账户"
+
 msgid "Change Registration"
-msgstr "注册错误"
+msgstr "更改帐户"
+
+#, fuzzy
+msgid "Malformed BOSH Connect Server"
+msgstr "连接到服务器失败。"
 
 #, fuzzy
 msgid "Error unregistering account"
 msgstr "更改账户信息出错"
 
-#, fuzzy
 msgid "Account successfully unregistered"
-msgstr "您成功创建了一个群"
+msgstr "取消帐户注册成功"
 
 msgid "Initializing Stream"
 msgstr "初始化流"
 
-#, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "初始化流"
+msgstr "初始化 SSL/TLS"
 
 msgid "Authenticating"
 msgstr "正在认证"
@@ -4263,12 +4098,8 @@
 msgid "Error changing password"
 msgstr "更改密码出错"
 
-msgid "Password (again)"
-msgstr "再次输入新密码"
-
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "更改密码"
+msgstr "更改 XMPP 密码"
 
 msgid "Please enter your new password"
 msgstr "请输入您的新密码"
@@ -4456,9 +4287,9 @@
 msgid "Unable to kick user %s"
 msgstr "无法踢出用户 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "无法屏蔽用户 %s"
+msgstr "无法 ping 用户 %s"
 
 #, fuzzy, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
@@ -4537,13 +4368,14 @@
 msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
 
 msgid ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
-"affiliation with the room."
-msgstr ""
-
-msgid ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
-"role in the room."
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
+"the users with an affiliation or set users' affiliation with the room."
+msgstr ""
+
+#, 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;: 设置用户在房间"
 "中的角色。"
@@ -4579,14 +4411,12 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "MSN 协议插件"
+msgstr "XMPP 协议插件"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#, fuzzy
 msgid "Domain"
-msgstr "罗马尼亚语"
+msgstr "域"
 
 msgid "Require SSL/TLS"
 msgstr ""
@@ -4606,19 +4436,20 @@
 msgid "Connect server"
 msgstr "连接服务器"
 
-#, fuzzy
 msgid "File transfer proxies"
-msgstr "文件传送端口"
+msgstr "文件传送代理"
+
+msgid "BOSH URL"
+msgstr ""
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "显示自定义如下:"
-
-#, fuzzy, c-format
+msgstr "显示自定义表情"
+
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s 已经关闭了对话。"
+msgstr "%s 已经离开了对话。"
 
 #, c-format
 msgid "Message from %s"
@@ -4636,11 +4467,10 @@
 msgid "Message delivery to %s failed: %s"
 msgstr "投递到 %s 的消息失败: %s"
 
-#, fuzzy
 msgid "XMPP Message Error"
-msgstr "Jabber 消息错误"
-
-#, fuzzy, c-format
+msgstr "XMPP 消息错误"
+
+#, c-format
 msgid "(Code %s)"
 msgstr " (代码 %s)"
 
@@ -4650,6 +4480,14 @@
 msgid "Unknown Error in presence"
 msgstr "出现未知错误"
 
+#, c-format
+msgid "Error joining chat %s"
+msgstr "加入聊天 %s 出错"
+
+#, c-format
+msgid "Error in chat %s"
+msgstr "聊天 %s 出错"
+
 msgid "Create New Room"
 msgstr "创建新房间"
 
@@ -4664,16 +4502,20 @@
 msgid "_Accept Defaults"
 msgstr "接受默认值(_A)"
 
-#, c-format
-msgid "Error joining chat %s"
-msgstr "加入聊天 %s 出错"
-
-#, c-format
-msgid "Error in chat %s"
-msgstr "聊天 %s 出错"
-
-#, fuzzy
-msgid "An error occured on the in-band bytestream transfer\n"
+#, fuzzy
+msgid "No reason"
+msgstr "没有给出理由。"
+
+#, fuzzy, c-format
+msgid "You have been kicked: (%s)"
+msgstr "您被 %s: %s 踢出了"
+
+#, fuzzy, c-format
+msgid "Kicked (%s)"
+msgstr "被 %s (%s) 踢出"
+
+#, fuzzy
+msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "打开文件时发生了错误。"
 
 #, fuzzy
@@ -5013,6 +4855,10 @@
 msgid "Non-IM Contacts"
 msgstr "删除联系人"
 
+#, fuzzy, c-format
+msgid "%s sent you a voice chat invite, which is not yet supported."
+msgstr "%s 向您发送了摄像头邀请,但尚不支持。"
+
 msgid "Nudge"
 msgstr ""
 
@@ -5174,9 +5020,6 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 支持。请安装本软件支持的 SSL 库。"
 
-msgid "Failed to connect to server."
-msgstr "连接到服务器失败。"
-
 msgid "Error retrieving profile"
 msgstr "获取配置文件出错"
 
@@ -5367,66 +5210,29 @@
 msgstr "失败: 身份验证失败"
 
 #, c-format
-msgid "%s is not a valid group."
-msgstr "%s 不是有效的组名。"
-
-msgid "Unknown error."
-msgstr "未知错误。"
-
-#, c-format
-msgid "%s on %s (%s)"
-msgstr "%2$s(%3$s) 上的 %1$s"
-
-#, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 刚刚给您发送了闪屏振动!"
 
-#. char *adl = g_strndup(payload, len);
-#, fuzzy, c-format
-msgid "Unknown error (%d)"
+#, fuzzy, c-format
+msgid "Unknown error (%d): %s"
 msgstr "未知错误"
 
 msgid "Unable to add user"
 msgstr "无法添加用户"
 
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "未知错误"
+
 #, fuzzy
 msgid "The following users are missing from your addressbook"
 msgstr "下面是您搜索的结果"
 
-#, c-format
-msgid "Unable to add user on %s (%s)"
-msgstr "无法在 %s(%s) 上添加用户"
-
-#, c-format
-msgid "Unable to block user on %s (%s)"
-msgstr "无法在 %s(%s) 上屏蔽用户"
-
-#, c-format
-msgid "Unable to permit user on %s (%s)"
-msgstr "无法允许 %s(%s) 上的拥护"
-
-#, c-format
-msgid "%s could not be added because your buddy list is full."
-msgstr "无法添加 %s,原因是您的好友列表已满。"
-
-#, c-format
-msgid "%s is not a valid passport account."
-msgstr "%s 不是有效的通行证账户。"
-
-msgid "Service Temporarily Unavailable."
-msgstr "服务暂时不可用。"
-
 #, fuzzy
 msgid "Mobile message was not sent because it was too long."
 msgstr "消息未发出,因为您尚未登入。"
 
-msgid "Unable to rename group"
-msgstr "无法重命名组"
-
-msgid "Unable to delete group"
-msgstr "无法删除组"
-
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
 "automatically be signed out at that time.  Please finish any conversations "
@@ -5446,6 +5252,11 @@
 "现在进行中的对话。\n"
 "\n"
 "维护完成后,您将能够成功登入。"
+msgstr[1] ""
+"MSN 服务器即将于 %d 分钟后关闭进行维护。到那时,您将会被自动登出。请尽快关闭"
+"现在进行中的对话。\n"
+"\n"
+"维护完成后,您将能够成功登入。"
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
@@ -5464,9 +5275,6 @@
 msgid "Message was not sent because an unknown error occurred."
 msgstr "消息未发出,因为发生了未知错误:"
 
-msgid "Unable to connect"
-msgstr "无法连接"
-
 msgid "Writing error"
 msgstr "写入错误"
 
@@ -5481,19 +5289,23 @@
 "%s 服务器的连接错误:\n"
 "%s"
 
-msgid "Our protocol is not supported by the server."
+#, fuzzy
+msgid "Our protocol is not supported by the server"
 msgstr "服务器不支持此协议。"
 
-msgid "Error parsing HTTP."
+#, fuzzy
+msgid "Error parsing HTTP"
 msgstr "分析 HTTP 出错。"
 
-msgid "You have signed on from another location."
+#, fuzzy
+msgid "You have signed on from another location"
 msgstr "您在其它位置用此用户名登入了。"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN 服务器临时不可用。请稍候再试一次。"
 
-msgid "The MSN servers are going down temporarily."
+#, fuzzy
+msgid "The MSN servers are going down temporarily"
 msgstr "MSN 服务器目前维护中。"
 
 #, c-format
@@ -5522,6 +5334,14 @@
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"
 
+#, fuzzy, 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 向您发送了摄像头邀请,但尚不支持。"
+
 msgid "Away From Computer"
 msgstr "远离电脑"
 
@@ -5558,14 +5378,6 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "消息未发出,因为发生了未知错误:"
 
-#, c-format
-msgid "%s has added you to his or her buddy list."
-msgstr "%s 已将您添加为好友。"
-
-#, c-format
-msgid "%s has removed you from his or her buddy list."
-msgstr "%s 已经将您从好友名单中删除。"
-
 #, fuzzy
 msgid "Delete Buddy from Address Book?"
 msgstr "添加到地址簿"
@@ -5599,6 +5411,54 @@
 msgstr "AIM 协议插件"
 
 #, c-format
+msgid "%s is not a valid group."
+msgstr "%s 不是有效的组名。"
+
+msgid "Unknown error."
+msgstr "未知错误。"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%2$s(%3$s) 上的 %1$s"
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr "无法在 %s(%s) 上添加用户"
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr "无法在 %s(%s) 上屏蔽用户"
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr "无法允许 %s(%s) 上的拥护"
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr "无法添加 %s,原因是您的好友列表已满。"
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr "%s 不是有效的通行证账户。"
+
+msgid "Service Temporarily Unavailable."
+msgstr "服务暂时不可用。"
+
+msgid "Unable to rename group"
+msgstr "无法重命名组"
+
+msgid "Unable to delete group"
+msgstr "无法删除组"
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr "%s 已将您添加为好友。"
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr "%s 已经将您从好友名单中删除。"
+
+#, c-format
 msgid "No such user: %s"
 msgstr ""
 
@@ -5634,6 +5494,8 @@
 "%s"
 
 #. 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 "发送消息"
@@ -5670,23 +5532,20 @@
 msgid "Add contacts from server"
 msgstr "服务器的响应无效。"
 
-#. The session is now set up, ready to be connected. This emits the
-#. * signedOn signal, so clients can now do anything with msimprpl, and
-#. * we're ready for it (session key, userid, username all setup).
-msgid "Connected"
-msgstr "已连接"
-
 #, fuzzy, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "进程返回了错误代码 %d"
 
 #, c-format
 msgid ""
-"%s Your password is %d characters, greater than the expected maximum length "
-"of %d for MySpaceIM. Please shorten your password at http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
-"again."
-msgstr ""
+"%s Your password is %zu characters, which is longer than the maximum length "
+"of %d.  Please shorten your password at http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword and try again."
+msgstr ""
+
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "昵称或密码不对"
 
 msgid "MySpaceIM Error"
 msgstr ""
@@ -5696,18 +5555,6 @@
 msgstr "完成连接"
 
 #, fuzzy
-msgid "Read buffer full (2)"
-msgstr "队列满"
-
-#, fuzzy
-msgid "Unparseable message"
-msgstr "无法处理消息"
-
-#, fuzzy, c-format
-msgid "Couldn't connect to host: %s (%d)"
-msgstr "无法连接到主机"
-
-#, fuzzy
 msgid "Failed to add buddy"
 msgstr "在聊天中加入好友失败"
 
@@ -5799,6 +5646,12 @@
 msgid "Client Version"
 msgstr "关闭对话"
 
+msgid ""
+"An error occurred while trying to set the username.  Please try again, or "
+"visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"to set your username."
+msgstr ""
+
 #, fuzzy
 msgid "MySpaceIM - Username Available"
 msgstr "服务不可用"
@@ -6023,10 +5876,6 @@
 msgstr "主存档配置错误"
 
 #, fuzzy
-msgid "Incorrect username or password"
-msgstr "昵称或密码不对"
-
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "无法识别您输入用户名的主机"
 
@@ -6066,9 +5915,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "未知错误: 0x%X"
 
-#, c-format
-msgid "Login failed (%s)."
-msgstr "登录失败(%s)。"
+#, fuzzy, c-format
+msgid "Unable to login: %s"
+msgstr "无法 ping 用户 %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6166,9 +6015,6 @@
 msgid "Authenticating..."
 msgstr "正在认证..."
 
-msgid "Unable to connect to server."
-msgstr "无法连接到服务器。"
-
 msgid "Waiting for response..."
 msgstr "正在等候响应..."
 
@@ -6192,22 +6038,17 @@
 msgid "Would you like to join the conversation?"
 msgstr "您是否想要加入对话?"
 
-msgid "You have been logged out because you logged in at another workstation."
-msgstr "您已被注销,因为您已从其它计算机上登录。"
-
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 显示为离线,因此未接受到您刚刚发出的消息。"
 
-msgid ""
-"Unable to connect to server. Please enter the address of the server you wish "
-"to connect to."
+#, fuzzy
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "无法连接到服务器。请输入您想要连接的服务器的地址。"
 
-msgid "Error. SSL support is not installed."
-msgstr "出错。SSL 支持未安装。"
-
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "此会议已关筹。不会再送出消息。"
 
@@ -6231,6 +6072,25 @@
 msgstr "服务器端口"
 
 #, fuzzy
+msgid "Received unexpected response from "
+msgstr "从服务器收到了意外的 HTTP 响应。"
+
+#. username connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+"您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
+"能会更长。"
+
+#, fuzzy, c-format
+msgid "Error requesting "
+msgstr "请求登录令牌出错"
+
+msgid "AOL does not allow your screen name to authenticate here"
+msgstr ""
+
+#, fuzzy
 msgid "Could not join chat room"
 msgstr "无法连接"
 
@@ -6238,18 +6098,8 @@
 msgid "Invalid chat room name"
 msgstr "无效的房间名"
 
-msgid "Server closed the connection."
-msgstr "服务器关闭了连接。"
-
-#, c-format
-msgid ""
-"Lost connection with server:\n"
-"%s"
-msgstr ""
-"失去与服务器的连接:\n"
-"%s"
-
-msgid "Received invalid data on connection with server."
+#, fuzzy
+msgid "Received invalid data on connection with server"
 msgstr "在与服务器的连接中收到了无效的数据。"
 
 #. *< type
@@ -6297,7 +6147,8 @@
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-msgid "Could not establish a connection with the remote user."
+#, fuzzy
+msgid "Unable to establish a connection with the remote user."
 msgstr "无法建立与远程用户的连接。"
 
 msgid "Direct IM established"
@@ -6400,7 +6251,7 @@
 
 #. Label
 msgid "Buddy Icon"
-msgstr "好友图标"
+msgstr "用户头像"
 
 msgid "Voice"
 msgstr "语音"
@@ -6490,21 +6341,15 @@
 msgid "Buddy Comment"
 msgstr "好友注释"
 
-#, c-format
-msgid ""
-"Could not connect to authentication server:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "无法连接到身份验证服务器:\n"
 "%s"
 
-#, c-format
-msgid ""
-"Could not connect to BOS server:\n"
-"%s"
-msgstr ""
-"无法连接到 BOS 服务器:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Unable to connect to BOS server: %s"
+msgstr "无法连接到服务器。"
 
 #, fuzzy
 msgid "Username sent"
@@ -6519,50 +6364,57 @@
 
 #, fuzzy, c-format
 msgid ""
-"Unable to login: Could not 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."
+"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 登入,原因是用户名无效。用户名必须是有效的电子邮件地址,"
 "或者以字母开头,且只能包含字母、数字和空格,或者只包含数字。"
 
+#, fuzzy, c-format
+msgid "You may be disconnected shortly.  If so, check %s for updates."
+msgstr "您即将被断开。请检查 %s 上的更新。"
+
+msgid "Unable to get a valid AIM login hash."
+msgstr "无法获取有效的 AIM 登录码。"
+
+msgid "Unable to get a valid login hash."
+msgstr "无法获取有效的登录码。"
+
+msgid "Received authorization"
+msgstr "收到的认证"
+
 #. Unregistered username
 #. uid is not exist
-#, fuzzy
-msgid "Invalid username."
-msgstr "名称无效"
-
-msgid "Incorrect password."
-msgstr "密码不对。"
+#. the username does not exist
+#, fuzzy
+msgid "Username does not exist"
+msgstr "用户不存在"
 
 #. Suspended account
-msgid "Your account is currently suspended."
+#, fuzzy
+msgid "Your account is currently suspended"
 msgstr "您的账户被停用。"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL 即时通讯服务暂时不可用。"
 
-#. username connecting too frequently
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr "您使用的客户版本太老。请在 %s 升级"
+
 #. IP address connecting too frequently
-msgid ""
-"You have been connecting and disconnecting too frequently. Wait ten minutes "
-"and try again. If you continue to try, you will need to wait even longer."
+#, 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."
 msgstr ""
 "您连接和断开得太频繁。请等十分钟,然后再试一次。如果您继续重试,您等的时间可"
 "能会更长。"
 
-#, c-format
-msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "您使用的客户版本太老。请在 %s 升级"
-
-msgid "Could Not Connect"
-msgstr "无法连接"
-
-msgid "Received authorization"
-msgstr "收到的认证"
-
-msgid "The SecurID key entered is invalid."
+#, fuzzy
+msgid "The SecurID key entered is invalid"
 msgstr "输入的 SecurID 密钥无效。"
 
 msgid "Enter SecurID"
@@ -6577,20 +6429,6 @@
 msgid "_OK"
 msgstr "确定(_O)"
 
-#, fuzzy, c-format
-msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "您即将被断开。请检查 %s 上的更新。"
-
-msgid "Unable to get a valid AIM login hash."
-msgstr "无法获取有效的 AIM 登录码。"
-
-#, c-format
-msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "您即将被断开。请检查 %s 上的更新。"
-
-msgid "Unable to get a valid login hash."
-msgstr "无法获取有效的登录码。"
-
 msgid "Password sent"
 msgstr "密码已送出"
 
@@ -6678,40 +6516,46 @@
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#, c-format
+#, fuzzy, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
-
-#, c-format
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息无效。"
+
+#, fuzzy, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
-
-#, c-format
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是这些消息太大。"
+
+#, fuzzy, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是达到了等级限制。"
 
 #, fuzzy, c-format
 msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她太可恶了。"
+msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她的警告级别过高。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是他/她的警告级别过高。"
 
 #, fuzzy, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是您太可恶了。"
-
-#, c-format
+msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因是您的警告级别过高。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因是您的警告级别过高。"
+
+#, fuzzy, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
+msgstr[1] "您错过了 %2$s 的 %1$hu 条消息,原因未知。"
 
 #. Data is assumed to be the destination bn
 #, c-format
@@ -6735,6 +6579,9 @@
 msgid "Member Since"
 msgstr "注册时间"
 
+msgid "Capabilities"
+msgstr "能力"
+
 msgid "Profile"
 msgstr "个人资料"
 
@@ -6866,7 +6713,7 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定;请在您完全连接后"
 "再试一次。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -6874,11 +6721,12 @@
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
+msgstr[1] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
 
 msgid "Profile too long."
 msgstr "配置文件太长。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -6886,13 +6734,14 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
+msgstr[1] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
 
 msgid "Away message too long."
 msgstr "离开消息太长。"
 
 #, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the username is invalid.  Usernames must "
+"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, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
@@ -6918,9 +6767,9 @@
 msgid "Orphans"
 msgstr "孤儿"
 
-#, c-format
-msgid ""
-"Could not add the buddy %s because you have too many buddies in your buddy "
+#, fuzzy, 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."
 msgstr ""
 "无法将 %s 加为好友,原因是您的好友太多。请删除其中一个好友,然后再试一次。"
@@ -6929,7 +6778,7 @@
 msgstr "(无名称)"
 
 #, fuzzy, c-format
-msgid "Could not add the buddy %s for an unknown reason."
+msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "您的命令失败,原因未知。"
 
 #, fuzzy, c-format
@@ -7055,6 +6904,7 @@
 msgid "Set User Info (web)..."
 msgstr "设置用户信息(URL)..."
 
+#. This only happens when connecting with the old-style BUCP login
 #, fuzzy
 msgid "Change Password (web)"
 msgstr "更改密码(URL)"
@@ -7087,6 +6937,10 @@
 msgstr "按信息搜索好友"
 
 #, fuzzy
+msgid "Use clientLogin"
+msgstr "用户未登入"
+
+#, fuzzy
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -7763,7 +7617,7 @@
 msgstr "保持在线错误"
 
 #, fuzzy
-msgid "Cannot decrypt server reply"
+msgid "Unable to decrypt server reply"
 msgstr "无法获取服务器信息"
 
 #, c-format
@@ -7790,10 +7644,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Could not decrypt server reply"
-msgstr "无法获取服务器信息"
-
-#, fuzzy
 msgid "Requesting captcha"
 msgstr "正在请求 %s 的注意..."
 
@@ -7830,21 +7680,9 @@
 "%s"
 msgstr ""
 
-msgid "Unable to connect."
-msgstr "无法连接。"
-
 msgid "Socket error"
 msgstr "套接字错误"
 
-msgid "Unable to read from socket"
-msgstr "无法读取套接字"
-
-msgid "Write Error"
-msgstr "写错误"
-
-msgid "Connection lost"
-msgstr "连接丢失"
-
 #, fuzzy
 msgid "Getting server"
 msgstr "设置用户信息..."
@@ -7853,8 +7691,9 @@
 msgid "Requesting token"
 msgstr "请求被禁止"
 
-msgid "Couldn't resolve host"
-msgstr "无法解析主机"
+#, fuzzy
+msgid "Unable to resolve hostname"
+msgstr "无法连接到服务器。"
 
 #, fuzzy
 msgid "Invalid server or port"
@@ -7905,7 +7744,7 @@
 msgstr "命令"
 
 #, fuzzy
-msgid "Could not decrypt login reply"
+msgid "Unable to decrypt login reply"
 msgstr "无法获取服务器信息"
 
 #, fuzzy
@@ -7927,9 +7766,6 @@
 msgid "%d canceled the transfer of %s"
 msgstr "%d 取消了 %s 的传送"
 
-msgid "Connection closed (writing)"
-msgstr "连接已关闭(写入)"
-
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>组标题:</b> %s<br>"
@@ -7983,17 +7819,6 @@
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime 管理员通知"
 
-msgid "Connection reset"
-msgstr "连接重置"
-
-#, c-format
-msgid "Error reading from socket: %s"
-msgstr "从套接字读取时出错:%s"
-
-#. this is a regular connect, error out
-msgid "Unable to connect to host"
-msgstr "无法连接到主机"
-
 #, c-format
 msgid "Announcement from %s"
 msgstr "来自 %s 的通知"
@@ -8017,6 +7842,9 @@
 msgid "Video Camera"
 msgstr "摄像头"
 
+msgid "File Transfer"
+msgstr "文件传送"
+
 msgid "Supports"
 msgstr "支持"
 
@@ -8801,6 +8629,9 @@
 msgid "Network Statistics"
 msgstr "网络统计"
 
+msgid "Ping"
+msgstr "Ping"
+
 msgid "Ping failed"
 msgstr "Ping 失败"
 
@@ -8862,7 +8693,8 @@
 msgid "Disconnected by server"
 msgstr "服务器断开连接"
 
-msgid "Error during connecting to SILC Server"
+#, fuzzy
+msgid "Error connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"
 
 msgid "Key Exchange failed"
@@ -8872,26 +8704,26 @@
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "恢复脱离的会话失败。请按[重新连接]以创建新连接。"
 
-msgid "Connection failed"
-msgstr "连接失败"
-
 msgid "Performing key exchange"
 msgstr "执行密钥交换"
 
-msgid "Unable to create connection"
-msgstr "无法创建连接"
-
-msgid "Could not load SILC key pair"
+#, fuzzy
+msgid "Unable to load SILC key pair"
 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 "内存溢出"
 
-msgid "Cannot initialize SILC protocol"
+#, fuzzy
+msgid "Unable to initialize SILC protocol"
 msgstr "无法初始化 SILC 协议"
 
 msgid "Error loading SILC key pair"
@@ -9177,7 +9009,7 @@
 msgstr "创建 SILC 密钥对..."
 
 #, fuzzy
-msgid "Cannot create SILC key pair\n"
+msgid "Unable to create SILC key pair"
 msgstr "创建 SILC 密钥对..."
 
 #. Hint for translators: Please check the tabulator width here and in
@@ -9271,6 +9103,9 @@
 msgid "No server statistics available"
 msgstr "没有可用的服务器统计"
 
+msgid "Error during connecting to SILC Server"
+msgstr "连接到 SILC 服务器时出错"
+
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "失败: 版本不匹配,请升级您的客户端"
@@ -9311,30 +9146,27 @@
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"
 
-msgid "Cannot initialize SILC Client connection"
+#, fuzzy
+msgid "Unable to initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"
 
 msgid "John Noname"
 msgstr "张三"
 
-#, c-format
-msgid "Could not load SILC key pair: %s"
+#, fuzzy, c-format
+msgid "Unable to load SILC key pair: %s"
 msgstr "无法装入 SILC 密钥对: %s"
 
-msgid "Could not write"
-msgstr "无法写入"
-
-msgid "Could not connect"
-msgstr "无法连接"
-
-msgid "Unknown server response."
+msgid "Unable to create connection"
+msgstr "无法创建连接"
+
+#, fuzzy
+msgid "Unknown server response"
 msgstr "未知的服务器响应。"
 
-msgid "Could not create listen socket"
-msgstr "无法创建监听套接字"
-
-msgid "Could not resolve hostname"
-msgstr "无法解析主机名"
+#, fuzzy
+msgid "Unable to create listen socket"
+msgstr "无法创建套接字"
 
 #, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
@@ -9377,9 +9209,77 @@
 msgid "Auth Domain"
 msgstr "认证域"
 
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s 向您发送了摄像头邀请,但尚不支持。"
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
+
+msgid "list: List rooms on the Yahoo network"
+msgstr "list: 列出 Yahoo 网络上的房间"
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#, fuzzy
+msgid "Yahoo ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! Protocol Plugin"
+msgstr "Yahoo 协议插件"
+
+msgid "Pager server"
+msgstr "寻呼服务器"
+
+msgid "Pager port"
+msgstr "寻呼端口"
+
+msgid "File transfer server"
+msgstr "文件传送服务器"
+
+msgid "File transfer port"
+msgstr "文件传送端口"
+
+msgid "Chat room locale"
+msgstr "聊天房间语系"
+
+msgid "Ignore conference and chatroom invitations"
+msgstr "忽略会议和聊天室邀请"
+
+msgid "Chat room list URL"
+msgstr "聊天房间列表 URL"
+
+msgid "Yahoo Chat server"
+msgstr "Yahoo 聊天服务器"
+
+msgid "Yahoo Chat port"
+msgstr "Yahoo 聊天端口"
+
+#, fuzzy
+msgid "Yahoo JAPAN ID..."
+msgstr "Yahoo! ID"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#, fuzzy
+msgid "Yahoo! JAPAN Protocol Plugin"
+msgstr "Yahoo 协议插件"
 
 msgid "Your SMS was not delivered"
 msgstr ""
@@ -9404,6 +9304,30 @@
 msgid "Add buddy rejected"
 msgstr "添加拒绝的好友"
 
+#. Some error in the received stream
+#, fuzzy
+msgid "Received invalid data"
+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 "昵称或密码不对"
+
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -9433,38 +9357,31 @@
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
 
-#, c-format
-msgid "Could not add buddy %s to group %s to the server list on account %s."
+#, fuzzy, c-format
+msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"
 
-msgid "Could not add buddy to server list"
+#, fuzzy
+msgid "Unable to add buddy to server list"
 msgstr "无法将好友添加到服务器列表"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""
 
-msgid "Received unexpected HTTP response from server."
+#, fuzzy
+msgid "Received unexpected HTTP response from server"
 msgstr "从服务器收到了意外的 HTTP 响应。"
 
-msgid "Connection problem"
-msgstr "连接问题"
-
-#, c-format
-msgid ""
-"Lost connection with %s:\n"
-"%s"
+#, fuzzy, c-format
+msgid "Lost connection with %s: %s"
 msgstr ""
 "失去与 %s 的连接:\n"
 "%s"
 
 #, fuzzy, c-format
-msgid ""
-"Could not establish a connection with %s:\n"
-"%s"
-msgstr ""
-"无法建立与服务器:\n"
-"%s"
+msgid "Unable to establish a connection with %s: %s"
+msgstr "无法与服务器建立连接"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9513,8 +9430,8 @@
 msgid "Start Doodling"
 msgstr ""
 
-msgid "Activate which ID?"
-msgstr "激活哪个 ID?"
+msgid "Select the ID you want to activate"
+msgstr ""
 
 msgid "Join whom in chat?"
 msgstr "将谁加入聊天?"
@@ -9528,74 +9445,15 @@
 msgid "Open Inbox"
 msgstr "打开收件箱"
 
-msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
-
-msgid "list: List rooms on the Yahoo network"
-msgstr "list: 列出 Yahoo 网络上的房间"
-
-msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
-msgid "Yahoo ID..."
-msgstr "Yahoo! ID"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo 协议插件"
-
-msgid "Yahoo Japan"
-msgstr "Yahoo 日本"
-
-msgid "Pager server"
-msgstr "寻呼服务器"
-
-msgid "Japan Pager server"
-msgstr "日本寻呼服务器"
-
-msgid "Pager port"
-msgstr "寻呼端口"
-
-msgid "File transfer server"
-msgstr "文件传送服务器"
-
-msgid "Japan file transfer server"
-msgstr "日本文件传送服务器"
-
-msgid "File transfer port"
-msgstr "文件传送端口"
-
-msgid "Chat room locale"
-msgstr "聊天房间语系"
-
-msgid "Ignore conference and chatroom invitations"
-msgstr "忽略会议和聊天室邀请"
-
-msgid "Chat room list URL"
-msgstr "聊天房间列表 URL"
-
-msgid "Yahoo Chat server"
-msgstr "Yahoo 聊天服务器"
-
-msgid "Yahoo Chat port"
-msgstr "Yahoo 聊天端口"
-
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
 msgstr ""
 
+msgid "Unable to connect."
+msgstr "无法连接。"
+
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"
 
@@ -9603,6 +9461,9 @@
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s 正在发送文件 %s"
 
+msgid "Write Error"
+msgstr "写错误"
+
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo 日本资料"
 
@@ -9710,23 +9571,19 @@
 msgid "Webcams"
 msgstr "摄像头"
 
+msgid "Connection problem"
+msgstr "连接问题"
+
 msgid "Unable to fetch room list."
 msgstr "无法获取房间列表。"
 
 msgid "User Rooms"
 msgstr "用户房间"
 
-msgid "Connection problem with the YCHT server."
+#, fuzzy
+msgid "Connection problem with the YCHT server"
 msgstr "YCHT 服务器连接出现问题。"
 
-#, c-format
-msgid ""
-"Lost connection with server\n"
-"%s"
-msgstr ""
-"丢失与服务器的连接\n"
-"%s"
-
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -9847,33 +9704,22 @@
 msgid "Exposure"
 msgstr "暴露"
 
-#, c-format
-msgid ""
-"Unable to create socket:\n"
-"%s"
-msgstr ""
-"无法创建套接字:\n"
-"%s"
-
-#, c-format
-msgid "Unable to parse response from HTTP proxy: %s\n"
+#, fuzzy, c-format
+msgid "Unable to parse response from HTTP proxy: %s"
 msgstr "无法从 HTTP 代理分析响应:%s\n"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理服务器连接错误 %d"
 
-#, c-format
-msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+#, fuzzy, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "访问被禁止: HTTP 代理服务器禁止端口 %d 流过。"
 
 #, c-format
 msgid "Error resolving %s"
 msgstr "解析 %s 出错"
 
-msgid "Could not resolve host name"
-msgstr "无法解析主机名"
-
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "正在请求 %s 的注意..."
@@ -10010,35 +9856,41 @@
 msgid "Unknown."
 msgstr "未知。"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
-
-#, c-format
+msgstr[1] "%d 秒"
+
+#, fuzzy, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
-
-#, c-format
+msgstr[1] "%d 天"
+
+#, fuzzy, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s %d 小时"
-
-#, c-format
+msgstr[1] "%s %d 小时"
+
+#, fuzzy, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小时"
-
-#, c-format
+msgstr[1] "%d 小时"
+
+#, fuzzy, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s %d 分"
-
-#, c-format
+msgstr[1] "%s %d 分"
+
+#, fuzzy, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
+msgstr[1] "%d 分"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -10070,12 +9922,6 @@
 msgid "Unable to connect to %s: %s"
 msgstr "无法连接到 %s: %s"
 
-#, fuzzy, c-format
-msgid ""
-"Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support was "
-"found."
-msgstr "服务器需要 TLS/SSL 才能登录。没有找到 TLS/SSL 支持。"
-
 #, c-format
 msgid " - %s"
 msgstr ""
@@ -10159,7 +10005,7 @@
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "此账户使用此好友图标(_I):"
+msgstr "用作当前账户头像(_I):"
 
 msgid "_Advanced"
 msgstr "高级(_A)"
@@ -10256,11 +10102,12 @@
 "如果您想要回到此窗口以便添加、编辑或删除帐户,可以从好友列表中窗口中选择<b>帐"
 "户->添加/编辑</b>"
 
-#, c-format
+#, fuzzy, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "您已经有名为 %2$s 的 %1$d 位联系人。您是否想要合并?"
+msgstr[1] "您已经有名为 %2$s 的 %1$d 位联系人。您是否想要合并?"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10270,21 +10117,20 @@
 "合并联系人将会使得这些联系人在好友列表中只显示单一的一项,并且使用单一的对话"
 "窗口。如果您想再解散合并后的联系人,可以从联系人的快捷菜单中选择“展开”"
 
-#, fuzzy
 msgid "Please update the necessary fields."
 msgstr "请更新必要的字段。"
 
-#, fuzzy
-msgid "Room _List"
-msgstr "房间列表"
+msgid "A_ccount"
+msgstr "账户(_C):"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"
 
-msgid "_Account:"
-msgstr "账户(_A):"
+#, fuzzy
+msgid "Room _List"
+msgstr "房间列表"
 
 msgid "_Block"
 msgstr "屏蔽(_B)"
@@ -10321,9 +10167,14 @@
 msgid "View _Log"
 msgstr "查看日志(_L)"
 
-msgid "Hide when offline"
+#, fuzzy
+msgid "Hide When Offline"
 msgstr "离线时隐藏"
 
+#, fuzzy
+msgid "Show When Offline"
+msgstr "离线时显示"
+
 msgid "_Alias..."
 msgstr "别名(_A)..."
 
@@ -10572,10 +10423,11 @@
 msgid "/Tools/Room List"
 msgstr "/工具(T)/房间列表(O)"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "来自 %2$s 的 %1$d 条未读消息\n"
+msgstr[1] "来自 %2$s 的 %1$d 条未读消息\n"
 
 msgid "Manually"
 msgstr "手动"
@@ -10728,6 +10580,116 @@
 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
+msgid "Type the host name for this certificate."
+msgstr "输入此证书所适用的主机名。"
+
 #. Widget creation function
 msgid "SSL Servers"
 msgstr "SSL 服务器"
@@ -10773,7 +10735,8 @@
 msgid "Get Away Message"
 msgstr "获得离开消息"
 
-msgid "Last said"
+#, fuzzy
+msgid "Last Said"
 msgstr "上次说道"
 
 msgid "Unable to save icon file to disk."
@@ -10985,10 +10948,11 @@
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "聊天室里有 %d 个人"
+msgstr[1] "聊天室里有 %d 个人"
 
 msgid "Typing"
 msgstr "正打字"
@@ -11230,6 +11194,10 @@
 msgid "Hungarian"
 msgstr "匈牙利语"
 
+#, fuzzy
+msgid "Armenian"
+msgstr "罗马尼亚语"
+
 msgid "Indonesian"
 msgstr "印度尼西亚语"
 
@@ -11334,6 +11302,9 @@
 msgid "Swedish"
 msgstr "瑞典语"
 
+msgid "Swahili"
+msgstr ""
+
 msgid "Tamil"
 msgstr "泰米尔语"
 
@@ -11463,7 +11434,7 @@
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
@@ -11473,6 +11444,9 @@
 msgstr[0] ""
 "您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
 "吗?"
+msgstr[1] ""
+"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
+"吗?"
 
 msgid "Remove Contact"
 msgstr "删除联系人"
@@ -11656,7 +11630,7 @@
 msgstr "超级链接颜色"
 
 #, fuzzy
-msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "绘制超级链接悬停时的颜色。"
 
 msgid "Hyperlink prelight color"
@@ -11694,15 +11668,22 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
+msgid "Color to draw the name of a whispered action message."
+msgstr ""
+
 msgid "Whisper Message Name Color"
 msgstr ""
 
+msgid "Color to draw the name of a whispered message."
+msgstr ""
+
 #, fuzzy
 msgid "Typing notification color"
 msgstr "通知删除"
 
-msgid "The color to use for the typing notification font"
-msgstr ""
+#, fuzzy
+msgid "The color to use for the typing notification"
+msgstr "新邮件通知"
 
 #, fuzzy
 msgid "Typing notification font"
@@ -11756,11 +11737,10 @@
 msgid "Save Image"
 msgstr "保存图像"
 
-#, c-format
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."
 
-#, fuzzy, c-format
+#, fuzzy
 msgid "_Add Custom Smiley..."
 msgstr "显示自定义如下:"
 
@@ -11846,9 +11826,6 @@
 msgid "Font Face"
 msgstr "字体"
 
-msgid "Background Color"
-msgstr "背景颜色"
-
 msgid "Foreground Color"
 msgstr "前景颜色"
 
@@ -12051,15 +12028,17 @@
 msgid "%s wishes to start a video session with you."
 msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s 有 %d 封新邮件。"
-
-#, c-format
+msgstr[1] "%s 有 %d 封新邮件。"
+
+#, fuzzy, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d 封新邮件。</b>"
+msgstr[1] "<b>%d 封新邮件。</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12076,6 +12055,10 @@
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "选择了“手动”浏览器命令,但未设置命令。"
 
+#, fuzzy
+msgid "No message"
+msgstr "未知信息"
+
 msgid "Open All Messages"
 msgstr "打开全部消息"
 
@@ -12093,10 +12076,6 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"
 
-#, fuzzy
-msgid "No message"
-msgstr "未知信息"
-
 msgid "The following plugins will be unloaded."
 msgstr "下列插件将会被卸载。"
 
@@ -12157,6 +12136,9 @@
 msgid "Pounce on Whom"
 msgstr "监视对象"
 
+msgid "_Account:"
+msgstr "账户(_A):"
+
 msgid "_Buddy name:"
 msgstr "好友名称(_B):"
 
@@ -12267,7 +12249,16 @@
 msgid "Unknown.... Please report this!"
 msgstr "未知的千里眼。请报告此错误!"
 
-msgid "Smiley theme failed to unpack."
+#, fuzzy
+msgid "Theme failed to unpack."
+msgstr "表情主题解包失败。"
+
+#, fuzzy
+msgid "Theme failed to load."
+msgstr "表情主题解包失败。"
+
+#, fuzzy
+msgid "Theme failed to copy."
 msgstr "表情主题解包失败。"
 
 msgid "Install Theme"
@@ -12303,8 +12294,9 @@
 msgid "On unread messages"
 msgstr "有未读消息时"
 
-msgid "Conversation Window Hiding"
-msgstr "对话窗口隐藏"
+#, fuzzy
+msgid "Conversation Window"
+msgstr "即时消息对话窗口"
 
 msgid "_Hide new IM conversations:"
 msgstr "隐藏新的 IM 对话(_H):"
@@ -12312,6 +12304,9 @@
 msgid "When away"
 msgstr "离开时"
 
+msgid "Minimi_ze new conversation windows"
+msgstr "最小化对话窗口(_Z)"
+
 #. All the tab options!
 msgid "Tabs"
 msgstr "标签"
@@ -12370,9 +12365,6 @@
 msgid "F_lash window when IMs are received"
 msgstr "收到信息时闪烁窗口(_L)"
 
-msgid "Minimi_ze new conversation windows"
-msgstr "最小化对话窗口(_Z)"
-
 msgid "Minimum input area height in lines:"
 msgstr ""
 
@@ -12406,7 +12398,8 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-msgid "_Autodetect IP address"
+#, fuzzy, c-format
+msgid "Use _automatically detected IP address: %s"
 msgstr "自动检测 IP 地址(_A)"
 
 msgid "Public _IP:"
@@ -12586,31 +12579,26 @@
 "声音命令(_O):\n"
 "(%s 代表文件名)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "静音"
+msgstr "静音(_U)"
 
 msgid "Sounds when conversation has _focus"
 msgstr "对话获得焦点后发声(_F)"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "启用声音:"
-
-#, fuzzy
+msgstr "开启声音(_E):"
+
 msgid "V_olume:"
-msgstr "音量:"
+msgstr "音量(_O):"
 
 msgid "Play"
 msgstr "播放"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "浏览(_E)..."
-
-#, fuzzy
+msgstr "浏览(_B)..."
+
 msgid "_Reset"
-msgstr "重置"
+msgstr "重置(_R)"
 
 msgid "_Report idle time:"
 msgstr "报告发呆时间(_R):"
@@ -12684,9 +12672,8 @@
 msgstr "设置隐私的账户:"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "删除"
+msgstr "全部删除(_L)"
 
 msgid "Permit User"
 msgstr "允许用户"
@@ -12782,46 +12769,26 @@
 msgid "Status for %s"
 msgstr "%s 的状态"
 
-#.
-#. * TODO: We should enable/disable the add button based on
-#. *       whether the user has entered all required data.  That
-#. *       would eliminate the need for this check and provide a
-#. *       better user experience.
-#.
-#, fuzzy
-msgid "Custom Smiley"
-msgstr "插入表情"
-
-msgid "More Data needed"
-msgstr ""
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr ""
-
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
 
+msgid "Custom Smiley"
+msgstr "自定义表情"
+
 #, fuzzy
 msgid "Duplicate Shortcut"
 msgstr "重复更正"
 
-#, fuzzy
-msgid "Please select an image for the smiley."
-msgstr "请输入 %s 的新名称"
-
-#, fuzzy
 msgid "Edit Smiley"
-msgstr "插入表情"
-
-#, fuzzy
+msgstr "修改表情"
+
 msgid "Add Smiley"
-msgstr "表情"
-
-#, fuzzy
+msgstr "添加表情"
+
 msgid "_Image:"
-msgstr "图像(_I)"
+msgstr "图像(_I):"
 
 #. Shortcut text
 #, fuzzy
@@ -12840,21 +12807,21 @@
 msgstr ""
 
 #, fuzzy
+msgid "Select Buddy Icon"
+msgstr "选择好友"
+
 msgid "Click to change your buddyicon for this account."
-msgstr "此账户使用此好友图标(_I):"
-
-#, fuzzy
+msgstr "点此修改当前账户所用图标。"
+
 msgid "Click to change your buddyicon for all accounts."
-msgstr "此账户使用此好友图标(_I):"
+msgstr "点此修改所有账户所用图标。"
 
 msgid "Waiting for network connection"
 msgstr "正在等待网络连接"
 
-#, fuzzy
 msgid "New status..."
-msgstr "新消息..."
-
-#, fuzzy
+msgstr "新状态..."
+
 msgid "Saved statuses..."
 msgstr "已存状态"
 
@@ -12892,7 +12859,7 @@
 "您可以通过文件传送发送此图像,将其嵌入到此消息中,或者将其用作此用户的头像。"
 
 msgid "Set as buddy icon"
-msgstr "设置为好友头像"
+msgstr "设置为用户头像"
 
 msgid "Send image file"
 msgstr "发送图像文件"
@@ -12906,12 +12873,12 @@
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
-msgstr "您可以通过文件传送发送此图像,或者将其用作此用户的头像。"
+msgstr "您可以通过文件传送发送该图片,或者将其用作此用户的头像。"
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
-msgstr "您可以通过文件传送发送此图像,或者将其用作此用户的头像。"
+msgstr "您可以在消息中插入该图片,或者将其用作此用户的头像。"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -12921,9 +12888,10 @@
 msgid "Cannot send launcher"
 msgstr "无法发送启动器"
 
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
+#, fuzzy
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
 msgstr ""
 "您拖曳的是桌面启动器。在大多数情况下,您可能想要发送此启动器所指向的文件,而"
 "非启动器自身。"
@@ -12959,7 +12927,7 @@
 
 #, fuzzy
 msgid "_Open Link"
-msgstr "打开链接的方式(_O):"
+msgstr "打开链接(_O):"
 
 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
@@ -12985,24 +12953,20 @@
 msgid "_Invite"
 msgstr "邀请(_I)"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "修改(_M)"
-
-#, fuzzy
+msgstr "修改(_M)..."
+
 msgid "_Add..."
-msgstr "添加(_A)"
+msgstr "添加(_A)..."
 
 msgid "_Open Mail"
 msgstr "打开邮件(_O)"
 
-#, fuzzy
 msgid "_Edit"
-msgstr "编辑"
-
-#, fuzzy
+msgstr "编辑(_E)"
+
 msgid "Pidgin Tooltip"
-msgstr "Pidgin"
+msgstr "Pidgin 工具提示"
 
 msgid "Pidgin smileys"
 msgstr "Pidgin 表情"
@@ -13016,9 +12980,8 @@
 msgid "none"
 msgstr "无"
 
-#, fuzzy
 msgid "Small"
-msgstr "电子邮件"
+msgstr "小"
 
 msgid "Smaller versions of the default smilies"
 msgstr ""
@@ -13062,6 +13025,77 @@
 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 "好友正发呆"
 
@@ -13217,7 +13251,6 @@
 msgstr "提供鼠标手势的支持"
 
 #. *  description
-#, fuzzy
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -13228,9 +13261,9 @@
 "允许在对话窗口中支持鼠标手势。\n"
 "拖曳鼠标中键可执行特定操作:\n"
 "\n"
-"向下再向右可关闭对话。\n"
-"向上再向左可切换到上个对话。\n"
-"向上再向右可切换到下个对话。"
+"·向下再向右可关闭对话。\n"
+"·向上再向左可切换到上个对话。\n"
+"·向上再向右可切换到下个对话。"
 
 msgid "Instant Messaging"
 msgstr "即时通讯"
@@ -13306,7 +13339,6 @@
 msgid "Please enter the person's information below."
 msgstr "请在下面输入联系人的信息。"
 
-#, fuzzy
 msgid "Please enter the buddy's username and account type below."
 msgstr "请在下面输入好友的用户名和账户类型。"
 
@@ -13342,11 +13374,13 @@
 msgid "Test to see that all ui signals are working properly."
 msgstr "测试看看所有的 UI 信号是否都工作正确。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
-msgstr "好友备注"
+msgstr ""
+"\n"
+"<b>好友备注</b>: %s"
 
 msgid "History"
 msgstr "历史"
@@ -13376,20 +13410,17 @@
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr "在好友列表旁显示一个小方块,标明您是否有新邮件。"
 
-#, fuzzy
 msgid "Markerline"
-msgstr "下划线"
-
-#, fuzzy
+msgstr "分割线"
+
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "对话时显示通知消息"
-
-#, fuzzy
+msgstr "在对话中以分割线突出显示新消息。"
+
 msgid "Jump to markerline"
-msgstr "下划线"
+msgstr "跳至分割线"
 
 msgid "Draw Markerline in "
-msgstr ""
+msgstr "分割线使用在"
 
 msgid "_IM windows"
 msgstr "即时消息窗口(_I)"
@@ -13439,18 +13470,18 @@
 msgstr "合作作曲的音乐信使插件。"
 
 #. *  summary
+#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
+"on a piece of music by editing a common score in real-time."
 msgstr "音乐信使插件允许多个用户同时在同一份曲谱上工作。"
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
 msgstr "提醒"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "\t仅当别人在聊天中提到您的名字(_O)"
+msgstr "\t仅当别人提到您的名字时(_O)"
 
 msgid "_Focused windows"
 msgstr "聚焦窗口(_F)"
@@ -13474,18 +13505,16 @@
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "设置窗口管理器“紧急”提示(_U)"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "聊天窗口(_H)"
+msgstr "闪烁窗口(_F)"
 
 #. Raise window method button
 msgid "R_aise conversation window"
 msgstr "升起对话窗口(_A)"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "升起对话窗口(_A)"
+msgstr "当前对话窗口(_P)"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -13554,23 +13583,20 @@
 "- 颠倒所有收到的文本\n"
 "- 当您的好友登入后立即给他们发送信息"
 
-msgid "Cursor Color"
-msgstr "光标颜色"
-
-msgid "Secondary Cursor Color"
-msgstr "次要光标颜色"
-
 msgid "Hyperlink Color"
 msgstr "超级链接颜色"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "超级链接颜色"
+msgstr "访问过的超级链接颜色"
 
 #, fuzzy
 msgid "Highlighted Message Name Color"
 msgstr "突出显示的消息"
 
+#, fuzzy
+msgid "Typing Notification Color"
+msgstr "通知删除"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView 水平分隔"
 
@@ -13600,35 +13626,24 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ 文字快捷方式主题"
 
-#.
-#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
-#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
-#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
-#.
-#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
-#. widget_bool_prefs_set[i], hbox);
-#. gtk_size_group_add_widget(labelsg, check);
-#.
-#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
-#. *
-#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
-#. *
-#. gtk_widget_set_sensitive(widget_bool_widgets[i],
-#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
-#. g_signal_connect(G_OBJECT(check), "toggled",
-#. G_CALLBACK(pidgin_toggle_sensitive),
-#. widget_bool_widgets[i]);
-#. }
-#.
-msgid "Interface colors"
-msgstr "界面颜色"
-
-msgid "Widget Sizes"
-msgstr "部件大小"
+#, fuzzy
+msgid "Disable Typing Notification Text"
+msgstr "新邮件通知"
+
+#, fuzzy
+msgid "GTK+ Theme Control Settings"
+msgstr "Pidgin GTK+ 主题控制"
+
+#, fuzzy
+msgid "Colors"
+msgstr "关闭"
 
 msgid "Fonts"
 msgstr "字体"
 
+msgid "Miscellaneous"
+msgstr ""
+
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc 文件工具"
 
@@ -13665,13 +13680,11 @@
 msgid "New Version Available"
 msgstr "新版本可用"
 
-#, fuzzy
 msgid "Later"
-msgstr "日期"
-
-#, fuzzy
+msgstr "稍后"
+
 msgid "Download Now"
-msgstr "%s 上的用户数: %s"
+msgstr "立即下载"
 
 #. *< type
 #. *< ui_requirement
@@ -13702,21 +13715,20 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "发送到"
+msgstr "发送按钮"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "对话窗口隐藏"
+msgstr "对话窗口的发送按钮"
 
 #. *< summary
+#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
-"for when no physical keyboard is present."
-msgstr ""
+"for use when no physical keyboard is present."
+msgstr "在对话窗口的输入栏添加一个发送按钮,适用于非键盘输入。"
 
 msgid "Duplicate Correction"
 msgstr "重复更正"
@@ -13767,6 +13779,113 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"
 
+#, fuzzy
+msgid "Just logged in"
+msgstr "未登入"
+
+#, fuzzy
+msgid "Just logged out"
+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
+msgid "Operator"
+msgstr "Opera"
+
+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
+msgid "Chatroom Emblems"
+msgstr "聊天房间语系"
+
+#, fuzzy
+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 ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *  description
+#, fuzzy
+msgid "Pidgin Theme Editor"
+msgstr "Pidgin GTK+ 主题控制"
+
+#. *< name
+#. *< version
+#. *  summary
+#, fuzzy
+msgid "Pidgin Theme Editor."
+msgstr "Pidgin GTK+ 主题控制"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -13931,8 +14050,9 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Pidgin for Windows 特定的选项。"
 
-msgid ""
-"Provides options specific to Pidgin for Windows , such as buddy list docking."
+#, fuzzy
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Pidgin for Windows 特定的选项,比如好友列表停靠。"
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -13972,6 +14092,292 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "此插件用于调试 XMPP 服务器或客户端。"
 
+#~ msgid "Cannot open socket"
+#~ msgstr "无法打开套接字"
+
+#~ msgid "Could not listen on socket"
+#~ msgstr "无法在套接字上监听"
+
+#~ msgid "Unable to read socket"
+#~ msgstr "无法读取套接字"
+
+#~ msgid "Connection failed."
+#~ msgstr "连接失败。"
+
+#~ msgid "Server has disconnected"
+#~ msgstr "服务器已断开连接"
+
+#~ msgid "Couldn't create socket"
+#~ msgstr "无法创建套接字"
+
+#~ msgid "Couldn't connect to host"
+#~ msgstr "无法连接到主机"
+
+#~ msgid "Read error"
+#~ msgstr "读取错误"
+
+#~ msgid ""
+#~ "Could not establish a connection with the server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法建立与服务器:\n"
+#~ "%s"
+
+#~ msgid "Write error"
+#~ msgstr "写错误"
+
+#~ msgid "Last Activity"
+#~ msgstr "最近活动"
+
+#~ msgid "Service Discovery Info"
+#~ msgstr "服务目录信息"
+
+#, fuzzy
+#~ msgid "Extended Stanza Addressing"
+#~ msgstr "额外地址"
+
+#~ msgid "Multi-User Chat"
+#~ msgstr "多用户聊天"
+
+#, fuzzy
+#~ msgid "Multi-User Chat Extended Presence Information"
+#~ msgstr "用户没有目录信息。"
+
+#, fuzzy
+#~ msgid "Ad-Hoc Commands"
+#~ msgstr "命令"
+
+#~ msgid "XHTML-IM"
+#~ msgstr "XHTML-IM"
+
+#, fuzzy
+#~ msgid "In-Band Registration"
+#~ msgstr "注册错误"
+
+#~ msgid "User Location"
+#~ msgstr "用户位置"
+
+#, fuzzy
+#~ msgid "User Avatar"
+#~ msgstr "用户搜索"
+
+#~ msgid "Chat State Notifications"
+#~ msgstr "聊天状态通知"
+
+#~ msgid "Software Version"
+#~ msgstr "软件版本"
+
+#, fuzzy
+#~ msgid "Stream Initiation"
+#~ msgstr "方向"
+
+#~ msgid "User Mood"
+#~ msgstr "用户心情"
+
+#~ msgid "User Activity"
+#~ msgstr "用户活动"
+
+#, fuzzy
+#~ msgid "Entity Capabilities"
+#~ msgstr "能力"
+
+#, fuzzy
+#~ msgid "User Tune"
+#~ msgstr "用户名"
+
+#, fuzzy
+#~ msgid "Roster Item Exchange"
+#~ msgstr "带密钥交换开聊"
+
+#, fuzzy
+#~ msgid "Reachability Address"
+#~ msgstr "电子邮件地址"
+
+#~ msgid "User Profile"
+#~ msgstr "用户资料"
+
+#, fuzzy
+#~ msgid "Jingle"
+#~ msgstr "加入"
+
+#~ msgid "User Nickname"
+#~ msgstr "用户昵称"
+
+#, fuzzy
+#~ msgid "Jingle Video"
+#~ msgstr "实时视频"
+
+#, fuzzy
+#~ msgid "Message Receipts"
+#~ msgstr "消息已收到"
+
+#, fuzzy
+#~ msgid "Public Key Publishing"
+#~ msgstr "公钥漏印"
+
+#, fuzzy
+#~ msgid "User Chatting"
+#~ msgstr "用户选项"
+
+#, fuzzy
+#~ msgid "User Browsing"
+#~ msgstr "用户模式"
+
+#, fuzzy
+#~ msgid "User Gaming"
+#~ msgstr "用户名"
+
+#, fuzzy
+#~ msgid "User Viewing"
+#~ msgstr "允许限制"
+
+#, fuzzy
+#~ msgid "Stanza Encryption"
+#~ msgstr "Trillian 加密"
+
+#~ msgid "Read Error"
+#~ msgstr "读取错误"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "连接到服务器失败。"
+
+#, fuzzy
+#~ msgid "Read buffer full (2)"
+#~ msgstr "队列满"
+
+#, fuzzy
+#~ msgid "Unparseable message"
+#~ msgstr "无法处理消息"
+
+#, fuzzy
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "无法连接到主机"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "登录失败(%s)。"
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "无法连接到服务器。"
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "您已被注销,因为您已从其它计算机上登录。"
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "出错。SSL 支持未安装。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密码不对。"
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法连接到 BOS 服务器:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "您即将被断开。请检查 %s 上的更新。"
+
+#~ msgid "Could Not Connect"
+#~ msgstr "无法连接"
+
+#, fuzzy
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "无法获取服务器信息"
+
+#, fuzzy
+#~ msgid "Invalid username."
+#~ msgstr "名称无效"
+
+#~ msgid "Connection lost"
+#~ msgstr "连接丢失"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "无法解析主机"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "连接已关闭(写入)"
+
+#~ msgid "Connection reset"
+#~ msgstr "连接重置"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "从套接字读取时出错:%s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "无法连接到主机"
+
+#~ msgid "Could not write"
+#~ msgstr "无法写入"
+
+#~ msgid "Could not connect"
+#~ msgstr "无法连接"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "无法创建监听套接字"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "无法解析主机名"
+
+#, fuzzy
+#~ msgid "Incorrect Password"
+#~ msgstr "密码不对"
+
+#, fuzzy
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "无法建立与服务器:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo 日本"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "日本寻呼服务器"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "日本文件传送服务器"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "丢失与服务器的连接\n"
+#~ "%s"
+
+#~ 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 支持。"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "对话窗口隐藏"
+
+#~ msgid "Activate which ID?"
+#~ msgstr "激活哪个 ID?"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "请给这个表情选择一个图片"
+
+#~ msgid "Cursor Color"
+#~ msgstr "光标颜色"
+
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "次要光标颜色"
+
+#~ msgid "Interface colors"
+#~ msgstr "界面颜色"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "部件大小"
+
 #, fuzzy
 #~ msgid "Invite message"
 #~ msgstr "在消息中插入"
@@ -14411,10 +14817,6 @@
 #~ msgid "Windows Live ID authentication Failed"
 #~ msgstr "失败: 身份验证失败"
 
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "无法连接到服务器。"
-
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "无法通过 SSL 连接到服务器。"
 
@@ -14475,9 +14877,6 @@
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "您加入 %d 群的请求已经被管理员 %d 批准"
 
-#~ msgid "This group has been added to your buddy list"
-#~ msgstr "您已经将此群添加到好友"
-
 #~ msgid "I am applying to join"
 #~ msgstr "我请求加入"
 
@@ -14499,9 +14898,6 @@
 #~ msgid "Enter your reason:"
 #~ msgstr "输入您的原因:"
 
-#~ msgid "Error requesting login token"
-#~ msgstr "请求登录令牌出错"
-
 #~ msgid "Unable to login, check debug log"
 #~ msgstr "无法登录,请检查调试日志"
 
@@ -14554,9 +14950,6 @@
 #~ "您想要将谁加为好友?请输入他/她的用户名。您还可为好友输入别名和昵称。只要"
 #~ "可能的话,别名将会替代用户名显示。\n"
 
-#~ msgid "A_ccount:"
-#~ msgstr "账户(_C):"
-
 #~ msgid "_Screen name:"
 #~ msgstr "用户名(_S):"