Update Simplified Chinese translation.

[empathy.git] / po / zh_CN.po

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 70d8f33c01dc6a50f6c976bc3b103138bcd62e23..4214de39b0904ca68d9682e3060ce474ad43d683 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # Simplified Chinese translation of Empathy.
 # Convert to Simp. Chinese translation of Empathy.
-# Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This file is distributed under the same license as the Empathy package.
 #
 # Abel Cheung <maddog@linux.org.hk>, 2003.
@@ -8,491 +8,645 @@
 # Rongjun Mu <elanmu@sina.com>, 2003.
 # YangZhang <zyangmath@gmail.com>, 2008.
 # Funda Wang <fundawang@gmail.com>, 2009.
-# Aron Xu <aronxu@gnome.org>, 2009.
 # Lyper Lai <lyp069@gmail.com>, 2009.
+# Yun Nie <yun.nie@ptiglobal.net>, 2009.
+# Richard Ma <richard.ma.19850509@gmail.com>, 2009.
+# Tao Wei <weitao1979@gmail.com>, 2009.
+# Tao Wang <dancefire@gmail.com>, 2010.
+# Dean Lee <xslidian@gmail.com>, 2010.
+# Yinghua Wang <wantinghard@gmail.com>, 2010
+# liuzhen <liuzhen1191@gmail.com>, 2011.
+# Aron Xu <happyaron.xu@gmail.com>, 2009, 2010, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gossip\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-25 19:26+0800\n"
-"PO-Revision-Date: 2009-07-25 21:28+0000\n"
+"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: 2011-03-03 13:42+0000\n"
+"PO-Revision-Date: 2011-03-03 22:44+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
-"Language-Team: Simplified Chinese <i18n-zh@googlegroups.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy IM Client"
-msgstr "Empathy IM 客户端"
+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 "Send and receive messages"
-msgstr "发送接收即时消息"
+msgid "Empathy"
+msgstr "Empathy"
 
-#: ../data/empathy.schemas.in.h:1
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
+msgstr "Empathy 即时通讯程序"
+
+#: ../data/empathy.desktop.in.in.h:4
+msgid "IM Client"
+msgstr "IM 客户端"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "总是为新聊天打开单独的聊天窗口。"
 
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "在群聊中使用昵称补全时在昵称后面添加的字符。"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Chat window theme"
 msgstr "聊天窗口主题"
 
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
 msgstr "用于拼写检查器的语言的列表，以逗号分隔(例如：en, fr, nl)。"
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
 msgstr "紧凑显示联系人列表"
 
-#: ../data/empathy.schemas.in.h:6
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Connection managers should be used"
-msgstr "是否使用 NetworkManager"
+msgstr "应该使用连接管理器"
 
-#: ../data/empathy.schemas.in.h:7
-msgid "Contact list sort criterium"
-msgstr "联系人列表排序规则"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Contact list sort criterion"
+msgstr "联系人列表排序条件"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "默认的选取头像图片的目录"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "离开时禁用弹出提示"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Disable sounds when away"
 msgstr "离开时禁用声音"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "在状态栏显示呼入事件。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+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:13
 msgid "Empathy can publish the user's location"
 msgstr "Empathy 能够发布用户的位置"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Empathy can use the GPS to guess the location"
-msgstr "Empathy 能够通过 GPS 来估算位置"
+msgstr "Empathy 能够通过 GPS 来估计位置"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 能够通过手机来估算位置"
+msgstr "Empathy 能够通过手机来估计位置"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy can use the network to guess the location"
-msgstr "Empathy 能够通过网络来估算位置"
+msgstr "Empathy 能够通过网络来估计位置"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Empathy default download folder"
 msgstr "Empathy 默认下载文件夹"
 
-#: ../data/empathy.schemas.in.h:16
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy å·²ç»\8f询é\97®å¯¼å\85¥è´¦æ\88·"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Empathy has migrated butterfly logs"
+msgstr "Empathy å·²ç»\8fè¿\81移è\87³ telepathy-butterfly æ\97¥å¿\97"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy 空闲时是否自动离开"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 启动时是否自动连接"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should reduce the location's accuracy"
 msgstr "降低 Emapthy 位置信息的准确度"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Enable WebKit Developer Tools"
 msgstr "启用 WebKit 开发工具"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable popup notifications for new messages"
 msgstr "启用新消息弹出提示"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Enable spell checker"
 msgstr "启用拼写检查器"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Hide main window"
 msgstr "隐藏主窗口"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Hide the main window."
 msgstr "隐藏主窗口。"
 
-#: ../data/empathy.schemas.in.h:25
-msgid "MC 4 accounts have been imported"
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:26
-msgid "MC 4 accounts have been imported."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Nick completed character"
 msgstr "昵称补全字符"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Open new chats in separate windows"
 msgstr "在单独窗口中打开新聊天"
 
-#: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+msgid "Path of the Adium theme to use"
 msgstr "Adium 主题的路径"
 
-#: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果聊天使用 Adium 主题，使用 Adium 主题的路径"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Play a sound for incoming messages"
 msgstr "收到消息时播放声音"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for new conversations"
 msgstr "新对话时播放声音"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "发出消息时播放声音"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound when a contact logs in"
 msgstr "联系人登录时播放声音"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when a contact logs out"
 msgstr "联系人注销时播放声音"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when we log in"
 msgstr "登录时播放声音"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound when we log out"
 msgstr "注销时播放声音"
 
-#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果聊天窗口不是焦点则弹出消息通知"
 
-#: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Pop up notifications when a contact logs in"
 msgstr "当联系人登录时弹出通知"
 
-#: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+msgid "Pop up notifications when a contact logs out"
 msgstr "当联系人注销时弹出通知"
 
-#: ../data/empathy.schemas.in.h:41
-msgid "Salut account is created"
-msgstr "已创建 Salut 账户"
-
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Show avatars"
 msgstr "显示头像"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show contact list in rooms"
 msgstr "在聊天室显示联系人列表"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show hint about closing the main window"
 msgstr "关闭主窗口时显示提示"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show offline contacts"
 msgstr "显示离线联系人"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+msgid "Show protocols"
+msgstr "显示协议"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Spell checking languages"
 msgstr "拼写检查器语言"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "The default folder to save file transfers in."
 msgstr "保存传送文件的默认文件夹。"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次选取头像图片的目录。"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "The position for the chat window side pane"
+msgstr "聊天窗口边栏的位置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "聊天窗口边栏保存的位置(像素)。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用于在聊天窗口中显示会话的主题。"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Use graphical smileys"
 msgstr "使用表情图标"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use notification sounds"
 msgstr "使用通知声音"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Use theme for chat rooms"
 msgstr "为聊天室使用主题"
 
-#: ../data/empathy.schemas.in.h:53
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "WebKit 开发工具，例如 Web Inspector 是否应该启用。"
-
-#: ../data/empathy.schemas.in.h:54
-msgid "Whether or not Empathy can publish the user's location to his contacts."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "是否允许 Empathy 将用户的位置共享给联系人"
 
-#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "是否允许 Empathy 通过 GPS 估算位置"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "是否允许 Empathy 通过 GPS 估计位置"
 
-#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
-msgstr "是否允许 Empathy 通过手机估算位置"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "是否允许 Empathy 通过手机网络估计位置"
 
-#: ../data/empathy.schemas.in.h:57
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "是否允许 Empathy 通过网络估算位置"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "是否允许 Empathy 通过网络估计位置"
 
-#: ../data/empathy.schemas.in.h:58
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "Empathy 是否应该已经询问过要从其它程序中导入账户。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr "Empathy 是否已经迁移至 telepathy-butterfly 日志。"
 
-#: ../data/empathy.schemas.in.h:59
-msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是否在启动时自动登入您的账户。"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Empathy 是否应在用户空闲时自动进入离开模式。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "是否使用联系人的头像作为聊天窗口的图标。"
 
-#: ../data/empathy.schemas.in.h:62
-#, fuzzy
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
-msgstr "是否使用 NetworkManager(网络管理器) 自动断开连接/重新连接。"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "WebKit 开发工具，例如 Web Inspector 是否应该启用。"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "是否在 Empathy 第一次运行时创建 Salut 账户。"
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "是否使用连接管理器自动断开连接或重新连接。"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr "是否对您想要作拼写检查的单词作拼写检查。"
 
-#: ../data/empathy.schemas.in.h:65
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
-msgstr "对话时是否将表情符号转换为真正的图标。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "对话时是否将表情符号转换为表情图标。"
 
-#: ../data/empathy.schemas.in.h:66
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是否需要联系人上线提示音。"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是否需要联系人下线提示音。"
 
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for events."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Whether to play a sound to notify of events."
 msgstr "是否需要事件提示音。"
 
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for incoming messages."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是否需要消息到达提示音。"
 
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for new conversations."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Whether to play a sound to notify of new conversations."
 msgstr "是否需要新会话提示音。"
 
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "是否为外出消息使用语音提示。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "是否为外出消息使用声音提示。"
 
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound when logging in a network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Whether to play a sound when logging into a network."
 msgstr "当联网登录时是否播放提示音。"
 
-#: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging off a network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+msgid "Whether to play a sound when logging out of a network."
 msgstr "当网络断开时是否播放提示音。"
 
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play sound notifications when away or busy."
-msgstr "当离开或忙碌时是否使用语音通知。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to play sound notifications when away or busy."
+msgstr "当离开或忙碌时是否使用声音提示。"
 
-#: ../data/empathy.schemas.in.h:75
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "当联系人离线时是否显示弹出通知。"
 
-#: ../data/empathy.schemas.in.h:76
-msgid "Whether or not to show a popup notification when a contact goes online."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr "当联系人上线时是否显示弹出通知"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
-msgstr "å½\93æ\8e¥æ\94¶æ\96°æ¶\88æ\81¯æ\97¶æ\98¯å\90¦æ\98¾ç¤ºå¼¹å\87ºæ\8f\90示å\8d³è\81\8a天çª\97å\8f£å·²å¼\80å\90¯ï¼\8cä½\86æ\9cªé\97²ç½®。"
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
+msgstr "å¦\82æ\9e\9cè\81\8a天çª\97å\8f£å·²å¼\80å\90¯ï¼\8cä½\86ä¸\8dæ\98¯å½\93å\89\8dçª\97å\8f£ï¼\8cæ\8e¥æ\94¶æ\96°æ¶\88æ\81¯æ\97¶æ\98¯å\90¦å¼¹å\87ºæ\8f\90示。"
 
-#: ../data/empathy.schemas.in.h:78
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr "当收到新消息时是否弹出显示提示框。"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是否在联系人列表和聊天窗口中显示头像。"
 
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是否显示联系人清单中离线的联系人。"
 
-#: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show popup notifications when away or busy."
-msgstr "当离开活忙碌时是否弹出显示提示框。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+msgid "Whether to show popup notifications when away or busy."
+msgstr "当离开或忙碌时是否弹出显示提示框。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "是否在联系人列表和聊天窗口中显示协议。"
 
-#: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show the contact list in chat rooms."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid "Whether to show the contact list in chat rooms."
 msgstr "是否在聊天室显示联系人列表。"
 
-#: ../data/empathy.schemas.in.h:83
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
-msgstr "是否对使用标题栏中的“X”按钮关闭主窗口显示消息对话框。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Whether to show the contact list in compact mode."
+msgstr "是否以紧凑模式显示联系人列表。"
 
-#: ../data/empathy.schemas.in.h:84
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "是否以紧凑格式显示联系人列表。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "当使用标题栏中的“X”按钮关闭主窗口时是否显示提示对话框。"
 
-#: ../data/empathy.schemas.in.h:85
-msgid "Whether to use the theme for chat rooms or not."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to use the theme for chat rooms."
 msgstr "是否对聊天室使用主题。"
 
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"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\"以按联系人姓名\n"
-"排序。取值为\"state\"时将按状态排序联系人列表。"
+"使用何种条件来排序联系人列表。默认情况下使用值“姓名”以按联系人姓名排序。取值"
+"为“状态”时将按状态排序联系人列表。"
 
-#: ../libempathy/empathy-account.c:1086
-msgid "Can't set an empty display name"
-msgstr ""
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管理消息和 VoIP 帐户"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2242
+msgid "Messaging and VoIP Accounts"
+msgstr "消息和 VoIP 帐户"
 
-#: ../libempathy/empathy-ft-handler.c:839
-msgid "The hash of the received file and the sent one do not match"
-msgstr "接收到的文件和发送的那个文件哈希值不匹配"
+#: ../libempathy/empathy-ft-handler.c:825
+#, fuzzy
+#| msgid "File transfer completed"
+msgid "File transfer completed, but the file was corrupted"
+msgstr "文件传送完成"
 
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1116
 msgid "File transfer not supported by remote contact"
 msgstr "文件传输不支持远程连接"
 
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1172
 msgid "The selected file is not a regular file"
 msgstr "所选文件是非正常的文件"
 
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1181
 msgid "The selected file is empty"
 msgstr "所选文件是空的"
 
-#: ../libempathy/empathy-tp-contact-list.c:844 ../src/empathy.c:285
-msgid "People nearby"
-msgstr "附近的人"
-
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:268
 msgid "Socket type not supported"
-msgstr "不支持Socket类型"
+msgstr "不支持 Socket 类型"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:387
 msgid "No reason was specified"
 msgstr "未指定原因"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:390
 msgid "The change in state was requested"
 msgstr "需要状态改变信息"
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:393
 msgid "You canceled the file transfer"
 msgstr "您取消了文件传输"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:396
 msgid "The other participant canceled the file transfer"
 msgstr "另外的参与者取消了文件的传输"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:399
 msgid "Error while trying to transfer the file"
 msgstr "当传输这个文件的时候发生错误"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:402
 msgid "The other participant is unable to transfer the file"
 msgstr "另外的参与者无法传输这个文件"
 
-#: ../libempathy/empathy-tp-file.c:417
+#: ../libempathy/empathy-tp-file.c:405 ../libempathy/empathy-utils.c:383
 msgid "Unknown reason"
 msgstr "未知原因"
 
-#: ../libempathy/empathy-utils.c:235
+#: ../libempathy/empathy-utils.c:305
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:237
+#: ../libempathy/empathy-utils.c:307
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:240
+#: ../libempathy/empathy-utils.c:310
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:242
-msgid "Hidden"
+#: ../libempathy/empathy-utils.c:312
+msgid "Invisible"
 msgstr "隐身"
 
-#: ../libempathy/empathy-utils.c:244
+#: ../libempathy/empathy-utils.c:314
 msgid "Offline"
 msgstr "离线"
 
-#: ../libempathy/empathy-utils.c:378 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:316
+#: ../src/empathy-streamed-media-window.c:1897
+#: ../src/empathy-streamed-media-window.c:1898
+#: ../src/empathy-streamed-media-window.c:1899
+#: ../src/empathy-streamed-media-window.c:1900
+#: ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "未知"
+
+#: ../libempathy/empathy-utils.c:355
+msgid "No reason specified"
+msgstr "未指定原因"
+
+#: ../libempathy/empathy-utils.c:357 ../libempathy/empathy-utils.c:413
+msgid "Status is set to offline"
+msgstr "状态已设置为离线"
+
+#: ../libempathy/empathy-utils.c:359 ../libempathy/empathy-utils.c:393
+msgid "Network error"
+msgstr "网络错误"
+
+#: ../libempathy/empathy-utils.c:361 ../libempathy/empathy-utils.c:395
+msgid "Authentication failed"
+msgstr "验证失败"
+
+#: ../libempathy/empathy-utils.c:363 ../libempathy/empathy-utils.c:397
+msgid "Encryption error"
+msgstr "加密错误"
+
+#: ../libempathy/empathy-utils.c:365
+msgid "Name in use"
+msgstr "用户名已经被占用"
+
+#: ../libempathy/empathy-utils.c:367 ../libempathy/empathy-utils.c:399
+msgid "Certificate not provided"
+msgstr "未提供证书"
+
+#: ../libempathy/empathy-utils.c:369 ../libempathy/empathy-utils.c:401
+msgid "Certificate untrusted"
+msgstr "证书不被信任"
+
+#: ../libempathy/empathy-utils.c:371 ../libempathy/empathy-utils.c:403
+msgid "Certificate expired"
+msgstr "证书已过期"
+
+#: ../libempathy/empathy-utils.c:373 ../libempathy/empathy-utils.c:405
+msgid "Certificate not activated"
+msgstr "证书尚未激活"
+
+#: ../libempathy/empathy-utils.c:375 ../libempathy/empathy-utils.c:407
+msgid "Certificate hostname mismatch"
+msgstr "证书主机名不匹配"
+
+#: ../libempathy/empathy-utils.c:377 ../libempathy/empathy-utils.c:409
+msgid "Certificate fingerprint mismatch"
+msgstr "证书指纹不匹配"
+
+#: ../libempathy/empathy-utils.c:379 ../libempathy/empathy-utils.c:411
+msgid "Certificate self-signed"
+msgstr "证书是自签属的"
+
+#: ../libempathy/empathy-utils.c:381
+msgid "Certificate error"
+msgstr "证书错误"
+
+#: ../libempathy/empathy-utils.c:415
+msgid "Encryption is not available"
+msgstr "加密不可用"
+
+#: ../libempathy/empathy-utils.c:417
+msgid "Certificate is invalid"
+msgstr "证书无效"
+
+#: ../libempathy/empathy-utils.c:419
+msgid "Connection has been refused"
+msgstr "连接被拒绝"
+
+#: ../libempathy/empathy-utils.c:421
+msgid "Connection can't be established"
+msgstr "无法建立连接"
+
+#: ../libempathy/empathy-utils.c:423
+msgid "Connection has been lost"
+msgstr "连接已丢失"
+
+#: ../libempathy/empathy-utils.c:425
+msgid "This resource is already connected to the server"
+msgstr "该资源已被连接至服务器"
+
+#: ../libempathy/empathy-utils.c:427
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "连接已被使用相同资源的新连接取代"
+
+#: ../libempathy/empathy-utils.c:430
+msgid "The account already exists on the server"
+msgstr "服务器上已存在该账户"
+
+#: ../libempathy/empathy-utils.c:432
+msgid "Server is currently too busy to handle the connection"
+msgstr "服务器太忙，无法处理当前连接"
+
+#: ../libempathy/empathy-utils.c:434
+msgid "Certificate has been revoked"
+msgstr "证书已被吊销"
+
+# lainme：证书使用不安全的加密算法或是弱加密的
+# xslidian：证书使用的加密算法不安全或者易被破解
+#: ../libempathy/empathy-utils.c:436
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "证书使用不安全的加密算法或者是弱加密的"
+
+#: ../libempathy/empathy-utils.c:439
+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:602
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "附近的人"
 
+#: ../libempathy/empathy-utils.c:607
+msgid "Yahoo! Japan"
+msgstr "Yahoo! 日本"
+
+#: ../libempathy/empathy-utils.c:636
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../libempathy/empathy-utils.c:637
+msgid "Facebook Chat"
+msgstr "Facebook 聊天"
+
 #: ../libempathy/empathy-time.c:137
 #, c-format
 msgid "%d second ago"
@@ -533,29 +687,119 @@ msgstr[0] "%d 月前"
 msgid "in the future"
 msgstr "将来"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:424
+#: ../libempathy-gtk/empathy-account-chooser.c:501
 msgid "All"
 msgstr "全部"
 
-#: ../libempathy-gtk/empathy-account-widget.c:448
-#: ../libempathy-gtk/empathy-account-widget.c:504
+#: ../libempathy-gtk/empathy-account-widget.c:679
+#: ../libempathy-gtk/empathy-log-window.c:647
+#: ../src/empathy-import-widget.c:321
+msgid "Account"
+msgstr "账户"
+
+#: ../libempathy-gtk/empathy-account-widget.c:680
+msgid "Password"
+msgstr "密码"
+
+#: ../libempathy-gtk/empathy-account-widget.c:681
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "服务器"
+
+#: ../libempathy-gtk/empathy-account-widget.c:682
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "端口"
+
+#: ../libempathy-gtk/empathy-account-widget.c:754
+#: ../libempathy-gtk/empathy-account-widget.c:811
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1224
-msgid "Enabled"
-msgstr "启用"
+#: ../libempathy-gtk/empathy-account-widget.c:1163
+#, c-format
+msgid "The account %s is edited via My Web Accounts."
+msgstr "%s 账户通过我的网络账户进行了编辑。"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1169
+#, c-format
+msgid "The account %s cannot be edited in Empathy."
+msgstr "%s 账户无法在 Empathy 中编辑。"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1189
+msgid "Launch My Web Accounts"
+msgstr "启动我的网络账户"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1527
+msgid "Username:"
+msgstr "用户名："
+
+#: ../libempathy-gtk/empathy-account-widget.c:1894
+msgid "A_pply"
+msgstr "应用(_P)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1924
+msgid "L_og in"
+msgstr "登录(_O)"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1990
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:463
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1479
+#: ../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:2001
+msgid "_Enabled"
+msgstr "已启用(_E)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2066
+msgid "This account already exists on the server"
+msgstr "服务器上已存在该账户"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2069
+msgid "Create a new account on the server"
+msgstr "在服务器上创建新的帐户"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2261
+msgid "Ca_ncel"
+msgstr "取消(_N)"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../libempathy-gtk/empathy-account-widget.c:2558
+#, 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:2584
+#, c-format
+msgid "%s Account"
+msgstr "%s 账户"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2588
+msgid "New account"
+msgstr "新建账户"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr ""
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>例如：</b> 我的屏幕名称"
 
 #: ../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: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
@@ -565,91 +809,142 @@ msgstr "高级"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 #: ../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:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "Pass_word:"
 msgstr "密码(_W)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../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:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#, fuzzy
+#| msgid "Password"
+msgid "Remember Password"
+msgstr "密码"
+
+#. remember password ticky box
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../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:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-password-dialog.c:311
+msgid "Remember password"
+msgstr "记住密码"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
 msgid "Screen _Name:"
 msgstr "用户名(_N)："
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 msgid "What is your AIM password?"
-msgstr ""
+msgstr "您的 AIM 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 msgid "What is your AIM screen name?"
-msgstr ""
+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:15
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:9
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
 msgstr "端口(_P)："
 
-#: ../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:16
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
+#: ../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:27
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:10
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "服务器(_S)："
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr ""
+msgid "<b>Example:</b> username"
+msgstr "<b>例如：</b>用户名"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "登录 I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 msgid "What is your GroupWise User ID?"
-msgstr ""
+msgstr "您的 GroupWise 用户名是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 msgid "What is your GroupWise password?"
-msgstr ""
+msgstr "您的 GroupWise 密码是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr ""
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>例如：</b>123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "字符集(_A):"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN："
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
 msgid "What is your ICQ UIN?"
-msgstr ""
+msgstr "您的 ICQ UIN 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
 msgid "What is your ICQ password?"
-msgstr ""
+msgstr "您的 ICQ 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
-msgstr "字符集(_C)："
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
+msgid "Auto"
+msgstr "自动"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
-msgid "New Network"
-msgstr "新建网络"
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+msgid "TCP"
+msgstr "TCP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
+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
+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
+msgid "Options"
+msgstr "选项"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+msgid "None"
+msgstr "无"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
+msgid "Character set:"
 msgstr "字符集："
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
@@ -674,239 +969,412 @@ msgstr "退出消息："
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
-msgstr "全名："
+msgstr "真名："
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Servers"
 msgstr "服务器"
 
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "您的 IRC 昵称是什么?"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "哪个 IRC 网络?"
+
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
-msgstr ""
+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:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "需要加密(TLS/SSL)(_Y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "忽略 SSL 证书错误(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
 msgstr "覆盖服务器设置"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
-msgid "Pri_ority:"
-msgstr "优先级(_O)："
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr "优先级(_T):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Reso_urce:"
 msgstr "资源(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#. 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:14
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\">this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+"这是您的用户名，而不是您通常登陆 Facebook 的名称。\n"
+"如果您是 facebook.com/<b>badger</b>，输入\n"
+"<b>badger</b>。如果您还没有 Facebook 用户名的话，使用<a href=\"http://www."
+"facebook.com/username/\">这个页面</a> 来选择一个。"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "Use old SS_L"
 msgstr "使用旧的 SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "What is your Facebook password?"
+msgstr "您的 Facebook 密码是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "What is your Facebook username?"
+msgstr "您的 Facebook 用户名是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+msgid "What is your Google ID?"
+msgstr "您的 Google ID 是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+msgid "What is your Google password?"
+msgstr "您的 Google 密码是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "What is your Jabber ID?"
-msgstr ""
+msgstr "您的 Jabber ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "What is your Jabber password?"
-msgstr ""
+msgstr "您的 Jabber 密码是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 msgid "What is your desired Jabber ID?"
-msgstr ""
+msgstr "您想要的 Jabber ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 msgid "What is your desired Jabber password?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
-msgid "_Encryption required (TLS/SSL)"
-msgstr "需要加密(TLS/SSL)(_E)"
-
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
-msgid "_Ignore SSL certificate errors"
-msgstr "忽略 SSL 证书错误(_I)"
+msgstr "您想要的 Jabber 密码是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@hotmail.com</span>"
-msgstr ""
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>例如：</b>user@hotmail.com"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
+msgid "What is your Windows Live ID?"
+msgstr "您的 Windows Live 帐户是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr ""
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+msgid "What is your Windows Live password?"
+msgstr "您的 Windows Live 密码是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
-msgstr "电子邮件(_E)："
+msgid "E-_mail address:"
+msgstr "电子邮件地址(_M):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "昵称(_K):"
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
 msgstr "名(_F)"
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID："
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
 msgstr "姓(_L)："
 
-#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
-msgid "_Nickname:"
-msgstr "昵称(_N)："
-
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
 msgstr "公开的名字(_P)："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user@my.sip.server</span>"
-msgstr ""
+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 "验证用户名："
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "Discover STUN"
-msgstr "搜索 STUN"
+msgid "Discover Binding"
+msgstr "发现绑定"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
+msgid "Discover the STUN server automatically"
+msgstr "自动发现 STUN 服务器"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN Server:"
-msgstr "STUN 服务器："
+msgid "Interval (seconds)"
+msgstr "间隔(秒)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "STUN port:"
-msgstr "STUN 端口："
+msgid "Keep-Alive Options"
+msgstr "Keep-Alive 选项"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-msgid "What is your SIP account password?"
-msgstr ""
+msgid "Loose Routing"
+msgstr "宽松路由"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid "What is your SIP login ID?"
-msgstr ""
+msgid "Mechanism:"
+msgstr "机制："
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Miscellaneous Options"
+msgstr "杂项"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "NAT Traversal Options"
+msgstr "NAT 选项"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Port:"
+msgstr "端口："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Proxy Options"
+msgstr "代理选项"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "STUN Server:"
+msgstr "STUN 服务器："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+msgid "Server:"
+msgstr "服务器："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+msgid "Transport:"
+msgstr "传输："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid "What is your SIP account password?"
+msgstr "您的 SIP 账户密码是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:21
+msgid "What is your SIP login ID?"
+msgstr "您的 SIP 登录 ID 是什么？"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
 msgid "_Username:"
 msgstr "用户名(_U)："
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "使用 _Yahoo 日本"
+msgid "I_gnore conference and chat room invitations"
+msgstr "忽略会议和聊天室邀请(_G)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 msgid "What is your Yahoo! ID?"
-msgstr ""
+msgstr "您的 Yahoo! ID 是什么？"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "What is your Yahoo! password?"
-msgstr ""
-
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
-msgstr "Yahoo I_D："
+msgstr "您的 Yahoo! 密码是什么？"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
-msgstr "忽略会议和聊天室邀请(_I)"
+msgid "Yahoo! I_D:"
+msgstr "Yahoo I_D："
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
 msgstr "聊天室列表 locale(_R)："
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:448
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
 msgid "Couldn't convert image"
 msgstr "无法转换图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
-msgstr "没æ\9c\89ä¸\80个å\85¬è®¤的图片格式能被您的系统支持"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+msgid "None of the accepted image formats are supported on your system"
+msgstr "没æ\9c\89ä»»ä½\95æ\8e¥å\8f\97的图片格式能被您的系统支持"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "Select Your Avatar Image"
 msgstr "选择您的头像图片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:939
 msgid "No Image"
 msgstr "无图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1001
 msgid "Images"
 msgstr "图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1005
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:322
 msgid "Click to enlarge"
 msgstr "单击以放大"
 
-#: ../libempathy-gtk/empathy-chat.c:186
-msgid "Failed to reconnect this chat"
-msgstr "重新连接到对话失败"
+#: ../libempathy-gtk/empathy-chat.c:655
+msgid "Failed to open private chat"
+msgstr "建立私人对话失败"
+
+#: ../libempathy-gtk/empathy-chat.c:720
+msgid "Topic not supported on this conversation"
+msgstr "不支持在此会话上设置主题"
+
+#: ../libempathy-gtk/empathy-chat.c:726
+msgid "You are not allowed to change the topic"
+msgstr "您不能更改主题"
+
+#: ../libempathy-gtk/empathy-chat.c:909
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear，清空当前会话的所有消息"
+
+#: ../libempathy-gtk/empathy-chat.c:912
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <主题>：设定当前对话的主题"
+
+#: ../libempathy-gtk/empathy-chat.c:915
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <聊天室名>：加入一个新的聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:918
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <聊天室名>：加入一个新的聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:923
+msgid ""
+"/part [<chat room ID>] [<reason>]: leave the chat room, by default the "
+"current one"
+msgstr "/用户[<聊天室ID>] [<原因>]：当前默认离开聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:928
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <昵称> [<消息>]：打开一个私人聊天"
+
+#: ../libempathy-gtk/empathy-chat.c:931
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <昵称> <消息>：打开一个私人聊天"
+
+#: ../libempathy-gtk/empathy-chat.c:934
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <昵称>：在当前服务器上改变您的昵称"
 
-#: ../libempathy-gtk/empathy-chat.c:413
-msgid "Unsupported command"
-msgstr "不支持的命令"
+#: ../libempathy-gtk/empathy-chat.c:937
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <动作消息>：向当前对话中发送一个动作消息"
 
-#: ../libempathy-gtk/empathy-chat.c:549
+#: ../libempathy-gtk/empathy-chat.c:940
+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 <消息>：发送 <消息> 到当前对话。这是用来发送一个“/”开始的信息。例如：“/"
+"say /join 是用来加入一个新的聊天室”"
+
+#: ../libempathy-gtk/empathy-chat.c:945
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<命令>]：显示所有支持的命令。如果 <命令> 是有定义的，则显示它的用法。"
+
+#: ../libempathy-gtk/empathy-chat.c:955
+#, c-format
+msgid "Usage: %s"
+msgstr "用法：%s"
+
+#: ../libempathy-gtk/empathy-chat.c:997
+msgid "Unknown command"
+msgstr "未知命令"
+
+#: ../libempathy-gtk/empathy-chat.c:1123
+msgid "Unknown command; see /help for the available commands"
+msgstr "未知命令，请使用 /help 查阅可用命令"
+
+#: ../libempathy-gtk/empathy-chat.c:1263
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:552
+#: ../libempathy-gtk/empathy-chat.c:1266
 msgid "invalid contact"
 msgstr "无效联系人"
 
-#: ../libempathy-gtk/empathy-chat.c:555
+#: ../libempathy-gtk/empathy-chat.c:1269
 msgid "permission denied"
 msgstr "权限不足"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:1272
 msgid "too long message"
 msgstr "消息太长"
 
-#: ../libempathy-gtk/empathy-chat.c:561
+#: ../libempathy-gtk/empathy-chat.c:1275
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:564
+#: ../libempathy-gtk/empathy-chat.c:1279
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:568
+#: ../libempathy-gtk/empathy-chat.c:1283
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "发送消息“%s”出错：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:598
+#: ../libempathy-gtk/empathy-chat.c:1344 ../src/empathy-chat-window.c:704
+msgid "Topic:"
+msgstr "话题："
+
+#: ../libempathy-gtk/empathy-chat.c:1356
 #, c-format
 msgid "Topic set to: %s"
 msgstr "话题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:600
+#: ../libempathy-gtk/empathy-chat.c:1358
 msgid "No topic defined"
 msgstr "未设置话题"
 
-#: ../libempathy-gtk/empathy-chat.c:970
+#: ../libempathy-gtk/empathy-chat.c:1857
 msgid "(No Suggestions)"
 msgstr "(没有建议)"
 
-#: ../libempathy-gtk/empathy-chat.c:1024
+#. translators: %s is the selected word
+#: ../libempathy-gtk/empathy-chat.c:1925
+#, 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:1962
+#, c-format
+msgid "Add '%s' to %s Dictionary"
+msgstr "添加 %s 到 %s 到字典"
+
+#: ../libempathy-gtk/empathy-chat.c:2021
 msgid "Insert Smiley"
 msgstr "插入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1042
-#: ../libempathy-gtk/empathy-ui-utils.c:1471
+#: ../libempathy-gtk/empathy-chat.c:2039
+#: ../libempathy-gtk/empathy-ui-utils.c:1810
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1076
+#. Spelling suggestions
+#: ../libempathy-gtk/empathy-chat.c:2074
 msgid "_Spelling Suggestions"
 msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1191
+#: ../libempathy-gtk/empathy-chat.c:2163
+msgid "Failed to retrieve recent logs"
+msgstr "获取最近日志失败"
+
+#: ../libempathy-gtk/empathy-chat.c:2274
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已断开连接"
@@ -914,12 +1382,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:1198
+#: ../libempathy-gtk/empathy-chat.c:2281
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:1201
+#: ../libempathy-gtk/empathy-chat.c:2284
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出"
@@ -927,17 +1395,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:1209
+#: ../libempathy-gtk/empathy-chat.c:2292
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%s 已被 %s 禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:1212
+#: ../libempathy-gtk/empathy-chat.c:2295
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被禁止"
 
-#: ../libempathy-gtk/empathy-chat.c:1216
+#: ../libempathy-gtk/empathy-chat.c:2299
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 离开了聊天室"
@@ -947,61 +1415,97 @@ msgstr "%s 离开了聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1225
+#: ../libempathy-gtk/empathy-chat.c:2308
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1248
+#: ../libempathy-gtk/empathy-chat.c:2333
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 加入了聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1381 ../src/empathy-call-window.c:1277
+#: ../libempathy-gtk/empathy-chat.c:2358
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s 现在叫做 %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2497
+#: ../src/empathy-streamed-media-window.c:1942
+#: ../src/empathy-event-manager.c:1122
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../libempathy-gtk/empathy-chat.c:1817
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3127
+msgid "Would you like to store this password?"
+msgstr "是否保存密码？"
+
+#: ../libempathy-gtk/empathy-chat.c:3133
+#, fuzzy
+#| msgid "Members"
+msgid "Remember"
+msgstr "成员"
+
+#: ../libempathy-gtk/empathy-chat.c:3143
+msgid "Not now"
+msgstr "暂不"
+
+#: ../libempathy-gtk/empathy-chat.c:3187
+msgid "Retry"
+msgstr "重试"
+
+#: ../libempathy-gtk/empathy-chat.c:3191
+msgid "Wrong password; please try again:"
+msgstr "密码错误，请重试："
+
+#. Add message
+#: ../libempathy-gtk/empathy-chat.c:3308
+msgid "This room is protected by a password:"
+msgstr "这个房间是由一个密码保护的："
+
+#: ../libempathy-gtk/empathy-chat.c:3335
+msgid "Join"
+msgstr "加入"
+
+#: ../libempathy-gtk/empathy-chat.c:3505 ../src/empathy-event-manager.c:1144
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:1867
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:3558
+#: ../libempathy-gtk/empathy-log-window.c:654
 msgid "Conversation"
 msgstr "对话"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:471
-msgid "Topic:"
-msgstr "话题："
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:266
+#: ../libempathy-gtk/empathy-chat-text-view.c:320
+#: ../libempathy-gtk/empathy-theme-adium.c:794
 msgid "_Copy Link Address"
 msgstr "复制链接地址(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:274
+#: ../libempathy-gtk/empathy-chat-text-view.c:327
+#: ../libempathy-gtk/empathy-theme-adium.c:801
 msgid "_Open Link"
 msgstr "打开链接(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:420
 msgid "%A %B %d %Y"
 msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:177
-#: ../libempathy-gtk/empathy-contact-dialogs.c:236
+#: ../libempathy-gtk/empathy-contact-dialogs.c:265
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "编辑联系人信息"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:287
+#: ../libempathy-gtk/empathy-contact-dialogs.c:316
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:392
+#: ../libempathy-gtk/empathy-contact-dialogs.c:425
+#: ../libempathy-gtk/empathy-individual-dialogs.c:115
 msgid "New Contact"
 msgstr "新建联系人"
 
@@ -1013,436 +1517,704 @@ msgstr "以后再决定(_L)"
 msgid "Subscription Request"
 msgstr "订阅请求"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1412
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "未分组"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "收藏夹"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2012
+#: ../libempathy-gtk/empathy-individual-view.c:2309
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "您真的要删除群组“%s”吗？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1414
+#: ../libempathy-gtk/empathy-contact-list-view.c:2014
+#: ../libempathy-gtk/empathy-individual-view.c:2312
 msgid "Removing group"
 msgstr "删除群组"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1461
-#: ../libempathy-gtk/empathy-contact-list-view.c:1538
+#: ../libempathy-gtk/empathy-contact-list-view.c:2063
+#: ../libempathy-gtk/empathy-contact-list-view.c:2140
+#: ../libempathy-gtk/empathy-individual-view.c:2367
+#: ../libempathy-gtk/empathy-individual-view.c:2514
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1491
+#: ../libempathy-gtk/empathy-contact-list-view.c:2093
+#: ../libempathy-gtk/empathy-individual-view.c:2417
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "您真的想要删除联系人“%s”吗？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1493
+#: ../libempathy-gtk/empathy-contact-list-view.c:2095
+#: ../libempathy-gtk/empathy-individual-view.c:2433
 msgid "Removing contact"
 msgstr "删除联系人"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
+#: ../libempathy-gtk/empathy-contact-menu.c:204
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Add Contact…"
 msgstr "添加联系人(_A)..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../libempathy-gtk/empathy-individual-menu.c:517
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:262
+#: ../libempathy-gtk/empathy-individual-menu.c:560
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "音频呼叫(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:293
+#: ../libempathy-gtk/empathy-individual-menu.c:602
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "视频呼叫(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "查看以前对话(_V)"
+#: ../libempathy-gtk/empathy-contact-menu.c:339
+#: ../libempathy-gtk/empathy-individual-menu.c:645
+#: ../src/empathy-main-window.ui.h:25
+msgid "_Previous Conversations"
+msgstr "最近会话(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:346
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:361
+#: ../libempathy-gtk/empathy-individual-menu.c:686
+msgid "Send File"
 msgstr "发送文件"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:384
+#: ../libempathy-gtk/empathy-individual-menu.c:728
+msgid "Share My Desktop"
 msgstr "共享我的桌面"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:424
+#: ../libempathy-gtk/empathy-contact-widget.c:1681
+#: ../libempathy-gtk/empathy-individual-menu.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:1370
+msgid "Favorite"
+msgstr "收藏"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:453
+#: ../libempathy-gtk/empathy-individual-menu.c:789
 msgid "Infor_mation"
 msgstr "信息(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:499
+msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
+#: ../libempathy-gtk/empathy-contact-menu.c:553
+#: ../libempathy-gtk/empathy-individual-menu.c:970
+#: ../src/empathy-chat-window.c:916
+msgid "Inviting you to this room"
 msgstr "邀请到此聊天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
+#: ../libempathy-gtk/empathy-contact-menu.c:584
+#: ../libempathy-gtk/empathy-individual-menu.c:1017
+msgid "_Invite to Chat Room"
 msgstr "邀请到聊天室(_I)"
 
+#. Title
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:456
+#, fuzzy
+#| msgid "Select a contact"
+msgid "Search contacts"
+msgstr "选择一个联系"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:486
+#, fuzzy
+#| msgid "Search"
+msgid "Search: "
+msgstr "搜索"
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:537
+#, fuzzy
+#| msgid "_Add Contact…"
+msgid "_Add Contact"
+msgstr "添加联系人(_A)..."
+
+#: ../libempathy-gtk/empathy-contact-search-dialog.c:555
+#, fuzzy
+#| msgid "No match found"
+msgid "No contacts found"
+msgstr "没有找到匹配项"
+
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "选择一个联系"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "保存头像"
+#: ../libempathy-gtk/empathy-contact-widget.c:276
+#: ../libempathy-gtk/empathy-individual-widget.c:153
+msgid "Full name:"
+msgstr "全称："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "无法保存头像"
+#: ../libempathy-gtk/empathy-contact-widget.c:277
+#: ../libempathy-gtk/empathy-individual-widget.c:154
+msgid "Phone number:"
+msgstr "电话号码："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1000
-msgid "Select"
-msgstr "选择"
+#: ../libempathy-gtk/empathy-contact-widget.c:278
+#: ../libempathy-gtk/empathy-individual-widget.c:155
+msgid "E-mail address:"
+msgstr "电子邮件地址："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1009
-#: ../src/empathy-main-window.c:1019
-msgid "Group"
-msgstr "群组"
+#: ../libempathy-gtk/empathy-contact-widget.c:279
+#: ../libempathy-gtk/empathy-individual-widget.c:156
+msgid "Website:"
+msgstr "网站："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:280
+#: ../libempathy-gtk/empathy-individual-widget.c:157
+msgid "Birthday:"
+msgstr "生日："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:724
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Country ISO Code:"
-msgstr "包括 ISO 编码"
+msgstr "包括 ISO 编码："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:726
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Country:"
-msgstr "国家"
+msgstr "国家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:728
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "State:"
-msgstr "省"
+msgstr "省："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:730
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "City:"
-msgstr "å¸\82"
+msgstr "å\9f\8eå¸\82ï¼\9a"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:732
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Area:"
-msgstr "地区"
+msgstr "地区："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Postal Code:"
-msgstr "邮政编码"
+msgstr "邮政编码："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Street:"
-msgstr "街"
+msgstr "街道："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:738
+#: ../libempathy-gtk/empathy-individual-widget.c:501
 msgid "Building:"
-msgstr "建筑物"
+msgstr "建筑物："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:740
+#: ../libempathy-gtk/empathy-individual-widget.c:503
 msgid "Floor:"
 msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:742
+#: ../libempathy-gtk/empathy-individual-widget.c:505
 msgid "Room:"
 msgstr "房间："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:744
+#: ../libempathy-gtk/empathy-individual-widget.c:507
 msgid "Text:"
 msgstr "文本："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:746
+#: ../libempathy-gtk/empathy-individual-widget.c:509
 msgid "Description:"
 msgstr "描述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:748
+#: ../libempathy-gtk/empathy-individual-widget.c:511
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:750
+#: ../libempathy-gtk/empathy-individual-widget.c:513
 msgid "Accuracy Level:"
 msgstr "准确程度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:752
+#: ../libempathy-gtk/empathy-individual-widget.c:515
 msgid "Error:"
 msgstr "错误："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:754
+#: ../libempathy-gtk/empathy-individual-widget.c:517
 msgid "Vertical Error (meters):"
-msgstr "垂直误差(米):"
+msgstr "垂直误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-widget.c:756
+#: ../libempathy-gtk/empathy-individual-widget.c:519
 msgid "Horizontal Error (meters):"
-msgstr "水平误差(米):"
+msgstr "水平误差(米)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:758
+#: ../libempathy-gtk/empathy-individual-widget.c:521
 msgid "Speed:"
-msgstr "速度:"
+msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:760
+#: ../libempathy-gtk/empathy-individual-widget.c:523
 msgid "Bearing:"
-msgstr "方位朝向:"
+msgstr "方位朝向："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:762
+#: ../libempathy-gtk/empathy-individual-widget.c:525
 msgid "Climb Speed:"
-msgstr "爬升速度:"
+msgstr "爬升速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:764
+#: ../libempathy-gtk/empathy-individual-widget.c:527
 msgid "Last Updated on:"
-msgstr "最近更新于:"
+msgstr "最近更新于："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:766
+#: ../libempathy-gtk/empathy-individual-widget.c:529
 msgid "Longitude:"
 msgstr "经度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1304
+#: ../libempathy-gtk/empathy-contact-widget.c:768
+#: ../libempathy-gtk/empathy-individual-widget.c:531
 msgid "Latitude:"
 msgstr "纬度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1306
+#: ../libempathy-gtk/empathy-contact-widget.c:770
+#: ../libempathy-gtk/empathy-individual-widget.c:533
 msgid "Altitude:"
 msgstr "海拔："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1353
-msgid "<b>Location</b>"
-msgstr "<b>位置</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:833
+#: ../libempathy-gtk/empathy-contact-widget.c:850
+#: ../libempathy-gtk/empathy-individual-widget.c:615
+#: ../libempathy-gtk/empathy-individual-widget.c:632
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "位置"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1366
-msgid "<b>Location</b>, "
-msgstr "<b>位置</b>，"
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:852
+#: ../libempathy-gtk/empathy-individual-widget.c:634
+#, c-format
+msgid "%s, %s"
+msgstr "%s, %s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1416
+#: ../libempathy-gtk/empathy-contact-widget.c:904
+#: ../libempathy-gtk/empathy-individual-widget.c:683
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e,%Y 于 %R UTC 时间"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:986
+#: ../libempathy-gtk/empathy-individual-widget.c:918
+msgid "Save Avatar"
+msgstr "保存头像"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1042
+#: ../libempathy-gtk/empathy-individual-widget.c:976
+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.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "账户："
-
+#. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1305
 msgid "Alias:"
 msgstr "别名："
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "生日："
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client Information"
 msgstr "客户端信息"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
 msgstr "客户端："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1002
-msgid "Contact"
-msgstr "联系人"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Contact Details"
 msgstr "联系人详情"
 
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1509
+msgid "Identifier:"
+msgstr "标识符："
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "电子邮件："
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Information requested…"
+msgstr "已发送信息请求..."
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
-msgstr "全称："
+msgid "OS:"
+msgstr "操作系统："
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "版本："
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
 msgid "Groups"
 msgstr "组"
 
-#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
-msgid "Identifier:"
-msgstr "用户 ID："
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "已请求信息..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
-msgid "OS:"
-msgstr "操作系统："
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-groups-widget.c:344
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "选择您想将该联系人加入的群组。注意您可以选择多个群组，也可以不选择。"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Version:"
-msgstr "版本："
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "网站："
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-groups-widget.c:363
 msgid "_Add Group"
 msgstr "添加群组(_A)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:281
-msgid "new server"
-msgstr "新建服务器"
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "选择"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:508
-msgid "Server"
-msgstr "服务器"
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1432
+msgid "Group"
+msgstr "群组"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:523
-msgid "Port"
-msgstr "端口"
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+msgid "Linked Contacts"
+msgstr "已绑定的联系人"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "选择要绑定的联系人"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "新联系人预览"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+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:131
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:837
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:863
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "合并联系人(_L)..."
+
+#: ../libempathy-gtk/empathy-individual-view.c:2425
+#, c-format
+msgid ""
+"Do you really want to remove the linked contact '%s'? Note that this will "
+"remove all the contacts which make up this linked contact."
+msgstr ""
+"您是否确定要删除已合并的联系人 %s？注意这将删除该组下的所有联系人。"
+
+#: ../libempathy-gtk/empathy-individual-widget.c:1650
+#, 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:4
+msgid "Online from a phone or mobile device"
+msgstr "手机或移动设备在线"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:332
+msgid "New Network"
+msgstr "新建网络"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:527
+msgid "Choose an IRC network"
+msgstr "选择一个 IRC 网络"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:584
+msgid "Reset _Networks List"
+msgstr "重置网络列表(_N)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:588
+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:536
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-widget.c:321
-msgid "Account"
-msgstr "账户"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
+msgid "Link Contacts"
+msgstr "绑定联系人"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "解除绑定(_U)…"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#, fuzzy
+#| msgid ""
+#| "Completely split the displayed meta-contact into the contacts it contains."
+msgid ""
+"Completely split the displayed linked contacts into the separate contacts."
+msgstr "将显示的元联系人所包含的联系人完全分开。"
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
+msgid "_Link"
+msgstr "绑定(_L)"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#, fuzzy, c-format
+#| msgid "Unlink meta-contact '%s'?"
+msgid "Unlink linked contacts '%s'?"
+msgstr "解除绑定元联系人 '%s'?"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#, fuzzy
+#| msgid ""
+#| "Are you sure you want to unlink this meta-contact? This will completely "
+#| "split the meta-contact into the contacts it contains."
+msgid ""
+"Are you sure you want to unlink these linked contacts? This will completely "
+"split the linked contacts into separate contacts."
+msgstr "是否希望解除绑定该元联系人? 这将将该元联系人所包含的联系人完全分开。"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "解除绑定(_U)"
+
+#: ../libempathy-gtk/empathy-log-window.c:664
 msgid "Date"
 msgstr "日期"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Conversations"
 msgstr "对话"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "向下查找"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "向上查找"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
 msgid "Previous Conversations"
 msgstr "以前的对话"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
 msgid "Search"
 msgstr "搜索"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "_For:"
 msgstr "包含(_F)："
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "通话(_A)"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "联系人 ID："
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:171
 msgid "C_hat"
 msgstr "聊天(_H)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "联系人 ID："
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:181
 msgid "New Conversation"
 msgstr "新建对话"
 
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:252
+msgid "Send _Video"
+msgstr "发送视频(_V)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:260
+msgid "C_all"
+msgstr "通话(_A)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:270
+msgid "New Call"
+msgstr "新建通话"
+
+#: ../libempathy-gtk/empathy-password-dialog.c:274
+#, 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:176
-#: ../libempathy-gtk/empathy-presence-chooser.c:212
-msgid "Custom Message..."
-msgstr "自定义状态..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:170
+#: ../libempathy-gtk/empathy-presence-chooser.c:206
+msgid "Custom Message…"
+msgstr "自定义消息..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:229
-#: ../libempathy-gtk/empathy-presence-chooser.c:231
-msgid "Edit Custom Messages..."
-msgstr "编辑自定义状态..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+msgid "Edit Custom Messages…"
+msgstr "编辑自定义消息"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:330
+#: ../libempathy-gtk/empathy-presence-chooser.c:348
 msgid "Click to remove this status as a favorite"
 msgstr "点击移除自定义状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:339
+#: ../libempathy-gtk/empathy-presence-chooser.c:357
 msgid "Click to make this status a favorite"
 msgstr "点击设置自定义状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:373
+#: ../libempathy-gtk/empathy-presence-chooser.c:391
 msgid "Set status"
 msgstr "设置状态"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:794
+#: ../libempathy-gtk/empathy-presence-chooser.c:948
 msgid "Set your presence and current status"
 msgstr "设置你的状态信息和现在的状态"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1043
-msgid "Custom messages..."
-msgstr "自定义状态..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1136
+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:3
+msgid "Find:"
+msgstr "查找："
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Match case"
+msgstr "区分大小写"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "Phrase not found"
+msgstr "未找到短语"
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound-manager.c:51
 msgid "Received an instant message"
 msgstr "收到了即时消息"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound-manager.c:53
 msgid "Sent an instant message"
 msgstr "发送即时消息"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound-manager.c:55
 msgid "Incoming chat request"
 msgstr "收到的聊天请求"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound-manager.c:57
 msgid "Contact connected"
 msgstr "联系人已连接"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound-manager.c:59
 msgid "Contact disconnected"
 msgstr "联系人已断开"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound-manager.c:61
 msgid "Connected to server"
 msgstr "已连接到服务器"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound-manager.c:63
 msgid "Disconnected from server"
 msgstr "已从服务器断开连接"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound-manager.c:65
 msgid "Incoming voice call"
 msgstr "呼入的语音通话"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound-manager.c:67
 msgid "Outgoing voice call"
 msgstr "呼出的语音通话"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound-manager.c:69
 msgid "Voice call ended"
 msgstr "语音通话结束"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
 msgid "Enter Custom Message"
 msgstr "输入自定义状态"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
 msgid "Edit Custom Messages"
 msgstr "编辑自定义状态"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
-msgid "Add _New Preset"
-msgstr "添加新自定义状态(_N)"
+#, fuzzy
+#| msgid "Save message"
+msgid "Save _New Status Message"
+msgstr "保存消息"
 
 #: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
-msgid "Saved Presets"
-msgstr "已保存的自定义状态"
+#, fuzzy
+#| msgid "Save message"
+msgid "Saved Status Messages"
+msgstr "保存消息"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
@@ -1460,26 +2232,98 @@ msgstr "清爽"
 msgid "Blue"
 msgstr "蓝色"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1373
-msgid "Unable to open URI"
-msgstr "无法打开 URI"
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "聊天服务器所提供的身份无法验证。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1463
-msgid "Select a file"
-msgstr "选择文件"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "证书并非由 CA 签发。"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1523
-msgid "Select a destination"
-msgstr "选择目的地"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+msgid "The certificate has expired."
+msgstr "证书已过期。"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:158
-msgid "Current Locale"
-msgstr "当前 Locale"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+msgid "The certificate hasn't yet been activated."
+msgstr "证书尚未被激活。"
 
-#: ../libempathy-gtk/totem-subtitle-encoding.c:161
-#: ../libempathy-gtk/totem-subtitle-encoding.c:163
-#: ../libempathy-gtk/totem-subtitle-encoding.c:165
-#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+#: ../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 "Continue"
+msgstr "继续"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:287
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "连接不受信任。是否仍要继续?"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:304
+msgid "Remember this choice for future connections"
+msgstr "为将来的连接记住本次选择"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:312
+msgid "Certificate Details"
+msgstr "证书详情"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1707
+msgid "Unable to open URI"
+msgstr "无法打开 URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1802
+msgid "Select a file"
+msgstr "选择文件"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1871
+#, c-format
+msgid "Incoming file from %s"
+msgstr "从 %s 传来的文件"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr "当前语言环境"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
 msgid "Arabic"
 msgstr "阿拉伯语"
 
@@ -1551,7 +2395,7 @@ msgstr "希腊语"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:242
 msgid "Gujarati"
-msgstr "å\8d°åº¦ Gujarati 语"
+msgstr "å\8f¤å\90\89æ\8b\89ç\89¹语"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:245
 msgid "Gurmukhi"
@@ -1639,75 +2483,51 @@ msgstr "西方语言"
 msgid "Vietnamese"
 msgstr "越南语"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr "在小程序上显示的联系人。空列表表示不显示联系人。"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr "选择的联系人无法接收文件。"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "联系人的头像标志。空表示联系人无头像。"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr "选择的联系人离线。"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "话筒"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "无错误信息"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:518
-msgid "Talk!"
-msgstr "说吧！"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "关于(_A)"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "信息(_I)"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "首选项(_P)"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "即时消息(Empathy)"
 
-#: ../megaphone/src/megaphone-applet.c:166
-msgid "Please configure a contact."
-msgstr "请配置一个联系人。"
-
-#: ../megaphone/src/megaphone-applet.c:256
-msgid "Select contact..."
-msgstr "选择联系人..."
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "状态"
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:105
-msgid "Set your own presence"
-msgstr "设置您的状态"
-
-#: ../src/empathy.c:588
+#: ../src/empathy.c:308
 msgid "Don't connect on startup"
-msgstr "启动时不自动登录"
+msgstr "启动时不自动连接"
 
-#: ../src/empathy.c:592
-msgid "Don't show the contact list on startup"
+#: ../src/empathy.c:312
+msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "启动时不显示联系人列表"
 
-#: ../src/empathy.c:596
-msgid "Show the accounts dialog"
-msgstr "显示账户对话框"
-
-#: ../src/empathy.c:608
+#: ../src/empathy.c:320
 msgid "- Empathy IM Client"
 msgstr " - Empathy IM 客户端"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy.c:499
+msgid "Error contacting the Account Manager"
+msgstr "联系账户管理器出错"
+
+#: ../src/empathy.c:501
+#, 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 "
@@ -1717,7 +2537,7 @@ msgstr ""
 "Empathy 是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证下重新发布"
 "或修改它；许可证可使用第二版或您想选择的更新的版本。"
 
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1727,7 +2547,7 @@ msgstr ""
 "Empathy 发布的目的是希望它对您有用，但是没有任何担保；即使是对商业应用以及其"
 "它特定目的。查阅 GNU 通用公共许可证以获取更多细节。"
 
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1737,15 +2557,25 @@ msgstr ""
 "给自由软件基金会写信。地址是：51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
 msgstr "一个 GNOME 即时消息客户端"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
-"翻译-贡献者YangZhang, <zyangmath@gmail.com>\n"
-"Aron Xu <aronxu@gnome.org>\n"
+"Abel Cheung <maddog@linux.org.hk>, 2003\n"
+"Mai Haohui <maihaohui@hotmail.com>, 2003\n"
+"Rongjun Mu <elanmu@sina.com>, 2003\n"
+"YangZhang <zyangmath@gmail.com>, 2008\n"
+"Funda Wang <fundawang@gmail.com>, 2009\n"
+"Lyper Lai <lyp069@gmail.com>, 2009\n"
+"Yun Nie <yun.nie@ptiglobal.net>, 2009\n"
+"Richard Ma <richard.ma.19850509@gmail.com>, 2009\n"
+"Tao Wei <weitao1979@gmail.com>, 2009\n"
+"Aron Xu <happyaron.xu@gmail.com>, 2009, 2010\n"
+"Tao Wang <dancefire@gmail.com>, 2010\n"
+"\n"
 "Launchpad Contributions:\n"
 "  =KK= https://launchpad.net/~sevkme\n"
 "  AnThOnYhO https://launchpad.net/~anthonyho\n"
@@ -1755,277 +2585,546 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n"
 "  yuane https://launchpad.net/~yuane"
 
-#. translators: this is followed by the "while ..." strings some lines
-#. * down this file.
-#.
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error "
-msgstr ""
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr "导入帐户时发生错误。"
 
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:125
-msgid "while importing the accounts."
-msgstr ""
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr "在解析账户详情时出现错误。"
 
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:129
-msgid "while parsing the account details."
-msgstr ""
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr "在创建账户时出现错误。"
 
-#. translators: this follows the "There has been an error " string
-#: ../src/empathy-account-assistant.c:133
-msgid "while creating the account."
-msgstr ""
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
+msgstr "发生错误。"
 
-#: ../src/empathy-account-assistant.c:151
+#: ../src/empathy-account-assistant.c:179
 #, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr ""
+msgid "The error message was: %s"
+msgstr "错误信息为：%s"
 
-#: ../src/empathy-account-assistant.c:159
+#: ../src/empathy-account-assistant.c:183
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
-"this wizard and add accounts later from the Edit menu."
+"this assistant and add accounts later from the Edit menu."
 msgstr ""
+"您可以返回尝试重新输入您的账户信息，或者退出助理，然后从编辑菜单中加入账户。"
 
-#: ../src/empathy-account-assistant.c:194
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1268
 msgid "An error occurred"
-msgstr ""
+msgstr "发生错误"
 
-#. Create account
-#. To translator: %s is the protocol name
-#: ../src/empathy-account-assistant.c:330
-#: ../src/empathy-accounts-dialog.c:1094
-#, c-format
-msgid "New %s account"
-msgstr "新建 %s 账户"
-
-#: ../src/empathy-account-assistant.c:397
+#: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
-msgstr ""
+msgstr "您已经拥有哪个类型的帐户？"
 
-#: ../src/empathy-account-assistant.c:403
-#, fuzzy
+#: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
-msgstr "æ\88\91å·²ç»\8fæ\8b¥æ\9c\89è´¦æ\88·ï¼\8cæ\88\91æ\83³ä½¿ç\94¨å®\83"
+msgstr "æ\82¨è¿\98è¦\81设置å\85¶å®\83è\81\8a天账æ\88·å\90\97ï¼\9f"
 
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
 msgstr "输入您的帐户详情"
 
-#: ../src/empathy-account-assistant.c:414
-#, fuzzy
+#: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
-msgstr "%s 来电，您想要接听吗？"
+msgstr "您想创建那种类型的帐户？"
 
-#: ../src/empathy-account-assistant.c:420
-#, fuzzy
+#: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
-msgstr "您真的想要删除联系人“%s”吗？"
+msgstr "您想要创建其它的聊天账户吗、"
 
-#: ../src/empathy-account-assistant.c:427
+#: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
-msgstr ""
+msgstr "输入新账户的详细资料"
 
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:612
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
+"使用 Empathy，您可以与附近的朋友聊天，还可以与使用 Google Talk，AIM，Windows "
+"Live 和许多其它聊天软件的朋友和同事聊天。使用麦克风或摄像头，您就可以开始音频"
+"和视频通话。"
 
-#: ../src/empathy-account-assistant.c:530
+#: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
-msgstr ""
+msgstr "您有没有其它聊天软件的账户？"
 
-#: ../src/empathy-account-assistant.c:553
+#: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
-msgstr ""
+msgstr "有，请导入我的账户信息"
 
-#: ../src/empathy-account-assistant.c:574
+#: ../src/empathy-account-assistant.c:673
 msgid "Yes, I'll enter my account details now"
-msgstr ""
+msgstr "有，我现在就输入我的账户信息"
 
-#: ../src/empathy-account-assistant.c:596
-#, fuzzy
+#: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
-msgstr "创建新的帐户(_C)"
+msgstr "不，我想要一个新的账户"
 
-#: ../src/empathy-account-assistant.c:606
+#: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
-msgstr ""
+msgstr "没有，我只是想看看附近现在谁在线上"
 
-#: ../src/empathy-account-assistant.c:627
-#, fuzzy
+#: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
-msgstr "选择您要邀请的人："
+msgstr "选择您要导入的账户："
 
-#: ../src/empathy-account-assistant.c:714
-#: ../src/empathy-new-chatroom-dialog.c:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-account-assistant.c:810
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:817
 msgid "No, that's all for now"
+msgstr "没有，就这样吧"
+
+#: ../src/empathy-account-assistant.c:1082
+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 可以自动发现和您连接到同一个网络中的人们，并且可以和他们聊天。如果您"
+"想使用这个功能，请仔细查看下列信息是否正确。您之后也可以通过“账户”对话框轻松"
+"的修改这些信息或关闭这个功能"
+
+#: ../src/empathy-account-assistant.c:1088
+#: ../src/empathy-account-assistant.c:1144
+msgid "Edit->Accounts"
+msgstr "编辑->账户"
+
+#: ../src/empathy-account-assistant.c:1104
+msgid "I don't want to enable this feature for now"
+msgstr "暂不启用此特性"
+
+#: ../src/empathy-account-assistant.c:1140
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
 msgstr ""
+"您无法同连接到您局域网中的用户聊天，因为没有安装 telepathy-salut。如果您想启"
+"用该功能，请安装 telepathy-salut 包，并且在账户对话框中创建附近的人(People "
+"Nearby)账户"
+
+#: ../src/empathy-account-assistant.c:1146
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut 未安装"
 
-#: ../src/empathy-account-assistant.c:914
+#: ../src/empathy-account-assistant.c:1192
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "消息和 VoIP 帐户助手"
+
+#: ../src/empathy-account-assistant.c:1226
 msgid "Welcome to Empathy"
 msgstr "欢迎使用 Empathy"
 
-#: ../src/empathy-account-assistant.c:923
+#: ../src/empathy-account-assistant.c:1235
 msgid "Import your existing accounts"
 msgstr "导入现有帐户"
 
-#: ../src/empathy-accounts-dialog.c:616
+#: ../src/empathy-account-assistant.c:1253
+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:64
+#, c-format
+msgid "There are unsaved modifications to your %s account."
+msgstr "您的 %s 账户有未保存的修改。"
+
+#. 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:68
+msgid "Your new account has not been saved yet."
+msgstr "您的新帐户还没有保存。"
+
+#: ../src/empathy-accounts-dialog.c:286
+#: ../src/empathy-streamed-media-window.c:809
+msgid "Connecting…"
+msgstr "正在连接..."
+
+#: ../src/empathy-accounts-dialog.c:327
 #, c-format
+msgid "Offline — %s"
+msgstr "离线 - %s"
+
+#: ../src/empathy-accounts-dialog.c:339
+#, c-format
+msgid "Disconnected — %s"
+msgstr "已断开 - %s"
+
+#: ../src/empathy-accounts-dialog.c:350
+msgid "Offline — No Network Connection"
+msgstr "离线 - 无可用网络"
+
+#: ../src/empathy-accounts-dialog.c:357
+msgid "Unknown Status"
+msgstr "未知状态"
+
+#: ../src/empathy-accounts-dialog.c:369
+msgid "Offline — Account Disabled"
+msgstr "离线 - 帐户被禁用"
+
+#: ../src/empathy-accounts-dialog.c:772
 msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"您将要删除您的 %s 账户！\n"
-"您确定要继续吗？"
+"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:1133
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "您要从电脑中移除 %s 吗？"
 
-#: ../src/empathy-accounts-dialog.c:622
+#: ../src/empathy-accounts-dialog.c:1137
+msgid "This will not remove your account on the server."
+msgstr "这不会删除服务器上的账户。"
+
+#: ../src/empathy-accounts-dialog.c:1375
 msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
-msgstr ""
-"如果您决定继续，任何相关的对话和聊天室都 不会 被删除。\n"
-"\n"
-"如果将来您重新添加此账户，它们将仍然存在。"
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr "您将要选择另一个账户，所做的修改将作废。您确定要继续吗？"
+
+#. Menu items: to enabled/disable the account
+#: ../src/empathy-accounts-dialog.c:1571
+#, fuzzy
+#| msgid "_Enabled"
+msgid "_Enable"
+msgstr "已启用(_E)"
+
+#: ../src/empathy-accounts-dialog.c:1572
+#, fuzzy
+#| msgid "_Enabled"
+msgid "_Disable"
+msgstr "已启用(_E)"
+
+#: ../src/empathy-accounts-dialog.c:2086
+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 "Accounts"
-msgstr "账户"
+msgid "Loading account information"
+msgstr "正在加载账号信息"
 
 #: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add new"
-msgstr ""
+msgid "No protocol installed"
+msgstr "尚未安装协议"
 
 #: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "å\88\9b建(_E)"
+msgid "Protocol:"
+msgstr "å\8d\8fè®®ï¼\9a"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "No protocol installed"
-msgstr "尚未安装协议"
-
-#: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "要添加一个新账户，您首先需要为您想要使用的每个协议安装后端。"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Add..."
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Add…"
 msgstr "添加(_A)..."
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "_Create a new account"
-msgstr "å\88\9b建æ\96°ç\9a\84å¸\90æ\88·(_C)"
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "_Import…"
+msgstr "导å\85¥(_I)..."
 
-#: ../src/empathy-accounts-dialog.ui.h:8
-msgid "_Reuse an existing account"
-msgstr "启用现有帐户(_R)"
+#: ../src/empathy-auth-client.c:243
+msgid " - Empathy authentication client"
+msgstr " - Empathy 认证客户端"
 
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "account"
-msgstr "账户"
+#: ../src/empathy-auth-client.c:259
+msgid "Empathy authentication client"
+msgstr "Empathy 认证客户端"
 
-#: ../src/empathy-call-window.c:426
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../src/empathy-av.c:118
+msgid "- Empathy Audio/Video Client"
+msgstr " - Empathy 语音/视频客户端"
+
+#: ../src/empathy-av.c:134
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy 语音/视频客户端"
+
+#: ../src/empathy-streamed-media-window.c:479
 msgid "Contrast"
 msgstr "对比度"
 
-#: ../src/empathy-call-window.c:429
+#: ../src/empathy-streamed-media-window.c:482
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:432
+#: ../src/empathy-streamed-media-window.c:485
 msgid "Gamma"
 msgstr "伽马"
 
-#: ../src/empathy-call-window.c:539
+#: ../src/empathy-streamed-media-window.c:590
 msgid "Volume"
 msgstr "音量"
 
-#: ../src/empathy-call-window.c:671
-msgid "Connecting..."
-msgstr "正在连接..."
-
-#: ../src/empathy-call-window.c:778
+#: ../src/empathy-streamed-media-window.c:1165
 msgid "_Sidebar"
 msgstr "侧边栏(_S)"
 
-#: ../src/empathy-call-window.c:797
-msgid "Dialpad"
-msgstr "电话键盘"
-
-#: ../src/empathy-call-window.c:803
+#: ../src/empathy-streamed-media-window.c:1185
 msgid "Audio input"
 msgstr "音频输入"
 
-#: ../src/empathy-call-window.c:807
+#: ../src/empathy-streamed-media-window.c:1189
 msgid "Video input"
 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:868
+#: ../src/empathy-streamed-media-window.c:1193
+msgid "Dialpad"
+msgstr "电话键盘"
+
+#: ../src/empathy-streamed-media-window.c:1198
+msgid "Details"
+msgstr "详细信息"
+
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-streamed-media-window.c:1267
 #, 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:938
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-streamed-media-window.c:1346
 msgid "Call"
 msgstr "通话"
 
+#: ../src/empathy-streamed-media-window.c:1500
+msgid "The IP address as seen by the machine"
+msgstr "机器所见的 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1502
+msgid "The IP address as seen by a server on the Internet"
+msgstr "Internet 上服务器所见的 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1504
+msgid "The IP address of the peer as seen by the other side"
+msgstr "另一方所见的 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1506
+msgid "The IP address of a relay server"
+msgstr "中转服务器 IP 地址"
+
+#: ../src/empathy-streamed-media-window.c:1508
+msgid "The IP address of the multicast group"
+msgstr "多播组的 IP 地址"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1390
+#: ../src/empathy-streamed-media-window.c:2259
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已连接 — %d:%02dm"
 
+#: ../src/empathy-streamed-media-window.c:2320
+msgid "Technical Details"
+msgstr "技术细节"
+
+#: ../src/empathy-streamed-media-window.c:2358
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "%s 软件无法理解您计算机所支持的任何音频格式。"
+
+#: ../src/empathy-streamed-media-window.c:2363
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "%s 软件无法理解您计算机所支持的任何视频格式。"
+
+#: ../src/empathy-streamed-media-window.c:2369
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr "不能与 %s 建立连接。可能是两台计算机之一不允许直接连接。"
+
+#: ../src/empathy-streamed-media-window.c:2375
+msgid "There was a failure on the network"
+msgstr "网络出现一个错误"
+
+#: ../src/empathy-streamed-media-window.c:2379
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
+
+#: ../src/empathy-streamed-media-window.c:2382
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
+
+#: ../src/empathy-streamed-media-window.c:2392
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>，并附上帮助菜"
+"单里“调试”窗口收集到的日志。"
+
+#: ../src/empathy-streamed-media-window.c:2400
+msgid "There was a failure in the call engine"
+msgstr "呼叫引擎里出现了一个故障"
+
+#: ../src/empathy-streamed-media-window.c:2403
+msgid "The end of the stream was reached"
+msgstr "已到达流的末尾"
+
+#: ../src/empathy-streamed-media-window.c:2443
+msgid "Can't establish audio stream"
+msgstr "不能建立音频流"
+
+#: ../src/empathy-streamed-media-window.c:2453
+msgid "Can't establish video stream"
+msgstr "不能建立视频流"
+
 #: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "音频"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call the contact again"
+msgstr "再次呼叫联系人"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera Off"
+msgstr "相机关闭"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Camera On"
+msgstr "相机开启"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "解码器："
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "禁用相机停止发送视频"
+
+#: ../src/empathy-call-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "启用相机，并发送视频"
+
+#: ../src/empathy-call-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "启用相机，但不发送视频"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "编码器："
+
+#: ../src/empathy-call-window.ui.h:10
 msgid "Hang up"
 msgstr "挂起"
 
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:11
+msgid "Hang up current call"
+msgstr "挂起当前呼叫"
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "本地候选："
+
+#: ../src/empathy-call-window.ui.h:13
+msgid "Preview"
+msgstr "预览"
+
+#: ../src/empathy-call-window.ui.h:14
 msgid "Redial"
-msgstr "é\87\8dæ\92­"
+msgstr "é\87\8dæ\8b¨"
 
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "远程候选："
+
+#: ../src/empathy-call-window.ui.h:16
 msgid "Send Audio"
 msgstr "发送音频"
 
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "å\8f\91é\80\81è§\86é¢\91"
+#: ../src/empathy-call-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "å\88\87æ\8d¢é\9f³é¢\91ä¼ è¾\93"
 
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
+#: ../src/empathy-call-window.ui.h:19
+msgid "V_ideo"
+msgstr "视频(_I)"
+
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "视频"
+
+#: ../src/empathy-call-window.ui.h:21
+msgid "Video Off"
+msgstr "视频关闭"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Video On"
+msgstr "视频开启"
+
+#: ../src/empathy-call-window.ui.h:23
+msgid "Video Preview"
 msgstr "视频预览"
 
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:24
 msgid "_Call"
 msgstr "通话(_C)"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:28
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../src/empathy-chat-window.c:343
+#: ../src/empathy-chat-window.c:469 ../src/empathy-chat-window.c:489
 #, c-format
-msgid "Conversations (%d)"
-msgstr "对话 (%d)"
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d 未读)"
 
-#: ../src/empathy-chat-window.c:475
+#: ../src/empathy-chat-window.c:481
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (和 %u 其它)"
+
+#: ../src/empathy-chat-window.c:497
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (%d 其它未读)"
+
+#: ../src/empathy-chat-window.c:506
+#, c-format
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (%d 全部未读)"
+
+#: ../src/empathy-chat-window.c:708
 msgid "Typing a message."
 msgstr "输入消息。"
 
@@ -2034,70 +3133,86 @@ msgid "C_lear"
 msgstr "清除(_L)"
 
 #: ../src/empathy-chat-window.ui.h:2
+msgid "C_ontact"
+msgstr "联系人(_O)"
+
+#: ../src/empathy-chat-window.ui.h:3
 msgid "Chat"
 msgstr "聊天"
 
-#: ../src/empathy-chat-window.ui.h:3
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Insert _Smiley"
-msgstr "插入表情(_M)"
+msgstr "插入表情(_S)"
 
-#: ../src/empathy-chat-window.ui.h:4
+#: ../src/empathy-chat-window.ui.h:5
+msgid "Invite _Participant…"
+msgstr "邀请参与者(_P)…"
+
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
 msgstr "左移标签(_L)"
 
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Right"
 msgstr "右移标签(_R)"
 
-#: ../src/empathy-chat-window.ui.h:6
-msgid "_Contact"
-msgstr "联系人(_C)"
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "提示所有消息"
 
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../src/empathy-chat-window.ui.h:8
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "对话(_C)"
 
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Detach Tab"
 msgstr "漂移标签(_D)"
 
-#: ../src/empathy-chat-window.ui.h:11
-msgid "_Favorite Chatroom"
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Favorite Chat Room"
 msgstr "收藏聊天室(_F)"
 
-#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "下一标签(_N)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
 msgstr "上一标签(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../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:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Tabs"
 msgstr "标签(_T)"
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "撤销关闭标签(_U)"
+
+#: ../src/empathy-chatrooms-window.c:241
 msgid "Name"
 msgstr "名称"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:259
 msgid "Room"
 msgstr "聊天室"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:267
 msgid "Auto-Connect"
 msgstr "自动连接"
 
@@ -2105,75 +3220,93 @@ msgstr "自动连接"
 msgid "Manage Favorite Rooms"
 msgstr "管理聊天室收藏"
 
-#: ../src/empathy-event-manager.c:322
+#: ../src/empathy-event-manager.c:507
+msgid "Incoming video call"
+msgstr "呼入的视频通话"
+
+#: ../src/empathy-event-manager.c:507
 msgid "Incoming call"
 msgstr "来电"
 
-#: ../src/empathy-event-manager.c:325
+#: ../src/empathy-event-manager.c:511
+#, c-format
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s 视频来电。您想要接听吗？"
+
+#: ../src/empathy-event-manager.c:512
 #, c-format
-msgid "%s is calling you, do you want to answer?"
+msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 来电，您想要接听吗？"
 
-#: ../src/empathy-event-manager.c:332
+#: ../src/empathy-event-manager.c:515 ../src/empathy-event-manager.c:660
+#, c-format
+msgid "Incoming call from %s"
+msgstr "%s 的来电"
+
+#: ../src/empathy-event-manager.c:540
 msgid "_Reject"
 msgstr "拒绝(_R)"
 
-#: ../src/empathy-event-manager.c:338
+#: ../src/empathy-event-manager.c:546
 msgid "_Answer"
 msgstr "接听(_A)"
 
-#: ../src/empathy-event-manager.c:453
+#: ../src/empathy-event-manager.c:660
 #, c-format
-msgid "Incoming call from %s"
-msgstr "%s 的来电"
-
-#: ../src/empathy-event-manager.c:497
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s 正发送邀请给您"
-
-#: ../src/empathy-event-manager.c:503
-msgid "An external application will be started to handle it."
-msgstr "将启动一个外部应用程序来处理它."
+msgid "Incoming video call from %s"
+msgstr "%s 的视频呼叫"
 
-#: ../src/empathy-event-manager.c:508
-msgid "You don't have the needed external application to handle it."
-msgstr "您没有必需的外部应用程序来处理它."
-
-#: ../src/empathy-event-manager.c:635
+#: ../src/empathy-event-manager.c:737
 msgid "Room invitation"
 msgstr "聊天室邀请"
 
-#: ../src/empathy-event-manager.c:638
+#: ../src/empathy-event-manager.c:739
+#, c-format
+msgid "Invitation to join %s"
+msgstr "邀请您加入 %s"
+
+#: ../src/empathy-event-manager.c:746
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:646
+#: ../src/empathy-event-manager.c:754
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../src/empathy-event-manager.c:651
+#: ../src/empathy-event-manager.c:759
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:690
+#: ../src/empathy-event-manager.c:786
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 已邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:716
+#: ../src/empathy-event-manager.c:792
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "您被邀请加入 %s"
+
+#: ../src/empathy-event-manager.c:843
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "接收 %s 文件传输"
 
-#: ../src/empathy-event-manager.c:896
-#, c-format
-msgid "Subscription requested by %s"
-msgstr "%s 的订阅请求"
+#: ../src/empathy-event-manager.c:1013 ../src/empathy-main-window.c:367
+#, fuzzy
+#| msgid "Password"
+msgid "Password required"
+msgstr "密码"
 
-#: ../src/empathy-event-manager.c:900
+#: ../src/empathy-event-manager.c:1069
+#, fuzzy, c-format
+#| msgid "%s would like to send you a file"
+msgid "%s would like permission to see when you are online"
+msgstr "%s 想要给您发送一个文件"
+
+#: ../src/empathy-event-manager.c:1073
 #, c-format
 msgid ""
 "\n"
@@ -2182,118 +3315,106 @@ msgstr ""
 "\n"
 "消息：%s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:936
-#, c-format
-msgid "%s is now offline."
-msgstr "%s 当前离线。"
-
-#. someone is logging in
-#: ../src/empathy-event-manager.c:952
-#, c-format
-msgid "%s is now online."
-msgstr "%s 当前在线。"
-
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:104
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "未知"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%2$s 中的 %1$s，速度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%2$s 中的 %1$s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正在从 %2$s 接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "正在向 %2$s 发送 \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "从 %2$s 接收 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "接收文件出错"
 
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "向 %2$s 发送 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "发送文件出错"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "已经从 %2$s 完成接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "已经向 %2$s 完成发送 \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "文件传送完成"
 
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他参与者的回应"
 
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "检查\"%s\"完整性"
 
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "校验中 \"%s\""
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:1016
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1028
 msgid "File"
 msgstr "文件"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1050
 msgid "Remaining"
 msgstr "剩余"
 
@@ -2328,185 +3449,168 @@ msgstr "协议"
 msgid "Source"
 msgstr "源"
 
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "%s 账户"
-
-#: ../src/empathy-main-window.c:399
-msgid "_Edit account"
-msgstr "编辑账户(_E)"
-
-#: ../src/empathy-main-window.c:502
-msgid "No error specified"
-msgstr "没有说明错误"
-
-#: ../src/empathy-main-window.c:505
-msgid "Network error"
-msgstr "网络错误"
-
-#: ../src/empathy-main-window.c:508
-msgid "Authentication failed"
-msgstr "验证失败"
-
-#: ../src/empathy-main-window.c:511
-msgid "Encryption error"
-msgstr "加密错误"
-
-#: ../src/empathy-main-window.c:514
-msgid "Name in use"
-msgstr "用户名已经被占用"
-
-#: ../src/empathy-main-window.c:517
-msgid "Certificate not provided"
-msgstr "未提供证书"
+#: ../src/empathy-main-window.c:384
+#, fuzzy
+#| msgid "Password"
+msgid "Provide Password"
+msgstr "密码"
 
-#: ../src/empathy-main-window.c:520
-msgid "Certificate untrusted"
-msgstr "证书不被信任"
+#: ../src/empathy-main-window.c:390
+#, fuzzy
+#| msgid "Disconnected"
+msgid "Disconnect"
+msgstr "已断开连接"
 
-#: ../src/empathy-main-window.c:523
-msgid "Certificate expired"
-msgstr "证书已过期"
+#: ../src/empathy-main-window.c:530
+msgid "No match found"
+msgstr "没有找到匹配项"
 
-#: ../src/empathy-main-window.c:526
-msgid "Certificate not activated"
-msgstr "证书尚未激活"
+#: ../src/empathy-main-window.c:685
+msgid "Reconnect"
+msgstr "重新连接"
 
-#: ../src/empathy-main-window.c:529
-msgid "Certificate hostname mismatch"
-msgstr "证书主机名不匹配"
+#: ../src/empathy-main-window.c:691
+msgid "Edit Account"
+msgstr "编辑账户"
 
-#: ../src/empathy-main-window.c:532
-msgid "Certificate fingerprint mismatch"
-msgstr "证书指纹不匹配"
+#: ../src/empathy-main-window.c:697
+msgid "Close"
+msgstr "关闭"
 
-#: ../src/empathy-main-window.c:535
-msgid "Certificate self-signed"
-msgstr "证书是自签属的"
-
-#: ../src/empathy-main-window.c:538
-msgid "Certificate error"
-msgstr "证书错误"
+#: ../src/empathy-main-window.c:1414
+msgid "Contact"
+msgstr "联系人"
 
-#: ../src/empathy-main-window.c:541
-msgid "Unknown error"
-msgstr "未知的错误"
+#: ../src/empathy-main-window.c:1748
+msgid "Contact List"
+msgstr "联系人列表"
 
-#: ../src/empathy-main-window.c:1288
+#: ../src/empathy-main-window.c:1863
 msgid "Show and edit accounts"
 msgstr "显示和编辑账户"
 
 #: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "联系人列表"
-
-#: ../src/empathy-main-window.ui.h:2
 msgid "Contacts on a _Map"
 msgstr "联系人地图(_M)"
 
-#: ../src/empathy-main-window.ui.h:3
-msgid "Context"
-msgstr "上下文"
+#: ../src/empathy-main-window.ui.h:2
+#, fuzzy
+#| msgid "Contact List"
+msgid "Find in Contact _List"
+msgstr "联系人列表"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
 msgstr "加入已收藏的聊天室(_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
 msgstr "管理收藏夹"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
 msgid "N_ormal Size"
 msgstr "常规视图(_O)"
 
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "新建呼叫(_C)..."
+
 #: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
 msgstr "扩展视图(_A)"
 
 #: ../src/empathy-main-window.ui.h:8
+msgid "P_references"
+msgstr "首选项(_R)"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Show P_rotocols"
+msgstr "显示协议(_R)"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "Sort by _Name"
 msgstr "按姓名排序(_N)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Status"
 msgstr "按状态排序(_S)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Accounts"
 msgstr "账户(_A)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Compact Size"
 msgstr "紧凑视图(_C)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:17
 msgid "_Debug"
 msgstr "调试(_D)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:19
 msgid "_File Transfers"
 msgstr "文件传输(_F)"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Join…"
 msgstr "加入(_J)..."
 
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
+#: ../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:21
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Offline Contacts"
 msgstr "离线联系人(_O)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Personal Information"
 msgstr "个人信息(_P)"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "最近会话(_P)"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Room"
 msgstr "聊天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:328
+#: ../src/empathy-main-window.ui.h:27
+#, fuzzy
+#| msgctxt "Link individual (contextual menu)"
+#| msgid "_Link Contacts…"
+msgid "_Search for Contacts…"
+msgstr "绑定联系人(_L)…"
+
+#: ../src/empathy-new-chatroom-dialog.c:337
 msgid "Chat Room"
 msgstr "聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:344
+#: ../src/empathy-new-chatroom-dialog.c:353
 msgid "Members"
 msgstr "成员"
 
-#: ../src/empathy-new-chatroom-dialog.c:494
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:560
 #, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
 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:496
-#: ../src/empathy-new-chatroom-dialog.c:497
+#: ../src/empathy-new-chatroom-dialog.c:562
+#: ../src/empathy-new-chatroom-dialog.c:563
 msgid "No"
 msgstr "否"
 
-#: ../src/empathy-new-chatroom-dialog.c:524
+#: ../src/empathy-new-chatroom-dialog.c:591
 msgid "Could not start room listing"
 msgstr "无法开始聊天室列表"
 
-#: ../src/empathy-new-chatroom-dialog.c:534
+#: ../src/empathy-new-chatroom-dialog.c:601
 msgid "Could not stop room listing"
 msgstr "无法停止聊天室列表"
 
@@ -2537,261 +3641,550 @@ msgstr "聊天室列表"
 msgid "_Room:"
 msgstr "聊天室(_R)："
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Message received"
 msgstr "收到了消息"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "Message sent"
 msgstr "发出了消息"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:141
 msgid "New conversation"
 msgstr "新对话"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes online"
 msgstr "离线人上线"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:143
 msgid "Contact goes offline"
 msgstr "联系人离线"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:144
 msgid "Account connected"
 msgstr "账户已连接"
 
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:145
 msgid "Account disconnected"
 msgstr "账户已断开"
 
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:446
 msgid "Language"
 msgstr "语言"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "允许使用 GPS 信息(_G)"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "允许使用网络信息(_C)"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "允许使用网络信息(_N)"
+#: ../src/empathy-preferences.c:875
+msgid "Preferences"
+msgstr "首选项"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "外观"
 
-#: ../src/empathy-preferences.ui.h:5
-msgid "Automatically _connect on startup "
-msgstr "启动时自动登录(_C) "
-
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:2
 msgid "Behavior"
 msgstr "行为"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:3
 msgid "Chat Th_eme:"
 msgstr "聊天主题(_E)："
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:4
 msgid "Disable notifications when _away or busy"
 msgstr "离开或忙碌时禁用提示(_A)"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable sounds when _away or busy"
 msgstr "离开或忙碌时禁用声音(_A)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "再提示区域显示呼入事件"
+
+#: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact comes online"
 msgstr "当联系人上线时允许提示"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Enable notifications when a contact goes offline"
 msgstr "当联系人离线时允许提示"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when the _chat is not focused"
 msgstr "当会话闲置时允许提示"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable spell checking for languages:"
 msgstr "允许拼写检查的语言："
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "常规"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Geoclue 设置"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "位置来源："
 
-#: ../src/empathy-preferences.ui.h:16
-msgid "Location"
-msgstr "位置"
+#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "记录对话"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:15
 msgid "Notifications"
 msgstr "提示"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:16
 msgid "Play sound for events"
 msgstr "播放事件声音"
 
-#: ../src/empathy-preferences.ui.h:19
-msgid "Preferences"
-msgstr "首选项"
-
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "隐私"
 
-#: ../src/empathy-preferences.ui.h:21
-#, fuzzy
+#: ../src/empathy-preferences.ui.h:18
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr ""
-"降低位置精度意味着你公开的城市、州和国家信息不在精确。 GPS 座标会有一个随机数"
-"å\8a å\85¥ (&#xB1;0.25&#xB0;) ã\80\82"
+"降低定位精度意味着比您所在的城市、州和国家更明确的信息将不会被公布。 GPS 坐标"
+"å°\86精确å\88°ä¸\80ä½\8då°\8fæ\95°ã\80\82 "
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "显示表情符号为图形(_S)"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
 msgid "Show contact _list in rooms"
 msgstr "在聊天室显示联系人列表(_L)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "声音"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
 msgstr "拼写检查"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "语言列表仅反映已安装的字典"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "主题"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr "启动时自动连接(_A) "
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Cellphone"
+msgstr "手机(_C)"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable bubble notifications"
 msgstr "允许气泡通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable sound notifications"
 msgstr "启用声音通知(_E)"
 
+#: ../src/empathy-preferences.ui.h:29
+msgid "_GPS"
+msgstr "_GPS"
+
 #: ../src/empathy-preferences.ui.h:30
+msgid "_Network (IP, Wi-Fi)"
+msgstr "网络(_N)(IP，Wi-Fi)"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Open new chats in separate windows"
 msgstr "在单独窗口中打开新聊天(_O)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Publish location to my contacts"
 msgstr "向我的联系人公布位置信息(_P)"
 
-#: ../src/empathy-preferences.ui.h:32
+#. 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:34
 msgid "_Reduce location accuracy"
 msgstr "降低位置信息精度(_R)"
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "状态"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "不能启动应用程序为 %s: %s 服务"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr "一个由 %s 服务提供邀请，但是你不需要应用程序处理它"
-
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:442
 msgid "Contact Map View"
 msgstr "联系地图视图"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1079
-msgid "Error"
-msgstr "错误"
-
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1073
-msgid "Critical"
-msgstr "危急"
-
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1067
-msgid "Warning"
-msgstr "警告"
-
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1061
-#: ../src/empathy-debug-dialog.c:1109
-msgid "Message"
-msgstr "消息"
-
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1055
-msgid "Info"
-msgstr "信息"
-
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1049
-msgid "Debug"
-msgstr "调试"
-
-#: ../src/empathy-debug-dialog.c:841
+#: ../src/empathy-debug-window.c:1218
 msgid "Save"
 msgstr "保存"
 
-#: ../src/empathy-debug-dialog.c:944
+#: ../src/empathy-debug-window.c:1394
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: ../src/empathy-debug-dialog.c:1017
+#: ../src/empathy-debug-window.c:1474
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/empathy-debug-dialog.c:1029
+#: ../src/empathy-debug-window.c:1486
 msgid "Level "
 msgstr "级别 "
 
-#: ../src/empathy-debug-dialog.c:1098
+#: ../src/empathy-debug-window.c:1506
+msgid "Debug"
+msgstr "调试"
+
+#: ../src/empathy-debug-window.c:1512
+msgid "Info"
+msgstr "信息"
+
+#: ../src/empathy-debug-window.c:1518 ../src/empathy-debug-window.c:1567
+msgid "Message"
+msgstr "消息"
+
+#: ../src/empathy-debug-window.c:1524
+msgid "Warning"
+msgstr "警告"
+
+#: ../src/empathy-debug-window.c:1530
+msgid "Critical"
+msgstr "危急"
+
+#: ../src/empathy-debug-window.c:1536
+msgid "Error"
+msgstr "错误"
+
+#: ../src/empathy-debug-window.c:1555
 msgid "Time"
 msgstr "时间"
 
-#: ../src/empathy-debug-dialog.c:1100
+#: ../src/empathy-debug-window.c:1558
 msgid "Domain"
 msgstr "域"
 
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1560
 msgid "Category"
 msgstr "类别"
 
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1562
 msgid "Level"
 msgstr "级别"
 
-#: ../src/empathy-debug-dialog.c:1136
+#: ../src/empathy-debug-window.c:1599
 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
+msgid "Invite Participant"
+msgstr "邀请参与者"
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "选择一个联系人以加入该会话："
+
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "邀请"
+
+#: ../src/empathy-accounts.c:183
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "不显示任何对话框；完成所有工作（如导入）然后退出"
+
+#: ../src/empathy-accounts.c:187
+#, fuzzy
+#| msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgid ""
+"Don't display any dialogs unless there are only \"People Nearby\" accounts"
+msgstr "如果有任何非 salut 账户的话，不显示任何对话框"
+
+# 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)"
+
+#: ../src/empathy-accounts.c:193
+msgid "<account-id>"
+msgstr "<账户 ID>"
+
+#: ../src/empathy-accounts.c:198
+msgid "- Empathy Accounts"
+msgstr "- Empathy 账户"
+
+#: ../src/empathy-accounts.c:237
+msgid "Empathy Accounts"
+msgstr "Empathy 账户"
+
+#: ../src/empathy-debugger.c:66
+msgid "Empathy Debugger"
+msgstr "Empathy 调试器"
+
+#: ../src/empathy-chat.c:107
+#, fuzzy
+#| msgid "- Empathy IM Client"
+msgid "- Empathy Chat Client"
+msgstr " - Empathy IM 客户端"
+
+#: ../src/empathy-notifications-approver.c:184
+msgid "Respond"
+msgstr "响应"
+
+#: ../src/empathy-notifications-approver.c:190
+msgid "Reject"
+msgstr "拒绝"
+
+#: ../src/empathy-notifications-approver.c:194
+msgid "Answer"
+msgstr "接听"
+
+#: ../src/empathy-notifications-approver.c:201
+#: ../src/empathy-notifications-approver.c:211
+msgid "Decline"
+msgstr "拒绝"
+
+#: ../src/empathy-notifications-approver.c:205
+#: ../src/empathy-notifications-approver.c:216
+msgid "Accept"
+msgstr "接受"
+
+#~ 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 账户已经被导入"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4 帐户已经被导入。"
+
+#~ msgid "Port of the proxy for outbound requests."
+#~ msgstr "出站代理端口"
+
+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "重新连接到对话失败"
+
+#~ msgid "Failed to join chat room"
+#~ msgstr "加入聊天室失败"
+
+#~ msgid "Select a destination"
+#~ msgstr "选择目的地"
+
+#~ msgid "%s account"
+#~ msgstr "%s 账户"
+
+#~ msgid "Salut account is created"
+#~ msgstr "已创建 Salut 账户"
+
+#~ msgid ""
+#~ "Whether or not the Salut account has been created on the first Empathy "
+#~ "run."
+#~ msgstr "是否在 Empathy 第一次运行时创建 Salut 账户。"
+
+#~ msgid "Hidden"
+#~ msgstr "隐身"
+
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>位置</b>"
+
+#~ msgid "Email:"
+#~ msgstr "电子邮件："
+
+#~ msgid "Custom Message..."
+#~ msgstr "自定义状态..."
+
+#~ msgid "Edit Custom Messages..."
+#~ msgstr "编辑自定义状态..."
+
+#~ 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 "添加"
+
+#~ msgid "Cr_eate"
+#~ msgstr "创建(_E)"
+
+#~ msgid "_Add..."
+#~ msgstr "添加(_A)..."
+
+#~ msgid "_Import..."
+#~ msgstr "导入(_I)..."
+
+#~ msgid "_Reuse an existing account"
+#~ msgstr "启用现有帐户(_R)"
+
+#~ msgid "%s is offering you an invitation"
+#~ msgstr "%s 正发送邀请给您"
+
+#~ msgid "An external application will be started to handle it."
+#~ msgstr "将启动一个外部应用程序来处理它."
+
+#~ msgid "You don't have the needed external application to handle it."
+#~ msgstr "您没有必需的外部应用程序来处理它."
+
+#~ msgid "No error specified"
+#~ msgstr "没有说明错误"
+
+#~ msgid "Unknown error"
+#~ msgstr "未知的错误"
+
+#~ msgid "_Join..."
+#~ msgstr "加入(_J)..."
+
+#~ msgid "_New Conversation..."
+#~ msgstr "新建对话(_N)..."
+
+#~ msgid "Unable to start application for service %s: %s"
+#~ msgstr "不能启动应用程序为 %s: %s 服务"
+
+#~ msgid ""
+#~ "An invitation was offered for service %s, but you don't have the needed "
+#~ "application to handle it"
+#~ msgstr "一个由 %s 服务提供邀请，但是你不需要应用程序处理它"
+
+#~ msgid "Can't set an empty display name"
+#~ msgstr "无法设置为空显示名称"
+
+#~ msgid "Unsupported command"
+#~ msgstr "不支持的命令"
+
+#~ msgid "_View Previous Conversations"
+#~ msgstr "查看以前对话(_V)"
+
+#~ msgid ""
+#~ "The contact to display in the applet. Empty means no contact is displayed."
+#~ msgstr "在小程序上显示的联系人。空列表表示不显示联系人。"
+
+#~ msgid "The contact's avatar token. Empty means contact has no avatar."
+#~ msgstr "联系人的头像标志。空表示联系人无头像。"
+
+#~ msgid "Megaphone"
+#~ msgstr "话筒"
+
+#~ msgid "Talk!"
+#~ msgstr "说吧！"
+
+#~ msgid "_Information"
+#~ msgstr "信息(_I)"
+
+#~ msgid "_Preferences"
+#~ msgstr "首选项(_P)"
+
+#~ msgid "Please configure a contact."
+#~ msgstr "请配置一个联系人。"
+
+#~ msgid "Select contact..."
+#~ msgstr "选择联系人..."
+
+#~ msgid "Presence"
+#~ msgstr "状态"
+
+#~ msgid "Set your own presence"
+#~ msgstr "设置您的状态"
+
+#~ msgid ""
+#~ "You are about to remove your %s account!\n"
+#~ "Are you sure you want to proceed?"
+#~ msgstr ""
+#~ "您将要删除您的 %s 账户！\n"
+#~ "您确定要继续吗？"
+
+#~ msgid ""
+#~ "Any associated conversations and chat rooms will NOT be removed if you "
+#~ "decide to proceed.\n"
+#~ "\n"
+#~ "Should you decide to add the account back at a later time, they will "
+#~ "still be available."
+#~ msgstr ""
+#~ "如果您决定继续，任何相关的对话和聊天室都 不会 被删除。\n"
+#~ "\n"
+#~ "如果将来您重新添加此账户，它们将仍然存在。"
+
+#~ msgid "Conversations (%d)"
+#~ msgstr "对话 (%d)"
+
+#~ msgid "_Contact"
+#~ msgstr "联系人(_C)"
+
+#~ msgid "Allow _GPS usage"
+#~ msgstr "允许使用 GPS 信息(_G)"
+
+#~ msgid "Allow _cellphone usage"
+#~ msgstr "允许使用网络信息(_C)"
+
+#~ msgid "Allow _network usage"
+#~ msgstr "允许使用网络信息(_N)"
+
+#~ msgid "Geoclue Settings"
+#~ msgstr "Geoclue 设置"
+
 #~ msgid "gtk-add"
 #~ msgstr "gtk-add"
 
@@ -2816,9 +4209,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "gtk-leave-fullscreen"
 #~ msgstr "gtk-leave-fullscreen"
 
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Empathy 即时通讯程序"
-
 #~ msgid "- Empathy Instant Messenger"
 #~ msgstr "- Empathy 即时通讯程序"
 
@@ -2834,9 +4224,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "<b>Servers</b>"
 #~ msgstr "<b>服务器</b>"
 
-#~ msgid "Create a new IRC network"
-#~ msgstr "创建新的 IRC 网络"
-
 #~ msgid "Edit the selected IRC network"
 #~ msgstr "编辑选中的 IRC 网络"
 
@@ -2855,6 +4242,7 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "Group Chat"
 #~ msgstr "群聊"
 
+#, fuzzy
 #~ msgid "Contact Information"
 #~ msgstr "联系人信息"
 
@@ -2864,9 +4252,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "Sorry, I don't want you in my contact list anymore."
 #~ msgstr "对不起，我不想让您以后出现在我的联系人列表中了。"
 
-#~ msgid "<b>Client Information</b>"
-#~ msgstr "<b>客户端信息</b>"
-
 #~ msgid "<b>Contact Details</b>"
 #~ msgstr "<b>联系人详情</b>"
 
@@ -2876,18 +4261,9 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "<b>Groups</b>"
 #~ msgstr "<b>群组</b>"
 
-#~ msgid "Contact information"
-#~ msgstr "联系人信息"
-
-#~ msgid "Custom message"
-#~ msgstr "自定义消息"
-
 #~ msgid "Message:"
 #~ msgstr "消息："
 
-#~ msgid "Save message"
-#~ msgstr "保存消息"
-
 #~ msgid "Status:"
 #~ msgstr "状态："
 
@@ -2915,12 +4291,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "Invitation _message:"
 #~ msgstr "邀请消息(_M)："
 
-#~ msgid "Invite"
-#~ msgstr "邀请"
-
-#~ msgid "You have been invited to join a chat conference."
-#~ msgstr "您被邀请加入一个聊天会议。"
-
 #~ msgid "Edit Favorite Room"
 #~ msgstr "编辑聊天室收藏"
 
@@ -2959,15 +4329,9 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "unknown size"
 #~ msgstr "未知大小"
 
-#~ msgid "%s would like to send you a file"
-#~ msgstr "%s 想要给您发送一个文件"
-
 #~ msgid "Do you want to accept the file \"%s\" (%s)?"
 #~ msgstr "您想要接收文件“%s”(%s)吗？"
 
-#~ msgid "_Accept"
-#~ msgstr "接受(_A)"
-
 #~ msgid "File transfers"
 #~ msgstr "文件传送"
 
@@ -2983,9 +4347,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "Browse:"
 #~ msgstr "浏览："
 
-#~ msgid "Join"
-#~ msgstr "加入"
-
 #~ msgid "Join New"
 #~ msgstr "加入新聊天室"
 
@@ -3034,9 +4395,6 @@ msgstr "已选定的连接管理不支持远程调试扩展"
 #~ msgid "Whether or not to show a popup when a contact becomes available."
 #~ msgstr "联系人上线时是否显示弹出消息通知。"
 
-#~ msgid "Closed"
-#~ msgstr "已关闭"
-
 #~ msgid "End this call?"
 #~ msgstr "结束此次通话吗？"