Fix broken nl translation

[empathy.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d78765b93941469900fff3bc77f330d81f1462ff..6e971833a83bf58e6e6b01100a0379f99720d60a 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,25 +15,29 @@
 # 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.
+# Wylmer Wang <wantinghard@gmail.com>, 2010-2013.
 # 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.
+# Cheng Lu <chenglu1990@gmail.com>, 2012.
+# Tong Hui <tonghuix@gmail.com>, 2013.
 #
 msgid ""
 msgstr ""
 "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-02 10:35+0000\n"
-"PO-Revision-Date: 2012-02-26 11:57+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2013-12-28 01:59+0000\n"
+"PO-Revision-Date: 2013-12-28 17:31+0800\n"
+"Last-Translator: Tong Hui <tonghuix@gmail.com>\n"
+"Language-Team: Chinese (Simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.7\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy"
@@ -51,325 +55,320 @@ msgstr "Empathy 即时通讯程序"
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2450
-msgid "Messaging and VoIP Accounts"
-msgstr "消息和 VoIP 帐号"
+#: ../data/empathy.desktop.in.in.h:5
+msgid "chat;talk;im;message;irc;voip;gtalk;facebook;jabber;"
+msgstr ""
+"chat;talk;im;message;irc;voip;gtalk;facebook;jabber;聊天;消息;即时通讯;通话;"
+"视频;"
+
+#: ../data/empathy.appdata.xml.in.h:1
+msgid ""
+"Empathy is the official instant messaging application of the GNOME desktop "
+"environment.  Empathy can connect to AIM, MSN, Jabber (including Facebook "
+"and Google Talk), IRC, and many other messaging networks. You can chat with "
+"text, make audio and video calls, or even transfer files, depending on what "
+"your contact’s chat application allows."
+msgstr ""
+"Empathy 是 GNOME 桌面环境的官方即时消息程序。Empathy 可以连接 AIM，MSN，"
+"Jabber (包括 Facebook 和 Google Talk)，IRC 以及许多其他的消息网络。您能使用文"
+"字聊天，拨打音频和视频电话，甚至传送文件(取决于您联系人的聊天程序是否允许)。"
 
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "管理消息和 VoIP 帐号"
+#: ../data/empathy.appdata.xml.in.h:2
+msgid ""
+"Empathy provides integrated messaging for the GNOME desktop, so you’ll never "
+"miss a message.  You can respond to your contacts without even having to "
+"open Empathy!"
+msgstr ""
+"Empathy 为 GNOME 桌面提供了消息集成，因此您一条消息也绝不错过。您甚至无需打"
+"开 Empathy 就可以回复联系人！"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.h:1
 msgid "Connection managers should be used"
 msgstr "应该使用连接管理器"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.h:2
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是否使用连接管理器自动断开连接或重新连接。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.h:3
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 启动时是否自动连接"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.h:4
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是否在启动时自动登入您的帐号。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.h:5
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy 空闲时是否自动离开"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.h:6
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy 是否应在用户空闲时自动进入离开模式。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.h:7
 msgid "Empathy default download folder"
 msgstr "Empathy 默认下载文件夹"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.h:8
 msgid "The default folder to save file transfers in."
 msgstr "保存传送文件的默认文件夹。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
+#. translators: Automatic tasks which are run once to port/update account settings. Ideally, this shouldn't be exposed to users at all, we just use a gsettings key here as an optimization to only run it only once.
+#: ../data/org.gnome.Empathy.gschema.xml.h:10
+msgid "Magic number used to check if sanity cleaning tasks should be run"
+msgstr "用于检测是否应该执行智能清理任务的幻数"
+
+#: ../data/org.gnome.Empathy.gschema.xml.h:11
+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/org.gnome.Empathy.gschema.xml.h:12
+#: ../src/empathy-preferences.ui.h:1
 msgid "Show offline contacts"
 msgstr "显示离线联系人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.h:13
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是否显示联系人清单中离线的联系人。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Show avatars"
-msgstr "显示头像"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
-msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "是否在联系人列表和聊天窗口中显示头像。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Show protocols"
-msgstr "显示协议"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "是否在联系人列表和聊天窗口中显示协议。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.h:14
 msgid "Show Balance in contact list"
 msgstr "在联系人列表中显示余额"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.h:15
 msgid "Whether to show account balances in the contact list."
 msgstr "是否在联系人列表和聊天窗口中显示余额。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Compact contact list"
-msgstr "紧凑显示联系人列表"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Whether to show the contact list in compact mode."
-msgstr "是否以紧凑模式显示联系人列表。"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.h:16
 msgid "Hide main window"
 msgstr "隐藏主窗口"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.h:17
 msgid "Hide the main window."
 msgstr "隐藏主窗口。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.h:18
 msgid "Default directory to select an avatar image from"
 msgstr "默认的选取头像图片的目录"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.h:19
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次选取头像图片的目录。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.h:20
 msgid "Open new chats in separate windows"
 msgstr "在单独窗口中打开新聊天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.h:21
 msgid "Always open a separate chat window for new chats."
 msgstr "总是为新聊天打开单独的聊天窗口。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.h:22
 msgid "Display incoming events in the status area"
 msgstr "在状态栏显示呼入事件。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.h:23
 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:27
+#: ../data/org.gnome.Empathy.gschema.xml.h:24
 msgid "The position for the chat window side pane"
 msgstr "聊天窗口边栏的位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.h:25
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "聊天窗口边栏保存的位置(像素)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.h:26
 msgid "Show contact groups"
 msgstr "显示联系人分组"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.h:27
 msgid "Whether to show groups in the contact list."
 msgstr "是否在联系人列表中显示分组。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Contact list sort criterion"
-msgstr "联系人列表排序条件"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-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:33
+#: ../data/org.gnome.Empathy.gschema.xml.h:28
 msgid "Use notification sounds"
 msgstr "使用通知声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.h:29
 msgid "Whether to play a sound to notify of events."
 msgstr "是否需要事件提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.h:30
 msgid "Disable sounds when away"
 msgstr "离开时禁用声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.h:31
 msgid "Whether to play sound notifications when away or busy."
 msgstr "当离开或忙碌时是否使用声音提示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.h:32
 msgid "Play a sound for incoming messages"
 msgstr "收到消息时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.h:33
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是否需要消息到达提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "发出消息时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.h:35
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是否为外出消息使用声音提示。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.h:36
 msgid "Play a sound for new conversations"
 msgstr "新对话时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.h:37
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是否需要新会话提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.h:38
 msgid "Play a sound when a contact logs in"
 msgstr "联系人登录时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.h:39
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是否需要联系人上线提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.h:40
 msgid "Play a sound when a contact logs out"
 msgstr "联系人注销时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.h:41
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是否需要联系人下线提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.h:42
 msgid "Play a sound when we log in"
 msgstr "登录时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.h:43
 msgid "Whether to play a sound when logging into a network."
 msgstr "当联网登录时是否播放提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.h:44
 msgid "Play a sound when we log out"
 msgstr "注销时播放声音"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.h:45
 msgid "Whether to play a sound when logging out of a network."
 msgstr "当网络断开时是否播放提示音。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.h:46
 msgid "Enable popup notifications for new messages"
 msgstr "启用新消息弹出提示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.h:47
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "当收到新消息时是否弹出显示提示框。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.h:48
 msgid "Disable popup notifications when away"
 msgstr "离开时禁用弹出提示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.h:49
 msgid "Whether to show popup notifications when away or busy."
 msgstr "当离开或忙碌时是否弹出显示提示框。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.h:50
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果聊天窗口不是焦点则弹出消息通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.h:51
 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:57
+#: ../data/org.gnome.Empathy.gschema.xml.h:52
 msgid "Pop up notifications when a contact logs in"
 msgstr "当联系人登录时弹出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.h:53
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "当联系人上线时是否显示弹出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.h:54
 msgid "Pop up notifications when a contact logs out"
 msgstr "当联系人注销时弹出通知"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.h:55
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "当联系人离线时是否显示弹出通知。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.h:56
 msgid "Use graphical smileys"
 msgstr "使用表情图标"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.h:57
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "对话时是否将表情符号转换为表情图标。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.h:58
 msgid "Show contact list in rooms"
 msgstr "在聊天室显示联系人列表"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.h:59
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是否在聊天室显示联系人列表。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.h:60
 msgid "Chat window theme"
 msgstr "聊天窗口主题"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.h:61
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用于在聊天窗口中显示会话的主题。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.h:62
 msgid "Chat window theme variant"
 msgstr "聊天窗口主题衍生"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.h:63
 msgid ""
 "The theme variant that is used to display the conversation in chat windows."
 msgstr "用于在聊天窗口中显示会话的主题。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.h:64
 msgid "Path of the Adium theme to use"
 msgstr "Adium 主题的路径"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-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.h:65
+msgid ""
+"Path of the Adium theme to use if the theme used for chat is Adium. "
+"Deprecated."
+msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径。已弃用。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.h:66
 msgid "Enable WebKit Developer Tools"
 msgstr "启用 WebKit 开发工具"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.h:67
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "WebKit 开发工具，例如 Web Inspector 是否应该启用。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.h:68
 msgid "Inform other users when you are typing to them"
 msgstr "告诉他人您正在输入"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.h:69
 msgid ""
 "Whether to send the 'composing' or 'paused' chat states. Does not currently "
 "affect the 'gone' state."
@@ -377,996 +376,429 @@ msgstr ""
 "是否发送“编写中”(composing)或“暂停”(paused)的聊天状态。目前不影响“已离"
 "开”(gone)状态"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.h:70
 msgid "Use theme for chat rooms"
 msgstr "为聊天室使用主题"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.h:71
 msgid "Whether to use the theme for chat rooms."
 msgstr "是否对聊天室使用主题。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.h:72
 msgid "Spell checking languages"
 msgstr "拼写检查器语言"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.h:73
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "用于拼写检查器的语言的列表，以逗号分隔(例如：en, fr, nl)。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.h:74
 msgid "Enable spell checker"
 msgstr "启用拼写检查器"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.h:75
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是否对您想要作拼写检查的单词作拼写检查。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.h:76
 msgid "Nick completed character"
 msgstr "昵称补全字符"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.h:77
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.h:78
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.h:79
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "是否使用联系人的头像作为聊天窗口的图标。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.h:80
 msgid "Last account selected in Join Room dialog"
 msgstr "在加入聊天室对话框中最后选择的帐号"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.h:81
 msgid "D-Bus object path of the last account selected to join a room."
 msgstr "最后选择加入聊天室的帐号的 D-Bus 对象路径。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.h:82
 msgid "Camera device"
 msgstr "相机设备"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.h:83
 msgid "Default camera device to use in video calls, e.g. /dev/video0."
 msgstr "视频呼叫时默认使用的相机设备，例如 /dev/video0。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.h:84
 msgid "Camera position"
 msgstr "相机位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.h:85
 msgid "Position the camera preview should be during a call."
 msgstr "在通话时摄像头预览的位置。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.h:86
 msgid "Echo cancellation support"
 msgstr "回声抑制支持"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../data/org.gnome.Empathy.gschema.xml.h:87
 msgid "Whether to enable Pulseaudio's echo cancellation filter."
 msgstr "是否启用 Pulseaudio 的回声抑制过滤器。"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+#: ../data/org.gnome.Empathy.gschema.xml.h:88
 msgid "Show hint about closing the main window"
 msgstr "关闭主窗口时显示提示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
+#: ../data/org.gnome.Empathy.gschema.xml.h:89
 msgid ""
 "Whether 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:95
+#: ../data/org.gnome.Empathy.gschema.xml.h:90
 msgid "Empathy can publish the user's location"
 msgstr "Empathy 能够发布用户的位置"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+#: ../data/org.gnome.Empathy.gschema.xml.h:91
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "是否允许 Empathy 将用户的位置共享给联系人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy 能够通过网络来估计位置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "是否允许 Empathy 通过网络估计位置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 能够通过手机来估计位置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:100
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "是否允许 Empathy 通过手机网络估计位置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:101
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy 能够通过 GPS 来估计位置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:102
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "是否允许 Empathy 通过 GPS 估计位置"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:103
+#: ../data/org.gnome.Empathy.gschema.xml.h:92
 msgid "Empathy should reduce the location's accuracy"
 msgstr "降低 Emapthy 位置信息的准确度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+#: ../data/org.gnome.Empathy.gschema.xml.h:93
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
 
-#: ../libempathy/empathy-ft-handler.c:736
+#: ../libempathy/empathy-ft-handler.c:734
 msgid "No reason was specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-ft-handler.c:739
+#: ../libempathy/empathy-ft-handler.c:737
 msgid "The change in state was requested"
 msgstr "需要状态改变信息"
 
-#: ../libempathy/empathy-ft-handler.c:742
+#: ../libempathy/empathy-ft-handler.c:740
 msgid "You canceled the file transfer"
 msgstr "您取消了文件传输"
 
-#: ../libempathy/empathy-ft-handler.c:745
+#: ../libempathy/empathy-ft-handler.c:743
 msgid "The other participant canceled the file transfer"
 msgstr "另外的参与者取消了文件的传输"
 
-#: ../libempathy/empathy-ft-handler.c:748
+#: ../libempathy/empathy-ft-handler.c:746
 msgid "Error while trying to transfer the file"
 msgstr "当传输这个文件的时候发生错误"
 
-#: ../libempathy/empathy-ft-handler.c:751
+#: ../libempathy/empathy-ft-handler.c:749
 msgid "The other participant is unable to transfer the file"
 msgstr "另外的参与者无法传输这个文件"
 
-#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-ft-handler.c:752 ../libempathy/empathy-utils.c:260
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../libempathy/empathy-ft-handler.c:917
+#: ../libempathy/empathy-ft-handler.c:915
 msgid "File transfer completed, but the file was corrupted"
 msgstr "文件传输完成，但该文件已损坏"
 
-#: ../libempathy/empathy-ft-handler.c:1203
+#: ../libempathy/empathy-ft-handler.c:1201
 msgid "File transfer not supported by remote contact"
 msgstr "文件传输不支持远程连接"
 
-#: ../libempathy/empathy-ft-handler.c:1259
+#: ../libempathy/empathy-ft-handler.c:1257
 msgid "The selected file is not a regular file"
 msgstr "所选文件是非正常的文件"
 
-#: ../libempathy/empathy-ft-handler.c:1268
+#: ../libempathy/empathy-ft-handler.c:1266
 msgid "The selected file is empty"
 msgstr "所选文件是空的"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
+#: ../libempathy/empathy-message.c:385 ../src/empathy-call-observer.c:108
 #, c-format
 msgid "Missed call from %s"
 msgstr "未接来电：%s"
 
 #. Translators: this is an outgoing call, e.g. 'Called Alice'
-#: ../libempathy/empathy-message.c:419
+#: ../libempathy/empathy-message.c:389
 #, c-format
 msgid "Called %s"
 msgstr "与 %s 通话"
 
-#: ../libempathy/empathy-message.c:422
+#: ../libempathy/empathy-message.c:392
 #, c-format
 msgid "Call from %s"
 msgstr "来电：%s"
 
-#: ../libempathy/empathy-utils.c:233
+#: ../libempathy/empathy-utils.c:180
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:182
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-utils.c:185
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:187
 msgid "Invisible"
 msgstr "隐身"
 
-#: ../libempathy/empathy-utils.c:242
+#: ../libempathy/empathy-utils.c:189
 msgid "Offline"
 msgstr "离线"
 
 #. translators: presence type is unknown
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:192
 msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:285
+#: ../libempathy/empathy-utils.c:232
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
+#: ../libempathy/empathy-utils.c:234 ../libempathy/empathy-utils.c:290
 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
+#: ../libempathy/empathy-utils.c:236 ../libempathy/empathy-utils.c:270
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-new-message-dialog.c:70
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
+#: ../libempathy/empathy-utils.c:238 ../libempathy/empathy-utils.c:272
 msgid "Authentication failed"
 msgstr "验证失败"
 
-#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
+#: ../libempathy/empathy-utils.c:240 ../libempathy/empathy-utils.c:274
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:242
 msgid "Name in use"
 msgstr "用户名已被占用"
 
-#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
+#: ../libempathy/empathy-utils.c:244 ../libempathy/empathy-utils.c:276
 msgid "Certificate not provided"
 msgstr "未提供证书"
 
-#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
+#: ../libempathy/empathy-utils.c:246 ../libempathy/empathy-utils.c:278
 msgid "Certificate untrusted"
 msgstr "证书不被信任"
 
-#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
+#: ../libempathy/empathy-utils.c:248 ../libempathy/empathy-utils.c:280
 msgid "Certificate expired"
 msgstr "证书已过期"
 
-#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
+#: ../libempathy/empathy-utils.c:250 ../libempathy/empathy-utils.c:282
 msgid "Certificate not activated"
 msgstr "证书尚未激活"
 
-#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
+#: ../libempathy/empathy-utils.c:252 ../libempathy/empathy-utils.c:284
 msgid "Certificate hostname mismatch"
 msgstr "证书主机名不匹配"
 
-#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
+#: ../libempathy/empathy-utils.c:254 ../libempathy/empathy-utils.c:286
 msgid "Certificate fingerprint mismatch"
 msgstr "证书指纹不匹配"
 
-#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
+#: ../libempathy/empathy-utils.c:256 ../libempathy/empathy-utils.c:288
 msgid "Certificate self-signed"
 msgstr "证书是自签属的"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:258
 msgid "Certificate error"
 msgstr "证书错误"
 
-#: ../libempathy/empathy-utils.c:345
+#: ../libempathy/empathy-utils.c:292
 msgid "Encryption is not available"
 msgstr "加密不可用"
 
-#: ../libempathy/empathy-utils.c:347
+#: ../libempathy/empathy-utils.c:294
 msgid "Certificate is invalid"
 msgstr "证书无效"
 
-#: ../libempathy/empathy-utils.c:349
+#: ../libempathy/empathy-utils.c:296
 msgid "Connection has been refused"
 msgstr "连接被拒绝"
 
-#: ../libempathy/empathy-utils.c:351
+#: ../libempathy/empathy-utils.c:298
 msgid "Connection can't be established"
 msgstr "无法建立连接"
 
-#: ../libempathy/empathy-utils.c:353
+#: ../libempathy/empathy-utils.c:300
 msgid "Connection has been lost"
 msgstr "连接已丢失"
 
-#: ../libempathy/empathy-utils.c:355
+#: ../libempathy/empathy-utils.c:302
 msgid "This account is already connected to the server"
 msgstr "该帐号已连接到服务器"
 
-#: ../libempathy/empathy-utils.c:357
+#: ../libempathy/empathy-utils.c:304
 msgid ""
 "Connection has been replaced by a new connection using the same resource"
 msgstr "连接已被使用相同资源的新连接取代"
 
-#: ../libempathy/empathy-utils.c:360
+#: ../libempathy/empathy-utils.c:307
 msgid "The account already exists on the server"
 msgstr "服务器上已存在该帐号"
 
-#: ../libempathy/empathy-utils.c:362
+#: ../libempathy/empathy-utils.c:309
 msgid "Server is currently too busy to handle the connection"
 msgstr "服务器太忙，无法处理当前连接"
 
-#: ../libempathy/empathy-utils.c:364
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate has been revoked"
 msgstr "证书已被吊销"
 
 # lainme：证书使用不安全的加密算法或是弱加密的
 # xslidian：证书使用的加密算法不安全或者易被破解
-#: ../libempathy/empathy-utils.c:366
+#: ../libempathy/empathy-utils.c:313
 msgid ""
 "Certificate uses an insecure cipher algorithm or is cryptographically weak"
 msgstr "证书使用不安全的加密算法或者是弱加密的"
 
-#: ../libempathy/empathy-utils.c:369
+#: ../libempathy/empathy-utils.c:316
 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
+#: ../libempathy/empathy-utils.c:320
 msgid "Your software is too old"
 msgstr "你的软件版本太旧了"
 
-#: ../libempathy/empathy-utils.c:375
+#: ../libempathy/empathy-utils.c:322
 msgid "Internal error"
 msgstr "内部错误"
 
-#: ../libempathy/empathy-utils.c:534
-msgid "People Nearby"
-msgstr "附近的人"
-
-#: ../libempathy/empathy-utils.c:539
-msgid "Yahoo! Japan"
-msgstr "Yahoo! 日本"
-
-#: ../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:90
-#, c-format
-msgid "%d second ago"
-msgid_plural "%d seconds ago"
-msgstr[0] "%d 秒钟前"
-
-#: ../libempathy/empathy-time.c:96
-#, c-format
-msgid "%d minute ago"
-msgid_plural "%d minutes ago"
-msgstr[0] "%d 分钟前"
-
-#: ../libempathy/empathy-time.c:102
-#, c-format
-msgid "%d hour ago"
-msgid_plural "%d hours ago"
-msgstr[0] "%d 小时前"
-
-#: ../libempathy/empathy-time.c:108
-#, c-format
-msgid "%d day ago"
-msgid_plural "%d days ago"
-msgstr[0] "%d 天前"
-
-#: ../libempathy/empathy-time.c:114
-#, c-format
-msgid "%d week ago"
-msgid_plural "%d weeks ago"
-msgstr[0] "%d 星期前"
-
-#: ../libempathy/empathy-time.c:120
-#, c-format
-msgid "%d month ago"
-msgid_plural "%d months ago"
-msgstr[0] "%d 月前"
-
-#: ../libempathy/empathy-time.c:142
-msgid "in the future"
-msgstr "将来"
-
-#: ../libempathy-gtk/empathy-account-chooser.c:692
+#: ../libempathy-gtk/empathy-account-chooser.c:683
 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:507
-msgid "Server"
-msgstr "服务器"
-
-#: ../libempathy-gtk/empathy-account-widget.c:685
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "端口"
+#: ../libempathy-gtk/empathy-avatar-image.c:320
+msgid "Click to enlarge"
+msgstr "单击以放大"
 
-#: ../libempathy-gtk/empathy-account-widget.c:765
-#: ../libempathy-gtk/empathy-account-widget.c:817
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:128
 #, c-format
-msgid "%s:"
-msgstr "%s："
-
-#: ../libempathy-gtk/empathy-account-widget.c:1398
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
-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 "登录(_O)"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1812
-msgid "This account already exists on the server"
-msgstr "服务器上已存在该帐号"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1816
-msgid "Create a new account on the server"
-msgstr "在服务器上创建新的帐号"
+msgid "Authentication failed for account <b>%s</b>"
+msgstr "帐号 <b>%s</b> 验证失败"
 
-#. To translators: The first parameter is the login id and the
-#. * 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:2241
-#, c-format
-msgid "%1$s on %2$s"
-msgstr "%2$s 中的 %1$s"
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:140
+#: ../libempathy-gtk/empathy-chat.c:3846
+msgid "Retry"
+msgstr "重试"
 
-#. To translators: The parameter is the protocol name. The resulting
-#. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2267
+#: ../libempathy-gtk/empathy-base-password-dialog.c:225
+#: ../libempathy-gtk/empathy-password-dialog.c:134
 #, c-format
-msgid "%s Account"
-msgstr "%s 帐号"
-
-#: ../libempathy-gtk/empathy-account-widget.c:2271
-msgid "New account"
-msgstr "新建帐号"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#: ../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
-msgid "Screen _Name:"
-msgstr "用户名(_N)："
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>例如：</b> 我的屏幕名称"
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"输入您的帐号密码\n"
+"<b>%s</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:12
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../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
+#: ../libempathy-gtk/empathy-base-password-dialog.c:262
 msgid "Remember password"
 msgstr "记住密码"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../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
-#: ../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-irc.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
-#: ../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
-msgid "What is your AIM screen name?"
-msgstr "您的 AIM 屏幕名称是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
-msgid "What is your AIM password?"
-msgstr "您的 AIM 密码是什么？"
-
-#: ../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: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:9
-msgid "What is your GroupWise password?"
-msgstr "您的 GroupWise 密码是什么？"
-
-#: ../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:10
-msgid "What is your ICQ password?"
-msgstr "您的 ICQ 密码是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:206
-#: ../libempathy-gtk/empathy-account-widget-sip.c:239
-msgid "Auto"
-msgstr "自动"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:209
-msgid "UDP"
-msgstr "UDP"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:212
-msgid "TCP"
-msgstr "TCP"
-
-#: ../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: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
-msgid "Servers"
-msgstr "服务器"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
-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:6
-msgid "Nickname:"
-msgstr "昵称："
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
-msgid "Password:"
-msgstr "密码："
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Quit message:"
-msgstr "退出消息："
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
-msgid "Real name:"
-msgstr "真名："
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
-msgid "Which IRC network?"
-msgstr "哪个 IRC 网络?"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:13
-msgid "What is your IRC nickname?"
-msgstr "您的 IRC 昵称是什么?"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "What is your Facebook username?"
-msgstr "您的 Facebook 用户名是什么？"
-
-#. 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:6
-msgid "What is your Facebook password?"
-msgstr "您的 Facebook 密码是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "What is your Google ID?"
-msgstr "您的 Google ID 是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-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 password?"
-msgstr "您的 Google 密码是什么？"
-
-#: ../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 "I_gnore SSL certificate errors"
-msgstr "忽略 SSL 证书错误(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
-msgid "Priori_ty:"
-msgstr "优先级(_T):"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
-msgid "Reso_urce:"
-msgstr "资源(_U)："
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
-msgid "Encr_yption required (TLS/SSL)"
-msgstr "需要加密(TLS/SSL)(_Y)"
-
-#: ../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-local-xmpp.ui.h:1
-msgid "Nic_kname:"
-msgstr "昵称(_K):"
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-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 "_Published Name:"
-msgstr "公开的名字(_P)："
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Jabber ID:"
-msgstr "_Jabber ID："
-
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "E-_mail address:"
-msgstr "电子邮件地址(_M):"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "_Username:"
-msgstr "用户名(_U)："
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "<b>Example:</b> user@my.sip.server"
-msgstr "<b>例如：</b>user@my.sip.server"
-
-#: ../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 "NAT Traversal Options"
-msgstr "NAT 选项"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Proxy Options"
-msgstr "代理选项"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Miscellaneous Options"
-msgstr "杂项"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "STUN Server:"
-msgstr "STUN 服务器："
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Discover the STUN server automatically"
-msgstr "自动发现 STUN 服务器"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "Discover Binding"
-msgstr "发现绑定"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:114
-msgid "Server:"
-msgstr "服务器："
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive 选项"
-
-#: ../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:5
-msgid "I_gnore conference and chat room invitations"
-msgstr "忽略会议和聊天室邀请(_G)"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Room List locale:"
-msgstr "聊天室列表 locale(_R)："
-
-#: ../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: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:939
-msgid "Select Your Avatar Image"
-msgstr "选择您的头像图片"
-
-#: ../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:1017
-msgid "Images"
-msgstr "图像"
-
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
-msgid "All Files"
-msgstr "所有文件"
-
-#: ../libempathy-gtk/empathy-avatar-image.c:322
-msgid "Click to enlarge"
-msgstr "单击以放大"
-
-#: ../libempathy-gtk/empathy-call-utils.c:42
-#: ../libempathy-gtk/empathy-call-utils.c:60
+#: ../libempathy-gtk/empathy-call-utils.c:37
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "There was an error starting the call"
 msgstr "发起呼叫时出错"
 
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:44
 msgid "The specified contact doesn't support calls"
 msgstr "选择的联系人不支持呼叫"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:46
 msgid "The specified contact is offline"
 msgstr "选择的联系人离线"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:48
 msgid "The specified contact is not valid"
 msgstr "选择的联系人无效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:50
 msgid "Emergency calls are not supported on this protocol"
 msgstr "不支持在此会话上进行紧急呼叫"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:52
 msgid "You don't have enough credit in order to place this call"
 msgstr "您信用卡余额不足以支付此次通话"
 
-#: ../libempathy-gtk/empathy-chat.c:728
+#: ../libempathy-gtk/empathy-chat.c:733
 msgid "Failed to open private chat"
 msgstr "建立私人对话失败"
 
-#: ../libempathy-gtk/empathy-chat.c:786
+#: ../libempathy-gtk/empathy-chat.c:791
 msgid "Topic not supported on this conversation"
 msgstr "不支持在此会话上设置主题"
 
-#: ../libempathy-gtk/empathy-chat.c:792
+#: ../libempathy-gtk/empathy-chat.c:797
 msgid "You are not allowed to change the topic"
 msgstr "您不能更改主题"
 
-#: ../libempathy-gtk/empathy-chat.c:991
-#, c-format
-msgid "“%s” is not a valid contact ID"
-msgstr "%s 是无效的联系人 ID"
+#: ../libempathy-gtk/empathy-chat.c:973
+msgid "Invalid contact ID"
+msgstr "无效的联系人 ID"
 
-#: ../libempathy-gtk/empathy-chat.c:1086
+#: ../libempathy-gtk/empathy-chat.c:1060
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear：清空当前会话的所有消息"
 
-#: ../libempathy-gtk/empathy-chat.c:1089
+#: ../libempathy-gtk/empathy-chat.c:1063
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主题>：设定当前对话的主题"
 
-#: ../libempathy-gtk/empathy-chat.c:1092
+#: ../libempathy-gtk/empathy-chat.c:1066
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <聊天室名>：加入一个新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1095
+#: ../libempathy-gtk/empathy-chat.c:1069
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <聊天室名>：加入一个新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1099
+#: ../libempathy-gtk/empathy-chat.c:1073
 msgid ""
 "/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
 "current one"
 msgstr "/用户[<聊天室ID>] [<原因>]：当前默认离开聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1103
+#: ../libempathy-gtk/empathy-chat.c:1077
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <昵称> [<消息>]：打开一个私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1106
+#: ../libempathy-gtk/empathy-chat.c:1080
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <昵称> <消息>：打开一个私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:1109
+#: ../libempathy-gtk/empathy-chat.c:1083
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <昵称>：在当前服务器上改变您的昵称"
 
-#: ../libempathy-gtk/empathy-chat.c:1112
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <动作消息>：向当前对话中发送一个动作消息"
 
-#: ../libempathy-gtk/empathy-chat.c:1115
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid ""
 "/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 "
@@ -1375,137 +807,137 @@ msgstr ""
 "/say <消息>：发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如：“/"
 "say /join 是用来加入一个新的聊天室”"
 
-#: ../libempathy-gtk/empathy-chat.c:1120
+#: ../libempathy-gtk/empathy-chat.c:1094
 msgid "/whois <contact ID>: display information about a contact"
 msgstr "/whois <联系人 ID>：显示一个联系人的信息"
 
-#: ../libempathy-gtk/empathy-chat.c:1123
+#: ../libempathy-gtk/empathy-chat.c:1097
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
 "/help [<命令>]：显示所有支持的命令。如果 <命令> 是有定义的，则显示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1116
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1161
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1313
+#: ../libempathy-gtk/empathy-chat.c:1287
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知命令，请使用 /help 查阅可用命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1564
+#: ../libempathy-gtk/empathy-chat.c:1542
 msgid "insufficient balance to send message"
 msgstr "余额不足，无法发送消息"
 
-#: ../libempathy-gtk/empathy-chat.c:1568 ../libempathy-gtk/empathy-chat.c:1582
-#: ../libempathy-gtk/empathy-chat.c:1645
+#: ../libempathy-gtk/empathy-chat.c:1546 ../libempathy-gtk/empathy-chat.c:1560
+#: ../libempathy-gtk/empathy-chat.c:1623
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "发送消息“%s”出错：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1570 ../libempathy-gtk/empathy-chat.c:1587
-#: ../libempathy-gtk/empathy-chat.c:1649
+#: ../libempathy-gtk/empathy-chat.c:1548 ../libempathy-gtk/empathy-chat.c:1565
+#: ../libempathy-gtk/empathy-chat.c:1627
 #, 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:1576
+#: ../libempathy-gtk/empathy-chat.c:1554
 #, c-format
 msgid "insufficient balance to send message. <a href='%s'>Top up</a>."
 msgstr "余额不足，无法发送消息。 <a href='%s'>充值</a>。"
 
-#: ../libempathy-gtk/empathy-chat.c:1616
+#: ../libempathy-gtk/empathy-chat.c:1594
 msgid "not capable"
 msgstr "做不到"
 
-#: ../libempathy-gtk/empathy-chat.c:1623
+#: ../libempathy-gtk/empathy-chat.c:1601
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1626
+#: ../libempathy-gtk/empathy-chat.c:1604
 msgid "invalid contact"
 msgstr "无效联系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1607
 msgid "permission denied"
 msgstr "权限不足"
 
-#: ../libempathy-gtk/empathy-chat.c:1632
+#: ../libempathy-gtk/empathy-chat.c:1610
 msgid "too long message"
 msgstr "消息太长"
 
-#: ../libempathy-gtk/empathy-chat.c:1635
+#: ../libempathy-gtk/empathy-chat.c:1613
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:1639
+#: ../libempathy-gtk/empathy-chat.c:1617
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
+#: ../libempathy-gtk/empathy-chat.c:1684 ../src/empathy-chat-window.c:973
 msgid "Topic:"
 msgstr "话题："
 
-#: ../libempathy-gtk/empathy-chat.c:1721
+#: ../libempathy-gtk/empathy-chat.c:1699
 #, c-format
 msgid "Topic set to: %s"
 msgstr "话题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1723
+#: ../libempathy-gtk/empathy-chat.c:1701
 #, 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:1728
+#: ../libempathy-gtk/empathy-chat.c:1706
 msgid "No topic defined"
 msgstr "未设置话题"
 
-#: ../libempathy-gtk/empathy-chat.c:2244
+#: ../libempathy-gtk/empathy-chat.c:2224
 msgid "(No Suggestions)"
 msgstr "(没有建议)"
 
 #. translators: %s is the selected word
-#: ../libempathy-gtk/empathy-chat.c:2312
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, 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:2349
+#: ../libempathy-gtk/empathy-chat.c:2329
 #, c-format
 msgid "Add '%s' to %s Dictionary"
 msgstr "添加“%s”到 %s 字典"
 
-#: ../libempathy-gtk/empathy-chat.c:2419
+#: ../libempathy-gtk/empathy-chat.c:2399
 msgid "Insert Smiley"
 msgstr "插入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:2437
-#: ../libempathy-gtk/empathy-ui-utils.c:1867
+#: ../libempathy-gtk/empathy-chat.c:2417
+#: ../libempathy-gtk/empathy-ui-utils.c:809
 msgid "_Send"
 msgstr "发送(_S)"
 
 #. Spelling suggestions
-#: ../libempathy-gtk/empathy-chat.c:2494
+#: ../libempathy-gtk/empathy-chat.c:2474
 msgid "_Spelling Suggestions"
 msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:2583
+#: ../libempathy-gtk/empathy-chat.c:2585
 msgid "Failed to retrieve recent logs"
 msgstr "获取最近日志失败"
 
-#: ../libempathy-gtk/empathy-chat.c:2722
+#: ../libempathy-gtk/empathy-chat.c:2828
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已断开连接"
@@ -1513,12 +945,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:2729
+#: ../libempathy-gtk/empathy-chat.c:2835
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:2732
+#: ../libempathy-gtk/empathy-chat.c:2838
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1526,17 +958,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:2740
+#: ../libempathy-gtk/empathy-chat.c:2846
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s 禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:2743
+#: ../libempathy-gtk/empathy-chat.c:2849
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:2747
+#: ../libempathy-gtk/empathy-chat.c:2853
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离开了聊天室"
@@ -1546,17 +978,17 @@ msgstr "%s 离开了聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2756
+#: ../libempathy-gtk/empathy-chat.c:2862
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2781
+#: ../libempathy-gtk/empathy-chat.c:2887
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 加入了聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2806
+#: ../libempathy-gtk/empathy-chat.c:2912
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s"
@@ -1564,76 +996,71 @@ 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:2993
-#: ../src/empathy-streamed-media-window.c:1886
-#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
-#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
+#: ../libempathy-gtk/empathy-chat.c:3099 ../src/empathy-call-window.c:1525
+#: ../src/empathy-call-window.c:1575 ../src/empathy-call-window.c:2654
+#: ../src/empathy-call-window.c:2953 ../src/empathy-event-manager.c:1170
 msgid "Disconnected"
 msgstr "已断开连接"
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3657
+#: ../libempathy-gtk/empathy-chat.c:3786
 msgid "Would you like to store this password?"
 msgstr "是否保存密码?"
 
-#: ../libempathy-gtk/empathy-chat.c:3663
+#: ../libempathy-gtk/empathy-chat.c:3792
 msgid "Remember"
 msgstr "记录"
 
-#: ../libempathy-gtk/empathy-chat.c:3673
+#: ../libempathy-gtk/empathy-chat.c:3802
 msgid "Not now"
 msgstr "不是现在"
 
-#: ../libempathy-gtk/empathy-chat.c:3717
-#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
-msgid "Retry"
-msgstr "重试"
-
-#: ../libempathy-gtk/empathy-chat.c:3721
+#: ../libempathy-gtk/empathy-chat.c:3850
 msgid "Wrong password; please try again:"
 msgstr "密码错误，请重试："
 
 #. Add message
-#: ../libempathy-gtk/empathy-chat.c:3851
+#: ../libempathy-gtk/empathy-chat.c:3974
 msgid "This room is protected by a password:"
 msgstr "这个房间是由一个密码保护的："
 
-#: ../libempathy-gtk/empathy-chat.c:3878
+#: ../libempathy-gtk/empathy-chat.c:4001
+#: ../src/empathy-new-chatroom-dialog.c:787
 msgid "Join"
 msgstr "加入"
 
-#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
+#: ../libempathy-gtk/empathy-chat.c:4193 ../src/empathy-event-manager.c:1191
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:4125
+#: ../libempathy-gtk/empathy-chat.c:4248
 msgid "Conversation"
 msgstr "对话"
 
 #. Translators: this string is a something like
 #. * "Escher Cat (SMS)"
-#: ../libempathy-gtk/empathy-chat.c:4130
+#: ../libempathy-gtk/empathy-chat.c:4253
 #, c-format
 msgid "%s (SMS)"
 msgstr "%s (短信)"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:263
 msgid "Unknown or invalid identifier"
-msgstr "未知或无效的识别符"
+msgstr "未知或无效的标识符"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:265
 msgid "Contact blocking temporarily unavailable"
 msgstr "联系人屏蔽暂时不可用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:267
 msgid "Contact blocking unavailable"
 msgstr "联系人屏蔽不可用"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:269
 msgid "Permission Denied"
 msgstr "权限不足"
 
-#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:273
 msgid "Could not block contact"
 msgstr "无法屏蔽联系人"
 
@@ -1643,11 +1070,10 @@ 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
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:559
+#: ../libempathy-gtk/empathy-individual-widget.c:1540
 #: ../src/empathy-chatrooms-window.ui.h:2
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
 msgid "Account:"
 msgstr "帐号："
 
@@ -1662,706 +1088,610 @@ msgstr "已屏蔽的联系人"
 msgid "Remove"
 msgstr "删除"
 
-#. Copy Link Address menu item
-#: ../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: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:417
-msgid "%A %B %d %Y"
-msgstr "%A %B %d %Y"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:326
-#: ../libempathy-gtk/empathy-individual-dialogs.c:118
-msgid "New Contact"
-msgstr "新建联系人"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:395
-#: ../libempathy-gtk/empathy-individual-dialogs.c:197
-#, c-format
-msgid "Block %s?"
-msgstr "屏蔽 %s？"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:400
-#: ../libempathy-gtk/empathy-individual-dialogs.c:252
-#, c-format
-msgid "Are you sure you want to block '%s' from contacting you again?"
-msgstr "确定要屏蔽 %s 以阻止他再次联系您吗？"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
-#: ../libempathy-gtk/empathy-individual-dialogs.c:274
-msgid "_Block"
-msgstr "屏蔽(_B)"
-
-#: ../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-dialogs.ui.h:1
-msgid "Subscription Request"
-msgstr "订阅请求"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "_Block User"
-msgstr "屏蔽用户(_B)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
-msgid "Decide _Later"
-msgstr "以后再决定(_L)"
-
 #. Title
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:552
 msgid "Search contacts"
 msgstr "搜索联系人"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:582
 msgid "Search: "
 msgstr "搜索"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:640
 msgid "_Add Contact"
 msgstr "添加联系人(_A)"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:659
 msgid "No contacts found"
 msgstr "未找到联系人"
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:660
+msgid "Contact search is not supported on this account"
+msgstr "此账户不支持搜索联系人"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:666
 msgid "Your message introducing yourself:"
 msgstr "您的自我介绍信息："
 
-#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:674
 msgid "Please let me see when you're online. Thanks!"
 msgstr "你在线时请让我知道，谢谢！"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:569
-#: ../libempathy-gtk/empathy-individual-widget.c:304
-msgid "Channels:"
-msgstr "频道："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:749
-#: ../libempathy-gtk/empathy-individual-widget.c:455
-msgid "Country ISO Code:"
-msgstr "包括 ISO 编码："
+#: ../libempathy-gtk/empathy-contact-widget.c:158
+#: ../libempathy-gtk/empathy-individual-widget.c:955
+msgid "Save Avatar"
+msgstr "保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:751
-#: ../libempathy-gtk/empathy-individual-widget.c:457
-msgid "Country:"
-msgstr "国家："
+#: ../libempathy-gtk/empathy-contact-widget.c:214
+#: ../libempathy-gtk/empathy-individual-widget.c:1013
+msgid "Unable to save avatar"
+msgstr "无法保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:753
-#: ../libempathy-gtk/empathy-individual-widget.c:459
-msgid "State:"
-msgstr "省："
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../src/empathy-import-widget.c:319
+msgid "Account"
+msgstr "帐号"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:755
-#: ../libempathy-gtk/empathy-individual-widget.c:461
-msgid "City:"
-msgstr "城市："
+#. Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+msgid "Identifier"
+msgstr "标识符"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:757
-#: ../libempathy-gtk/empathy-individual-widget.c:463
-msgid "Area:"
-msgstr "地区："
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
+msgid "Alias"
+msgstr "别名"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:465
-msgid "Postal Code:"
-msgstr "邮政编码："
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Contact Details"
+msgstr "联系人详情"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:761
-#: ../libempathy-gtk/empathy-individual-widget.c:467
-msgid "Street:"
-msgstr "街道："
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:4
+msgid "Information requested…"
+msgstr "已发送信息请求..."
 
-#: ../libempathy-gtk/empathy-contact-widget.c:763
-#: ../libempathy-gtk/empathy-individual-widget.c:469
-msgid "Building:"
-msgstr "建筑物："
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>位置</b>于(日期）\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:765
-#: ../libempathy-gtk/empathy-individual-widget.c:471
-msgid "Floor:"
-msgstr "楼层："
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Client Information"
+msgstr "客户端信息"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:767
-#: ../libempathy-gtk/empathy-individual-widget.c:473
-msgid "Room:"
-msgstr "房间："
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "OS"
+msgstr "操作系统"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:769
-#: ../libempathy-gtk/empathy-individual-widget.c:475
-msgid "Text:"
-msgstr "文本："
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+msgid "Version"
+msgstr "版本"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:771
-#: ../libempathy-gtk/empathy-individual-widget.c:477
-msgid "Description:"
-msgstr "描述："
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Client"
+msgstr "客户端"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:773
-#: ../libempathy-gtk/empathy-individual-widget.c:479
-msgid "URI:"
-msgstr "URI："
+#: ../libempathy-gtk/empathy-groups-widget.c:318
+msgid "Groups"
+msgstr "组"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:775
-#: ../libempathy-gtk/empathy-individual-widget.c:481
-msgid "Accuracy Level:"
-msgstr "准确程度："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:777
-#: ../libempathy-gtk/empathy-individual-widget.c:483
-msgid "Error:"
-msgstr "错误："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:779
-#: ../libempathy-gtk/empathy-individual-widget.c:485
-msgid "Vertical Error (meters):"
-msgstr "垂直误差(米)："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:781
-#: ../libempathy-gtk/empathy-individual-widget.c:487
-msgid "Horizontal Error (meters):"
-msgstr "水平误差(米)："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:783
-#: ../libempathy-gtk/empathy-individual-widget.c:489
-msgid "Speed:"
-msgstr "速度："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:785
-#: ../libempathy-gtk/empathy-individual-widget.c:491
-msgid "Bearing:"
-msgstr "方位朝向："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:787
-#: ../libempathy-gtk/empathy-individual-widget.c:493
-msgid "Climb Speed:"
-msgstr "爬升速度："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:789
-#: ../libempathy-gtk/empathy-individual-widget.c:495
-msgid "Last Updated on:"
-msgstr "最近更新于："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:791
-#: ../libempathy-gtk/empathy-individual-widget.c:497
-msgid "Longitude:"
-msgstr "经度："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:793
-#: ../libempathy-gtk/empathy-individual-widget.c:499
-msgid "Latitude:"
-msgstr "纬度："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:795
-#: ../libempathy-gtk/empathy-individual-widget.c:501
-msgid "Altitude:"
-msgstr "海拔："
-
-#: ../libempathy-gtk/empathy-contact-widget.c:848
-#: ../libempathy-gtk/empathy-contact-widget.c:863
-#: ../libempathy-gtk/empathy-individual-widget.c:593
-#: ../libempathy-gtk/empathy-individual-widget.c:608
-#: ../src/empathy-preferences.ui.h:35
-msgid "Location"
-msgstr "位置"
-
-#. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:865
-#: ../libempathy-gtk/empathy-individual-widget.c:610
-#, c-format
-msgid "%s, %s"
-msgstr "%s, %s"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:917
-#: ../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.c:999
-#: ../libempathy-gtk/empathy-individual-widget.c:900
-msgid "Save Avatar"
-msgstr "保存头像"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1055
-#: ../libempathy-gtk/empathy-individual-widget.c:958
-msgid "Unable to save avatar"
-msgstr "无法保存头像"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1446
-msgid "Personal Details"
-msgstr "个人详情"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1449
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
-msgid "Contact Details"
-msgstr "联系人详情"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:104
-msgid "Full name"
-msgstr "全名"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:105
-msgid "Phone number"
-msgstr "电话号码"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:106
-msgid "E-mail address"
-msgstr "电子邮件地址"
-
-#: ../libempathy-gtk/empathy-contactinfo-utils.c:107
-msgid "Website"
-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
-#. 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 "标识符："
-
-#. 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: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:9
-msgid "OS:"
-msgstr "操作系统："
-
-#: ../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
+#: ../libempathy-gtk/empathy-groups-widget.c:330
 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-groups-widget.c:362
+#: ../libempathy-gtk/empathy-groups-widget.c:349
 msgid "_Add Group"
 msgstr "添加群组(_A)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
+#: ../libempathy-gtk/empathy-groups-widget.c:384
 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
+#: ../libempathy-gtk/empathy-groups-widget.c:394
 msgid "Group"
 msgstr "群组"
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+#: ../libempathy-gtk/empathy-individual-dialogs.c:109
+msgid "New Contact"
+msgstr "新建联系人"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:184
+#: ../libempathy-gtk/empathy-subscription-dialog.c:121
+#, c-format
+msgid "Block %s?"
+msgstr "屏蔽 %s？"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:239
+#: ../libempathy-gtk/empathy-subscription-dialog.c:125
+#, c-format
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "确定要屏蔽 %s 以阻止他再次联系您吗？"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:244
 msgid "The following identity will be blocked:"
 msgid_plural "The following identities will be blocked:"
 msgstr[0] "以下用户将被屏蔽："
 
-#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+#: ../libempathy-gtk/empathy-individual-dialogs.c:251
 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
+#: ../libempathy-gtk/empathy-individual-dialogs.c:261
+#: ../libempathy-gtk/empathy-subscription-dialog.c:130
+#: ../libempathy-gtk/empathy-subscription-dialog.c:275
+msgid "_Block"
+msgstr "屏蔽(_B)"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:270
+#: ../libempathy-gtk/empathy-subscription-dialog.c:150
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "举报联系人滥用"
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:237
 msgid "Edit Contact Information"
 msgstr "编辑联系人信息"
 
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:283
+msgid "Linked Contacts"
+msgstr "已绑定的联系人"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:322
+msgid "gnome-contacts not installed"
+msgstr "gnome-contacts 未安装"
+
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:325
+msgid "Please install gnome-contacts to access contacts details."
+msgstr "请安装 gnome-contacts 来访问联系人详情。"
+
 #. 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:172
+#: ../libempathy-gtk/empathy-individual-menu.c:181
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:344
+#: ../libempathy-gtk/empathy-individual-menu.c:363
 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:348
+#: ../libempathy-gtk/empathy-individual-menu.c:367
 #: ../libempathy-gtk/empathy-log-window.ui.h:6
-#: ../src/empathy-streamed-media-window.c:1288
-#: ../src/empathy-call-window.ui.h:18
+#: ../src/empathy-call-window.ui.h:20
 msgid "Call"
 msgstr "通话"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:413
+#: ../libempathy-gtk/empathy-individual-menu.c:433
 msgid "Mobile"
 msgstr "手机"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:415
+#: ../libempathy-gtk/empathy-individual-menu.c:435
 msgid "Work"
 msgstr "办公"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:417
+#: ../libempathy-gtk/empathy-individual-menu.c:437
 msgid "HOME"
 msgstr "家庭"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:658
+#. translators: first argument is a phone number like +32123456 and
+#. * the second one is something like 'home' or 'work'.
+#: ../libempathy-gtk/empathy-individual-menu.c:478
+#, c-format
+msgid "Call %s (%s)"
+msgstr "呼叫 %s (%s)"
+
+#. translators: argument is a phone number like +32123456
+#: ../libempathy-gtk/empathy-individual-menu.c:483
+#, c-format
+msgid "Call %s"
+msgstr "呼叫 %s "
+
+#: ../libempathy-gtk/empathy-individual-menu.c:695
 msgid "_Block Contact"
 msgstr "屏蔽联系人"
 
+#: ../libempathy-gtk/empathy-individual-menu.c:750
+#, c-format
+msgid "Remove from _Group '%s'"
+msgstr "从组 '%s' 移除(_G)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:771
+msgid "Delete and _Block"
+msgstr "删除并屏蔽(_B)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:859
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "您真的想要删除联系人“%s”吗？"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:868
+#, 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-menu.c:879
+msgid "Removing contact"
+msgstr "删除联系人"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:955
+#: ../libempathy-gtk/empathy-individual-view.c:2442
+msgid "_Remove"
+msgstr "删除(_R)"
+
 #. add chat button
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
-#: ../libempathy-gtk/empathy-new-message-dialog.c:319
-#: ../src/empathy-roster-window-menubar.ui.h:1
+#: ../libempathy-gtk/empathy-individual-menu.c:1374
+#: ../libempathy-gtk/empathy-new-message-dialog.c:308
 msgid "_Chat"
 msgstr "聊天(_C)"
 
 #. add SMS button
-#: ../libempathy-gtk/empathy-individual-menu.c:1052
-#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+#: ../libempathy-gtk/empathy-individual-menu.c:1413
+#: ../libempathy-gtk/empathy-new-message-dialog.c:302
 msgid "_SMS"
 msgstr "短信(_S)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1085
+#: ../libempathy-gtk/empathy-individual-menu.c:1450
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "音频呼叫(_A)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1118
+#: ../libempathy-gtk/empathy-individual-menu.c:1487
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "视频呼叫(_V)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1159
-#: ../src/empathy-roster-window-menubar.ui.h:4
+#: ../libempathy-gtk/empathy-individual-menu.c:1529
+#: ../src/empathy-roster-window-menubar.ui.h:11
 msgid "_Previous Conversations"
 msgstr "最近会话(_P)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1188
+#: ../libempathy-gtk/empathy-individual-menu.c:1561
 msgid "Send File"
 msgstr "发送文件"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1218
+#: ../libempathy-gtk/empathy-individual-menu.c:1595
 msgid "Share My Desktop"
 msgstr "共享我的桌面"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1244
-#: ../libempathy-gtk/empathy-individual-widget.c:1357
+#: ../libempathy-gtk/empathy-individual-menu.c:1622
+#: ../libempathy-gtk/empathy-individual-widget.c:1423
 msgid "Favorite"
 msgstr "收藏"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1263
-msgid "gnome-contacts not installed"
-msgstr "gnome-contacts 未安装"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1266
-msgid "Please install gnome-contacts to access contacts details."
-msgstr "请安装 gnome-contacts 来访问联系人详情。"
-
-#: ../libempathy-gtk/empathy-individual-menu.c:1380
+#: ../libempathy-gtk/empathy-individual-menu.c:1651
 msgid "Infor_mation"
 msgstr "信息(_M)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1429
+#: ../libempathy-gtk/empathy-individual-menu.c:1700
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1546
-#: ../src/empathy-chat-window.c:1192
+#. send invitation
+#: ../libempathy-gtk/empathy-individual-menu.c:1816
+#: ../src/empathy-chat-window.c:1274
 msgid "Inviting you to this room"
 msgstr "邀请到此聊天室"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1592
+#: ../libempathy-gtk/empathy-individual-menu.c:1862
 msgid "_Invite to Chat Room"
 msgstr "邀请到聊天室(_I)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:1788
-#: ../src/empathy-roster-window-menubar.ui.h:5
+#: ../libempathy-gtk/empathy-individual-menu.c:2058
+#: ../src/empathy-roster-window.ui.h:4
 msgid "_Add Contact…"
 msgstr "添加联系人(_A)..."
 
-#: ../libempathy-gtk/empathy-individual-view.c:2306
-msgid "Delete and _Block"
-msgstr "删除并屏蔽(_B)"
-
-#: ../libempathy-gtk/empathy-individual-view.c:2341
+#: ../libempathy-gtk/empathy-individual-view.c:2362
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "您真的要删除群组“%s”吗？"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2344
+#: ../libempathy-gtk/empathy-individual-view.c:2365
 msgid "Removing group"
 msgstr "删除群组"
 
-#. Remove
-#: ../libempathy-gtk/empathy-individual-view.c:2399
-#: ../libempathy-gtk/empathy-individual-view.c:2603
-msgid "_Remove"
-msgstr "删除(_R)"
+#: ../libempathy-gtk/empathy-individual-view.c:2433
+msgid "Re_name"
+msgstr "重命名"
 
-#: ../libempathy-gtk/empathy-individual-view.c:2476
-#, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "您真的想要删除联系人“%s”吗？"
+#: ../libempathy-gtk/empathy-individual-widget.c:361
+msgid "Channels:"
+msgstr "频道："
 
-#: ../libempathy-gtk/empathy-individual-view.c:2485
-#, 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-widget.c:512
+msgid "Country ISO Code:"
+msgstr "包括 ISO 编码："
 
-#: ../libempathy-gtk/empathy-individual-view.c:2497
-msgid "Removing contact"
-msgstr "å\88 é\99¤è\81\94系人"
+#: ../libempathy-gtk/empathy-individual-widget.c:514
+msgid "Country:"
+msgstr "å\9b½å®¶ï¼\9a"
 
-#: ../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.c:516
+msgid "State:"
+msgstr "省："
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
-msgid "<b>Location</b> at (date)"
-msgstr "<b>位置</b> 于 (日期)"
+#: ../libempathy-gtk/empathy-individual-widget.c:518
+msgid "City:"
+msgstr "城市："
 
-#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
-msgid "Online from a phone or mobile device"
-msgstr "通过电话或移动设备上网"
+#: ../libempathy-gtk/empathy-individual-widget.c:520
+msgid "Area:"
+msgstr "地区："
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
-msgid "New Network"
-msgstr "新建网络"
+#: ../libempathy-gtk/empathy-individual-widget.c:522
+msgid "Postal Code:"
+msgstr "邮政编码："
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
-msgid "Choose an IRC network"
-msgstr "选择一个 IRC 网络"
+#: ../libempathy-gtk/empathy-individual-widget.c:524
+msgid "Street:"
+msgstr "街道："
 
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
-msgid "Reset _Networks List"
-msgstr "重置_Networks列表"
+#: ../libempathy-gtk/empathy-individual-widget.c:526
+msgid "Building:"
+msgstr "建筑物："
 
-#: ../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-individual-widget.c:528
+msgid "Floor:"
+msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "æ\96°å»ºæ\9c\8då\8a¡å\99¨"
+#: ../libempathy-gtk/empathy-individual-widget.c:530
+msgid "Room:"
+msgstr "æ\88¿é\97´ï¼\9a"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
-msgid "SSL"
-msgstr "SSL"
+#: ../libempathy-gtk/empathy-individual-widget.c:532
+msgid "Text:"
+msgstr "文本："
 
-#: ../libempathy-gtk/empathy-log-window.c:620
-msgid "History"
-msgstr "历史"
+#: ../libempathy-gtk/empathy-individual-widget.c:534
+msgid "Description:"
+msgstr "描述："
 
-#: ../libempathy-gtk/empathy-log-window.c:675
-msgid "Show"
-msgstr "显示"
+#: ../libempathy-gtk/empathy-individual-widget.c:536
+msgid "URI:"
+msgstr "URI："
 
-#: ../libempathy-gtk/empathy-log-window.c:697
-msgid "Search"
-msgstr "搜索"
+#: ../libempathy-gtk/empathy-individual-widget.c:538
+msgid "Accuracy Level:"
+msgstr "准确程度："
 
-#: ../libempathy-gtk/empathy-log-window.c:1148
-#, c-format
-msgid "Chat in %s"
-msgstr "在 %s 聊天"
+#: ../libempathy-gtk/empathy-individual-widget.c:540
+msgid "Error:"
+msgstr "错误："
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
-#, c-format
-msgid "Chat with %s"
-msgstr "与 %s 聊天"
+#: ../libempathy-gtk/empathy-individual-widget.c:542
+msgid "Vertical Error (meters):"
+msgstr "垂直误差(米)："
 
-#: ../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"
+#: ../libempathy-gtk/empathy-individual-widget.c:544
+msgid "Horizontal Error (meters):"
+msgstr "水平误差(米)："
 
-#. 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-individual-widget.c:546
+msgid "Speed:"
+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-individual-widget.c:548
+msgid "Bearing:"
+msgstr "方位朝向："
 
-#: ../libempathy-gtk/empathy-log-window.c:1371
-#, c-format
-msgid "%s second"
+#: ../libempathy-gtk/empathy-individual-widget.c:550
+msgid "Climb Speed:"
+msgstr "爬升速度："
+
+#: ../libempathy-gtk/empathy-individual-widget.c:552
+msgid "Last Updated on:"
+msgstr "最近更新于："
+
+#: ../libempathy-gtk/empathy-individual-widget.c:554
+msgid "Longitude:"
+msgstr "经度："
+
+#: ../libempathy-gtk/empathy-individual-widget.c:556
+msgid "Latitude:"
+msgstr "纬度："
+
+#: ../libempathy-gtk/empathy-individual-widget.c:558
+msgid "Altitude:"
+msgstr "海拔："
+
+#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:665
+#: ../src/empathy-preferences.ui.h:35
+msgid "Location"
+msgstr "位置"
+
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-individual-widget.c:667
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:716
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e,%Y 于 %R UTC 时间"
+
+#. Alias
+#: ../libempathy-gtk/empathy-individual-widget.c:1359
+msgid "Alias:"
+msgstr "别名："
+
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-individual-widget.c:1568
+msgid "Identifier:"
+msgstr "标识符："
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1707
+#, 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-local-xmpp-assistant-widget.c:82
+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:102
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:117
+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>来禁用这一功能。"
+
+#: ../libempathy-gtk/empathy-log-window.c:631
+msgid "History"
+msgstr "历史"
+
+#: ../libempathy-gtk/empathy-log-window.c:686
+msgid "Show"
+msgstr "显示"
+
+#: ../libempathy-gtk/empathy-log-window.c:708
+msgid "Search"
+msgstr "搜索"
+
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
+msgid "Chat in %s"
+msgstr "在 %s 聊天"
+
+#: ../libempathy-gtk/empathy-log-window.c:1154
+#, c-format
+msgid "Chat with %s"
+msgstr "与 %s 聊天"
+
+#: ../libempathy-gtk/empathy-log-window.c:1204
+#: ../libempathy-gtk/empathy-log-window.c:1348
+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:1291
+#, c-format
+msgid "<i>* %s %s</i>"
+msgstr "<i>* %s %s</i>"
+
+#. Translators: this is a message: 'Danielle: hello'
+#. * The string in bold is the sender's name
+#: ../libempathy-gtk/empathy-log-window.c:1297
+#, c-format
+msgid "<b>%s:</b> %s"
+msgstr "<b>%s：</b>%s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1372
+#, c-format
+msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1378
+#: ../libempathy-gtk/empathy-log-window.c:1379
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分"
 
-#: ../libempathy-gtk/empathy-log-window.c:1386
+#: ../libempathy-gtk/empathy-log-window.c:1387
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通话时长：%s，结束于 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1720
+#: ../libempathy-gtk/empathy-log-window.c:1718
 msgid "Today"
 msgstr "今天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1724
+#: ../libempathy-gtk/empathy-log-window.c:1722
 msgid "Yesterday"
 msgstr "昨天"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1739
+#: ../libempathy-gtk/empathy-log-window.c:1737
 msgid "%e %B %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1827
-#: ../libempathy-gtk/empathy-log-window.c:3487
+#: ../libempathy-gtk/empathy-log-window.c:1841
+#: ../libempathy-gtk/empathy-log-window.c:3464
 msgid "Anytime"
 msgstr "随时"
 
-#: ../libempathy-gtk/empathy-log-window.c:1916
-#: ../libempathy-gtk/empathy-log-window.c:2400
+#: ../libempathy-gtk/empathy-log-window.c:1940
+#: ../libempathy-gtk/empathy-log-window.c:2399
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../libempathy-gtk/empathy-log-window.c:2713
+#: ../libempathy-gtk/empathy-log-window.c:2712
 msgid "Who"
 msgstr "谁"
 
-#: ../libempathy-gtk/empathy-log-window.c:2922
+#: ../libempathy-gtk/empathy-log-window.c:2921
 msgid "When"
 msgstr "何时"
 
-#: ../libempathy-gtk/empathy-log-window.c:3038
+#: ../libempathy-gtk/empathy-log-window.c:3039
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3041
 msgid "Text chats"
 msgstr "文本聊天"
 
 #: ../libempathy-gtk/empathy-log-window.c:3042
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "Calls"
 msgstr "通话"
 
-#: ../libempathy-gtk/empathy-log-window.c:3047
+#: ../libempathy-gtk/empathy-log-window.c:3046
 msgid "Incoming calls"
 msgstr "来电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3048
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Outgoing calls"
 msgstr "呼出的语音通话"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Missed calls"
 msgstr "未接来电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3071
+#: ../libempathy-gtk/empathy-log-window.c:3068
 msgid "What"
 msgstr "什么事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3780
+#: ../libempathy-gtk/empathy-log-window.c:3757
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "确定要删除以前的全部对话日志？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3784
+#: ../libempathy-gtk/empathy-log-window.c:3761
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../libempathy-gtk/empathy-log-window.c:3791
+#: ../libempathy-gtk/empathy-log-window.c:3768
 msgid "Delete from:"
 msgstr "从以下位置删除："
 
@@ -2370,27 +1700,25 @@ msgid "_File"
 msgstr "文件(_F)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:2
-#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:12
+#: ../src/empathy-call-window.ui.h:2 ../src/empathy-chat-window.ui.h:11
 msgid "_Edit"
 msgstr "编辑(_E)"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Delete All History..."
-msgstr "清空全部历史..."
+msgid "Delete All History…"
+msgstr "删除全部历史…"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "Profile"
 msgstr "个人信息"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:5
-#: ../src/empathy-chat-window.ui.h:19
+#: ../src/empathy-chat-window.c:1490 ../src/empathy-preferences.ui.h:11
 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 "视频"
 
@@ -2399,92 +1727,89 @@ 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>"
+msgid "<span size=\"x-large\">Loading…</span>"
+msgstr "<span size=\"x-large\">加载中...</span>"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:130
+msgid "What kind of chat account do you have?"
+msgstr "您已经拥有哪个类型的帐号？"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:152
+msgid "Add new account"
+msgstr "添加新帐号"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+#: ../libempathy-gtk/empathy-new-call-dialog.c:189
+#: ../libempathy-gtk/empathy-new-message-dialog.c:279
+msgid "Enter a contact identifier or phone number:"
+msgstr "输入一个联系人标识或电话号码："
+
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:212
+msgid "_Video Call"
+msgstr "视频呼叫(_V)"
+
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:222
+msgid "_Audio Call"
+msgstr "音频呼叫(_A)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:232
+msgid "New Call"
+msgstr "新建通话"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.c:72
 msgid "The contact is offline"
 msgstr "联系人为离线"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+#: ../libempathy-gtk/empathy-new-message-dialog.c:74
 msgid "The specified contact is either invalid or unknown"
 msgstr "指定的联系人无效或信息未知"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+#: ../libempathy-gtk/empathy-new-message-dialog.c:76
 msgid "The contact does not support this kind of conversation"
 msgstr "选择的联系人不支持在该类型会话"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+#: ../libempathy-gtk/empathy-new-message-dialog.c:78
 msgid "The requested functionality is not implemented for this protocol"
 msgstr "所要求的功能与此协议不兼容"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+#: ../libempathy-gtk/empathy-new-message-dialog.c:84
 msgid "Could not start a conversation with the given contact"
 msgstr "无法与选择的联系人发起对话"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+#: ../libempathy-gtk/empathy-new-message-dialog.c:86
 msgid "You are banned from this channel"
 msgstr "您已被此频道屏蔽"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+#: ../libempathy-gtk/empathy-new-message-dialog.c:88
 msgid "This channel is full"
 msgstr "频道已满"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+#: ../libempathy-gtk/empathy-new-message-dialog.c:90
 msgid "You must be invited to join this channel"
 msgstr "您必须被邀请才能加入此频道"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+#: ../libempathy-gtk/empathy-new-message-dialog.c:92
 msgid "Can't proceed while disconnected"
 msgstr "断开时无法进行"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+#: ../libempathy-gtk/empathy-new-message-dialog.c:94
 msgid "Permission denied"
 msgstr "拒绝访问"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+#: ../libempathy-gtk/empathy-new-message-dialog.c:100
 msgid "There was an error starting the conversation"
 msgstr "发起对话时出错"
 
-#: ../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
+#: ../libempathy-gtk/empathy-new-message-dialog.c:322
 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>"
+#: ../libempathy-gtk/empathy-password-dialog.c:132
+msgid "Password Required"
+msgstr "需要密码"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -2492,41 +1817,46 @@ msgstr ""
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:167
-#: ../libempathy-gtk/empathy-presence-chooser.c:203
+#: ../libempathy-gtk/empathy-presence-chooser.c:158
+#: ../libempathy-gtk/empathy-presence-chooser.c:194
 msgid "Custom Message…"
 msgstr "自定义消息..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:220
-#: ../libempathy-gtk/empathy-presence-chooser.c:222
+#: ../libempathy-gtk/empathy-presence-chooser.c:211
+#: ../libempathy-gtk/empathy-presence-chooser.c:213
 msgid "Edit Custom Messages…"
 msgstr "编辑自定义消息"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:345
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
 msgid "Click to remove this status as a favorite"
 msgstr "点击移除常用自定义状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:354
+#: ../libempathy-gtk/empathy-presence-chooser.c:344
 msgid "Click to make this status a favorite"
 msgstr "点击设置常用自定义状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:388
+#. Translators: %s is a status message like 'At the pub' for example
+#: ../libempathy-gtk/empathy-presence-chooser.c:378
+#, c-format
+msgid ""
+"<b>Current message: %s</b>\n"
+"<small><i>Press Enter to set the new message or Esc to cancel.</i></small>"
+msgstr ""
+"<b>当前信息: %s</b>\n"
+"<small><i>按下 Enter 设置新信息或按下 Esc 取消。</i></small>"
+
+#: ../libempathy-gtk/empathy-presence-chooser.c:387
 msgid "Set status"
 msgstr "设置状态"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1135
+#: ../libempathy-gtk/empathy-presence-chooser.c:1095
 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.c:239
+msgid "_Match case"
+msgstr "区分大小写(_M)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
@@ -2548,378 +1878,212 @@ msgstr "区分大小写(_C)"
 msgid "Phrase not found"
 msgstr "未找到短语"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:50
 msgid "Received an instant message"
 msgstr "收到了即时消息"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:52
 msgid "Sent an instant message"
 msgstr "发送即时消息"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:54
 msgid "Incoming chat request"
 msgstr "收到的聊天请求"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:56
 msgid "Contact connected"
 msgstr "联系人已连接"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:58
 msgid "Contact disconnected"
 msgstr "联系人已断开"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:60
 msgid "Connected to server"
 msgstr "已连接到服务器"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:62
 msgid "Disconnected from server"
 msgstr "已从服务器断开连接"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:64
 msgid "Incoming voice call"
 msgstr "呼入的语音通话"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:66
 msgid "Outgoing voice call"
 msgstr "呼出的语音通话"
 
-#: ../libempathy-gtk/empathy-sound-manager.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:68
 msgid "Voice call ended"
 msgstr "语音通话结束"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:295
 msgid "Edit Custom Messages"
 msgstr "编辑自定义消息"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#: ../libempathy-gtk/empathy-subscription-dialog.c:234
+msgid "Subscription Request"
+msgstr "订阅请求"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:240
+#: ../src/empathy-event-manager.c:1108
+#, c-format
+msgid "%s would like permission to see when you are online"
+msgstr "%s 当您在线的时候可见"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:281
+#: ../src/empathy-event-manager.c:723
+msgid "_Decline"
+msgstr "拒绝(_D)"
+
+#: ../libempathy-gtk/empathy-subscription-dialog.c:282
+msgid "_Accept"
+msgstr "接受(_A)"
+
+#: ../libempathy-gtk/empathy-theme-adium.c:1218
 #, c-format
 msgid "Message edited at %s"
 msgstr "消息于 %s 被编辑"
 
-#: ../libempathy-gtk/empathy-theme-adium.c:1757
+#: ../libempathy-gtk/empathy-theme-adium.c:1920
 msgid "Normal"
 msgstr "普通"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
-msgid "Classic"
-msgstr "经典"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:71
-msgid "Simple"
-msgstr "简洁"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:72
-msgid "Clean"
-msgstr "清爽"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:73
-msgid "Blue"
-msgstr "蓝色"
-
-#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#: ../libempathy-gtk/empathy-tls-dialog.c:147
 msgid "The identity provided by the chat server cannot be verified."
 msgstr "聊天服务器所提供的身份无法验证。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#: ../libempathy-gtk/empathy-tls-dialog.c:154
 msgid "The certificate is not signed by a Certification Authority."
 msgstr "证书并非由 CA 签发。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#: ../libempathy-gtk/empathy-tls-dialog.c:158
 msgid "The certificate has expired."
 msgstr "证书已过期。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
 msgid "The certificate hasn't yet been activated."
 msgstr "证书尚未被激活。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
 msgid "The certificate does not have the expected fingerprint."
 msgstr "证书缺少应有的指纹。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
 msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "证书所验证的主机名与服务器名不匹配。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#: ../libempathy-gtk/empathy-tls-dialog.c:171
 msgid "The certificate is self-signed."
 msgstr "证书是自签署的。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
 msgid ""
 "The certificate has been revoked by the issuing Certification Authority."
 msgstr "证书被证书签发机构吊销。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#: ../libempathy-gtk/empathy-tls-dialog.c:178
 msgid "The certificate is cryptographically weak."
 msgstr "证书是弱加密的。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
 msgid "The certificate length exceeds verifiable limits."
 msgstr "证书长度超出可验证限制。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#: ../libempathy-gtk/empathy-tls-dialog.c:185
 msgid "The certificate is malformed."
 msgstr "证书损坏。"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#: ../libempathy-gtk/empathy-tls-dialog.c:203
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "预期主机名: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "证书主机名: %s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:281
+#: ../libempathy-gtk/empathy-tls-dialog.c:278
 msgid "C_ontinue"
 msgstr "继续(_O)"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:287
+#: ../libempathy-gtk/empathy-tls-dialog.c:284
 msgid "Untrusted connection"
 msgstr "不受信任的连接"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:288
+#: ../libempathy-gtk/empathy-tls-dialog.c:285
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "连接不受信任。是否仍要继续?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:298
+#: ../libempathy-gtk/empathy-tls-dialog.c:295
 msgid "Remember this choice for future connections"
 msgstr "为将来的连接记住本次选择"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:304
+#: ../libempathy-gtk/empathy-tls-dialog.c:301
 msgid "Certificate Details"
 msgstr "证书详情"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1741
+#: ../libempathy-gtk/empathy-ui-utils.c:679
 msgid "Unable to open URI"
 msgstr "无法打开 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1859
+#: ../libempathy-gtk/empathy-ui-utils.c:803
 msgid "Select a file"
 msgstr "选择文件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1934
+#: ../libempathy-gtk/empathy-ui-utils.c:877
 msgid "Insufficient free space to save file"
 msgstr "空间不足，无法保存文件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#: ../libempathy-gtk/empathy-ui-utils.c:885
 #, 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:1986
+#: ../libempathy-gtk/empathy-ui-utils.c:931
 #, 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
-#: ../libempathy-gtk/totem-subtitle-encoding.c:177
-msgid "Baltic"
-msgstr "波罗的语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:180
-msgid "Celtic"
-msgstr "凯尔特语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:183
-#: ../libempathy-gtk/totem-subtitle-encoding.c:185
-#: ../libempathy-gtk/totem-subtitle-encoding.c:187
-#: ../libempathy-gtk/totem-subtitle-encoding.c:189
-msgid "Central European"
-msgstr "中欧"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:192
-#: ../libempathy-gtk/totem-subtitle-encoding.c:194
-#: ../libempathy-gtk/totem-subtitle-encoding.c:196
-#: ../libempathy-gtk/totem-subtitle-encoding.c:198
-msgid "Chinese Simplified"
-msgstr "简体中文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:201
-#: ../libempathy-gtk/totem-subtitle-encoding.c:203
-#: ../libempathy-gtk/totem-subtitle-encoding.c:205
-msgid "Chinese Traditional"
-msgstr "繁体中文"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:208
-msgid "Croatian"
-msgstr "克罗地亚语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:211
-#: ../libempathy-gtk/totem-subtitle-encoding.c:213
-#: ../libempathy-gtk/totem-subtitle-encoding.c:215
-#: ../libempathy-gtk/totem-subtitle-encoding.c:217
-#: ../libempathy-gtk/totem-subtitle-encoding.c:219
-#: ../libempathy-gtk/totem-subtitle-encoding.c:221
-msgid "Cyrillic"
-msgstr "斯拉夫语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:224
-msgid "Cyrillic/Russian"
-msgstr "斯拉夫语系/俄语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:227
-#: ../libempathy-gtk/totem-subtitle-encoding.c:229
-msgid "Cyrillic/Ukrainian"
-msgstr "斯拉夫语系/乌克兰语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:232
-msgid "Georgian"
-msgstr "格鲁吉亚语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:235
-#: ../libempathy-gtk/totem-subtitle-encoding.c:237
-#: ../libempathy-gtk/totem-subtitle-encoding.c:239
-msgid "Greek"
-msgstr "希腊语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:242
-msgid "Gujarati"
-msgstr "古吉拉特语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:245
-msgid "Gurmukhi"
-msgstr "旁遮普语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:248
-#: ../libempathy-gtk/totem-subtitle-encoding.c:250
-#: ../libempathy-gtk/totem-subtitle-encoding.c:252
-#: ../libempathy-gtk/totem-subtitle-encoding.c:254
-msgid "Hebrew"
-msgstr "希伯来语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:257
-msgid "Hebrew Visual"
-msgstr "希伯来语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:260
-msgid "Hindi"
-msgstr "北印度语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:263
-msgid "Icelandic"
-msgstr "冰岛语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:266
-#: ../libempathy-gtk/totem-subtitle-encoding.c:268
-#: ../libempathy-gtk/totem-subtitle-encoding.c:270
-msgid "Japanese"
-msgstr "日本语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:273
-#: ../libempathy-gtk/totem-subtitle-encoding.c:275
-#: ../libempathy-gtk/totem-subtitle-encoding.c:277
-#: ../libempathy-gtk/totem-subtitle-encoding.c:279
-msgid "Korean"
-msgstr "韩语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:282
-msgid "Nordic"
-msgstr "北欧语系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:285
-msgid "Persian"
-msgstr "波斯语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:288
-#: ../libempathy-gtk/totem-subtitle-encoding.c:290
-msgid "Romanian"
-msgstr "罗马尼亚语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:293
-msgid "South European"
-msgstr "南欧语系"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:296
-msgid "Thai"
-msgstr "泰国语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:299
-#: ../libempathy-gtk/totem-subtitle-encoding.c:301
-#: ../libempathy-gtk/totem-subtitle-encoding.c:303
-#: ../libempathy-gtk/totem-subtitle-encoding.c:305
-msgid "Turkish"
-msgstr "土耳其语"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:308
-#: ../libempathy-gtk/totem-subtitle-encoding.c:310
-#: ../libempathy-gtk/totem-subtitle-encoding.c:312
-#: ../libempathy-gtk/totem-subtitle-encoding.c:314
-#: ../libempathy-gtk/totem-subtitle-encoding.c:316
-msgid "Unicode"
-msgstr "Unicode"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:319
-#: ../libempathy-gtk/totem-subtitle-encoding.c:321
-#: ../libempathy-gtk/totem-subtitle-encoding.c:323
-#: ../libempathy-gtk/totem-subtitle-encoding.c:325
-#: ../libempathy-gtk/totem-subtitle-encoding.c:327
-msgid "Western"
-msgstr "西方语言"
-
-#: ../libempathy-gtk/totem-subtitle-encoding.c:330
-#: ../libempathy-gtk/totem-subtitle-encoding.c:332
-#: ../libempathy-gtk/totem-subtitle-encoding.c:334
-msgid "Vietnamese"
-msgstr "越南语"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
-msgid "No error message"
-msgstr "无错误信息"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
-msgid "Instant Message (Empathy)"
-msgstr "即时消息(Empathy)"
-
-#: ../src/empathy.c:435
-msgid "Don't connect on startup"
-msgstr "启动时不自动连接"
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:285
+msgid "_Copy Link Address"
+msgstr "复制链接地址(_C)"
 
-#: ../src/empathy.c:439
-msgid "Don't display the contact list or any other dialogs on startup"
-msgstr "启动时不显示联系人列表"
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-webkit-utils.c:292
+msgid "_Open Link"
+msgstr "打开链接(_O)"
 
-#: ../src/empathy.c:454
-msgid "- Empathy IM Client"
-msgstr " - Empathy 即时通讯客户端"
+#. Inspector
+#: ../libempathy-gtk/empathy-webkit-utils.c:306
+msgid "Inspect HTML"
+msgstr "审查 HTML"
 
-#: ../src/empathy.c:641
-msgid "Error contacting the Account Manager"
-msgstr "联系帐号管理器出错"
+#: ../libempathy-gtk/empathy-roster-model.h:27
+msgid "Top Contacts"
+msgstr "常用联系人"
+
+#: ../libempathy-gtk/empathy-roster-model.h:28
+msgid "People Nearby"
+msgstr "附近的人"
 
-#: ../src/empathy.c:643
+#: ../libempathy-gtk/empathy-roster-model.h:29
+msgid "Ungrouped"
+msgstr "未分组"
+
+#. Add a prefix explaining that something goes wrong when trying to
+#. * fetch contact's presence.
+#: ../libempathy-gtk/empathy-roster-contact.c:202
 #, 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"
+msgid "Server cannot find contact: %s"
+msgstr "服务器找不到联系人：%s"
 
-#: ../src/empathy-about-dialog.c:81
+#: ../src/empathy-about-dialog.c:77
 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 "
@@ -2929,7 +2093,7 @@ msgstr ""
 "Empathy 是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证下重新发布"
 "或修改它；许可证可使用第二版或您想选择的更新的版本。"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 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 "
@@ -2939,7 +2103,7 @@ msgstr ""
 "Empathy 发布的目的是希望它对您有用，但是没有任何担保；即使是对商业应用以及其"
 "它特定目的。查阅 GNU 通用公共许可证以获取更多细节。"
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 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 "
@@ -2949,11 +2113,11 @@ msgstr ""
 "给自由软件基金会写信。地址是：51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:109
+#: ../src/empathy-about-dialog.c:105
 msgid "An Instant Messaging client for GNOME"
 msgstr "一个 GNOME 即时消息客户端"
 
-#: ../src/empathy-about-dialog.c:115
+#: ../src/empathy-about-dialog.c:111
 msgid "translator-credits"
 msgstr ""
 "Abel Cheung <maddog@linux.org.hk>, 2003\n"
@@ -2968,6 +2132,8 @@ msgstr ""
 "Aron Xu <happyaron.xu@gmail.com>, 2009, 2010\n"
 "Tao Wang <dancefire@gmail.com>, 2010\n"
 "Mike Manilone <crtmike@gmail.com>, 2012\n"
+"Cheng Lu <chenglu1990@gmail.com>, 2012\n"
+"Tong Hui <tonghuix@gmail.com>, 2013\n"
 "\n"
 "Launchpad Contributions:\n"
 "  =KK= https://launchpad.net/~sevkme\n"
@@ -2978,44 +2144,68 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n"
 "  yuane https://launchpad.net/~yuane"
 
+#: ../src/empathy-accounts.c:172
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "不显示任何对话框；完成所有工作（如导入）然后退出"
+
+#: ../src/empathy-accounts.c:176
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "只有“附近的人”帐号的时候不显示任何对话框"
+
+# lainme：初次选择给定的帐号(比如 gabble/jabber/foo_40example_2eorg0)
+#: ../src/empathy-accounts.c:180
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "首先选择给定帐号(如 gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:182
+msgid "<account-id>"
+msgstr "<帐号 ID>"
+
+#: ../src/empathy-accounts.c:187
+msgid "- Empathy Accounts"
+msgstr "- Empathy 帐号"
+
+#: ../src/empathy-accounts.c:240
+msgid "Empathy Accounts"
+msgstr "Empathy 帐号"
+
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:72
+#: ../src/empathy-accounts-dialog.c:55
 #, c-format
-msgid "There are unsaved modifications to your %s account."
-msgstr "您的 %s 帐号有未保存的修改。"
+msgid "There are unsaved modifications to your %.50s account."
+msgstr "您的 %.50s 帐号有未保存的修改。"
 
 #. 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
+#: ../src/empathy-accounts-dialog.c:59
 msgid "Your new account has not been saved yet."
 msgstr "您的新帐号还没有保存。"
 
-#: ../src/empathy-accounts-dialog.c:370
-#: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1289
+#: ../src/empathy-accounts-dialog.c:387 ../src/empathy-call-window.c:1267
 msgid "Connecting…"
 msgstr "正在连接..."
 
-#: ../src/empathy-accounts-dialog.c:411
+#: ../src/empathy-accounts-dialog.c:428
 #, c-format
 msgid "Offline — %s"
 msgstr "离线 - %s"
 
-#: ../src/empathy-accounts-dialog.c:423
+#: ../src/empathy-accounts-dialog.c:440
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已断开 - %s"
 
-#: ../src/empathy-accounts-dialog.c:434
+#: ../src/empathy-accounts-dialog.c:451
 msgid "Offline — No Network Connection"
 msgstr "离线 - 无可用网络"
 
-#: ../src/empathy-accounts-dialog.c:441
+#: ../src/empathy-accounts-dialog.c:458
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: ../src/empathy-accounts-dialog.c:458
+#: ../src/empathy-accounts-dialog.c:475
 msgid ""
 "This account has been disabled because it relies on an old, unsupported "
 "backend. Please install telepathy-haze and restart your session to migrate "
@@ -3024,64 +2214,62 @@ msgstr ""
 "因为此账户依赖一个旧式、不支持的后端，所以此账户已被禁用。请安装 telepathy-"
 "haze 并重新启动您的会话来迁移您的账户。"
 
-#: ../src/empathy-accounts-dialog.c:468
+#: ../src/empathy-accounts-dialog.c:485
 msgid "Offline — Account Disabled"
 msgstr "离线 - 帐号被禁用"
 
-#: ../src/empathy-accounts-dialog.c:572
+#: ../src/empathy-accounts-dialog.c:591
 msgid "Edit Connection Parameters"
 msgstr "编辑连接参数"
 
-#: ../src/empathy-accounts-dialog.c:735
-msgid "Failed to retrieve your personal information from the server."
-msgstr "从服务器获取您的个人信息失败。"
-
-#: ../src/empathy-accounts-dialog.c:741
-msgid "Go online to edit your personal information."
-msgstr "请上线以编辑您的个人信息。"
+#: ../src/empathy-accounts-dialog.c:718
+msgid "_Edit Connection Parameters…"
+msgstr "编辑连接参数(_E)…"
 
-#: ../src/empathy-accounts-dialog.c:826
-msgid "_Edit Connection Parameters..."
-msgstr "编辑连接参数(_E)..."
-
-#: ../src/empathy-accounts-dialog.c:1322
+#: ../src/empathy-accounts-dialog.c:1248
 #, c-format
-msgid "Do you want to remove %s from your computer?"
-msgstr "您要从电脑中移除 %s 吗？"
+msgid "Do you want to remove %.50s from your computer?"
+msgstr "您要从您电脑中移除 %.50s 吗？"
 
-#: ../src/empathy-accounts-dialog.c:1326
+#: ../src/empathy-accounts-dialog.c:1252
 msgid "This will not remove your account on the server."
 msgstr "这不会删除服务器上的帐号。"
 
-#: ../src/empathy-accounts-dialog.c:1562
+#: ../src/empathy-accounts-dialog.c:1457
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "您将要选择另一个帐号，所做的修改将作废。您确定要继续吗？"
 
-#. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1738
-msgid "_Enable"
-msgstr "启用(_E)"
+#. Menu item: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1648
+msgid "_Enabled"
+msgstr "å·²å\90¯ç\94¨(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1739
-msgid "_Disable"
-msgstr "禁用(_D)"
+#. Menu item: Rename
+#: ../src/empathy-accounts-dialog.c:1671
+msgid "Rename"
+msgstr "重命名"
 
-#: ../src/empathy-accounts-dialog.c:2122
+#: ../src/empathy-accounts-dialog.c:2073
 msgid "_Skip"
 msgstr "跳过(_S)"
 
-#: ../src/empathy-accounts-dialog.c:2126
+#: ../src/empathy-accounts-dialog.c:2077
 msgid "_Connect"
 msgstr "连接(_C)"
 
-#: ../src/empathy-accounts-dialog.c:2303
+#: ../src/empathy-accounts-dialog.c:2256
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "您将要关闭此窗口，所做的修改将作废。您确定要继续吗？"
 
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:2400
+msgid "Messaging and VoIP Accounts"
+msgstr "消息和 VoIP 帐号"
+
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "Add…"
 msgstr "添加..."
@@ -3104,153 +2292,176 @@ msgstr "要添加一个新帐号，您首先需要为您想要使用的每个协
 msgid "No protocol backends installed"
 msgstr "未安装协议后端"
 
-#: ../src/empathy-auth-client.c:286
+#: ../src/empathy-auth-client.c:285
 msgid " - Empathy authentication client"
 msgstr " - Empathy 认证客户端"
 
-#: ../src/empathy-auth-client.c:302
+#: ../src/empathy-auth-client.c:301
 msgid "Empathy authentication client"
 msgstr "Empathy 认证客户端"
 
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
-msgid "- Empathy Audio/Video Client"
-msgstr " - Empathy 语音/视频客户端"
-
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
-msgid "Empathy Audio/Video Client"
-msgstr "Empathy 语音/视频客户端"
+#: ../src/empathy.c:408
+msgid "Don't connect on startup"
+msgstr "启动时不自动连接"
 
-#: ../src/empathy-streamed-media-window.c:433
-msgid "Contrast"
-msgstr "对比度"
+#: ../src/empathy.c:412
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "启动时不显示联系人列表"
+
+#: ../src/empathy.c:441
+msgid "- Empathy IM Client"
+msgstr " - Empathy 即时通讯客户端"
+
+#: ../src/empathy.c:627
+msgid "Error contacting the Account Manager"
+msgstr "联系帐号管理器出错"
+
+#: ../src/empathy.c:629
+#, 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-call.c:116
+msgid "In a call"
+msgstr "正在通话"
 
-#: ../src/empathy-streamed-media-window.c:436
-msgid "Brightness"
-msgstr "亮度"
+#: ../src/empathy-call.c:224
+msgid "- Empathy Audio/Video Client"
+msgstr " - Empathy 语音/视频客户端"
 
-#: ../src/empathy-streamed-media-window.c:439
-msgid "Gamma"
-msgstr "伽马"
+#: ../src/empathy-call.c:248
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy 语音/视频客户端"
 
-#: ../src/empathy-streamed-media-window.c:545
-msgid "Volume"
-msgstr "音量"
+#: ../src/empathy-call-observer.c:111
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s 刚刚尝试呼叫您，但您当时正在与其他人通话。"
 
-#: ../src/empathy-streamed-media-window.c:1097
-msgid "_Sidebar"
-msgstr "侧边栏(_S)"
+#: ../src/empathy-call-window.c:1542 ../src/empathy-event-manager.c:503
+msgid "Incoming call"
+msgstr "来电"
 
-#: ../src/empathy-streamed-media-window.c:1117
-msgid "Audio input"
-msgstr "音频输入"
+#: ../src/empathy-call-window.c:1548 ../src/empathy-event-manager.c:906
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "%s 的视频呼叫"
 
-#: ../src/empathy-streamed-media-window.c:1121
-msgid "Video input"
-msgstr "视频输入"
+#: ../src/empathy-call-window.c:1548 ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:906
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s 的来电"
 
-#: ../src/empathy-streamed-media-window.c:1129
-msgid "Dialpad"
-msgstr "电话键盘"
+#: ../src/empathy-call-window.c:1552
+#: ../src/empathy-notifications-approver.c:191
+msgid "Reject"
+msgstr "拒绝"
 
-#: ../src/empathy-streamed-media-window.c:1140
-msgid "Details"
-msgstr "详细信息"
+#: ../src/empathy-call-window.c:1553
+#: ../src/empathy-notifications-approver.c:196
+#: ../src/empathy-notifications-approver.c:201
+msgid "Answer"
+msgstr "接听"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1889
+#: ../src/empathy-call-window.c:1923
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通话"
 
-#: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2133
+#: ../src/empathy-call-window.c:2175
 msgid "The IP address as seen by the machine"
 msgstr "机器所见的 IP 地址"
 
-#: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2135
+#: ../src/empathy-call-window.c:2177
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet 上服务器所见的 IP 地址"
 
-#: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2137
+#: ../src/empathy-call-window.c:2179
 msgid "The IP address of the peer as seen by the other side"
 msgstr "另一方所见的 IP 地址"
 
-#: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2139
+#: ../src/empathy-call-window.c:2181
 msgid "The IP address of a relay server"
 msgstr "中转服务器 IP 地址"
 
-#: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2141
+#: ../src/empathy-call-window.c:2183
 msgid "The IP address of the multicast group"
 msgstr "多播组的 IP 地址"
 
-#: ../src/empathy-streamed-media-window.c:1835
-#: ../src/empathy-streamed-media-window.c:1838
-#: ../src/empathy-streamed-media-window.c:1841
-#: ../src/empathy-streamed-media-window.c:1844
-msgctxt "codec"
+#: ../src/empathy-call-window.c:2597 ../src/empathy-call-window.c:2598
+#: ../src/empathy-call-window.c:2599 ../src/empathy-call-window.c:2600
+#: ../src/empathy-call-window.ui.h:28
 msgid "Unknown"
 msgstr "未知"
 
-#. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2136
+#: ../src/empathy-call-window.c:2951
+msgid "On hold"
+msgstr "挂起"
+
+#: ../src/empathy-call-window.c:2955
+msgid "Mute"
+msgstr "静音"
+
+#: ../src/empathy-call-window.c:2957
+msgid "Duration"
+msgstr "时长"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2960
 #, c-format
-msgid "Connected — %d:%02dm"
-msgstr "已连接 — %d:%02dm"
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2197
-#: ../src/empathy-call-window.c:2987
+#: ../src/empathy-call-window.c:3056
 msgid "Technical Details"
 msgstr "技术细节"
 
-#: ../src/empathy-streamed-media-window.c:2235
-#: ../src/empathy-call-window.c:3026
+#: ../src/empathy-call-window.c:3095
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
 
-#: ../src/empathy-streamed-media-window.c:2240
-#: ../src/empathy-call-window.c:3031
+#: ../src/empathy-call-window.c:3100
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
 
-#: ../src/empathy-streamed-media-window.c:2246
-#: ../src/empathy-call-window.c:3037
+#: ../src/empathy-call-window.c:3106
 #, 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:2252
-#: ../src/empathy-call-window.c:3043
+#: ../src/empathy-call-window.c:3112
 msgid "There was a failure on the network"
 msgstr "网络出现一个错误"
 
-#: ../src/empathy-streamed-media-window.c:2256
-#: ../src/empathy-call-window.c:3047
+#: ../src/empathy-call-window.c:3116
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3050
+#: ../src/empathy-call-window.c:3119
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
 
-#: ../src/empathy-streamed-media-window.c:2269
-#: ../src/empathy-call-window.c:3062
+#: ../src/empathy-call-window.c:3131
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3260,28 +2471,36 @@ msgstr ""
 "Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>，并附上帮助菜"
 "单里“调试”窗口收集到的日志。"
 
-#: ../src/empathy-streamed-media-window.c:2277
-#: ../src/empathy-call-window.c:3071
+#: ../src/empathy-call-window.c:3140
 msgid "There was a failure in the call engine"
 msgstr "呼叫引擎里出现了一个故障"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3074
+#: ../src/empathy-call-window.c:3143
 msgid "The end of the stream was reached"
 msgstr "已到达流的末尾"
 
-#: ../src/empathy-streamed-media-window.c:2320
-#: ../src/empathy-call-window.c:3114
+#: ../src/empathy-call-window.c:3183
 msgid "Can't establish audio stream"
 msgstr "不能建立音频流"
 
-#: ../src/empathy-streamed-media-window.c:2330
-#: ../src/empathy-call-window.c:3124
+#: ../src/empathy-call-window.c:3193
 msgid "Can't establish video stream"
 msgstr "不能建立视频流"
 
+#: ../src/empathy-call-window.c:3230
+#, c-format
+msgid "Your current balance is %s."
+msgstr "您当前的余额为 %s。"
+
+#: ../src/empathy-call-window.c:3234
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "对不起，您信用卡余额不足以支付此次通话。"
+
+#: ../src/empathy-call-window.c:3236
+msgid "Top Up"
+msgstr "充值"
+
 #: ../src/empathy-call-window.ui.h:1
-#: ../src/empathy-streamed-media-window.ui.h:1
 msgid "_Call"
 msgstr "通话(_C)"
 
@@ -3298,134 +2517,133 @@ msgid "_Settings"
 msgstr "设置(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-#: ../src/empathy-roster-window-menubar.ui.h:17
-#: ../src/empathy-streamed-media-window.ui.h:8
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
-#: ../src/empathy-roster-window-menubar.ui.h:27
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:19
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
-#: ../src/empathy-roster-window-menubar.ui.h:28
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:20
 msgid "_Contents"
 msgstr "内容(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-#: ../src/empathy-roster-window-menubar.ui.h:29
 msgid "_Debug"
 msgstr "调试(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
+msgid "_GStreamer"
+msgstr "_GStreamer"
+
+#: ../src/empathy-call-window.ui.h:11
+msgid "_Telepathy"
+msgstr "_Telepathy"
+
+#: ../src/empathy-call-window.ui.h:12
 msgid "Swap camera"
 msgstr "交换相机"
 
-#: ../src/empathy-call-window.ui.h:11
+#: ../src/empathy-call-window.ui.h:13
 msgid "Minimise me"
 msgstr "最小化我"
 
-#: ../src/empathy-call-window.ui.h:12
+#: ../src/empathy-call-window.ui.h:14
 msgid "Maximise me"
 msgstr "最大化我"
 
-#: ../src/empathy-call-window.ui.h:13
+#: ../src/empathy-call-window.ui.h:15
 msgid "Disable camera"
 msgstr "禁用相机"
 
-#: ../src/empathy-call-window.ui.h:14
-#: ../src/empathy-streamed-media-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:16
 msgid "Hang up"
 msgstr "挂断"
 
-#: ../src/empathy-call-window.ui.h:15
-#: ../src/empathy-streamed-media-window.ui.h:9
+#: ../src/empathy-call-window.ui.h:17
 msgid "Hang up current call"
 msgstr "挂断当前呼叫"
 
-#: ../src/empathy-call-window.ui.h:16
+#: ../src/empathy-call-window.ui.h:18
 msgid "Video call"
 msgstr "视频呼叫"
 
-#: ../src/empathy-call-window.ui.h:17
+#: ../src/empathy-call-window.ui.h:19
 msgid "Start a video call"
 msgstr "开始视频通话"
 
-#: ../src/empathy-call-window.ui.h:19
+#: ../src/empathy-call-window.ui.h:21
 msgid "Start an audio call"
 msgstr "开始音频通话"
 
-#: ../src/empathy-call-window.ui.h:20
+#: ../src/empathy-call-window.ui.h:22
 msgid "Show dialpad"
 msgstr "显示拨号盘"
 
-#: ../src/empathy-call-window.ui.h:21
+#: ../src/empathy-call-window.ui.h:23
 msgid "Display the dialpad"
 msgstr "显示拨号盘"
 
-#: ../src/empathy-call-window.ui.h:22
-msgid "Send Video"
-msgstr "发送视频"
-
-#: ../src/empathy-call-window.ui.h:23
+#: ../src/empathy-call-window.ui.h:24
 msgid "Toggle video transmission"
 msgstr "切换视频传输"
 
-#: ../src/empathy-call-window.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:11
-msgid "Send Audio"
-msgstr "发送音频"
-
 #: ../src/empathy-call-window.ui.h:25
-#: ../src/empathy-streamed-media-window.ui.h:12
 msgid "Toggle audio transmission"
 msgstr "切换音频传输"
 
 #: ../src/empathy-call-window.ui.h:27
-#: ../src/empathy-streamed-media-window.ui.h:20
 msgid "Encoding Codec:"
 msgstr "编码器："
 
-#: ../src/empathy-call-window.ui.h:28
-#: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
-#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
-msgid "Unknown"
-msgstr "未知"
-
 #: ../src/empathy-call-window.ui.h:29
-#: ../src/empathy-streamed-media-window.ui.h:22
 msgid "Decoding Codec:"
 msgstr "解码器："
 
 #: ../src/empathy-call-window.ui.h:30
-#: ../src/empathy-streamed-media-window.ui.h:23
 msgid "Remote Candidate:"
 msgstr "远程候选："
 
 #: ../src/empathy-call-window.ui.h:31
-#: ../src/empathy-streamed-media-window.ui.h:24
 msgid "Local Candidate:"
 msgstr "本地候选："
 
-#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:24
-#: ../src/empathy-streamed-media-window.ui.h:25
+#: ../src/empathy-call-window.ui.h:32 ../src/empathy-preferences.ui.h:28
 msgid "Audio"
 msgstr "音频"
 
-#: ../src/empathy-chat-window.c:289
+#: ../src/empathy-chat.c:101
+msgid "- Empathy Chat Client"
+msgstr " - Empathy IM 客户端"
+
+#: ../src/empathy-chatrooms-window.c:244
+msgid "Name"
+msgstr "名称"
+
+#: ../src/empathy-chatrooms-window.c:262
+msgid "Room"
+msgstr "聊天室"
+
+#: ../src/empathy-chatrooms-window.c:270
+msgid "Auto-Connect"
+msgstr "自动连接"
+
+#: ../src/empathy-chatrooms-window.ui.h:1
+msgid "Manage Favorite Rooms"
+msgstr "管理聊天室收藏"
+
+#: ../src/empathy-chat-window.c:278
 msgid "Close this window?"
 msgstr "关闭此窗口？"
 
-#: ../src/empathy-chat-window.c:294
+#: ../src/empathy-chat-window.c:284
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
 "until you rejoin it."
 msgstr "关闭此窗口将离开 %s。您将不会再收到任何消息，除非重新加入。"
 
-#: ../src/empathy-chat-window.c:305
+#: ../src/empathy-chat-window.c:297
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3436,60 +2654,60 @@ msgid_plural ""
 msgstr[0] ""
 "关闭此窗口将离开 %u 间聊天室。您将不会再收到任何消息，除非重新加入。"
 
-#: ../src/empathy-chat-window.c:314
+#: ../src/empathy-chat-window.c:308
 #, c-format
 msgid "Leave %s?"
-msgstr "级å\88« %s？"
+msgstr "离å¼\80 %s？"
 
-#: ../src/empathy-chat-window.c:315
+#: ../src/empathy-chat-window.c:310
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "您将不会再收到来自此聊天室的任何消息，除非重新加入。"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:329
 msgid "Close window"
 msgstr "关闭窗口"
 
-#: ../src/empathy-chat-window.c:334
+#: ../src/empathy-chat-window.c:329
 msgid "Leave room"
 msgstr "离开聊天室"
 
-#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
+#: ../src/empathy-chat-window.c:671 ../src/empathy-chat-window.c:694
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 未读)"
 
-#: ../src/empathy-chat-window.c:652
+#: ../src/empathy-chat-window.c:686
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (和另外 %u 人)"
 
-#: ../src/empathy-chat-window.c:668
+#: ../src/empathy-chat-window.c:702
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (另有他人的 %d 条未读)"
 
-#: ../src/empathy-chat-window.c:677
+#: ../src/empathy-chat-window.c:711
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (所有人共 %d 条未读)"
 
-#: ../src/empathy-chat-window.c:892
+#: ../src/empathy-chat-window.c:948
 msgid "SMS:"
 msgstr "短信："
 
-#: ../src/empathy-chat-window.c:902
+#: ../src/empathy-chat-window.c:956
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在发送 %d 条消息"
 
-#: ../src/empathy-chat-window.c:924
+#: ../src/empathy-chat-window.c:976
 msgid "Typing a message."
 msgstr "输入消息。"
 
@@ -3522,143 +2740,215 @@ msgid "Invite _Participant…"
 msgstr "邀请参与者(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
+msgid "_Join Chat"
+msgstr "加入聊天(_J)"
+
+#: ../src/empathy-chat-window.ui.h:9
+msgid "Le_ave Chat"
+msgstr "离开聊天(_A)"
+
+#: ../src/empathy-chat-window.ui.h:10
 msgid "C_ontact"
 msgstr "联系人(_O)"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:12
 msgid "_Tabs"
 msgstr "标签(_T)"
 
-#: ../src/empathy-chat-window.ui.h:11
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Previous Tab"
 msgstr "上一标签(_P)"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:14
 msgid "_Next Tab"
 msgstr "下一标签(_N)"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Undo Close Tab"
 msgstr "撤销关闭标签(_U)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "Move Tab _Left"
 msgstr "左移标签(_L)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:17
 msgid "Move Tab _Right"
 msgstr "右移标签(_R)"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Detach Tab"
 msgstr "漂移标签(_D)"
 
-#: ../src/empathy-chatrooms-window.c:251
-msgid "Name"
-msgstr "名称"
+#: ../src/empathy-debugger.c:77
+msgid "Show a particular service"
+msgstr "显示特定的服务"
 
-#: ../src/empathy-chatrooms-window.c:269
-msgid "Room"
-msgstr "聊天室"
+#: ../src/empathy-debugger.c:82
+msgid "- Empathy Debugger"
+msgstr "- Empathy 调试器"
 
-#: ../src/empathy-chatrooms-window.c:277
-msgid "Auto-Connect"
-msgstr "自动连接"
+#: ../src/empathy-debugger.c:142
+msgid "Empathy Debugger"
+msgstr "Empathy 调试器"
 
-#: ../src/empathy-chatrooms-window.ui.h:1
-msgid "Manage Favorite Rooms"
-msgstr "管理聊天室收藏"
+#: ../src/empathy-debug-window.c:1556
+msgid "Save"
+msgstr "保存"
+
+#: ../src/empathy-debug-window.c:1616
+msgid "Pastebin link"
+msgstr "Pastebin 链接"
+
+#: ../src/empathy-debug-window.c:1625
+msgid "Pastebin response"
+msgstr "Pastebin 响应"
+
+#: ../src/empathy-debug-window.c:1632
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "一次粘贴的数据太多。请把日志保存到文件。"
+
+#: ../src/empathy-debug-window.c:1814
+msgid "Debug Window"
+msgstr "调试窗口"
+
+#: ../src/empathy-debug-window.c:1874
+msgid "Send to pastebin"
+msgstr "发送到 pastebin"
+
+#: ../src/empathy-debug-window.c:1918
+msgid "Pause"
+msgstr "暂停"
+
+#: ../src/empathy-debug-window.c:1930
+msgid "Level "
+msgstr "级别 "
+
+#: ../src/empathy-debug-window.c:1949
+msgid "Debug"
+msgstr "调试"
+
+#: ../src/empathy-debug-window.c:1954
+msgid "Info"
+msgstr "信息"
+
+#: ../src/empathy-debug-window.c:1959 ../src/empathy-debug-window.c:2039
+msgid "Message"
+msgstr "消息"
+
+#: ../src/empathy-debug-window.c:1964
+msgid "Warning"
+msgstr "警告"
+
+#: ../src/empathy-debug-window.c:1969
+msgid "Critical"
+msgstr "危急"
+
+#: ../src/empathy-debug-window.c:1974
+msgid "Error"
+msgstr "错误"
+
+#: ../src/empathy-debug-window.c:1987
+msgid ""
+"Even if they don't display passwords, logs can contain sensitive information "
+"such as your list of contacts or the messages you recently sent or "
+"received.\n"
+"If you don't want to see such information available in a public bug report, "
+"you can choose to limit the visibility of your bug to Empathy developers "
+"when reporting it by displaying the advanced fields in the <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug report</a>."
+msgstr ""
+"即使不显示密码，日志中仍然可能包含一些敏感信息，如您的联系人列表或最近收发的"
+"消息。\n"
+"如果不想让这些信息出现在公共的 BUG 报告中，您可以通过在 <a href=\"https://"
+"bugzilla.gnome.org/enter_bug.cgi?product=empathy\">bug 报告</a> 中显示高级字"
+"段来控制在发送报告时哪些内容能被 Empathy 开发者看到。"
+
+#: ../src/empathy-debug-window.c:2019
+msgid "Time"
+msgstr "时间"
+
+#: ../src/empathy-debug-window.c:2022
+msgid "Domain"
+msgstr "域"
 
-#: ../src/empathy-event-manager.c:522
+#: ../src/empathy-debug-window.c:2025
+msgid "Category"
+msgstr "类别"
+
+#: ../src/empathy-debug-window.c:2028
+msgid "Level"
+msgstr "级别"
+
+#: ../src/empathy-debug-window.c:2062
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "已选定的连接管理不支持远程调试扩展"
+
+#: ../src/empathy-event-manager.c:503
 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
+#: ../src/empathy-event-manager.c:507
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 视频来电。您想要接听吗？"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:508
 #, 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
+#: ../src/empathy-event-manager.c:536
 msgid "_Reject"
 msgstr "拒绝(_R)"
 
-#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:544 ../src/empathy-event-manager.c:552
 msgid "_Answer"
 msgstr "接听(_A)"
 
-#: ../src/empathy-event-manager.c:571
+#: ../src/empathy-event-manager.c:552
 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
+#: ../src/empathy-event-manager.c:706
 msgid "Room invitation"
 msgstr "聊天室邀请"
 
-#: ../src/empathy-event-manager.c:839
+#: ../src/empathy-event-manager.c:708
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:846
+#: ../src/empathy-event-manager.c:715
 #, 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
+#: ../src/empathy-event-manager.c:728
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:886
+#: ../src/empathy-event-manager.c:754
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 已邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:892
+#: ../src/empathy-event-manager.c:760
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "您被邀请加入 %s"
 
-#: ../src/empathy-event-manager.c:943
+#: ../src/empathy-event-manager.c:949
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "接收 %s 文件传输"
 
-#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:977 ../src/empathy-roster-window.c:214
 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
+#: ../src/empathy-event-manager.c:1114
 #, c-format
 msgid ""
 "\n"
@@ -3668,105 +2958,105 @@ msgstr ""
 "消息：%s"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:99
+#: ../src/empathy-ft-manager.c:94
 #, 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:102
+#: ../src/empathy-ft-manager.c:97
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:178
+#: ../src/empathy-ft-manager.c:173
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:268
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%2$s 中的 %1$s，速度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:269
 #, 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:305
+#: ../src/empathy-ft-manager.c:300
 #, 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:308
+#: ../src/empathy-ft-manager.c:303
 #, 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:338
+#: ../src/empathy-ft-manager.c:333
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "从 %2$s 接收 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:341
+#: ../src/empathy-ft-manager.c:336
 msgid "Error receiving a file"
 msgstr "接收文件出错"
 
-#: ../src/empathy-ft-manager.c:346
+#: ../src/empathy-ft-manager.c:341
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "向 %2$s 发送 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:349
+#: ../src/empathy-ft-manager.c:344
 msgid "Error sending a file"
 msgstr "发送文件出错"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:488
+#: ../src/empathy-ft-manager.c:483
 #, 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:493
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "已经向 %2$s 完成发送 \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:496
+#: ../src/empathy-ft-manager.c:491
 msgid "File transfer completed"
 msgstr "文件传送完成"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
+#: ../src/empathy-ft-manager.c:610 ../src/empathy-ft-manager.c:774
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他参与者的回应"
 
-#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
+#: ../src/empathy-ft-manager.c:636 ../src/empathy-ft-manager.c:674
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "检查\"%s\"完整性"
 
-#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
+#: ../src/empathy-ft-manager.c:639 ../src/empathy-ft-manager.c:677
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "校验中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1020
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1037
+#: ../src/empathy-ft-manager.c:1032
 msgid "File"
 msgstr "文件"
 
-#: ../src/empathy-ft-manager.c:1059
+#: ../src/empathy-ft-manager.c:1054
 msgid "Remaining"
 msgstr "剩余"
 
@@ -3778,205 +3068,59 @@ msgstr "文件传输"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "从列表移除已完成、已取消及已失败的文件传输"
 
-#: ../src/empathy-import-dialog.c:76
+#: ../src/empathy-import-dialog.c:70
 msgid "_Import"
 msgstr "导入(_I)"
 
-#: ../src/empathy-import-dialog.c:88
+#: ../src/empathy-import-dialog.c:82
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "未找到可导入的帐号。Empathy 目前只能支持从 Pidgin 导入帐号。"
 
-#: ../src/empathy-import-dialog.c:209
+#: ../src/empathy-import-dialog.c:203
 msgid "Import Accounts"
 msgstr "导入帐号"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:316
+#: ../src/empathy-import-widget.c:299
 msgid "Import"
 msgstr "导入"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:308
 msgid "Protocol"
 msgstr "协议"
 
-#: ../src/empathy-import-widget.c:349
+#: ../src/empathy-import-widget.c:332
 msgid "Source"
 msgstr "源"
 
-#: ../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-invite-participant-dialog.c:197
+#: ../src/empathy-invite-participant-dialog.c:225
+msgid "Invite Participant"
+msgstr "邀请参与者"
 
-#: ../src/empathy-roster-window.c:783
-#, c-format
-msgid "Sorry, %s accounts can’t be used until your %s software is updated."
-msgstr "很抱歉，在软件 %2$s 更新前，您不能使用 %1$s 帐号。"
+#: ../src/empathy-invite-participant-dialog.c:198
+msgid "Choose a contact to invite into the conversation:"
+msgstr "选择一个联系人以加入该会话："
 
-#: ../src/empathy-roster-window.c:849
-msgid "Update software..."
-msgstr "升级软件"
+#: ../src/empathy-invite-participant-dialog.c:221
+msgid "Invite"
+msgstr "邀请"
 
-#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
-msgid "Close"
-msgstr "关闭"
+#: ../src/empathy-new-chatroom-dialog.c:186
+msgid "Chat Room"
+msgstr "聊天室"
 
-#: ../src/empathy-roster-window.c:960
-msgid "Reconnect"
-msgstr "重新连接"
+#: ../src/empathy-new-chatroom-dialog.c:201
+msgid "Members"
+msgstr "成员"
 
-#: ../src/empathy-roster-window.c:966
-msgid "Edit Account"
-msgstr "编辑帐号"
+#: ../src/empathy-new-chatroom-dialog.c:402
+msgid "Failed to list rooms"
+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-roster-window.c:1156
-msgid "Top up account credit"
-msgstr "帐号充值"
-
-#. top up button
-#: ../src/empathy-roster-window.c:1228
-msgid "Top Up..."
-msgstr "充值..."
-
-#: ../src/empathy-roster-window.c:1952
-msgid "Contact"
-msgstr "联系人"
-
-#: ../src/empathy-roster-window.c:2150
-msgid "You need to enable one of your accounts to see contacts here."
-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-roster-window.c:2460
-msgid "Contact List"
-msgstr "联系人列表"
-
-#: ../src/empathy-roster-window.ui.h:1
-msgid "Account settings"
-msgstr "帐号设置"
-
-#: ../src/empathy-roster-window-menubar.ui.h:2
-#: ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation…"
-msgstr "新建对话(_N)..."
-
-#: ../src/empathy-roster-window-menubar.ui.h:3
-#: ../src/empathy-status-icon.ui.h:3
-msgid "New _Call…"
-msgstr "新建呼叫(_C)..."
-
-#: ../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
+#: ../src/empathy-new-chatroom-dialog.c:437
 #, c-format
 msgid ""
 "%s\n"
@@ -3989,597 +3133,1312 @@ msgstr ""
 "需要密码: %s\n"
 "成员: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
+#: ../src/empathy-new-chatroom-dialog.c:439
+#: ../src/empathy-new-chatroom-dialog.c:440
 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
+#: ../src/empathy-new-chatroom-dialog.c:791
 msgid "Join Room"
 msgstr "加入聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:3
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 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
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Room:"
 msgstr "聊天室(_R)："
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account&apos;s server"
+msgstr "输入聊天室所在的服务器，或置空表示聊天室在当前帐号的服务器上。"
+
+#: ../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 "输入聊天室所在的服务器，或为空表示聊天室在当前帐号的服务器上。"
+msgstr "输入聊天室所在的服务器，或置空表示聊天室在当前帐号的服务器上。"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "_Server:"
+msgstr "服务器(_S)："
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "Couldn't load room list"
 msgstr "无法载入聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "Room List"
 msgstr "聊天室列表"
 
-#: ../src/empathy-preferences.c:166
+#: ../src/empathy-notifications-approver.c:182
+msgid "Respond"
+msgstr "响应"
+
+#: ../src/empathy-notifications-approver.c:201
+msgid "Answer with video"
+msgstr "以视频应答"
+
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:219
+msgid "Decline"
+msgstr "拒绝"
+
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-notifications-approver.c:224
+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:234
+msgid "Provide"
+msgstr "提供"
+
+#: ../src/empathy-preferences.c:138
 msgid "Message received"
 msgstr "收到了消息"
 
-#: ../src/empathy-preferences.c:167
+#: ../src/empathy-preferences.c:139
 msgid "Message sent"
 msgstr "发出了消息"
 
-#: ../src/empathy-preferences.c:168
+#: ../src/empathy-preferences.c:140
 msgid "New conversation"
 msgstr "新对话"
 
-#: ../src/empathy-preferences.c:169
+#: ../src/empathy-preferences.c:141
 msgid "Contact comes online"
 msgstr "联系人上线了"
 
-#: ../src/empathy-preferences.c:170
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes offline"
 msgstr "联系人离线了"
 
-#: ../src/empathy-preferences.c:171
+#: ../src/empathy-preferences.c:143
 msgid "Account connected"
 msgstr "帐号已连接"
 
-#: ../src/empathy-preferences.c:172
+#: ../src/empathy-preferences.c:144
 msgid "Account disconnected"
 msgstr "帐号已断开"
 
-#: ../src/empathy-preferences.c:475
+#: ../src/empathy-preferences.c:369
 msgid "Language"
 msgstr "语言"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:726
+#: ../src/empathy-preferences.c:620
 msgid "Juliet"
 msgstr "朱立叶"
 
 #. translators: Contact name for the chat theme preview
-#: ../src/empathy-preferences.c:733
+#: ../src/empathy-preferences.c:627
 msgid "Romeo"
 msgstr "罗密欧"
 
 #. translators: Quote from Romeo & Julier, for chat theme preview
-#: ../src/empathy-preferences.c:739
+#: ../src/empathy-preferences.c:633
 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
+#: ../src/empathy-preferences.c:637
 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
+#: ../src/empathy-preferences.c:640
 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
+#: ../src/empathy-preferences.c:643
 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
+#: ../src/empathy-preferences.c:646
 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
+#: ../src/empathy-preferences.c:649
 msgid "Juliet has disconnected"
 msgstr "朱立叶已断开连接"
 
-#: ../src/empathy-preferences.c:1159
+#: ../src/empathy-preferences.c:1015
 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)"
+msgid "Show groups"
+msgstr "显示分组"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Appearance"
-msgstr "外观"
+msgid "Show account balances"
+msgstr "显示帐号余额"
+
+#: ../src/empathy-preferences.ui.h:4 ../src/empathy-roster-window.c:2302
+msgid "Contact List"
+msgstr "联系人列表"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:5
 msgid "Start chats in:"
 msgstr "聊天开始于："
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:6
 msgid "new ta_bs"
 msgstr "新标签(_B)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:7
 msgid "new _windows"
 msgstr "新窗口(_W)"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:8
+msgid "Show _smileys as images"
+msgstr "显示表情符号为图形(_S)"
+
+#: ../src/empathy-preferences.ui.h:9
+msgid "Show contact _list in rooms"
+msgstr "在聊天室显示联系人列表(_L)"
+
+#: ../src/empathy-preferences.ui.h:10
+msgid "Log conversations"
+msgstr "记录对话"
+
+#: ../src/empathy-preferences.ui.h:12
 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:13
+msgid "_Automatically connect on startup"
+msgstr "启动时自动连接(_A) "
+
+#: ../src/empathy-preferences.ui.h:14
+msgid "Behavior"
+msgstr "行为"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "General"
+msgstr "常规"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "_Enable bubble notifications"
+msgstr "允许气泡通知(_E)"
+
+#: ../src/empathy-preferences.ui.h:17
+msgid "Disable notifications when _away or busy"
+msgstr "离开或忙碌时禁用提示(_A)"
+
+#: ../src/empathy-preferences.ui.h:18
+msgid "Enable notifications when the _chat is not focused"
+msgstr "当会话闲置时允许提示"
+
+#: ../src/empathy-preferences.ui.h:19
+msgid "Enable notifications when a contact comes online"
+msgstr "当联系人上线时允许提示"
+
+#: ../src/empathy-preferences.ui.h:20
+msgid "Enable notifications when a contact goes offline"
+msgstr "当联系人离线时允许提示"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid "Notifications"
+msgstr "提示"
+
+#: ../src/empathy-preferences.ui.h:22
+msgid "_Enable sound notifications"
+msgstr "启用声音通知(_E)"
+
+#: ../src/empathy-preferences.ui.h:23
+msgid "Disable sounds when _away or busy"
+msgstr "离开或忙碌时禁用声音(_A)"
+
+#: ../src/empathy-preferences.ui.h:24
+msgid "Play sound for events"
+msgstr "播放事件声音"
+
+#: ../src/empathy-preferences.ui.h:25
+msgid "Sounds"
+msgstr "声音"
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "Use _echo cancellation to improve call quality"
+msgstr "使用回声抑制，以改善通话质量"
+
+#: ../src/empathy-preferences.ui.h:27
+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:30
+msgid "_Publish location to my contacts"
+msgstr "向我的联系人公布位置信息(_P)"
+
+#: ../src/empathy-preferences.ui.h:31
+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:33
+msgid "_Reduce location accuracy"
+msgstr "降低位置信息精度(_R)"
+
+#: ../src/empathy-preferences.ui.h:34
+msgid "Privacy"
+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-roster-window.c:231
+msgid "Provide Password"
+msgstr "提供密码"
+
+#: ../src/empathy-roster-window.c:237
+msgid "Disconnect"
+msgstr "已断开连接"
+
+#: ../src/empathy-roster-window.c:494
+msgid "You need to set up an account to see contacts here."
+msgstr "您需要设置一个帐号才能查看这里的联系人。"
+
+#: ../src/empathy-roster-window.c:570
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "很抱歉，在软件 %2$s 更新前，您不能使用 %1$s 帐号。"
+
+#: ../src/empathy-roster-window.c:671
+msgid "Windows Live"
+msgstr "Windows Live"
+
+#: ../src/empathy-roster-window.c:673
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../src/empathy-roster-window.c:675
+msgid "Facebook"
+msgstr "Facebook"
+
+#. translators: %s is an account name like 'Facebook' or 'Google Talk'
+#: ../src/empathy-roster-window.c:690
+#, c-format
+msgid "%s account requires authorisation"
+msgstr "%s 帐号需要身份认证"
+
+#: ../src/empathy-roster-window.c:701
+msgid "Online Accounts"
+msgstr "在线帐号"
+
+#: ../src/empathy-roster-window.c:748
+msgid "Update software…"
+msgstr " 更新软件…"
+
+#: ../src/empathy-roster-window.c:754
+msgid "Reconnect"
+msgstr "重新连接"
+
+#: ../src/empathy-roster-window.c:758
+msgid "Edit Account"
+msgstr "编辑帐号"
+
+#: ../src/empathy-roster-window.c:763
+msgid "Close"
+msgstr "关闭"
+
+#: ../src/empathy-roster-window.c:905
+msgid "Top up account"
+msgstr "帐号充值"
+
+#: ../src/empathy-roster-window.c:1627
+msgid "You need to enable one of your accounts to see contacts here."
+msgstr "您需要启用一个帐号才能查看这里的联系人。"
+
+#. translators: argument is an account name
+#: ../src/empathy-roster-window.c:1635
+#, c-format
+msgid "You need to enable %s to see contacts here."
+msgstr "您需要启用 %s 来查看这里的联系人。"
+
+#: ../src/empathy-roster-window.c:1713
+msgid "Change your presence to see contacts here"
+msgstr "更改您的在线状态来查看这里的联系人"
+
+#: ../src/empathy-roster-window.c:1722
+msgid "No match found"
+msgstr "没有找到匹配项"
+
+#: ../src/empathy-roster-window.c:1729
+msgid "You haven't added any contacts yet"
+msgstr "您尚未添加任何联系人"
+
+#: ../src/empathy-roster-window.c:1732
+msgid "No online contacts"
+msgstr "无在线联系人"
+
+#: ../src/empathy-roster-window-menubar.ui.h:1
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新建对话(_N)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新建呼叫(_C)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:3
+msgid "Contacts"
+msgstr "联系人"
+
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Add Contacts…"
+msgstr "添加联系人(_A)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:5
+msgid "_Search for Contacts…"
+msgstr "搜索联系人(_S)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Blocked Contacts"
+msgstr "已屏蔽的联系人(_B)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_Rooms"
+msgstr "聊天室(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Join…"
+msgstr "加入(_J)..."
+
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Join _Favorites"
+msgstr "加入已收藏的聊天室(_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "_Manage Favorites"
+msgstr "管理收藏夹(_M)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:12
+msgid "_File Transfers"
+msgstr "文件传输(_F)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:13
+msgid "_Accounts"
+msgstr "帐号(_A)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:14
+msgid "P_references"
+msgstr "首选项(_R)"
+
+#: ../src/empathy-roster-window-menubar.ui.h:15
+msgid "Help"
+msgstr "帮助"
+
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "About"
+msgstr "关于"
+
+#: ../src/empathy-roster-window-menubar.ui.h:17
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "帐号设置"
+
+#: ../src/empathy-roster-window.ui.h:2
+msgid "Go _Online"
+msgstr "上线(_O)"
+
+#: ../src/empathy-roster-window.ui.h:3
+msgid "Show _Offline Contacts"
+msgstr "显示离线联系人(_O)"
+
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "状态"
+
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:183
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:126
+msgid "Done"
+msgstr "完成"
+
+#: ../ubuntu-online-accounts/cc-plugins/account-plugins/empathy-accounts-plugin-widget.c:214
+msgid "Please enter your account details"
+msgstr "输入您的帐号详情"
+
+#: ../ubuntu-online-accounts/cc-plugins/app-plugin/empathy-app-plugin-widget.c:160
+#, c-format
+msgid "Edit %s account options"
+msgstr "编辑 %s 帐号选项"
+
+#: ../ubuntu-online-accounts/empathy.application.in.h:1
+msgid "Integrate your IM accounts"
+msgstr "集成您的即时通讯帐号"
+
+#~ msgid "About Empathy"
+#~ msgstr "关于 Empathy"
+
+#~ msgid "No error message"
+#~ msgstr "无错误信息"
+
+#~ msgid "Instant Message (Empathy)"
+#~ msgstr "即时消息(Empathy)"
+
+#~ msgid "Empathy can use the network to guess the location"
+#~ msgstr "Empathy 能够通过网络来估计位置"
+
+#~ msgid "Whether Empathy can use the network to guess the location."
+#~ msgstr "是否允许 Empathy 通过网络估计位置"
+
+#~ msgid "Empathy can use the cellular network to guess the location"
+#~ msgstr "Empathy 能够通过手机来估计位置"
+
+#~ msgid "Whether Empathy can use the cellular network to guess the location."
+#~ msgstr "是否允许 Empathy 通过手机网络估计位置"
+
+#~ msgid "Empathy can use the GPS to guess the location"
+#~ msgstr "Empathy 能够通过 GPS 来估计位置"
+
+#~ msgid "Whether Empathy can use the GPS to guess the location."
+#~ msgstr "是否允许 Empathy 通过 GPS 估计位置"
+
+#~ msgid "Password not found"
+#~ msgstr "未找到密码"
+
+#~ msgid "IM account password for %s (%s)"
+#~ msgstr "IM 帐号 %s (%s) 的密码"
+
+#~ msgid "Password for chatroom '%s' on account %s (%s)"
+#~ msgstr "帐号 %2$s (%3$s) 的聊天室 %1$s 密码"
+
+#~ msgid "%d second ago"
+#~ msgid_plural "%d seconds ago"
+#~ msgstr[0] "%d 秒钟前"
+
+#~ msgid "%d minute ago"
+#~ msgid_plural "%d minutes ago"
+#~ msgstr[0] "%d 分钟前"
+
+#~ msgid "%d hour ago"
+#~ msgid_plural "%d hours ago"
+#~ msgstr[0] "%d 小时前"
+
+#~ msgid "%d day ago"
+#~ msgid_plural "%d days ago"
+#~ msgstr[0] "%d 天前"
+
+#~ msgid "%d week ago"
+#~ msgid_plural "%d weeks ago"
+#~ msgstr[0] "%d 星期前"
+
+#~ msgid "%d month ago"
+#~ msgid_plural "%d months ago"
+#~ msgstr[0] "%d 月前"
+
+#~ msgid "in the future"
+#~ msgstr "将来"
+
+#~ msgid "Yahoo! Japan"
+#~ msgstr "Yahoo! 日本"
+
+#~ msgid "Facebook Chat"
+#~ msgstr "Facebook 聊天"
+
+#~ msgid "Pass_word"
+#~ msgstr "密码(_W)"
+
+#~ msgid "Screen _Name"
+#~ msgstr "用户名(_N)"
+
+#~ msgid "<b>Example:</b> MyScreenName"
+#~ msgstr "<b>例如：</b> 我的屏幕名称"
+
+#~ msgid "_Port"
+#~ msgstr "端口(_P)"
+
+#~ msgid "_Server"
+#~ msgstr "服务器(_S)"
+
+#~ msgid "Advanced"
+#~ msgstr "高级"
+
+#~ msgid "What is your AIM screen name?"
+#~ msgstr "您的 AIM 屏幕名称是什么？"
+
+#~ msgid "What is your AIM password?"
+#~ msgstr "您的 AIM 密码是什么？"
+
+#~ msgid "Remember Password"
+#~ msgstr "记住密码"
+
+#~ msgid "Password"
+#~ msgstr "密码"
+
+#~ msgid "Server"
+#~ msgstr "服务器"
+
+#~ msgid "Port"
+#~ msgstr "端口"
+
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid "%s:"
+#~ msgstr "%s："
+
+#~ msgid "Username:"
+#~ msgstr "用户名："
+
+#~ msgid "A_pply"
+#~ msgstr "应用(_P)"
+
+#~ msgid "L_og in"
+#~ msgstr "登录(_O)"
+
+#~ msgid "This account already exists on the server"
+#~ msgstr "服务器上已存在该帐号"
+
+#~ msgid "Create a new account on the server"
+#~ msgstr "在服务器上创建新的帐号"
+
+#~ msgid "%1$s on %2$s"
+#~ msgstr "%2$s 中的 %1$s"
+
+#~ msgid "%s Account"
+#~ msgstr "%s 帐号"
+
+#~ msgid "New account"
+#~ msgstr "新建帐号"
+
+#~ msgid "Login I_D"
+#~ msgstr "登录 I_D"
+
+#~ msgid "<b>Example:</b> username"
+#~ msgstr "<b>例如：</b>用户名"
+
+#~ msgid "What is your GroupWise User ID?"
+#~ msgstr "您的 GroupWise 用户名是什么？"
+
+#~ msgid "What is your GroupWise password?"
+#~ msgstr "您的 GroupWise 密码是什么？"
+
+#~ msgid "ICQ _UIN"
+#~ msgstr "ICQ _UIN"
+
+#~ msgid "<b>Example:</b> 123456789"
+#~ msgstr "<b>例如：</b>123456789"
+
+#~ msgid "Ch_aracter set"
+#~ msgstr "字符集(_A)"
+
+#~ msgid "What is your ICQ UIN?"
+#~ msgstr "您的 ICQ UIN 是什么？"
+
+#~ msgid "What is your ICQ password?"
+#~ msgstr "您的 ICQ 密码是什么？"
+
+#~ msgid "Network"
+#~ msgstr "网络"
+
+#~ msgid "Character set"
+#~ msgstr "字符集"
+
+#~ msgid "Up"
+#~ msgstr "在线"
+
+#~ msgid "Down"
+#~ msgstr "离线"
+
+#~ msgid "Servers"
+#~ msgstr "服务器"
+
+#~ msgid ""
+#~ "Most IRC servers don't need a password, so if you're not sure, don't "
+#~ "enter a password."
+#~ msgstr "大多数 IRC 服务器不需要密码，如果您不确定，则不要输入密码。"
+
+#~ msgid "Nickname"
+#~ msgstr "昵称"
+
+#~ msgid "Quit message"
+#~ msgstr "退出消息"
+
+#~ msgid "Real name"
+#~ msgstr "真名"
+
+#~ msgid "Username"
+#~ msgstr "用户名"
+
+#~ msgid "Which IRC network?"
+#~ msgstr "哪个 IRC 网络?"
+
+#~ msgid "What is your IRC nickname?"
+#~ msgstr "您的 IRC 昵称是什么?"
+
+#~ msgid "What is your Facebook username?"
+#~ msgstr "您的 Facebook 用户名是什么？"
+
+#~ 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> 来选择一个。"
+
+#~ msgid "What is your Facebook password?"
+#~ msgstr "您的 Facebook 密码是什么？"
+
+#~ msgid "What is your Google ID?"
+#~ msgstr "您的 Google ID 是什么？"
+
+#~ msgid "<b>Example:</b> user@gmail.com"
+#~ msgstr "<b>例如：</b>user@gmail.com"
+
+#~ msgid "What is your Google password?"
+#~ msgstr "您的 Google 密码是什么？"
+
+#~ msgid "<b>Example:</b> user@jabber.org"
+#~ msgstr "<b>例如：</b>user@jabber.org"
+
+#~ msgid "I_gnore SSL certificate errors"
+#~ msgstr "忽略 SSL 证书错误(_G)"
+
+#~ msgid "Priori_ty"
+#~ msgstr "优先级(_T)"
+
+#~ msgid "Reso_urce"
+#~ msgstr "资源(_U)"
+
+#~ msgid "Encr_yption required (TLS/SSL)"
+#~ msgstr "需要加密(TLS/SSL)(_Y)"
+
+#~ msgid "Override server settings"
+#~ msgstr "覆盖服务器设置"
+
+#~ msgid "Use old SS_L"
+#~ msgstr "使用旧的 SS_L"
+
+#~ msgid "What is your Jabber ID?"
+#~ msgstr "您的 Jabber ID 是什么？"
+
+#~ msgid "What is your desired Jabber ID?"
+#~ msgstr "您想要的 Jabber ID 是什么？"
+
+#~ msgid "What is your Jabber password?"
+#~ msgstr "您的 Jabber 密码是什么？"
+
+#~ msgid "What is your desired Jabber password?"
+#~ msgstr "您想要的 Jabber 密码是什么？"
+
+#~ msgid "Nic_kname"
+#~ msgstr "昵称(_K)"
+
+#~ msgid "_Last Name"
+#~ msgstr "姓(_L)"
+
+#~ msgid "_First Name"
+#~ msgstr "名(_F)"
+
+#~ msgid "_Published Name"
+#~ msgstr "公开的名字(_P)"
+
+#~ msgid "_Jabber ID"
+#~ msgstr "_Jabber ID"
+
+#~ msgid "E-_mail address"
+#~ msgstr "电子邮件地址(_M)"
+
+#~ msgid "<b>Example:</b> user@hotmail.com"
+#~ msgstr "<b>例如：</b>user@hotmail.com"
+
+#~ msgid "What is your Windows Live ID?"
+#~ msgstr "您的 Windows Live 帐号是什么？"
+
+#~ msgid "What is your Windows Live password?"
+#~ msgstr "您的 Windows Live 密码是什么？"
+
+#~ msgid "Auto"
+#~ msgstr "自动"
+
+#~ msgid "UDP"
+#~ msgstr "UDP"
+
+#~ msgid "TCP"
+#~ msgstr "TCP"
+
+#~ msgid "TLS"
+#~ msgstr "TLS"
+
+#~ msgid "Register"
+#~ msgstr "注册"
+
+#~ msgid "Options"
+#~ msgstr "选项"
+
+#~ msgid "None"
+#~ msgstr "无"
+
+#~ msgid "_Username"
+#~ msgstr "用户名(_U)"
+
+#~ msgid "<b>Example:</b> user@my.sip.server"
+#~ msgstr "<b>例如：</b>user@my.sip.server"
+
+#~ msgid "Use this account to call _landlines and mobile phones"
+#~ msgstr "用此帐号拨打固定电话和手机(_L)"
+
+#~ msgid "NAT Traversal Options"
+#~ msgstr "NAT 选项"
+
+#~ msgid "Proxy Options"
+#~ msgstr "代理选项"
+
+#~ msgid "Miscellaneous Options"
+#~ msgstr "杂项"
+
+#~ msgid "STUN Server"
+#~ msgstr "STUN 服务器"
+
+#~ msgid "Discover the STUN server automatically"
+#~ msgstr "自动发现 STUN 服务器"
+
+#~ msgid "Discover Binding"
+#~ msgstr "发现绑定"
+
+#~ msgid "Keep-Alive Options"
+#~ msgstr "Keep-Alive 选项"
+
+#~ msgid "Mechanism"
+#~ msgstr "机制"
+
+#~ msgid "Interval (seconds)"
+#~ msgstr "间隔(秒)"
+
+#~ msgid "Authentication username"
+#~ msgstr "验证用户名"
+
+#~ msgid "Transport"
+#~ msgstr "传输"
+
+#~ msgid "Loose Routing"
+#~ msgstr "宽松路由"
+
+#~ msgid "Ignore TLS Errors"
+#~ msgstr "忽略 TLS 错误"
+
+#~ msgid "Local IP Address"
+#~ msgstr "本地 IP 地址"
+
+#~ msgid "What is your SIP login ID?"
+#~ msgstr "您的 SIP 登录 ID 是什么？"
+
+#~ msgid "What is your SIP account password?"
+#~ msgstr "您的 SIP 帐号密码是什么？"
+
+#~ msgid "Pass_word:"
+#~ msgstr "密码(_W)："
+
+#~ msgid "Yahoo! I_D:"
+#~ msgstr "Yahoo I_D："
+
+#~ msgid "I_gnore conference and chat room invitations"
+#~ msgstr "忽略会议和聊天室邀请(_G)"
+
+#~ msgid "_Room List locale:"
+#~ msgstr "聊天室列表 locale(_R)："
+
+#~ msgid "Ch_aracter set:"
+#~ msgstr "字符集(_A):"
+
+#~ msgid "_Port:"
+#~ msgstr "端口(_P)："
+
+#~ msgid "What is your Yahoo! ID?"
+#~ msgstr "您的 Yahoo! ID 是什么？"
+
+#~ msgid "What is your Yahoo! password?"
+#~ msgstr "您的 Yahoo! 密码是什么？"
+
+#~ msgid "Couldn't convert image"
+#~ msgstr "无法转换图像"
+
+#~ msgid "None of the accepted image formats are supported on your system"
+#~ msgstr "没有任何接受的图片格式能被您的系统支持"
+
+#~ msgid "Couldn't save picture to file"
+#~ msgstr "无法将图片保存为文件"
+
+#~ msgid "Select Your Avatar Image"
+#~ msgstr "选择您的头像图片"
+
+#~ msgid "Take a picture..."
+#~ msgstr "照相..."
+
+#~ msgid "No Image"
+#~ msgstr "无图像"
+
+#~ msgid "Images"
+#~ msgstr "图像"
+
+#~ msgid "All Files"
+#~ msgstr "所有文件"
+
+#~ msgid "Select..."
+#~ msgstr "选择..."
+
+#~ msgid "_Select"
+#~ msgstr "选择(_S)"
+
+#~ msgid "Full name"
+#~ msgstr "全名"
+
+#~ msgid "Phone number"
+#~ msgstr "电话号码"
+
+#~ msgid "E-mail address"
+#~ msgstr "电子邮件地址"
+
+#~ msgid "Website"
+#~ msgstr "网站"
+
+#~ msgid "Birthday"
+#~ msgstr "生日"
+
+#~ msgid "Last seen:"
+#~ msgstr "最近上线："
+
+#~ msgid "Server:"
+#~ msgstr "服务器："
+
+#~ msgid "Connected from:"
+#~ msgstr "连接来源："
+
+#~ msgid "Away message:"
+#~ msgstr "离开消息："
+
+#~ msgid "work"
+#~ msgstr "办公"
+
+#~ msgid "home"
+#~ msgstr "主页"
+
+#~ msgid "mobile"
+#~ msgstr "手机"
+
+#~ msgid "voice"
+#~ msgstr "音频"
+
+#~ msgid "preferred"
+#~ msgstr "首选"
+
+#~ msgid "postal"
+#~ msgstr "邮政"
+
+#~ msgid "parcel"
+#~ msgstr "邮件"
+
+#~ msgid "New Network"
+#~ msgstr "新建网络"
+
+#~ msgid "Choose an IRC network"
+#~ msgstr "选择一个 IRC 网络"
+
+#~ msgid "Reset _Networks List"
+#~ msgstr "重置_Networks列表"
+
+#~ msgctxt "verb displayed on a button to select an IRC network"
+#~ msgid "Select"
+#~ msgstr "选择"
+
+#~ msgid "new server"
+#~ msgstr "新建服务器"
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "New %s account"
+#~ msgstr "新建 %s 帐号"
+
+#~ msgid "Go online to edit your personal information."
+#~ msgstr "请上线以编辑您的个人信息。"
+
+#~ msgid "<b>Personal Details</b>"
+#~ msgstr "<b>个人详情</b>"
+
+#~ msgid "Current Locale"
+#~ msgstr "当前语言环境"
+
+#~ msgid "Arabic"
+#~ msgstr "阿拉伯语"
+
+#~ msgid "Armenian"
+#~ msgstr "亚美尼亚语"
+
+#~ msgid "Baltic"
+#~ msgstr "波罗的语"
+
+#~ msgid "Celtic"
+#~ msgstr "凯尔特语"
+
+#~ msgid "Central European"
+#~ msgstr "中欧"
 
-#: ../src/empathy-preferences.ui.h:9
-msgid "Log conversations"
-msgstr "记录对话"
+#~ msgid "Chinese Simplified"
+#~ msgstr "简体中文"
 
-#: ../src/empathy-preferences.ui.h:10
-msgid "Behavior"
-msgstr "行为"
+#~ msgid "Chinese Traditional"
+#~ msgstr "繁体中文"
 
-#: ../src/empathy-preferences.ui.h:11
-msgid "General"
-msgstr "常规"
+#~ msgid "Croatian"
+#~ msgstr "克罗地亚语"
 
-#: ../src/empathy-preferences.ui.h:12
-msgid "_Enable bubble notifications"
-msgstr "允许气泡通知(_E)"
+#~ msgid "Cyrillic"
+#~ msgstr "斯拉夫语"
 
-#: ../src/empathy-preferences.ui.h:13
-msgid "Disable notifications when _away or busy"
-msgstr "离开或忙碌时禁用提示(_A)"
+#~ msgid "Cyrillic/Russian"
+#~ msgstr "斯拉夫语系/俄语"
 
-#: ../src/empathy-preferences.ui.h:14
-msgid "Enable notifications when the _chat is not focused"
-msgstr "当会话闲置时允许提示"
+#~ msgid "Cyrillic/Ukrainian"
+#~ msgstr "斯拉夫语系/乌克兰语"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Enable notifications when a contact comes online"
-msgstr "当联系人上线时允许提示"
+#~ msgid "Georgian"
+#~ msgstr "格鲁吉亚语"
 
-#: ../src/empathy-preferences.ui.h:16
-msgid "Enable notifications when a contact goes offline"
-msgstr "当联系人离线时允许提示"
+#~ msgid "Greek"
+#~ msgstr "希腊语"
 
-#: ../src/empathy-preferences.ui.h:17
-msgid "Notifications"
-msgstr "提示"
+#~ msgid "Gujarati"
+#~ msgstr "古吉拉特语"
 
-#: ../src/empathy-preferences.ui.h:18
-msgid "_Enable sound notifications"
-msgstr "启用声音通知(_E)"
+#~ msgid "Gurmukhi"
+#~ msgstr "旁遮普语"
 
-#: ../src/empathy-preferences.ui.h:19
-msgid "Disable sounds when _away or busy"
-msgstr "离开或忙碌时禁用声音(_A)"
+#~ msgid "Hebrew"
+#~ msgstr "希伯来语"
 
-#: ../src/empathy-preferences.ui.h:20
-msgid "Play sound for events"
-msgstr "播放事件声音"
+#~ msgid "Hebrew Visual"
+#~ msgstr "希伯来语"
 
-#: ../src/empathy-preferences.ui.h:21
-msgid "Sounds"
-msgstr "声音"
+#~ msgid "Hindi"
+#~ msgstr "北印度语"
 
-#: ../src/empathy-preferences.ui.h:22
-msgid "Use _echo cancellation to improve call quality"
-msgstr "使用回声抑制，以改善通话质量"
+#~ msgid "Icelandic"
+#~ 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 ""
-"回声消除可以使您的语音在对方听来更清晰，但在某些计算机上可能导致问题。如果您"
-"或对方在通话时听到了奇怪的噪音或怪音，请尝试关闭回声消除并重新通话。"
+#~ msgid "Japanese"
+#~ msgstr "日本语"
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "_Publish location to my contacts"
-msgstr "向我的联系人公布位置信息(_P)"
+#~ msgid "Korean"
+#~ msgstr "韩语"
 
-#: ../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 坐标"
-"将精确到一位小数。 "
+#~ msgid "Nordic"
+#~ msgstr "北欧语系"
 
-#. 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)"
+#~ msgid "Persian"
+#~ msgstr "波斯语"
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "Privacy"
-msgstr "隐私"
+#~ msgid "Romanian"
+#~ msgstr "罗马尼亚语"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_GPS"
-msgstr "_GPS"
+#~ msgid "South European"
+#~ msgstr "南欧语系"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Cellphone"
-msgstr "手机(_C)"
+#~ msgid "Thai"
+#~ msgstr "泰国语"
 
-#: ../src/empathy-preferences.ui.h:33
-msgid "_Network (IP, Wi-Fi)"
-msgstr "网络(_N)(IP，Wi-Fi)"
+#~ msgid "Turkish"
+#~ msgstr "土耳其语"
 
-#: ../src/empathy-preferences.ui.h:34
-msgid "Location sources:"
-msgstr "位置来源："
+#~ msgid "Unicode"
+#~ msgstr "Unicode"
 
-#: ../src/empathy-preferences.ui.h:36
-msgid ""
-"The list of languages reflects only the languages for which you have a "
-"dictionary installed."
-msgstr "语言列表仅反映已安装的字典"
+#~ msgid "Western"
+#~ msgstr "西方语言"
 
-#: ../src/empathy-preferences.ui.h:37
-msgid "Enable spell checking for languages:"
-msgstr "允许拼写检查的语言："
+#~ msgid "Vietnamese"
+#~ msgstr "越南语"
 
-#: ../src/empathy-preferences.ui.h:38
-msgid "Spell Checking"
-msgstr "拼写检查"
+#~ msgid "_Edit Connection Parameters..."
+#~ msgstr "编辑连接参数(_E)..."
 
-#: ../src/empathy-preferences.ui.h:39
-msgid "Chat Th_eme:"
-msgstr "聊天主题(_E)："
+#~ msgid "_GPS"
+#~ msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:40
-msgid "Variant:"
-msgstr "版本："
+#~ msgid "_Cellphone"
+#~ msgstr "手机(_C)"
 
-#: ../src/empathy-preferences.ui.h:41
-msgid "Themes"
-msgstr "主题"
+#~ msgid "_Network (IP, Wi-Fi)"
+#~ msgstr "网络(_N)(IP，Wi-Fi)"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "Status"
-msgstr "状态"
+#~ msgid "Location sources:"
+#~ msgstr "位置来源："
 
-#: ../src/empathy-status-icon.ui.h:5
-msgid "_Quit"
-msgstr "退出(_Q)"
+#~ msgid "_New Conversation..."
+#~ msgstr "新建对话(_N)..."
 
-#: ../src/empathy-streamed-media-window.ui.h:3
-msgid "Redial"
-msgstr "重拨"
+#~ msgid "New _Call..."
+#~ msgstr "新建通话(_C)..."
 
-#: ../src/empathy-streamed-media-window.ui.h:4
-msgid "V_ideo"
-msgstr "视频(_I)"
+#~ msgid "_Add Contacts..."
+#~ msgstr "添加联系人(_A)..."
 
-#: ../src/empathy-streamed-media-window.ui.h:5
-msgid "Video Off"
-msgstr "视频关闭"
+#~ msgid "_Join..."
+#~ msgstr "加入(_J)..."
 
-#: ../src/empathy-streamed-media-window.ui.h:6
-msgid "Video Preview"
-msgstr "视频预览"
+#~ msgid "_Add Contact..."
+#~ msgstr "添加联系人(_A)..."
 
-#: ../src/empathy-streamed-media-window.ui.h:7
-msgid "Video On"
-msgstr "视频开启"
+#~ msgid "i"
+#~ msgstr "i"
 
-#: ../src/empathy-streamed-media-window.ui.h:10
-msgid "Call the contact again"
-msgstr "再次呼叫联系人"
+#~ msgid "Manage Messaging and VoIP accounts"
+#~ msgstr "管理消息和 VoIP 帐号"
 
-#: ../src/empathy-streamed-media-window.ui.h:13
-msgid "Camera Off"
-msgstr "相机关闭"
+#~ msgid "Show avatars"
+#~ msgstr "显示头像"
 
-#: ../src/empathy-streamed-media-window.ui.h:14
-msgid "Disable camera and stop sending video"
-msgstr "禁用相机停止发送视频"
+#~ msgid ""
+#~ "Whether to show avatars for contacts in the contact list and chat windows."
+#~ msgstr "是否在联系人列表和聊天窗口中显示头像。"
 
-#: ../src/empathy-streamed-media-window.ui.h:15
-msgid "Preview"
-msgstr "预览"
+#~ msgid "Show protocols"
+#~ msgstr "显示协议"
 
-#: ../src/empathy-streamed-media-window.ui.h:16
-msgid "Enable camera but don't send video"
-msgstr "启用相机，但不发送视频"
+#~ msgid "Whether to show protocols for contacts in the contact list."
+#~ msgstr "是否在联系人列表和聊天窗口中显示协议。"
 
-#: ../src/empathy-streamed-media-window.ui.h:17
-msgid "Camera On"
-msgstr "相机开启"
+#~ msgid "Compact contact list"
+#~ msgstr "紧凑显示联系人列表"
 
-#: ../src/empathy-streamed-media-window.ui.h:18
-msgid "Enable camera and send video"
-msgstr "启用相机，并发送视频"
+#~ msgid "Whether to show the contact list in compact mode."
+#~ msgstr "是否以紧凑模式显示联系人列表。"
 
-#: ../src/empathy-map-view.c:471
-msgid "Contact Map View"
-msgstr "联系地图视图"
+#~ msgid "Contact list sort criterion"
+#~ msgstr "联系人列表排序条件"
 
-#: ../src/empathy-debug-window.c:1607
-msgid "Save"
-msgstr "保存"
+#~ 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 ""
+#~ "使用何种条件来排序联系人列表。默认情况下使用值“状态”以按联系人状态排序。取"
+#~ "值为“姓名”时将按姓名排序联系人列表。"
 
-#: ../src/empathy-debug-window.c:1667
-msgid "Pastebin link"
-msgstr "Pastebin 链接"
+#~ msgid "Network:"
+#~ msgstr "网络："
 
-#: ../src/empathy-debug-window.c:1676
-msgid "Pastebin response"
-msgstr "Pastebin 响应"
+#~ msgid "Password:"
+#~ msgstr "密码："
 
-#: ../src/empathy-debug-window.c:1680
-#, c-format
-msgid "%s"
-msgstr "%s"
+#~ msgid "Port:"
+#~ msgstr "端口："
 
-#: ../src/empathy-debug-window.c:1683
-msgid "Data too large for a single paste. Please save logs to file."
-msgstr "一次粘贴的数据太多。请把日志保存到文件。"
+#~ msgid "“%s” is not a valid contact ID"
+#~ msgstr "%s 是无效的联系人 ID"
 
-#: ../src/empathy-debug-window.c:1912
-msgid "Debug Window"
-msgstr "调试窗口"
+#~ msgid "%A %B %d %Y"
+#~ msgstr "%A %B %d %Y"
 
-#: ../src/empathy-debug-window.c:1970
-msgid "Send to pastebin"
-msgstr "发送到 pastebin"
+#~ msgid "_Block User"
+#~ msgstr "屏蔽用户(_B)"
 
-#: ../src/empathy-debug-window.c:2009
-msgid "Pause"
-msgstr "暂停"
+#~ msgid "Decide _Later"
+#~ msgstr "以后再决定(_L)"
 
-#: ../src/empathy-debug-window.c:2021
-msgid "Level "
-msgstr "级别 "
+#~ msgid "Classic"
+#~ msgstr "经典"
 
-#: ../src/empathy-debug-window.c:2040
-msgid "Debug"
-msgstr "调试"
+#~ msgid "Simple"
+#~ msgstr "简洁"
 
-#: ../src/empathy-debug-window.c:2045
-msgid "Info"
-msgstr "信息"
+#~ msgid "Clean"
+#~ msgstr "清爽"
 
-#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
-msgid "Message"
-msgstr "消息"
+#~ msgid "Blue"
+#~ msgstr "蓝色"
 
-#: ../src/empathy-debug-window.c:2055
-msgid "Warning"
-msgstr "警告"
+#~ msgid "Failed to retrieve your personal information from the server."
+#~ msgstr "从服务器获取您的个人信息失败。"
 
-#: ../src/empathy-debug-window.c:2060
-msgid "Critical"
-msgstr "危急"
+#~ msgid "_Enable"
+#~ msgstr "启用(_E)"
 
-#: ../src/empathy-debug-window.c:2065
-msgid "Error"
-msgstr "错误"
+#~ msgid "_Disable"
+#~ msgstr "禁用(_D)"
 
-#: ../src/empathy-debug-window.c:2084
-msgid "Time"
-msgstr "时间"
+#~ msgid "Contrast"
+#~ msgstr "对比度"
 
-#: ../src/empathy-debug-window.c:2087
-msgid "Domain"
-msgstr "域"
+#~ msgid "Brightness"
+#~ msgstr "亮度"
 
-#: ../src/empathy-debug-window.c:2089
-msgid "Category"
-msgstr "类别"
+#~ msgid "Gamma"
+#~ msgstr "伽马"
 
-#: ../src/empathy-debug-window.c:2091
-msgid "Level"
-msgstr "级别"
+#~ msgid "Volume"
+#~ msgstr "音量"
 
-#: ../src/empathy-debug-window.c:2114
-msgid ""
-"The selected connection manager does not support the remote debugging "
-"extension."
-msgstr "已选定的连接管理不支持远程调试扩展"
+#~ msgid "_Sidebar"
+#~ msgstr "侧边栏(_S)"
 
-#: ../src/empathy-invite-participant-dialog.c:200
-#: ../src/empathy-invite-participant-dialog.c:228
-msgid "Invite Participant"
-msgstr "邀请参与者"
+#~ msgid "Audio input"
+#~ msgstr "音频输入"
 
-#: ../src/empathy-invite-participant-dialog.c:201
-msgid "Choose a contact to invite into the conversation:"
-msgstr "选择一个联系人以加入该会话："
+#~ msgid "Video input"
+#~ msgstr "视频输入"
 
-#: ../src/empathy-invite-participant-dialog.c:224
-msgid "Invite"
-msgstr "邀请"
+#~ msgid "Dialpad"
+#~ msgstr "电话键盘"
 
-#: ../src/empathy-accounts.c:180
-msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "不显示任何对话框；完成所有工作（如导入）然后退出"
+#~ msgid "Details"
+#~ msgstr "详细信息"
 
-#: ../src/empathy-accounts.c:184
-msgid ""
-"Don't display any dialogs unless there are only \"People Nearby\" accounts"
-msgstr "只有“附近的人”帐号的时候不显示任何对话框"
+#~ msgctxt "codec"
+#~ msgid "Unknown"
+#~ 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)"
+#~ msgid "Connected — %d:%02dm"
+#~ msgstr "已连接 — %d:%02dm"
 
-#: ../src/empathy-accounts.c:190
-msgid "<account-id>"
-msgstr "<帐号 ID>"
+#~ msgid "Send Video"
+#~ msgstr "发送视频"
 
-#: ../src/empathy-accounts.c:195
-msgid "- Empathy Accounts"
-msgstr "- Empathy 帐号"
+#~ msgid "Send Audio"
+#~ msgstr "发送音频"
 
-#: ../src/empathy-accounts.c:231
-msgid "Empathy Accounts"
-msgstr "Empathy 帐号"
+#~ msgid "Top up %s (%s)..."
+#~ msgstr "给 %s 充值(%s)..."
 
-#: ../src/empathy-debugger.c:69
-msgid "Show a particular service"
-msgstr "显示特定的服务"
+#~ msgid "Top Up..."
+#~ msgstr "充值..."
 
-#: ../src/empathy-debugger.c:74
-msgid "- Empathy Debugger"
-msgstr "- Empathy 调试器"
+#~ msgid "_Offline Contacts"
+#~ msgstr "离线联系人(_O)"
 
-#: ../src/empathy-debugger.c:113
-msgid "Empathy Debugger"
-msgstr "Empathy 调试器"
+#~ msgid "Show P_rotocols"
+#~ msgstr "显示协议(_R)"
 
-#: ../src/empathy-chat.c:109
-msgid "- Empathy Chat Client"
-msgstr " - Empathy IM 客户端"
+#~ msgid "Credit Balance"
+#~ msgstr "帐号余额"
 
-#: ../src/empathy-notifications-approver.c:189
-msgid "Respond"
-msgstr "响应"
+#~ msgid "Contacts on a _Map"
+#~ msgstr "联系人地图(_M)"
 
-#: ../src/empathy-notifications-approver.c:203
-#: ../src/empathy-call-window.c:1529
-msgid "Reject"
-msgstr "拒绝"
+#~ msgid "Find in Contact _List"
+#~ msgstr "在联系人列表中查找(_L)"
 
-#: ../src/empathy-notifications-approver.c:208
-#: ../src/empathy-notifications-approver.c:213
-#: ../src/empathy-call-window.c:1530
-msgid "Answer"
-msgstr "接听"
+#~ msgid "Sort by _Name"
+#~ msgstr "按姓名排序(_N)"
 
-#: ../src/empathy-notifications-approver.c:213
-msgid "Answer with video"
-msgstr "以视频应答"
+#~ msgid "Sort by _Status"
+#~ msgstr "按状态排序(_S)"
 
-#: ../src/empathy-notifications-approver.c:221
-#: ../src/empathy-notifications-approver.c:231
-msgid "Decline"
-msgstr "拒绝"
+#~ msgid "Normal Size With _Avatars"
+#~ msgstr "扩展视图(_A)"
 
-#: ../src/empathy-notifications-approver.c:225
-#: ../src/empathy-notifications-approver.c:236
-msgid "Accept"
-msgstr "接受"
+#~ msgid "N_ormal Size"
+#~ msgstr "常规视图(_O)"
 
-#. 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 "提供"
+#~ msgid "_Compact Size"
+#~ msgstr "紧凑视图(_C)"
 
-#: ../src/empathy-call-observer.c:132
-#, c-format
-msgid "%s just tried to call you, but you were in another call."
-msgstr "%s 刚刚尝试呼叫您，但您当时正在与其他人通话。"
+#~ msgid "Could not start room listing"
+#~ msgstr "无法开始聊天室列表"
 
-#. Translators: this is an "Info" label. It should be as short
-#. * as possible.
-#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
-msgid "i"
-msgstr "i"
+#~ msgid "Could not stop room listing"
+#~ msgstr "无法停止聊天室列表"
 
-#: ../src/empathy-call-window.c:2883
-msgid "On hold"
-msgstr "挂起"
+#~ msgid "Appearance"
+#~ msgstr "外观"
 
-#: ../src/empathy-call-window.c:2886
-msgid "Mute"
-msgstr "静音"
+#~ msgid "Redial"
+#~ msgstr "重拨"
 
-#: ../src/empathy-call-window.c:2888
-msgid "Duration"
-msgstr "时长"
+#~ msgid "V_ideo"
+#~ msgstr "视频(_I)"
 
-#. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2891
-#, c-format
-msgid "%s — %d:%02dm"
-msgstr "%s — %d:%02dm"
+#~ msgid "Video Off"
+#~ msgstr "视频关闭"
 
-#: ../src/empathy-call-window.c:3161
-#, c-format
-msgid "Your current balance is %s."
-msgstr "您当前的余额为 %s。"
+#~ msgid "Video Preview"
+#~ msgstr "视频预览"
 
-#: ../src/empathy-call-window.c:3165
-msgid "Sorry, you don’t have enough credit for that call."
-msgstr "对不起，您信用卡余额不足以支付此次通话。"
+#~ msgid "Video On"
+#~ msgstr "视频开启"
 
-#: ../src/empathy-call-window.c:3167
-msgid "Top Up"
-msgstr "充值"
+#~ msgid "Call the contact again"
+#~ msgstr "再次呼叫联系人"
 
-#: ../libempathy-gtk/empathy-search-bar.c:243
-msgid "_Match case"
-msgstr "区分大小写(_M)"
+#~ msgid "Camera Off"
+#~ msgstr "相机关闭"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "您已经拥有哪个类型的帐号？"
+#~ msgid "Disable camera and stop sending video"
+#~ msgstr "禁用相机停止发送视频"
 
-#: ../libempathy-gtk/empathy-new-account-dialog.c:166
-msgid "Adding new account"
-msgstr "添加新帐号"
+#~ msgid "Preview"
+#~ msgstr "预览"
 
-#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
-msgid "People nearby"
-msgstr "附近的人"
+#~ msgid "Enable camera but don't send video"
+#~ 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 可以自动发现和您连接到同一个网络中的人们，并且可以和他们聊天。如果您"
-"想使用这个功能，请仔细查看下列信息是否正确。"
+#~ msgid "Camera On"
+#~ msgstr "相机开启"
 
-#: ../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 "Enable camera and send video"
+#~ msgstr "启用相机，并发送视频"
+
+#~ msgid "Contact Map View"
+#~ msgstr "联系地图视图"
 
 #~ msgid "There was an error while importing the accounts."
 #~ msgstr "导入帐号时发生错误。"
@@ -4609,9 +4468,6 @@ 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 "您想创建那种类型的帐号？"
 
@@ -4677,24 +4533,15 @@ msgstr ""
 #~ 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 进行了编辑。"
 
@@ -4717,9 +4564,6 @@ msgstr ""
 #~ msgid "_Edit"
 #~ msgstr "编辑(_E)"
 
-#~ msgid "Linked Contacts"
-#~ msgstr "已绑定的联系人"
-
 #~ msgid "Select contacts to link"
 #~ msgstr "选择要绑定的联系人"
 
@@ -4790,15 +4634,9 @@ msgstr ""
 #~ msgid "Whether Empathy has migrated butterfly logs."
 #~ msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
 
-#~ msgid "Ungrouped"
-#~ msgstr "未分组"
-
 #~ msgid "Favorite People"
 #~ msgstr "收藏夹"
 
-#~ msgid "Select a contact"
-#~ msgstr "选择一个联系"
-
 #~ msgid "Contact ID:"
 #~ msgstr "联系人 ID："
 
@@ -4877,9 +4715,6 @@ msgstr ""
 #~ msgid "Saved Status Messages"
 #~ msgstr "保存状态信息"
 
-#~ msgid "_Enabled"
-#~ msgstr "已启用(_E)"
-
 #~ msgid "The hash of the received file and the sent one do not match"
 #~ msgstr "接收到的文件和发送的那个文件哈希值不匹配"
 
@@ -4938,9 +4773,6 @@ msgstr ""
 #~ msgid "Failed to reconnect this chat"
 #~ msgstr "重新连接到对话失败"
 
-#~ msgid "Failed to join chat room"
-#~ msgstr "加入聊天室失败"
-
 #~ msgid "Select a destination"
 #~ msgstr "选择目的地"
 
@@ -5003,12 +4835,6 @@ msgstr ""
 #~ msgid "Unknown error"
 #~ msgstr "未知的错误"
 
-#~ msgid "_Join..."
-#~ msgstr "加入(_J)..."
-
-#~ msgid "_New Conversation..."
-#~ msgstr "新建对话(_N)..."
-
 #~ msgid "Unable to start application for service %s: %s"
 #~ msgstr "不能启动应用程序为 %s: %s 服务"
 
@@ -5231,9 +5057,6 @@ msgstr ""
 #~ msgid "Join _New..."
 #~ msgstr "加入新聊天室(_N)..."
 
-#~ msgid "Show _Offline Contacts"
-#~ msgstr "显示离线联系人(_O)"
-
 #~ msgid "Chat Rooms"
 #~ msgstr "聊天室"