local-xmpp-assistant-widget: increase row-spacing

[empathy.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7c49c1c6b707b4e5b2ce8e83e056fe9e87da3395..0a32f1cbebe5bb35d2386663bac86653263e38b0 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,1222 +13,1498 @@
 # Richard Ma <richard.ma.19850509@gmail.com>, 2009.
 # Tao Wei <weitao1979@gmail.com>, 2009.
 # Tao Wang <dancefire@gmail.com>, 2010.
+# Dean Lee <xslidian@gmail.com>, 2010.
 # Aron Xu <happyaron.xu@gmail.com>, 2009, 2010.
+# Wylmer Wang <wantinghard@gmail.com>, 2010-2012.
+# zhen liu  <liuzhen1191@gmail.com>, 2011
+# Yangtse Su <yangtsesu@gmail.com>, 2011
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=empathy&component=general\n"
-"POT-Creation-Date: 2010-07-16 08:58+0000\n"
-"PO-Revision-Date: 2010-07-17 15:37+0800\n"
-"Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
+"product=empathy&keywords=I18N+L10N&component=General\n"
+"POT-Creation-Date: 2012-02-15 21:22+0000\n"
+"PO-Revision-Date: 2012-02-14 13:52+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Chat on Google Talk, Facebook, MSN, and many other chat services"
-msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务"
-
-#: ../data/empathy.desktop.in.in.h:2
 msgid "Empathy"
 msgstr "Empathy"
 
+#: ../data/empathy.desktop.in.in.h:2
+msgid "IM Client"
+msgstr "即时通讯客户端"
+
 #: ../data/empathy.desktop.in.in.h:3
 msgid "Empathy Internet Messaging"
-msgstr "Empathy 互联网通讯"
+msgstr "Empathy 即时通讯程序"
 
 #: ../data/empathy.desktop.in.in.h:4
-msgid "IM Client"
-msgstr "IM 客户端"
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
-msgid "Always open a separate chat window for new chats."
-msgstr "总是为新聊天打开单独的聊天窗口。"
+msgid "Connection managers should be used"
+msgstr "应该使用连接管理器"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
-"Character to add after nickname when using nick completion (tab) in group "
-"chat."
-msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "是否使用连接管理器自动断开连接或重新连接。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:3
-msgid "Chat window theme"
-msgstr "聊天窗口主题"
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy 启动时是否自动连接"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:4
-msgid ""
-"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "用于拼写检查器的语言的列表，以逗号分隔(例如：en, fr, nl)。"
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy 是否在启动时自动登入您的帐号。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:5
-msgid "Compact contact list"
-msgstr "紧凑显示联系人列表"
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy 空闲时是否自动离开"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:6
-msgid "Connection managers should be used"
-msgstr "应该使用连接管理器"
+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
-msgid "Contact list sort criterion"
-msgstr "联系人列表排序条件"
+msgid "Empathy default download folder"
+msgstr "Empathy 默认下载文件夹"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:8
-msgid "Default directory to select an avatar image from"
-msgstr "默认的选取头像图片的目录"
+msgid "The default folder to save file transfers in."
+msgstr "保存传送文件的默认文件夹。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:9
-msgid "Disable popup notifications when away"
-msgstr "离å¼\80æ\97¶ç¦\81ç\94¨å¼¹å\87ºæ\8f\90示"
+msgid "Show offline contacts"
+msgstr "æ\98¾ç¤ºç¦»çº¿è\81\94系人"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:10
-msgid "Disable sounds when away"
-msgstr "离开时禁用声音"
+msgid "Whether to show contacts that are offline in the contact list."
+msgstr "是否显示联系人清单中离线的联系人。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:11
-msgid "Display incoming events in the status area"
-msgstr "在状态栏显示呼入事件。"
+msgid "Show avatars"
+msgstr "显示头像"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid ""
-"Display incoming events in the status area. If false present them right away "
-"to the user."
-msgstr "在状态栏显示呼入事件。如果为 false 则立即显示给用户。"
+"Whether to show avatars for contacts in the contact list and chat windows."
+msgstr "是否在联系人列表和聊天窗口中显示头像。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:13
-msgid "Empathy can publish the user's location"
-msgstr "Empathy è\83½å¤\9få\8f\91å¸\83ç\94¨æ\88·ç\9a\84ä½\8dç½®"
+msgid "Show protocols"
+msgstr "æ\98¾ç¤ºå\8d\8fè®®"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:14
-msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy 能够通过 GPS 来估计位置"
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "是否在联系人列表和聊天窗口中显示协议。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:15
-msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 能够通过手机来估计位置"
+msgid "Show Balance in contact list"
+msgstr "在联系人列表中显示余额"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:16
-msgid "Empathy can use the network to guess the location"
-msgstr "Empathy 能够通过网络来估计位置"
+msgid "Whether to show account balances in the contact list."
+msgstr "是否在联系人列表和聊天窗口中显示余额。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:17
-msgid "Empathy default download folder"
-msgstr "Empathy 默认下载文件夹"
+msgid "Compact contact list"
+msgstr "紧凑显示联系人列表"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy 已经询问导入账户"
+msgid "Whether to show the contact list in compact mode."
+msgstr "是否以紧凑模式显示联系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:19
-msgid "Empathy has migrated butterfly logs"
-msgstr "Empathy 已迁移 telepathy-butterfly 日志"
+msgid "Hide main window"
+msgstr "隐藏主窗口"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:20
-msgid "Empathy should auto-away when idle"
-msgstr "Empathy 空闲时是否自动离开"
+msgid "Hide the main window."
+msgstr "隐藏主窗口。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:21
-msgid "Empathy should auto-connect on startup"
-msgstr "Empathy 启动时是否自动连接"
+msgid "Default directory to select an avatar image from"
+msgstr "默认的选取头像图片的目录"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:22
-msgid "Empathy should reduce the location's accuracy"
-msgstr "降低 Emapthy 位置信息的准确度"
+msgid "The last directory that an avatar image was chosen from."
+msgstr "上次选取头像图片的目录。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:23
-msgid "Empathy should use the avatar of the contact as the chat window icon"
-msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
+msgid "Open new chats in separate windows"
+msgstr "在单独窗口中打开新聊天"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:24
-msgid "Enable WebKit Developer Tools"
-msgstr "启用 WebKit 开发工具"
+msgid "Always open a separate chat window for new chats."
+msgstr "总是为新聊天打开单独的聊天窗口。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:25
-msgid "Enable popup notifications for new messages"
-msgstr "å\90¯ç\94¨æ\96°æ¶\88æ\81¯å¼¹å\87ºæ\8f\90示"
+msgid "Display incoming events in the status area"
+msgstr "å\9c¨ç\8a¶æ\80\81æ \8fæ\98¾ç¤ºå\91¼å\85¥äº\8b件ã\80\82"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:26
-msgid "Enable spell checker"
-msgstr "启用拼写检查器"
+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
-msgid "Hide main window"
-msgstr "隐藏主窗口"
+msgid "The position for the chat window side pane"
+msgstr "聊天窗口边栏的位置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:28
-msgid "Hide the main window."
-msgstr "隐藏主窗口。"
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "聊天窗口边栏保存的位置(像素)。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:29
-msgid "Nick completed character"
-msgstr "æ\98µç§°è¡¥å\85¨å­\97符"
+msgid "Show contact groups"
+msgstr "æ\98¾ç¤ºè\81\94系人å\88\86ç»\84"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:30
-msgid "Open new chats in separate windows"
-msgstr "在单独窗口中打开新聊天"
+msgid "Whether to show groups in the contact list."
+msgstr "是否在联系人列表中显示分组。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:31
-msgid "Path of the Adium theme to use"
-msgstr "Adium 主题的路径"
+msgid "Contact list sort criterion"
+msgstr "联系人列表排序条件"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:32
-msgid "Path of the Adium theme to use if the theme used for chat is Adium."
-msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径"
+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
-msgid "Play a sound for incoming messages"
-msgstr "收到消息时播放声音"
+msgid "Use notification sounds"
+msgstr "使用通知声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:34
-msgid "Play a sound for new conversations"
-msgstr "æ\96°å¯¹è¯\9dæ\97¶æ\92­æ\94¾å£°é\9f³"
+msgid "Whether to play a sound to notify of events."
+msgstr "æ\98¯å\90¦é\9c\80è¦\81äº\8b件æ\8f\90示é\9f³ã\80\82"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:35
-msgid "Play a sound for outgoing messages"
-msgstr "发出消息时播放声音"
+msgid "Disable sounds when away"
+msgstr "离开时禁用声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:36
-msgid "Play a sound when a contact logs in"
-msgstr "联系人登录时播放声音"
+msgid "Whether to play sound notifications when away or busy."
+msgstr "当离开或忙碌时是否使用声音提示。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:37
-msgid "Play a sound when a contact logs out"
-msgstr "联系人注销时播放声音"
+msgid "Play a sound for incoming messages"
+msgstr "收到消息时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:38
-msgid "Play a sound when we log in"
-msgstr "登录时播放声音"
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "是否需要消息到达提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:39
-msgid "Play a sound when we log out"
-msgstr "注销时播放声音"
+msgid "Play a sound for outgoing messages"
+msgstr "发出消息时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:40
-msgid "Pop up notifications if the chat isn't focused"
-msgstr "如果聊天窗口不是焦点则弹出消息通知"
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "是否为外出消息使用声音提示。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:41
-msgid "Pop up notifications when a contact logs in"
-msgstr "当联系人登录时弹出通知"
+msgid "Play a sound for new conversations"
+msgstr "新对话时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:42
-msgid "Pop up notifications when a contact logs out"
-msgstr "当联系人注销时弹出通知"
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "是否需要新会话提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:43
-msgid "Show avatars"
-msgstr "显示头像"
+msgid "Play a sound when a contact logs in"
+msgstr "联系人登录时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:44
-msgid "Show contact list in rooms"
-msgstr "在聊天室显示联系人列表"
+msgid "Whether to play a sound to notify of contacts logging into the network."
+msgstr "是否需要联系人上线提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:45
-msgid "Show hint about closing the main window"
-msgstr "关闭主窗口时显示提示"
+msgid "Play a sound when a contact logs out"
+msgstr "联系人注销时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:46
-msgid "Show offline contacts"
-msgstr "显示离线联系人"
+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
-msgid "Show protocols"
-msgstr "显示协议"
+msgid "Play a sound when we log in"
+msgstr "登录时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:48
-msgid "Spell checking languages"
-msgstr "拼写检查器语言"
+msgid "Whether to play a sound when logging into a network."
+msgstr "当联网登录时是否播放提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:49
-msgid "The default folder to save file transfers in."
-msgstr "保存传送文件的默认文件夹。"
+msgid "Play a sound when we log out"
+msgstr "注销时播放声音"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:50
-msgid "The last directory that an avatar image was chosen from."
-msgstr "上次选取头像图片的目录。"
+msgid "Whether to play a sound when logging out of a network."
+msgstr "当网络断开时是否播放提示音。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:51
-msgid "The position for the chat window side pane"
-msgstr "聊天窗口边栏的位置"
+msgid "Enable popup notifications for new messages"
+msgstr "启用新消息弹出提示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:52
-msgid "The stored position (in pixels) of the chat window side pane."
-msgstr "聊天窗口边栏保存的位置(像素)。"
+msgid "Whether to show a popup notification when receiving a new message."
+msgstr "当收到新消息时是否弹出显示提示框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:53
-msgid "The theme that is used to display the conversation in chat windows."
-msgstr "ç\94¨äº\8eå\9c¨è\81\8a天çª\97å\8f£ä¸­æ\98¾ç¤ºä¼\9aè¯\9dç\9a\84主é¢\98ã\80\82"
+msgid "Disable popup notifications when away"
+msgstr "离å¼\80æ\97¶ç¦\81ç\94¨å¼¹å\87ºæ\8f\90示"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:54
-msgid "Use graphical smileys"
-msgstr "使用表情图标"
+msgid "Whether to show popup notifications when away or busy."
+msgstr "当离开或忙碌时是否弹出显示提示框。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:55
-msgid "Use notification sounds"
-msgstr "使用通知声音"
+msgid "Pop up notifications if the chat isn't focused"
+msgstr "如果聊天窗口不是焦点则弹出消息通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:56
-msgid "Use theme for chat rooms"
-msgstr "为聊天室使用主题"
+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
-msgid "Whether Empathy can publish the user's location to their contacts."
-msgstr "是否允许 Empathy 将用户的位置共享给联系人"
+msgid "Pop up notifications when a contact logs in"
+msgstr "当联系人登录时弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:58
-msgid "Whether Empathy can use the GPS to guess the location."
-msgstr "是否允许 Empathy 通过 GPS 估计位置"
+msgid "Whether to show a popup notification when a contact goes online."
+msgstr "当联系人上线时是否显示弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:59
-msgid "Whether Empathy can use the cellular network to guess the location."
-msgstr "是否允许 Empathy 通过手机网络估计位置"
+msgid "Pop up notifications when a contact logs out"
+msgstr "当联系人注销时弹出通知"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:60
-msgid "Whether Empathy can use the network to guess the location."
-msgstr "是否允许 Empathy 通过网络估计位置"
+msgid "Whether to show a popup notification when a contact goes offline."
+msgstr "当联系人离线时是否显示弹出通知。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Empathy 是否应该已经询问过要从其它程序中导入账户。"
+msgid "Use graphical smileys"
+msgstr "使用表情图标"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:62
-msgid "Whether Empathy has migrated butterfly logs."
-msgstr "Empathy 是否迁移 telepathy-butterfly 日志。"
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "对话时是否将表情符号转换为表情图标。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:63
-msgid "Whether Empathy should automatically log into your accounts on startup."
-msgstr "Empathy 是否在启动时自动登入您的账户。"
+msgid "Show contact list in rooms"
+msgstr "在聊天室显示联系人列表"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:64
-msgid "Whether Empathy should go into away mode automatically if user is idle."
-msgstr "Empathy 是否在空闲时自动进入离开状态"
+msgid "Whether to show the contact list in chat rooms."
+msgstr "是否在聊天室显示联系人列表。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:65
-msgid ""
-"Whether Empathy should reduce the location's accuracy for privacy reasons."
-msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
+msgid "Chat window theme"
+msgstr "聊天窗口主题"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:66
-msgid ""
-"Whether Empathy should use the avatar of the contact as the chat window icon."
-msgstr "是否使用联系人的头像作为聊天窗口的图标。"
+msgid "The theme that is used to display the conversation in chat windows."
+msgstr "用于在聊天窗口中显示会话的主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:67
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "WebKit 开发工具，例如 Web Inspector 是否应该启用。"
+msgid "Chat window theme variant"
+msgstr "聊天窗口主题衍生"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid ""
-"Whether connectivity managers should be used to automatically disconnect/"
-"reconnect."
-msgstr "是否使用连接管理器自动断开连接或重新连接。"
+"The theme variant that is used to display the conversation in chat windows."
+msgstr "用于在聊天窗口中显示会话的主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:69
-msgid ""
-"Whether to check words typed against the languages you want to check with."
-msgstr "是否对您想要作拼写检查的单词作拼写检查。"
+msgid "Path of the Adium theme to use"
+msgstr "Adium 主题的路径"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:70
-msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "对è¯\9dæ\97¶æ\98¯å\90¦å°\86表æ\83\85符å\8f·è½¬æ\8d¢ä¸ºè¡¨æ\83\85å\9b¾æ \87ã\80\82"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "å¦\82æ\9e\9cè\81\8a天使ç\94¨ Adium 主é¢\98ï¼\8c使ç\94¨ Adium 主é¢\98ç\9a\84è·¯å¾\84"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:71
-msgid "Whether to play a sound to notify of contacts logging into the network."
-msgstr "是否需要联系人上线提示音。"
+msgid "Enable WebKit Developer Tools"
+msgstr "启用 WebKit 开发工具"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid ""
-"Whether to play a sound to notify of contacts logging out of the network."
-msgstr "是否需要联系人下线提示音。"
+"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
-msgid "Whether to play a sound to notify of events."
-msgstr "是否需要事件提示音。"
+msgid "Inform other users when you are typing to them"
+msgstr "告诉他人您正在输入"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:74
-msgid "Whether to play a sound to notify of incoming messages."
-msgstr "是否需要消息到达提示音。"
+msgid ""
+"Whether to send the 'composing' or 'paused' chat states. Does not currently "
+"affect the 'gone' state."
+msgstr ""
+"是否发送“编写中”(composing)或“暂停”(paused)的聊天状态。目前不影响“已离"
+"开”(gone)状态"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:75
-msgid "Whether to play a sound to notify of new conversations."
-msgstr "是否需要新会话提示音。"
+msgid "Use theme for chat rooms"
+msgstr "为聊天室使用主题"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:76
-msgid "Whether to play a sound to notify of outgoing messages."
-msgstr "是否为外出消息使用声音提示。"
+msgid "Whether to use the theme for chat rooms."
+msgstr "是否对聊天室使用主题。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:77
-msgid "Whether to play a sound when logging into a network."
-msgstr "当联网登录时是否播放提示音。"
+msgid "Spell checking languages"
+msgstr "拼写检查器语言"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:78
-msgid "Whether to play a sound when logging out of a network."
-msgstr "当网络断开时是否播放提示音。"
+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
-msgid "Whether to play sound notifications when away or busy."
-msgstr "å½\93离å¼\80æ\88\96å¿\99ç¢\8cæ\97¶æ\98¯å\90¦ä½¿ç\94¨å£°é\9f³æ\8f\90示ã\80\82"
+msgid "Enable spell checker"
+msgstr "å\90¯ç\94¨æ\8b¼å\86\99æ£\80æ\9f¥å\99¨"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:80
-msgid "Whether to show a popup notification when a contact goes offline."
-msgstr "当联系人离线时是否显示弹出通知。"
+msgid ""
+"Whether to check words typed against the languages you want to check with."
+msgstr "是否对您想要作拼写检查的单词作拼写检查。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:81
-msgid "Whether to show a popup notification when a contact goes online."
-msgstr "当联系人上线时是否显示弹出通知"
+msgid "Nick completed character"
+msgstr "昵称补全字符"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
-"Whether to show a popup notification when receiving a new message even if "
-"the chat is already opened, but not focused."
-msgstr "å½\93æ\8e¥æ\94¶æ\96°æ¶\88æ\81¯æ\97¶æ\98¯å\90¦æ\98¾ç¤ºå¼¹å\87ºæ\8f\90示ï¼\8cå\8d³ä½¿è\81\8a天çª\97å\8f£å·²æ\89\93å¼\80ï¼\8cä½\86æ\98¯ä¸\8då\9c¨ç\84¦ç\82¹ä¸\8a。"
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr "å\9c¨ç¾¤è\81\8a中使ç\94¨æ\98µç§°è¡¥å\85¨æ\97¶å\9c¨æ\98µç§°å\90\8eé\9d¢æ·»å\8a ç\9a\84å­\97符。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:83
-msgid "Whether to show a popup notification when receiving a new message."
-msgstr "当收到新消息时是否弹出显示提示框。"
+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
 msgid ""
-"Whether to show avatars for contacts in the contact list and chat windows."
-msgstr "是否在联系人列表和聊天窗口中显示头像。"
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "是否使用联系人的头像作为聊天窗口的图标。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:85
-msgid "Whether to show contacts that are offline in the contact list."
-msgstr "是否显示联系人清单中离线的联系人。"
+msgid "Last account selected in Join Room dialog"
+msgstr "在加入聊天室对话框中最后选择的帐号"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:86
-msgid "Whether to show popup notifications when away or busy."
-msgstr "当离开或忙碌时是否弹出显示提示框。"
+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
-msgid "Whether to show protocols for contacts in the contact list."
-msgstr "是否在联系人列表和聊天窗口中显示协议。"
+msgid "Camera device"
+msgstr "相机设备"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:88
-msgid "Whether to show the contact list in chat rooms."
-msgstr "是否在聊天室显示联系人列表。"
+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
-msgid "Whether to show the contact list in compact mode."
-msgstr "是否以紧凑模式显示联系人列表。"
+msgid "Camera position"
+msgstr "相机位置"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:90
-msgid ""
-"Whether to show the message dialog about closing the main window with the "
-"'x' button in the title bar."
-msgstr "是否对使用标题栏中的“X”按钮关闭主窗口显示消息对话框。"
+msgid "Position the camera preview should be during a call."
+msgstr "在通话时摄像头预览的位置。"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:91
-msgid "Whether to use the theme for chat rooms."
-msgstr "是否对聊天室使用主题。"
+msgid "Echo cancellation support"
+msgstr "回声抑制支持"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+msgid "Whether to enable Pulseaudio's echo cancellation filter."
+msgstr "是否启用 Pulseaudio 的回声抑制过滤器。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:93
+msgid "Show hint about closing the main window"
+msgstr "关闭主窗口时显示提示"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:94
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to sort by "
-"the contact's name with the value \"name\". A value of \"state\" will sort "
-"the contact list by state."
-msgstr ""
-"使用何种条件来排序联系人列表。默认情况下使用值“name”以按联系人姓名排序。取值"
-"为“state“时将按状态排序联系人列表。"
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "当使用标题栏中的“X”按钮关闭主窗口时是否显示提示对话框。"
 
-#: ../data/empathy-accounts.desktop.in.in.h:1
-msgid "Manage Messaging and VoIP accounts"
-msgstr "管理消息和 VoIP 帐户"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:95
+msgid "Empathy can publish the user's location"
+msgstr "Empathy 能够发布用户的位置"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2094 ../src/cc-empathy-accounts-page.c:244
-#: ../src/cc-empathy-accounts-panel.c:91
-msgid "Messaging and VoIP Accounts"
-msgstr "消息和 VoIP 帐户"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:96
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "是否允许 Empathy 将用户的位置共享给联系人"
 
-#: ../libempathy/empathy-ft-handler.c:843
-msgid "The hash of the received file and the sent one do not match"
-msgstr "接收到的文件和发送的那个文件哈希值不匹配"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:97
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy 能够通过网络来估计位置"
 
-#: ../libempathy/empathy-ft-handler.c:1103
-msgid "File transfer not supported by remote contact"
-msgstr "æ\96\87ä»¶ä¼ è¾\93ä¸\8dæ\94¯æ\8c\81è¿\9cç¨\8bè¿\9eæ\8e¥"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:98
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "æ\98¯å\90¦å\85\81许 Empathy é\80\9aè¿\87ç½\91ç»\9c估计ä½\8dç½®"
 
-#: ../libempathy/empathy-ft-handler.c:1161
-msgid "The selected file is not a regular file"
-msgstr "所选文件是非正常的文件"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:99
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy 能够通过手机来估计位置"
 
-#: ../libempathy/empathy-ft-handler.c:1170
-msgid "The selected file is empty"
-msgstr "所选文件是空的"
+#: ../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
+msgid "Empathy should reduce the location's accuracy"
+msgstr "降低 Emapthy 位置信息的准确度"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:104
+msgid ""
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2330
+msgid "Messaging and VoIP Accounts"
+msgstr "消息和 VoIP 帐号"
 
-#: ../libempathy/empathy-tp-file.c:281
-msgid "Socket type not supported"
-msgstr "不支持 Socket 类型"
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管理消息和 VoIP 帐号"
 
-#: ../libempathy/empathy-tp-file.c:400
+#: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-tp-file.c:403
+#: ../libempathy/empathy-ft-handler.c:739
 msgid "The change in state was requested"
 msgstr "需要状态改变信息"
 
-#: ../libempathy/empathy-tp-file.c:406
+#: ../libempathy/empathy-ft-handler.c:742
 msgid "You canceled the file transfer"
 msgstr "您取消了文件传输"
 
-#: ../libempathy/empathy-tp-file.c:409
+#: ../libempathy/empathy-ft-handler.c:745
 msgid "The other participant canceled the file transfer"
 msgstr "另外的参与者取消了文件的传输"
 
-#: ../libempathy/empathy-tp-file.c:412
+#: ../libempathy/empathy-ft-handler.c:748
 msgid "Error while trying to transfer the file"
 msgstr "当传输这个文件的时候发生错误"
 
-#: ../libempathy/empathy-tp-file.c:415
+#: ../libempathy/empathy-ft-handler.c:751
 msgid "The other participant is unable to transfer the file"
 msgstr "另外的参与者无法传输这个文件"
 
-#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:315
+#: ../libempathy/empathy-ft-handler.c:754 ../libempathy/empathy-utils.c:313
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../libempathy/empathy-utils.c:238
+#: ../libempathy/empathy-ft-handler.c:917
+msgid "File transfer completed, but the file was corrupted"
+msgstr "文件传输完成，但该文件已损坏"
+
+#: ../libempathy/empathy-ft-handler.c:1203
+msgid "File transfer not supported by remote contact"
+msgstr "文件传输不支持远程连接"
+
+#: ../libempathy/empathy-ft-handler.c:1259
+msgid "The selected file is not a regular file"
+msgstr "所选文件是非正常的文件"
+
+#: ../libempathy/empathy-ft-handler.c:1268
+msgid "The selected file is empty"
+msgstr "所选文件是空的"
+
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#, c-format
+msgid "Missed call from %s"
+msgstr "未接来电：%s"
+
+#. Translators: this is an outgoing call, e.g. 'Called Alice'
+#: ../libempathy/empathy-message.c:419
+#, c-format
+msgid "Called %s"
+msgstr "与 %s 通话"
+
+#: ../libempathy/empathy-message.c:422
+#, c-format
+msgid "Call from %s"
+msgstr "来电：%s"
+
+#: ../libempathy/empathy-utils.c:233
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:235
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:243
+#: ../libempathy/empathy-utils.c:238
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:245
+#: ../libempathy/empathy-utils.c:240
 msgid "Invisible"
 msgstr "隐身"
 
-#: ../libempathy/empathy-utils.c:247
+#: ../libempathy/empathy-utils.c:242
 msgid "Offline"
 msgstr "离线"
 
-#: ../libempathy/empathy-utils.c:249 ../src/empathy-call-window.c:1763
-#: ../src/empathy-call-window.c:1764 ../src/empathy-call-window.c:1765
-#: ../src/empathy-call-window.c:1766 ../src/empathy-call-window.ui.h:16
+#. translators: presence type is unknown
+#: ../libempathy/empathy-utils.c:245
+msgctxt "presence"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../libempathy/empathy-utils.c:287
+#: ../libempathy/empathy-utils.c:285
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-utils.c:289
+#: ../libempathy/empathy-utils.c:287 ../libempathy/empathy-utils.c:343
 msgid "Status is set to offline"
 msgstr "状态已设置为离线"
 
-#: ../libempathy/empathy-utils.c:291
+#: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
+#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../libempathy/empathy-utils.c:293
+#: ../libempathy/empathy-utils.c:291 ../libempathy/empathy-utils.c:325
 msgid "Authentication failed"
 msgstr "验证失败"
 
-#: ../libempathy/empathy-utils.c:295
+#: ../libempathy/empathy-utils.c:293 ../libempathy/empathy-utils.c:327
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../libempathy/empathy-utils.c:297
+#: ../libempathy/empathy-utils.c:295
 msgid "Name in use"
-msgstr "用户名已经被占用"
+msgstr "用户名已被占用"
 
-#: ../libempathy/empathy-utils.c:299
+#: ../libempathy/empathy-utils.c:297 ../libempathy/empathy-utils.c:329
 msgid "Certificate not provided"
 msgstr "未提供证书"
 
-#: ../libempathy/empathy-utils.c:301
+#: ../libempathy/empathy-utils.c:299 ../libempathy/empathy-utils.c:331
 msgid "Certificate untrusted"
 msgstr "证书不被信任"
 
-#: ../libempathy/empathy-utils.c:303
+#: ../libempathy/empathy-utils.c:301 ../libempathy/empathy-utils.c:333
 msgid "Certificate expired"
 msgstr "证书已过期"
 
-#: ../libempathy/empathy-utils.c:305
+#: ../libempathy/empathy-utils.c:303 ../libempathy/empathy-utils.c:335
 msgid "Certificate not activated"
 msgstr "证书尚未激活"
 
-#: ../libempathy/empathy-utils.c:307
+#: ../libempathy/empathy-utils.c:305 ../libempathy/empathy-utils.c:337
 msgid "Certificate hostname mismatch"
 msgstr "证书主机名不匹配"
 
-#: ../libempathy/empathy-utils.c:309
+#: ../libempathy/empathy-utils.c:307 ../libempathy/empathy-utils.c:339
 msgid "Certificate fingerprint mismatch"
 msgstr "证书指纹不匹配"
 
-#: ../libempathy/empathy-utils.c:311
+#: ../libempathy/empathy-utils.c:309 ../libempathy/empathy-utils.c:341
 msgid "Certificate self-signed"
 msgstr "证书是自签属的"
 
-#: ../libempathy/empathy-utils.c:313
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate error"
 msgstr "证书错误"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:345
+msgid "Encryption is not available"
+msgstr "加密不可用"
+
+#: ../libempathy/empathy-utils.c:347
+msgid "Certificate is invalid"
+msgstr "证书无效"
+
+#: ../libempathy/empathy-utils.c:349
+msgid "Connection has been refused"
+msgstr "连接被拒绝"
+
+#: ../libempathy/empathy-utils.c:351
+msgid "Connection can't be established"
+msgstr "无法建立连接"
+
+#: ../libempathy/empathy-utils.c:353
+msgid "Connection has been lost"
+msgstr "连接已丢失"
+
+#: ../libempathy/empathy-utils.c:355
+msgid "This account is already connected to the server"
+msgstr "该帐号已连接到服务器"
+
+#: ../libempathy/empathy-utils.c:357
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "连接已被使用相同资源的新连接取代"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "The account already exists on the server"
+msgstr "服务器上已存在该帐号"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Server is currently too busy to handle the connection"
+msgstr "服务器太忙，无法处理当前连接"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Certificate has been revoked"
+msgstr "证书已被吊销"
+
+# lainme：证书使用不安全的加密算法或是弱加密的
+# xslidian：证书使用的加密算法不安全或者易被破解
+#: ../libempathy/empathy-utils.c:366
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "证书使用不安全的加密算法或者是弱加密的"
+
+#: ../libempathy/empathy-utils.c:369
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr "服务器证书的长度——或服务器证书链的深度——超出了加密库的硬性限制"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Your software is too old"
+msgstr "你的软件版本太旧了"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Internal error"
+msgstr "内部错误"
+
+#: ../libempathy/empathy-utils.c:534
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:539
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:436
+#: ../libempathy/empathy-utils.c:568
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:569
 msgid "Facebook Chat"
 msgstr "Facebook 聊天"
 
-#: ../libempathy/empathy-time.c:137
+#: ../libempathy/empathy-time.c:90
 #, c-format
 msgid "%d second ago"
 msgid_plural "%d seconds ago"
 msgstr[0] "%d 秒钟前"
 
-#: ../libempathy/empathy-time.c:142
+#: ../libempathy/empathy-time.c:96
 #, c-format
 msgid "%d minute ago"
 msgid_plural "%d minutes ago"
 msgstr[0] "%d 分钟前"
 
-#: ../libempathy/empathy-time.c:147
+#: ../libempathy/empathy-time.c:102
 #, c-format
 msgid "%d hour ago"
 msgid_plural "%d hours ago"
 msgstr[0] "%d 小时前"
 
-#: ../libempathy/empathy-time.c:152
+#: ../libempathy/empathy-time.c:108
 #, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天前"
 
-#: ../libempathy/empathy-time.c:157
+#: ../libempathy/empathy-time.c:114
 #, c-format
 msgid "%d week ago"
 msgid_plural "%d weeks ago"
 msgstr[0] "%d 星期前"
 
-#: ../libempathy/empathy-time.c:162
+#: ../libempathy/empathy-time.c:120
 #, c-format
 msgid "%d month ago"
 msgid_plural "%d months ago"
 msgstr[0] "%d 月前"
 
-#: ../libempathy/empathy-time.c:167
+#: ../libempathy/empathy-time.c:142
 msgid "in the future"
 msgstr "将来"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:463
-msgid "All"
-msgstr "全部"
+#: ../libempathy-gtk/empathy-account-chooser.c:692
+msgid "All accounts"
+msgstr "全部帐号"
+
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../src/empathy-import-widget.c:335
+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-account-widget.c:549
-#: ../libempathy-gtk/empathy-account-widget.c:605
+#: ../libempathy-gtk/empathy-account-widget.c:765
+#: ../libempathy-gtk/empathy-account-widget.c:817
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1136
+#: ../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:1479
+#: ../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:1547
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "账户："
-
-#: ../libempathy-gtk/empathy-account-widget.c:1558
-msgid "Enabled"
-msgstr "启用"
-
-#: ../libempathy-gtk/empathy-account-widget.c:1623
+#: ../libempathy-gtk/empathy-account-widget.c:1812
 msgid "This account already exists on the server"
-msgstr "服务器上已存在该账户。"
+msgstr "服务器上已存在该帐号"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1626
+#: ../libempathy-gtk/empathy-account-widget.c:1816
 msgid "Create a new account on the server"
-msgstr "在服务器上创建新的帐æ\88·"
+msgstr "在服务器上创建新的帐å\8f·"
 
 #. To translators: The first parameter is the login id and the
-#. * second one is the server. The resulting string will be something
-#. * like: "MyUserName on chat.freenode.net".
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1995
+#: ../libempathy-gtk/empathy-account-widget.c:2241
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s 中的 %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:2021
+#: ../libempathy-gtk/empathy-account-widget.c:2267
 #, c-format
 msgid "%s Account"
-msgstr "%s è´¦æ\88·"
+msgstr "%s å¸\90å\8f·"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2025
+#: ../libempathy-gtk/empathy-account-widget.c:2271
 msgid "New account"
-msgstr "新建è´¦æ\88·"
+msgstr "新建å¸\90å\8f·"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<b>Example:</b> MyScreenName"
-msgstr "<b>例如：</b> 我的屏幕名称"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Pass_word:"
+msgstr "密码(_W)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Advanced"
-msgstr "高级"
+msgid "Screen _Name:"
+msgstr "用户名(_N)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>例如：</b> 我的屏幕名称"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "Pass_word:"
-msgstr "密码(_W)："
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
-msgid "Screen _Name:"
-msgstr "用户名(_N)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
+#: ../libempathy-gtk/empathy-base-password-dialog.c:261
+msgid "Remember password"
+msgstr "记住密码"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-msgid "What is your AIM password?"
-msgstr "您的 AIM 密码是什么？"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "_Port:"
+msgstr "端口(_P)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
-msgid "What is your AIM screen name?"
-msgstr "您的 AIM 屏幕名称是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
+#: ../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-yahoo.ui.h:10
-msgid "_Port:"
-msgstr "端口(_P)："
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "Advanced"
+msgstr "高级"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
-#: ../src/empathy-new-chatroom-dialog.ui.h:9
-msgid "_Server:"
-msgstr "服务器(_S)："
+msgid "What is your AIM screen name?"
+msgstr "您的 AIM 屏幕名称是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<b>Example:</b> username"
-msgstr "<b>例如：</b>用户名"
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+msgid "What is your AIM password?"
+msgstr "您的 AIM 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
+msgid "Remember Password"
+msgstr "记住密码"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "登录 I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "<b>Example:</b> username"
+msgstr "<b>例如：</b>用户名"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise User ID?"
 msgstr "您的 GroupWise 用户名是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
 msgid "What is your GroupWise password?"
 msgstr "您的 GroupWise 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<b>Example:</b> 123456789"
-msgstr "<b>例如：</b>123456789"
-
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN："
 
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>例如：</b>123456789"
+
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "Ch_aracter set:"
+msgstr "字符集(_A):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ UIN?"
 msgstr "您的 ICQ UIN 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
 msgid "What is your ICQ password?"
 msgstr "您的 ICQ 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Character set:"
-msgstr "字符集(_C)："
-
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
-msgid "New Network"
-msgstr "新建网络"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.c:183
-#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+#: ../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:186
+#: ../libempathy-gtk/empathy-account-widget-sip.c:209
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+#: ../libempathy-gtk/empathy-account-widget-sip.c:212
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+#: ../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:221
+#: ../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:226
+#: ../libempathy-gtk/empathy-account-widget-sip.c:249
 msgid "Options"
 msgstr "选项"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+#: ../libempathy-gtk/empathy-account-widget-sip.c:252
 msgid "None"
 msgstr "无"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Character set:"
-msgstr "字符集："
-
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "网络"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network:"
 msgstr "网络："
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
+msgid "Character set:"
+msgstr "字符集："
+
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
+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:5
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Password:"
 msgstr "密码："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Quit message:"
 msgstr "退出消息："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
 msgid "Real name:"
 msgstr "真名："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
-msgid "Servers"
-msgstr "服务器"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<b>Example:</b> user@gmail.com"
-msgstr "<b>例如：</b>user@gmail.com"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<b>Example:</b> user@jabber.org"
-msgstr "<b>例如：</b>user@jabber.org"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "Override server settings"
-msgstr "覆盖服务器设置"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:12
+msgid "Which IRC network?"
+msgstr "哪个 IRC 网络?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
-msgid "Pri_ority:"
-msgstr "优先级(_O)："
+#: ../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:8
-msgid "Reso_urce:"
-msgstr "资源(_U)："
+#: ../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:10
+#: ../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 的名称。\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:13
-msgid "Use old SS_L"
-msgstr "使用旧的 SS_L"
+"<b>badger</b>。如果您还没有 Facebook 用户名的话，使用<a href=\"http://www."
+"facebook.com/username/\">这个页面</a> 来选择一个。"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../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:15
-msgid "What is your Facebook username?"
-msgstr "您的 Facebook 用户名是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../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:17
+#: ../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 "What is your Jabber ID?"
-msgstr "您的 Jabber ID 是什么？"
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "需要加密(TLS/SSL)(_Y)"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
-msgid "What is your Jabber password?"
-msgstr "您的 Jabber 密码是什么？"
+msgid "Use old SS_L"
+msgstr "使用旧的 SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../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:21
+#: ../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-jabber.ui.h:22
-msgid "_Encryption required (TLS/SSL)"
-msgstr "需要加密(TLS/SSL)(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
-msgid "_Ignore SSL certificate errors"
-msgstr "忽略 SSL 证书错误(_I)"
-
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../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:5
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 msgid "What is your Windows Live ID?"
-msgstr "您的 Windows Live 帐æ\88·æ\98¯ä»\80ä¹\88ï¼\9f"
+msgstr "您的 Windows Live 帐å\8f·æ\98¯ä»\80ä¹\88ï¼\9f"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../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 "_E-mail address:"
-msgstr "电子邮件(_E)："
+msgid "_Last Name:"
+msgstr "姓(_L)："
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
 msgstr "名(_F)"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
-msgid "_Jabber ID:"
-msgstr "_Jabber ID："
+msgid "_Published Name:"
+msgstr "公开的名字(_P)："
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
-msgid "_Last Name:"
-msgstr "姓(_L)："
+msgid "_Jabber ID:"
+msgstr "_Jabber ID："
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "昵称(_N)："
+msgid "E-_mail address:"
+msgstr "电子邮件地址(_M):"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
-msgid "_Published Name:"
-msgstr "公开的名字(_P)："
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
+msgid "_Username:"
+msgstr "用户名(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../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:3
-msgid "Authentication username:"
-msgstr "验证用户名："
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover Binding"
-msgstr "发现绑定"
-
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "Discover the STUN server automatically"
-msgstr "自动的发现 STUN 服务器"
+msgid "Use this account to call _landlines and mobile phones"
+msgstr "用此帐号拨打固定电话和手机(_L)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Interval (seconds)"
-msgstr "间隔(秒)"
+msgid "NAT Traversal Options"
+msgstr "NAT 选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "Keep-Alive Options"
-msgstr "Keep-Alive 选项"
+msgid "Proxy Options"
+msgstr "代理选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "Loose Routing"
-msgstr "宽松路由"
+msgid "Miscellaneous Options"
+msgstr "杂项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "Mechanism:"
-msgstr "机制："
+msgid "STUN Server:"
+msgstr "STUN 服务器："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
-msgid "Miscellaneous Options"
-msgstr "杂项"
+msgid "Discover the STUN server automatically"
+msgstr "自动发现 STUN 服务器"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
-msgid "NAT Traversal Options"
-msgstr "NAT 选项"
+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 "Port:"
-msgstr "端口："
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive 选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
-msgid "Proxy Options"
-msgstr "代理选项"
+msgid "Mechanism:"
+msgstr "机制："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "STUN Server:"
-msgstr "STUN 服务器："
+msgid "Interval (seconds)"
+msgstr "间隔(秒)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
-msgid "Server:"
-msgstr "服务器："
+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 "What is your SIP account password?"
-msgstr "您的 SIP 账户密码是什么？"
+msgid "Loose Routing"
+msgstr "宽松路由"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
-msgid "What is your SIP login ID?"
-msgstr "您的 SIP 登录 ID 是什么？"
+msgid "Ignore TLS Errors"
+msgstr "忽略 TLS 错误"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid "_Username:"
-msgstr "ç\94¨æ\88·å\90\8d(_U)："
+msgid "Port:"
+msgstr "端å\8f£："
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo! Japan"
-msgstr "使用 _Yahoo 日本"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+msgid "What is your SIP login ID?"
+msgstr "您的 SIP 登录 ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "What is your Yahoo! ID?"
-msgstr "您的 Yahoo! ID 是什么？"
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "What is your Yahoo! password?"
-msgstr "您的 Yahoo! 密码是什么？"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+msgid "What is your SIP account password?"
+msgstr "您的 SIP 帐号密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Yahoo! I_D:"
 msgstr "Yahoo I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chat room invitations"
-msgstr "忽略会议和聊天室邀请(_I)"
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "I_gnore conference and chat room invitations"
+msgstr "忽略会议和聊天室邀请(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Room List locale:"
 msgstr "聊天室列表 locale(_R)："
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:443
-#: ../libempathy-gtk/empathy-avatar-chooser.c:519
+#: ../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:444
+#: ../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:935
+#: ../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:938
+#: ../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:1000
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1017
 msgid "Images"
 msgstr "图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:325
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr "单击以放大"
 
-#: ../libempathy-gtk/empathy-chat.c:645
+#: ../libempathy-gtk/empathy-call-utils.c:44
+#: ../libempathy-gtk/empathy-call-utils.c:62
+msgid "There was an error starting the call"
+msgstr "发起呼叫时出错"
+
+#: ../libempathy-gtk/empathy-call-utils.c:51
+msgid "The specified contact doesn't support calls"
+msgstr "选择的联系人不支持呼叫"
+
+#: ../libempathy-gtk/empathy-call-utils.c:53
+msgid "The specified contact is offline"
+msgstr "选择的联系人离线"
+
+#: ../libempathy-gtk/empathy-call-utils.c:55
+msgid "The specified contact is not valid"
+msgstr "选择的联系人无效"
+
+#: ../libempathy-gtk/empathy-call-utils.c:57
+msgid "Emergency calls are not supported on this protocol"
+msgstr "不支持在此会话上进行紧急呼叫"
+
+#: ../libempathy-gtk/empathy-call-utils.c:59
+msgid "You don't have enough credit in order to place this call"
+msgstr "您信用卡余额不足以支付此次通话"
+
+#: ../libempathy-gtk/empathy-chat.c:728
 msgid "Failed to open private chat"
 msgstr "建立私人对话失败"
 
-#: ../libempathy-gtk/empathy-chat.c:685
+#: ../libempathy-gtk/empathy-chat.c:786
 msgid "Topic not supported on this conversation"
 msgstr "不支持在此会话上设置主题"
 
-#: ../libempathy-gtk/empathy-chat.c:691
+#: ../libempathy-gtk/empathy-chat.c:792
 msgid "You are not allowed to change the topic"
 msgstr "您不能更改主题"
 
-#: ../libempathy-gtk/empathy-chat.c:825
+#: ../libempathy-gtk/empathy-chat.c:991
+#, c-format
+msgid "“%s” is not a valid contact ID"
+msgstr "%s 是无效的联系人 ID"
+
+#: ../libempathy-gtk/empathy-chat.c:1086
 msgid "/clear: clear all messages from the current conversation"
-msgstr "/clearï¼\8c清空当前会话的所有消息"
+msgstr "/clearï¼\9a清空当前会话的所有消息"
 
-#: ../libempathy-gtk/empathy-chat.c:828
+#: ../libempathy-gtk/empathy-chat.c:1089
 msgid "/topic <topic>: set the topic of the current conversation"
-msgstr "/topic <主é¢\98>ï¼\8c设定当前对话的主题"
+msgstr "/topic <主é¢\98>ï¼\9a设定当前对话的主题"
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:1092
 msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <è\81\8a天室å\90\8d>ï¼\8c加入一个新的聊天室"
+msgstr "/join <è\81\8a天室å\90\8d>ï¼\9a加入一个新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:834
+#: ../libempathy-gtk/empathy-chat.c:1095
 msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <聊天室名>，加入一个新的聊天室"
+msgstr "/j <聊天室名>：加入一个新的聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:1099
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr "/用户[<聊天室ID>] [<原因>]：当前默认离开聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:839
+#: ../libempathy-gtk/empathy-chat.c:1103
 msgid "/query <contact ID> [<message>]: open a private chat"
-msgstr "/query <æ\98µç§°> [<æ¶\88æ\81¯>]ï¼\8c打开一个私人聊天"
+msgstr "/query <æ\98µç§°> [<æ¶\88æ\81¯>]ï¼\9a打开一个私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:842
+#: ../libempathy-gtk/empathy-chat.c:1106
 msgid "/msg <contact ID> <message>: open a private chat"
-msgstr "/msg <æ\98µç§°> <æ¶\88æ\81¯>ï¼\8c打开一个私人聊天"
+msgstr "/msg <æ\98µç§°> <æ¶\88æ\81¯>ï¼\9a打开一个私人聊天"
 
-#: ../libempathy-gtk/empathy-chat.c:846
+#: ../libempathy-gtk/empathy-chat.c:1109
 msgid "/nick <nickname>: change your nickname on the current server"
-msgstr "/nick <æ\98µç§°>ï¼\8c在当前服务器上改变您的昵称"
+msgstr "/nick <æ\98µç§°>ï¼\9a在当前服务器上改变您的昵称"
 
-#: ../libempathy-gtk/empathy-chat.c:849
+#: ../libempathy-gtk/empathy-chat.c:1112
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr "/me <å\8a¨ä½\9cæ¶\88æ\81¯>ï¼\8c向当前对话中发送一个动作消息"
+msgstr "/me <å\8a¨ä½\9cæ¶\88æ\81¯>ï¼\9a向当前对话中发送一个动作消息"
 
-#: ../libempathy-gtk/empathy-chat.c:852
+#: ../libempathy-gtk/empathy-chat.c:1115
 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 "
 "join a new chat room\""
 msgstr ""
-"/say <æ¶\88æ\81¯>ï¼\8c发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如：“/"
+"/say <æ¶\88æ\81¯>ï¼\9a发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如：“/"
 "say /join 是用来加入一个新的聊天室”"
 
-#: ../libempathy-gtk/empathy-chat.c:857
+#: ../libempathy-gtk/empathy-chat.c:1120
+msgid "/whois <contact ID>: display information about a contact"
+msgstr "/whois <联系人 ID>：显示一个联系人的信息"
+
+#: ../libempathy-gtk/empathy-chat.c:1123
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<å\91½ä»¤>]ï¼\8c显示所有支持的命令。如果 <命令> 是有定义的，则显示它的用法。"
+"/help [<å\91½ä»¤>]ï¼\9a显示所有支持的命令。如果 <命令> 是有定义的，则显示它的用法。"
 
-#: ../libempathy-gtk/empathy-chat.c:867
+#: ../libempathy-gtk/empathy-chat.c:1142
 #, c-format
 msgid "Usage: %s"
 msgstr "用法：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:896
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1017
+#: ../libempathy-gtk/empathy-chat.c:1313
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知命令，请使用 /help 查阅可用命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1564
+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
+#, 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
+#, 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
+#, 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
+msgid "not capable"
+msgstr "做不到"
+
+#: ../libempathy-gtk/empathy-chat.c:1623
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1626
 msgid "invalid contact"
 msgstr "无效联系人"
 
-#: ../libempathy-gtk/empathy-chat.c:1161
+#: ../libempathy-gtk/empathy-chat.c:1629
 msgid "permission denied"
 msgstr "权限不足"
 
-#: ../libempathy-gtk/empathy-chat.c:1164
+#: ../libempathy-gtk/empathy-chat.c:1632
 msgid "too long message"
 msgstr "消息太长"
 
-#: ../libempathy-gtk/empathy-chat.c:1167
+#: ../libempathy-gtk/empathy-chat.c:1635
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:1170
+#: ../libempathy-gtk/empathy-chat.c:1639
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:1174
-#, c-format
-msgid "Error sending message '%s': %s"
-msgstr "发送消息“%s”出错：%s"
-
-#: ../libempathy-gtk/empathy-chat.c:1284 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916
 msgid "Topic:"
 msgstr "话题："
 
-#: ../libempathy-gtk/empathy-chat.c:1296
+#: ../libempathy-gtk/empathy-chat.c:1721
 #, c-format
 msgid "Topic set to: %s"
 msgstr "话题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1298
+#: ../libempathy-gtk/empathy-chat.c:1723
+#, 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
 msgid "No topic defined"
 msgstr "未设置话题"
 
-#: ../libempathy-gtk/empathy-chat.c:1777
+#: ../libempathy-gtk/empathy-chat.c:2244
 msgid "(No Suggestions)"
 msgstr "(没有建议)"
 
-#: ../libempathy-gtk/empathy-chat.c:1831
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:2312
+#, 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
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "添加“%s”到 %s 字典"
+
+#: ../libempathy-gtk/empathy-chat.c:2419
 msgid "Insert Smiley"
 msgstr "插入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1849
-#: ../libempathy-gtk/empathy-ui-utils.c:1619
+#: ../libempathy-gtk/empathy-chat.c:2437
+#: ../libempathy-gtk/empathy-ui-utils.c:1867
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1883
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2494
 msgid "_Spelling Suggestions"
 msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2583
 msgid "Failed to retrieve recent logs"
 msgstr "获取最近日志失败"
 
-#: ../libempathy-gtk/empathy-chat.c:2066
+#: ../libempathy-gtk/empathy-chat.c:2722
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已断开连接"
@@ -1236,12 +1512,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:2073
+#: ../libempathy-gtk/empathy-chat.c:2729
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:2076
+#: ../libempathy-gtk/empathy-chat.c:2732
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -1249,17 +1525,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:2084
+#: ../libempathy-gtk/empathy-chat.c:2740
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s 禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:2087
+#: ../libempathy-gtk/empathy-chat.c:2743
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:2091
+#: ../libempathy-gtk/empathy-chat.c:2747
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离开了聊天室"
@@ -1269,574 +1545,1175 @@ msgstr "%s 离开了聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2100
+#: ../libempathy-gtk/empathy-chat.c:2756
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2125
+#: ../libempathy-gtk/empathy-chat.c:2781
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 加入了聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2150
+#: ../libempathy-gtk/empathy-chat.c:2806
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 现在叫做 %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2289 ../src/empathy-call-window.c:1802
+#. 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:1889
+#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
+#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../libempathy-gtk/empathy-chat.c:2927
-msgid "Wrong password; please try again:"
-msgstr "密码错误，请重试："
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3657
+msgid "Would you like to store this password?"
+msgstr "是否保存密码?"
+
+#: ../libempathy-gtk/empathy-chat.c:3663
+msgid "Remember"
+msgstr "记录"
+
+#: ../libempathy-gtk/empathy-chat.c:3673
+msgid "Not now"
+msgstr "不是现在"
 
-#: ../libempathy-gtk/empathy-chat.c:2928
+#: ../libempathy-gtk/empathy-chat.c:3717
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:142
 msgid "Retry"
 msgstr "重试"
 
-#: ../libempathy-gtk/empathy-chat.c:2933
+#: ../libempathy-gtk/empathy-chat.c:3721
+msgid "Wrong password; please try again:"
+msgstr "密码错误，请重试："
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3851
 msgid "This room is protected by a password:"
 msgstr "这个房间是由一个密码保护的："
 
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:3878
 msgid "Join"
 msgstr "加入"
 
-#: ../libempathy-gtk/empathy-chat.c:3074
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:3127
-#: ../libempathy-gtk/empathy-log-window.c:639
+#: ../libempathy-gtk/empathy-chat.c:4125
 msgid "Conversation"
 msgstr "对话"
 
+#. Translators: this string is a something like
+#. * "Escher Cat (SMS)"
+#: ../libempathy-gtk/empathy-chat.c:4130
+#, c-format
+msgid "%s (SMS)"
+msgstr "%s (短信)"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:264
+msgid "Unknown or invalid identifier"
+msgstr "未知或无效的识别符"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:266
+msgid "Contact blocking temporarily unavailable"
+msgstr "联系人屏蔽暂时不可用"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:268
+msgid "Contact blocking unavailable"
+msgstr "联系人屏蔽不可用"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:270
+msgid "Permission Denied"
+msgstr "权限不足"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:274
+msgid "Could not block contact"
+msgstr "无法屏蔽联系人"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.c:612
+msgid "Edit Blocked Contacts"
+msgstr "编辑屏蔽的联系人"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:1
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:506
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+#: ../libempathy-gtk/empathy-individual-widget.c:1474
+#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
+msgid "Account:"
+msgstr "帐号："
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:2
+msgid "Blocked Contacts"
+msgstr "已屏蔽的联系人"
+
+#: ../libempathy-gtk/empathy-contact-blocking-dialog.ui.h:3
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:3
+msgid "Remove"
+msgstr "删除"
+
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:785
+#: ../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:331
-#: ../libempathy-gtk/empathy-theme-adium.c:792
+#: ../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:424
+#: ../libempathy-gtk/empathy-chat-text-view.c:417
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-msgid "Edit Contact Information"
-msgstr "编辑联系人信息"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
-msgid "Personal Information"
-msgstr "个人信息"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
+#: ../libempathy-gtk/empathy-contact-dialogs.c:326
+#: ../libempathy-gtk/empathy-individual-dialogs.c:118
 msgid "New Contact"
 msgstr "新建联系人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
-msgid "Decide _Later"
-msgstr "以后再决定(_L)"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
-msgid "Subscription Request"
-msgstr "订阅请求"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1984
+#: ../libempathy-gtk/empathy-contact-dialogs.c:395
+#: ../libempathy-gtk/empathy-individual-dialogs.c:197
 #, c-format
-msgid "Do you really want to remove the group '%s'?"
-msgstr "您真的要删除群组“%s”吗？"
-
-#: ../libempathy-gtk/empathy-contact-list-view.c:1986
-msgid "Removing group"
-msgstr "删除群组"
-
-#. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:2035
-#: ../libempathy-gtk/empathy-contact-list-view.c:2112
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Remove"
-msgstr "删除(_R)"
+msgid "Block %s?"
+msgstr "屏蔽 %s？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2065
+#: ../libempathy-gtk/empathy-contact-dialogs.c:400
+#: ../libempathy-gtk/empathy-individual-dialogs.c:252
 #, c-format
-msgid "Do you really want to remove the contact '%s'?"
-msgstr "您真的想要删除联系人“%s”吗？"
+msgid "Are you sure you want to block '%s' from contacting you again?"
+msgstr "确定要屏蔽 %s 以阻止他再次联系您吗？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:2067
-msgid "Removing contact"
-msgstr "删除联系人"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:203
-#: ../src/empathy-main-window.ui.h:13
-msgid "_Add Contact…"
-msgstr "添加联系人(_A)..."
-
-#: ../libempathy-gtk/empathy-contact-menu.c:231
-#: ../src/empathy-main-window.ui.h:14
-msgid "_Chat"
-msgstr "聊天(_C)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-individual-dialogs.c:274
+msgid "_Block"
+msgstr "屏蔽(_B)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:261
-msgctxt "menu item"
-msgid "_Audio Call"
-msgstr "音频呼叫(_A)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:423
+#: ../libempathy-gtk/empathy-individual-dialogs.c:283
+msgid "_Report this contact as abusive"
+msgid_plural "_Report these contacts as abusive"
+msgstr[0] "举报联系人滥用"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:291
-msgctxt "menu item"
-msgid "_Video Call"
-msgstr "视频呼叫(_V)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:331
-#: ../src/empathy-main-window.ui.h:25
-msgid "_Previous Conversations"
-msgstr "最近会话(_P)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:353
-msgid "Send File"
-msgstr "发送文件"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:376
-msgid "Share My Desktop"
-msgstr "共享我的桌面"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:416
-#: ../libempathy-gtk/empathy-contact-widget.c:1819
-msgid "Favorite"
-msgstr "收藏夹"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:445
-msgid "Infor_mation"
-msgstr "信息(_M)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:491
-msgctxt "Edit contact (contextual menu)"
-msgid "_Edit"
-msgstr "编辑(_E)"
-
-#: ../libempathy-gtk/empathy-contact-menu.c:545
-#: ../src/empathy-chat-window.c:903
-msgid "Inviting you to this room"
-msgstr "邀请到此聊天室"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
+msgid "Subscription Request"
+msgstr "订阅请求"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:576
-msgid "_Invite to Chat Room"
-msgstr "邀请到聊天室(_I)"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
+msgid "_Block User"
+msgstr "屏蔽用户(_B)"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:129
-msgid "Select a contact"
-msgstr "选择一个联系"
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:3
+msgid "Decide _Later"
+msgstr "以后再决定(_L)"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-msgid "Full name:"
-msgstr "全称："
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:499
+msgid "Search contacts"
+msgstr "搜索联系人"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-msgid "Phone number:"
-msgstr "电话号码："
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:529
+msgid "Search: "
+msgstr "搜索"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-msgid "E-mail address:"
-msgstr "E-mail 地址："
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:587
+msgid "_Add Contact"
+msgstr "添加联系人(_A)"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:222
-msgid "Website:"
-msgstr "网站："
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:605
+msgid "No contacts found"
+msgstr "未找到联系人"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:223
-msgid "Birthday:"
-msgstr "生日："
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:621
+msgid "Your message introducing yourself:"
+msgstr "您的自我介绍信息："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-msgid "Select"
-msgstr "选择"
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:629
+msgid "Please let me see when you're online. Thanks!"
+msgstr "你在线时请让我知道，谢谢！"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:623
-#: ../src/empathy-main-window.c:1171
-msgid "Group"
-msgstr "群组"
+#: ../libempathy-gtk/empathy-contact-widget.c:569
+#: ../libempathy-gtk/empathy-individual-widget.c:304
+msgid "Channels:"
+msgstr "频道："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:854
+#: ../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:856
+#: ../libempathy-gtk/empathy-contact-widget.c:751
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "Country:"
 msgstr "国家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:858
+#: ../libempathy-gtk/empathy-contact-widget.c:753
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "State:"
 msgstr "省："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:860
+#: ../libempathy-gtk/empathy-contact-widget.c:755
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "City:"
 msgstr "城市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:862
+#: ../libempathy-gtk/empathy-contact-widget.c:757
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Area:"
 msgstr "地区："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:864
+#: ../libempathy-gtk/empathy-contact-widget.c:759
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Postal Code:"
 msgstr "邮政编码："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:866
+#: ../libempathy-gtk/empathy-contact-widget.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Street:"
 msgstr "街道："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:868
+#: ../libempathy-gtk/empathy-contact-widget.c:763
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Building:"
 msgstr "建筑物："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:870
+#: ../libempathy-gtk/empathy-contact-widget.c:765
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Floor:"
 msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:872
+#: ../libempathy-gtk/empathy-contact-widget.c:767
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Room:"
 msgstr "房间："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:874
+#: ../libempathy-gtk/empathy-contact-widget.c:769
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Text:"
 msgstr "文本："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:876
+#: ../libempathy-gtk/empathy-contact-widget.c:771
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "Description:"
 msgstr "描述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:878
+#: ../libempathy-gtk/empathy-contact-widget.c:773
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:880
+#: ../libempathy-gtk/empathy-contact-widget.c:775
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Accuracy Level:"
 msgstr "准确程度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:882
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Error:"
 msgstr "错误："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:884
+#: ../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:886
+#: ../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:888
+#: ../libempathy-gtk/empathy-contact-widget.c:783
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:890
+#: ../libempathy-gtk/empathy-contact-widget.c:785
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Bearing:"
 msgstr "方位朝向："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:892
+#: ../libempathy-gtk/empathy-contact-widget.c:787
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Climb Speed:"
 msgstr "爬升速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:894
+#: ../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:896
+#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Longitude:"
 msgstr "经度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:898
+#: ../libempathy-gtk/empathy-contact-widget.c:793
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Latitude:"
 msgstr "纬度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:900
+#: ../libempathy-gtk/empathy-contact-widget.c:795
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Altitude:"
 msgstr "海拔："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:963
-#: ../src/empathy-preferences.ui.h:12
+#: ../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 "位置"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:979
-msgid "<b>Location</b>, "
-msgstr "<b>位置</b>，"
+#. 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:1030
+#: ../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:1113
+#: ../libempathy-gtk/empathy-contact-widget.c:999
+#: ../libempathy-gtk/empathy-individual-widget.c:900
 msgid "Save Avatar"
 msgstr "保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1169
+#: ../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.ui.h:1
-msgid "<b>Location</b> at (date)\t"
-msgstr "<b>位置</b>于(日期）\t"
+#: ../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:4
+#: ../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:5
+#: ../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-contact-widget.ui.h:6
-msgid "Contact Details"
-msgstr "联系人详情"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-groups-widget.c:331
 msgid "Groups"
 msgstr "组"
 
-#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Identifier:"
-msgstr "标识符："
+#: ../libempathy-gtk/empathy-groups-widget.c:343
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr "选择您想将该联系人加入的群组。注意您可以选择多个群组，也可以不选择。"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Information requested…"
-msgstr "已发送信息请求..."
+#: ../libempathy-gtk/empathy-groups-widget.c:362
+msgid "_Add Group"
+msgstr "添加群组(_A)"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
-msgid "OS:"
-msgstr "操作系统："
+#: ../libempathy-gtk/empathy-groups-widget.c:397
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "选择"
+
+#: ../libempathy-gtk/empathy-groups-widget.c:407
+#: ../src/empathy-roster-window.c:1970
+msgid "Group"
+msgstr "群组"
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:257
+msgid "The following identity will be blocked:"
+msgid_plural "The following identities will be blocked:"
+msgstr[0] "以下用户将被屏蔽："
+
+#: ../libempathy-gtk/empathy-individual-dialogs.c:264
+msgid "The following identity can not be blocked:"
+msgid_plural "The following identities can not be blocked:"
+msgstr[0] "以下用户无法被屏蔽："
+
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
+msgid "Edit Contact Information"
+msgstr "编辑联系人信息"
+
+#. Translators: 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
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:344
+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-log-window.ui.h:6
+#: ../src/empathy-streamed-media-window.c:1288
+#: ../src/empathy-call-window.ui.h:18
+msgid "Call"
+msgstr "通话"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:413
+msgid "Mobile"
+msgstr "手机"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:415
+msgid "Work"
+msgstr "办公"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:417
+msgid "HOME"
+msgstr "家庭"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:658
+msgid "_Block Contact"
+msgstr "屏蔽联系人"
+
+#. 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
+msgid "_Chat"
+msgstr "聊天(_C)"
+
+#. add SMS button
+#: ../libempathy-gtk/empathy-individual-menu.c:1052
+#: ../libempathy-gtk/empathy-new-message-dialog.c:313
+msgid "_SMS"
+msgstr "短信(_S)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1085
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "音频呼叫(_A)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1118
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "视频呼叫(_V)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1159
+#: ../src/empathy-roster-window-menubar.ui.h:4
+msgid "_Previous Conversations"
+msgstr "最近会话(_P)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1188
+msgid "Send File"
+msgstr "发送文件"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1218
+msgid "Share My Desktop"
+msgstr "共享我的桌面"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1244
+#: ../libempathy-gtk/empathy-individual-widget.c:1357
+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
+msgid "Infor_mation"
+msgstr "信息(_M)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1429
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1546
+#: ../src/empathy-chat-window.c:1175
+msgid "Inviting you to this room"
+msgstr "邀请到此聊天室"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1592
+msgid "_Invite to Chat Room"
+msgstr "邀请到聊天室(_I)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:1788
+#: ../src/empathy-roster-window-menubar.ui.h:5
+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
+#, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "您真的要删除群组“%s”吗？"
+
+#: ../libempathy-gtk/empathy-individual-view.c:2344
+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:2476
+#, c-format
+msgid "Do you really want to remove the contact '%s'?"
+msgstr "您真的想要删除联系人“%s”吗？"
+
+#: ../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-view.c:2497
+msgid "Removing contact"
+msgstr "删除联系人"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1641
+#, c-format
+msgid "Linked contact containing %u contact"
+msgid_plural "Linked contacts containing %u contacts"
+msgstr[0] "已绑定联系人包含 %u 联系人"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>位置</b> 于 (日期)"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
+msgid "Online from a phone or mobile device"
+msgstr "通过电话或移动设备上网"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:335
+msgid "New Network"
+msgstr "新建网络"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:530
+msgid "Choose an IRC network"
+msgstr "选择一个 IRC 网络"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:587
+msgid "Reset _Networks List"
+msgstr "重置_Networks列表"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:591
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "选择"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+msgid "new server"
+msgstr "新建服务器"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
+msgid "SSL"
+msgstr "SSL"
+
+#: ../libempathy-gtk/empathy-log-window.c:622
+msgid "History"
+msgstr "历史"
+
+#: ../libempathy-gtk/empathy-log-window.c:677
+msgid "Show"
+msgstr "显示"
+
+#: ../libempathy-gtk/empathy-log-window.c:699
+msgid "Search"
+msgstr "搜索"
+
+#: ../libempathy-gtk/empathy-log-window.c:1150
+#, c-format
+msgid "Chat in %s"
+msgstr "在 %s 聊天"
+
+#: ../libempathy-gtk/empathy-log-window.c:1152
+#, c-format
+msgid "Chat with %s"
+msgstr "与 %s 聊天"
+
+#: ../libempathy-gtk/empathy-log-window.c:1202
+#: ../libempathy-gtk/empathy-log-window.c:1349
+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:1373
+#, c-format
+msgid "%s second"
+msgid_plural "%s seconds"
+msgstr[0] "%s 秒"
+
+#: ../libempathy-gtk/empathy-log-window.c:1380
+#, c-format
+msgid "%s minute"
+msgid_plural "%s minutes"
+msgstr[0] "%s 分"
+
+#: ../libempathy-gtk/empathy-log-window.c:1388
+#, c-format
+msgid "Call took %s, ended at %s"
+msgstr "通话时长：%s，结束于 %s"
+
+#: ../libempathy-gtk/empathy-log-window.c:1722
+msgid "Today"
+msgstr "今天"
+
+#: ../libempathy-gtk/empathy-log-window.c:1726
+msgid "Yesterday"
+msgstr "昨天"
+
+#. Translators: A date such as '23 May 2010' (strftime format)
+#: ../libempathy-gtk/empathy-log-window.c:1741
+msgid "%e %B %Y"
+msgstr "%Y年%m月%d日"
+
+#: ../libempathy-gtk/empathy-log-window.c:1829
+#: ../libempathy-gtk/empathy-log-window.c:3489
+msgid "Anytime"
+msgstr "随时"
+
+#: ../libempathy-gtk/empathy-log-window.c:1918
+#: ../libempathy-gtk/empathy-log-window.c:2402
+msgid "Anyone"
+msgstr "任何人"
+
+#: ../libempathy-gtk/empathy-log-window.c:2715
+msgid "Who"
+msgstr "谁"
+
+#: ../libempathy-gtk/empathy-log-window.c:2924
+msgid "When"
+msgstr "何时"
+
+#: ../libempathy-gtk/empathy-log-window.c:3040
+msgid "Anything"
+msgstr "任何事"
+
+#: ../libempathy-gtk/empathy-log-window.c:3042
+msgid "Text chats"
+msgstr "文本聊天"
+
+#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../src/empathy-preferences.ui.h:25
+msgid "Calls"
+msgstr "通话"
+
+#: ../libempathy-gtk/empathy-log-window.c:3049
+msgid "Incoming calls"
+msgstr "来电"
+
+#: ../libempathy-gtk/empathy-log-window.c:3050
+msgid "Outgoing calls"
+msgstr "呼出的语音通话"
+
+#: ../libempathy-gtk/empathy-log-window.c:3051
+msgid "Missed calls"
+msgstr "未接来电"
+
+#: ../libempathy-gtk/empathy-log-window.c:3073
+msgid "What"
+msgstr "什么事"
+
+#: ../libempathy-gtk/empathy-log-window.c:3782
+msgid "Are you sure you want to delete all logs of previous conversations?"
+msgstr "确定要删除以前的全部对话日志？"
+
+#: ../libempathy-gtk/empathy-log-window.c:3786
+msgid "Clear All"
+msgstr "全部清除"
+
+#: ../libempathy-gtk/empathy-log-window.c:3793
+msgid "Delete from:"
+msgstr "从以下位置删除："
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
+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
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+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
+msgid "Chat"
+msgstr "聊天"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
-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-log-window.ui.h:7
+#: ../src/empathy-call-window.ui.h:26
+#: ../src/empathy-streamed-media-window.ui.h:19
+msgid "Video"
+msgstr "视频"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
-msgid "Version:"
-msgstr "ç\89\88æ\9c¬ï¼\9a"
+#: ../libempathy-gtk/empathy-log-window.ui.h:8
+msgid "page 2"
+msgstr "第 2 页"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "_Add Group"
-msgstr "添加群组(_A)"
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
+msgid "<span size=\"x-large\">Loading...</span>"
+msgstr "<span size=\"x-large\">正在载入...</span>"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
-msgid "new server"
-msgstr "新建服务器"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:83
+msgid "The contact is offline"
+msgstr "联系人为离线"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
-msgid "Server"
-msgstr "æ\9c\8då\8a¡å\99¨"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:85
+msgid "The specified contact is either invalid or unknown"
+msgstr "æ\8c\87å®\9aç\9a\84è\81\94系人æ\97 æ\95\88æ\88\96ä¿¡æ\81¯æ\9cªç\9f¥"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
-msgid "Port"
-msgstr "端口"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:87
+msgid "The contact does not support this kind of conversation"
+msgstr "选择的联系人不支持在该类型会话"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
-msgid "SSL"
-msgstr "SSL"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:89
+msgid "The requested functionality is not implemented for this protocol"
+msgstr "所要求的功能与此协议不兼容"
 
-#: ../libempathy-gtk/empathy-log-window.c:632
-#: ../src/empathy-import-widget.c:312
-msgid "Account"
-msgstr "账户"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:95
+msgid "Could not start a conversation with the given contact"
+msgstr "无法与选择的联系人发起对话"
 
-#: ../libempathy-gtk/empathy-log-window.c:649
-msgid "Date"
-msgstr "æ\97¥æ\9c\9f"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:97
+msgid "You are banned from this channel"
+msgstr "æ\82¨å·²è¢«æ­¤é¢\91é\81\93å±\8fè\94½"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
-msgid "Conversations"
-msgstr "对话"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:99
+msgid "This channel is full"
+msgstr "频道已满"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
-msgid "Previous Conversations"
-msgstr "以前的对话"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:101
+msgid "You must be invited to join this channel"
+msgstr "您必须被邀请才能加入此频道"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
-msgid "Search"
-msgstr "æ\90\9cç´¢"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:103
+msgid "Can't proceed while disconnected"
+msgstr "æ\96­å¼\80æ\97¶æ\97 æ³\95è¿\9bè¡\8c"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
-msgid "_For:"
-msgstr "包含(_F)："
+#: ../libempathy-gtk/empathy-new-message-dialog.c:105
+msgid "Permission denied"
+msgstr "拒绝访问"
 
-#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
-msgid "Contact ID:"
-msgstr "联系人 ID："
+#: ../libempathy-gtk/empathy-new-message-dialog.c:111
+msgid "There was an error starting the conversation"
+msgstr "发起对话时出错"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:145
-msgid "C_hat"
-msgstr "è\81\8a天(_H)"
+#: ../libempathy-gtk/empathy-new-message-dialog.c:290
+#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+msgid "Enter a contact identifier or phone number:"
+msgstr "è¾\93å\85¥ä¸\80个è\81\94系人æ \87è¯\86æ\88\96ç\94µè¯\9då\8f·ç \81ï¼\9a"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:155
+#: ../libempathy-gtk/empathy-new-message-dialog.c:333
 msgid "New Conversation"
 msgstr "新建对话"
 
-#. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:190
-msgid "Send _Video"
-msgstr "发送视频(_V)"
+#. add video button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+msgid "_Video Call"
+msgstr "视频呼叫(_V)"
 
-#. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:198
-#: ../src/empathy-call-window.ui.h:22
-msgid "_Call"
-msgstr "通话(_C)"
+#. add audio button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+msgid "_Audio Call"
+msgstr "音频呼叫(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:208
+#: ../libempathy-gtk/empathy-new-call-dialog.c:245
 msgid "New Call"
 msgstr "新建通话"
 
+#: ../libempathy-gtk/empathy-bad-password-dialog.c:130
+#, c-format
+msgid "Authentification failed for account <b>%s</b>"
+msgstr "帐号 <b>%s</b> 验证失败"
+
+#: ../libempathy-gtk/empathy-base-password-dialog.c:224
+#: ../libempathy-gtk/empathy-password-dialog.c:134
+#, c-format
+msgid ""
+"Enter your password for account\n"
+"<b>%s</b>"
+msgstr ""
+"输入您的帐号密码\n"
+"<b>%s</b>"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:168
-#: ../libempathy-gtk/empathy-presence-chooser.c:204
+#: ../libempathy-gtk/empathy-presence-chooser.c:167
+#: ../libempathy-gtk/empathy-presence-chooser.c:203
 msgid "Custom Message…"
-msgstr "自定义消息"
+msgstr "自定义消息..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:221
-#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:220
+#: ../libempathy-gtk/empathy-presence-chooser.c:222
 msgid "Edit Custom Messages…"
 msgstr "编辑自定义消息"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:346
+#: ../libempathy-gtk/empathy-presence-chooser.c:345
 msgid "Click to remove this status as a favorite"
-msgstr "点击移除自定义状态"
+msgstr "点击移除常用自定义状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:355
+#: ../libempathy-gtk/empathy-presence-chooser.c:354
 msgid "Click to make this status a favorite"
-msgstr "点击设置自定义状态"
+msgstr "点击设置常用自定义状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:389
+#: ../libempathy-gtk/empathy-presence-chooser.c:388
 msgid "Set status"
 msgstr "设置状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:939
-msgid "Set your presence and current status"
-msgstr "设置你的状态信息和现在的状态"
-
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+#: ../libempathy-gtk/empathy-presence-chooser.c:1135
 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:584
+#, c-format
+msgid "New %s account"
+msgstr "新建 %s 帐号"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
 msgstr "查找："
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
-msgid "Match case"
-msgstr "区分大小写"
+msgid "_Previous"
+msgstr "上一页(_P)"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "_Next"
+msgstr "下一页(_N)"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Mat_ch case"
+msgstr "区分大小写(_C)"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
 msgid "Phrase not found"
 msgstr "未找到短语"
 
-#: ../libempathy-gtk/empathy-sound.c:50
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "收到了即时消息"
 
-#: ../libempathy-gtk/empathy-sound.c:52
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr "发送即时消息"
 
-#: ../libempathy-gtk/empathy-sound.c:54
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr "收到的聊天请求"
 
-#: ../libempathy-gtk/empathy-sound.c:56
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "联系人已连接"
 
-#: ../libempathy-gtk/empathy-sound.c:58
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "联系人已断开"
 
-#: ../libempathy-gtk/empathy-sound.c:60
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr "已连接到服务器"
 
-#: ../libempathy-gtk/empathy-sound.c:62
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr "已从服务器断开连接"
 
-#: ../libempathy-gtk/empathy-sound.c:64
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "呼入的语音通话"
 
-#: ../libempathy-gtk/empathy-sound.c:66
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "呼出的语音通话"
 
-#: ../libempathy-gtk/empathy-sound.c:68
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "语音通话结束"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
-msgid "Enter Custom Message"
-msgstr "输入自定义状态"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:296
 msgid "Edit Custom Messages"
-msgstr "编辑自定义状态"
+msgstr "编辑自定义消息"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "添加新自定义状态(_N)"
+#: ../libempathy-gtk/empathy-theme-adium.c:1051
+#, c-format
+msgid "Message edited at %s"
+msgstr "消息于 %s 被编辑"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "已保存的自定义状态"
+#: ../libempathy-gtk/empathy-theme-adium.c:1757
+msgid "Normal"
+msgstr "普通"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:67
+#: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Classic"
 msgstr "经典"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:68
+#: ../libempathy-gtk/empathy-theme-manager.c:71
 msgid "Simple"
 msgstr "简洁"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:69
+#: ../libempathy-gtk/empathy-theme-manager.c:72
 msgid "Clean"
 msgstr "清爽"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:70
+#: ../libempathy-gtk/empathy-theme-manager.c:73
 msgid "Blue"
 msgstr "蓝色"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1516
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "聊天服务器所提供的身份无法验证。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "证书并非由 CA 签发。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "证书已过期。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "证书尚未被激活。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+msgid "The certificate does not have the expected fingerprint."
+msgstr "证书缺少应有的指纹。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "证书所验证的主机名与服务器名不匹配。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+msgid "The certificate is self-signed."
+msgstr "证书是自签署的。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "证书被证书签发机构吊销。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+msgid "The certificate is cryptographically weak."
+msgstr "证书是弱加密的。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+msgid "The certificate length exceeds verifiable limits."
+msgstr "证书长度超出可验证限制。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+msgid "The certificate is malformed."
+msgstr "证书损坏。"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "预期主机名: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "证书主机名: %s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:281
+msgid "C_ontinue"
+msgstr "继续(_O)"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "Untrusted connection"
+msgstr "不受信任的连接"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:288
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "连接不受信任。是否仍要继续?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:298
+msgid "Remember this choice for future connections"
+msgstr "为将来的连接记住本次选择"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
+msgid "Certificate Details"
+msgstr "证书详情"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1741
 msgid "Unable to open URI"
 msgstr "无法打开 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1611
+#: ../libempathy-gtk/empathy-ui-utils.c:1859
 msgid "Select a file"
 msgstr "选择文件"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1680
+#: ../libempathy-gtk/empathy-ui-utils.c:1934
+msgid "Insufficient free space to save file"
+msgstr "空间不足，无法保存文件"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1942
+#, 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
 #, c-format
 msgid "Incoming file from %s"
-msgstr "从 %s 传送来文件"
+msgstr "从 %s 传来的文件"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -2005,36 +2882,43 @@ msgstr "西方语言"
 msgid "Vietnamese"
 msgstr "越南语"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The selected contact cannot receive files."
-msgstr "选择的联系人无法接收文件。"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The selected contact is offline."
-msgstr "选择的联系人离线。"
-
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:202
 msgid "No error message"
 msgstr "无错误信息"
 
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:244
-#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:259
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:275
 msgid "Instant Message (Empathy)"
 msgstr "即时消息(Empathy)"
 
-#: ../src/empathy.c:474
+#: ../src/empathy.c:437
 msgid "Don't connect on startup"
-msgstr "启动时不自动登录"
+msgstr "启动时不自动连接"
 
-#: ../src/empathy.c:478
+#: ../src/empathy.c:441
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "启动时不显示联系人列表"
 
-#: ../src/empathy.c:490
+#: ../src/empathy.c:456
 msgid "- Empathy IM Client"
-msgstr " - Empathy IM 客户端"
+msgstr " - Empathy 即时通讯客户端"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy.c:643
+msgid "Error contacting the Account Manager"
+msgstr "联系帐号管理器出错"
+
+#: ../src/empathy.c:645
+#, c-format
+msgid ""
+"There was an error while trying to connect to the Telepathy Account Manager. "
+"The error was:\n"
+"\n"
+"%s"
+msgstr ""
+"在试图连接到 Telepathy 帐号管理器时出错。错误是：\n"
+"\n"
+"%s"
+
+#: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -2044,7 +2928,7 @@ msgstr ""
 "Empathy 是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证下重新发布"
 "或修改它；许可证可使用第二版或您想选择的更新的版本。"
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2054,7 +2938,7 @@ msgstr ""
 "Empathy 发布的目的是希望它对您有用，但是没有任何担保；即使是对商业应用以及其"
 "它特定目的。查阅 GNU 通用公共许可证以获取更多细节。"
 
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -2064,11 +2948,11 @@ msgstr ""
 "给自由软件基金会写信。地址是：51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:109
 msgid "An Instant Messaging client for GNOME"
 msgstr "一个 GNOME 即时消息客户端"
 
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:115
 msgid "translator-credits"
 msgstr ""
 "Abel Cheung <maddog@linux.org.hk>, 2003\n"
@@ -2094,15 +2978,15 @@ msgstr ""
 
 #: ../src/empathy-account-assistant.c:167
 msgid "There was an error while importing the accounts."
-msgstr "导入帐æ\88·æ\97¶å\8f\91ç\94\9fé\94\99误ã\80\82"
+msgstr "导入帐å\8f·æ\97¶å\8f\91ç\94\9fé\94\99误ã\80\82"
 
 #: ../src/empathy-account-assistant.c:170
 msgid "There was an error while parsing the account details."
-msgstr "在解析è´¦æ\88·è¯¦æ\83\85æ\97¶å\87ºç\8e°é\94\99误ã\80\82"
+msgstr "在解析å¸\90å\8f·è¯¦æ\83\85æ\97¶å\87ºç\8e°é\94\99误ã\80\82"
 
 #: ../src/empathy-account-assistant.c:173
 msgid "There was an error while creating the account."
-msgstr "在创建è´¦æ\88·æ\97¶å\87ºç\8e°é\94\99误ã\80\82"
+msgstr "在创建å¸\90å\8f·æ\97¶å\87ºç\8e°é\94\99误ã\80\82"
 
 #: ../src/empathy-account-assistant.c:175
 msgid "There was an error."
@@ -2118,48 +3002,39 @@ msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr ""
-"您可以返回尝试重新输入您的è´¦æ\88·ä¿¡æ\81¯ï¼\8cæ\88\96è\80\85é\80\80å\87ºå\8a©ç\90\86ï¼\8cç\84¶å\90\8eä»\8eç¼\96è¾\91è\8f\9cå\8d\95中å\8a å\85¥è´¦æ\88·ã\80\82"
+"您可以返回尝试重新输入您的å¸\90å\8f·ä¿¡æ\81¯ï¼\8cæ\88\96è\80\85é\80\80å\87ºå\8a©ç\90\86ï¼\8cç\84¶å\90\8eä»\8eç¼\96è¾\91è\8f\9cå\8d\95中å\8a å\85¥å¸\90å\8f·ã\80\82"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1315
+#: ../src/empathy-account-assistant.c:1276
 msgid "An error occurred"
 msgstr "发生错误"
 
-#. To translator: %s is the protocol name
-#. Create account
-#. To translator: %s is the name of the protocol, such as "Google Talk" or
-#. * "Yahoo!"
-#.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:606
-#, c-format
-msgid "New %s account"
-msgstr "新建 %s 账户"
-
-#: ../src/empathy-account-assistant.c:510
+#: ../src/empathy-account-assistant.c:469
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
 msgid "What kind of chat account do you have?"
-msgstr "您已经拥有哪个类型的帐æ\88·ï¼\9f"
+msgstr "您已经拥有哪个类型的帐å\8f·ï¼\9f"
 
-#: ../src/empathy-account-assistant.c:516
+#: ../src/empathy-account-assistant.c:475
 msgid "Do you have any other chat accounts you want to set up?"
-msgstr "您还要设置其它聊天è´¦æ\88·å\90\97ï¼\9f"
+msgstr "您还要设置其它聊天å¸\90å\8f·å\90\97ï¼\9f"
 
-#: ../src/empathy-account-assistant.c:522
+#: ../src/empathy-account-assistant.c:481
 msgid "Enter your account details"
-msgstr "输入您的帐æ\88·è¯¦æ\83\85"
+msgstr "输入您的帐å\8f·è¯¦æ\83\85"
 
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:486
 msgid "What kind of chat account do you want to create?"
-msgstr "您想创建那种类型的帐æ\88·ï¼\9f"
+msgstr "您想创建那种类型的帐å\8f·ï¼\9f"
 
-#: ../src/empathy-account-assistant.c:533
+#: ../src/empathy-account-assistant.c:492
 msgid "Do you want to create other chat accounts?"
-msgstr "您想要创建其它的聊天è´¦æ\88·å\90\97ã\80\81"
+msgstr "您想要创建其它的聊天å¸\90å\8f·å\90\97ã\80\81"
 
-#: ../src/empathy-account-assistant.c:540
+#: ../src/empathy-account-assistant.c:499
 msgid "Enter the details for the new account"
-msgstr "输入新è´¦æ\88·ç\9a\84详ç»\86èµ\84æ\96\99"
+msgstr "输入新å¸\90å\8f·ç\9a\84详ç»\86èµ\84æ\96\99"
 
-#: ../src/empathy-account-assistant.c:655
+#: ../src/empathy-account-assistant.c:614
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2170,61 +3045,61 @@ msgstr ""
 "Live 和许多其它聊天软件的朋友和同事聊天。使用麦克风或摄像头，您就可以开始音频"
 "和视频通话。"
 
-#: ../src/empathy-account-assistant.c:672
+#: ../src/empathy-account-assistant.c:631
 msgid "Do you have an account you've been using with another chat program?"
-msgstr "您有没有其它聊天软件的è´¦æ\88·ï¼\9f"
+msgstr "您有没有其它聊天软件的å¸\90å\8f·ï¼\9f"
 
-#: ../src/empathy-account-assistant.c:695
+#: ../src/empathy-account-assistant.c:655
 msgid "Yes, import my account details from "
-msgstr "有，请导入我的è´¦æ\88·ä¿¡æ\81¯"
+msgstr "有，请导入我的å¸\90å\8f·ä¿¡æ\81¯"
 
-#: ../src/empathy-account-assistant.c:716
+#: ../src/empathy-account-assistant.c:676
 msgid "Yes, I'll enter my account details now"
-msgstr "有，我现在就输入我的è´¦æ\88·ä¿¡æ\81¯"
+msgstr "有，我现在就输入我的å¸\90å\8f·ä¿¡æ\81¯"
 
-#: ../src/empathy-account-assistant.c:738
+#: ../src/empathy-account-assistant.c:698
 msgid "No, I want a new account"
-msgstr "不，我想要一个新的账户。"
+msgstr "不，我想要一个新的帐号"
 
-#: ../src/empathy-account-assistant.c:748
+#: ../src/empathy-account-assistant.c:708
 msgid "No, I just want to see people online nearby for now"
 msgstr "没有，我只是想看看附近现在谁在线上"
 
-#: ../src/empathy-account-assistant.c:769
+#: ../src/empathy-account-assistant.c:729
 msgid "Select the accounts you want to import:"
-msgstr "选择您要导入的è´¦æ\88·ï¼\9a"
+msgstr "选择您要导入的å¸\90å\8f·ï¼\9a"
 
-#: ../src/empathy-account-assistant.c:853
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-account-assistant.c:816
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-account-assistant.c:860
+#: ../src/empathy-account-assistant.c:823
 msgid "No, that's all for now"
-msgstr "没有，就这样吧。"
+msgstr "没有，就这样吧"
 
-#: ../src/empathy-account-assistant.c:1129
+#: ../src/empathy-account-assistant.c:1088
 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. You can easily change these details later or "
 "disable this feature by using the 'Accounts' dialog"
 msgstr ""
-"Empathy å\8f¯ä»¥è\87ªå\8a¨å\8f\91ç\8e°å\83\8fæ\82¨ä¸\80æ ·è¿\9eæ\8e¥å\88°å\90\8cæ ·ç\9a\84ç½\91ç»\9c中ç\9a\84人们ï¼\8c并ä¸\94å\8f¯ä»¥å\92\8cä»\96们è\81\8a天ã\80\82å¦\82"
-"æ\9e\9cæ\82¨æ\83³ä½¿ç\94¨è¿\99个å\8a\9fè\83½ï¼\8c请ä»\94ç»\86æ\9f¥ç\9c\8bä¸\8bå\88\97ä¿¡æ\81¯æ\98¯å\90¦æ­£ç¡®ã\80\82æ\82¨ä¹\8bå\90\8eä¹\9få\8f¯ä»¥é\80\9aè¿\87â\80\9cè´¦æ\88·â\80\9d对è¯\9dæ¡\86"
-"轻松的修改这些信息或关闭这个功能。"
+"Empathy å\8f¯ä»¥è\87ªå\8a¨å\8f\91ç\8e°å\92\8cæ\82¨è¿\9eæ\8e¥å\88°å\90\8cä¸\80个ç½\91ç»\9c中ç\9a\84人们ï¼\8c并ä¸\94å\8f¯ä»¥å\92\8cä»\96们è\81\8a天ã\80\82å¦\82æ\9e\9cæ\82¨"
+"æ\83³ä½¿ç\94¨è¿\99个å\8a\9fè\83½ï¼\8c请ä»\94ç»\86æ\9f¥ç\9c\8bä¸\8bå\88\97ä¿¡æ\81¯æ\98¯å\90¦æ­£ç¡®ã\80\82æ\82¨ä¹\8bå\90\8eä¹\9få\8f¯ä»¥é\80\9aè¿\87â\80\9cå¸\90å\8f·â\80\9d对è¯\9dæ¡\86è½»æ\9d¾"
+"的修改这些信息或关闭这个功能"
 
-#: ../src/empathy-account-assistant.c:1135
-#: ../src/empathy-account-assistant.c:1191
+#: ../src/empathy-account-assistant.c:1094
+#: ../src/empathy-account-assistant.c:1152
 msgid "Edit->Accounts"
-msgstr "编辑->è´¦æ\88·"
+msgstr "编辑->å¸\90å\8f·"
 
-#: ../src/empathy-account-assistant.c:1151
-msgid "I don't want to enable this feature for now"
-msgstr "暂不启用此特性"
+#: ../src/empathy-account-assistant.c:1110
+msgid "I do _not want to enable this feature for now"
+msgstr "暂不启用此特性(_N)"
 
-#: ../src/empathy-account-assistant.c:1187
+#: ../src/empathy-account-assistant.c:1148
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2232,217 +3107,293 @@ msgid ""
 "the Accounts dialog"
 msgstr ""
 "您无法同连接到您局域网中的用户聊天，因为没有安装 telepathy-salut。如果您想启"
-"用该功能，请安装 telepathy-salut 包，并且在è´¦æ\88·å¯¹è¯\9dæ¡\86中å\88\9b建é\99\84è¿\91ç\9a\84人(People "
-"Nearby) 账户。"
+"用该功能，请安装 telepathy-salut 包，并且在å¸\90å\8f·å¯¹è¯\9dæ¡\86中å\88\9b建é\99\84è¿\91ç\9a\84人(People "
+"Nearby)帐号"
 
-#: ../src/empathy-account-assistant.c:1193
+#: ../src/empathy-account-assistant.c:1154
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut 未安装"
 
-#: ../src/empathy-account-assistant.c:1239
+#: ../src/empathy-account-assistant.c:1200
 msgid "Messaging and VoIP Accounts Assistant"
-msgstr "消息和 VoIP 帐æ\88·å\8a©æ\89\8b"
+msgstr "消息和 VoIP 帐å\8f·å\8a©æ\89\8b"
 
-#: ../src/empathy-account-assistant.c:1273
+#: ../src/empathy-account-assistant.c:1234
 msgid "Welcome to Empathy"
 msgstr "欢迎使用 Empathy"
 
-#: ../src/empathy-account-assistant.c:1282
+#: ../src/empathy-account-assistant.c:1243
 msgid "Import your existing accounts"
-msgstr "导入现有帐æ\88·"
+msgstr "导入现有帐å\8f·"
 
-#: ../src/empathy-account-assistant.c:1300
+#: ../src/empathy-account-assistant.c:1261
 msgid "Please enter personal details"
 msgstr "请输入个人信息"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:69
 #, c-format
 msgid "There are unsaved modifications to your %s account."
-msgstr "您的 %s è´¦æ\88·æ\9c\89æ\9cªä¿\9då­\98ç\9a\84ä¿®æ\94¹ã\80\82"
+msgstr "您的 %s å¸\90å\8f·æ\9c\89æ\9cªä¿\9då­\98ç\9a\84ä¿®æ\94¹ã\80\82"
 
 #. 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:69
+#: ../src/empathy-accounts-dialog.c:73
 msgid "Your new account has not been saved yet."
-msgstr "您的新帐æ\88·è¿\98没æ\9c\89ä¿\9då­\98ã\80\82"
+msgstr "您的新帐å\8f·è¿\98没æ\9c\89ä¿\9då­\98ã\80\82"
 
-#: ../src/empathy-accounts-dialog.c:273 ../src/empathy-call-window.c:799
+#: ../src/empathy-accounts-dialog.c:347
+#: ../src/empathy-streamed-media-window.c:757
+#: ../src/empathy-call-window.c:1332
 msgid "Connecting…"
 msgstr "正在连接..."
 
-#: ../src/empathy-accounts-dialog.c:314
+#: ../src/empathy-accounts-dialog.c:388
 #, c-format
 msgid "Offline — %s"
 msgstr "离线 - %s"
 
-#: ../src/empathy-accounts-dialog.c:326
+#: ../src/empathy-accounts-dialog.c:400
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已断开 - %s"
 
-#: ../src/empathy-accounts-dialog.c:337
+#: ../src/empathy-accounts-dialog.c:411
 msgid "Offline — No Network Connection"
 msgstr "离线 - 无可用网络"
 
-#: ../src/empathy-accounts-dialog.c:344
+#: ../src/empathy-accounts-dialog.c:418
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: ../src/empathy-accounts-dialog.c:356
+#: ../src/empathy-accounts-dialog.c:430
 msgid "Offline — Account Disabled"
-msgstr "离线 - 帐æ\88·è¢«ç¦\81ç\94¨"
+msgstr "离线 - 帐å\8f·è¢«ç¦\81ç\94¨"
 
-#: ../src/empathy-accounts-dialog.c:797
-msgid ""
-"You are about to create a new account, which will discard\n"
-"your changes. Are you sure you want to proceed?"
-msgstr "您将要创建一个新账户，所做的修改将作废。您确定要继续吗？"
+#: ../src/empathy-accounts-dialog.c:533
+msgid "Edit Connection Parameters"
+msgstr "编辑连接参数"
+
+#: ../src/empathy-accounts-dialog.c:696
+msgid "Failed to retrieve your personal information from the server."
+msgstr "从服务器获取您的个人信息失败。"
+
+#: ../src/empathy-accounts-dialog.c:702
+msgid "Go online to edit your personal information."
+msgstr "请上线以编辑您的个人信息。"
+
+#: ../src/empathy-accounts-dialog.c:787
+msgid "_Edit Connection Parameters..."
+msgstr "编辑连接参数(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1144
+#: ../src/empathy-accounts-dialog.c:1292
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "您要从电脑中移除 %s 吗？"
 
-#: ../src/empathy-accounts-dialog.c:1148
+#: ../src/empathy-accounts-dialog.c:1296
 msgid "This will not remove your account on the server."
-msgstr "这不会删除服务器上的è´¦æ\88·ã\80\82"
+msgstr "这不会删除服务器上的å¸\90å\8f·ã\80\82"
 
-#: ../src/empathy-accounts-dialog.c:1385
+#: ../src/empathy-accounts-dialog.c:1532
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
-msgstr "您将要选择另一个è´¦æ\88·ï¼\8cæ\89\80å\81\9aç\9a\84ä¿®æ\94¹å°\86ä½\9cåº\9fã\80\82æ\82¨ç¡®å®\9aè¦\81继续å\90\97ï¼\9f"
+msgstr "您将要选择另一个å¸\90å\8f·ï¼\8cæ\89\80å\81\9aç\9a\84ä¿®æ\94¹å°\86ä½\9cåº\9fã\80\82æ\82¨ç¡®å®\9aè¦\81继续å\90\97ï¼\9f"
 
-#: ../src/empathy-accounts-dialog.c:1962
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1708
+msgid "_Enable"
+msgstr "启用(_E)"
+
+#: ../src/empathy-accounts-dialog.c:1709
+msgid "_Disable"
+msgstr "禁用(_D)"
+
+#: ../src/empathy-accounts-dialog.c:2179
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "您将要关闭此窗口，所做的修改将作废。您确定要继续吗？"
 
 #: ../src/empathy-accounts-dialog.ui.h:1
-msgid "No protocol installed"
-msgstr "尚未安装协议"
+msgid "Add…"
+msgstr "添加..."
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "_Import…"
+msgstr "导入(_I)..."
+
+#: ../src/empathy-accounts-dialog.ui.h:4
 msgid "Protocol:"
 msgstr "协议："
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
-msgstr "要添加一个新è´¦æ\88·ï¼\8cæ\82¨é¦\96å\85\88é\9c\80è¦\81为æ\82¨æ\83³è¦\81使ç\94¨ç\9a\84æ¯\8f个å\8d\8fè®®å®\89è£\85å\90\8e端ã\80\82"
+msgstr "要添加一个新å¸\90å\8f·ï¼\8cæ\82¨é¦\96å\85\88é\9c\80è¦\81为æ\82¨æ\83³è¦\81使ç\94¨ç\9a\84æ¯\8f个å\8d\8fè®®å®\89è£\85å\90\8e端ã\80\82"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "_Add…"
-msgstr "添加(_A)..."
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "尚未安装协议"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Import…"
-msgstr "导入(_I)..."
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Loading account information"
+msgstr "正在加载帐号信息"
+
+#: ../src/empathy-auth-client.c:286
+msgid " - Empathy authentication client"
+msgstr " - Empathy 认证客户端"
 
-#: ../src/empathy-auto-salut-account-helper.c:78
+#: ../src/empathy-auth-client.c:302
+msgid "Empathy authentication client"
+msgstr "Empathy 认证客户端"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../src/empathy-call-window.c:470
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
+msgid "- Empathy Audio/Video Client"
+msgstr " - Empathy 语音/视频客户端"
+
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy 语音/视频客户端"
+
+#: ../src/empathy-streamed-media-window.c:433
 msgid "Contrast"
 msgstr "对比度"
 
-#: ../src/empathy-call-window.c:473
+#: ../src/empathy-streamed-media-window.c:436
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:476
+#: ../src/empathy-streamed-media-window.c:439
 msgid "Gamma"
 msgstr "伽马"
 
-#: ../src/empathy-call-window.c:581
+#: ../src/empathy-streamed-media-window.c:545
 msgid "Volume"
 msgstr "音量"
 
-#: ../src/empathy-call-window.c:1146
+#: ../src/empathy-streamed-media-window.c:1097
 msgid "_Sidebar"
 msgstr "侧边栏(_S)"
 
-#: ../src/empathy-call-window.c:1165
+#: ../src/empathy-streamed-media-window.c:1117
 msgid "Audio input"
 msgstr "音频输入"
 
-#: ../src/empathy-call-window.c:1169
+#: ../src/empathy-streamed-media-window.c:1121
 msgid "Video input"
 msgstr "视频输入"
 
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-streamed-media-window.c:1129
 msgid "Dialpad"
 msgstr "电话键盘"
 
-#: ../src/empathy-call-window.c:1178
-#| msgid "Contact Details"
+#: ../src/empathy-streamed-media-window.c:1140
 msgid "Details"
 msgstr "详细信息"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1246
+#: ../src/empathy-streamed-media-window.c:1209
+#: ../src/empathy-call-window.c:1934
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通话"
 
-#. translators: Call is a noun. This string is used in the window
-#. * title
-#: ../src/empathy-call-window.c:1325
-msgid "Call"
-msgstr "通话"
+#: ../src/empathy-streamed-media-window.c:1442
+#: ../src/empathy-call-window.c:2178
+msgid "The IP address as seen by the machine"
+msgstr "机器所见的 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1444
+#: ../src/empathy-call-window.c:2180
+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:2182
+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:2184
+msgid "The IP address of a relay server"
+msgstr "中转服务器 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1450
+#: ../src/empathy-call-window.c:2186
+msgid "The IP address of the multicast group"
+msgstr "多播组的 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1838
+#: ../src/empathy-streamed-media-window.c:1841
+#: ../src/empathy-streamed-media-window.c:1844
+#: ../src/empathy-streamed-media-window.c:1847
+msgctxt "codec"
+msgid "Unknown"
+msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2117
+#: ../src/empathy-streamed-media-window.c:2139
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已连接 — %d:%02dm"
 
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-streamed-media-window.c:2200
+#: ../src/empathy-call-window.c:3040
 msgid "Technical Details"
 msgstr "技术细节"
 
-#: ../src/empathy-call-window.c:2216
+#: ../src/empathy-streamed-media-window.c:2238
+#: ../src/empathy-call-window.c:3079
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
 
-#: ../src/empathy-call-window.c:2221
+#: ../src/empathy-streamed-media-window.c:2243
+#: ../src/empathy-call-window.c:3084
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
 
-#: ../src/empathy-call-window.c:2227
+#: ../src/empathy-streamed-media-window.c:2249
+#: ../src/empathy-call-window.c:3090
 #, 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-call-window.c:2233
+#: ../src/empathy-streamed-media-window.c:2255
+#: ../src/empathy-call-window.c:3096
 msgid "There was a failure on the network"
 msgstr "网络出现一个错误"
 
-#: ../src/empathy-call-window.c:2237
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3100
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
 
-#: ../src/empathy-call-window.c:2240
+#: ../src/empathy-streamed-media-window.c:2262
+#: ../src/empathy-call-window.c:3103
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
 
-#: ../src/empathy-call-window.c:2250
+#: ../src/empathy-streamed-media-window.c:2272
+#: ../src/empathy-call-window.c:3115
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2452,299 +3403,405 @@ msgstr ""
 "Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>，并附上帮助菜"
 "单里“调试”窗口收集到的日志。"
 
-#: ../src/empathy-call-window.c:2258
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3124
 msgid "There was a failure in the call engine"
 msgstr "呼叫引擎里出现了一个故障"
 
-#: ../src/empathy-call-window.c:2297
+#: ../src/empathy-streamed-media-window.c:2283
+#: ../src/empathy-call-window.c:3127
+msgid "The end of the stream was reached"
+msgstr "已到达流的末尾"
+
+#: ../src/empathy-streamed-media-window.c:2323
+#: ../src/empathy-call-window.c:3167
 msgid "Can't establish audio stream"
 msgstr "不能建立音频流"
 
-#: ../src/empathy-call-window.c:2307
+#: ../src/empathy-streamed-media-window.c:2333
+#: ../src/empathy-call-window.c:3177
 msgid "Can't establish video stream"
 msgstr "不能建立视频流"
 
 #: ../src/empathy-call-window.ui.h:1
-#| msgid "Auto"
-msgid "Audio"
-msgstr "音频"
-
-#: ../src/empathy-call-window.ui.h:2
-msgid "Call the contact again"
-msgstr "再次呼叫联系人"
+#: ../src/empathy-streamed-media-window.ui.h:1
+msgid "_Call"
+msgstr "通话(_C)"
 
 #: ../src/empathy-call-window.ui.h:3
-msgid "Camera Off"
-msgstr "相机关闭"
+msgid "_Microphone"
+msgstr "话筒(_M)"
 
 #: ../src/empathy-call-window.ui.h:4
-msgid "Camera On"
-msgstr "相机开启"
+msgid "_Camera"
+msgstr "相机(_C)"
 
 #: ../src/empathy-call-window.ui.h:5
-msgid "Decoding Codec:"
-msgstr "解ç \81å\99¨ï¼\9a"
+msgid "_Settings"
+msgstr "设置(_S)"
 
 #: ../src/empathy-call-window.ui.h:6
-msgid "Disable camera and stop sending video"
-msgstr "禁用相机停止发送视频"
+#: ../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
-msgid "Enable camera and send video"
-msgstr "启用相机，并发送视频"
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-roster-window-menubar.ui.h:27
+msgid "_Help"
+msgstr "帮助(_H)"
 
-#: ../src/empathy-call-window.ui.h:8
-msgid "Enable camera but don't send video"
-msgstr "启用相机，但不发送视频"
+#: ../src/empathy-call-window.ui.h:8 ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-roster-window-menubar.ui.h:28
+msgid "_Contents"
+msgstr "内容(_C)"
 
 #: ../src/empathy-call-window.ui.h:9
-msgid "Encoding Codec:"
-msgstr "编码器："
+#: ../src/empathy-roster-window-menubar.ui.h:29
+msgid "_Debug"
+msgstr "调试(_D)"
 
 #: ../src/empathy-call-window.ui.h:10
-msgid "Hang up"
-msgstr "挂起"
+msgid "Swap camera"
+msgstr "交换相机"
 
 #: ../src/empathy-call-window.ui.h:11
-msgid "Hang up current call"
-msgstr "æ\8c\82èµ·å½\93å\89\8då\91¼å\8f«"
+msgid "Minimise me"
+msgstr "æ\9c\80å°\8få\8c\96æ\88\91"
 
 #: ../src/empathy-call-window.ui.h:12
-msgid "Preview"
-msgstr "预览"
+msgid "Maximise me"
+msgstr "最大化我"
 
 #: ../src/empathy-call-window.ui.h:13
-msgid "Redial"
-msgstr "重播"
+msgid "Disable camera"
+msgstr "禁用相机"
 
 #: ../src/empathy-call-window.ui.h:14
-msgid "Send Audio"
-msgstr "发送音频"
+#: ../src/empathy-streamed-media-window.ui.h:2
+msgid "Hang up"
+msgstr "挂断"
 
 #: ../src/empathy-call-window.ui.h:15
-msgid "Toggle audio transmission"
-msgstr "切换音频传输"
+#: ../src/empathy-streamed-media-window.ui.h:9
+msgid "Hang up current call"
+msgstr "挂断当前呼叫"
 
-#: ../src/empathy-call-window.ui.h:17
-msgid "V_ideo"
-msgstr "视频(_I)"
+#: ../src/empathy-call-window.ui.h:16
+msgid "Video call"
+msgstr "视频呼叫"
 
-#: ../src/empathy-call-window.ui.h:18
-#| msgid "V_ideo"
-msgid "Video"
-msgstr "视频"
+#: ../src/empathy-call-window.ui.h:17
+msgid "Start a video call"
+msgstr "开始视频通话"
 
 #: ../src/empathy-call-window.ui.h:19
-msgid "Video Off"
-msgstr "视频关闭"
+msgid "Start an audio call"
+msgstr "开始音频通话"
 
 #: ../src/empathy-call-window.ui.h:20
-msgid "Video On"
-msgstr "视频开启"
+msgid "Show dialpad"
+msgstr "显示拨号盘"
 
 #: ../src/empathy-call-window.ui.h:21
-msgid "Video Preview"
-msgstr "视频预览"
+msgid "Display the dialpad"
+msgstr "显示拨号盘"
 
-#: ../src/empathy-call-window.ui.h:23 ../src/empathy-main-window.ui.h:27
-msgid "_View"
-msgstr "查看(_V)"
+#: ../src/empathy-call-window.ui.h:22
+msgid "Send Video"
+msgstr "发送视频"
+
+#: ../src/empathy-call-window.ui.h:23
+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:2587 ../src/empathy-call-window.c:2588
+#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
+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
+msgid "Audio"
+msgstr "音频"
+
+#: ../src/empathy-chat-window.c:285
+msgid "Close this window?"
+msgstr "关闭此窗口？"
+
+#: ../src/empathy-chat-window.c:290
+#, 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:301
+#, c-format
+msgid ""
+"Closing this window will leave a chat room. You will not receive any further "
+"messages until you rejoin it."
+msgid_plural ""
+"Closing this window will leave %u chat rooms. You will not receive any "
+"further messages until you rejoin them."
+msgstr[0] ""
+"关闭此窗口将离开 %u 间聊天室。您将不会再收到任何消息，除非重新加入。"
+
+#: ../src/empathy-chat-window.c:310
+#, c-format
+msgid "Leave %s?"
+msgstr "级别 %s？"
+
+#: ../src/empathy-chat-window.c:311
+msgid ""
+"You will not receive any further messages from this chat room until you "
+"rejoin it."
+msgstr "您将不会再收到来自此聊天室的任何消息，除非重新加入。"
 
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:330
+msgid "Close window"
+msgstr "关闭窗口"
+
+#: ../src/empathy-chat-window.c:330
+msgid "Leave room"
+msgstr "离开聊天室"
+
+#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 未读)"
 
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:648
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
-msgstr[0] "%s (和 %u 其它)"
+msgstr[0] "%s (和另外 %u 人)"
 
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:664
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
-msgstr[0] "%s (%d 其它未读)"
+msgstr[0] "%s (另有他人的 %d 条未读)"
 
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:673
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
-msgstr[0] "%s (%d 全部未读)"
+msgstr[0] "%s (所有人共 %d 条未读)"
+
+#: ../src/empathy-chat-window.c:888
+msgid "SMS:"
+msgstr "短信："
+
+#: ../src/empathy-chat-window.c:898
+#, c-format
+msgid "Sending %d message"
+msgid_plural "Sending %d messages"
+msgstr[0] "正在发送 %d 条消息"
 
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:920
 msgid "Typing a message."
 msgstr "输入消息。"
 
 #: ../src/empathy-chat-window.ui.h:1
-msgid "C_lear"
-msgstr "清除(_L)"
+msgid "_Conversation"
+msgstr "对话(_C)"
 
-#: ../src/empathy-chat-window.ui.h:2
-msgid "C_ontact"
-msgstr "联系人(_O)"
+#: ../src/empathy-chat-window.ui.h:2
+msgid "C_lear"
+msgstr "清除(_L)"
 
 #: ../src/empathy-chat-window.ui.h:3
-msgid "Chat"
-msgstr "聊天"
-
-#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
 msgstr "插入表情(_S)"
 
+#: ../src/empathy-chat-window.ui.h:4
+msgid "_Favorite Chat Room"
+msgstr "收藏聊天室(_F)"
+
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant…"
-msgstr "邀请参与人(_P)..."
+msgid "Notify for All Messages"
+msgstr "提示所有消息"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "Move Tab _Left"
-msgstr "左移标签(_L)"
+#: ../src/empathy-chat-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "_Show Contact List"
+msgstr "显示联系人列表(_S)"
 
 #: ../src/empathy-chat-window.ui.h:7
-msgid "Move Tab _Right"
-msgstr "右移标签(_R)"
+msgid "Invite _Participant…"
+msgstr "邀请参与者(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:8
-msgid "Notify for All Messages"
-msgstr "提示所有消息"
-
-#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
-msgid "_Contents"
-msgstr "内容(_C)"
+msgid "C_ontact"
+msgstr "联系人(_O)"
 
 #: ../src/empathy-chat-window.ui.h:10
-msgid "_Conversation"
-msgstr "对话(_C)"
+msgid "_Tabs"
+msgstr "标签(_T)"
 
 #: ../src/empathy-chat-window.ui.h:11
-msgid "_Detach Tab"
-msgstr "漂移标签(_D)"
+msgid "_Previous Tab"
+msgstr "上一标签(_P)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
-msgid "_Edit"
-msgstr "编辑(_E)"
+#: ../src/empathy-chat-window.ui.h:12
+msgid "_Next Tab"
+msgstr "下一标签(_N)"
 
 #: ../src/empathy-chat-window.ui.h:13
-msgid "_Favorite Chat Room"
-msgstr "æ\94¶è\97\8fè\81\8a天室(_F)"
+msgid "_Undo Close Tab"
+msgstr "æ\92¤é\94\80å\85³é\97­æ \87ç­¾(_U)"
 
-#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
-msgid "_Help"
-msgstr "帮å\8a©(_H)"
+#: ../src/empathy-chat-window.ui.h:14
+msgid "Move Tab _Left"
+msgstr "左移æ \87ç­¾(_L)"
 
 #: ../src/empathy-chat-window.ui.h:15
-msgid "_Next Tab"
-msgstr "下一标签(_N)"
+msgid "Move Tab _Right"
+msgstr "右移标签(_R)"
 
 #: ../src/empathy-chat-window.ui.h:16
-msgid "_Previous Tab"
-msgstr "上一标签(_P)"
-
-#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
-msgid "_Show Contact List"
-msgstr "显示联系人列表(_S)"
-
-#: ../src/empathy-chat-window.ui.h:18
-msgid "_Tabs"
-msgstr "标签(_T)"
-
-#: ../src/empathy-chat-window.ui.h:19
-msgid "_Undo Close Tab"
-msgstr "撤销关闭标签(_U)"
+msgid "_Detach Tab"
+msgstr "漂移标签(_D)"
 
-#: ../src/empathy-chatrooms-window.c:241
+#: ../src/empathy-chatrooms-window.c:251
 msgid "Name"
 msgstr "名称"
 
-#: ../src/empathy-chatrooms-window.c:259
+#: ../src/empathy-chatrooms-window.c:269
 msgid "Room"
 msgstr "聊天室"
 
-#: ../src/empathy-chatrooms-window.c:267
+#: ../src/empathy-chatrooms-window.c:277
 msgid "Auto-Connect"
 msgstr "自动连接"
 
-#: ../src/empathy-chatrooms-window.ui.h:2
+#: ../src/empathy-chatrooms-window.ui.h:1
 msgid "Manage Favorite Rooms"
 msgstr "管理聊天室收藏"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:523
 msgid "Incoming video call"
 msgstr "呼入的视频通话"
 
-#: ../src/empathy-event-manager.c:473
+#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
 msgid "Incoming call"
 msgstr "来电"
 
-#: ../src/empathy-event-manager.c:477
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
-msgstr "%s 有一个视频呼叫给您。您想要接听吗？"
+msgstr "%s 视频来电。您想要接听吗？"
 
-#: ../src/empathy-event-manager.c:478
+#: ../src/empathy-event-manager.c:528
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 来电，您想要接听吗？"
 
-#: ../src/empathy-event-manager.c:481 ../src/empathy-event-manager.c:623
+#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
+#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的来电"
 
-#: ../src/empathy-event-manager.c:506
+#: ../src/empathy-event-manager.c:556
 msgid "_Reject"
 msgstr "拒绝(_R)"
 
-#: ../src/empathy-event-manager.c:512
+#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
 msgid "_Answer"
 msgstr "接听(_A)"
 
-#: ../src/empathy-event-manager.c:623
+#: ../src/empathy-event-manager.c:572
+msgid "_Answer with video"
+msgstr "使用视频接听(_A)"
+
+#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
+#: ../src/empathy-call-window.c:1568
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s 的视频呼叫"
 
-#: ../src/empathy-event-manager.c:700
+#: ../src/empathy-event-manager.c:838
 msgid "Room invitation"
 msgstr "聊天室邀请"
 
-#: ../src/empathy-event-manager.c:702
+#: ../src/empathy-event-manager.c:840
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:709
+#: ../src/empathy-event-manager.c:847
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:717
+#: ../src/empathy-event-manager.c:855
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../src/empathy-event-manager.c:722
-#: ../src/empathy-new-chatroom-dialog.ui.h:7
+#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:760
+#: ../src/empathy-event-manager.c:887
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 已邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:787
+#: ../src/empathy-event-manager.c:893
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "您被邀请加入 %s"
+
+#: ../src/empathy-event-manager.c:944
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "接收 %s 文件传输"
 
-#: ../src/empathy-event-manager.c:988
+#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
+msgid "Password required"
+msgstr "需要密码"
+
+#: ../src/empathy-event-manager.c:1217
 #, c-format
-msgid "Subscription requested by %s"
-msgstr "%s 的订阅请求"
+msgid "%s would like permission to see when you are online"
+msgstr "%s 当您在线的时候可见"
 
-#: ../src/empathy-event-manager.c:992
+#: ../src/empathy-event-manager.c:1223
 #, c-format
 msgid ""
 "\n"
@@ -2753,16 +3810,6 @@ msgstr ""
 "\n"
 "消息：%s"
 
-#: ../src/empathy-event-manager.c:1035
-#, c-format
-msgid "%s is now offline."
-msgstr "%s 当前离线。"
-
-#: ../src/empathy-event-manager.c:1055
-#, c-format
-msgid "%s is now online."
-msgstr "%s 当前在线。"
-
 #. Translators: time left, when it is more than one hour
 #: ../src/empathy-ft-manager.c:99
 #, c-format
@@ -2840,7 +3887,7 @@ msgstr "已经向 %2$s 完成发送 \"%1$s\""
 msgid "File transfer completed"
 msgstr "文件传送完成"
 
-#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:779
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他参与者的回应"
 
@@ -2854,15 +3901,15 @@ msgstr "检查\"%s\"完整性"
 msgid "Hashing \"%s\""
 msgstr "校验中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:990
+#: ../src/empathy-ft-manager.c:1025
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1002
+#: ../src/empathy-ft-manager.c:1037
 msgid "File"
 msgstr "文件"
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:1059
 msgid "Remaining"
 msgstr "剩余"
 
@@ -2878,168 +3925,225 @@ msgstr "从列表移除已完成、已取消及已失败的文件传输"
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
-msgstr "未找到可导入的è´¦æ\88·ã\80\82Empathy ç\9b®å\89\8då\8fªè\83½æ\94¯æ\8c\81ä»\8e Pidgin 导å\85¥è´¦æ\88·ã\80\82"
+msgstr "未找到可导入的å¸\90å\8f·ã\80\82Empathy ç\9b®å\89\8då\8fªè\83½æ\94¯æ\8c\81ä»\8e Pidgin 导å\85¥å¸\90å\8f·ã\80\82"
 
 #: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
-msgstr "导入è´¦æ\88·"
+msgstr "导入å¸\90å\8f·"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:315
 msgid "Import"
 msgstr "导入"
 
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:324
 msgid "Protocol"
 msgstr "协议"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:348
 msgid "Source"
 msgstr "源"
 
-#: ../src/empathy-main-window.c:457
+#: ../src/empathy-roster-window.c:391
+msgid "Provide Password"
+msgstr "提供密码"
+
+#: ../src/empathy-roster-window.c:397
+msgid "Disconnect"
+msgstr "已断开连接"
+
+#: ../src/empathy-roster-window.c:657
+msgid "You need to setup an account to see contacts here."
+msgstr "您需要设置一个帐号才能查看这里的联系人。"
+
+#: ../src/empathy-roster-window.c:673
+msgid "No match found"
+msgstr "没有找到匹配项"
+
+#: ../src/empathy-roster-window.c:783
+#, c-format
+msgid "Sorry, %s accounts can’t be used until your %s software is updated."
+msgstr "很抱歉，在软件 %2$s 更新前，您不能使用 %1$s 帐号。"
+
+#: ../src/empathy-roster-window.c:849
+msgid "Update software..."
+msgstr "升级软件"
+
+#: ../src/empathy-roster-window.c:855 ../src/empathy-roster-window.c:972
+msgid "Close"
+msgstr "关闭"
+
+#: ../src/empathy-roster-window.c:960
 msgid "Reconnect"
 msgstr "重新连接"
 
-#: ../src/empathy-main-window.c:463
+#: ../src/empathy-roster-window.c:966
 msgid "Edit Account"
-msgstr "编辑è´¦æ\88·"
+msgstr "编辑å¸\90å\8f·"
 
-#: ../src/empathy-main-window.c:469
-msgid "Close"
-msgstr "关闭"
+#. Translators: this string will be something like:
+#. * Top up My Account ($1.23)..."
+#: ../src/empathy-roster-window.c:1110
+#, c-format
+msgid "Top up %s (%s)..."
+msgstr "给 %s 充值(%s)..."
 
-#: ../src/empathy-main-window.c:1154
+#: ../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-main-window.c:1476
+#: ../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-main-window.c:1583
-msgid "Show and edit accounts"
-msgstr "显示和编辑账户"
+#: ../src/empathy-roster-window.ui.h:1
+msgid "Account settings"
+msgstr "帐号设置"
 
-#: ../src/empathy-main-window.ui.h:1
-msgid "Contacts on a _Map"
-msgstr "联系人地图(_M)"
+#: ../src/empathy-roster-window-menubar.ui.h:2
+#: ../src/empathy-status-icon.ui.h:2
+msgid "_New Conversation…"
+msgstr "新建对话(_N)..."
 
-#: ../src/empathy-main-window.ui.h:2
-msgid "Context"
-msgstr "上下文"
+#: ../src/empathy-roster-window-menubar.ui.h:3
+#: ../src/empathy-status-icon.ui.h:3
+msgid "New _Call…"
+msgstr "新建呼叫(_C)..."
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Join _Favorites"
-msgstr "加入已收藏的聊天室(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:6
+msgid "_Search for Contacts…"
+msgstr "搜索联系人(_S)..."
 
-#: ../src/empathy-main-window.ui.h:4
-msgid "Manage Favorites"
-msgstr "管理收藏夹"
+#: ../src/empathy-roster-window-menubar.ui.h:7
+msgid "_File Transfers"
+msgstr "文件传输(_F)"
 
-#: ../src/empathy-main-window.ui.h:5
-msgid "N_ormal Size"
-msgstr "常规视图(_O)"
+#: ../src/empathy-roster-window-menubar.ui.h:8
+msgid "_Offline Contacts"
+msgstr "离线联系人(_O)"
 
-#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call…"
-msgstr "æ\96°å»ºå\91¼å\8f«(_C)..."
+#: ../src/empathy-roster-window-menubar.ui.h:9
+msgid "Show P_rotocols"
+msgstr "æ\98¾ç¤ºå\8d\8fè®®(_R)"
 
-#: ../src/empathy-main-window.ui.h:7
-msgid "Normal Size With _Avatars"
-msgstr "扩展视图(_A)"
+#: ../src/empathy-roster-window-menubar.ui.h:10
+msgid "Credit Balance"
+msgstr "帐号余额"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../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-main-window.ui.h:9
-msgid "Show P_rotocols"
-msgstr "显示协议(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:16
+msgid "Find in Contact _List"
+msgstr "在联系人列表中查找(_L)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-roster-window-menubar.ui.h:18
 msgid "Sort by _Name"
 msgstr "按姓名排序(_N)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-roster-window-menubar.ui.h:19
 msgid "Sort by _Status"
 msgstr "按状态排序(_S)"
 
-#: ../src/empathy-main-window.ui.h:12
-msgid "_Accounts"
-msgstr "账户(_A)"
+#: ../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-main-window.ui.h:15
+#: ../src/empathy-roster-window-menubar.ui.h:22
 msgid "_Compact Size"
 msgstr "紧凑视图(_C)"
 
-#: ../src/empathy-main-window.ui.h:17
-msgid "_Debug"
-msgstr "调试(_D)"
-
-#: ../src/empathy-main-window.ui.h:19
-msgid "_File Transfers"
-msgstr "文件传输(_F)"
+#: ../src/empathy-roster-window-menubar.ui.h:23
+msgid "_Room"
+msgstr "聊天室(_R)"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-roster-window-menubar.ui.h:24
 msgid "_Join…"
 msgstr "加入(_J)..."
 
-#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation…"
-msgstr "新建对话(_N)..."
-
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Offline Contacts"
-msgstr "离线联系人(_O)"
-
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Personal Information"
-msgstr "个人信息(_P)"
+#: ../src/empathy-roster-window-menubar.ui.h:25
+msgid "Join _Favorites"
+msgstr "加入已收藏的聊天室(_F)"
 
-#: ../src/empathy-main-window.ui.h:26
-msgid "_Room"
-msgstr "聊天室(_R)"
+#: ../src/empathy-roster-window-menubar.ui.h:26
+msgid "Manage Favorites"
+msgstr "管理收藏夹"
 
-#: ../src/empathy-new-chatroom-dialog.c:379
+#: ../src/empathy-new-chatroom-dialog.c:369
 msgid "Chat Room"
 msgstr "聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:395
+#: ../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:605
+#: ../src/empathy-new-chatroom-dialog.c:637
 #, c-format
 msgid ""
-"<b>%s</b>\n"
+"%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
-"<b>%s</b>\n"
-"需要邀请：%s\n"
-"需要密码：%s\n"
-"成员：%s"
+"%s\n"
+"需要邀请: %s\n"
+"需要密码: %s\n"
+"成员: %s"
 
-#: ../src/empathy-new-chatroom-dialog.c:607
-#: ../src/empathy-new-chatroom-dialog.c:608
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "否"
 
-#: ../src/empathy-new-chatroom-dialog.c:635
+#: ../src/empathy-new-chatroom-dialog.c:668
 msgid "Could not start room listing"
 msgstr "无法开始聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.c:645
+#: ../src/empathy-new-chatroom-dialog.c:678
 msgid "Could not stop room listing"
 msgstr "无法停止聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:2
-msgid "Couldn't load room list"
-msgstr "无法载入聊天室列表"
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Join Room"
+msgstr "加入聊天室"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
@@ -3047,120 +4151,202 @@ msgid ""
 msgstr "输入聊天室名以加入或在列表中点击一个或多个聊天室。"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:4
+msgid "_Room:"
+msgstr "聊天室(_R)："
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
 msgid ""
 "Enter the server which hosts the room, or leave it empty if the room is on "
 "the current account's server"
-msgstr "输入聊天室所在的服务器，或为空表示聊天室在当前è´¦æ\88·ç\9a\84æ\9c\8då\8a¡å\99¨ä¸\8aã\80\82"
+msgstr "输入聊天室所在的服务器，或为空表示聊天室在当前å¸\90å\8f·ç\9a\84æ\9c\8då\8a¡å\99¨ä¸\8aã\80\82"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:5
-msgid "Join Room"
-msgstr "加入聊天室"
+#: ../src/empathy-new-chatroom-dialog.ui.h:8
+msgid "Couldn't load room list"
+msgstr "无法载入聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:6
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "Room List"
 msgstr "聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.ui.h:8
-msgid "_Room:"
-msgstr "聊天室(_R)："
-
-#: ../src/empathy-preferences.c:136
+#: ../src/empathy-preferences.c:166
 msgid "Message received"
 msgstr "收到了消息"
 
-#: ../src/empathy-preferences.c:137
+#: ../src/empathy-preferences.c:167
 msgid "Message sent"
 msgstr "发出了消息"
 
-#: ../src/empathy-preferences.c:138
+#: ../src/empathy-preferences.c:168
 msgid "New conversation"
 msgstr "新对话"
 
-#: ../src/empathy-preferences.c:139
-msgid "Contact goes online"
-msgstr "离线人上线"
+#: ../src/empathy-preferences.c:169
+msgid "Contact comes online"
+msgstr "联系人上线了"
 
-#: ../src/empathy-preferences.c:140
+#: ../src/empathy-preferences.c:170
 msgid "Contact goes offline"
-msgstr "联系人离线"
+msgstr "联系人离线了"
 
-#: ../src/empathy-preferences.c:141
+#: ../src/empathy-preferences.c:171
 msgid "Account connected"
-msgstr "è´¦æ\88·å·²è¿\9eæ\8e¥"
+msgstr "å¸\90å\8f·å·²è¿\9eæ\8e¥"
 
-#: ../src/empathy-preferences.c:142
+#: ../src/empathy-preferences.c:172
 msgid "Account disconnected"
-msgstr "è´¦æ\88·å·²æ\96­å¼\80"
+msgstr "å¸\90å\8f·å·²æ\96­å¼\80"
 
-#: ../src/empathy-preferences.c:437
+#: ../src/empathy-preferences.c:475
 msgid "Language"
 msgstr "语言"
 
-#: ../src/empathy-preferences.c:873
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:726
+msgid "Juliet"
+msgstr "朱立叶"
+
+#. translators: Contact name for the chat theme preview
+#: ../src/empathy-preferences.c:733
+msgid "Romeo"
+msgstr "罗密欧"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:739
+msgid "O Romeo, Romeo, wherefore art thou Romeo?"
+msgstr "O Romeo, Romeo, wherefore art thou Romeo?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:743
+msgid "Deny thy father and refuse thy name;"
+msgstr "Deny thy father and refuse thy name;"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:746
+msgid "Or if thou wilt not, be but sworn my love"
+msgstr "Or if thou wilt not, be but sworn my love"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:749
+msgid "And I'll no longer be a Capulet."
+msgstr "And I'll no longer be a Capulet."
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:752
+msgid "Shall I hear more, or shall I speak at this?"
+msgstr "Shall I hear more, or shall I speak at this?"
+
+#. translators: Quote from Romeo & Julier, for chat theme preview
+#: ../src/empathy-preferences.c:755
+msgid "Juliet has disconnected"
+msgstr "朱立叶已断开连接"
+
+#: ../src/empathy-preferences.c:1159
 msgid "Preferences"
 msgstr "首选项"
 
 #: ../src/empathy-preferences.ui.h:1
-msgid "Appearance"
-msgstr "外观"
+msgid "Show _smileys as images"
+msgstr "显示表情符号为图形(_S)"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Behavior"
-msgstr "行为"
+msgid "Show contact _list in rooms"
+msgstr "在聊天室显示联系人列表(_L)"
 
 #: ../src/empathy-preferences.ui.h:3
-msgid "Chat Th_eme:"
-msgstr "聊天主题(_E)："
+msgid "Appearance"
+msgstr "外观"
 
 #: ../src/empathy-preferences.ui.h:4
-msgid "Disable notifications when _away or busy"
-msgstr "离开或忙碌时禁用提示(_A)"
+msgid "Start chats in:"
+msgstr "聊天开始于："
 
 #: ../src/empathy-preferences.ui.h:5
-msgid "Disable sounds when _away or busy"
-msgstr "离开或忙碌时禁用声音(_A)"
+msgid "new ta_bs"
+msgstr "新标签(_B)"
 
 #: ../src/empathy-preferences.ui.h:6
-msgid "Display incoming events in the notification area"
-msgstr "再提示区域显示呼入事件"
+msgid "new _windows"
+msgstr "新窗口(_W)"
 
 #: ../src/empathy-preferences.ui.h:7
-msgid "Enable notifications when a contact comes online"
-msgstr "å½\93è\81\94系人ä¸\8a线æ\97¶å\85\81许æ\8f\90示"
+msgid "Display incoming events in the notification area"
+msgstr "å\86\8dæ\8f\90示å\8cºå\9f\9fæ\98¾ç¤ºå\91¼å\85¥äº\8b件"
 
 #: ../src/empathy-preferences.ui.h:8
-msgid "Enable notifications when a contact goes offline"
-msgstr "å½\93è\81\94系人离线æ\97¶å\85\81许æ\8f\90示"
+msgid "_Automatically connect on startup"
+msgstr "å\90¯å\8a¨æ\97¶è\87ªå\8a¨è¿\9eæ\8e¥(_A) "
 
 #: ../src/empathy-preferences.ui.h:9
-msgid "Enable notifications when the _chat is not focused"
-msgstr "当会话闲置时允许提示"
+msgid "Log conversations"
+msgstr "记录对话"
 
 #: ../src/empathy-preferences.ui.h:10
-msgid "Enable spell checking for languages:"
-msgstr "允许拼写检查的语言："
+msgid "Behavior"
+msgstr "行为"
 
 #: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "常规"
 
+#: ../src/empathy-preferences.ui.h:12
+msgid "_Enable bubble notifications"
+msgstr "允许气泡通知(_E)"
+
 #: ../src/empathy-preferences.ui.h:13
-msgid "Location sources:"
-msgstr "位置来源："
+msgid "Disable notifications when _away or busy"
+msgstr "离开或忙碌时禁用提示(_A)"
 
 #: ../src/empathy-preferences.ui.h:14
+msgid "Enable notifications when the _chat is not focused"
+msgstr "当会话闲置时允许提示"
+
+#: ../src/empathy-preferences.ui.h:15
+msgid "Enable notifications when a contact comes online"
+msgstr "当联系人上线时允许提示"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Enable notifications when a contact goes offline"
+msgstr "当联系人离线时允许提示"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 msgstr "提示"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "_Enable sound notifications"
+msgstr "启用声音通知(_E)"
+
+#: ../src/empathy-preferences.ui.h:19
+msgid "Disable sounds when _away or busy"
+msgstr "离开或忙碌时禁用声音(_A)"
+
+#: ../src/empathy-preferences.ui.h:20
 msgid "Play sound for events"
 msgstr "播放事件声音"
 
-#: ../src/empathy-preferences.ui.h:16
-msgid "Privacy"
-msgstr "隐私"
+#: ../src/empathy-preferences.ui.h:21
+msgid "Sounds"
+msgstr "声音"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:22
+msgid "Use _echo cancellation to improve call quality"
+msgstr "使用回声抑制，以改善通话质量"
+
+#: ../src/empathy-preferences.ui.h:23
+msgid ""
+"Echo cancellation helps to make your voice sound clearer to the other "
+"person, but may cause problems on some computers. If you or the other person "
+"hear strange noises or glitches during calls, try turning echo cancellation "
+"off and restarting the call."
+msgstr ""
+"回声消除可以使您的语音在对方听来更清晰，但在某些计算机上可能导致问题。如果您"
+"或对方在通话时听到了奇怪的噪音或怪音，请尝试关闭回声消除并重新通话。"
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Publish location to my contacts"
+msgstr "向我的联系人公布位置信息(_P)"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3169,219 +4355,566 @@ msgstr ""
 "降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
 "将精确到一位小数。 "
 
-#: ../src/empathy-preferences.ui.h:18
-msgid "Show _smileys as images"
-msgstr "显示表情符号为图形(_S)"
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:29
+msgid "_Reduce location accuracy"
+msgstr "降低位置信息精度(_R)"
+
+#: ../src/empathy-preferences.ui.h:30
+msgid "Privacy"
+msgstr "隐私"
 
-#: ../src/empathy-preferences.ui.h:19
-msgid "Show contact _list in rooms"
-msgstr "在聊天室显示联系人列表(_L)"
+#: ../src/empathy-preferences.ui.h:31
+msgid "_GPS"
+msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:20
-msgid "Sounds"
-msgstr "声音"
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Cellphone"
+msgstr "手机(_C)"
 
-#: ../src/empathy-preferences.ui.h:21
-msgid "Spell Checking"
-msgstr "拼写检查"
+#: ../src/empathy-preferences.ui.h:33
+msgid "_Network (IP, Wi-Fi)"
+msgstr "网络(_N)(IP，Wi-Fi)"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:34
+msgid "Location sources:"
+msgstr "位置来源："
+
+#: ../src/empathy-preferences.ui.h:36
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "语言列表仅反映已安装的字典"
 
-#: ../src/empathy-preferences.ui.h:23
-msgid "Themes"
-msgstr "主题"
+#: ../src/empathy-preferences.ui.h:37
+msgid "Enable spell checking for languages:"
+msgstr "允许拼写检查的语言："
 
-#: ../src/empathy-preferences.ui.h:24
-msgid "_Automatically connect on startup"
-msgstr "启动时自动登录(_A) "
+#: ../src/empathy-preferences.ui.h:38
+msgid "Spell Checking"
+msgstr "拼写检查"
 
-#: ../src/empathy-preferences.ui.h:25
-msgid "_Cellphone"
-msgstr "手机(_C)"
+#: ../src/empathy-preferences.ui.h:39
+msgid "Chat Th_eme:"
+msgstr "聊天主题(_E)："
 
-#: ../src/empathy-preferences.ui.h:26
-msgid "_Enable bubble notifications"
-msgstr "允许气泡通知(_E)"
+#: ../src/empathy-preferences.ui.h:40
+msgid "Variant:"
+msgstr "版本："
 
-#: ../src/empathy-preferences.ui.h:27
-msgid "_Enable sound notifications"
-msgstr "启用声音通知(_E)"
+#: ../src/empathy-preferences.ui.h:41
+msgid "Themes"
+msgstr "主题"
 
-#: ../src/empathy-preferences.ui.h:28
-msgid "_GPS"
-msgstr "_GPS"
+#: ../src/empathy-status-icon.ui.h:4
+msgid "Status"
+msgstr "状态"
 
-#: ../src/empathy-preferences.ui.h:29
-msgid "_Network (IP, Wi-Fi)"
-msgstr "网络(_N)(IP，Wi-Fi)"
+#: ../src/empathy-status-icon.ui.h:5
+msgid "_Quit"
+msgstr "退出(_Q)"
 
-#: ../src/empathy-preferences.ui.h:30
-msgid "_Open new chats in separate windows"
-msgstr "在单独窗口中打开新聊天(_O)"
+#: ../src/empathy-streamed-media-window.ui.h:3
+msgid "Redial"
+msgstr "重拨"
 
-#: ../src/empathy-preferences.ui.h:31
-msgid "_Publish location to my contacts"
-msgstr "向我的联系人公布位置信息(_P)"
+#: ../src/empathy-streamed-media-window.ui.h:4
+msgid "V_ideo"
+msgstr "视频(_I)"
 
-#: ../src/empathy-preferences.ui.h:32
-msgid "_Reduce location accuracy"
-msgstr "降低位置信息精度(_R)"
+#: ../src/empathy-streamed-media-window.ui.h:5
+msgid "Video Off"
+msgstr "视频关闭"
 
-#: ../src/empathy-status-icon.c:141
-msgid "Respond"
-msgstr "响应"
+#: ../src/empathy-streamed-media-window.ui.h:6
+msgid "Video Preview"
+msgstr "视频预览"
 
-#: ../src/empathy-status-icon.c:147
-msgid "Reject"
-msgstr "拒绝"
+#: ../src/empathy-streamed-media-window.ui.h:7
+msgid "Video On"
+msgstr "视频开启"
 
-#: ../src/empathy-status-icon.c:151
-msgid "Answer"
-msgstr "接听"
+#: ../src/empathy-streamed-media-window.ui.h:10
+msgid "Call the contact again"
+msgstr "再次呼叫联系人"
 
-#: ../src/empathy-status-icon.c:158
-msgid "Decline"
-msgstr "拒绝"
+#: ../src/empathy-streamed-media-window.ui.h:13
+msgid "Camera Off"
+msgstr "相机关闭"
 
-#: ../src/empathy-status-icon.c:162
-msgid "Accept"
-msgstr "接受"
+#: ../src/empathy-streamed-media-window.ui.h:14
+msgid "Disable camera and stop sending video"
+msgstr "禁用相机停止发送视频"
 
-#: ../src/empathy-status-icon.ui.h:2
-msgid "Status"
-msgstr "状态"
+#: ../src/empathy-streamed-media-window.ui.h:15
+msgid "Preview"
+msgstr "预览"
 
-#: ../src/empathy-status-icon.ui.h:4
-msgid "_Quit"
-msgstr "退出(_Q)"
+#: ../src/empathy-streamed-media-window.ui.h:16
+msgid "Enable camera but don't send video"
+msgstr "启用相机，但不发送视频"
+
+#: ../src/empathy-streamed-media-window.ui.h:17
+msgid "Camera On"
+msgstr "相机开启"
+
+#: ../src/empathy-streamed-media-window.ui.h:18
+msgid "Enable camera and send video"
+msgstr "启用相机，并发送视频"
 
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:471
 msgid "Contact Map View"
 msgstr "联系地图视图"
 
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1228
 msgid "Save"
 msgstr "保存"
 
-#: ../src/empathy-debug-window.c:1395
+#: ../src/empathy-debug-window.c:1435
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: ../src/empathy-debug-window.c:1475
+#: ../src/empathy-debug-window.c:1517
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/empathy-debug-window.c:1487
+#: ../src/empathy-debug-window.c:1529
 msgid "Level "
 msgstr "级别 "
 
-#: ../src/empathy-debug-window.c:1507
+#: ../src/empathy-debug-window.c:1549
 msgid "Debug"
 msgstr "调试"
 
-#: ../src/empathy-debug-window.c:1513
+#: ../src/empathy-debug-window.c:1555
 msgid "Info"
 msgstr "信息"
 
-#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
 msgid "Message"
 msgstr "消息"
 
-#: ../src/empathy-debug-window.c:1525
+#: ../src/empathy-debug-window.c:1567
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:1531
+#: ../src/empathy-debug-window.c:1573
 msgid "Critical"
 msgstr "危急"
 
-#: ../src/empathy-debug-window.c:1537
+#: ../src/empathy-debug-window.c:1579
 msgid "Error"
 msgstr "错误"
 
-#: ../src/empathy-debug-window.c:1556
+#: ../src/empathy-debug-window.c:1598
 msgid "Time"
 msgstr "时间"
 
-#: ../src/empathy-debug-window.c:1559
+#: ../src/empathy-debug-window.c:1601
 msgid "Domain"
 msgstr "域"
 
-#: ../src/empathy-debug-window.c:1561
+#: ../src/empathy-debug-window.c:1603
 msgid "Category"
 msgstr "类别"
 
-#: ../src/empathy-debug-window.c:1563
+#: ../src/empathy-debug-window.c:1605
 msgid "Level"
 msgstr "级别"
 
-#: ../src/empathy-debug-window.c:1600
+#: ../src/empathy-debug-window.c:1642
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "已选定的连接管理不支持远程调试扩展"
 
-#: ../src/empathy-invite-participant-dialog.c:34
-#: ../src/empathy-invite-participant-dialog.c:48
+#: ../src/empathy-invite-participant-dialog.c:200
+#: ../src/empathy-invite-participant-dialog.c:228
 msgid "Invite Participant"
-msgstr "邀请参与人"
+msgstr "邀请参与者"
 
-#: ../src/empathy-invite-participant-dialog.c:35
+#: ../src/empathy-invite-participant-dialog.c:201
 msgid "Choose a contact to invite into the conversation:"
 msgstr "选择一个联系人以加入该会话："
 
-#: ../src/empathy-invite-participant-dialog.c:45
+#: ../src/empathy-invite-participant-dialog.c:224
 msgid "Invite"
 msgstr "邀请"
 
-#: ../src/empathy-accounts.c:182
+#: ../src/empathy-accounts.c:183
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
-msgstr "不显示任何对话框；执行任务(如，导入)然后退出"
+msgstr "不显示任何对话框；完成所有工作（如导入）然后退出"
 
-#: ../src/empathy-accounts.c:186
-msgid "Don't display any dialogs if there are any non-salut accounts"
-msgstr "如果有任何 non-salut 账户的话，不显示任何对话框"
+#: ../src/empathy-accounts.c:187
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "只有“附近的人”帐号的时候不显示任何对话框"
 
-#: ../src/empathy-accounts.c:190
+# lainme：初次选择给定的帐号(比如 gabble/jabber/foo_40example_2eorg0)
+#: ../src/empathy-accounts.c:191
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "首先选择给定账户 (如，gabble/jabber/foo_40example_2eorg0)"
+msgstr "首先选择给定帐号(如 gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:192
+#: ../src/empathy-accounts.c:193
 msgid "<account-id>"
-msgstr "<è´¦æ\88· ID>"
+msgstr "<å¸\90å\8f· ID>"
 
-#: ../src/empathy-accounts.c:200
+#: ../src/empathy-accounts.c:196
+msgid "Show account assistant"
+msgstr "显示帐号助手"
+
+#: ../src/empathy-accounts.c:202
 msgid "- Empathy Accounts"
-msgstr "- Empathy è´¦æ\88·"
+msgstr "- Empathy å¸\90å\8f·"
 
-#: ../src/empathy-accounts.c:216
+#: ../src/empathy-accounts.c:238
 msgid "Empathy Accounts"
-msgstr "Empathy 账户"
+msgstr "Empathy 帐号"
+
+#: ../src/empathy-debugger.c:69
+msgid "Show a particular service"
+msgstr "显示特定的服务"
 
-#: ../src/empathy-debugger.c:40
+#: ../src/empathy-debugger.c:74
+msgid "- Empathy Debugger"
+msgstr "- Empathy 调试器"
+
+#: ../src/empathy-debugger.c:113
 msgid "Empathy Debugger"
 msgstr "Empathy 调试器"
 
-#: ../src/empathy-av.c:133
-msgid "- Empathy Audio/Video Client"
-msgstr " - Empathy 语音/视频客户端"
+#: ../src/empathy-chat.c:109
+msgid "- Empathy Chat Client"
+msgstr " - Empathy IM 客户端"
 
-#: ../src/empathy-av.c:149
-msgid "Empathy Audio/Video Client"
-msgstr "Empathy 语音/视频客户端"
+#: ../src/empathy-notifications-approver.c:190
+msgid "Respond"
+msgstr "响应"
+
+#: ../src/empathy-notifications-approver.c:204
+#: ../src/empathy-call-window.c:1572
+msgid "Reject"
+msgstr "拒绝"
+
+#: ../src/empathy-notifications-approver.c:209
+#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-call-window.c:1573
+msgid "Answer"
+msgstr "接听"
+
+#: ../src/empathy-notifications-approver.c:214
+msgid "Answer with video"
+msgstr "以视频应答"
+
+#: ../src/empathy-notifications-approver.c:222
+#: ../src/empathy-notifications-approver.c:232
+msgid "Decline"
+msgstr "拒绝"
+
+#: ../src/empathy-notifications-approver.c:226
+#: ../src/empathy-notifications-approver.c:237
+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:247
+msgid "Provide"
+msgstr "提供"
+
+#: ../src/empathy-call-observer.c:134
+#, c-format
+msgid "%s just tried to call you, but you were in another call."
+msgstr "%s 刚刚尝试呼叫您，但您当时正在与其他人通话。"
+
+#. Translators: this is an "Info" label. It should be as short
+#. * as possible.
+#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
+msgid "i"
+msgstr "i"
+
+#: ../src/empathy-call-window.c:2936
+msgid "On hold"
+msgstr "挂起"
+
+#: ../src/empathy-call-window.c:2939
+msgid "Mute"
+msgstr "静音"
+
+#: ../src/empathy-call-window.c:2941
+msgid "Duration"
+msgstr "时长"
+
+#. Translators: 'status - minutes:seconds' the caller has been connected
+#: ../src/empathy-call-window.c:2944
+#, c-format
+msgid "%s — %d:%02dm"
+msgstr "%s — %d:%02dm"
+
+#: ../src/empathy-call-window.c:3214
+#, c-format
+msgid "Your current balance is %s."
+msgstr "您当前的余额为 %s。"
+
+#: ../src/empathy-call-window.c:3218
+msgid "Sorry, you don’t have enough credit for that call."
+msgstr "对不起，您信用卡余额不足以支付此次通话。"
+
+#: ../src/empathy-call-window.c:3220
+msgid "Top Up"
+msgstr "充值"
+
+#: ../libempathy-gtk/empathy-search-bar.c:243
+msgid "_Match case"
+msgstr "区分大小写(_M)"
+
+#: ../libempathy-gtk/empathy-new-account-dialog.c:166
+msgid "Adding new account"
+msgstr "添加新帐号"
+
+#~ msgid "Socket type not supported"
+#~ msgstr "不支持 Socket 类型"
+
+#~ msgid "My Web Accounts"
+#~ msgstr "我的网络帐号"
+
+#~ msgid "The account %s is edited via %s."
+#~ msgstr "%s 帐号通过 %s 进行了编辑。"
+
+#~ msgid "The account %s cannot be edited in Empathy."
+#~ msgstr "%s 帐号无法在 Empathy 中编辑。"
+
+#~ msgid "Launch My Web Accounts"
+#~ msgstr "启动我的网络帐号"
+
+#~ msgid "Edit %s"
+#~ msgstr "编辑 %s"
+
+#~ msgid "Ca_ncel"
+#~ msgstr "取消(_N)"
+
+#~ msgid "Personal Information"
+#~ msgstr "个人信息"
+
+#~ msgctxt "Edit contact (contextual menu)"
+#~ msgid "_Edit"
+#~ msgstr "编辑(_E)"
+
+#~ msgid "Linked Contacts"
+#~ msgstr "已绑定的联系人"
+
+#~ msgid "Select contacts to link"
+#~ msgstr "选择要绑定的联系人"
+
+#~ msgid "New contact preview"
+#~ msgstr "新联系人预览"
+
+#~ msgid "Contacts selected in the list on the left will be linked together."
+#~ msgstr "在左侧列表中选中的联系人将被绑定在一起。"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link Contacts…"
+#~ msgstr "绑定联系人(_L)…"
+
+#~ msgid "Link Contacts"
+#~ msgstr "绑定联系人"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink…"
+#~ msgstr "解除绑定(_U)..."
+
+#~ msgid ""
+#~ "Completely split the displayed linked contacts into the separate contacts."
+#~ msgstr "完全分离已显示的绑定的联系人成为单独的联系人"
+
+#~ msgid "_Link"
+#~ msgstr "绑定(_L)"
+
+#~ msgid "Unlink linked contacts '%s'?"
+#~ msgstr "解除已绑定的联系人 %s？"
+
+#~ msgid ""
+#~ "Are you sure you want to unlink these linked contacts? This will "
+#~ "completely split the linked contacts into separate contacts."
+#~ msgstr ""
+#~ "您确定您要接触这些已绑定的联系人？这将会完全拆分已绑定的联系人为单独的联系"
+#~ "人。"
+
+#~ msgctxt "Unlink individual (button)"
+#~ msgid "_Unlink"
+#~ msgstr "解除绑定(_U)"
+
+#~ msgid ""
+#~ "You are about to create a new account, which will discard\n"
+#~ "your changes. Are you sure you want to proceed?"
+#~ msgstr "您将要创建一个新帐号，所做的修改将作废。您确定要继续吗？"
+
+#~ msgid "_Personal Information"
+#~ msgstr "个人信息(_P)"
+
+#~ msgid "_Open new chats in separate windows"
+#~ msgstr "在单独窗口中打开新聊天(_O)"
+
+#~ msgid "Call volume"
+#~ msgstr "来电音量"
+
+#~ msgid "Call volume, as a percentage."
+#~ msgstr "来电音量，以百分比计。"
+
+#~ msgid "Input level:"
+#~ msgstr "输入级别："
+
+#~ msgid "Input volume:"
+#~ msgstr "输入音量："
+
+#~ msgid "Empathy has migrated butterfly logs"
+#~ msgstr "Empathy 已经迁移至 telepathy-butterfly 日志"
+
+#~ 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："
+
+#~ msgid "C_hat"
+#~ msgstr "聊天(_H)"
+
+#~ msgid "Send _Video"
+#~ msgstr "发送视频(_V)"
+
+#~ msgid "C_all"
+#~ msgstr "通话(_A)"
+
+#~ msgid "Set your presence and current status"
+#~ msgstr "设置您的状态信息和现在的状态"
+
+#~ msgid "The selected contact cannot receive files."
+#~ msgstr "选择的联系人无法接收文件。"
+
+#~ msgid "The selected contact is offline."
+#~ msgstr "选择的联系人离线。"
+
+#~ msgctxt "encoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgctxt "encoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgctxt "decoding video codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgctxt "decoding audio codec"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgid "Find Next"
+#~ msgstr "向下查找"
+
+#~ msgid "Find Previous"
+#~ msgstr "向上查找"
+
+#~ msgid "Show and edit accounts"
+#~ msgstr "显示和编辑帐号"
+
+#, fuzzy
+#~ msgid "Call with %d participants"
+#~ msgstr "与 %s 通话"
+
+#~| msgid "Dialpad"
+#~ msgid "_Dialpad"
+#~ msgstr "电话键盘"
+
+#~ msgid "All"
+#~ msgstr "全部"
+
+#~ msgid "Date"
+#~ msgstr "日期"
+
+#~ msgid "Conversations"
+#~ msgstr "对话"
+
+#~ msgid "Previous Conversations"
+#~ msgstr "以前的对话"
+
+#~ msgid "_For:"
+#~ msgstr "包含(_F)："
+
+#~ msgid "Enter Custom Message"
+#~ msgstr "输入自定义状态"
+
+#~ msgid "Save _New Status Message"
+#~ msgstr "保存新的状态信息(_N)"
+
+#~ msgid "Saved Status Messages"
+#~ msgstr "保存状态信息"
+
+#~ msgid "_Enabled"
+#~ msgstr "已启用(_E)"
+
+#~ msgid "The hash of the received file and the sent one do not match"
+#~ msgstr "接收到的文件和发送的那个文件哈希值不匹配"
+
+#~ msgid "Add _New Preset"
+#~ msgstr "添加新自定义状态(_N)"
+
+#~ msgid "Saved Presets"
+#~ msgstr "已保存的自定义状态"
+
+#~ msgid "Subscription requested by %s"
+#~ msgstr "%s 的订阅请求"
+
+#~ msgid "%s is now offline."
+#~ msgstr "%s 当前离线。"
+
+#~ msgid "%s is now online."
+#~ msgstr "%s 当前在线。"
+
+#~ msgid "Context"
+#~ msgstr "上下文"
+
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy 已经询问导入帐号"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Empathy 是否应该已经询问过要从其它程序中导入帐号。"
+
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "使用 _Yahoo 日本"
+
+#~ msgid "_Character set:"
+#~ msgstr "字符集(_C)："
+
+#~ msgid "_E-mail address:"
+#~ msgstr "电子邮件(_E)："
+
+#~ msgid "_Nickname:"
+#~ msgstr "昵称(_N)："
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>位置</b>，"
 
 #~ msgid "Send and receive messages"
 #~ msgstr "发送接收即时消息"
 
 #~ msgid "MC 4 accounts have been imported"
-#~ msgstr "MC 4 è´¦æ\88·å·²ç»\8f被导å\85¥"
+#~ msgstr "MC 4 å¸\90å\8f·å·²ç»\8f被导å\85¥"
 
 #~ msgid "MC 4 accounts have been imported."
-#~ msgstr "MC 4 帐æ\88·å·²ç»\8f被导å\85¥ã\80\82"
+#~ msgstr "MC 4 帐å\8f·å·²ç»\8f被导å\85¥ã\80\82"
 
 #~ msgid "Port of the proxy for outbound requests."
 #~ msgstr "出站代理端口"
@@ -3396,15 +4929,12 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgstr "选择目的地"
 
 #~ msgid "%s account"
-#~ msgstr "%s 账户"
-
-#~ msgid "Salut account is created"
-#~ msgstr "已创建 Salut 账户"
+#~ msgstr "%s 帐号"
 
 #~ msgid ""
 #~ "Whether or not the Salut account has been created on the first Empathy "
 #~ "run."
-#~ msgstr "是否在 Empathy 第一次运行时创建 Salut è´¦æ\88·ã\80\82"
+#~ msgstr "是否在 Empathy 第一次运行时创建 Salut å¸\90å\8f·ã\80\82"
 
 #~ msgid "Hidden"
 #~ msgstr "隐身"
@@ -3415,9 +4945,6 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgid "Email:"
 #~ msgstr "电子邮件："
 
-#~ msgid "C_all"
-#~ msgstr "通话(_A)"
-
 #~ msgid "Custom Message..."
 #~ msgstr "自定义状态..."
 
@@ -3427,18 +4954,9 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgid "Custom messages..."
 #~ msgstr "自定义状态..."
 
-#~ msgid "Show the accounts dialog"
-#~ msgstr "显示账户对话框"
-
 #~ msgid "The error message was: <span style=\"italic\">%s</span>"
 #~ msgstr "错误信息是：<span style=\"italic\">%s</span>"
 
-#~ msgid "_Next"
-#~ msgstr "下一页(_N)"
-
-#~ msgid "Accounts"
-#~ msgstr "账户"
-
 #~ msgid "Add new"
 #~ msgstr "添加"
 
@@ -3452,7 +4970,7 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgstr "导入(_I)..."
 
 #~ msgid "_Reuse an existing account"
-#~ msgstr "启用现有帐æ\88·(_R)"
+#~ msgstr "启用现有帐å\8f·(_R)"
 
 #~ msgid "%s is offering you an invitation"
 #~ msgstr "%s 正发送邀请给您"
@@ -3481,7 +4999,7 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgid ""
 #~ "An invitation was offered for service %s, but you don't have the needed "
 #~ "application to handle it"
-#~ msgstr "一个由 %s 服务提供邀请，但是你不需要应用程序处理它"
+#~ msgstr "一个由 %s 服务提供邀请，但是您不需要应用程序处理它"
 
 #~ msgid "Can't set an empty display name"
 #~ msgstr "无法设置为空显示名称"
@@ -3499,9 +5017,6 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgid "The contact's avatar token. Empty means contact has no avatar."
 #~ msgstr "联系人的头像标志。空表示联系人无头像。"
 
-#~ msgid "Megaphone"
-#~ msgstr "话筒"
-
 #~ msgid "Talk!"
 #~ msgstr "说吧！"
 
@@ -3527,7 +5042,7 @@ msgstr "Empathy 语音/视频客户端"
 #~ "You are about to remove your %s account!\n"
 #~ "Are you sure you want to proceed?"
 #~ msgstr ""
-#~ "您将要删除您的 %s è´¦æ\88·ï¼\81\n"
+#~ "您将要删除您的 %s å¸\90å\8f·ï¼\81\n"
 #~ "您确定要继续吗？"
 
 #~ msgid ""
@@ -3539,14 +5054,11 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgstr ""
 #~ "如果您决定继续，任何相关的对话和聊天室都 不会 被删除。\n"
 #~ "\n"
-#~ "如果将来您重新添加此è´¦æ\88·ï¼\8cå®\83们å°\86ä»\8dç\84¶å­\98å\9c¨ã\80\82"
+#~ "如果将来您重新添加此å¸\90å\8f·ï¼\8cå®\83们å°\86ä»\8dç\84¶å­\98å\9c¨ã\80\82"
 
 #~ msgid "Conversations (%d)"
 #~ msgstr "对话 (%d)"
 
-#~ msgid "_Contact"
-#~ msgstr "联系人(_C)"
-
 #~ msgid "Allow _GPS usage"
 #~ msgstr "允许使用 GPS 信息(_G)"
 
@@ -3566,16 +5078,13 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgstr "gtk-remove"
 
 #~ msgid "Add Account"
-#~ msgstr "添加帐æ\88·"
+#~ msgstr "添加帐å\8f·"
 
 #~ msgid "Gmail"
 #~ msgstr "Gmail"
 
 #~ msgid "Import Accounts..."
-#~ msgstr "导入账户..."
-
-#~ msgid "Settings"
-#~ msgstr "设置"
+#~ msgstr "导入帐号..."
 
 #~ msgid "Type:"
 #~ msgstr "类型："
@@ -3598,9 +5107,6 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgid "<b>Servers</b>"
 #~ msgstr "<b>服务器</b>"
 
-#~ msgid "Create a new IRC network"
-#~ msgstr "创建新的 IRC 网络"
-
 #~ msgid "Edit the selected IRC network"
 #~ msgstr "编辑选中的 IRC 网络"
 
@@ -3613,9 +5119,6 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgid "_Check Word Spelling..."
 #~ msgstr "拼写检查(_C)..."
 
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>话题：</b>"
-
 #~ msgid "Group Chat"
 #~ msgstr "群聊"
 
@@ -3638,21 +5141,12 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>群组</b>"
 
-#~ msgid "Contact information"
-#~ msgstr "联系人信息"
-
 #~ msgid "Message:"
 #~ msgstr "消息："
 
-#~ msgid "Save message"
-#~ msgstr "保存消息"
-
 #~ msgid "Status:"
 #~ msgstr "状态："
 
-#~ msgid "Word"
-#~ msgstr "单词"
-
 #~ msgid "Suggestions for the word"
 #~ msgstr "单词的拼写建议"
 
@@ -3663,7 +5157,7 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgstr "单词的拼写建议："
 
 #~ msgid "<b>New Account</b>"
-#~ msgstr "<b>新建è´¦æ\88·</b>"
+#~ msgstr "<b>新建å¸\90å\8f·</b>"
 
 #~ msgid "<b>No protocol installed</b>"
 #~ msgstr "<b>未安装协议</b>"
@@ -3674,9 +5168,6 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgid "Invitation _message:"
 #~ msgstr "邀请消息(_M)："
 
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "您被邀请加入一个聊天会议。"
-
 #~ msgid "Edit Favorite Room"
 #~ msgstr "编辑聊天室收藏"
 
@@ -3715,9 +5206,6 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgid "unknown size"
 #~ msgstr "未知大小"
 
-#~ msgid "%s would like to send you a file"
-#~ msgstr "%s 想要给您发送一个文件"
-
 #~ msgid "Do you want to accept the file \"%s\" (%s)?"
 #~ msgstr "您想要接收文件“%s”(%s)吗？"
 
@@ -3769,9 +5257,6 @@ msgstr "Empathy 语音/视频客户端"
 #~ msgid "Show _avatars"
 #~ msgstr "显示头像(_A)"
 
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "紧凑显示联系人列表(_M)"
-
 #~ msgid "Sort by _name"
 #~ msgstr "按名称排序(_N)"