Updated Russian translation

[empathy.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 68e337aec6df4bae574d1d8d9259002144a28b6b..21c395f3a46d914668b17ac1a9542d9d3c134dfe 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # Simplified Chinese translation of Empathy.
 # Convert to Simp. Chinese translation of Empathy.
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008, 2009, 2010 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Empathy package.
 #
 # Abel Cheung <maddog@linux.org.hk>, 2003.
@@ -8,20 +8,33 @@
 # Rongjun Mu <elanmu@sina.com>, 2003.
 # YangZhang <zyangmath@gmail.com>, 2008.
 # Funda Wang <fundawang@gmail.com>, 2009.
-# Aron Xu <aronxu@gnome.org>, 2009.
 # Lyper Lai <lyp069@gmail.com>, 2009.
+# Yun Nie <yun.nie@ptiglobal.net>, 2009.
+# Richard Ma <richard.ma.19850509@gmail.com>, 2009.
+# Tao Wei <weitao1979@gmail.com>, 2009.
+# Tao Wang <dancefire@gmail.com>, 2010.
+# Dean Lee <xslidian@gmail.com>, 2010.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
+# Wylmer Wang <wantinghard@gmail.com>, 2010-2012.
+# zhen liu  <liuzhen1191@gmail.com>, 2011
+# Yangtse Su <yangtsesu@gmail.com>, 2011
+# Mike Manilone <crtmike@gmail.com>, 2012
+# EL8LatSPQ <el8latspq@hotmail.com>, 2012.
+# YunQiang Su <wzssyqa@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gossip\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-16 19:23+0800\n"
-"PO-Revision-Date: 2009-10-09 17:06-0800\n"
-"Last-Translator: Yun Nie <yun.nie@ptiglobal.net>\n"
-"Language-Team: Simplified Chinese <i18n-zh@googlegroups.com>\n"
+"Project-Id-Version: empathy master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-03-16 10:47+0000\n"
+"PO-Revision-Date: 2012-04-11 16:38+0000\n"
+"Last-Translator: YunQiang Su <wzssyqa@gmail.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"
+"Content-Transfer-Encoding: 8bits\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
@@ -29,1017 +42,1520 @@ msgid "Empathy"
 msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "Empathy IM 客户端"
+msgid "IM Client"
+msgstr "即时通讯客户端"
 
 #: ../data/empathy.desktop.in.in.h:3
-msgid "IM Client"
-msgstr "IM 客户端"
+msgid "Empathy Internet Messaging"
+msgstr "Empathy 即时通讯程序"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "Send and receive messages"
-msgstr "发送接收即时消息"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务"
 
-#: ../data/empathy.schemas.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "总是为新聊天打开单独的聊天窗口。"
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2512
+msgid "Messaging and VoIP Accounts"
+msgstr "消息和 VoIP 帐号"
 
-#: ../data/empathy.schemas.in.h:2
-msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管理消息和 VoIP 帐号"
 
-#: ../data/empathy.schemas.in.h:3
-msgid "Chat window theme"
-msgstr "聊天窗口主题"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
+msgid "Connection managers should be used"
+msgstr "应该使用连接管理器"
 
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr "用于拼写检查器的语言的列表，以逗号分隔(例如：en, fr, nl)。"
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "是否使用连接管理器自动断开连接或重新连接。"
 
-#: ../data/empathy.schemas.in.h:5
-msgid "Compact contact list"
-msgstr "紧凑显示联系人列表"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy 启动时是否自动连接"
 
-#: ../data/empathy.schemas.in.h:6
-msgid "Connection managers should be used"
-msgstr "应该使用连接管理器"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy 是否在启动时自动登入您的帐号。"
 
-#: ../data/empathy.schemas.in.h:7
-#, fuzzy
-msgid "Contact list sort criterion"
-msgstr "联系人列表排序条件"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy 空闲时是否自动离开"
 
-#: ../data/empathy.schemas.in.h:8
-msgid "Default directory to select an avatar image from"
-msgstr "默认的选取头像图片的目录"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Empathy 是否应在用户空闲时自动进入离开模式。"
 
-#: ../data/empathy.schemas.in.h:9
-msgid "Disable popup notifications when away"
-msgstr "离开时禁用弹出提示"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Empathy default download folder"
+msgstr "Empathy 默认下载文件夹"
 
-#: ../data/empathy.schemas.in.h:10
-msgid "Disable sounds when away"
-msgstr "离开时禁用声音"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+msgid "The default folder to save file transfers in."
+msgstr "保存传送文件的默认文件夹。"
 
-#: ../data/empathy.schemas.in.h:11
-msgid "Empathy can publish the user's location"
-msgstr "Empathy 能够发布用户的位置"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "用于检测是否应该执行智能清理任务的幻数"
 
-#: ../data/empathy.schemas.in.h:12
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy 能够通过 GPS 来估算位置"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+msgid ""
+"empathy-sanity-cleaning.c uses this number to check if the cleaning tasks "
+"should be executed or not. Users should not change this key manually."
+msgstr ""
+"empathy-sanity-cleaning.c 使用这个数字来确定是否应该执行清理任务。用户不应当"
+"手工更改这个值。"
 
-#: ../data/empathy.schemas.in.h:13
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 能够通过手机来估算位置"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Show offline contacts"
+msgstr "显示离线联系人"
 
-#: ../data/empathy.schemas.in.h:14
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy 能够通过网络来估算位置"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "是否显示联系人清单中离线的联系人。"
 
-#: ../data/empathy.schemas.in.h:15
-msgid "Empathy default download folder"
-msgstr "Empathy 默认下载文件夹"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
+msgid "Show avatars"
+msgstr "显示头像"
 
-#: ../data/empathy.schemas.in.h:16
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy 已经询问导入账户"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
+msgid ""
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "是否在联系人列表和聊天窗口中显示头像。"
 
-#: ../data/empathy.schemas.in.h:17
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy 启动时是否自动连接"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+msgid "Show protocols"
+msgstr "显示协议"
 
-#: ../data/empathy.schemas.in.h:18
-msgid "Empathy should reduce the location's accuracy"
-msgstr "降低 Emapthy 位置信息的准确度"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "是否在联系人列表和聊天窗口中显示协议。"
 
-#: ../data/empathy.schemas.in.h:19
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
+msgid "Show Balance in contact list"
+msgstr "在联系人列表中显示余额"
 
-#: ../data/empathy.schemas.in.h:20
-msgid "Enable WebKit Developer Tools"
-msgstr "启用 WebKit 开发工具"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Whether to show account balances in the contact list."
+msgstr "是否在联系人列表和聊天窗口中显示余额。"
 
-#: ../data/empathy.schemas.in.h:21
-msgid "Enable popup notifications for new messages"
-msgstr "启用新消息弹出提示"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Compact contact list"
+msgstr "紧凑显示联系人列表"
 
-#: ../data/empathy.schemas.in.h:22
-msgid "Enable spell checker"
-msgstr "启用拼写检查器"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+msgid "Whether to show the contact list in compact mode."
+msgstr "是否以紧凑模式显示联系人列表。"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Hide main window"
 msgstr "隐藏主窗口"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Hide the main window."
 msgstr "隐藏主窗口。"
 
-#: ../data/empathy.schemas.in.h:25
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4 账户已被导入"
-
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4 accounts have been imported。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+msgid "Default directory to select an avatar image from"
+msgstr "默认的选取头像图片的目录"
 
-#: ../data/empathy.schemas.in.h:27
-msgid "Nick completed character"
-msgstr "昵称补全字符"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+msgid "The last directory that an avatar image was chosen from."
+msgstr "上次选取头像图片的目录。"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Open new chats in separate windows"
 msgstr "在单独窗口中打开新聊天"
 
-#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
-msgstr "Adium 主题的路径"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+msgid "Always open a separate chat window for new chats."
+msgstr "总是为新聊天打开单独的聊天窗口。"
 
-#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+msgid "Display incoming events in the status area"
+msgstr "在状态栏显示呼入事件。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "在状态栏显示呼入事件。如果为 false 则立即显示给用户。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+msgid "The position for the chat window side pane"
+msgstr "聊天窗口边栏的位置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "聊天窗口边栏保存的位置(像素)。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Show contact groups"
+msgstr "显示联系人分组"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+msgid "Whether to show groups in the contact list."
+msgstr "是否在联系人列表中显示分组。"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+msgid "Contact list sort criterion"
+msgstr "联系人列表排序条件"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+msgid ""
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's state with the value \"state\". A value of \"name\" will sort "
+"the contact list by name."
+msgstr ""
+"使用何种条件来排序联系人列表。默认情况下使用值“状态”以按联系人状态排序。取值"
+"为“姓名”时将按姓名排序联系人列表。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+msgid "Use notification sounds"
+msgstr "使用通知声音"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+msgid "Whether to play a sound to notify of events."
+msgstr "是否需要事件提示音。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+msgid "Disable sounds when away"
+msgstr "离开时禁用声音"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+msgid "Whether to play sound notifications when away or busy."
+msgstr "当离开或忙碌时是否使用声音提示。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Play a sound for incoming messages"
 msgstr "收到消息时播放声音"
 
-#: ../data/empathy.schemas.in.h:32
-msgid "Play a sound for new conversations"
-msgstr "æ\96°å¯¹è¯\9dæ\97¶æ\92­æ\94¾å£°é\9f³"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "æ\98¯å\90¦é\9c\80è¦\81æ¶\88æ\81¯å\88°è¾¾æ\8f\90示é\9f³ã\80\82"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Play a sound for outgoing messages"
 msgstr "发出消息时播放声音"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "是否为外出消息使用声音提示。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+msgid "Play a sound for new conversations"
+msgstr "新对话时播放声音"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "是否需要新会话提示音。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Play a sound when a contact logs in"
 msgstr "联系人登录时播放声音"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "是否需要联系人上线提示音。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Play a sound when a contact logs out"
 msgstr "联系人注销时播放声音"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+msgid ""
+"Whether to play a sound to notify of contacts logging out of the network."
+msgstr "是否需要联系人下线提示音。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "Play a sound when we log in"
 msgstr "登录时播放声音"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "Whether to play a sound when logging into a network."
+msgstr "当联网登录时是否播放提示音。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "Play a sound when we log out"
 msgstr "注销时播放声音"
 
-#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+msgid "Whether to play a sound when logging out of a network."
+msgstr "当网络断开时是否播放提示音。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+msgid "Enable popup notifications for new messages"
+msgstr "启用新消息弹出提示"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "当收到新消息时是否弹出显示提示框。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+msgid "Disable popup notifications when away"
+msgstr "离开时禁用弹出提示"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+msgid "Whether to show popup notifications when away or busy."
+msgstr "当离开或忙碌时是否弹出显示提示框。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果聊天窗口不是焦点则弹出消息通知"
 
-#: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+msgid ""
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr "如果聊天窗口已开启，但不是当前窗口，接收新消息时是否弹出提示。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+msgid "Pop up notifications when a contact logs in"
 msgstr "当联系人登录时弹出通知"
 
-#: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "当联系人上线时是否显示弹出通知"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+msgid "Pop up notifications when a contact logs out"
 msgstr "当联系人注销时弹出通知"
 
-#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "å·²å\88\9b建 Salut è´¦æ\88·"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "å½\93è\81\94系人离线æ\97¶æ\98¯å\90¦æ\98¾ç¤ºå¼¹å\87ºé\80\9aç\9f¥ã\80\82"
 
-#: ../data/empathy.schemas.in.h:42
-msgid "Show avatars"
-msgstr "显示头像"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+msgid "Use graphical smileys"
+msgstr "使用表情图标"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "对话时是否将表情符号转换为表情图标。"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid "Show contact list in rooms"
 msgstr "在聊天室显示联系人列表"
 
-#: ../data/empathy.schemas.in.h:44
-msgid "Show hint about closing the main window"
-msgstr "关闭主窗口时显示提示"
-
-#: ../data/empathy.schemas.in.h:45
-msgid "Show offline contacts"
-msgstr "显示离线联系人"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+msgid "Whether to show the contact list in chat rooms."
+msgstr "是否在聊天室显示联系人列表。"
 
-#: ../data/empathy.schemas.in.h:46
-msgid "Spell checking languages"
-msgstr "拼写检查器语言"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+msgid "Chat window theme"
+msgstr "聊天窗口主题"
 
-#: ../data/empathy.schemas.in.h:47
-msgid "The default folder to save file transfers in."
-msgstr "保存传送文件的默认文件夹。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "用于在聊天窗口中显示会话的主题。"
 
-#: ../data/empathy.schemas.in.h:48
-msgid "The last directory that an avatar image was chosen from."
-msgstr "上次选取头像图片的目录。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+msgid "Chat window theme variant"
+msgstr "聊天窗口主题衍生"
 
-#: ../data/empathy.schemas.in.h:49
-msgid "The theme that is used to display the conversation in chat windows."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
+msgid ""
+"The theme variant that is used to display the conversation in chat windows."
 msgstr "用于在聊天窗口中显示会话的主题。"
 
-#: ../data/empathy.schemas.in.h:50
-msgid "Use graphical smileys"
-msgstr "使用表情图标"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Path of the Adium theme to use"
+msgstr "Adium 主题的路径"
 
-#: ../data/empathy.schemas.in.h:51
-msgid "Use notification sounds"
-msgstr "使用通知声音"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径"
 
-#: ../data/empathy.schemas.in.h:52
-msgid "Use theme for chat rooms"
-msgstr "为聊天室使用主题"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Enable WebKit Developer Tools"
+msgstr "启用 WebKit 开发工具"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "WebKit 开发工具，例如 Web Inspector 是否应该启用。"
 
-#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr "是否允许 Empathy 将用户的位置共享给联系人"
-
-#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "是否允许 Empathy 通过 GPS 估算位置"
-
-#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
-msgstr "是否允许 Empathy 通过手机估算位置"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Inform other users when you are typing to them"
+msgstr "告诉他人您正在输入"
 
-#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "是否允许 Empathy 通过网络估算位置"
-
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "Empathy 是否应该已经询问过要从其它程序中导入账户。"
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"是否发送“编写中”(composing)或“暂停”(paused)的聊天状态。目前不影响“已离"
+"开”(gone)状态"
 
-#: ../data/empathy.schemas.in.h:59
-msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "Empathy 是否在启动时自动登入您的账户。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Use theme for chat rooms"
+msgstr "为聊天室使用主题"
 
-#: ../data/empathy.schemas.in.h:60
-msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+msgid "Whether to use the theme for chat rooms."
+msgstr "是否对聊天室使用主题。"
 
-#: ../data/empathy.schemas.in.h:61
-msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
-msgstr "是否使用联系人的头像作为聊天窗口的图标。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Spell checking languages"
+msgstr "拼写检查器语言"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
-msgstr "是否使用连接管理器自动断开连接/重新连接。"
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "用于拼写检查器的语言的列表，以逗号分隔(例如：en, fr, nl)。"
 
-#: ../data/empathy.schemas.in.h:63
-msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "是否在 Empathy 第一次运行时创建 Salut 账户。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid "Enable spell checker"
+msgstr "启用拼写检查器"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr "是否对您想要作拼写检查的单词作拼写检查。"
 
-#: ../data/empathy.schemas.in.h:65
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
-msgstr "对话时是否将表情符号转换为真正的图标。"
-
-#: ../data/empathy.schemas.in.h:66
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "是否需要联系人上线提示音。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Nick completed character"
+msgstr "昵称补全字符"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
-msgstr "是否需要联系人下线提示音。"
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
 
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
-msgstr "是否需要事件提示音。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
 
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "是否需要消息到达提示音。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid ""
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "是否使用联系人的头像作为聊天窗口的图标。"
 
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "是否需要新会话提示音。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Last account selected in Join Room dialog"
+msgstr "在加入聊天室对话框中最后选择的帐号"
 
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "æ\98¯å\90¦ä¸ºå¤\96å\87ºæ¶\88æ\81¯ä½¿ç\94¨è¯­é\9f³æ\8f\90示。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid "D-Bus object path of the last account selected to join a room."
+msgstr "æ\9c\80å\90\8eé\80\89æ\8b©å\8a å\85¥è\81\8a天室ç\9a\84å¸\90å\8f·ç\9a\84 D-Bus 对象路å¾\84。"
 
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
-msgstr "当联网登录时是否播放提示音。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Camera device"
+msgstr "相机设备"
 
-#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "当网络断开时是否播放提示音。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+msgid "Default camera device to use in video calls, e.g. /dev/video0."
+msgstr "视频呼叫时默认使用的相机设备，例如 /dev/video0。"
 
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
-msgstr "当离开或忙碌时是否使用语音通知。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+msgid "Camera position"
+msgstr "相机位置"
 
-#: ../data/empathy.schemas.in.h:75
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
-msgstr "当联系人离线时是否显示弹出通知。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Position the camera preview should be during a call."
+msgstr "在通话时摄像头预览的位置。"
 
-#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
-msgstr "å½\93è\81\94系人ä¸\8a线æ\97¶æ\98¯å\90¦æ\98¾ç¤ºå¼¹å\87ºé\80\9aç\9f¥"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Echo cancellation support"
+msgstr "å\9b\9e声æ\8a\91å\88¶æ\94¯æ\8c\81"
 
-#: ../data/empathy.schemas.in.h:77
-msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
-msgstr "当接收新消息时是否显示弹出提示即聊天窗口已开启，但未闲置。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "是否启用 Pulseaudio 的回声抑制过滤器。"
 
-#: ../data/empathy.schemas.in.h:78
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
-msgstr "当收到新消息时是否弹出显示提示框。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Show hint about closing the main window"
+msgstr "关闭主窗口时显示提示"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
-msgstr "是否在联系人列表和聊天窗口中显示头像。"
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "当使用标题栏中的“X”按钮关闭主窗口时是否显示提示对话框。"
 
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
-msgstr "是否显示联系人清单中离线的联系人。"
-
-#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
-msgstr "当离开活忙碌时是否弹出显示提示框。"
-
-#: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
-msgstr "是否在聊天室显示联系人列表。"
-
-#: ../data/empathy.schemas.in.h:83
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
-msgstr "是否对使用标题栏中的“X”按钮关闭主窗口显示消息对话框。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can publish the user's location"
+msgstr "Empathy 能够发布用户的位置"
 
-#: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "是否以紧凑格式显示联系人列表。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "是否允许 Empathy 将用户的位置共享给联系人"
 
-#: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
-msgstr "是否对聊天室使用主题。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy 能够通过网络来估计位置"
 
-#: ../data/empathy.schemas.in.h:86
-#, fuzzy
-msgid ""
-"Which criterion to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
-msgstr ""
-"使用何种条件来排序联系人列表。默认情况下使用值\"name\"以按联系人姓名\n"
-"排序。取值为\"state\"时将按状态排序联系人列表。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "是否允许 Empathy 通过网络估计位置"
 
-#: ../libempathy/empathy-ft-handler.c:839
-msgid "The hash of the received file and the sent one do not match"
-msgstr "接收到的文件和发送的那个文件哈希值不匹配"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy 能够通过手机来估计位置"
 
-#: ../libempathy/empathy-ft-handler.c:1099
-msgid "File transfer not supported by remote contact"
-msgstr "æ\96\87ä»¶ä¼ è¾\93ä¸\8dæ\94¯æ\8c\81è¿\9cç¨\8bè¿\9eæ\8e¥"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "æ\98¯å\90¦å\85\81许 Empathy é\80\9aè¿\87æ\89\8bæ\9cºç½\91ç»\9c估计ä½\8dç½®"
 
-#: ../libempathy/empathy-ft-handler.c:1157
-msgid "The selected file is not a regular file"
-msgstr "所选文件是非正常的文件"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy 能够通过 GPS 来估计位置"
 
-#: ../libempathy/empathy-ft-handler.c:1166
-msgid "The selected file is empty"
-msgstr "æ\89\80é\80\89æ\96\87件æ\98¯ç©ºç\9a\84"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "æ\98¯å\90¦å\85\81许 Empathy é\80\9aè¿\87 GPS 估计ä½\8dç½®"
 
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:293
-msgid "People nearby"
-msgstr "é\99\84è¿\91ç\9a\84人"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:105
+msgid "Empathy should reduce the location's accuracy"
+msgstr "é\99\8dä½\8e Emapthy ä½\8d置信æ\81¯ç\9a\84å\87\86确度"
 
-#: ../libempathy/empathy-tp-file.c:280
-msgid "Socket type not supported"
-msgstr "不支持Socket类型"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:106
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-ft-handler.c:738
 msgid "No reason was specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-ft-handler.c:741
 msgid "The change in state was requested"
 msgstr "需要状态改变信息"
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-ft-handler.c:744
 msgid "You canceled the file transfer"
 msgstr "您取消了文件传输"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-ft-handler.c:747
 msgid "The other participant canceled the file transfer"
 msgstr "另外的参与者取消了文件的传输"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-ft-handler.c:750
 msgid "Error while trying to transfer the file"
 msgstr "当传输这个文件的时候发生错误"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-ft-handler.c:753
 msgid "The other participant is unable to transfer the file"
 msgstr "另外的参与者无法传输这个文件"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-ft-handler.c:756 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-ft-handler.c:919
+msgid "File transfer completed, but the file was corrupted"
+msgstr "文件传输完成，但该文件已损坏"
+
+#: ../libempathy/empathy-ft-handler.c:1205
+msgid "File transfer not supported by remote contact"
+msgstr "文件传输不支持远程连接"
+
+#: ../libempathy/empathy-ft-handler.c:1261
+msgid "The selected file is not a regular file"
+msgstr "所选文件是非正常的文件"
+
+#: ../libempathy/empathy-ft-handler.c:1270
+msgid "The selected file is empty"
+msgstr "所选文件是空的"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#, c-format
+msgid "Missed call from %s"
+msgstr "未接来电：%s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "与 %s 通话"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "来电：%s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:245
-msgid "Hidden"
+#: ../libempathy/empathy-utils.c:240
+msgid "Invisible"
 msgstr "隐身"
 
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "离线"
 
-#: ../libempathy/empathy-utils.c:383 ../src/empathy-import-mc4-accounts.c:104
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:245
+msgctxt "presence"
+msgid "Unknown"
+msgstr "未知"
+
+#: ../libempathy/empathy-utils.c:285
+msgid "No reason specified"
+msgstr "未指定原因"
+
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+msgid "Status is set to offline"
+msgstr "状态已设置为离线"
+
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:47
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
+msgid "Network error"
+msgstr "网络错误"
+
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+msgid "Authentication failed"
+msgstr "验证失败"
+
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+msgid "Encryption error"
+msgstr "加密错误"
+
+#: ../libempathy/empathy-utils.c:295
+msgid "Name in use"
+msgstr "用户名已被占用"
+
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+msgid "Certificate not provided"
+msgstr "未提供证书"
+
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+msgid "Certificate untrusted"
+msgstr "证书不被信任"
+
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+msgid "Certificate expired"
+msgstr "证书已过期"
+
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+msgid "Certificate not activated"
+msgstr "证书尚未激活"
+
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+msgid "Certificate hostname mismatch"
+msgstr "证书主机名不匹配"
+
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+msgid "Certificate fingerprint mismatch"
+msgstr "证书指纹不匹配"
+
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+msgid "Certificate self-signed"
+msgstr "证书是自签属的"
+
+#: ../libempathy/empathy-utils.c:311
+msgid "Certificate error"
+msgstr "证书错误"
+
+#: ../libempathy/empathy-utils.c:345
+msgid "Encryption is not available"
+msgstr "加密不可用"
+
+#: ../libempathy/empathy-utils.c:347
+msgid "Certificate is invalid"
+msgstr "证书无效"
+
+#: ../libempathy/empathy-utils.c:349
+msgid "Connection has been refused"
+msgstr "连接被拒绝"
+
+#: ../libempathy/empathy-utils.c:351
+msgid "Connection can't be established"
+msgstr "无法建立连接"
+
+#: ../libempathy/empathy-utils.c:353
+msgid "Connection has been lost"
+msgstr "连接已丢失"
+
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "该帐号已连接到服务器"
+
+#: ../libempathy/empathy-utils.c:357
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "连接已被使用相同资源的新连接取代"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "The account already exists on the server"
+msgstr "服务器上已存在该帐号"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Server is currently too busy to handle the connection"
+msgstr "服务器太忙，无法处理当前连接"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Certificate has been revoked"
+msgstr "证书已被吊销"
+
+# lainme：证书使用不安全的加密算法或是弱加密的
+# xslidian：证书使用的加密算法不安全或者易被破解
+#: ../libempathy/empathy-utils.c:366
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "证书使用不安全的加密算法或者是弱加密的"
+
+#: ../libempathy/empathy-utils.c:369
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr "服务器证书的长度——或服务器证书链的深度——超出了加密库的硬性限制"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "你的软件版本太旧了"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "内部错误"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:388
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:389
+#: ../libempathy/empathy-utils.c:568
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook 聊天"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒钟前"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 星期前"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 月前"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "将来"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:450
-msgid "All"
-msgstr "全部"
+#: ../libempathy/empathy-keyring.c:75
+#| msgid "Phrase not found"
+msgid "Password not found"
+msgstr "未找到密码"
 
-#: ../libempathy-gtk/empathy-account-widget.c:439
-#: ../libempathy-gtk/empathy-account-widget.c:495
+#: ../libempathy/empathy-keyring.c:218
+#, c-format
+msgid "IM account password for %s (%s)"
+msgstr "IM 帐号 %s (%s) 的密码"
+
+#: ../libempathy/empathy-keyring.c:253
+#, c-format
+msgid "Password for chatroom '%s' on account %s (%s)"
+msgstr "帐号 %2$s (%3$s) 的聊天室 %1$s 密码"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:692
+msgid "All accounts"
+msgstr "全部帐号"
+
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:336
+msgid "Account"
+msgstr "帐号"
+
+#: ../libempathy-gtk/empathy-account-widget.c:683
+msgid "Password"
+msgstr "密码"
+
+#: ../libempathy-gtk/empathy-account-widget.c:684
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:511
+msgid "Server"
+msgstr "服务器"
+
+#: ../libempathy-gtk/empathy-account-widget.c:685
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:529
+msgid "Port"
+msgstr "端口"
+
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1289
+#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:14
+msgid "Username:"
+msgstr "用户名："
+
+#: ../libempathy-gtk/empathy-account-widget.c:1710
+msgid "A_pply"
+msgstr "应用(_P)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1739
 msgid "L_og in"
-msgstr "登录"
+msgstr "登录(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1353
-msgid "Enabled"
-msgstr "启用"
+#: ../libempathy-gtk/empathy-account-widget.c:1812
+msgid "This account already exists on the server"
+msgstr "服务器上已存在该帐号"
 
-#.  Translators: this is used only when built on a moblin platform 
-#: ../libempathy-gtk/empathy-account-widget.c:1359
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "账户："
+#: ../libempathy-gtk/empathy-account-widget.c:1816
+msgid "Create a new account on the server"
+msgstr "在服务器上创建新的帐号"
 
 #. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1623
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 中的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:1641
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
-msgstr "%s è´¦æ\88·"
+msgstr "%s å¸\90å\8f·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1645
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
-msgstr "新è´¦æ\88·"
+msgstr "新建å¸\90å\8f·"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>例如：</b> 我的屏幕名称</span>"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "密码(_W)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "高级"
+msgid "Screen _Name:"
+msgstr "用户名(_N)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>例如：</b> 我的屏幕名称"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "Pass_word:"
-msgstr "密码(_W)："
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-msgid "Screen _Name:"
-msgstr "用户名(_N)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "记住密码"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-msgid "What is your AIM password?"
-msgstr "您的 AIM 密码是什么？"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "端口(_P)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "What is your AIM screen name?"
-msgstr "您的 AIM 屏幕名称是什么？"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "_Server:"
+msgstr "服务器(_S)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "端口(_P)："
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "高级"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "服务器(_S)："
+msgid "What is your AIM screen name?"
+msgstr "您的 AIM 屏幕名称是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>例如：</b>用户名</span>"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+msgid "What is your AIM password?"
+msgstr "您的 AIM 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "记住密码"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "登录 I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>例如：</b>用户名"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "您的 GroupWise 用户名是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "您的 GroupWise 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>例如：</b>123456789</span>"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN："
 
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>例如：</b>123456789"
+
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Ch_aracter set:"
+msgstr "字符集(_A):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "您的 ICQ UIN 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "您的 ICQ 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
-msgstr "字符集(_C)："
+#: ../libempathy-gtk/empathy-account-widget-sip.c:206
+#: ../libempathy-gtk/empathy-account-widget-sip.c:239
+msgid "Auto"
+msgstr "自动"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
-msgid "New Network"
-msgstr "新建网络"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
+msgid "UDP"
+msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
-msgstr "字符集："
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
+msgid "TCP"
+msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-sip.c:215
+msgid "TLS"
+msgstr "TLS"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:244
+msgid "Register"
+msgstr "注册"
+
+#. translators: this string is very specific to SIP's internal; maybe
+#. * best to keep the English version.
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
+msgid "Options"
+msgstr "选项"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
+msgid "None"
+msgstr "无"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Network"
 msgstr "网络"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network:"
 msgstr "网络："
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set:"
+msgstr "字符集："
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Add…"
+msgstr "添加..."
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "删除"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+msgid "Up"
+msgstr "在线"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+msgid "Down"
+msgstr "离线"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "服务器"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid ""
+"Most IRC servers don't need a password, so if you're not sure, don't enter a "
+"password."
+msgstr "大多数 IRC 服务器不需要密码，如果您不确定，则不要输入密码。"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
 msgid "Nickname:"
 msgstr "昵称："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:11
 msgid "Password:"
 msgstr "密码："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
 msgid "Quit message:"
 msgstr "退出消息："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
 msgid "Real name:"
-msgstr "全名："
+msgstr "真名："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Servers"
-msgstr "服务器"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:16
+msgid "Which IRC network?"
+msgstr "哪个 IRC 网络?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
-msgstr "<span size=\"small\"><b>例如：</b> user@gmail.com</span>"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:17
+msgid "What is your IRC nickname?"
+msgstr "您的 IRC 昵称是什么?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
-msgstr "<span size=\"small\"><b>例如：</b> user@jabber.org</span>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "What is your Facebook username?"
+msgstr "您的 Facebook 用户名是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "Override server settings"
-msgstr "覆盖服务器设置"
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+"这是您的用户名，而不是您通常登陆 Facebook 的名称。\n"
+"如果您是 facebook.com/<b>badger</b>，输入\n"
+"<b>badger</b>。如果您还没有 Facebook 用户名的话，使用<a href=\"http://www."
+"facebook.com/username/\">这个页面</a> 来选择一个。"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
-msgstr "优先级(_O)："
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+msgid "What is your Facebook password?"
+msgstr "您的 Facebook 密码是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "Reso_urce:"
-msgstr "资源(_U)："
+msgid "What is your Google ID?"
+msgstr "您的 Google ID 是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "Use old SS_L"
-msgstr "使用旧的 SS_L"
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>例如：</b>user@gmail.com"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
-msgid "What is your Google ID?"
-msgstr "您的 Google ID 是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
 msgid "What is your Google password?"
 msgstr "您的 Google 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
-msgid "What is your Jabber ID?"
-msgstr "您的 Jabber ID 是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-msgid "What is your Jabber password?"
-msgstr "您的 Jabber 密码是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-msgid "What is your desired Jabber ID?"
-msgstr "您想要的 Jabber ID 是什么？"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>例如：</b>user@jabber.org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
-msgid "What is your desired Jabber password?"
-msgstr "您想要的 Jabber 密码是什么？"
+msgid "I_gnore SSL certificate errors"
+msgstr "忽略 SSL 证书错误(_G)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "_Encryption required (TLS/SSL)"
-msgstr "需要加密(TLS/SSL)(_E)"
+msgid "Priori_ty:"
+msgstr "优先级(_T):"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "_Ignore SSL certificate errors"
-msgstr "忽略 SSL 证书错误(_I)"
+msgid "Reso_urce:"
+msgstr "资源(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgstr "<span size=\"small\"><b>例如：</b> user@hotmail.com</span>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "需要加密(TLS/SSL)(_Y)"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "Use old SS_L"
+msgstr "使用旧的 SS_L"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "Override server settings"
+msgstr "覆盖服务器设置"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+msgid "What is your Jabber ID?"
+msgstr "您的 Jabber ID 是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
+msgid "What is your desired Jabber ID?"
+msgstr "您想要的 Jabber ID 是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+msgid "What is your Jabber password?"
+msgstr "您的 Jabber 密码是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:27
+msgid "What is your desired Jabber password?"
+msgstr "您想要的 Jabber 密码是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>例如：</b>user@hotmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live ID?"
+msgstr "您的 Windows Live 帐号是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 msgid "What is your Windows Live password?"
 msgstr "您的 Windows Live 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "æ\82¨ç\9a\84 Windows Live ç\94¨æ\88·å\90\8dæ\98¯ä»\80ä¹\88ï¼\9f"
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+msgid "Nic_kname:"
+msgstr "æ\98µç§°(_K):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
-msgstr "电子邮件(_E)："
+msgid "_Last Name:"
+msgstr "姓(_L)："
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "名(_F)"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Jabber ID:"
-msgstr "_Jabber ID："
+msgid "_Published Name:"
+msgstr "公开的名字(_P)："
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Last Name:"
-msgstr "姓(_L)："
+msgid "_Jabber ID:"
+msgstr "_Jabber ID："
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "昵称(_N)："
+msgid "E-_mail address:"
+msgstr "电子邮件地址(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "公开的名字(_P)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "用户名(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
-msgstr "<span size=\"small\"><b>例如：</b> user@my.sip.server</span>"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>例如：</b>user@my.sip.server"
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "搜索 STUN"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "用此帐号拨打固定电话和手机(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN Server:"
-msgstr "STUN 服务器："
+msgid "NAT Traversal Options"
+msgstr "NAT 选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "STUN 端口："
+msgid "Proxy Options"
+msgstr "代理选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "What is your SIP account password?"
-msgstr "æ\82¨ç\9a\84 SIP è´¦æ\88·å¯\86ç \81æ\98¯ä»\80ä¹\88ï¼\9f"
+msgid "Miscellaneous Options"
+msgstr "æ\9d\82项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "What is your SIP login ID?"
-msgstr "您的 SIP 登录 ID 是什么？"
+msgid "STUN Server:"
+msgstr "STUN 服务器："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "_Username:"
-msgstr "用户名(_U)："
+msgid "Discover the STUN server automatically"
+msgstr "自动发现 STUN 服务器"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "使用 _Yahoo 日本"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "Discover Binding"
+msgstr "发现绑定"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "What is your Yahoo! ID?"
-msgstr "您的 Yahoo ID 是什么？"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
+msgid "Server:"
+msgstr "服务器："
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "What is your Yahoo! password?"
-msgstr "您的 Yahoo！密码是什么？"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive 选项"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Mechanism:"
+msgstr "机制："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "Interval (seconds)"
+msgstr "间隔(秒)"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Authentication username:"
+msgstr "验证用户名："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "传输："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "Loose Routing"
+msgstr "宽松路由"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Ignore TLS Errors"
+msgstr "忽略 TLS 错误"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid "Port:"
+msgstr "端口："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "What is your SIP login ID?"
+msgstr "您的 SIP 登录 ID 是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "您的 SIP 帐号密码是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
+msgid "Yahoo! I_D:"
 msgstr "Yahoo I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
-msgstr "忽略会议和聊天室邀请(_I)"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "I_gnore conference and chat room invitations"
+msgstr "忽略会议和聊天室邀请(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Room List locale:"
 msgstr "聊天室列表 locale(_R)："
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
+msgid "What is your Yahoo! ID?"
+msgstr "您的 Yahoo! ID 是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+msgid "What is your Yahoo! password?"
+msgstr "您的 Yahoo! 密码是什么？"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:471
+#: ../libempathy-gtk/empathy-avatar-chooser.c:556
 msgid "Couldn't convert image"
 msgstr "无法转换图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
-msgstr "没有一个公认的图片格式能被您的系统支持"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:472
+msgid "None of the accepted image formats are supported on your system"
+msgstr "没有任何接受的图片格式能被您的系统支持"
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:819
+msgid "Couldn't save picture to file"
+msgstr "无法将图片保存为文件"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "Select Your Avatar Image"
 msgstr "选择您的头像图片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:947
+msgid "Take a picture..."
+msgstr "照相..."
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:960
 msgid "No Image"
 msgstr "无图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:325
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr "单击以放大"
 
-#: ../libempathy-gtk/empathy-chat.c:194
-msgid "Failed to reconnect this chat"
-msgstr "重新连接到对话失败"
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
+msgid "There was an error starting the call"
+msgstr "发起呼叫时出错"
 
-#: ../libempathy-gtk/empathy-chat.c:592
-#, fuzzy
-msgid "Failed to join chatroom"
-msgstr "邀请到聊天室(_I)"
+#: ../libempathy-gtk/empathy-call-utils.c:49
+msgid "The specified contact doesn't support calls"
+msgstr "选择的联系人不支持呼叫"
 
-#: ../libempathy-gtk/empathy-chat.c:610
-#, fuzzy
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact is offline"
+msgstr "选择的联系人离线"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is not valid"
+msgstr "选择的联系人无效"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "Emergency calls are not supported on this protocol"
+msgstr "不支持在此会话上进行紧急呼叫"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "You don't have enough credit in order to place this call"
+msgstr "您信用卡余额不足以支付此次通话"
+
+#: ../libempathy-gtk/empathy-chat.c:729
 msgid "Failed to open private chat"
-msgstr "重新连接到对话失败"
+msgstr "建立私人对话失败"
 
-#: ../libempathy-gtk/empathy-chat.c:649
+#: ../libempathy-gtk/empathy-chat.c:787
 msgid "Topic not supported on this conversation"
-msgstr ""
+msgstr "不支持在此会话上设置主题"
 
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-chat.c:793
 msgid "You are not allowed to change the topic"
-msgstr ""
+msgstr "您不能更改主题"
 
-#: ../libempathy-gtk/empathy-chat.c:773
-msgid "/clear, clear all messages from the current conversation"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:992
+#, c-format
+msgid "“%s” is not a valid contact ID"
+msgstr "%s 是无效的联系人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:776
-msgid "/topic <topic>, set the topic of the current conversation"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1087
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear：清空当前会话的所有消息"
 
-#: ../libempathy-gtk/empathy-chat.c:779
-msgid "/join <chatroom id>, join a new chatroom"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1090
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <主题>：设定当前对话的主题"
 
-#: ../libempathy-gtk/empathy-chat.c:782
-msgid "/j <chatroom id>, join a new chatroom"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1093
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <聊天室名>：加入一个新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:785
-msgid "/query <contact id> [<message>], open a private chat"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1096
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <聊天室名>：加入一个新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:788
-msgid "/msg <contact id> <message>, open a private chat"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1100
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr "/用户[<聊天室ID>] [<原因>]：当前默认离开聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:791
-msgid "/nick <nickname>, change your nickname on current server"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1104
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <昵称> [<消息>]：打开一个私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:794
-msgid "/me <message>, send an ACTION message to the current conversation"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1107
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <昵称> <消息>：打开一个私人聊天"
+
+#: ../libempathy-gtk/empathy-chat.c:1110
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <昵称>：在当前服务器上改变您的昵称"
 
-#: ../libempathy-gtk/empathy-chat.c:797
+#: ../libempathy-gtk/empathy-chat.c:1113
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <动作消息>：向当前对话中发送一个动作消息"
+
+#: ../libempathy-gtk/empathy-chat.c:1116
 msgid ""
-"/say <message>, send <message> to the current conversation. This is used to "
+"/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chatroom\""
+"join a new chat room\""
 msgstr ""
+"/say <消息>：发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如：“/"
+"say /join 是用来加入一个新的聊天室”"
+
+#: ../libempathy-gtk/empathy-chat.c:1121
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <联系人 ID>：显示一个联系人的信息"
 
-#: ../libempathy-gtk/empathy-chat.c:802
+#: ../libempathy-gtk/empathy-chat.c:1124
 msgid ""
-"/help [<command>], show all supported commands. If <command> is defined, "
+"/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
+"/help [<命令>]：显示所有支持的命令。如果 <命令> 是有定义的，则显示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:812
-#, fuzzy, c-format
+#: ../libempathy-gtk/empathy-chat.c:1143
+#, c-format
 msgid "Usage: %s"
-msgstr ""
-"\n"
-"消息：%s"
+msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:841
-#, fuzzy
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "Unknown command"
-msgstr "æ\9cªç\9f¥å\8e\9få\9b "
+msgstr "æ\9cªç\9f¥å\91½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:962
-msgid "Unknown command, see /help for the available commands"
-msgstr ""
+#: ../libempathy-gtk/empathy-chat.c:1314
+msgid "Unknown command; see /help for the available commands"
+msgstr "未知命令，请使用 /help 查阅可用命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1100
+#: ../libempathy-gtk/empathy-chat.c:1565
+msgid "insufficient balance to send message"
+msgstr "余额不足，无法发送消息"
+
+#: ../libempathy-gtk/empathy-chat.c:1569 ../libempathy-gtk/empathy-chat.c:1583
+#: ../libempathy-gtk/empathy-chat.c:1646
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr "发送消息“%s”出错：%s"
+
+#: ../libempathy-gtk/empathy-chat.c:1571 ../libempathy-gtk/empathy-chat.c:1588
+#: ../libempathy-gtk/empathy-chat.c:1650
+#, c-format
+msgid "Error sending message: %s"
+msgstr "发送消息出错：%s"
+
+#. translators: error used when user doesn't have enough credit on his
+#. * account to send the message.
+#: ../libempathy-gtk/empathy-chat.c:1577
+#, c-format
+msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
+msgstr "余额不足，无法发送消息。 <a href='%s'>充值</a>。"
+
+#: ../libempathy-gtk/empathy-chat.c:1617
+msgid "not capable"
+msgstr "做不到"
+
+#: ../libempathy-gtk/empathy-chat.c:1624
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1627
 msgid "invalid contact"
 msgstr "无效联系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1106
+#: ../libempathy-gtk/empathy-chat.c:1630
 msgid "permission denied"
 msgstr "权限不足"
 
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1633
 msgid "too long message"
 msgstr "消息太长"
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1636
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:1115
+#: ../libempathy-gtk/empathy-chat.c:1640
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:1119
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "发送消息“%s”出错：%s"
+#: ../libempathy-gtk/empathy-chat.c:1707 ../src/empathy-chat-window.c:920
+msgid "Topic:"
+msgstr "话题："
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1722
 #, c-format
 msgid "Topic set to: %s"
 msgstr "话题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1151
+#: ../libempathy-gtk/empathy-chat.c:1724
+#, c-format
+msgid "Topic set by %s to: %s"
+msgstr "话题被 %s 设置为：%s"
+
+#. No need to display this 'event' is no topic can be defined anyway
+#: ../libempathy-gtk/empathy-chat.c:1729
 msgid "No topic defined"
 msgstr "未设置话题"
 
-#: ../libempathy-gtk/empathy-chat.c:1524
+#: ../libempathy-gtk/empathy-chat.c:2245
 msgid "(No Suggestions)"
 msgstr "(没有建议)"
 
-#: ../libempathy-gtk/empathy-chat.c:1578
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:2313
+#, c-format
+msgid "Add '%s' to Dictionary"
+msgstr "添加“%s”到字典"
+
+#. translators: first %s is the selected word,
+#. * second %s is the language name of the target dictionary
+#: ../libempathy-gtk/empathy-chat.c:2350
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "添加“%s”到 %s 字典"
+
+#: ../libempathy-gtk/empathy-chat.c:2420
 msgid "Insert Smiley"
 msgstr "插入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1596
-#: ../libempathy-gtk/empathy-ui-utils.c:1492
+#: ../libempathy-gtk/empathy-chat.c:2438
+#: ../libempathy-gtk/empathy-ui-utils.c:1880
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1630
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2495
 msgid "_Spelling Suggestions"
 msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1745
+#: ../libempathy-gtk/empathy-chat.c:2584
+msgid "Failed to retrieve recent logs"
+msgstr "获取最近日志失败"
+
+#: ../libempathy-gtk/empathy-chat.c:2723
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已断开连接"
@@ -1047,12 +1563,12 @@ msgstr "%s 已断开连接"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1752
+#: ../libempathy-gtk/empathy-chat.c:2730
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:1755
+#: ../libempathy-gtk/empathy-chat.c:2733
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1060,17 +1576,17 @@ msgstr "%s 被踢出"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1763
+#: ../libempathy-gtk/empathy-chat.c:2741
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s 禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:1766
+#: ../libempathy-gtk/empathy-chat.c:2744
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:1770
+#: ../libempathy-gtk/empathy-chat.c:2748
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离开了聊天室"
@@ -1080,554 +1596,1188 @@ msgstr "%s 离开了聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1779
+#: ../libempathy-gtk/empathy-chat.c:2757
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1802
+#: ../libempathy-gtk/empathy-chat.c:2782
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 加入了聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1934 ../src/empathy-call-window.c:1297
+#: ../libempathy-gtk/empathy-chat.c:2807
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s 现在叫做 %s"
+
+#. We don't know if the incoming call has been accepted or not, so we
+#. * assume it hasn't and if it has, we'll set the proper status when
+#. * we get the new handler.
+#: ../libempathy-gtk/empathy-chat.c:2994
+#: ../src/empathy-streamed-media-window.c:1888
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2590
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../libempathy-gtk/empathy-chat.c:2424
-msgid "Wrong password; please try again:"
-msgstr ""
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3658
+msgid "Would you like to store this password?"
+msgstr "是否保存密码?"
+
+#: ../libempathy-gtk/empathy-chat.c:3664
+msgid "Remember"
+msgstr "记录"
 
-#: ../libempathy-gtk/empathy-chat.c:2425
+#: ../libempathy-gtk/empathy-chat.c:3674
+msgid "Not now"
+msgstr "不是现在"
+
+#: ../libempathy-gtk/empathy-chat.c:3718
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
-msgstr ""
+msgstr "重试"
+
+#: ../libempathy-gtk/empathy-chat.c:3722
+msgid "Wrong password; please try again:"
+msgstr "密码错误，请重试："
 
-#: ../libempathy-gtk/empathy-chat.c:2430
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3852
 msgid "This room is protected by a password:"
-msgstr ""
+msgstr "这个房间是由一个密码保护的："
 
-#: ../libempathy-gtk/empathy-chat.c:2431
+#: ../libempathy-gtk/empathy-chat.c:3879
 msgid "Join"
 msgstr "加入"
 
-#: ../libempathy-gtk/empathy-chat.c:2568
+#: ../libempathy-gtk/empathy-chat.c:4071 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:2621
-#: ../libempathy-gtk/empathy-log-window.c:546
+#: ../libempathy-gtk/empathy-chat.c:4126
 msgid "Conversation"
 msgstr "对话"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:557
-msgid "Topic:"
-msgstr "话题："
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:4131
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (短信)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:262
+msgid "Unknown or invalid identifier"
+msgstr "未知或无效的识别符"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+msgid "Contact blocking temporarily unavailable"
+msgstr "联系人屏蔽暂时不可用"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+msgid "Contact blocking unavailable"
+msgstr "联系人屏蔽不可用"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+msgid "Permission Denied"
+msgstr "权限不足"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:272
+msgid "Could not block contact"
+msgstr "无法屏蔽联系人"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:610
+msgid "Edit Blocked Contacts"
+msgstr "编辑屏蔽的联系人"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "Account:"
+msgstr "帐号："
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "已屏蔽的联系人"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:315
-#: ../libempathy-gtk/empathy-theme-adium.c:808
+#: ../libempathy-gtk/empathy-chat-text-view.c:322
+#: ../libempathy-gtk/empathy-webkit-utils.c:277
 msgid "_Copy Link Address"
 msgstr "复制链接地址(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:322
-#: ../libempathy-gtk/empathy-theme-adium.c:815
+#: ../libempathy-gtk/empathy-chat-text-view.c:329
+#: ../libempathy-gtk/empathy-webkit-utils.c:284
 msgid "_Open Link"
 msgstr "打开链接(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:420
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
-msgid "Edit Contact Information"
-msgstr "编辑联系人信息"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
-msgid "Personal Information"
-msgstr "个人信息"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新建联系人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "以后再决定(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "Subscription Request"
-msgstr "订阅请求"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1416
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "您真的要删除群组“%s”吗？"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1418
-msgid "Removing group"
-msgstr "删除群组"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1465
-#: ../libempathy-gtk/empathy-contact-list-view.c:1542
-msgid "_Remove"
-msgstr "删除(_R)"
+msgid "Block %s?"
+msgstr "屏蔽 %s？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1495
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "您真的想要删除联系人“%s”吗？"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1497
-msgid "Removing contact"
-msgstr "删除联系人"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:12
-msgid "_Add Contact..."
-msgstr "添加联系人(_A)..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Chat"
-msgstr "聊天(_C)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:253
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "音频呼叫(_A)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:285
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "视频呼叫(_V)"
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "确定要屏蔽 %s 以阻止他再次联系您吗？"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "最近会话(_P)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "屏蔽(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:346
-msgid "Send file"
-msgstr "发送文件"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "举报联系人滥用"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Share my desktop"
-msgstr "共享我的桌面"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Subscription Request"
+msgstr "订阅请求"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:397
-msgid "Infor_mation"
-msgstr "信息(_M)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "_Block User"
+msgstr "屏蔽用户(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:17
-msgid "_Edit"
-msgstr "编辑(_E)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "以后再决定(_L)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "邀请到此聊天室"
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+msgid "Search contacts"
+msgstr "搜索联系人"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
-msgstr "邀请到聊天室(_I)"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+msgid "Search: "
+msgstr "搜索"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "选择一个联系"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+msgid "_Add Contact"
+msgstr "添加联系人(_A)"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "保存头像"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+msgid "No contacts found"
+msgstr "未找到联系人"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "æ\97 æ³\95ä¿\9då­\98头å\83\8f"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "æ\82¨ç\9a\84è\87ªæ\88\91ä»\8bç»\8dä¿¡æ\81¯ï¼\9a"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-msgid "Select"
-msgstr "选择"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "你在线时请让我知道，谢谢！"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1034
-msgid "Group"
-msgstr "群组"
+#: ../libempathy-gtk/empathy-contact-widget.c:567
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "频道："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:747
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country ISO Code:"
-msgstr "包括 ISO 编码"
+msgstr "包括 ISO 编码："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:749
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
-msgstr "国家"
+msgstr "国家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
-msgstr "省"
+msgstr "省："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
-msgstr "å¸\82"
+msgstr "å\9f\8eå¸\82ï¼\9a"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
-msgstr "地区"
+msgstr "地区："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
-msgstr "邮政编码"
+msgstr "邮政编码："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
-msgstr "街"
+msgstr "街道："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
-msgstr "建筑物"
+msgstr "建筑物："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "房间："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "文本："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "描述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "准确程度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "错误："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Vertical Error (meters):"
-msgstr "垂直误差(米):"
+msgstr "垂直误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:779
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Horizontal Error (meters):"
-msgstr "水平误差(米):"
+msgstr "水平误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:781
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
-msgstr "速度:"
+msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
-msgstr "方位朝向:"
+msgstr "方位朝向："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
-msgstr "爬升速度:"
+msgstr "爬升速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Last Updated on:"
-msgstr "最近更新于:"
+msgstr "最近更新于："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:789
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "经度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "纬度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "海拔："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1367
-msgid "<b>Location</b>"
-msgstr "<b>位置</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:846
+#: ../libempathy-gtk/empathy-contact-widget.c:861
+#: ../libempathy-gtk/empathy-individual-widget.c:593
+#: ../libempathy-gtk/empathy-individual-widget.c:608
+#: ../src/empathy-preferences.ui.h:35
+msgid "Location"
+msgstr "位置"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1380
-msgid "<b>Location</b>, "
-msgstr "<b>位置</b>，"
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:863
+#: ../libempathy-gtk/empathy-individual-widget.c:610
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1430
+#: ../libempathy-gtk/empathy-contact-widget.c:915
+#: ../libempathy-gtk/empathy-individual-widget.c:659
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y 于 %R UTC 时间"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>位置</b>于(日期）\t"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-msgid "Alias:"
-msgstr "别名："
+#: ../libempathy-gtk/empathy-contact-widget.c:997
+#: ../libempathy-gtk/empathy-individual-widget.c:900
+msgid "Save Avatar"
+msgstr "保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "生日："
+#: ../libempathy-gtk/empathy-contact-widget.c:1053
+#: ../libempathy-gtk/empathy-individual-widget.c:958
+msgid "Unable to save avatar"
+msgstr "无法保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
-msgid "Client Information"
-msgstr "客户端信息"
+#: ../libempathy-gtk/empathy-contact-widget.c:1444
+msgid "Personal Details"
+msgstr "个人详情"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:1447
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-msgid "Client:"
-msgstr "客户端："
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "联系人详情"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1017
-msgid "Contact"
-msgstr "联系人"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
+msgid "Full name"
+msgstr "全名"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "Contact Details"
-msgstr "联系人详情"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
+msgid "Phone number"
+msgstr "电话号码"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "电子邮件："
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
+msgid "E-mail address"
+msgstr "电子邮件地址"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
-msgstr "全称："
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
+msgid "Website"
+msgstr "网站"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "Groups"
-msgstr "组"
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:108
+msgid "Birthday"
+msgstr "生日"
+
+#. Note to translators: this is the caption for a string of the form "5
+#. * minutes ago", and refers to the time since the contact last interacted
+#. * with their IM client.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:113
+msgid "Last seen:"
+msgstr "最近上线："
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:115
+msgid "Connected from:"
+msgstr "连接来源："
+
+#. FIXME: once Idle implements SimplePresence using this information, we can
+#. * and should bin this.
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:119
+msgid "Away message:"
+msgstr "离开消息："
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:132
+msgid "work"
+msgstr "办公"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:133
+msgid "home"
+msgstr "主页"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:134
+msgid "mobile"
+msgstr "手机"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:135
+msgid "voice"
+msgstr "音频"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:136
+msgid "preferred"
+msgstr "首选"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:137
+msgid "postal"
+msgstr "邮政"
+
+#: ../libempathy-gtk/empathy-contactinfo-utils.c:138
+msgid "parcel"
+msgstr "邮件"
 
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1502
 msgid "Identifier:"
-msgstr "用户 ID："
+msgstr "标识符："
+
+#. Alias
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+#: ../libempathy-gtk/empathy-individual-widget.c:1293
+msgid "Alias:"
+msgstr "别名："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "已请求信息..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>位置</b>于(日期）\t"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "已发送信息请求..."
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "客户端信息"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "OS:"
 msgstr "操作系统："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Version:"
+msgstr "版本："
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client:"
+msgstr "客户端："
+
+#: ../libempathy-gtk/empathy-groups-widget.c:331
+msgid "Groups"
+msgstr "组"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:343
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "选择您想将该联系人加入的群组。注意您可以选择多个群组，也可以不选择。"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Version:"
-msgstr "版本："
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "网站："
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-groups-widget.c:362
 msgid "_Add Group"
 msgstr "添加群组(_A)"
 
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "选择"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
+msgid "Group"
+msgstr "群组"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "以下用户将被屏蔽："
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "以下用户无法被屏蔽："
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "编辑联系人信息"
+
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:288
+msgid "Linked Contacts"
+msgstr "已绑定的联系人"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:173
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:345
+msgid "Select account to use to place the call"
+msgstr "选择要用于拨打电话的帐号"
+
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../libempathy-gtk/empathy-individual-menu.c:349
+#: ../libempathy-gtk/empathy-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1290
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "通话"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:414
+msgid "Mobile"
+msgstr "手机"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:416
+msgid "Work"
+msgstr "办公"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:418
+msgid "HOME"
+msgstr "家庭"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:659
+msgid "_Block Contact"
+msgstr "屏蔽联系人"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-individual-menu.c:1018
+#: ../libempathy-gtk/empathy-new-message-dialog.c:319
+#: ../src/empathy-roster-window-menubar.ui.h:1
+msgid "_Chat"
+msgstr "聊天(_C)"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1053
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+msgid "_SMS"
+msgstr "短信(_S)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1086
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "音频呼叫(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1119
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "视频呼叫(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1160
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "最近会话(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1189
+msgid "Send File"
+msgstr "发送文件"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1219
+msgid "Share My Desktop"
+msgstr "共享我的桌面"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1245
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+msgid "Favorite"
+msgstr "收藏"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1264
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts 未安装"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1267
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "请安装 gnome-contacts 来访问联系人详情。"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1398
+msgid "Infor_mation"
+msgstr "信息(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1447
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1564
+#: ../src/empathy-chat-window.c:1192
+msgid "Inviting you to this room"
+msgstr "邀请到此聊天室"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1610
+msgid "_Invite to Chat Room"
+msgstr "邀请到聊天室(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1806
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Add Contact…"
+msgstr "添加联系人(_A)..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2304
+msgid "Delete and _Block"
+msgstr "删除并屏蔽(_B)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2339
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "您真的要删除群组“%s”吗？"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2342
+msgid "Removing group"
+msgstr "删除群组"
+
+#. Remove
+#: ../libempathy-gtk/empathy-individual-view.c:2397
+#: ../libempathy-gtk/empathy-individual-view.c:2601
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2474
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "您真的想要删除联系人“%s”吗？"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2483
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"您是否真正地想要删除已绑定的联系人'%s' ？ 注意这将删除所有联系已绑定的联系人"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2495
+msgid "Removing contact"
+msgstr "删除联系人"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "已绑定联系人包含 %u 联系人"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>位置</b> 于 (日期)"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Online from a phone or mobile device"
+msgstr "通过电话或移动设备上网"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+msgid "New Network"
+msgstr "新建网络"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+msgid "Choose an IRC network"
+msgstr "选择一个 IRC 网络"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+msgid "Reset _Networks List"
+msgstr "重置_Networks列表"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "选择"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "新建服务器"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "服务器"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "端口"
-
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:539
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:539
-#: ../src/empathy-import-widget.c:310
-msgid "Account"
-msgstr "账户"
+#: ../libempathy-gtk/empathy-log-window.c:620
+msgid "History"
+msgstr "历史"
+
+#: ../libempathy-gtk/empathy-log-window.c:675
+msgid "Show"
+msgstr "显示"
+
+#: ../libempathy-gtk/empathy-log-window.c:697
+msgid "Search"
+msgstr "搜索"
+
+#: ../libempathy-gtk/empathy-log-window.c:1148
+#, c-format
+msgid "Chat in %s"
+msgstr "在 %s 聊天"
+
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
+msgid "Chat with %s"
+msgstr "与 %s 聊天"
+
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
+msgctxt "A date with the time"
+msgid "%A, %e %B %Y %X"
+msgstr "%Y年%m月%d日 %A"
+
+#. Translators: this is an emote: '* Danielle waves'
+#: ../libempathy-gtk/empathy-log-window.c:1289
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
 
-#: ../libempathy-gtk/empathy-log-window.c:556
-msgid "Date"
-msgstr "日期"
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1295
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s：</b>%s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1371
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s 秒"
+
+#: ../libempathy-gtk/empathy-log-window.c:1378
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s 分"
+
+#: ../libempathy-gtk/empathy-log-window.c:1386
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "通话时长：%s，结束于 %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1720
+msgid "Today"
+msgstr "今天"
+
+#: ../libempathy-gtk/empathy-log-window.c:1724
+msgid "Yesterday"
+msgstr "昨天"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1739
+msgid "%e %B %Y"
+msgstr "%Y年%m月%d日"
+
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
+msgid "Anytime"
+msgstr "随时"
+
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
+msgid "Anyone"
+msgstr "任何人"
+
+#: ../libempathy-gtk/empathy-log-window.c:2713
+msgid "Who"
+msgstr "谁"
+
+#: ../libempathy-gtk/empathy-log-window.c:2922
+msgid "When"
+msgstr "何时"
+
+#: ../libempathy-gtk/empathy-log-window.c:3038
+msgid "Anything"
+msgstr "任何事"
+
+#: ../libempathy-gtk/empathy-log-window.c:3040
+msgid "Text chats"
+msgstr "文本聊天"
+
+#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../src/empathy-preferences.ui.h:25
+msgid "Calls"
+msgstr "通话"
+
+#: ../libempathy-gtk/empathy-log-window.c:3047
+msgid "Incoming calls"
+msgstr "来电"
+
+#: ../libempathy-gtk/empathy-log-window.c:3048
+msgid "Outgoing calls"
+msgstr "呼出的语音通话"
+
+#: ../libempathy-gtk/empathy-log-window.c:3049
+msgid "Missed calls"
+msgstr "未接来电"
+
+#: ../libempathy-gtk/empathy-log-window.c:3071
+msgid "What"
+msgstr "什么事"
+
+#: ../libempathy-gtk/empathy-log-window.c:3780
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "确定要删除以前的全部对话日志？"
+
+#: ../libempathy-gtk/empathy-log-window.c:3784
+msgid "Clear All"
+msgstr "全部清除"
+
+#: ../libempathy-gtk/empathy-log-window.c:3791
+msgid "Delete from:"
+msgstr "从以下位置删除："
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "Conversations"
-msgstr "对话"
+msgid "_File"
+msgstr "文件(_F)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Previous Conversations"
-msgstr "以前的对话"
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_Edit"
+msgstr "编辑(_E)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Search"
-msgstr "æ\90\9cç´¢"
+msgid "Delete All History..."
+msgstr "æ¸\85空å\85¨é\83¨å\8e\86å\8f²..."
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "_For:"
-msgstr "包含(_F)："
+msgid "Profile"
+msgstr "个人信息"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:19
+msgid "Chat"
+msgstr "聊天"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "视频"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "page 2"
+msgstr "第 2 页"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">正在载入...</span>"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "联系人为离线"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "指定的联系人无效或信息未知"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "选择的联系人不支持在该类型会话"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "所要求的功能与此协议不兼容"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "无法与选择的联系人发起对话"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "您已被此频道屏蔽"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "频道已满"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "您必须被邀请才能加入此频道"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "通话(_A)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "断开时无法进行"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
-msgid "C_hat"
-msgstr "聊天(_H)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "拒绝访问"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "联系人 ID："
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "发起对话时出错"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
+msgid "Enter a contact identifier or phone number:"
+msgstr "输入一个联系人标识或电话号码："
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "新建对话"
 
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "_Video Call"
+msgstr "视频呼叫(_V)"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
+msgid "_Audio Call"
+msgstr "音频呼叫(_A)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
+msgid "New Call"
+msgstr "新建通话"
+
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "帐号 <b>%s</b> 验证失败"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"输入您的帐号密码\n"
+"<b>%s</b>"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:177
-#: ../libempathy-gtk/empathy-presence-chooser.c:213
-msgid "Custom Message..."
-msgstr "自定义状态..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
+msgid "Custom Message…"
+msgstr "自定义消息..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:230
-#: ../libempathy-gtk/empathy-presence-chooser.c:232
-msgid "Edit Custom Messages..."
-msgstr "编辑自定义状态..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
+msgid "Edit Custom Messages…"
+msgstr "编辑自定义消息"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:331
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr "点击移除自定义状态"
+msgstr "点击移除常用自定义状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:340
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr "点击设置自定义状态"
+msgstr "点击设置常用自定义状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:374
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "设置状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:876
-msgid "Set your presence and current status"
-msgstr "设置你的状态信息和现在的状态"
-
 #. Custom messages
 #: ../libempathy-gtk/empathy-presence-chooser.c:1135
-msgid "Custom messages..."
-msgstr "自定义状态..."
+msgid "Custom messages…"
+msgstr "自定义消息..."
+
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
+#, c-format
+msgid "New %s account"
+msgstr "新建 %s 帐号"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "查找："
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "_Previous"
+msgstr "上一页(_P)"
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "_Next"
+msgstr "下一页(_N)"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "区分大小写(_C)"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "Phrase not found"
+msgstr "未找到短语"
+
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "收到了即时消息"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr "发送即时消息"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr "收到的聊天请求"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "联系人已连接"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "联系人已断开"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr "已连接到服务器"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr "已从服务器断开连接"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "呼入的语音通话"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "呼出的语音通话"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "语音通话结束"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
-msgid "Enter Custom Message"
-msgstr "输入自定义状态"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
-msgstr "编辑自定义状态"
+msgstr "编辑自定义消息"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "添加新自定义状态(_N)"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+msgid "Message edited at %s"
+msgstr "消息于 %s 被编辑"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "已保存的自定义状态"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
+msgid "Normal"
+msgstr "普通"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "经典"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "简洁"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "清爽"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "蓝色"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1394
-msgid "Unable to open URI"
-msgstr "无法打开 URI"
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "聊天服务器所提供的身份无法验证。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1484
-msgid "Select a file"
-msgstr "选择文件"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "证书并非由 CA 签发。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1544
-msgid "Select a destination"
-msgstr "选择目的地"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "证书已过期。"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "当前 Locale"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "证书尚未被激活。"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:161
-#: ../libempathy-gtk/totem-subtitle-encoding.c:163
-#: ../libempathy-gtk/totem-subtitle-encoding.c:165
-#: ../libempathy-gtk/totem-subtitle-encoding.c:167
-msgid "Arabic"
-msgstr "阿拉伯语"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "证书缺少应有的指纹。"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:170
-msgid "Armenian"
-msgstr "亚美尼亚语"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "证书所验证的主机名与服务器名不匹配。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "证书是自签署的。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "证书被证书签发机构吊销。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "证书是弱加密的。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "证书长度超出可验证限制。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "证书损坏。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "预期主机名: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "证书主机名: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
+msgid "C_ontinue"
+msgstr "继续(_O)"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "不受信任的连接"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "连接不受信任。是否仍要继续?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
+msgid "Remember this choice for future connections"
+msgstr "为将来的连接记住本次选择"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
+msgid "Certificate Details"
+msgstr "证书详情"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1754
+msgid "Unable to open URI"
+msgstr "无法打开 URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1872
+msgid "Select a file"
+msgstr "选择文件"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1947
+msgid "Insufficient free space to save file"
+msgstr "空间不足，无法保存文件"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1955
+#, c-format
+msgid ""
+"%s of free space are required to save this file, but only %s is available. "
+"Please choose another location."
+msgstr "保存此文件需要 %s 空闲空间，但目前仅有 %s，请选择其他位置。"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1999
+#, c-format
+msgid "Incoming file from %s"
+msgstr "从 %s 传来的文件"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr "当前语言环境"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr "阿拉伯语"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr "亚美尼亚语"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:173
 #: ../libempathy-gtk/totem-subtitle-encoding.c:175
@@ -1693,7 +2843,7 @@ msgstr "希腊语"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:242
 msgid "Gujarati"
-msgstr "å\8d°åº¦ Gujarati 语"
+msgstr "å\8f¤å\90\89æ\8b\89ç\89¹语"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:245
 msgid "Gurmukhi"
@@ -1781,40 +2931,55 @@ msgstr "西方语言"
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The contact selected cannot receive files."
-msgstr "选择的联系人无法接受文件。"
+#: ../libempathy-gtk/empathy-calendar-button.c:66
+#| msgctxt "verb in a column header displaying group names"
+#| msgid "Select"
+msgid "Select..."
+msgstr "选择..."
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The contact selected is offline."
-msgstr "联系人离线"
+#: ../libempathy-gtk/empathy-calendar-button.c:154
+#| msgctxt "verb in a column header displaying group names"
+#| msgid "Select"
+msgid "_Select"
+msgstr "选择(_S)"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "无错误信息"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
-msgstr "即时消息（Empathy）"
+msgstr "即时消息(Empathy)"
 
-#: ../src/empathy.c:889
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
-msgstr "启动时不自动登录"
+msgstr "启动时不自动连接"
 
-#: ../src/empathy.c:893
-#, fuzzy
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "启动时不显示联系人列表"
 
-#: ../src/empathy.c:897
-msgid "Show the accounts dialog"
-msgstr "显示账户对话框"
-
-#: ../src/empathy.c:909
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
-msgstr " - Empathy IM 客户端"
+msgstr " - Empathy 即时通讯客户端"
+
+#: ../src/empathy.c:641
+msgid "Error contacting the Account Manager"
+msgstr "联系帐号管理器出错"
+
+#: ../src/empathy.c:643
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"在试图连接到 Telepathy 帐号管理器时出错。错误是：\n"
+"\n"
+"%s"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -1824,7 +2989,7 @@ msgstr ""
 "Empathy 是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证下重新发布"
 "或修改它；许可证可使用第二版或您想选择的更新的版本。"
 
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1834,7 +2999,7 @@ msgstr ""
 "Empathy 发布的目的是希望它对您有用，但是没有任何担保；即使是对商业应用以及其"
 "它特定目的。查阅 GNU 通用公共许可证以获取更多细节。"
 
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1844,15 +3009,26 @@ msgstr ""
 "给自由软件基金会写信。地址是：51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "一个 GNOME 即时消息客户端"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
-"翻译-贡献者YangZhang, <zyangmath@gmail.com>\n"
-"Aron Xu <aronxu@gnome.org>\n"
+"Abel Cheung <maddog@linux.org.hk>, 2003\n"
+"Mai Haohui <maihaohui@hotmail.com>, 2003\n"
+"Rongjun Mu <elanmu@sina.com>, 2003\n"
+"YangZhang <zyangmath@gmail.com>, 2008\n"
+"Funda Wang <fundawang@gmail.com>, 2009\n"
+"Lyper Lai <lyp069@gmail.com>, 2009\n"
+"Yun Nie <yun.nie@ptiglobal.net>, 2009\n"
+"Richard Ma <richard.ma.19850509@gmail.com>, 2009\n"
+"Tao Wei <weitao1979@gmail.com>, 2009\n"
+"Aron Xu <happyaron.xu@gmail.com>, 2009, 2010\n"
+"Tao Wang <dancefire@gmail.com>, 2010\n"
+"Mike Manilone <crtmike@gmail.com>, 2012\n"
+"\n"
 "Launchpad Contributions:\n"
 "  =KK= https://launchpad.net/~sevkme\n"
 "  AnThOnYhO https://launchpad.net/~anthonyho\n"
@@ -1862,601 +3038,791 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n"
 "  yuane https://launchpad.net/~yuane"
 
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
-msgstr "导入账户时出现错误。"
-
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
-msgstr "在解析账户信息时出现错误。"
-
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
-msgstr "在创建账户是出现错误。"
-
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
-msgstr "发生错误。"
-
-#: ../src/empathy-account-assistant.c:141
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:72
 #, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "错误信息是：<span style=\"italic\">%s</span>"
+msgid "There are unsaved modifications to your %s account."
+msgstr "您的 %s 帐号有未保存的修改。"
 
-#: ../src/empathy-account-assistant.c:149
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"您可以返回尝试重新输入您的账户信息，或者退出助理，然后从编辑菜单中加入账户。"
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:76
+msgid "Your new account has not been saved yet."
+msgstr "您的新帐号还没有保存。"
 
-#: ../src/empathy-account-assistant.c:184
-msgid "An error occurred"
-msgstr "发生错误"
+#: ../src/empathy-accounts-dialog.c:381
+#: ../src/empathy-streamed-media-window.c:759
+#: ../src/empathy-call-window.c:1289
+msgid "Connecting…"
+msgstr "正在连接..."
 
-#. Create account
-#. To translator: %s is the protocol name
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../src/empathy-account-assistant.c:331
-#: ../src/empathy-accounts-dialog.c:1339
+#: ../src/empathy-accounts-dialog.c:422
 #, c-format
-msgid "New %s account"
-msgstr "新建 %s 账户"
-
-#: ../src/empathy-account-assistant.c:403
-msgid "What kind of chat account do you have?"
-msgstr "您有什么样的聊天账户？"
-
-#: ../src/empathy-account-assistant.c:409
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "您还要设置其它聊天账户吗？"
+msgid "Offline — %s"
+msgstr "离线 - %s"
 
-#: ../src/empathy-account-assistant.c:415
-msgid "Enter your account details"
-msgstr "输入您的帐户详情"
-
-#: ../src/empathy-account-assistant.c:420
-msgid "What kind of chat account do you want to create?"
-msgstr "您想要创建什么样的聊天账户？"
+#: ../src/empathy-accounts-dialog.c:434
+#, c-format
+msgid "Disconnected — %s"
+msgstr "已断开 - %s"
 
-#: ../src/empathy-account-assistant.c:426
-msgid "Do you want to create other chat accounts?"
-msgstr "您想要创建其它的聊天账户吗、"
+#: ../src/empathy-accounts-dialog.c:445
+msgid "Offline — No Network Connection"
+msgstr "离线 - 无可用网络"
 
-#: ../src/empathy-account-assistant.c:433
-msgid "Enter the details for the new account"
-msgstr "输入新账户的详细资料"
+#: ../src/empathy-accounts-dialog.c:452
+msgid "Unknown Status"
+msgstr "未知状态"
 
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-accounts-dialog.c:469
 msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"programs. With a microphone or a webcam you can also have audio or video "
-"calls."
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
 msgstr ""
-"使用 Empathy，您可以与附近的朋友聊天，还可以与使用 Google Talk，AIM，Windows "
-"Live 和许多其它聊天软件的朋友和同事聊天。使用麦克风或摄像头，您就可以开始音频"
-"和视频通话。"
-
-#: ../src/empathy-account-assistant.c:536
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "您有没有其它聊天软件的账户？"
-
-#: ../src/empathy-account-assistant.c:559
-msgid "Yes, import my account details from "
-msgstr "有，请导入我的账户信息"
-
-#: ../src/empathy-account-assistant.c:580
-msgid "Yes, I'll enter my account details now"
-msgstr "有，我现在就输入我的账户信息"
-
-#: ../src/empathy-account-assistant.c:602
-msgid "No, I want a new account"
-msgstr "不，我想要一个新的账户。"
+"因为此账户依赖一个旧式、不支持的后端，所以此账户已被禁用。请安装 telepathy-"
+"haze 并重新启动您的会话来迁移您的账户。"
 
-#: ../src/empathy-account-assistant.c:612
-msgid "No, I just want to see people online nearby for now"
-msgstr "没有，我只是想看看附近现在谁在线上"
+#: ../src/empathy-accounts-dialog.c:479
+msgid "Offline — Account Disabled"
+msgstr "离线 - 帐号被禁用"
 
-#: ../src/empathy-account-assistant.c:633
-msgid "Select the accounts you want to import:"
-msgstr "选择您要导入的账户："
+#: ../src/empathy-accounts-dialog.c:585
+msgid "Edit Connection Parameters"
+msgstr "编辑连接参数"
 
-#: ../src/empathy-account-assistant.c:720
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
-msgid "Yes"
-msgstr "是"
-
-#: ../src/empathy-account-assistant.c:727
-msgid "No, that's all for now"
-msgstr "没有，就这样吧。"
-
-#: ../src/empathy-account-assistant.c:920
-msgid "Welcome to Empathy"
-msgstr "欢迎使用 Empathy"
-
-#: ../src/empathy-account-assistant.c:929
-msgid "Import your existing accounts"
-msgstr "导入现有帐户"
-
-#. The primary text of the dialog shown to the user when he is about to lose
-#. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:63
-#, c-format
-msgid "There are unsaved modification regarding your %s account."
-msgstr "您的 %s 账户有未保存的修改。"
+#: ../src/empathy-accounts-dialog.c:750
+msgid "Failed to retrieve your personal information from the server."
+msgstr "从服务器获取您的个人信息失败。"
 
-#. The primary text of the dialog shown to the user when he is about to lose
-#. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:67
-msgid "Your new account has not been saved yet."
-msgstr ""
+#: ../src/empathy-accounts-dialog.c:756
+msgid "Go online to edit your personal information."
+msgstr "请上线以编辑您的个人信息。"
 
-#: ../src/empathy-accounts-dialog.c:484
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr "您将要创建一个新账户，所做的修改将作废。您确定要继续吗？"
+#: ../src/empathy-accounts-dialog.c:843
+msgid "_Edit Connection Parameters..."
+msgstr "编辑连接参数(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:774
+#: ../src/empathy-accounts-dialog.c:1339
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "您要从电脑中移除 %s 吗？"
 
-#: ../src/empathy-accounts-dialog.c:778
+#: ../src/empathy-accounts-dialog.c:1343
 msgid "This will not remove your account on the server."
-msgstr "这不会删除服务器上的è´¦æ\88·ã\80\82"
+msgstr "这不会删除服务器上的å¸\90å\8f·ã\80\82"
 
-#: ../src/empathy-accounts-dialog.c:960
+#: ../src/empathy-accounts-dialog.c:1579
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
-msgstr "您将要选择另一个è´¦æ\88·ï¼\8cæ\89\80å\81\9aç\9a\84ä¿®æ\94¹å°\86ä½\9cåº\9fã\80\82æ\82¨ç¡®å®\9aè¦\81继续å\90\97ï¼\9f"
+msgstr "您将要选择另一个å¸\90å\8f·ï¼\8cæ\89\80å\81\9aç\9a\84ä¿®æ\94¹å°\86ä½\9cåº\9fã\80\82æ\82¨ç¡®å®\9aè¦\81继续å\90\97ï¼\9f"
 
-#: ../src/empathy-accounts-dialog.c:1425
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1755
+msgid "_Enable"
+msgstr "启用(_E)"
+
+#: ../src/empathy-accounts-dialog.c:1756
+msgid "_Disable"
+msgstr "禁用(_D)"
+
+#: ../src/empathy-accounts-dialog.c:2184
+msgid "_Skip"
+msgstr "跳过(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2188
+msgid "_Connect"
+msgstr "连接(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2365
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "您将要关闭此窗口，所做的修改将作废。您确定要继续吗？"
 
-#.  Translators: this is used only when built on a moblin platform 
-#: ../src/empathy-accounts-dialog.c:1596
-msgid "_Next"
-msgstr "_下一页"
-
-#: ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "账户"
-
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr "添加"
-
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "å\88\9b建(_E)"
+msgid "_Import…"
+msgstr "导å\85¥(_I)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "No protocol installed"
-msgstr "尚未安装协议"
+msgid "Loading account information"
+msgstr "正在加载帐号信息"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
-msgstr "要添加一个新è´¦æ\88·ï¼\8cæ\82¨é¦\96å\85\88é\9c\80è¦\81为æ\82¨æ\83³è¦\81使ç\94¨ç\9a\84æ¯\8f个å\8d\8fè®®å®\89è£\85å\90\8e端ã\80\82"
+msgstr "要添加一个新å¸\90å\8f·ï¼\8cæ\82¨é¦\96å\85\88é\9c\80è¦\81为æ\82¨æ\83³è¦\81使ç\94¨ç\9a\84æ¯\8f个å\8d\8fè®®å®\89è£\85å\90\8e端ã\80\82"
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Add..."
-msgstr "æ·»å\8a (_A)..."
+msgid "No protocol backends installed"
+msgstr "æ\9cªå®\89è£\85å\8d\8fè®®å\90\8e端"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "创建新的帐户(_C)"
+#: ../src/empathy-auth-client.c:288
+msgid " - Empathy authentication client"
+msgstr " - Empathy 认证客户端"
 
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Import..."
-msgstr "_导入……"
+#: ../src/empathy-auth-client.c:304
+msgid "Empathy authentication client"
+msgstr "Empathy 认证客户端"
 
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "_Reuse an existing account"
-msgstr "启用现有帐户(_R)"
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
+msgid "- Empathy Audio/Video Client"
+msgstr " - Empathy 语音/视频客户端"
 
-#: ../src/empathy-accounts-dialog.ui.h:10
-msgid "account"
-msgstr "账户"
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy 语音/视频客户端"
 
-#: ../src/empathy-call-window.c:428
+#: ../src/empathy-streamed-media-window.c:434
 msgid "Contrast"
 msgstr "对比度"
 
-#: ../src/empathy-call-window.c:431
+#: ../src/empathy-streamed-media-window.c:437
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:434
+#: ../src/empathy-streamed-media-window.c:440
 msgid "Gamma"
 msgstr "伽马"
 
-#: ../src/empathy-call-window.c:542
+#: ../src/empathy-streamed-media-window.c:547
 msgid "Volume"
 msgstr "音量"
 
-#: ../src/empathy-call-window.c:676
-msgid "Connecting..."
-msgstr "正在连接..."
-
-#: ../src/empathy-call-window.c:784
+#: ../src/empathy-streamed-media-window.c:1099
 msgid "_Sidebar"
 msgstr "侧边栏(_S)"
 
-#: ../src/empathy-call-window.c:803
-msgid "Dialpad"
-msgstr "电话键盘"
-
-#: ../src/empathy-call-window.c:809
+#: ../src/empathy-streamed-media-window.c:1119
 msgid "Audio input"
 msgstr "音频输入"
 
-#: ../src/empathy-call-window.c:813
+#: ../src/empathy-streamed-media-window.c:1123
 msgid "Video input"
 msgstr "视频输入"
 
+#: ../src/empathy-streamed-media-window.c:1131
+msgid "Dialpad"
+msgstr "电话键盘"
+
+#: ../src/empathy-streamed-media-window.c:1142
+msgid "Details"
+msgstr "详细信息"
+
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:876
+#: ../src/empathy-streamed-media-window.c:1211
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通话"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-call-window.c:957
-msgid "Call"
-msgstr "通话"
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2133
+msgid "The IP address as seen by the machine"
+msgstr "机器所见的 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1446
+#: ../src/empathy-call-window.c:2135
+msgid "The IP address as seen by a server on the Internet"
+msgstr "Internet 上服务器所见的 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1448
+#: ../src/empathy-call-window.c:2137
+msgid "The IP address of the peer as seen by the other side"
+msgstr "另一方所见的 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2139
+msgid "The IP address of a relay server"
+msgstr "中转服务器 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1452
+#: ../src/empathy-call-window.c:2141
+msgid "The IP address of the multicast group"
+msgstr "多播组的 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1837
+#: ../src/empathy-streamed-media-window.c:1840
+#: ../src/empathy-streamed-media-window.c:1843
+#: ../src/empathy-streamed-media-window.c:1846
+msgctxt "codec"
+msgid "Unknown"
+msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1457
+#: ../src/empathy-streamed-media-window.c:2138
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已连接 — %d:%02dm"
 
-#: ../src/empathy-call-window.c:1517
-#, fuzzy
+#: ../src/empathy-streamed-media-window.c:2199
+#: ../src/empathy-call-window.c:2992
 msgid "Technical Details"
-msgstr "联系人详情"
+msgstr "技术细节"
 
-#: ../src/empathy-call-window.c:1551
+#: ../src/empathy-streamed-media-window.c:2237
+#: ../src/empathy-call-window.c:3031
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
-msgstr ""
+msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
 
-#: ../src/empathy-call-window.c:1556
+#: ../src/empathy-streamed-media-window.c:2242
+#: ../src/empathy-call-window.c:3036
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
-msgstr ""
+msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
 
-#: ../src/empathy-call-window.c:1562
+#: ../src/empathy-streamed-media-window.c:2248
+#: ../src/empathy-call-window.c:3042
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
+msgstr "不能与 %s 建立连接。可能是两台计算机之一不允许直接连接。"
+
+#: ../src/empathy-streamed-media-window.c:2254
+#: ../src/empathy-call-window.c:3048
+msgid "There was a failure on the network"
+msgstr "网络出现一个错误"
+
+#: ../src/empathy-streamed-media-window.c:2258
+#: ../src/empathy-call-window.c:3052
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
+
+#: ../src/empathy-streamed-media-window.c:2261
+#: ../src/empathy-call-window.c:3055
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
+
+#: ../src/empathy-streamed-media-window.c:2271
+#: ../src/empathy-call-window.c:3067
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
 msgstr ""
+"Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>，并附上帮助菜"
+"单里“调试”窗口收集到的日志。"
+
+#: ../src/empathy-streamed-media-window.c:2279
+#: ../src/empathy-call-window.c:3076
+msgid "There was a failure in the call engine"
+msgstr "呼叫引擎里出现了一个故障"
 
-#: ../src/empathy-call-window.c:1604
+#: ../src/empathy-streamed-media-window.c:2282
+#: ../src/empathy-call-window.c:3079
+msgid "The end of the stream was reached"
+msgstr "已到达流的末尾"
+
+#: ../src/empathy-streamed-media-window.c:2322
+#: ../src/empathy-call-window.c:3119
 msgid "Can't establish audio stream"
-msgstr ""
+msgstr "不能建立音频流"
 
-#: ../src/empathy-call-window.c:1614
+#: ../src/empathy-streamed-media-window.c:2332
+#: ../src/empathy-call-window.c:3129
 msgid "Can't establish video stream"
-msgstr ""
+msgstr "不能建立视频流"
 
 #: ../src/empathy-call-window.ui.h:1
-msgid "Hang up"
-msgstr "挂起"
-
-#: ../src/empathy-call-window.ui.h:2
-msgid "Redial"
-msgstr "重播"
+#: ../src/empathy-streamed-media-window.ui.h:1
+msgid "_Call"
+msgstr "通话(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Send Audio"
-msgstr "发送音频"
+msgid "_Microphone"
+msgstr "话筒(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "发送视频"
+msgid "_Camera"
+msgstr "相机(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
-msgstr "è§\86é¢\91é¢\84è§\88"
+msgid "_Settings"
+msgstr "设置(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "_Call"
-msgstr "通话(_C)"
-
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../src/empathy-chat-window.c:561
-msgid "Typing a message."
-msgstr "输入消息。"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "帮助(_H)"
 
-#: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "清除(_L)"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "内容(_C)"
 
-#: ../src/empathy-chat-window.ui.h:2
-#, fuzzy
-msgid "C_ontact"
-msgstr "è\81\94系人"
+#: ../src/empathy-call-window.ui.h:9
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "è°\83è¯\95(_D)"
 
-#: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "聊天"
+#: ../src/empathy-call-window.ui.h:10
+msgid "Swap camera"
+msgstr "交换相机"
 
-#: ../src/empathy-chat-window.ui.h:4
-msgid "Insert _Smiley"
-msgstr "æ\8f\92å\85¥è¡¨æ\83\85(_M)"
+#: ../src/empathy-call-window.ui.h:11
+msgid "Minimise me"
+msgstr "æ\9c\80å°\8få\8c\96æ\88\91"
 
-#: ../src/empathy-chat-window.ui.h:5
-msgid "Move Tab _Left"
-msgstr "左移标签(_L)"
+#: ../src/empathy-call-window.ui.h:12
+msgid "Maximise me"
+msgstr "最大化我"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Right"
-msgstr "右移标签(_R)"
+#: ../src/empathy-call-window.ui.h:13
+msgid "Disable camera"
+msgstr "禁用相机"
 
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:15
-msgid "_Contents"
-msgstr "内容(_C)"
+#: ../src/empathy-call-window.ui.h:14
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "挂断"
 
-#: ../src/empathy-chat-window.ui.h:8
-msgid "_Conversation"
-msgstr "对话(_C)"
+#: ../src/empathy-call-window.ui.h:15
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "挂断当前呼叫"
 
-#: ../src/empathy-chat-window.ui.h:9
-msgid "_Detach Tab"
-msgstr "漂移标签(_D)"
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "视频呼叫"
 
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
-msgstr "收藏聊天室(_F)"
+#: ../src/empathy-call-window.ui.h:17
+msgid "Start a video call"
+msgstr "开始视频通话"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:19
-msgid "_Help"
-msgstr "帮å\8a©(_H)"
+#: ../src/empathy-call-window.ui.h:19
+msgid "Start an audio call"
+msgstr "å¼\80å§\8bé\9f³é¢\91é\80\9aè¯\9d"
 
-#: ../src/empathy-chat-window.ui.h:13
-msgid "_Next Tab"
-msgstr "下一标签(_N)"
+#: ../src/empathy-call-window.ui.h:20
+msgid "Show dialpad"
+msgstr "显示拨号盘"
 
-#: ../src/empathy-chat-window.ui.h:14
-msgid "_Previous Tab"
-msgstr "上一标签(_P)"
+#: ../src/empathy-call-window.ui.h:21
+msgid "Display the dialpad"
+msgstr "显示拨号盘"
 
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
-msgid "_Show Contact List"
-msgstr "显示联系人列表(_S)"
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "发送视频"
 
-#: ../src/empathy-chat-window.ui.h:16
-msgid "_Tabs"
-msgstr "标签(_T)"
+#: ../src/empathy-call-window.ui.h:23
+msgid "Toggle video transmission"
+msgstr "切换视频传输"
 
-#: ../src/empathy-chatrooms-window.c:258
-msgid "Name"
-msgstr "名称"
+#: ../src/empathy-call-window.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:11
+msgid "Send Audio"
+msgstr "发送音频"
 
-#: ../src/empathy-chatrooms-window.c:276
-msgid "Room"
-msgstr "聊天室"
+#: ../src/empathy-call-window.ui.h:25
+#: ../src/empathy-streamed-media-window.ui.h:12
+msgid "Toggle audio transmission"
+msgstr "切换音频传输"
 
-#: ../src/empathy-chatrooms-window.c:285
-msgid "Auto-Connect"
-msgstr "自动连接"
+#: ../src/empathy-call-window.ui.h:27
+#: ../src/empathy-streamed-media-window.ui.h:20
+msgid "Encoding Codec:"
+msgstr "编码器："
 
-#: ../src/empathy-chatrooms-window.ui.h:2
-msgid "Manage Favorite Rooms"
-msgstr "管理聊天室收藏"
+#: ../src/empathy-call-window.ui.h:28
+#: ../src/empathy-streamed-media-window.ui.h:21
+#: ../src/empathy-call-window.c:2542 ../src/empathy-call-window.c:2543
+#: ../src/empathy-call-window.c:2544 ../src/empathy-call-window.c:2545
+msgid "Unknown"
+msgstr "未知"
 
-#: ../src/empathy-event-manager.c:330
-msgid "Incoming call"
-msgstr "来电"
+#: ../src/empathy-call-window.ui.h:29
+#: ../src/empathy-streamed-media-window.ui.h:22
+msgid "Decoding Codec:"
+msgstr "解码器："
 
-#: ../src/empathy-event-manager.c:333
-#, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s 来电，您想要接听吗？"
+#: ../src/empathy-call-window.ui.h:30
+#: ../src/empathy-streamed-media-window.ui.h:23
+msgid "Remote Candidate:"
+msgstr "远程候选："
 
-#: ../src/empathy-event-manager.c:340
-msgid "_Reject"
-msgstr "拒绝(_R)"
+#: ../src/empathy-call-window.ui.h:31
+#: ../src/empathy-streamed-media-window.ui.h:24
+msgid "Local Candidate:"
+msgstr "本地候选："
 
-#: ../src/empathy-event-manager.c:346
-msgid "_Answer"
-msgstr "接听(_A)"
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-streamed-media-window.ui.h:25
+msgid "Audio"
+msgstr "音频"
 
-#: ../src/empathy-event-manager.c:455
-#, c-format
-msgid "Incoming call from %s"
-msgstr "%s 的来电"
+#: ../src/empathy-chat-window.c:289
+msgid "Close this window?"
+msgstr "关闭此窗口？"
 
-#: ../src/empathy-event-manager.c:499
+#: ../src/empathy-chat-window.c:294
 #, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s 正发送邀请给您"
-
-#: ../src/empathy-event-manager.c:505
-msgid "An external application will be started to handle it."
-msgstr "将启动一个外部应用程序来处理它."
-
-#: ../src/empathy-event-manager.c:510
-msgid "You don't have the needed external application to handle it."
-msgstr "您没有必需的外部应用程序来处理它."
-
-#: ../src/empathy-event-manager.c:638
-msgid "Room invitation"
-msgstr "聊天室邀请"
+msgid ""
+"Closing this window will leave %s. You will not receive any further messages "
+"until you rejoin it."
+msgstr "关闭此窗口将离开 %s。您将不会再收到任何消息，除非重新加入。"
 
-#: ../src/empathy-event-manager.c:641
+#: ../src/empathy-chat-window.c:305
 #, c-format
-msgid "%s is inviting you to join %s"
-msgstr "%s 正邀请您加入 %s"
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"关闭此窗口将离开 %u 间聊天室。您将不会再收到任何消息，除非重新加入。"
+
+#: ../src/empathy-chat-window.c:314
+#, c-format
+msgid "Leave %s?"
+msgstr "离开 %s？"
 
-#: ../src/empathy-event-manager.c:649
-msgid "_Decline"
-msgstr "拒绝(_D)"
+#: ../src/empathy-chat-window.c:315
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "您将不会再收到来自此聊天室的任何消息，除非重新加入。"
 
-#: ../src/empathy-event-manager.c:654
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
-msgid "_Join"
-msgstr "加入(_J)"
+#: ../src/empathy-chat-window.c:334
+msgid "Close window"
+msgstr "关闭窗口"
 
-#: ../src/empathy-event-manager.c:693
-#, c-format
-msgid "%s invited you to join %s"
-msgstr "%s 已邀请您加入 %s"
+#: ../src/empathy-chat-window.c:334
+msgid "Leave room"
+msgstr "离开聊天室"
 
-#: ../src/empathy-event-manager.c:719
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
-msgid "Incoming file transfer from %s"
-msgstr "接收 %s 文件传输"
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d 未读)"
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-chat-window.c:652
 #, c-format
-msgid "Subscription requested by %s"
-msgstr "%s 的订阅请求"
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (和另外 %u 人)"
 
-#: ../src/empathy-event-manager.c:903
+#: ../src/empathy-chat-window.c:668
 #, c-format
-msgid ""
-"\n"
-"Message: %s"
-msgstr ""
-"\n"
-"消息：%s"
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (另有他人的 %d 条未读)"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-chat-window.c:677
 #, c-format
-msgid "%s is now offline."
-msgstr "%s 当前离线。"
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (所有人共 %d 条未读)"
 
-#. someone is logging in
-#: ../src/empathy-event-manager.c:959
-#, c-format
-msgid "%s is now online."
-msgstr "%s 当前在线。"
+#: ../src/empathy-chat-window.c:892
+msgid "SMS:"
+msgstr "短信："
 
-#. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:102
+#: ../src/empathy-chat-window.c:902
 #, c-format
-msgid "%u:%02u.%02u"
-msgstr "%u:%02u.%02u"
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "正在发送 %d 条消息"
+
+#: ../src/empathy-chat-window.c:924
+msgid "Typing a message."
+msgstr "输入消息。"
+
+#: ../src/empathy-chat-window.ui.h:1
+msgid "_Conversation"
+msgstr "对话(_C)"
+
+#: ../src/empathy-chat-window.ui.h:2
+msgid "C_lear"
+msgstr "清除(_L)"
+
+#: ../src/empathy-chat-window.ui.h:3
+msgid "Insert _Smiley"
+msgstr "插入表情(_S)"
+
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "收藏聊天室(_F)"
+
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Notify for All Messages"
+msgstr "提示所有消息"
+
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "显示联系人列表(_S)"
+
+#: ../src/empathy-chat-window.ui.h:7
+msgid "Invite _Participant…"
+msgstr "邀请参与者(_P)…"
+
+#: ../src/empathy-chat-window.ui.h:8
+msgid "C_ontact"
+msgstr "联系人(_O)"
+
+#: ../src/empathy-chat-window.ui.h:10
+msgid "_Tabs"
+msgstr "标签(_T)"
+
+#: ../src/empathy-chat-window.ui.h:11
+msgid "_Previous Tab"
+msgstr "上一标签(_P)"
+
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "下一标签(_N)"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Undo Close Tab"
+msgstr "撤销关闭标签(_U)"
+
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "左移标签(_L)"
+
+#: ../src/empathy-chat-window.ui.h:15
+msgid "Move Tab _Right"
+msgstr "右移标签(_R)"
+
+#: ../src/empathy-chat-window.ui.h:16
+msgid "_Detach Tab"
+msgstr "漂移标签(_D)"
+
+#: ../src/empathy-chatrooms-window.c:251
+msgid "Name"
+msgstr "名称"
+
+#: ../src/empathy-chatrooms-window.c:269
+msgid "Room"
+msgstr "聊天室"
+
+#: ../src/empathy-chatrooms-window.c:277
+msgid "Auto-Connect"
+msgstr "自动连接"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "管理聊天室收藏"
+
+#: ../src/empathy-event-manager.c:522
+msgid "Incoming video call"
+msgstr "呼入的视频通话"
+
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
+msgid "Incoming call"
+msgstr "来电"
+
+#: ../src/empathy-event-manager.c:526
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s 视频来电。您想要接听吗？"
+
+#: ../src/empathy-event-manager.c:527
+#, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s 来电，您想要接听吗？"
+
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s 的来电"
+
+#: ../src/empathy-event-manager.c:555
+msgid "_Reject"
+msgstr "拒绝(_R)"
+
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+msgid "_Answer"
+msgstr "接听(_A)"
+
+#: ../src/empathy-event-manager.c:571
+msgid "_Answer with video"
+msgstr "使用视频接听(_A)"
+
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "%s 的视频呼叫"
+
+#: ../src/empathy-event-manager.c:837
+msgid "Room invitation"
+msgstr "聊天室邀请"
+
+#: ../src/empathy-event-manager.c:839
+#, c-format
+msgid "Invitation to join %s"
+msgstr "邀请您加入 %s"
+
+#: ../src/empathy-event-manager.c:846
+#, c-format
+msgid "%s is inviting you to join %s"
+msgstr "%s 正邀请您加入 %s"
+
+#: ../src/empathy-event-manager.c:854
+msgid "_Decline"
+msgstr "拒绝(_D)"
+
+#: ../src/empathy-event-manager.c:859
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "_Join"
+msgstr "加入(_J)"
+
+#: ../src/empathy-event-manager.c:886
+#, c-format
+msgid "%s invited you to join %s"
+msgstr "%s 已邀请您加入 %s"
+
+#: ../src/empathy-event-manager.c:892
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "您被邀请加入 %s"
+
+#: ../src/empathy-event-manager.c:943
+#, c-format
+msgid "Incoming file transfer from %s"
+msgstr "接收 %s 文件传输"
+
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
+msgid "Password required"
+msgstr "需要密码"
+
+#: ../src/empathy-event-manager.c:1216
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s 当您在线的时候可见"
+
+#: ../src/empathy-event-manager.c:1222
+#, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr ""
+"\n"
+"消息：%s"
+
+#. Translators: time left, when it is more than one hour
+#: ../src/empathy-ft-manager.c:99
+#, c-format
+msgid "%u:%02u.%02u"
+msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:105
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:181
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%2$s 中的 %1$s，速度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:277
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%2$s 中的 %1$s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:308
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正在从 %2$s 接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:311
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "正在向 %2$s 发送 \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "从 %2$s 接收 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:344
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "接收文件出错"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "向 %2$s 发送 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:352
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "发送文件出错"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:491
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "已经从 %2$s 完成接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "已经向 %2$s 完成发送 \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:499
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "文件传送完成"
 
-#: ../src/empathy-ft-manager.c:618 ../src/empathy-ft-manager.c:785
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他参与者的回应"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "检查\"%s\"完整性"
 
-#: ../src/empathy-ft-manager.c:647 ../src/empathy-ft-manager.c:685
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "校验中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1041
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1053
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "文件"
 
-#: ../src/empathy-ft-manager.c:1075
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "剩余"
 
@@ -2468,506 +3834,1241 @@ msgstr "文件传输"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "从列表移除已完成、已取消及已失败的文件传输"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "导入(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
-msgstr "未找到可导入的è´¦æ\88·ã\80\82Empathy ç\9b®å\89\8då\8fªè\83½æ\94¯æ\8c\81ä»\8e Pidgin 导å\85¥è´¦æ\88·ã\80\82"
+msgstr "未找到可导入的å¸\90å\8f·ã\80\82Empathy ç\9b®å\89\8då\8fªè\83½æ\94¯æ\8c\81ä»\8e Pidgin 导å\85¥å¸\90å\8f·ã\80\82"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
-msgstr "导入è´¦æ\88·"
+msgstr "导入å¸\90å\8f·"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "导入"
 
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "协议"
 
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "源"
 
-#: ../src/empathy-import-mc4-accounts.c:106
+#: ../src/empathy-roster-window.c:391
+msgid "Provide Password"
+msgstr "提供密码"
+
+#: ../src/empathy-roster-window.c:397
+msgid "Disconnect"
+msgstr "已断开连接"
+
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "您需要设置一个帐号才能查看这里的联系人。"
+
+#: ../src/empathy-roster-window.c:673
+msgid "No match found"
+msgstr "没有找到匹配项"
+
+#: ../src/empathy-roster-window.c:783
 #, c-format
-msgid "%s account"
-msgstr "%s 账户"
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "很抱歉，在软件 %2$s 更新前，您不能使用 %1$s 帐号。"
 
-#: ../src/empathy-main-window.c:413
-#, fuzzy
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "升级软件"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "关闭"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
-msgstr "已断开连接"
+msgstr "重新连接"
 
-#: ../src/empathy-main-window.c:420
-#, fuzzy
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
-msgstr "编辑账户(_E)"
+msgstr "编辑帐号"
 
-#: ../src/empathy-main-window.c:427
-#, fuzzy
-msgid "Close"
-msgstr "已关闭"
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "给 %s 充值(%s)..."
 
-#: ../src/empathy-main-window.c:515
-msgid "No error specified"
-msgstr "没有说明错误"
+#: ../src/empathy-roster-window.c:1156
+msgid "Top up account credit"
+msgstr "帐号充值"
 
-#: ../src/empathy-main-window.c:518
-msgid "Network error"
-msgstr "网络错误"
+#. top up button
+#: ../src/empathy-roster-window.c:1228
+msgid "Top Up..."
+msgstr "充值..."
 
-#: ../src/empathy-main-window.c:521
-msgid "Authentication failed"
-msgstr "验证失败"
+#: ../src/empathy-roster-window.c:1952
+msgid "Contact"
+msgstr "联系人"
 
-#: ../src/empathy-main-window.c:524
-msgid "Encryption error"
-msgstr "加密错误"
+#: ../src/empathy-roster-window.c:2150
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "您需要启用一个帐号才能查看这里的联系人。"
 
-#: ../src/empathy-main-window.c:527
-msgid "Name in use"
-msgstr "用户名已经被占用"
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:2158
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "您需要启用 %s 来查看这里的联系人。"
 
-#: ../src/empathy-main-window.c:530
-msgid "Certificate not provided"
-msgstr "未提供证书"
+#: ../src/empathy-roster-window.c:2460
+msgid "Contact List"
+msgstr "联系人列表"
 
-#: ../src/empathy-main-window.c:533
-msgid "Certificate untrusted"
-msgstr "证书不被信任"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "帐号设置"
 
-#: ../src/empathy-main-window.c:536
-msgid "Certificate expired"
-msgstr "证书已过期"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新建对话(_N)..."
 
-#: ../src/empathy-main-window.c:539
-msgid "Certificate not activated"
-msgstr "证书尚未激活"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新建呼叫(_C)..."
 
-#: ../src/empathy-main-window.c:542
-msgid "Certificate hostname mismatch"
-msgstr "证书主机名不匹配"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "搜索联系人(_S)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "文件传输(_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "离线联系人(_O)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "显示协议(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "帐号余额"
+
+#: ../src/empathy-roster-window-menubar.ui.h:11
+msgid "Contacts on a _Map"
+msgstr "联系人地图(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "帐号(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "_Blocked Contacts"
+msgstr "已屏蔽的联系人(_B)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "P_references"
+msgstr "首选项(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "在联系人列表中查找(_L)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:18
+msgid "Sort by _Name"
+msgstr "按姓名排序(_N)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:19
+msgid "Sort by _Status"
+msgstr "按状态排序(_S)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:20
+msgid "Normal Size With _Avatars"
+msgstr "扩展视图(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:21
+msgid "N_ormal Size"
+msgstr "常规视图(_O)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:22
+msgid "_Compact Size"
+msgstr "紧凑视图(_C)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "聊天室(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:24
+msgid "_Join…"
+msgstr "加入(_J)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "加入已收藏的聊天室(_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "管理收藏夹"
+
+#: ../src/empathy-new-chatroom-dialog.c:369
+msgid "Chat Room"
+msgstr "聊天室"
+
+#: ../src/empathy-new-chatroom-dialog.c:385
+msgid "Members"
+msgstr "成员"
+
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:637
+#, c-format
+msgid ""
+"%s\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"%s\n"
+"需要邀请: %s\n"
+"需要密码: %s\n"
+"成员: %s"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
+msgid "No"
+msgstr "否"
+
+#: ../src/empathy-new-chatroom-dialog.c:668
+msgid "Could not start room listing"
+msgstr "无法开始聊天室列表"
+
+#: ../src/empathy-new-chatroom-dialog.c:678
+msgid "Could not stop room listing"
+msgstr "无法停止聊天室列表"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "加入聊天室"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
+msgstr "输入聊天室名以加入或在列表中点击一个或多个聊天室。"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "聊天室(_R)："
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr "输入聊天室所在的服务器，或为空表示聊天室在当前帐号的服务器上。"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "无法载入聊天室列表"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
+msgid "Room List"
+msgstr "聊天室列表"
+
+#: ../src/empathy-preferences.c:166
+msgid "Message received"
+msgstr "收到了消息"
+
+#: ../src/empathy-preferences.c:167
+msgid "Message sent"
+msgstr "发出了消息"
+
+#: ../src/empathy-preferences.c:168
+msgid "New conversation"
+msgstr "新对话"
+
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "联系人上线了"
+
+#: ../src/empathy-preferences.c:170
+msgid "Contact goes offline"
+msgstr "联系人离线了"
+
+#: ../src/empathy-preferences.c:171
+msgid "Account connected"
+msgstr "帐号已连接"
+
+#: ../src/empathy-preferences.c:172
+msgid "Account disconnected"
+msgstr "帐号已断开"
+
+#: ../src/empathy-preferences.c:475
+msgid "Language"
+msgstr "语言"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:726
+msgid "Juliet"
+msgstr "朱立叶"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:733
+msgid "Romeo"
+msgstr "罗密欧"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:739
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:743
+msgid "Deny thy father and refuse thy name;"
+msgstr "Deny thy father and refuse thy name;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:746
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Or if thou wilt not, be but sworn my love"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:749
+msgid "And I'll no longer be a Capulet."
+msgstr "And I'll no longer be a Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:752
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Shall I hear more, or shall I speak at this?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:755
+msgid "Juliet has disconnected"
+msgstr "朱立叶已断开连接"
+
+#: ../src/empathy-preferences.c:1159
+msgid "Preferences"
+msgstr "首选项"
+
+#: ../src/empathy-preferences.ui.h:1
+msgid "Show _smileys as images"
+msgstr "显示表情符号为图形(_S)"
+
+#: ../src/empathy-preferences.ui.h:2
+msgid "Show contact _list in rooms"
+msgstr "在聊天室显示联系人列表(_L)"
+
+#: ../src/empathy-preferences.ui.h:3
+msgid "Appearance"
+msgstr "外观"
+
+#: ../src/empathy-preferences.ui.h:4
+msgid "Start chats in:"
+msgstr "聊天开始于："
+
+#: ../src/empathy-preferences.ui.h:5
+msgid "new ta_bs"
+msgstr "新标签(_B)"
+
+#: ../src/empathy-preferences.ui.h:6
+msgid "new _windows"
+msgstr "新窗口(_W)"
+
+#: ../src/empathy-preferences.ui.h:7
+msgid "Display incoming events in the notification area"
+msgstr "再提示区域显示呼入事件"
+
+#: ../src/empathy-preferences.ui.h:8
+msgid "_Automatically connect on startup"
+msgstr "启动时自动连接(_A) "
+
+#: ../src/empathy-preferences.ui.h:9
+msgid "Log conversations"
+msgstr "记录对话"
+
+#: ../src/empathy-preferences.ui.h:10
+msgid "Behavior"
+msgstr "行为"
+
+#: ../src/empathy-preferences.ui.h:11
+msgid "General"
+msgstr "常规"
+
+#: ../src/empathy-preferences.ui.h:12
+msgid "_Enable bubble notifications"
+msgstr "允许气泡通知(_E)"
+
+#: ../src/empathy-preferences.ui.h:13
+msgid "Disable notifications when _away or busy"
+msgstr "离开或忙碌时禁用提示(_A)"
+
+#: ../src/empathy-preferences.ui.h:14
+msgid "Enable notifications when the _chat is not focused"
+msgstr "当会话闲置时允许提示"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "当联系人上线时允许提示"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Enable notifications when a contact goes offline"
+msgstr "当联系人离线时允许提示"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Notifications"
+msgstr "提示"
+
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "启用声音通知(_E)"
+
+#: ../src/empathy-preferences.ui.h:19
+msgid "Disable sounds when _away or busy"
+msgstr "离开或忙碌时禁用声音(_A)"
+
+#: ../src/empathy-preferences.ui.h:20
+msgid "Play sound for events"
+msgstr "播放事件声音"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "声音"
+
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "使用回声抑制，以改善通话质量"
+
+#: ../src/empathy-preferences.ui.h:23
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"回声消除可以使您的语音在对方听来更清晰，但在某些计算机上可能导致问题。如果您"
+"或对方在通话时听到了奇怪的噪音或怪音，请尝试关闭回声消除并重新通话。"
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "向我的联系人公布位置信息(_P)"
+
+#: ../src/empathy-preferences.ui.h:27
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
+msgstr ""
+"降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
+"将精确到一位小数。 "
+
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Reduce location accuracy"
+msgstr "降低位置信息精度(_R)"
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "Privacy"
+msgstr "隐私"
+
+#: ../src/empathy-preferences.ui.h:31
+msgid "_GPS"
+msgstr "_GPS"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Cellphone"
+msgstr "手机(_C)"
+
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "网络(_N)(IP，Wi-Fi)"
+
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "位置来源："
+
+#: ../src/empathy-preferences.ui.h:36
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr "语言列表仅反映已安装的字典"
+
+#: ../src/empathy-preferences.ui.h:37
+msgid "Enable spell checking for languages:"
+msgstr "允许拼写检查的语言："
+
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "拼写检查"
+
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "聊天主题(_E)："
+
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "版本："
+
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "主题"
+
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "状态"
+
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Redial"
+msgstr "重拨"
+
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "V_ideo"
+msgstr "视频(_I)"
+
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "视频关闭"
+
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Video Preview"
+msgstr "视频预览"
+
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Video On"
+msgstr "视频开启"
+
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "再次呼叫联系人"
+
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Camera Off"
+msgstr "相机关闭"
+
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Disable camera and stop sending video"
+msgstr "禁用相机停止发送视频"
+
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "预览"
+
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "启用相机，但不发送视频"
+
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "相机开启"
+
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "启用相机，并发送视频"
+
+#: ../src/empathy-map-view.c:471
+msgid "Contact Map View"
+msgstr "联系地图视图"
+
+#: ../src/empathy-debug-window.c:1607
+msgid "Save"
+msgstr "保存"
+
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin 链接"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin 响应"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "一次粘贴的数据太多。请把日志保存到文件。"
+
+#: ../src/empathy-debug-window.c:1912
+msgid "Debug Window"
+msgstr "调试窗口"
+
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "发送到 pastebin"
+
+#: ../src/empathy-debug-window.c:2009
+msgid "Pause"
+msgstr "暂停"
+
+#: ../src/empathy-debug-window.c:2021
+msgid "Level "
+msgstr "级别 "
+
+#: ../src/empathy-debug-window.c:2040
+msgid "Debug"
+msgstr "调试"
+
+#: ../src/empathy-debug-window.c:2045
+msgid "Info"
+msgstr "信息"
+
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
+msgid "Message"
+msgstr "消息"
+
+#: ../src/empathy-debug-window.c:2055
+msgid "Warning"
+msgstr "警告"
+
+#: ../src/empathy-debug-window.c:2060
+msgid "Critical"
+msgstr "危急"
+
+#: ../src/empathy-debug-window.c:2065
+msgid "Error"
+msgstr "错误"
+
+#: ../src/empathy-debug-window.c:2084
+msgid "Time"
+msgstr "时间"
+
+#: ../src/empathy-debug-window.c:2087
+msgid "Domain"
+msgstr "域"
+
+#: ../src/empathy-debug-window.c:2089
+msgid "Category"
+msgstr "类别"
+
+#: ../src/empathy-debug-window.c:2091
+msgid "Level"
+msgstr "级别"
+
+#: ../src/empathy-debug-window.c:2114
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "已选定的连接管理不支持远程调试扩展"
+
+#: ../src/empathy-invite-participant-dialog.c:202
+#: ../src/empathy-invite-participant-dialog.c:230
+msgid "Invite Participant"
+msgstr "邀请参与者"
+
+#: ../src/empathy-invite-participant-dialog.c:203
+msgid "Choose a contact to invite into the conversation:"
+msgstr "选择一个联系人以加入该会话："
+
+#: ../src/empathy-invite-participant-dialog.c:226
+msgid "Invite"
+msgstr "邀请"
+
+#: ../src/empathy-accounts.c:180
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "不显示任何对话框；完成所有工作（如导入）然后退出"
+
+#: ../src/empathy-accounts.c:184
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "只有“附近的人”帐号的时候不显示任何对话框"
+
+# lainme：初次选择给定的帐号(比如 gabble/jabber/foo_40example_2eorg0)
+#: ../src/empathy-accounts.c:188
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "首先选择给定帐号(如 gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:190
+msgid "<account-id>"
+msgstr "<帐号 ID>"
+
+#: ../src/empathy-accounts.c:195
+msgid "- Empathy Accounts"
+msgstr "- Empathy 帐号"
+
+#: ../src/empathy-accounts.c:231
+msgid "Empathy Accounts"
+msgstr "Empathy 帐号"
+
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "显示特定的服务"
+
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathy 调试器"
+
+#: ../src/empathy-debugger.c:113
+msgid "Empathy Debugger"
+msgstr "Empathy 调试器"
+
+#: ../src/empathy-chat.c:109
+msgid "- Empathy Chat Client"
+msgstr " - Empathy IM 客户端"
+
+#: ../src/empathy-notifications-approver.c:189
+msgid "Respond"
+msgstr "响应"
+
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
+msgid "Reject"
+msgstr "拒绝"
+
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
+msgid "Answer"
+msgstr "接听"
+
+#: ../src/empathy-notifications-approver.c:213
+msgid "Answer with video"
+msgstr "以视频应答"
+
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
+msgid "Decline"
+msgstr "拒绝"
+
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
+msgid "Accept"
+msgstr "接受"
+
+#. translators: the 'Provide' button is displayed in a notification
+#. * bubble when Empathy is asking for an account password; clicking on it
+#. * brings the password popup.
+#: ../src/empathy-notifications-approver.c:246
+msgid "Provide"
+msgstr "提供"
+
+#: ../src/empathy-call-observer.c:132
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s 刚刚尝试呼叫您，但您当时正在与其他人通话。"
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1140 ../src/empathy-call-window.c:1162
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2888
+msgid "On hold"
+msgstr "挂起"
+
+#: ../src/empathy-call-window.c:2891
+msgid "Mute"
+msgstr "静音"
+
+#: ../src/empathy-call-window.c:2893
+msgid "Duration"
+msgstr "时长"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2896
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../src/empathy-call-window.c:3166
+#, c-format
+msgid "Your current balance is %s."
+msgstr "您当前的余额为 %s。"
+
+#: ../src/empathy-call-window.c:3170
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "对不起，您信用卡余额不足以支付此次通话。"
+
+#: ../src/empathy-call-window.c:3172
+msgid "Top Up"
+msgstr "充值"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "区分大小写(_M)"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "您已经拥有哪个类型的帐号？"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "添加新帐号"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy 可以自动发现和您连接到同一个网络中的人们，并且可以和他们聊天。如果您"
+"想使用这个功能，请仔细查看下列信息是否正确。"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"您可以在以后修改这些详细信息或通过在联系人列表中选择<span style=\"italic\">编"
+"辑 → 帐号</span>来禁用这一功能。"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "导入帐号时发生错误。"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "在解析帐号详情时出现错误。"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "在创建帐号时出现错误。"
+
+#~ msgid "There was an error."
+#~ msgstr "发生错误。"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "错误信息为：%s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "您可以返回尝试重新输入您的帐号信息，或者退出助理，然后从编辑菜单中加入帐"
+#~ "号。"
+
+#~ msgid "An error occurred"
+#~ msgstr "发生错误"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "您还要设置其它聊天帐号吗？"
+
+#~ msgid "Enter your account details"
+#~ msgstr "输入您的帐号详情"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "您想创建那种类型的帐号？"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "您想要创建其它的聊天帐号吗、"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "输入新帐号的详细资料"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "使用 Empathy，您可以与附近的朋友聊天，还可以与使用 Google Talk，AIM，"
+#~ "Windows Live 和许多其它聊天软件的朋友和同事聊天。使用麦克风或摄像头，您就"
+#~ "可以开始音频和视频通话。"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "您有没有其它聊天软件的帐号？"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "有，请导入我的帐号信息"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "有，我现在就输入我的帐号信息"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "不，我想要一个新的帐号"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "没有，我只是想看看附近现在谁在线上"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "选择您要导入的帐号："
+
+#~ msgid "No, that's all for now"
+#~ msgstr "没有，就这样吧"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "编辑->帐号"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "暂不启用此特性(_N)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "您无法同连接到您局域网中的用户聊天，因为没有安装 telepathy-salut。如果您想"
+#~ "启用该功能，请安装 telepathy-salut 包，并且在帐号对话框中创建附近的人"
+#~ "(People Nearby)帐号"
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut 未安装"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "消息和 VoIP 帐号助手"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "欢迎使用 Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "导入现有帐号"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "请输入个人信息"
+
+#~ msgid "Protocol:"
+#~ msgstr "协议："
+
+#~ msgid "Show account assistant"
+#~ msgstr "显示帐号助手"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "不支持 Socket 类型"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "我的网络帐号"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s 帐号通过 %s 进行了编辑。"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s 帐号无法在 Empathy 中编辑。"
 
-#: ../src/empathy-main-window.c:545
-msgid "Certificate fingerprint mismatch"
-msgstr "证书指纹不匹配"
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "启动我的网络帐号"
 
-#: ../src/empathy-main-window.c:548
-msgid "Certificate self-signed"
-msgstr "证书是自签属的"
+#~ msgid "Edit %s"
+#~ msgstr "编辑 %s"
 
-#: ../src/empathy-main-window.c:551
-msgid "Certificate error"
-msgstr "证书错误"
+#~ msgid "Ca_ncel"
+#~ msgstr "取消(_N)"
 
-#: ../src/empathy-main-window.c:554
-msgid "Unknown error"
-msgstr "未知的错误"
+#~ msgid "Personal Information"
+#~ msgstr "个人信息"
 
-#: ../src/empathy-main-window.c:1353
-msgid "Show and edit accounts"
-msgstr "显示和编辑账户"
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "编辑(_E)"
 
-#: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "联系人列表"
+#~ msgid "Select contacts to link"
+#~ msgstr "选择要绑定的联系人"
 
-#: ../src/empathy-main-window.ui.h:2
-msgid "Contacts on a _Map"
-msgstr "联系人地图(_M)"
+#~ msgid "New contact preview"
+#~ msgstr "新联系人预览"
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Context"
-msgstr "上下文"
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "在左侧列表中选中的联系人将被绑定在一起。"
 
-#: ../src/empathy-main-window.ui.h:4
-msgid "Join _Favorites"
-msgstr "加入已收藏的聊天室(_F)"
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "绑定联系人(_L)…"
 
-#: ../src/empathy-main-window.ui.h:5
-msgid "Manage Favorites"
-msgstr "管理收藏夹"
+#~ msgid "Link Contacts"
+#~ msgstr "绑定联系人"
 
-#: ../src/empathy-main-window.ui.h:6
-msgid "N_ormal Size"
-msgstr "常规视图(_O)"
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "解除绑定(_U)..."
 
-#: ../src/empathy-main-window.ui.h:7
-msgid "Normal Size With _Avatars"
-msgstr "扩展视图(_A)"
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "完全分离已显示的绑定的联系人成为单独的联系人"
 
-#: ../src/empathy-main-window.ui.h:8
-#, fuzzy
-msgid "P_references"
-msgstr "首选项"
+#~ msgid "_Link"
+#~ msgstr "绑定(_L)"
 
-#: ../src/empathy-main-window.ui.h:9
-msgid "Sort by _Name"
-msgstr "按姓名排序(_N)"
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "解除已绑定的联系人 %s？"
 
-#: ../src/empathy-main-window.ui.h:10
-msgid "Sort by _Status"
-msgstr "按状态排序(_S)"
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "您确定您要接触这些已绑定的联系人？这将会完全拆分已绑定的联系人为单独的联系"
+#~ "人。"
 
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Accounts"
-msgstr "账户(_A)"
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "解除绑定(_U)"
 
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Compact Size"
-msgstr "紧凑视图(_C)"
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr "您将要创建一个新帐号，所做的修改将作废。您确定要继续吗？"
 
-#: ../src/empathy-main-window.ui.h:16
-msgid "_Debug"
-msgstr "调试(_D)"
+#~ msgid "_Personal Information"
+#~ msgstr "个人信息(_P)"
 
-#: ../src/empathy-main-window.ui.h:18
-msgid "_File Transfers"
-msgstr "文件传输(_F)"
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在单独窗口中打开新聊天(_O)"
 
-#: ../src/empathy-main-window.ui.h:20
-msgid "_Join..."
-msgstr "加入(_J)..."
+#~ msgid "Call volume"
+#~ msgstr "来电音量"
 
-#: ../src/empathy-main-window.ui.h:21 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "新建对话(_N)..."
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "来电音量，以百分比计。"
 
-#: ../src/empathy-main-window.ui.h:22
-msgid "_Offline Contacts"
-msgstr "离线联系人(_O)"
+#~ msgid "Input level:"
+#~ msgstr "输入级别："
 
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Personal Information"
-msgstr "个人信息(_P)"
+#~ msgid "Input volume:"
+#~ msgstr "输入音量："
 
-#: ../src/empathy-main-window.ui.h:25
-msgid "_Room"
-msgstr "聊天室(_R)"
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy 已经迁移至 telepathy-butterfly 日志"
 
-#: ../src/empathy-new-chatroom-dialog.c:328
-msgid "Chat Room"
-msgstr "聊天室"
+#~ msgid "Whether Empathy has migrated butterfly logs."
+#~ msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
 
-#: ../src/empathy-new-chatroom-dialog.c:344
-msgid "Members"
-msgstr "成员"
+#~ msgid "Ungrouped"
+#~ msgstr "未分组"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
-#, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
-msgid ""
-"<b>%s</b>\n"
-"Invite required: %s\n"
-"Password required: %s\n"
-"Members: %s"
-msgstr ""
-"<b>%s</b>\n"
-"需要邀请：%s\n"
-"需要邀请：%s\n"
-"成员：%s"
+#~ msgid "Favorite People"
+#~ msgstr "收藏夹"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
-msgid "No"
-msgstr "否"
+#~ msgid "Select a contact"
+#~ msgstr "选择一个联系"
 
-#: ../src/empathy-new-chatroom-dialog.c:524
-msgid "Could not start room listing"
-msgstr "无法开始聊天室列表"
+#~ msgid "Contact ID:"
+#~ msgstr "联系人 ID："
 
-#: ../src/empathy-new-chatroom-dialog.c:534
-msgid "Could not stop room listing"
-msgstr "无法停止聊天室列表"
+#~ msgid "C_hat"
+#~ msgstr "聊天(_H)"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "无法载入聊天室列表"
+#~ msgid "Send _Video"
+#~ msgstr "发送视频(_V)"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
-msgid ""
-"Enter the room name to join here or click on one or more rooms in the list."
-msgstr "输入聊天室名以加入或在列表中点击一个或多个聊天室。"
+#~ msgid "C_all"
+#~ msgstr "通话(_A)"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:4
-msgid ""
-"Enter the server which hosts the room, or leave it empty if the room is on "
-"the current account's server"
-msgstr "输入聊天室所在的服务器，或为空表示聊天室在当前账户的服务器上。"
+#~ msgid "Set your presence and current status"
+#~ msgstr "设置您的状态信息和现在的状态"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "加入聊天室"
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "选择的联系人无法接收文件。"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
-msgid "Room List"
-msgstr "聊天室列表"
+#~ msgid "The selected contact is offline."
+#~ msgstr "选择的联系人离线。"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "聊天室(_R)："
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
 
-#: ../src/empathy-preferences.c:148
-msgid "Message received"
-msgstr "收到了消息"
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
 
-#: ../src/empathy-preferences.c:149
-msgid "Message sent"
-msgstr "发出了消息"
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
 
-#: ../src/empathy-preferences.c:150
-msgid "New conversation"
-msgstr "新对话"
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
 
-#: ../src/empathy-preferences.c:151
-msgid "Contact goes online"
-msgstr "离线人上线"
+#~ msgid "Find Next"
+#~ msgstr "向下查找"
 
-#: ../src/empathy-preferences.c:152
-msgid "Contact goes offline"
-msgstr "联系人离线"
+#~ msgid "Find Previous"
+#~ msgstr "向上查找"
 
-#: ../src/empathy-preferences.c:153
-msgid "Account connected"
-msgstr "账户已连接"
+#~ msgid "Show and edit accounts"
+#~ msgstr "显示和编辑帐号"
 
-#: ../src/empathy-preferences.c:154
-msgid "Account disconnected"
-msgstr "账户已断开"
+#, fuzzy
+#~ msgid "Call with %d participants"
+#~ msgstr "与 %s 通话"
 
-#: ../src/empathy-preferences.c:394
-msgid "Language"
-msgstr "语言"
+#~| msgid "Dialpad"
+#~ msgid "_Dialpad"
+#~ msgstr "电话键盘"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "外观"
+#~ msgid "All"
+#~ msgstr "全部"
 
-#: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "启动时自动登录(_C) "
+#~ msgid "Date"
+#~ msgstr "日期"
 
-#: ../src/empathy-preferences.ui.h:3
-msgid "Behavior"
-msgstr "行为"
+#~ msgid "Conversations"
+#~ msgstr "对话"
 
-#: ../src/empathy-preferences.ui.h:4
-msgid "Chat Th_eme:"
-msgstr "聊天主题(_E)："
+#~ msgid "Previous Conversations"
+#~ msgstr "以前的对话"
 
-#: ../src/empathy-preferences.ui.h:5
-msgid "Disable notifications when _away or busy"
-msgstr "离开或忙碌时禁用提示(_A)"
+#~ msgid "_For:"
+#~ msgstr "包含(_F)："
 
-#: ../src/empathy-preferences.ui.h:6
-msgid "Disable sounds when _away or busy"
-msgstr "离开或忙碌时禁用声音(_A)"
+#~ msgid "Enter Custom Message"
+#~ msgstr "输入自定义状态"
 
-#: ../src/empathy-preferences.ui.h:7
-msgid "Enable notifications when a contact comes online"
-msgstr "当联系人上线时允许提示"
+#~ msgid "Save _New Status Message"
+#~ msgstr "保存新的状态信息(_N)"
 
-#: ../src/empathy-preferences.ui.h:8
-msgid "Enable notifications when a contact goes offline"
-msgstr "当联系人离线时允许提示"
+#~ msgid "Saved Status Messages"
+#~ msgstr "保存状态信息"
 
-#: ../src/empathy-preferences.ui.h:9
-msgid "Enable notifications when the _chat is not focused"
-msgstr "当会话闲置时允许提示"
+#~ msgid "_Enabled"
+#~ msgstr "已启用(_E)"
 
-#: ../src/empathy-preferences.ui.h:10
-msgid "Enable spell checking for languages:"
-msgstr "允许拼写检查的语言："
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "接收到的文件和发送的那个文件哈希值不匹配"
 
-#: ../src/empathy-preferences.ui.h:11
-msgid "General"
-msgstr "常规"
+#~ msgid "Add _New Preset"
+#~ msgstr "添加新自定义状态(_N)"
 
-#: ../src/empathy-preferences.ui.h:12
-msgid "Location"
-msgstr "位置"
+#~ msgid "Saved Presets"
+#~ msgstr "已保存的自定义状态"
 
-#: ../src/empathy-preferences.ui.h:13
-msgid "Location sources:"
-msgstr "定位来源："
+#~ msgid "Subscription requested by %s"
+#~ msgstr "%s 的订阅请求"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Notifications"
-msgstr "提示"
+#~ msgid "%s is now offline."
+#~ msgstr "%s 当前离线。"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Play sound for events"
-msgstr "播放事件声音"
+#~ msgid "%s is now online."
+#~ msgstr "%s 当前在线。"
 
-#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "首选项"
+#~ msgid "Context"
+#~ msgstr "上下文"
 
-#: ../src/empathy-preferences.ui.h:17
-msgid "Privacy"
-msgstr "隐私"
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy 已经询问导入帐号"
 
-#: ../src/empathy-preferences.ui.h:18
-msgid ""
-"Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will be accurate to 1 "
-"decimal place."
-msgstr ""
-"降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
-"将精确到一位小数。 "
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Empathy 是否应该已经询问过要从其它程序中导入帐号。"
 
-#: ../src/empathy-preferences.ui.h:19
-msgid "Show _smileys as images"
-msgstr "显示表情符号为图形(_S)"
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "使用 _Yahoo 日本"
 
-#: ../src/empathy-preferences.ui.h:20
-msgid "Show contact _list in rooms"
-msgstr "在聊天室显示联系人列表(_L)"
+#~ msgid "_Character set:"
+#~ msgstr "字符集(_C)："
 
-#: ../src/empathy-preferences.ui.h:21
-msgid "Sounds"
-msgstr "声音"
+#~ msgid "_E-mail address:"
+#~ msgstr "电子邮件(_E)："
 
-#: ../src/empathy-preferences.ui.h:22
-msgid "Spell Checking"
-msgstr "拼写检查"
+#~ msgid "_Nickname:"
+#~ msgstr "昵称(_N)："
 
-#: ../src/empathy-preferences.ui.h:23
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "语言列表仅反映已安装的字典"
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>位置</b>，"
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "Themes"
-msgstr "主题"
+#~ msgid "Send and receive messages"
+#~ msgstr "发送接收即时消息"
 
-#: ../src/empathy-preferences.ui.h:25
-msgid "_Cellphone"
-msgstr "_手机"
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "MC 4 帐号已经被导入"
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "_Enable bubble notifications"
-msgstr "允许气泡通知(_E)"
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4 帐号已经被导入。"
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "_Enable sound notifications"
-msgstr "启用声音通知(_E)"
+#~ msgid "Port of the proxy for outbound requests."
+#~ msgstr "出站代理端口"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "_GPS"
-msgstr "_GPS"
+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "重新连接到对话失败"
 
-#: ../src/empathy-preferences.ui.h:29
-msgid "_Network (IP, Wifi)"
-msgstr "_网络 (IP, Wifi)"
+#~ msgid "Failed to join chat room"
+#~ msgstr "加入聊天室失败"
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "_Open new chats in separate windows"
-msgstr "在单独窗口中打开新聊天(_O)"
+#~ msgid "Select a destination"
+#~ msgstr "选择目的地"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_Publish location to my contacts"
-msgstr "向我的联系人公布位置信息(_P)"
+#~ msgid "%s account"
+#~ msgstr "%s 帐号"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Reduce location accuracy"
-msgstr "降低位置信息精度(_R)"
+#~ msgid ""
+#~ "Whether or not the Salut account has been created on the first Empathy "
+#~ "run."
+#~ msgstr "是否在 Empathy 第一次运行时创建 Salut 帐号。"
 
-#: ../src/empathy-status-icon.c:180
-msgid "Respond"
-msgstr "响应"
+#~ msgid "Hidden"
+#~ msgstr "隐身"
 
-#: ../src/empathy-status-icon.ui.h:1
-msgid "Status"
-msgstr "状态"
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>位置</b>"
 
-#: ../src/empathy-status-icon.ui.h:3
-msgid "_Quit"
-msgstr "退出(_Q)"
+#~ msgid "Email:"
+#~ msgstr "电子邮件："
 
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "不能启动应用程序为 %s: %s 服务"
+#~ msgid "Custom Message..."
+#~ msgstr "自定义状态..."
 
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr "一个由 %s 服务提供邀请，但是你不需要应用程序处理它"
+#~ msgid "Edit Custom Messages..."
+#~ msgstr "编辑自定义状态..."
 
-#: ../src/empathy-map-view.ui.h:1
-msgid "Contact Map View"
-msgstr "联系地图视图"
+#~ msgid "Custom messages..."
+#~ msgstr "自定义状态..."
 
-#: ../src/empathy-debug-window.c:1042
-msgid "Save"
-msgstr "保存"
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "错误信息是：<span style=\"italic\">%s</span>"
 
-#: ../src/empathy-debug-window.c:1164
-msgid "Debug Window"
-msgstr "调试窗口"
+#~ msgid "Add new"
+#~ msgstr "添加"
 
-#: ../src/empathy-debug-window.c:1243
-msgid "Pause"
-msgstr "暂停"
+#~ msgid "Cr_eate"
+#~ msgstr "创建(_E)"
 
-#: ../src/empathy-debug-window.c:1255
-msgid "Level "
-msgstr "级别 "
+#~ msgid "_Add..."
+#~ msgstr "添加(_A)..."
 
-#: ../src/empathy-debug-window.c:1275
-msgid "Debug"
-msgstr "调试"
+#~ msgid "_Import..."
+#~ msgstr "导入(_I)..."
 
-#: ../src/empathy-debug-window.c:1281
-msgid "Info"
-msgstr "信息"
+#~ msgid "_Reuse an existing account"
+#~ msgstr "启用现有帐号(_R)"
 
-#: ../src/empathy-debug-window.c:1287 ../src/empathy-debug-window.c:1336
-msgid "Message"
-msgstr "消息"
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s 正发送邀请给您"
 
-#: ../src/empathy-debug-window.c:1293
-msgid "Warning"
-msgstr "警告"
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "将启动一个外部应用程序来处理它."
 
-#: ../src/empathy-debug-window.c:1299
-msgid "Critical"
-msgstr "危急"
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr "您没有必需的外部应用程序来处理它."
 
-#: ../src/empathy-debug-window.c:1305
-msgid "Error"
-msgstr "错误"
+#~ msgid "No error specified"
+#~ msgstr "没有说明错误"
 
-#: ../src/empathy-debug-window.c:1324
-msgid "Time"
-msgstr "时间"
+#~ msgid "Unknown error"
+#~ msgstr "未知的错误"
 
-#: ../src/empathy-debug-window.c:1327
-msgid "Domain"
-msgstr "域"
+#~ msgid "_Join..."
+#~ msgstr "加入(_J)..."
 
-#: ../src/empathy-debug-window.c:1329
-msgid "Category"
-msgstr "类别"
+#~ msgid "_New Conversation..."
+#~ msgstr "新建对话(_N)..."
 
-#: ../src/empathy-debug-window.c:1331
-msgid "Level"
-msgstr "级别"
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "不能启动应用程序为 %s: %s 服务"
 
-#: ../src/empathy-debug-window.c:1363
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr "已选定的连接管理不支持远程调试扩展"
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the needed "
+#~ "application to handle it"
+#~ msgstr "一个由 %s 服务提供邀请，但是您不需要应用程序处理它"
 
 #~ msgid "Can't set an empty display name"
 #~ msgstr "无法设置为空显示名称"
@@ -2985,15 +5086,9 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "The contact's avatar token. Empty means contact has no avatar."
 #~ msgstr "联系人的头像标志。空表示联系人无头像。"
 
-#~ msgid "Megaphone"
-#~ msgstr "话筒"
-
 #~ msgid "Talk!"
 #~ msgstr "说吧！"
 
-#~ msgid "_About"
-#~ msgstr "关于(_A)"
-
 #~ msgid "_Information"
 #~ msgstr "信息(_I)"
 
@@ -3016,7 +5111,7 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ "You are about to remove your %s account!\n"
 #~ "Are you sure you want to proceed?"
 #~ msgstr ""
-#~ "您将要删除您的 %s è´¦æ\88·ï¼\81\n"
+#~ "您将要删除您的 %s å¸\90å\8f·ï¼\81\n"
 #~ "您确定要继续吗？"
 
 #~ msgid ""
@@ -3028,14 +5123,11 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgstr ""
 #~ "如果您决定继续，任何相关的对话和聊天室都 不会 被删除。\n"
 #~ "\n"
-#~ "如果将来您重新添加此è´¦æ\88·ï¼\8cå®\83们å°\86ä»\8dç\84¶å­\98å\9c¨ã\80\82"
+#~ "如果将来您重新添加此å¸\90å\8f·ï¼\8cå®\83们å°\86ä»\8dç\84¶å­\98å\9c¨ã\80\82"
 
 #~ msgid "Conversations (%d)"
 #~ msgstr "对话 (%d)"
 
-#~ msgid "_Contact"
-#~ msgstr "联系人(_C)"
-
 #~ msgid "Allow _GPS usage"
 #~ msgstr "允许使用 GPS 信息(_G)"
 
@@ -3055,16 +5147,13 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgstr "gtk-remove"
 
 #~ msgid "Add Account"
-#~ msgstr "添加帐æ\88·"
+#~ msgstr "添加帐å\8f·"
 
 #~ msgid "Gmail"
 #~ msgstr "Gmail"
 
 #~ msgid "Import Accounts..."
-#~ msgstr "导入账户..."
-
-#~ msgid "Settings"
-#~ msgstr "设置"
+#~ msgstr "导入帐号..."
 
 #~ msgid "Type:"
 #~ msgstr "类型："
@@ -3072,9 +5161,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "gtk-leave-fullscreen"
 #~ msgstr "gtk-leave-fullscreen"
 
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Empathy 即时通讯程序"
-
 #~ msgid "- Empathy Instant Messenger"
 #~ msgstr "- Empathy 即时通讯程序"
 
@@ -3090,9 +5176,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "<b>Servers</b>"
 #~ msgstr "<b>服务器</b>"
 
-#~ msgid "Create a new IRC network"
-#~ msgstr "创建新的 IRC 网络"
-
 #~ msgid "Edit the selected IRC network"
 #~ msgstr "编辑选中的 IRC 网络"
 
@@ -3105,9 +5188,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "_Check Word Spelling..."
 #~ msgstr "拼写检查(_C)..."
 
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>话题：</b>"
-
 #~ msgid "Group Chat"
 #~ msgstr "群聊"
 
@@ -3121,9 +5201,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "Sorry, I don't want you in my contact list anymore."
 #~ msgstr "对不起，我不想让您以后出现在我的联系人列表中了。"
 
-#~ msgid "<b>Client Information</b>"
-#~ msgstr "<b>客户端信息</b>"
-
 #~ msgid "<b>Contact Details</b>"
 #~ msgstr "<b>联系人详情</b>"
 
@@ -3133,24 +5210,12 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>群组</b>"
 
-#~ msgid "Contact information"
-#~ msgstr "联系人信息"
-
-#~ msgid "Custom message"
-#~ msgstr "自定义消息"
-
 #~ msgid "Message:"
 #~ msgstr "消息："
 
-#~ msgid "Save message"
-#~ msgstr "保存消息"
-
 #~ msgid "Status:"
 #~ msgstr "状态："
 
-#~ msgid "Word"
-#~ msgstr "单词"
-
 #~ msgid "Suggestions for the word"
 #~ msgstr "单词的拼写建议"
 
@@ -3161,7 +5226,7 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgstr "单词的拼写建议："
 
 #~ msgid "<b>New Account</b>"
-#~ msgstr "<b>新建è´¦æ\88·</b>"
+#~ msgstr "<b>新建å¸\90å\8f·</b>"
 
 #~ msgid "<b>No protocol installed</b>"
 #~ msgstr "<b>未安装协议</b>"
@@ -3172,12 +5237,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "Invitation _message:"
 #~ msgstr "邀请消息(_M)："
 
-#~ msgid "Invite"
-#~ msgstr "邀请"
-
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "您被邀请加入一个聊天会议。"
-
 #~ msgid "Edit Favorite Room"
 #~ msgstr "编辑聊天室收藏"
 
@@ -3216,15 +5275,9 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "unknown size"
 #~ msgstr "未知大小"
 
-#~ msgid "%s would like to send you a file"
-#~ msgstr "%s 想要给您发送一个文件"
-
 #~ msgid "Do you want to accept the file \"%s\" (%s)?"
 #~ msgstr "您想要接收文件“%s”(%s)吗？"
 
-#~ msgid "_Accept"
-#~ msgstr "接受(_A)"
-
 #~ msgid "File transfers"
 #~ msgstr "文件传送"
 
@@ -3273,9 +5326,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "Show _avatars"
 #~ msgstr "显示头像(_A)"
 
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "紧凑显示联系人列表(_M)"
-
 #~ msgid "Sort by _name"
 #~ msgstr "按名称排序(_N)"