update Simplified Chinese (zh_CN) translation

1 files changed, 393 insertions, 377 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0a32f1cbe..d78765b93 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -18,14 +18,15 @@
 # Wylmer Wang <wantinghard@gmail.com>, 2010-2012.
 # zhen liu  <liuzhen1191@gmail.com>, 2011
 # Yangtse Su <yangtsesu@gmail.com>, 2011
+# Mike Manilone <crtmike@gmail.com>, 2012
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&keywords=I18N+L10N&component=General\n"
-"POT-Creation-Date: 2012-02-15 21:22+0000\n"
-"PO-Revision-Date: 2012-02-14 13:52+0800\n"
+"POT-Creation-Date: 2012-03-02 10:35+0000\n"
+"PO-Revision-Date: 2012-02-26 11:57+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -50,6 +51,16 @@ msgstr "Empathy 即时通讯程序"
 msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
 msgstr "使用 Google Talk、Facebook、MSN 以及许多其它聊天服务"
 
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:1
+#: ../src/empathy-accounts-dialog.c:2450
+msgid "Messaging and VoIP Accounts"
+msgstr "消息和 VoIP 帐号"
+
+#: ../data/empathy-accounts.desktop.in.in.h:2
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管理消息和 VoIP 帐号"
+
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Connection managers should be used"
 msgstr "应该使用连接管理器"
@@ -494,16 +505,6 @@ msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
 
-#. Tweak the dialog
-#: ../data/empathy-accounts.desktop.in.in.h:1
-#: ../src/empathy-accounts-dialog.c:2330
-msgid "Messaging and VoIP Accounts"
-msgstr "消息和 VoIP 帐号"
-
-#: ../data/empathy-accounts.desktop.in.in.h:2
-msgid "Manage Messaging and VoIP accounts"
-msgstr "管理消息和 VoIP 帐号"
-
 #: ../libempathy/empathy-ft-handler.c:736
 msgid "No reason was specified"
 msgstr "未指定原因"
@@ -548,7 +549,7 @@ msgstr "所选文件是非正常的文件"
 msgid "The selected file is empty"
 msgstr "所选文件是空的"
 
-#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:131
+#: ../libempathy/empathy-message.c:415 ../src/empathy-call-observer.c:129
 #, c-format
 msgid "Missed call from %s"
 msgstr "未接来电：%s"
@@ -599,7 +600,7 @@ msgid "Status is set to offline"
 msgstr "状态已设置为离线"
 
 #: ../libempathy/empathy-utils.c:289 ../libempathy/empathy-utils.c:323
-#: ../libempathy-gtk/empathy-call-utils.c:49
+#: ../libempathy-gtk/empathy-call-utils.c:47
 #: ../libempathy-gtk/empathy-new-message-dialog.c:81
 msgid "Network error"
 msgstr "网络错误"
@@ -771,7 +772,7 @@ msgid "All accounts"
 msgstr "全部帐号"
 
 #: ../libempathy-gtk/empathy-account-widget.c:682
-#: ../src/empathy-import-widget.c:335
+#: ../src/empathy-import-widget.c:336
 msgid "Account"
 msgstr "帐号"
 
@@ -1285,28 +1286,28 @@ msgstr "所有文件"
 msgid "Click to enlarge"
 msgstr "单击以放大"
 
-#: ../libempathy-gtk/empathy-call-utils.c:44
-#: ../libempathy-gtk/empathy-call-utils.c:62
+#: ../libempathy-gtk/empathy-call-utils.c:42
+#: ../libempathy-gtk/empathy-call-utils.c:60
 msgid "There was an error starting the call"
 msgstr "发起呼叫时出错"
 
-#: ../libempathy-gtk/empathy-call-utils.c:51
+#: ../libempathy-gtk/empathy-call-utils.c:49
 msgid "The specified contact doesn't support calls"
 msgstr "选择的联系人不支持呼叫"
 
-#: ../libempathy-gtk/empathy-call-utils.c:53
+#: ../libempathy-gtk/empathy-call-utils.c:51
 msgid "The specified contact is offline"
 msgstr "选择的联系人离线"
 
-#: ../libempathy-gtk/empathy-call-utils.c:55
+#: ../libempathy-gtk/empathy-call-utils.c:53
 msgid "The specified contact is not valid"
 msgstr "选择的联系人无效"
 
-#: ../libempathy-gtk/empathy-call-utils.c:57
+#: ../libempathy-gtk/empathy-call-utils.c:55
 msgid "Emergency calls are not supported on this protocol"
 msgstr "不支持在此会话上进行紧急呼叫"
 
-#: ../libempathy-gtk/empathy-call-utils.c:59
+#: ../libempathy-gtk/empathy-call-utils.c:57
 msgid "You don't have enough credit in order to place this call"
 msgstr "您信用卡余额不足以支付此次通话"
 
@@ -1449,7 +1450,7 @@ msgstr "尚未实现"
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:916
+#: ../libempathy-gtk/empathy-chat.c:1706 ../src/empathy-chat-window.c:920
 msgid "Topic:"
 msgstr "话题："
 
@@ -1564,9 +1565,9 @@ msgstr "%s 现在叫做 %s"
 #. * assume it hasn't and if it has, we'll set the proper status when
 #. * we get the new handler.
 #: ../libempathy-gtk/empathy-chat.c:2993
-#: ../src/empathy-streamed-media-window.c:1889
-#: ../src/empathy-event-manager.c:1280 ../src/empathy-call-window.c:1545
-#: ../src/empathy-call-window.c:1595 ../src/empathy-call-window.c:2638
+#: ../src/empathy-streamed-media-window.c:1886
+#: ../src/empathy-event-manager.c:1279 ../src/empathy-call-window.c:1502
+#: ../src/empathy-call-window.c:1552 ../src/empathy-call-window.c:2585
 msgid "Disconnected"
 msgstr "已断开连接"
 
@@ -1601,7 +1602,7 @@ msgstr "这个房间是由一个密码保护的："
 msgid "Join"
 msgstr "加入"
 
-#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1301
+#: ../libempathy-gtk/empathy-chat.c:4070 ../src/empathy-event-manager.c:1300
 msgid "Connected"
 msgstr "已连接"
 
@@ -2146,7 +2147,7 @@ msgid "_Edit"
 msgstr "编辑(_E)"
 
 #: ../libempathy-gtk/empathy-individual-menu.c:1546
-#: ../src/empathy-chat-window.c:1175
+#: ../src/empathy-chat-window.c:1192
 msgid "Inviting you to this room"
 msgstr "邀请到此聊天室"
 
@@ -2234,133 +2235,133 @@ msgstr "新建服务器"
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:622
+#: ../libempathy-gtk/empathy-log-window.c:620
 msgid "History"
 msgstr "历史"
 
-#: ../libempathy-gtk/empathy-log-window.c:677
+#: ../libempathy-gtk/empathy-log-window.c:675
 msgid "Show"
 msgstr "显示"
 
-#: ../libempathy-gtk/empathy-log-window.c:699
+#: ../libempathy-gtk/empathy-log-window.c:697
 msgid "Search"
 msgstr "搜索"
 
-#: ../libempathy-gtk/empathy-log-window.c:1150
+#: ../libempathy-gtk/empathy-log-window.c:1148
 #, c-format
 msgid "Chat in %s"
 msgstr "在 %s 聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1152
+#: ../libempathy-gtk/empathy-log-window.c:1150
 #, c-format
 msgid "Chat with %s"
 msgstr "与 %s 聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1202
-#: ../libempathy-gtk/empathy-log-window.c:1349
+#: ../libempathy-gtk/empathy-log-window.c:1200
+#: ../libempathy-gtk/empathy-log-window.c:1347
 msgctxt "A date with the time"
 msgid "%A, %e %B %Y %X"
 msgstr "%Y年%m月%d日 %A"
 
 #. Translators: this is an emote: '* Danielle waves'
-#: ../libempathy-gtk/empathy-log-window.c:1291
+#: ../libempathy-gtk/empathy-log-window.c:1289
 #, c-format
 msgid "<i>* %s %s</i>"
 msgstr "<i>* %s %s</i>"
 
 #. Translators: this is a message: 'Danielle: hello'
 #. * The string in bold is the sender's name
-#: ../libempathy-gtk/empathy-log-window.c:1297
+#: ../libempathy-gtk/empathy-log-window.c:1295
 #, c-format
 msgid "<b>%s:</b> %s"
 msgstr "<b>%s：</b>%s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1373
+#: ../libempathy-gtk/empathy-log-window.c:1371
 #, c-format
 msgid "%s second"
 msgid_plural "%s seconds"
 msgstr[0] "%s 秒"
 
-#: ../libempathy-gtk/empathy-log-window.c:1380
+#: ../libempathy-gtk/empathy-log-window.c:1378
 #, c-format
 msgid "%s minute"
 msgid_plural "%s minutes"
 msgstr[0] "%s 分"
 
-#: ../libempathy-gtk/empathy-log-window.c:1388
+#: ../libempathy-gtk/empathy-log-window.c:1386
 #, c-format
 msgid "Call took %s, ended at %s"
 msgstr "通话时长：%s，结束于 %s"
 
-#: ../libempathy-gtk/empathy-log-window.c:1722
+#: ../libempathy-gtk/empathy-log-window.c:1720
 msgid "Today"
 msgstr "今天"
 
-#: ../libempathy-gtk/empathy-log-window.c:1726
+#: ../libempathy-gtk/empathy-log-window.c:1724
 msgid "Yesterday"
 msgstr "昨天"
 
 #. Translators: A date such as '23 May 2010' (strftime format)
-#: ../libempathy-gtk/empathy-log-window.c:1741
+#: ../libempathy-gtk/empathy-log-window.c:1739
 msgid "%e %B %Y"
 msgstr "%Y年%m月%d日"
 
-#: ../libempathy-gtk/empathy-log-window.c:1829
-#: ../libempathy-gtk/empathy-log-window.c:3489
+#: ../libempathy-gtk/empathy-log-window.c:1827
+#: ../libempathy-gtk/empathy-log-window.c:3487
 msgid "Anytime"
 msgstr "随时"
 
-#: ../libempathy-gtk/empathy-log-window.c:1918
-#: ../libempathy-gtk/empathy-log-window.c:2402
+#: ../libempathy-gtk/empathy-log-window.c:1916
+#: ../libempathy-gtk/empathy-log-window.c:2400
 msgid "Anyone"
 msgstr "任何人"
 
-#: ../libempathy-gtk/empathy-log-window.c:2715
+#: ../libempathy-gtk/empathy-log-window.c:2713
 msgid "Who"
 msgstr "谁"
 
-#: ../libempathy-gtk/empathy-log-window.c:2924
+#: ../libempathy-gtk/empathy-log-window.c:2922
 msgid "When"
 msgstr "何时"
 
-#: ../libempathy-gtk/empathy-log-window.c:3040
+#: ../libempathy-gtk/empathy-log-window.c:3038
 msgid "Anything"
 msgstr "任何事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3042
+#: ../libempathy-gtk/empathy-log-window.c:3040
 msgid "Text chats"
 msgstr "文本聊天"
 
-#: ../libempathy-gtk/empathy-log-window.c:3044
+#: ../libempathy-gtk/empathy-log-window.c:3042
 #: ../src/empathy-preferences.ui.h:25
 msgid "Calls"
 msgstr "通话"
 
-#: ../libempathy-gtk/empathy-log-window.c:3049
+#: ../libempathy-gtk/empathy-log-window.c:3047
 msgid "Incoming calls"
 msgstr "来电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3050
+#: ../libempathy-gtk/empathy-log-window.c:3048
 msgid "Outgoing calls"
 msgstr "呼出的语音通话"
 
-#: ../libempathy-gtk/empathy-log-window.c:3051
+#: ../libempathy-gtk/empathy-log-window.c:3049
 msgid "Missed calls"
 msgstr "未接来电"
 
-#: ../libempathy-gtk/empathy-log-window.c:3073
+#: ../libempathy-gtk/empathy-log-window.c:3071
 msgid "What"
 msgstr "什么事"
 
-#: ../libempathy-gtk/empathy-log-window.c:3782
+#: ../libempathy-gtk/empathy-log-window.c:3780
 msgid "Are you sure you want to delete all logs of previous conversations?"
 msgstr "确定要删除以前的全部对话日志？"
 
-#: ../libempathy-gtk/empathy-log-window.c:3786
+#: ../libempathy-gtk/empathy-log-window.c:3784
 msgid "Clear All"
 msgstr "全部清除"
 
-#: ../libempathy-gtk/empathy-log-window.c:3793
+#: ../libempathy-gtk/empathy-log-window.c:3791
 msgid "Delete from:"
 msgstr "从以下位置删除："
 
@@ -2446,7 +2447,7 @@ msgid "There was an error starting the conversation"
 msgstr "发起对话时出错"
 
 #: ../libempathy-gtk/empathy-new-message-dialog.c:290
-#: ../libempathy-gtk/empathy-new-call-dialog.c:202
+#: ../libempathy-gtk/empathy-new-call-dialog.c:200
 msgid "Enter a contact identifier or phone number:"
 msgstr "输入一个联系人标识或电话号码："
 
@@ -2456,17 +2457,17 @@ msgid "New Conversation"
 msgstr "新建对话"
 
 #. add video button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:225
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
 msgid "_Video Call"
 msgstr "视频呼叫(_V)"
 
 #. add audio button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:235
+#: ../libempathy-gtk/empathy-new-call-dialog.c:233
 msgid "_Audio Call"
 msgstr "音频呼叫(_A)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:245
+#: ../libempathy-gtk/empathy-new-call-dialog.c:243
 msgid "New Call"
 msgstr "新建通话"
 
@@ -2522,7 +2523,7 @@ msgstr "自定义消息..."
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#: ../libempathy-gtk/empathy-protocol-chooser.c:588
 #, c-format
 msgid "New %s account"
 msgstr "新建 %s 帐号"
@@ -2890,23 +2891,23 @@ msgstr "无错误信息"
 msgid "Instant Message (Empathy)"
 msgstr "即时消息(Empathy)"
 
-#: ../src/empathy.c:437
+#: ../src/empathy.c:435
 msgid "Don't connect on startup"
 msgstr "启动时不自动连接"
 
-#: ../src/empathy.c:441
+#: ../src/empathy.c:439
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "启动时不显示联系人列表"
 
-#: ../src/empathy.c:456
+#: ../src/empathy.c:454
 msgid "- Empathy IM Client"
 msgstr " - Empathy 即时通讯客户端"
 
-#: ../src/empathy.c:643
+#: ../src/empathy.c:641
 msgid "Error contacting the Account Manager"
 msgstr "联系帐号管理器出错"
 
-#: ../src/empathy.c:645
+#: ../src/empathy.c:643
 #, c-format
 msgid ""
 "There was an error while trying to connect to the Telepathy Account Manager. "
@@ -2966,6 +2967,7 @@ msgstr ""
 "Tao Wei <weitao1979@gmail.com>, 2009\n"
 "Aron Xu <happyaron.xu@gmail.com>, 2009, 2010\n"
 "Tao Wang <dancefire@gmail.com>, 2010\n"
+"Mike Manilone <crtmike@gmail.com>, 2012\n"
 "\n"
 "Launchpad Contributions:\n"
 "  =KK= https://launchpad.net/~sevkme\n"
@@ -2976,242 +2978,105 @@ msgstr ""
 "  fujianwzh https://launchpad.net/~fujianwzh\n"
 "  yuane https://launchpad.net/~yuane"
 
-#: ../src/empathy-account-assistant.c:167
-msgid "There was an error while importing the accounts."
-msgstr "导入帐号时发生错误。"
-
-#: ../src/empathy-account-assistant.c:170
-msgid "There was an error while parsing the account details."
-msgstr "在解析帐号详情时出现错误。"
-
-#: ../src/empathy-account-assistant.c:173
-msgid "There was an error while creating the account."
-msgstr "在创建帐号时出现错误。"
-
-#: ../src/empathy-account-assistant.c:175
-msgid "There was an error."
-msgstr "发生错误。"
-
-#: ../src/empathy-account-assistant.c:179
-#, c-format
-msgid "The error message was: %s"
-msgstr "错误信息为：%s"
-
-#: ../src/empathy-account-assistant.c:183
-msgid ""
-"You can either go back and try to enter your accounts' details again or quit "
-"this assistant and add accounts later from the Edit menu."
-msgstr ""
-"您可以返回尝试重新输入您的帐号信息，或者退出助理，然后从编辑菜单中加入帐号。"
-
-#: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1276
-msgid "An error occurred"
-msgstr "发生错误"
-
-#: ../src/empathy-account-assistant.c:469
-#: ../libempathy-gtk/empathy-new-account-dialog.c:144
-msgid "What kind of chat account do you have?"
-msgstr "您已经拥有哪个类型的帐号？"
-
-#: ../src/empathy-account-assistant.c:475
-msgid "Do you have any other chat accounts you want to set up?"
-msgstr "您还要设置其它聊天帐号吗？"
-
-#: ../src/empathy-account-assistant.c:481
-msgid "Enter your account details"
-msgstr "输入您的帐号详情"
-
-#: ../src/empathy-account-assistant.c:486
-msgid "What kind of chat account do you want to create?"
-msgstr "您想创建那种类型的帐号？"
-
-#: ../src/empathy-account-assistant.c:492
-msgid "Do you want to create other chat accounts?"
-msgstr "您想要创建其它的聊天帐号吗、"
-
-#: ../src/empathy-account-assistant.c:499
-msgid "Enter the details for the new account"
-msgstr "输入新帐号的详细资料"
-
-#: ../src/empathy-account-assistant.c:614
-msgid ""
-"With Empathy you can chat with people online nearby and with friends and "
-"colleagues who use Google Talk, AIM, Windows Live and many other chat "
-"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:631
-msgid "Do you have an account you've been using with another chat program?"
-msgstr "您有没有其它聊天软件的帐号？"
-
-#: ../src/empathy-account-assistant.c:655
-msgid "Yes, import my account details from "
-msgstr "有，请导入我的帐号信息"
-
-#: ../src/empathy-account-assistant.c:676
-msgid "Yes, I'll enter my account details now"
-msgstr "有，我现在就输入我的帐号信息"
-
-#: ../src/empathy-account-assistant.c:698
-msgid "No, I want a new account"
-msgstr "不，我想要一个新的帐号"
-
-#: ../src/empathy-account-assistant.c:708
-msgid "No, I just want to see people online nearby for now"
-msgstr "没有，我只是想看看附近现在谁在线上"
-
-#: ../src/empathy-account-assistant.c:729
-msgid "Select the accounts you want to import:"
-msgstr "选择您要导入的帐号："
-
-#: ../src/empathy-account-assistant.c:816
-#: ../src/empathy-new-chatroom-dialog.c:639
-#: ../src/empathy-new-chatroom-dialog.c:640
-msgid "Yes"
-msgstr "是"
-
-#: ../src/empathy-account-assistant.c:823
-msgid "No, that's all for now"
-msgstr "没有，就这样吧"
-
-#: ../src/empathy-account-assistant.c:1088
-msgid ""
-"Empathy can automatically discover and chat with the people connected on the "
-"same network as you. If you want to use this feature, please check that the "
-"details below are correct. You can easily change these details later or "
-"disable this feature by using the 'Accounts' dialog"
-msgstr ""
-"Empathy 可以自动发现和您连接到同一个网络中的人们，并且可以和他们聊天。如果您"
-"想使用这个功能，请仔细查看下列信息是否正确。您之后也可以通过“帐号”对话框轻松"
-"的修改这些信息或关闭这个功能"
-
-#: ../src/empathy-account-assistant.c:1094
-#: ../src/empathy-account-assistant.c:1152
-msgid "Edit->Accounts"
-msgstr "编辑->帐号"
-
-#: ../src/empathy-account-assistant.c:1110
-msgid "I do _not want to enable this feature for now"
-msgstr "暂不启用此特性(_N)"
-
-#: ../src/empathy-account-assistant.c:1148
-msgid ""
-"You won't be able to chat with people connected to your local network, as "
-"telepathy-salut is not installed. If you want to enable this feature, please "
-"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:1154
-msgid "telepathy-salut not installed"
-msgstr "telepathy-salut 未安装"
-
-#: ../src/empathy-account-assistant.c:1200
-msgid "Messaging and VoIP Accounts Assistant"
-msgstr "消息和 VoIP 帐号助手"
-
-#: ../src/empathy-account-assistant.c:1234
-msgid "Welcome to Empathy"
-msgstr "欢迎使用 Empathy"
-
-#: ../src/empathy-account-assistant.c:1243
-msgid "Import your existing accounts"
-msgstr "导入现有帐号"
-
-#: ../src/empathy-account-assistant.c:1261
-msgid "Please enter personal details"
-msgstr "请输入个人信息"
-
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:72
 #, 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:73
+#: ../src/empathy-accounts-dialog.c:76
 msgid "Your new account has not been saved yet."
 msgstr "您的新帐号还没有保存。"
 
-#: ../src/empathy-accounts-dialog.c:347
+#: ../src/empathy-accounts-dialog.c:370
 #: ../src/empathy-streamed-media-window.c:757
-#: ../src/empathy-call-window.c:1332
+#: ../src/empathy-call-window.c:1289
 msgid "Connecting…"
 msgstr "正在连接..."
 
-#: ../src/empathy-accounts-dialog.c:388
+#: ../src/empathy-accounts-dialog.c:411
 #, c-format
 msgid "Offline — %s"
 msgstr "离线 - %s"
 
-#: ../src/empathy-accounts-dialog.c:400
+#: ../src/empathy-accounts-dialog.c:423
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已断开 - %s"
 
-#: ../src/empathy-accounts-dialog.c:411
+#: ../src/empathy-accounts-dialog.c:434
 msgid "Offline — No Network Connection"
 msgstr "离线 - 无可用网络"
 
-#: ../src/empathy-accounts-dialog.c:418
+#: ../src/empathy-accounts-dialog.c:441
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: ../src/empathy-accounts-dialog.c:430
+#: ../src/empathy-accounts-dialog.c:458
+msgid ""
+"This account has been disabled because it relies on an old, unsupported "
+"backend. Please install telepathy-haze and restart your session to migrate "
+"the account."
+msgstr ""
+"因为此账户依赖一个旧式、不支持的后端，所以此账户已被禁用。请安装 telepathy-"
+"haze 并重新启动您的会话来迁移您的账户。"
+
+#: ../src/empathy-accounts-dialog.c:468
 msgid "Offline — Account Disabled"
 msgstr "离线 - 帐号被禁用"
 
-#: ../src/empathy-accounts-dialog.c:533
+#: ../src/empathy-accounts-dialog.c:572
 msgid "Edit Connection Parameters"
 msgstr "编辑连接参数"
 
-#: ../src/empathy-accounts-dialog.c:696
+#: ../src/empathy-accounts-dialog.c:735
 msgid "Failed to retrieve your personal information from the server."
 msgstr "从服务器获取您的个人信息失败。"
 
-#: ../src/empathy-accounts-dialog.c:702
+#: ../src/empathy-accounts-dialog.c:741
 msgid "Go online to edit your personal information."
 msgstr "请上线以编辑您的个人信息。"
 
-#: ../src/empathy-accounts-dialog.c:787
+#: ../src/empathy-accounts-dialog.c:826
 msgid "_Edit Connection Parameters..."
 msgstr "编辑连接参数(_E)..."
 
-#: ../src/empathy-accounts-dialog.c:1292
+#: ../src/empathy-accounts-dialog.c:1322
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "您要从电脑中移除 %s 吗？"
 
-#: ../src/empathy-accounts-dialog.c:1296
+#: ../src/empathy-accounts-dialog.c:1326
 msgid "This will not remove your account on the server."
 msgstr "这不会删除服务器上的帐号。"
 
-#: ../src/empathy-accounts-dialog.c:1532
+#: ../src/empathy-accounts-dialog.c:1562
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
 msgstr "您将要选择另一个帐号，所做的修改将作废。您确定要继续吗？"
 
 #. Menu items: to enabled/disable the account
-#: ../src/empathy-accounts-dialog.c:1708
+#: ../src/empathy-accounts-dialog.c:1738
 msgid "_Enable"
 msgstr "启用(_E)"
 
-#: ../src/empathy-accounts-dialog.c:1709
+#: ../src/empathy-accounts-dialog.c:1739
 msgid "_Disable"
 msgstr "禁用(_D)"
 
-#: ../src/empathy-accounts-dialog.c:2179
+#: ../src/empathy-accounts-dialog.c:2122
+msgid "_Skip"
+msgstr "跳过(_S)"
+
+#: ../src/empathy-accounts-dialog.c:2126
+msgid "_Connect"
+msgstr "连接(_C)"
+
+#: ../src/empathy-accounts-dialog.c:2303
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -3226,8 +3091,8 @@ msgid "_Import…"
 msgstr "导入(_I)..."
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Protocol:"
-msgstr "协议："
+msgid "Loading account information"
+msgstr "正在加载帐号信息"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
 msgid ""
@@ -3236,12 +3101,8 @@ msgid ""
 msgstr "要添加一个新帐号，您首先需要为您想要使用的每个协议安装后端。"
 
 #: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "尚未安装协议"
-
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Loading account information"
-msgstr "正在加载帐号信息"
+msgid "No protocol backends installed"
+msgstr "未安装协议后端"
 
 #: ../src/empathy-auth-client.c:286
 msgid " - Empathy authentication client"
@@ -3251,15 +3112,11 @@ msgstr " - Empathy 认证客户端"
 msgid "Empathy authentication client"
 msgstr "Empathy 认证客户端"
 
-#: ../src/empathy-auto-salut-account-helper.c:83
-msgid "People nearby"
-msgstr "附近的人"
-
-#: ../src/empathy-av.c:118 ../src/empathy-call.c:203
+#: ../src/empathy-av.c:118 ../src/empathy-call.c:201
 msgid "- Empathy Audio/Video Client"
 msgstr " - Empathy 语音/视频客户端"
 
-#: ../src/empathy-av.c:134 ../src/empathy-call.c:228
+#: ../src/empathy-av.c:134 ../src/empathy-call.c:223
 msgid "Empathy Audio/Video Client"
 msgstr "Empathy 语音/视频客户端"
 
@@ -3302,98 +3159,98 @@ msgstr "详细信息"
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
 #: ../src/empathy-streamed-media-window.c:1209
-#: ../src/empathy-call-window.c:1934
+#: ../src/empathy-call-window.c:1889
 #, c-format
 msgid "Call with %s"
 msgstr "与 %s 通话"
 
 #: ../src/empathy-streamed-media-window.c:1442
-#: ../src/empathy-call-window.c:2178
+#: ../src/empathy-call-window.c:2133
 msgid "The IP address as seen by the machine"
 msgstr "机器所见的 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1444
-#: ../src/empathy-call-window.c:2180
+#: ../src/empathy-call-window.c:2135
 msgid "The IP address as seen by a server on the Internet"
 msgstr "Internet 上服务器所见的 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1446
-#: ../src/empathy-call-window.c:2182
+#: ../src/empathy-call-window.c:2137
 msgid "The IP address of the peer as seen by the other side"
 msgstr "另一方所见的 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1448
-#: ../src/empathy-call-window.c:2184
+#: ../src/empathy-call-window.c:2139
 msgid "The IP address of a relay server"
 msgstr "中转服务器 IP 地址"
 
 #: ../src/empathy-streamed-media-window.c:1450
-#: ../src/empathy-call-window.c:2186
+#: ../src/empathy-call-window.c:2141
 msgid "The IP address of the multicast group"
 msgstr "多播组的 IP 地址"
 
+#: ../src/empathy-streamed-media-window.c:1835
 #: ../src/empathy-streamed-media-window.c:1838
 #: ../src/empathy-streamed-media-window.c:1841
 #: ../src/empathy-streamed-media-window.c:1844
-#: ../src/empathy-streamed-media-window.c:1847
 msgctxt "codec"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-streamed-media-window.c:2139
+#: ../src/empathy-streamed-media-window.c:2136
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已连接 — %d:%02dm"
 
-#: ../src/empathy-streamed-media-window.c:2200
-#: ../src/empathy-call-window.c:3040
+#: ../src/empathy-streamed-media-window.c:2197
+#: ../src/empathy-call-window.c:2987
 msgid "Technical Details"
 msgstr "技术细节"
 
-#: ../src/empathy-streamed-media-window.c:2238
-#: ../src/empathy-call-window.c:3079
+#: ../src/empathy-streamed-media-window.c:2235
+#: ../src/empathy-call-window.c:3026
 #, 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:2243
-#: ../src/empathy-call-window.c:3084
+#: ../src/empathy-streamed-media-window.c:2240
+#: ../src/empathy-call-window.c:3031
 #, 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:2249
-#: ../src/empathy-call-window.c:3090
+#: ../src/empathy-streamed-media-window.c:2246
+#: ../src/empathy-call-window.c:3037
 #, 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:2255
-#: ../src/empathy-call-window.c:3096
+#: ../src/empathy-streamed-media-window.c:2252
+#: ../src/empathy-call-window.c:3043
 msgid "There was a failure on the network"
 msgstr "网络出现一个错误"
 
-#: ../src/empathy-streamed-media-window.c:2259
-#: ../src/empathy-call-window.c:3100
+#: ../src/empathy-streamed-media-window.c:2256
+#: ../src/empathy-call-window.c:3047
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "呼叫所需要的音频格式还没有在您的电脑上安装"
 
-#: ../src/empathy-streamed-media-window.c:2262
-#: ../src/empathy-call-window.c:3103
+#: ../src/empathy-streamed-media-window.c:2259
+#: ../src/empathy-call-window.c:3050
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "呼叫所需要的视频格式还没有在您的电脑上安装"
 
-#: ../src/empathy-streamed-media-window.c:2272
-#: ../src/empathy-call-window.c:3115
+#: ../src/empathy-streamed-media-window.c:2269
+#: ../src/empathy-call-window.c:3062
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -3403,23 +3260,23 @@ msgstr ""
 "Telepathy 组件出现了一些意外。请<a href=\"%s\">汇报这个错误</a>，并附上帮助菜"
 "单里“调试”窗口收集到的日志。"
 
-#: ../src/empathy-streamed-media-window.c:2280
-#: ../src/empathy-call-window.c:3124
+#: ../src/empathy-streamed-media-window.c:2277
+#: ../src/empathy-call-window.c:3071
 msgid "There was a failure in the call engine"
 msgstr "呼叫引擎里出现了一个故障"
 
-#: ../src/empathy-streamed-media-window.c:2283
-#: ../src/empathy-call-window.c:3127
+#: ../src/empathy-streamed-media-window.c:2280
+#: ../src/empathy-call-window.c:3074
 msgid "The end of the stream was reached"
 msgstr "已到达流的末尾"
 
-#: ../src/empathy-streamed-media-window.c:2323
-#: ../src/empathy-call-window.c:3167
+#: ../src/empathy-streamed-media-window.c:2320
+#: ../src/empathy-call-window.c:3114
 msgid "Can't establish audio stream"
 msgstr "不能建立音频流"
 
-#: ../src/empathy-streamed-media-window.c:2333
-#: ../src/empathy-call-window.c:3177
+#: ../src/empathy-streamed-media-window.c:2330
+#: ../src/empathy-call-window.c:3124
 msgid "Can't establish video stream"
 msgstr "不能建立视频流"
 
@@ -3532,8 +3389,8 @@ msgstr "编码器："
 
 #: ../src/empathy-call-window.ui.h:28
 #: ../src/empathy-streamed-media-window.ui.h:21
-#: ../src/empathy-call-window.c:2587 ../src/empathy-call-window.c:2588
-#: ../src/empathy-call-window.c:2589 ../src/empathy-call-window.c:2590
+#: ../src/empathy-call-window.c:2537 ../src/empathy-call-window.c:2538
+#: ../src/empathy-call-window.c:2539 ../src/empathy-call-window.c:2540
 msgid "Unknown"
 msgstr "未知"
 
@@ -3557,18 +3414,18 @@ msgstr "本地候选："
 msgid "Audio"
 msgstr "音频"
 
-#: ../src/empathy-chat-window.c:285
+#: ../src/empathy-chat-window.c:289
 msgid "Close this window?"
 msgstr "关闭此窗口？"
 
-#: ../src/empathy-chat-window.c:290
+#: ../src/empathy-chat-window.c:294
 #, c-format
 msgid ""
 "Closing this window will leave %s. You will not receive any further messages "
 "until you rejoin it."
 msgstr "关闭此窗口将离开 %s。您将不会再收到任何消息，除非重新加入。"
 
-#: ../src/empathy-chat-window.c:301
+#: ../src/empathy-chat-window.c:305
 #, c-format
 msgid ""
 "Closing this window will leave a chat room. You will not receive any further "
@@ -3579,60 +3436,60 @@ msgid_plural ""
 msgstr[0] ""
 "关闭此窗口将离开 %u 间聊天室。您将不会再收到任何消息，除非重新加入。"
 
-#: ../src/empathy-chat-window.c:310
+#: ../src/empathy-chat-window.c:314
 #, c-format
 msgid "Leave %s?"
 msgstr "级别 %s？"
 
-#: ../src/empathy-chat-window.c:311
+#: ../src/empathy-chat-window.c:315
 msgid ""
 "You will not receive any further messages from this chat room until you "
 "rejoin it."
 msgstr "您将不会再收到来自此聊天室的任何消息，除非重新加入。"
 
-#: ../src/empathy-chat-window.c:330
+#: ../src/empathy-chat-window.c:334
 msgid "Close window"
 msgstr "关闭窗口"
 
-#: ../src/empathy-chat-window.c:330
+#: ../src/empathy-chat-window.c:334
 msgid "Leave room"
 msgstr "离开聊天室"
 
-#: ../src/empathy-chat-window.c:636 ../src/empathy-chat-window.c:656
+#: ../src/empathy-chat-window.c:640 ../src/empathy-chat-window.c:660
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 未读)"
 
-#: ../src/empathy-chat-window.c:648
+#: ../src/empathy-chat-window.c:652
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (和另外 %u 人)"
 
-#: ../src/empathy-chat-window.c:664
+#: ../src/empathy-chat-window.c:668
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (另有他人的 %d 条未读)"
 
-#: ../src/empathy-chat-window.c:673
+#: ../src/empathy-chat-window.c:677
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (所有人共 %d 条未读)"
 
-#: ../src/empathy-chat-window.c:888
+#: ../src/empathy-chat-window.c:892
 msgid "SMS:"
 msgstr "短信："
 
-#: ../src/empathy-chat-window.c:898
+#: ../src/empathy-chat-window.c:902
 #, c-format
 msgid "Sending %d message"
 msgid_plural "Sending %d messages"
 msgstr[0] "正在发送 %d 条消息"
 
-#: ../src/empathy-chat-window.c:920
+#: ../src/empathy-chat-window.c:924
 msgid "Typing a message."
 msgstr "输入消息。"
 
@@ -3712,96 +3569,96 @@ msgstr "自动连接"
 msgid "Manage Favorite Rooms"
 msgstr "管理聊天室收藏"
 
-#: ../src/empathy-event-manager.c:523
+#: ../src/empathy-event-manager.c:522
 msgid "Incoming video call"
 msgstr "呼入的视频通话"
 
-#: ../src/empathy-event-manager.c:523 ../src/empathy-call-window.c:1562
+#: ../src/empathy-event-manager.c:522 ../src/empathy-call-window.c:1519
 msgid "Incoming call"
 msgstr "来电"
 
-#: ../src/empathy-event-manager.c:527
+#: ../src/empathy-event-manager.c:526
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 视频来电。您想要接听吗？"
 
-#: ../src/empathy-event-manager.c:528
+#: ../src/empathy-event-manager.c:527
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 来电，您想要接听吗？"
 
-#: ../src/empathy-event-manager.c:531 ../src/empathy-event-manager.c:732
-#: ../src/empathy-event-manager.c:765 ../src/empathy-call-window.c:1568
+#: ../src/empathy-event-manager.c:530 ../src/empathy-event-manager.c:731
+#: ../src/empathy-event-manager.c:764 ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的来电"
 
-#: ../src/empathy-event-manager.c:556
+#: ../src/empathy-event-manager.c:555
 msgid "_Reject"
 msgstr "拒绝(_R)"
 
-#: ../src/empathy-event-manager.c:564 ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:563 ../src/empathy-event-manager.c:571
 msgid "_Answer"
 msgstr "接听(_A)"
 
-#: ../src/empathy-event-manager.c:572
+#: ../src/empathy-event-manager.c:571
 msgid "_Answer with video"
 msgstr "使用视频接听(_A)"
 
-#: ../src/empathy-event-manager.c:732 ../src/empathy-event-manager.c:765
-#: ../src/empathy-call-window.c:1568
+#: ../src/empathy-event-manager.c:731 ../src/empathy-event-manager.c:764
+#: ../src/empathy-call-window.c:1525
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "%s 的视频呼叫"
 
-#: ../src/empathy-event-manager.c:838
+#: ../src/empathy-event-manager.c:837
 msgid "Room invitation"
 msgstr "聊天室邀请"
 
-#: ../src/empathy-event-manager.c:840
+#: ../src/empathy-event-manager.c:839
 #, c-format
 msgid "Invitation to join %s"
 msgstr "邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:847
+#: ../src/empathy-event-manager.c:846
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:855
+#: ../src/empathy-event-manager.c:854
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:859
 #: ../src/empathy-new-chatroom-dialog.ui.h:2
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:887
+#: ../src/empathy-event-manager.c:886
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 已邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:893
+#: ../src/empathy-event-manager.c:892
 #, c-format
 msgid "You have been invited to join %s"
 msgstr "您被邀请加入 %s"
 
-#: ../src/empathy-event-manager.c:944
+#: ../src/empathy-event-manager.c:943
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "接收 %s 文件传输"
 
-#: ../src/empathy-event-manager.c:1147 ../src/empathy-roster-window.c:374
+#: ../src/empathy-event-manager.c:1146 ../src/empathy-roster-window.c:374
 msgid "Password required"
 msgstr "需要密码"
 
-#: ../src/empathy-event-manager.c:1217
+#: ../src/empathy-event-manager.c:1216
 #, c-format
 msgid "%s would like permission to see when you are online"
 msgstr "%s 当您在线的时候可见"
 
-#: ../src/empathy-event-manager.c:1223
+#: ../src/empathy-event-manager.c:1222
 #, c-format
 msgid ""
 "\n"
@@ -3921,26 +3778,30 @@ msgstr "文件传输"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "从列表移除已完成、已取消及已失败的文件传输"
 
-#: ../src/empathy-import-dialog.c:84
+#: ../src/empathy-import-dialog.c:76
+msgid "_Import"
+msgstr "导入(_I)"
+
+#: ../src/empathy-import-dialog.c:88
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "未找到可导入的帐号。Empathy 目前只能支持从 Pidgin 导入帐号。"
 
-#: ../src/empathy-import-dialog.c:199
+#: ../src/empathy-import-dialog.c:209
 msgid "Import Accounts"
 msgstr "导入帐号"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:315
+#: ../src/empathy-import-widget.c:316
 msgid "Import"
 msgstr "导入"
 
-#: ../src/empathy-import-widget.c:324
+#: ../src/empathy-import-widget.c:325
 msgid "Protocol"
 msgstr "协议"
 
-#: ../src/empathy-import-widget.c:348
+#: ../src/empathy-import-widget.c:349
 msgid "Source"
 msgstr "源"
 
@@ -4130,6 +3991,11 @@ msgstr ""
 
 #: ../src/empathy-new-chatroom-dialog.c:639
 #: ../src/empathy-new-chatroom-dialog.c:640
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:639
+#: ../src/empathy-new-chatroom-dialog.c:640
 msgid "No"
 msgstr "否"
 
@@ -4466,63 +4332,84 @@ msgstr "启用相机，并发送视频"
 msgid "Contact Map View"
 msgstr "联系地图视图"
 
-#: ../src/empathy-debug-window.c:1228
+#: ../src/empathy-debug-window.c:1607
 msgid "Save"
 msgstr "保存"
 
-#: ../src/empathy-debug-window.c:1435
+#: ../src/empathy-debug-window.c:1667
+msgid "Pastebin link"
+msgstr "Pastebin 链接"
+
+#: ../src/empathy-debug-window.c:1676
+msgid "Pastebin response"
+msgstr "Pastebin 响应"
+
+#: ../src/empathy-debug-window.c:1680
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: ../src/empathy-debug-window.c:1683
+msgid "Data too large for a single paste. Please save logs to file."
+msgstr "一次粘贴的数据太多。请把日志保存到文件。"
+
+#: ../src/empathy-debug-window.c:1912
 msgid "Debug Window"
 msgstr "调试窗口"
 
-#: ../src/empathy-debug-window.c:1517
+#: ../src/empathy-debug-window.c:1970
+msgid "Send to pastebin"
+msgstr "发送到 pastebin"
+
+#: ../src/empathy-debug-window.c:2009
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/empathy-debug-window.c:1529
+#: ../src/empathy-debug-window.c:2021
 msgid "Level "
 msgstr "级别 "
 
-#: ../src/empathy-debug-window.c:1549
+#: ../src/empathy-debug-window.c:2040
 msgid "Debug"
 msgstr "调试"
 
-#: ../src/empathy-debug-window.c:1555
+#: ../src/empathy-debug-window.c:2045
 msgid "Info"
 msgstr "信息"
 
-#: ../src/empathy-debug-window.c:1561 ../src/empathy-debug-window.c:1610
+#: ../src/empathy-debug-window.c:2050 ../src/empathy-debug-window.c:2096
 msgid "Message"
 msgstr "消息"
 
-#: ../src/empathy-debug-window.c:1567
+#: ../src/empathy-debug-window.c:2055
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:1573
+#: ../src/empathy-debug-window.c:2060
 msgid "Critical"
 msgstr "危急"
 
-#: ../src/empathy-debug-window.c:1579
+#: ../src/empathy-debug-window.c:2065
 msgid "Error"
 msgstr "错误"
 
-#: ../src/empathy-debug-window.c:1598
+#: ../src/empathy-debug-window.c:2084
 msgid "Time"
 msgstr "时间"
 
-#: ../src/empathy-debug-window.c:1601
+#: ../src/empathy-debug-window.c:2087
 msgid "Domain"
 msgstr "域"
 
-#: ../src/empathy-debug-window.c:1603
+#: ../src/empathy-debug-window.c:2089
 msgid "Category"
 msgstr "类别"
 
-#: ../src/empathy-debug-window.c:1605
+#: ../src/empathy-debug-window.c:2091
 msgid "Level"
 msgstr "级别"
 
-#: ../src/empathy-debug-window.c:1642
+#: ../src/empathy-debug-window.c:2114
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -4541,33 +4428,29 @@ msgstr "选择一个联系人以加入该会话："
 msgid "Invite"
 msgstr "邀请"
 
-#: ../src/empathy-accounts.c:183
+#: ../src/empathy-accounts.c:180
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "不显示任何对话框；完成所有工作（如导入）然后退出"
 
-#: ../src/empathy-accounts.c:187
+#: ../src/empathy-accounts.c:184
 msgid ""
 "Don't display any dialogs unless there are only \"People Nearby\" accounts"
 msgstr "只有“附近的人”帐号的时候不显示任何对话框"
 
 # lainme：初次选择给定的帐号(比如 gabble/jabber/foo_40example_2eorg0)
-#: ../src/empathy-accounts.c:191
+#: ../src/empathy-accounts.c:188
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
 msgstr "首先选择给定帐号(如 gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:193
+#: ../src/empathy-accounts.c:190
 msgid "<account-id>"
 msgstr "<帐号 ID>"
 
-#: ../src/empathy-accounts.c:196
-msgid "Show account assistant"
-msgstr "显示帐号助手"
-
-#: ../src/empathy-accounts.c:202
+#: ../src/empathy-accounts.c:195
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帐号"
 
-#: ../src/empathy-accounts.c:238
+#: ../src/empathy-accounts.c:231
 msgid "Empathy Accounts"
 msgstr "Empathy 帐号"
 
@@ -4587,81 +4470,81 @@ msgstr "Empathy 调试器"
 msgid "- Empathy Chat Client"
 msgstr " - Empathy IM 客户端"
 
-#: ../src/empathy-notifications-approver.c:190
+#: ../src/empathy-notifications-approver.c:189
 msgid "Respond"
 msgstr "响应"
 
-#: ../src/empathy-notifications-approver.c:204
-#: ../src/empathy-call-window.c:1572
+#: ../src/empathy-notifications-approver.c:203
+#: ../src/empathy-call-window.c:1529
 msgid "Reject"
 msgstr "拒绝"
 
-#: ../src/empathy-notifications-approver.c:209
-#: ../src/empathy-notifications-approver.c:214
-#: ../src/empathy-call-window.c:1573
+#: ../src/empathy-notifications-approver.c:208
+#: ../src/empathy-notifications-approver.c:213
+#: ../src/empathy-call-window.c:1530
 msgid "Answer"
 msgstr "接听"
 
-#: ../src/empathy-notifications-approver.c:214
+#: ../src/empathy-notifications-approver.c:213
 msgid "Answer with video"
 msgstr "以视频应答"
 
-#: ../src/empathy-notifications-approver.c:222
-#: ../src/empathy-notifications-approver.c:232
+#: ../src/empathy-notifications-approver.c:221
+#: ../src/empathy-notifications-approver.c:231
 msgid "Decline"
 msgstr "拒绝"
 
-#: ../src/empathy-notifications-approver.c:226
-#: ../src/empathy-notifications-approver.c:237
+#: ../src/empathy-notifications-approver.c:225
+#: ../src/empathy-notifications-approver.c:236
 msgid "Accept"
 msgstr "接受"
 
 #. translators: the 'Provide' button is displayed in a notification
 #. * bubble when Empathy is asking for an account password; clicking on it
 #. * brings the password popup.
-#: ../src/empathy-notifications-approver.c:247
+#: ../src/empathy-notifications-approver.c:246
 msgid "Provide"
 msgstr "提供"
 
-#: ../src/empathy-call-observer.c:134
+#: ../src/empathy-call-observer.c:132
 #, c-format
 msgid "%s just tried to call you, but you were in another call."
 msgstr "%s 刚刚尝试呼叫您，但您当时正在与其他人通话。"
 
 #. Translators: this is an "Info" label. It should be as short
 #. * as possible.
-#: ../src/empathy-call-window.c:1179 ../src/empathy-call-window.c:1202
+#: ../src/empathy-call-window.c:1136 ../src/empathy-call-window.c:1159
 msgid "i"
 msgstr "i"
 
-#: ../src/empathy-call-window.c:2936
+#: ../src/empathy-call-window.c:2883
 msgid "On hold"
 msgstr "挂起"
 
-#: ../src/empathy-call-window.c:2939
+#: ../src/empathy-call-window.c:2886
 msgid "Mute"
 msgstr "静音"
 
-#: ../src/empathy-call-window.c:2941
+#: ../src/empathy-call-window.c:2888
 msgid "Duration"
 msgstr "时长"
 
 #. Translators: 'status - minutes:seconds' the caller has been connected
-#: ../src/empathy-call-window.c:2944
+#: ../src/empathy-call-window.c:2891
 #, c-format
 msgid "%s — %d:%02dm"
 msgstr "%s — %d:%02dm"
 
-#: ../src/empathy-call-window.c:3214
+#: ../src/empathy-call-window.c:3161
 #, c-format
 msgid "Your current balance is %s."
 msgstr "您当前的余额为 %s。"
 
-#: ../src/empathy-call-window.c:3218
+#: ../src/empathy-call-window.c:3165
 msgid "Sorry, you don’t have enough credit for that call."
 msgstr "对不起，您信用卡余额不足以支付此次通话。"
 
-#: ../src/empathy-call-window.c:3220
+#: ../src/empathy-call-window.c:3167
 msgid "Top Up"
 msgstr "充值"
 
@@ -4669,10 +4552,143 @@ msgstr "充值"
 msgid "_Match case"
 msgstr "区分大小写(_M)"
 
+#: ../libempathy-gtk/empathy-new-account-dialog.c:144
+msgid "What kind of chat account do you have?"
+msgstr "您已经拥有哪个类型的帐号？"
+
 #: ../libempathy-gtk/empathy-new-account-dialog.c:166
 msgid "Adding new account"
 msgstr "添加新帐号"
 
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:77
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:150
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct."
+msgstr ""
+"Empathy 可以自动发现和您连接到同一个网络中的人们，并且可以和他们聊天。如果您"
+"想使用这个功能，请仔细查看下列信息是否正确。"
+
+#: ../libempathy-gtk/empathy-local-xmpp-assistant-widget.c:183
+msgid ""
+"You can change these details later or disable this feature by choosing <span "
+"style=\"italic\">Edit → Accounts</span> in the Contact List."
+msgstr ""
+"您可以在以后修改这些详细信息或通过在联系人列表中选择<span style=\"italic\">编"
+"辑 → 帐号</span>来禁用这一功能。"
+
+#~ msgid "There was an error while importing the accounts."
+#~ msgstr "导入帐号时发生错误。"
+
+#~ msgid "There was an error while parsing the account details."
+#~ msgstr "在解析帐号详情时出现错误。"
+
+#~ msgid "There was an error while creating the account."
+#~ msgstr "在创建帐号时出现错误。"
+
+#~ msgid "There was an error."
+#~ msgstr "发生错误。"
+
+#~ msgid "The error message was: %s"
+#~ msgstr "错误信息为：%s"
+
+#~ msgid ""
+#~ "You can either go back and try to enter your accounts' details again or "
+#~ "quit this assistant and add accounts later from the Edit menu."
+#~ msgstr ""
+#~ "您可以返回尝试重新输入您的帐号信息，或者退出助理，然后从编辑菜单中加入帐"
+#~ "号。"
+
+#~ msgid "An error occurred"
+#~ msgstr "发生错误"
+
+#~ msgid "Do you have any other chat accounts you want to set up?"
+#~ msgstr "您还要设置其它聊天帐号吗？"
+
+#~ msgid "Enter your account details"
+#~ msgstr "输入您的帐号详情"
+
+#~ msgid "What kind of chat account do you want to create?"
+#~ msgstr "您想创建那种类型的帐号？"
+
+#~ msgid "Do you want to create other chat accounts?"
+#~ msgstr "您想要创建其它的聊天帐号吗、"
+
+#~ msgid "Enter the details for the new account"
+#~ msgstr "输入新帐号的详细资料"
+
+#~ msgid ""
+#~ "With Empathy you can chat with people online nearby and with friends and "
+#~ "colleagues who use Google Talk, AIM, Windows Live and many other chat "
+#~ "programs. With a microphone or a webcam you can also have audio or video "
+#~ "calls."
+#~ msgstr ""
+#~ "使用 Empathy，您可以与附近的朋友聊天，还可以与使用 Google Talk，AIM，"
+#~ "Windows Live 和许多其它聊天软件的朋友和同事聊天。使用麦克风或摄像头，您就"
+#~ "可以开始音频和视频通话。"
+
+#~ msgid "Do you have an account you've been using with another chat program?"
+#~ msgstr "您有没有其它聊天软件的帐号？"
+
+#~ msgid "Yes, import my account details from "
+#~ msgstr "有，请导入我的帐号信息"
+
+#~ msgid "Yes, I'll enter my account details now"
+#~ msgstr "有，我现在就输入我的帐号信息"
+
+#~ msgid "No, I want a new account"
+#~ msgstr "不，我想要一个新的帐号"
+
+#~ msgid "No, I just want to see people online nearby for now"
+#~ msgstr "没有，我只是想看看附近现在谁在线上"
+
+#~ msgid "Select the accounts you want to import:"
+#~ msgstr "选择您要导入的帐号："
+
+#~ msgid "No, that's all for now"
+#~ msgstr "没有，就这样吧"
+
+#~ msgid "Edit->Accounts"
+#~ msgstr "编辑->帐号"
+
+#~ msgid "I do _not want to enable this feature for now"
+#~ msgstr "暂不启用此特性(_N)"
+
+#~ msgid ""
+#~ "You won't be able to chat with people connected to your local network, as "
+#~ "telepathy-salut is not installed. If you want to enable this feature, "
+#~ "please install the telepathy-salut package and create a People Nearby "
+#~ "account from the Accounts dialog"
+#~ msgstr ""
+#~ "您无法同连接到您局域网中的用户聊天，因为没有安装 telepathy-salut。如果您想"
+#~ "启用该功能，请安装 telepathy-salut 包，并且在帐号对话框中创建附近的人"
+#~ "(People Nearby)帐号"
+
+#~ msgid "telepathy-salut not installed"
+#~ msgstr "telepathy-salut 未安装"
+
+#~ msgid "Messaging and VoIP Accounts Assistant"
+#~ msgstr "消息和 VoIP 帐号助手"
+
+#~ msgid "Welcome to Empathy"
+#~ msgstr "欢迎使用 Empathy"
+
+#~ msgid "Import your existing accounts"
+#~ msgstr "导入现有帐号"
+
+#~ msgid "Please enter personal details"
+#~ msgstr "请输入个人信息"
+
+#~ msgid "Protocol:"
+#~ msgstr "协议："
+
+#~ msgid "Show account assistant"
+#~ msgstr "显示帐号助手"
+
 #~ msgid "Socket type not supported"
 #~ msgstr "不支持 Socket 类型"