Update Simplified Chinese help translation.

1 files changed, 523 insertions, 293 deletions

diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index dfdb922ed..645d667db 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the empathy package.
 # Lavande  <lavande@thislove.cz.cc>, 2010
 # Tao Wang <dancefire@gmail.com>, 2010
+# lainme <lainme993@gmail.com>, 2011
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
-"POT-Creation-Date: 2010-07-13 11:44+0000\n"
-"PO-Revision-Date: 2010-07-14 16:35+1000\n"
-"Last-Translator: Tao Wang <dancefire@gmail.com>\n"
+"POT-Creation-Date: 2011-07-11 12:41+0000\n"
+"PO-Revision-Date: 2011-07-11 20:40+0800\n"
+"Last-Translator: lainme <lainme993@gmail.com>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,8 +19,8 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/video-call.page:45(None) C/video-call.page:63(None)
-#: C/audio-video.page:70(None) C/audio-call.page:65(None)
+#: C/video-call.page:38(None) C/audio-video.page:70(None)
+#: C/audio-call.page:36(None)
 msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
 msgstr ""
 "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
@@ -34,18 +35,19 @@ msgstr "向您的联系人发起视频会话。"
 #: C/remove-account.page:18(name) C/prob-conn-neterror.page:18(name)
 #: C/prob-conn-name.page:17(name) C/prob-conn-auth.page:21(name)
 #: C/prob-conn-acctdisabled.page:18(name) C/prev-conv.page:16(name)
-#: C/irc-start-conversation.page:15(name) C/irc-send-file.page:16(name)
-#: C/irc-nick-password.page:18(name) C/irc-manage.page:19(name)
-#: C/irc-join-room.page:16(name) C/irc-join-pwd.page:17(name)
-#: C/irc-commands.page:10(name) C/introduction.page:13(name)
-#: C/index.page:18(name) C/import-account.page:23(name)
-#: C/hide-contacts.page:11(name) C/group-conversations.page:19(name)
-#: C/geolocation-what-is.page:18(name) C/geolocation-turn.page:18(name)
-#: C/geolocation-supported.page:16(name) C/geolocation-privacy.page:17(name)
-#: C/geolocation-not-showing.page:17(name) C/geolocation.page:17(name)
-#: C/favorite-rooms.page:14(name) C/disable-account.page:20(name)
-#: C/create-account.page:18(name) C/audio-video.page:17(name)
-#: C/audio-call.page:18(name) C/add-account.page:20(name)
+#: C/link-contacts.page:15(name) C/irc-start-conversation.page:15(name)
+#: C/irc-send-file.page:16(name) C/irc-nick-password.page:18(name)
+#: C/irc-manage.page:19(name) C/irc-join-room.page:16(name)
+#: C/irc-join-pwd.page:17(name) C/irc-commands.page:10(name)
+#: C/introduction.page:13(name) C/index.page:19(name)
+#: C/import-account.page:23(name) C/hide-contacts.page:11(name)
+#: C/group-conversations.page:19(name) C/geolocation-what-is.page:18(name)
+#: C/geolocation-turn.page:18(name) C/geolocation-supported.page:16(name)
+#: C/geolocation-privacy.page:17(name) C/geolocation-not-showing.page:17(name)
+#: C/geolocation.page:17(name) C/favorite-rooms.page:14(name)
+#: C/disable-account.page:20(name) C/create-account.page:19(name)
+#: C/audio-video.page:17(name) C/audio-call.page:19(name)
+#: C/add-account.page:20(name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
@@ -55,52 +57,59 @@ msgstr "Milo Casagrande"
 #: C/remove-account.page:19(email) C/prob-conn-neterror.page:19(email)
 #: C/prob-conn-name.page:18(email) C/prob-conn-auth.page:22(email)
 #: C/prob-conn-acctdisabled.page:19(email) C/prev-conv.page:17(email)
-#: C/irc-start-conversation.page:16(email) C/irc-send-file.page:17(email)
-#: C/irc-nick-password.page:19(email) C/irc-manage.page:20(email)
-#: C/irc-join-room.page:17(email) C/irc-join-pwd.page:18(email)
-#: C/irc-commands.page:11(email) C/introduction.page:14(email)
-#: C/index.page:19(email) C/import-account.page:24(email)
-#: C/hide-contacts.page:12(email) C/group-conversations.page:20(email)
-#: C/geolocation-what-is.page:19(email) C/geolocation-turn.page:19(email)
-#: C/geolocation-supported.page:17(email) C/geolocation-privacy.page:18(email)
+#: C/link-contacts.page:16(email) C/irc-start-conversation.page:16(email)
+#: C/irc-send-file.page:17(email) C/irc-nick-password.page:19(email)
+#: C/irc-manage.page:20(email) C/irc-join-room.page:17(email)
+#: C/irc-join-pwd.page:18(email) C/irc-commands.page:11(email)
+#: C/introduction.page:14(email) C/index.page:20(email)
+#: C/import-account.page:24(email) C/hide-contacts.page:12(email)
+#: C/group-conversations.page:20(email) C/geolocation-what-is.page:19(email)
+#: C/geolocation-turn.page:19(email) C/geolocation-supported.page:17(email)
+#: C/geolocation-privacy.page:18(email)
 #: C/geolocation-not-showing.page:18(email) C/geolocation.page:18(email)
 #: C/favorite-rooms.page:15(email) C/disable-account.page:21(email)
-#: C/create-account.page:19(email) C/audio-video.page:18(email)
-#: C/audio-call.page:19(email) C/add-account.page:21(email)
+#: C/create-account.page:20(email) C/audio-video.page:18(email)
+#: C/audio-call.page:20(email) C/add-account.page:21(email)
 msgid "milo@ubuntu.com"
 msgstr "milo@ubuntu.com"
 
 #: C/video-call.page:25(p) C/status-icons.page:24(p)
 #: C/share-desktop.page:17(p) C/set-custom-status.page:23(p)
-#: C/send-message.page:20(p) C/send-file.page:25(p)
+#: C/send-message.page:21(p) C/send-file.page:25(p)
 #: C/salut-protocol.page:22(p) C/remove-account.page:22(p)
 #: C/prob-conn.page:18(p) C/prob-conn-neterror.page:22(p)
 #: C/prob-conn-name.page:21(p) C/prob-conn-auth.page:25(p)
 #: C/prob-conn-acctdisabled.page:22(p) C/prev-conv.page:24(p)
-#: C/irc-start-conversation.page:19(p) C/irc-send-file.page:20(p)
-#: C/irc-nick-password.page:22(p) C/irc-manage.page:23(p)
-#: C/irc-join-room.page:20(p) C/irc-join-pwd.page:21(p)
-#: C/irc-commands.page:14(p) C/introduction.page:17(p) C/index.page:22(p)
-#: C/import-account.page:31(p) C/hide-contacts.page:15(p)
-#: C/group-conversations.page:23(p) C/geolocation-what-is.page:22(p)
-#: C/geolocation-turn.page:22(p) C/geolocation-supported.page:20(p)
-#: C/geolocation-privacy.page:21(p) C/geolocation-not-showing.page:21(p)
-#: C/geolocation.page:21(p) C/favorite-rooms.page:18(p)
-#: C/disable-account.page:28(p) C/create-account.page:22(p)
-#: C/change-status.page:23(p) C/audio-video.page:21(p) C/audio-call.page:22(p)
-#: C/add-contact.page:22(p) C/add-account.page:28(p)
-#: C/accounts-window.page:22(p) C/account-jabber.page:18(p)
-#: C/account-irc.page:20(p)
+#: C/link-contacts.page:19(p) C/irc-start-conversation.page:19(p)
+#: C/irc-send-file.page:20(p) C/irc-nick-password.page:22(p)
+#: C/irc-manage.page:23(p) C/irc-join-room.page:20(p)
+#: C/irc-join-pwd.page:21(p) C/irc-commands.page:14(p)
+#: C/introduction.page:17(p) C/index.page:23(p) C/import-account.page:31(p)
+#: C/hide-contacts.page:15(p) C/group-conversations.page:23(p)
+#: C/geolocation-what-is.page:22(p) C/geolocation-turn.page:22(p)
+#: C/geolocation-supported.page:20(p) C/geolocation-privacy.page:21(p)
+#: C/geolocation-not-showing.page:21(p) C/geolocation.page:21(p)
+#: C/favorite-rooms.page:18(p) C/disable-account.page:28(p)
+#: C/create-account.page:23(p) C/change-status.page:23(p)
+#: C/audio-video.page:21(p) C/audio-call.page:23(p) C/add-contact.page:22(p)
+#: C/add-account.page:28(p) C/accounts-window.page:22(p)
+#: C/account-jabber.page:18(p) C/account-irc.page:20(p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "知识共享-相同方式共享 (Creative Commons Share Alike) 3.0"
 
-#: C/video-call.page:35(title)
+#: C/video-call.page:28(title)
 msgid "Start a video conversation"
 msgstr "发起视频会话"
 
-#: C/video-call.page:37(p)
+#: C/video-call.page:30(p)
+#, fuzzy
+#| msgid ""
+#| "If you have a webcam, you can call your contacts and have an video "
+#| "conversation with them. This features only works with certain types of "
+#| "accounts, and it requires the other person to have an application that "
+#| "supports video calls."
 msgid ""
-"If you have a webcam, you can call your contacts and have an video "
+"If you have a webcam, you can call your contacts and have a video "
 "conversation with them. This features only works with certain types of "
 "accounts, and it requires the other person to have an application that "
 "supports video calls."
@@ -108,67 +117,111 @@ msgstr ""
 "如果您有网络摄像头，您可以呼叫您的联系人并和他们进行视频会话。此功能仅可用于"
 "特定类型的帐号，并需要对方也安装了支持视频呼叫的程序。"
 
-#: C/video-call.page:44(p)
+#: C/video-call.page:37(p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#| "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+#| "next to the name of the contact you wish to call and choose <gui style="
+#| "\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
+#| "choose <gui style=\"menuitem\">Video Call</gui>."
 msgid ""
 "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
 "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
 "next to the name of the contact you wish to call and choose <gui style="
-"\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
-"choose <gui style=\"menuitem\">Video Call</gui>."
+"\"menuitem\">Video Call</gui>."
 msgstr ""
 "在<gui>联系人列表</gui>窗口，点击您想呼叫的联系人的名字旁的<media type="
 "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media>"
 "图标并选择<gui style=\"menuitem\">视频呼叫</gui>。同样，也可以右击联系人并选"
 "择<gui style=\"menuitem\">视频呼叫</gui>。"
 
-#: C/video-call.page:50(p) C/audio-call.page:52(p)
+#: C/video-call.page:43(p) C/audio-call.page:42(p)
 msgid ""
 "A new window will open. When the connection is established, you will see "
 "<gui>Connected</gui> at the bottom of the window, along with the total "
 "conversation time."
 msgstr ""
-"连接建立后，会打开新的窗口，您将在窗口底部看见<gui>已连接</gui>，以及总对话时"
+"连接建立后，会打开新的窗口，您将在窗口底部看见<gui>已连接</gui>，以及总会话时"
 "间。"
 
-#: C/video-call.page:55(p) C/audio-call.page:57(p)
+#: C/video-call.page:48(p) C/audio-call.page:48(p)
 msgid "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgstr "点击<gui style=\"button\">挂断</gui>以结束会话。"
 
-#: C/video-call.page:61(p)
+#: C/video-call.page:54(p)
+#, fuzzy
+#| msgid ""
+#| "To turn a video conversation into an audio conversation, choose "
+#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</"
+#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
+#| "\"figures/camera-web.png\">video call</media> toolbar button to deselect "
+#| "it."
 msgid ""
 "To turn a video conversation into an audio conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>, "
-"or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
-"web.png\">video call</media> toolbar button to deselect it."
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
 msgstr ""
 "要将视频会话转为音频会话，则选择<guiseq><gui style=\"menu\">视频</gui><gui "
 "style=\"menuitem\">关闭视频</gui></guiseq>，或者点击工具栏上的<media type="
 "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media>"
 "按钮以取消选择。"
 
+#: C/video-call.page:60(title)
+#, fuzzy
+#| msgid "Start a video conversation with one of your contacts."
+msgid "Start a video conversation with a meta-contact"
+msgstr "向您的联系人发起视频会话。"
+
+#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click on the drop-down list at "
+#| "the top."
+msgid ""
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "从 <gui>联系人列表</gui> 窗口，点击顶部的下拉菜单。"
+
+#: C/video-call.page:68(p)
+#, fuzzy
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
+msgstr "右键点击您想要进行交谈的联系人的名字，然后选择 <gui>聊天</gui>"
+
+#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+msgid ""
+"To recognize if a contact is a <em>meta-contact</em>, move your mouse on a "
+"contact in the <gui>Contact List</gui> window, and stop over it for a "
+"second: a small pop-up message will appear showing the number of the "
+"contacts that form the meta-contact."
+msgstr ""
+
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:39(None)
-msgid "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
-msgstr "@@image: 'figures/available.png'; md5=1952a8952efbe87e84b21e09e0587e71"
+msgid "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
+msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:45(None)
-msgid "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
-msgstr "@@image: 'figures/busy.png'; md5=6cab57171fb6d732a85ace48f11cf207"
+msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:53(None)
-msgid "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
-msgstr "@@image: 'figures/away.png'; md5=9a93ccca527af39cbe11db5c9d915ca0"
+msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
+msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/status-icons.page:62(None) C/status-icons.page:69(None)
-msgid "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
-msgstr "@@image: 'figures/offline.png'; md5=565ba82fbedd22e4eb5b810750199527"
+msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
 
 #: C/status-icons.page:7(desc)
 msgid "Understanding the various statuses and status icons."
@@ -304,7 +357,7 @@ msgstr ""
 "为了能够共享您的桌面或者远程使用您联系人的桌面，需要在您的系统中安装远程桌面"
 "查看应用程序。"
 
-#: C/share-desktop.page:46(p) C/send-message.page:35(p) C/send-file.page:40(p)
+#: C/share-desktop.page:46(p) C/send-file.page:40(p)
 #: C/favorite-rooms.page:66(p)
 msgid "From the <gui>Contact List</gui> window, perform one of the following:"
 msgstr "从 <gui>联系人列表</gui> 窗口，执行下列操作中的一个："
@@ -499,37 +552,35 @@ msgstr ""
 msgid "Send a message to one of your contacts."
 msgstr "发送消息给一个您的联系人。"
 
-#: C/send-message.page:16(name) C/send-file.page:17(name)
+#: C/send-message.page:17(name) C/send-file.page:17(name)
 #: C/prob-conn.page:14(name) C/prob-conn-neterror.page:14(name)
 #: C/prob-conn-auth.page:17(name) C/prob-conn-acctdisabled.page:14(name)
 #: C/change-status.page:19(name) C/add-contact.page:18(name)
 msgid "Phil Bull"
 msgstr "Phil Bull"
 
-#: C/send-message.page:17(email) C/send-file.page:18(email)
+#: C/send-message.page:18(email) C/send-file.page:18(email)
 #: C/prob-conn.page:15(email) C/prob-conn-neterror.page:15(email)
 #: C/prob-conn-auth.page:18(email) C/prob-conn-acctdisabled.page:15(email)
 #: C/change-status.page:20(email) C/add-contact.page:19(email)
 msgid "philbull@gmail.com"
 msgstr "philbull@gmail.com"
 
-#: C/send-message.page:31(title)
+#: C/send-message.page:32(title)
 msgid "Send a message to someone"
 msgstr "发送一条消息给某人"
 
-#: C/send-message.page:40(p)
+#: C/send-message.page:36(p)
+#, fuzzy
+#| msgid ""
+#| "Double click the name of the contact that you want to have a conversation "
+#| "with."
 msgid ""
-"Double click the name of the contact that you want to have a conversation "
-"with."
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
 msgstr "双击您想要进行交谈的联系人的名字。"
 
-#: C/send-message.page:46(p)
-msgid ""
-"Right-click on the name of the contact you want to have a conversation with, "
-"and choose <gui>Chat</gui>."
-msgstr "右键点击您想要进行交谈的联系人的名字，然后选择 <gui>聊天</gui>"
-
-#: C/send-message.page:54(p)
+#: C/send-message.page:42(p)
 msgid ""
 "A new window will open. Type a message into the box at the bottom of the "
 "window and press <key>Enter</key> to send it."
@@ -537,6 +588,22 @@ msgstr ""
 "这时会打开一个新的窗口。在窗口底部的文本框中输入一条消息，然后按<key>回车键</"
 "key>来发送。"
 
+#: C/send-message.page:50(title)
+#, fuzzy
+#| msgid "Send a message to someone"
+msgid "Send a message to a meta-contact"
+msgstr "发送一条消息给某人"
+
+#: C/send-message.page:58(p)
+#, fuzzy
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
+msgstr "右键点击您想要进行交谈的联系人的名字，然后选择 <gui>聊天</gui>"
+
 #: C/send-file.page:8(desc)
 msgid "Send a file from your computer to one of your contacts."
 msgstr "从您的计算机上发送一个文件至您的联系人。"
@@ -714,11 +781,11 @@ msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
 msgid ""
 "An error message which says “<gui>Network error</gui>” appears in the main "
 "window."
-msgstr ""
+msgstr "一个显示“<gui>网络错误</gui>”的信息显示在主窗口中。"
 
 #: C/prob-conn-neterror.page:33(title)
 msgid "I get a message that says “Network error”"
-msgstr ""
+msgstr "我收到“网络错误”的信息"
 
 #: C/prob-conn-neterror.page:36(cite)
 msgid "shaunm"
@@ -735,18 +802,19 @@ msgid ""
 "This kind of error happens when <app>Empathy</app> cannot communicate with "
 "the instant messaging service for some reason."
 msgstr ""
+"这种错误在 <app>Empathy</app> 由于某种原因而无法和即时通讯服务器连上时出现。"
 
 #: C/prob-conn-neterror.page:45(p)
 msgid ""
 "Also, this kind of error happens when you try to use an IRC account without "
 "setting a nickname."
-msgstr ""
+msgstr "此外，这种错误也在您试图不设置昵称而使用 IRC 账户时出现。"
 
 #: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
 #: C/prob-conn-acctdisabled.page:43(p)
 msgid ""
 "Make sure that you are connected to the Internet, or to a local area network."
-msgstr ""
+msgstr "确保您已经连接到互联网，或者一个本地网络。"
 
 #: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
 #: C/prob-conn-auth.page:57(p)
@@ -754,6 +822,8 @@ msgid ""
 "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
 "\">edit</media> icon in the error message."
 msgstr ""
+"点击错误信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/gtk-"
+"edit.png\">编辑</media>图标。"
 
 #: C/prob-conn-neterror.page:65(p) C/prob-conn-acctdisabled.page:59(p)
 msgid ""
@@ -761,35 +831,37 @@ msgid ""
 "You should be able to find these details from the website of the messaging "
 "service."
 msgstr ""
+"检查<gui>高级</gui>选项卡中是否所有细节都是正确的。您可以从即时通讯服务商的网"
+"站上找到这些信息。"
 
 #: C/prob-conn-neterror.page:82(p) C/prob-conn-auth.page:68(p)
 msgid ""
 "Deselect the <gui>Enabled</gui>, and then select it again to try to "
 "reconnect to the service."
-msgstr ""
+msgstr "取消选择<gui>已启用</gui>，然后再次选中以重新连接到服务器。"
 
 #: C/prob-conn-neterror.page:90(title)
 msgid "Proxy support"
-msgstr ""
+msgstr "代理支持"
 
 #: C/prob-conn-neterror.page:91(p)
 msgid ""
 "At the moment <app>Empathy</app> can not be configured to work with a proxy."
-msgstr ""
+msgstr "目前 <app>Empathy</app> 无法在代理下工作。"
 
 #: C/prob-conn-name.page:9(title)
 msgid "“Name in use”"
-msgstr ""
+msgstr "“用户名已经被占用”"
 
 #: C/prob-conn-name.page:10(desc)
 msgid ""
 "An error message which says “<gui>Name in use</gui>” appears in the main "
 "window."
-msgstr ""
+msgstr "一个显示“<gui>用户名已经被占用</gui>”的信息显示在主窗口中。"
 
 #: C/prob-conn-name.page:32(title)
 msgid "I get a message that says “Name in use”"
-msgstr ""
+msgstr "我收到“用户名已经被占用”的信息"
 
 #: C/prob-conn-name.page:34(p)
 msgid ""
@@ -797,10 +869,12 @@ msgid ""
 "you are using a nickname that is already being used by someone else on that "
 "particular network."
 msgstr ""
+"这种错误出现在您尝试连接到 IRC 账户，然而您使用的昵称正在被该网络上其他人使用"
+"的情况下。"
 
 #: C/prob-conn-name.page:50(p)
 msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr ""
+msgstr "在<gui>昵称</gui>文本框中，输入一个新昵称。"
 
 #: C/prob-conn-name.page:55(p)
 msgid ""
@@ -808,22 +882,25 @@ msgid ""
 "the password for that nickname. For more information, see <link xref=\"irc-"
 "nick-password\"/>."
 msgstr ""
+"如果您已经在所用的网路中注册了昵称，请为该昵称设置密码。更多信息参见 <link "
+"xref=\"irc-nick-password\"/>。"
 
 #: C/prob-conn-name.page:64(p)
 msgid ""
 "Deselect the <gui>Enabled</gui> check-box next to the name of your account, "
 "and then select it again to try to reconnect to the service."
 msgstr ""
+"取消选择账户旁边的<gui>已启用</gui>选框，然后再次选中以重新连接到服务器。"
 
 #: C/prob-conn-auth.page:8(desc)
 msgid ""
 "An error message which says “<gui>Authentication failed</gui>” appears in "
 "the main window."
-msgstr ""
+msgstr "一个显示“<gui>验证失败</gui>”的信息显示在主窗口中。"
 
 #: C/prob-conn-auth.page:36(title)
 msgid "I get a message that says “Authentication failed”"
-msgstr ""
+msgstr "我收到“验证失败”的信息"
 
 #: C/prob-conn-auth.page:38(p)
 msgid ""
@@ -831,6 +908,8 @@ msgid ""
 "allowing you to connect because it does not recognize your username or "
 "password for some reason."
 msgstr ""
+"这种错误是由于您的即时通信服务器不允许您连接，由于某种原因，它不识别您的用户"
+"名或者密码。"
 
 #: C/prob-conn-auth.page:50(p)
 msgid ""
@@ -838,21 +917,23 @@ msgid ""
 "trying to connect to. If you do not have an account, most services will not "
 "allow you to connect."
 msgstr ""
+"确保您已经在要连接的服务上注册了账户。如果没有账户，多数服务都不会允许您连"
+"接。"
 
 #: C/prob-conn-auth.page:63(p) C/prob-conn-acctdisabled.page:54(p)
 msgid ""
 "Type your username and password again to make sure that they are correct."
-msgstr ""
+msgstr "再次输入您的用户名和密码，以确保它们是正确的。"
 
 #: C/prob-conn-acctdisabled.page:7(desc)
 msgid ""
 "The instant messaging account that you want to use is not enabled in the "
 "list of accounts."
-msgstr ""
+msgstr "您要连接的即时通信账户没有在帐号列表中启用。"
 
 #: C/prob-conn-acctdisabled.page:33(title)
 msgid "My account is not enabled"
-msgstr ""
+msgstr "我的账户没有启用"
 
 #: C/prob-conn-acctdisabled.page:35(p)
 msgid ""
@@ -860,26 +941,31 @@ msgid ""
 "drop-down account list when you try to start a new conversation or join a "
 "room, your account details may not be correct."
 msgstr ""
+"如果当您尝试开始一个新会话或者加入房间时，要使用的即时聊天账户没有在下拉的账"
+"户列表中启用，您的账户信息可能不正确。"
 
 #: C/prob-conn-acctdisabled.page:48(p)
 msgid ""
 "Choose <guiseq><gui>Edit</gui><gui>Accounts</gui></guiseq> and select the "
 "account that is not working."
 msgstr ""
+"选择<guiseq><gui>编辑</gui><gui>账户</gui></guiseq>，再选择不工作的账户。"
 
 #: C/prob-conn-acctdisabled.page:65(p)
 msgid ""
 "Check that the <gui style=\"checkbox\">Enabled</gui> check-box is selected. "
 "If it is not, select the check-box to enable the account."
 msgstr ""
+"检查<gui style=\"checkbox\">已启用</gui>选框是否勾选。没有的勾选它已启用账"
+"户。"
 
 #: C/prev-conv.page:8(desc)
 msgid "Browse or search your previous conversations."
-msgstr ""
+msgstr "浏览或搜索您之前的会话。"
 
 #: C/prev-conv.page:35(title)
 msgid "View previous conversations"
-msgstr ""
+msgstr "查看之前的会话"
 
 #: C/prev-conv.page:39(p)
 msgid ""
@@ -897,22 +983,25 @@ msgid ""
 "your previous conversations</link> or <link xref=\"#browse\">browse previous "
 "conversations</link> by contact and date."
 msgstr ""
+"<app>Empathy</app> 自动保存您和联系人的所有文字会话。您可以<link xref="
+"\"#search\">搜索之前全部的会话</link>或者根据联系人和日期<link xref=\"#browse"
+"\">浏览之前的会话。"
 
 #: C/prev-conv.page:54(p)
 msgid ""
 "You do not need to be connected to the Internet to view and search your "
 "previous conversations."
-msgstr ""
+msgstr "您不需要连接到网络来查看和搜索您之前的会话。"
 
 #: C/prev-conv.page:61(title)
 msgid "Search previous conversations"
-msgstr ""
+msgstr "搜索之前的会话"
 
 #: C/prev-conv.page:63(p)
 msgid ""
 "You can perform a full-text search through all of your previous "
 "conversations."
-msgstr ""
+msgstr "您可以在之前的所有会话中进行全文搜索。"
 
 #: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
 msgid ""
@@ -920,10 +1009,12 @@ msgid ""
 "gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
 "<key>F3</key>."
 msgstr ""
+"从<gui>联系人列表</gui>窗口，选择<guiseq><gui>查看</gui><gui>以前的会话</"
+"gui></guiseq>。或者可以按<key>F3</key>键。"
 
 #: C/prev-conv.page:71(p)
 msgid "Select the <gui>Search</gui> tab."
-msgstr ""
+msgstr "选择<gui>搜索</gui>标签。"
 
 #: C/prev-conv.page:74(p)
 msgid ""
@@ -936,6 +1027,7 @@ msgid ""
 "Any conversations that matched your search terms will be shown in the list "
 "below the search field. By default, conversations are ordered by date."
 msgstr ""
+"任何符合搜索项的会话都会显示在搜索域下面的列表中。会话默认安装时间排序。"
 
 #: C/prev-conv.page:82(p)
 msgid ""
@@ -945,17 +1037,17 @@ msgstr ""
 
 #: C/prev-conv.page:89(title)
 msgid "Browse previous conversations"
-msgstr ""
+msgstr "浏览之前的会话"
 
 #: C/prev-conv.page:91(p)
 msgid ""
 "You can browse your previous conversations with your contacts or in chat "
 "rooms by date."
-msgstr ""
+msgstr "您可以按时间顺序浏览之前和联系人或在聊天室中的会话。"
 
 #: C/prev-conv.page:100(p)
 msgid "Select the <gui>Conversations</gui> tab."
-msgstr ""
+msgstr "选择<gui>会话</gui>标签。"
 
 #: C/prev-conv.page:103(p)
 msgid ""
@@ -991,47 +1083,140 @@ msgid ""
 "Conversations</gui> window will open with that contact already selected."
 msgstr ""
 
+#: C/link-contacts.page:11(desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr ""
+
+#: C/link-contacts.page:25(title)
+msgid "Combine and separate contacts"
+msgstr "合并和分割联系人"
+
+#: C/link-contacts.page:26(p)
+msgid ""
+"If one, or more, of your contacts has multiple accounts with different "
+"messaging services, you can combine these contacts into a single one."
+msgstr ""
+
+#: C/link-contacts.page:30(p)
+msgid ""
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
+msgstr ""
+
+#: C/link-contacts.page:34(p)
+msgid ""
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr ""
+
+#: C/link-contacts.page:40(p)
+msgid "janes@facebook"
+msgstr "janes@facebook"
+
+#: C/link-contacts.page:45(p)
+msgid "jane.smith@gmail"
+msgstr "jane.smith@gmail"
+
+#: C/link-contacts.page:50(p)
+msgid "jane_smith@hotmail"
+msgstr "jane_smith@hotmail"
+
+#: C/link-contacts.page:55(p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr ""
+
+#: C/link-contacts.page:60(title)
+msgid "Combining contacts"
+msgstr "合并联系人"
+
+#: C/link-contacts.page:63(p)
+msgid ""
+"From the <gui>Contact List</gui> window, right-click one of the contact that "
+"has different accounts, and select <gui style=\"menuitem\">Link Contacts...</"
+"gui>."
+msgstr ""
+
+#: C/link-contacts.page:70(p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Saved Presets</gui> box, select the status message you want "
+#| "to remove."
+msgid ""
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr "从 <gui>已保存的自定义状态</gui> 框中，选择您想要删除的状态消息。"
+
+#: C/link-contacts.page:76(p)
+#, fuzzy
+#| msgid "Click on <gui style=\"button\">Remove</gui>."
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "点击 <gui style=\"button\">删除</gui>。"
+
+#: C/link-contacts.page:82(p)
+msgid ""
+"When a meta-contact has been created, the default contact that will be used "
+"to have a conversation with when you double-click on it, is the contact with "
+"the highest presence on-line."
+msgstr ""
+
+#: C/link-contacts.page:91(title)
+msgid "Separating contacts"
+msgstr "分割联系人"
+
+#: C/link-contacts.page:94(p)
+msgid ""
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
+msgstr ""
+
+#: C/link-contacts.page:100(p)
+#, fuzzy
+#| msgid "Click on <gui style=\"button\">Remove</gui>."
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "点击 <gui style=\"button\">删除</gui>。"
+
 #: C/license.page:8(desc)
 msgid "Legal information."
-msgstr ""
+msgstr "法律信息。"
 
 #: C/license.page:11(title)
 msgid "License"
-msgstr ""
+msgstr "许可"
 
 #: C/license.page:12(p)
 msgid ""
 "This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
 "Unported license."
 msgstr ""
+"本作品在 CreativeCommons Attribution-Share Alike 3.0 Unported license下发布。"
 
 #: C/license.page:20(p)
 msgid "You are free:"
-msgstr ""
+msgstr "您可以自由："
 
 #: C/license.page:25(em)
 msgid "To share"
-msgstr ""
+msgstr "分享"
 
 #: C/license.page:26(p)
 msgid "To copy, distribute and transmit the work."
-msgstr ""
+msgstr "复制、分发或者传播作品。"
 
 #: C/license.page:29(em)
 msgid "To remix"
-msgstr ""
+msgstr "再创作"
 
 #: C/license.page:30(p)
 msgid "To adapt the work."
-msgstr ""
+msgstr "修改作品。"
 
 #: C/license.page:33(p)
 msgid "Under the following conditions:"
-msgstr ""
+msgstr "需遵守一下条件："
 
 #: C/license.page:38(em)
 msgid "Attribution"
-msgstr ""
+msgstr "署名"
 
 #: C/license.page:39(p)
 msgid ""
@@ -1039,16 +1224,20 @@ msgid ""
 "licensor (but not in any way that suggests that they endorse you or your use "
 "of the work)."
 msgstr ""
+"您必须按照作者或许可人指定的方式对作品署名(但不能以任何方式暗示他们认可您或者"
+"您对作品的使用)。"
 
 #: C/license.page:46(em)
 msgid "Share Alike"
-msgstr ""
+msgstr "相同方式共享"
 
 #: C/license.page:47(p)
 msgid ""
 "If you alter, transform, or build upon this work, you may distribute the "
 "resulting work only under the same, similar or a compatible license."
 msgstr ""
+"如果您改变、转换本作品或者以本作品为基础进行再创作，您应以相同、相似或者兼容"
+"的协议发布修改后的作品。"
 
 #: C/license.page:53(p)
 msgid ""
@@ -1057,14 +1246,19 @@ msgid ""
 "link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
 "sa/3.0/\">Commons Deed</link>."
 msgstr ""
+"许可的全文参见 <link href=\"http://creativecommons.org/licenses/by-sa/3.0/"
+"legalcode\">CreativeCommons 网站</link>，或者阅读完整的<link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/\">通俗协议</link>。"
 
 #: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation witn an IRC contact."
-msgstr ""
+#, fuzzy
+#| msgid "Start a video conversation with one of your contacts."
+msgid "Start a conversation with an IRC contact."
+msgstr "向您的联系人发起视频会话。"
 
 #: C/irc-start-conversation.page:30(title)
 msgid "Chat with somebody on IRC"
-msgstr ""
+msgstr "与 IRC 中某人聊天"
 
 #: C/irc-start-conversation.page:32(p)
 msgid ""
@@ -1095,23 +1289,23 @@ msgstr ""
 
 #: C/irc-send-file.page:9(desc)
 msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr ""
+msgstr "<app>Empathy</app> 目前不支持 IRC 传文件。"
 
 #: C/irc-send-file.page:31(title)
 msgid "Send files over IRC"
-msgstr ""
+msgstr "通过 IRC 传送文件"
 
 #: C/irc-send-file.page:33(p)
 msgid "It is not currently possible to send files using IRC."
-msgstr ""
+msgstr "目前无法用 IRC 传送文件。"
 
 #: C/irc-nick-password.page:10(desc)
 msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr ""
+msgstr "保护您的昵称，以防其他 IRC 用户使用。"
 
 #: C/irc-nick-password.page:33(title)
 msgid "Use a nickname password on IRC"
-msgstr ""
+msgstr "在 IRC 中使用昵称和密码"
 
 #: C/irc-nick-password.page:35(p)
 msgid ""
@@ -1132,7 +1326,7 @@ msgstr ""
 
 #: C/irc-nick-password.page:46(p)
 msgid "To set an IRC server password:"
-msgstr ""
+msgstr "设置一个 IRC 密码："
 
 #: C/irc-nick-password.page:54(p)
 msgid "Select the IRC account from the list on the left of the dialog."
@@ -1146,7 +1340,7 @@ msgstr ""
 
 #: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
 msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr ""
+msgstr "点击<gui style=\"button\">应用</gui>。"
 
 #: C/irc-nick-password.page:69(p)
 msgid ""
@@ -1157,11 +1351,11 @@ msgstr ""
 
 #: C/irc-manage.page:9(desc)
 msgid "How to use IRC with <app>Empathy</app>."
-msgstr ""
+msgstr "如何在 <app>Empathy</app> 中使用 IRC。"
 
 #: C/irc-manage.page:34(title)
 msgid "Internet Relay Chat (IRC)"
-msgstr ""
+msgstr "互联网中继聊天(IRC)"
 
 #: C/irc-manage.page:37(p) C/account-irc.page:39(p)
 msgid ""
@@ -1171,27 +1365,27 @@ msgstr ""
 
 #: C/irc-manage.page:43(title)
 msgid "IRC Chat Rooms and Conversations"
-msgstr ""
+msgstr "IRC 聊天室和会话"
 
 #: C/irc-manage.page:45(title)
 msgid "Chat Rooms and Conversations"
-msgstr ""
+msgstr "聊天室和会话"
 
 #: C/irc-manage.page:50(title)
 msgid "Common IRC Problems"
-msgstr ""
+msgstr "常见 IRC 问题"
 
-#: C/irc-manage.page:52(title) C/index.page:52(title)
+#: C/irc-manage.page:52(title) C/index.page:55(title)
 msgid "Common Problems"
-msgstr ""
+msgstr "常见问题"
 
 #: C/irc-join-room.page:8(desc)
 msgid "Join an IRC channel."
-msgstr ""
+msgstr "加入一个 IRC 频道。"
 
 #: C/irc-join-room.page:31(title)
 msgid "Join an IRC chat room"
-msgstr ""
+msgstr "加入一个 IRC 聊天室"
 
 #: C/irc-join-room.page:33(p)
 msgid ""
@@ -1221,20 +1415,20 @@ msgstr ""
 
 #: C/irc-join-room.page:57(p)
 msgid "Click <gui>Join</gui> to enter the room."
-msgstr ""
+msgstr "点击<gui>加入</gui>来进入房间。"
 
 #: C/irc-join-room.page:64(p)
 msgid ""
 "To join multiple rooms, you need to repeat the steps above for each room."
-msgstr ""
+msgstr "要加入多个房间，您需要对每个房间重复上面的步骤。"
 
 #: C/irc-join-pwd.page:9(desc)
 msgid "Enter password-protected IRC chat rooms."
-msgstr ""
+msgstr "进入有密码保护的 IRC 聊天室。"
 
 #: C/irc-join-pwd.page:25(title)
 msgid "Join a protected IRC chat room"
-msgstr ""
+msgstr "加入一个受保护的 IRC 聊天室"
 
 #: C/irc-join-pwd.page:27(p)
 msgid ""
@@ -1244,7 +1438,7 @@ msgstr ""
 
 #: C/irc-join-pwd.page:33(p)
 msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
-msgstr ""
+msgstr "如往常一样<link xref=\"irc-join-room\">加入房间</link>。"
 
 #: C/irc-join-pwd.page:38(p)
 msgid ""
@@ -1254,11 +1448,11 @@ msgstr ""
 
 #: C/irc-commands.page:7(desc)
 msgid "The supported IRC commands."
-msgstr ""
+msgstr "支持的 IRC 命令。"
 
 #: C/irc-commands.page:18(title)
 msgid "Supported IRC commands"
-msgstr ""
+msgstr "支持的 IRC 命令"
 
 #: C/irc-commands.page:19(p)
 msgid ""
@@ -1268,23 +1462,25 @@ msgstr ""
 
 #: C/irc-commands.page:24(p)
 msgid "All commands available have a small description on their usage."
-msgstr ""
+msgstr "所有可用命令都有一个简单的用法描述。"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/introduction.page:41(None)
 msgid ""
 "@@image: 'figures/empathy-main-window.png'; "
-"md5=489ba00b0fc377aba4c691210b6e0650"
+"md5=54908dcb2588beddb15ef0968d2c2582"
 msgstr ""
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=54908dcb2588beddb15ef0968d2c2582"
 
 #: C/introduction.page:9(desc)
 msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr ""
+msgstr "介绍 <app>Empathy</app> 即时聊天工具。"
 
 #: C/introduction.page:21(title)
 msgid "Introduction"
-msgstr ""
+msgstr "介绍"
 
 #: C/introduction.page:23(p)
 msgid ""
@@ -1310,68 +1506,71 @@ msgstr ""
 
 #: C/introduction.page:39(title)
 msgid "<gui>Contact List</gui> window"
-msgstr ""
+msgstr "<gui>联系人列表</gui>窗口"
 
 #: C/introduction.page:40(desc)
 msgid "<app>Empathy</app> main window"
-msgstr ""
+msgstr "<app>Empathy</app> 主窗口"
 
 #: C/introduction.page:42(p)
 msgid "<app>Empathy</app> main window."
-msgstr ""
+msgstr "<app>Empathy</app> 主窗口。"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/index.page:27(None)
+#: C/index.page:28(None)
 msgid ""
-"@@image: 'figures/empathy-logo.png'; md5=14568248b11d2cfe7992c5edd7e157e8"
+"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
 msgstr ""
+"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
 
 #: C/index.page:7(title) C/index.page:8(title)
-msgid "Empathy Instant Messenger"
-msgstr ""
+msgid "Empathy Internet Messenger"
+msgstr "Empathy 网络聊天工具"
 
-#: C/index.page:26(title)
+#: C/index.page:27(title)
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png"
-"\">Empathy Instant Messenger logo</media> Empathy Instant Messenger"
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
 msgstr ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
+"Empathy 网络聊天工具标识</media> Empathy 网络聊天工具"
 
-#: C/index.page:32(title)
+#: C/index.page:35(title)
 msgid "Account Management"
-msgstr ""
+msgstr "账户管理"
 
-#: C/index.page:36(title)
+#: C/index.page:39(title)
 msgid "Contact Management"
-msgstr ""
+msgstr "联系人管理"
 
-#: C/index.page:40(title)
+#: C/index.page:43(title)
 msgid "Text Conversations"
-msgstr ""
+msgstr "文字聊天"
 
-#: C/index.page:44(title)
+#: C/index.page:47(title)
 msgid "Audio and Video Conversations"
-msgstr ""
+msgstr "音频和视频聊天"
 
-#: C/index.page:48(title)
+#: C/index.page:51(title)
 msgid "Advanced Actions"
 msgstr ""
 
 #: C/import-account.page:10(desc)
 msgid "Import an account from another instant messaging application."
-msgstr ""
+msgstr "从其他即时聊天程序中导入账户。"
 
 #: C/import-account.page:19(name)
 msgid "Peter Haslam"
-msgstr ""
+msgstr "Peter Haslam"
 
 #: C/import-account.page:20(email)
 msgid "peter.haslam@freenet.de"
-msgstr ""
+msgstr "peter.haslam@freenet.de"
 
 #: C/import-account.page:42(title)
 msgid "Import an existing account"
-msgstr ""
+msgstr "导入已存在的账户"
 
 #: C/import-account.page:44(p)
 msgid ""
@@ -1408,7 +1607,7 @@ msgstr ""
 
 #: C/hide-contacts.page:19(title)
 msgid "Hide offline contacts"
-msgstr ""
+msgstr "隐藏离线的联系人"
 
 #: C/hide-contacts.page:21(p)
 msgid ""
@@ -1418,7 +1617,7 @@ msgstr ""
 
 #: C/hide-contacts.page:25(p)
 msgid "To hide the contacts that are offline:"
-msgstr ""
+msgstr "要隐藏离线的联系人："
 
 #: C/hide-contacts.page:31(p)
 msgid ""
@@ -1429,7 +1628,7 @@ msgstr ""
 
 #: C/hide-contacts.page:36(p)
 msgid "To show the offline contacts again, repeat the same procedure above."
-msgstr ""
+msgstr "要再次显示离线的联系人，重复上面的步骤。"
 
 #: C/group-conversations.page:8(desc)
 msgid "Start or join a group conversation with your contacts."
@@ -1519,11 +1718,11 @@ msgstr ""
 
 #: C/group-conversations.page:128(p)
 msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
-msgstr ""
+msgstr "展开<gui>房间列表</gui>部分来查看所有存在的房间。"
 
 #: C/group-conversations.page:133(p)
 msgid "Double-click on the name of a room to join it."
-msgstr ""
+msgstr "双击房间的名称来加入它。"
 
 #: C/group-conversations.page:139(p)
 msgid ""
@@ -1534,29 +1733,29 @@ msgstr ""
 
 #: C/geolocation-what-is.page:9(desc)
 msgid "Understanding geolocation."
-msgstr ""
+msgstr "了解地理位置。"
 
 #: C/geolocation-what-is.page:33(title)
 msgid "What is geolocation"
-msgstr ""
+msgstr "什么是地理位置"
 
 #: C/geolocation-what-is.page:35(p)
 msgid ""
 "Geolocation allows you to identify the real geographical location of a "
 "computer or a device connected to the Internet."
-msgstr ""
+msgstr "地理位置允许您确定连接到网络的一台电脑或设备在地理上的真实位置。"
 
 #: C/geolocation-what-is.page:37(p)
 msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr ""
+msgstr "通过 <app>Empathy</app> 中的地理位置，您可以："
 
 #: C/geolocation-what-is.page:42(p)
 msgid "Publish your geographical location to your contacts."
-msgstr ""
+msgstr "公布您的地理位置给联系人。"
 
 #: C/geolocation-what-is.page:47(p)
 msgid "See your contacts’ geographical location and quickly contact them."
-msgstr ""
+msgstr "查看联系人的地址位置并快速联系他们。"
 
 #: C/geolocation-what-is.page:52(p)
 msgid ""
@@ -1572,19 +1771,19 @@ msgstr ""
 
 #: C/geolocation-turn.page:9(desc)
 msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr ""
+msgstr "在 <app>Empathy</app> 中如何激活和禁用地理位置。"
 
 #: C/geolocation-turn.page:33(title)
 msgid "Activate/Deactivate geolocation"
-msgstr ""
+msgstr "激活/禁用地理位置"
 
 #: C/geolocation-turn.page:37(p)
 msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
-msgstr ""
+msgstr "选择<guiseq><gui>编辑</gui><gui>首选项</gui></guiseq>。"
 
 #: C/geolocation-turn.page:42(p)
 msgid "Select the <gui>Location</gui> tab."
-msgstr ""
+msgstr "选择<gui>位置</gui>标签。"
 
 #: C/geolocation-turn.page:47(p)
 msgid ""
@@ -1604,7 +1803,7 @@ msgstr ""
 #: C/geolocation-turn.page:61(p)
 msgid ""
 "If you have an external device like a GPS or want to send a more accurate "
-"position, select the appropriate option in the <gui>Geoclue Settings</gui> "
+"position, select the appropriate option in the <gui>Location sources</gui> "
 "section."
 msgstr ""
 
@@ -1614,7 +1813,7 @@ msgstr ""
 
 #: C/geolocation-supported.page:31(title)
 msgid "Supported services"
-msgstr ""
+msgstr "支持的设备"
 
 #: C/geolocation-supported.page:33(p)
 msgid ""
@@ -1647,7 +1846,7 @@ msgstr ""
 
 #: C/geolocation-privacy.page:32(title)
 msgid "Geolocation Privacy"
-msgstr ""
+msgstr "地理位置隐私"
 
 #: C/geolocation-privacy.page:35(title)
 msgid "What information is sent"
@@ -1690,7 +1889,7 @@ msgstr ""
 
 #: C/geolocation-privacy.page:63(title)
 msgid "What is the privacy mode"
-msgstr ""
+msgstr "什么是隐私模式"
 
 #: C/geolocation-privacy.page:64(p)
 msgid ""
@@ -1713,7 +1912,7 @@ msgstr ""
 
 #: C/geolocation-privacy.page:82(p)
 msgid "Privacy mode is enabled by default."
-msgstr ""
+msgstr "隐私模式默认被激活"
 
 #: C/geolocation-privacy.page:87(p)
 msgid ""
@@ -1722,7 +1921,7 @@ msgstr ""
 
 #: C/geolocation-privacy.page:92(p)
 msgid "Only your contacts can see your position."
-msgstr ""
+msgstr "只有您的联系人可以看到您的位置。"
 
 #: C/geolocation-not-showing.page:8(desc)
 msgid "<app>Empathy</app> does not publish my geographical position."
@@ -1761,7 +1960,7 @@ msgstr ""
 
 #: C/geolocation.page:8(desc)
 msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr ""
+msgstr "使用和了解 <app>Empathy</app> 中的地理位置。"
 
 #: C/geolocation.page:32(title)
 msgid "Geographical position"
@@ -1773,7 +1972,7 @@ msgstr ""
 
 #: C/geolocation.page:39(title)
 msgid "Fix common problems"
-msgstr ""
+msgstr "修复常见问题"
 
 #: C/favorite-rooms.page:10(desc)
 msgid "Set, join and manage favorite rooms."
@@ -1789,7 +1988,7 @@ msgstr ""
 
 #: C/favorite-rooms.page:35(p)
 msgid "Join a room."
-msgstr ""
+msgstr "加入一个房间。"
 
 #: C/favorite-rooms.page:40(p)
 msgid ""
@@ -1815,7 +2014,7 @@ msgstr ""
 
 #: C/favorite-rooms.page:71(p)
 msgid "Press <key>F5</key>."
-msgstr ""
+msgstr "按 <key>F5</key> 键。"
 
 #: C/favorite-rooms.page:76(p)
 msgid ""
@@ -1869,7 +2068,7 @@ msgstr ""
 
 #: C/favorite-rooms.page:134(p)
 msgid "When done, click <gui>Close</gui>."
-msgstr ""
+msgstr "完成后点<gui>关闭</gui>。"
 
 #: C/disable-account.page:9(desc)
 msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
@@ -1877,7 +2076,7 @@ msgstr ""
 
 #: C/disable-account.page:39(title)
 msgid "Disable an account"
-msgstr ""
+msgstr "禁用一个账户"
 
 #: C/disable-account.page:41(p)
 msgid ""
@@ -1909,11 +2108,11 @@ msgstr ""
 msgid "Register for an account with one of the supported messaging services."
 msgstr ""
 
-#: C/create-account.page:33(title)
+#: C/create-account.page:34(title)
 msgid "Register for a new account"
-msgstr ""
+msgstr "注册一个新账户"
 
-#: C/create-account.page:35(p)
+#: C/create-account.page:36(p)
 msgid ""
 "Most account types require you to create an account with a account provider "
 "before you can connect using instant messaging applications like "
@@ -1922,7 +2121,7 @@ msgid ""
 "<link xref=\"add-account\">add an account</link>."
 msgstr ""
 
-#: C/create-account.page:41(p)
+#: C/create-account.page:42(p)
 msgid ""
 "This page provides information on creating a new account for various types "
 "of accounts. Your account provider should give you a login ID and a "
@@ -1930,53 +2129,53 @@ msgid ""
 "<app>Empathy</app>."
 msgstr ""
 
-#: C/create-account.page:46(title)
+#: C/create-account.page:47(title)
 msgid "Facebook"
-msgstr ""
+msgstr "Facebook"
 
-#: C/create-account.page:47(p)
+#: C/create-account.page:48(p)
 msgid ""
 "Facebook is one of the most-used social networks. It allows users to create "
 "their own profile and to communicate with their friends."
 msgstr ""
 
-#: C/create-account.page:51(p)
+#: C/create-account.page:52(p)
 msgid ""
 "To use Facebook to communicate with your friends, you will need to create a "
 "new account from the website: <link href=\"http://www.facebook.com\">www."
 "facebook.com</link>."
 msgstr ""
 
-#: C/create-account.page:59(title) C/audio-video.page:170(p)
+#: C/create-account.page:60(title) C/audio-video.page:170(p)
 msgid "Jabber"
-msgstr ""
+msgstr "Jabber"
 
-#: C/create-account.page:61(p)
+#: C/create-account.page:62(p)
 msgid ""
 "Jabber is an open instant messaging system. Like email, Jabber allows you to "
 "choose your account provider and communicate with all other Jabber users, "
 "regardless of their account provider."
 msgstr ""
 
-#: C/create-account.page:65(p)
+#: C/create-account.page:66(p)
 msgid ""
 "You will need to create a new account with a Jabber provider. There are many "
 "free providers; one popular provider is <link href=\"http://register.jabber."
 "org/\">Jabber.org</link>."
 msgstr ""
 
-#: C/create-account.page:70(p)
+#: C/create-account.page:71(p)
 msgid ""
 "If you use Google Mail or Google Talk, you already have a Jabber account. "
 "Google Talk is a Jabber service. Simply use your Google Mail address and "
 "password in <app>Empathy</app> to connect."
 msgstr ""
 
-#: C/create-account.page:77(title) C/audio-video.page:190(p)
+#: C/create-account.page:78(title) C/audio-video.page:190(p)
 msgid "People Nearby"
 msgstr ""
 
-#: C/create-account.page:79(p)
+#: C/create-account.page:80(p)
 msgid ""
 "You do not need to create an account with a service provider to use this "
 "feature. This service works whenever you are connected to a local network, "
@@ -1984,15 +2183,15 @@ msgid ""
 "network who are also using this service."
 msgstr ""
 
-#: C/create-account.page:84(p)
+#: C/create-account.page:85(p)
 msgid "For more information, see <link xref=\"salut-protocol\"/>."
 msgstr ""
 
-#: C/create-account.page:88(title) C/audio-video.page:205(p)
+#: C/create-account.page:89(title) C/audio-video.page:205(p)
 msgid "SIP"
-msgstr ""
+msgstr "SIP"
 
-#: C/create-account.page:90(p)
+#: C/create-account.page:91(p)
 msgid ""
 "SIP is an open system which allows users to have audio and video "
 "conversations over the Internet. You need to create an account with a SIP "
@@ -2000,31 +2199,24 @@ msgid ""
 "SIP provider they use."
 msgstr ""
 
-#: C/create-account.page:95(p)
-msgid ""
-"There are a number of popular free SIP account providers; one popular "
-"provider is <link href=\"https://signup.sipphone.com/new-users/app?"
-"class=NewUser;proc=start\">Sipphone</link>."
-msgstr ""
-
-#: C/create-account.page:100(p)
+#: C/create-account.page:97(p)
 msgid ""
 "Due to technical differences, the free <link href=\"https://www.ekiga.net/"
 "index.php?page=register\">Ekiga.net</link> service does not currently work "
 "with <app>Empathy</app>."
 msgstr ""
 
-#: C/create-account.page:105(p)
+#: C/create-account.page:102(p)
 msgid ""
 "Some SIP providers allow you to call normal phones from your computer. "
 "Generally, you will need to subscribe to a paid service for this feature."
 msgstr ""
 
-#: C/create-account.page:110(title) C/audio-video.page:165(p)
+#: C/create-account.page:107(title) C/audio-video.page:165(p)
 msgid "IRC"
-msgstr ""
+msgstr "IRC"
 
-#: C/create-account.page:112(p)
+#: C/create-account.page:109(p)
 msgid ""
 "You do not need to register for an account to use IRC. Although you specify "
 "a nickname when you add an IRC account to <app>Empathy</app>, this nickname "
@@ -2032,23 +2224,23 @@ msgid ""
 "nickname, you will need to choose a new nickname."
 msgstr ""
 
-#: C/create-account.page:117(p)
+#: C/create-account.page:114(p)
 msgid ""
 "Some IRC networks use a service called NickServ to allow users to protect "
 "their nicknames. See <link xref=\"irc-nick-password\"/> for more information."
 msgstr ""
 
-#: C/create-account.page:120(p)
+#: C/create-account.page:117(p)
 msgid ""
 "Some IRC servers are password protected. You will need to know the password "
 "to connect to these servers. Generally, these are private IRC networks."
 msgstr ""
 
-#: C/create-account.page:125(title)
+#: C/create-account.page:122(title)
 msgid "Proprietary Services"
 msgstr ""
 
-#: C/create-account.page:127(p)
+#: C/create-account.page:124(p)
 msgid ""
 "There are many proprietary instant messaging services that have been "
 "developed by different companies or organizations. <app>Empathy</app> allows "
@@ -2057,21 +2249,21 @@ msgid ""
 "web site and agree to its terms of use."
 msgstr ""
 
-#: C/create-account.page:136(link) C/audio-video.page:135(p)
+#: C/create-account.page:133(link) C/audio-video.page:135(p)
 msgid "AIM"
-msgstr ""
+msgstr "AIM"
 
-#: C/create-account.page:141(link) C/audio-video.page:160(p)
+#: C/create-account.page:138(link) C/audio-video.page:160(p)
 msgid "ICQ"
-msgstr ""
+msgstr "ICQ"
 
-#: C/create-account.page:146(link) C/audio-video.page:175(p)
+#: C/create-account.page:143(link) C/audio-video.page:175(p)
 msgid "MSN"
-msgstr ""
+msgstr "MSN"
 
-#: C/create-account.page:151(link) C/audio-video.page:210(p)
+#: C/create-account.page:148(link) C/audio-video.page:210(p)
 msgid "Yahoo!"
-msgstr ""
+msgstr "Yahoo!"
 
 #: C/change-status.page:9(desc)
 msgid "Change your status to advertise your availability to your contacts."
@@ -2079,7 +2271,7 @@ msgstr ""
 
 #: C/change-status.page:34(title)
 msgid "Change your status"
-msgstr ""
+msgstr "改变您的状态"
 
 #: C/change-status.page:36(p)
 msgid ""
@@ -2112,11 +2304,13 @@ msgstr ""
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
-#: C/audio-video.page:58(None) C/audio-call.page:47(None)
+#: C/audio-video.page:58(None)
 msgid ""
 "@@image: 'figures/audio-input-microphone.png'; "
 "md5=8d89026b66a263a3bc5b1f0665948567"
 msgstr ""
+"@@image: 'figures/audio-input-microphone.png'; "
+"md5=8d89026b66a263a3bc5b1f0665948567"
 
 #: C/audio-video.page:8(desc)
 msgid ""
@@ -2125,7 +2319,7 @@ msgstr ""
 
 #: C/audio-video.page:32(title)
 msgid "Audio and video support"
-msgstr ""
+msgstr "音频和视频支持"
 
 #: C/audio-video.page:34(p)
 msgid ""
@@ -2137,15 +2331,15 @@ msgstr ""
 
 #: C/audio-video.page:43(p)
 msgid "Icon"
-msgstr ""
+msgstr "图标"
 
 #: C/audio-video.page:48(p)
 msgid "Description"
-msgstr ""
+msgstr "描述"
 
 #: C/audio-video.page:58(media)
 msgid "Icon for audio conversation"
-msgstr ""
+msgstr "音频聊天的图标"
 
 #: C/audio-video.page:64(p)
 msgid "The contact is able to have an audio conversation."
@@ -2153,7 +2347,7 @@ msgstr ""
 
 #: C/audio-video.page:70(media)
 msgid "Icon for video conversation"
-msgstr ""
+msgstr "视频聊天的图标"
 
 #: C/audio-video.page:76(p)
 msgid "The contact is able to have a video conversation."
@@ -2173,7 +2367,7 @@ msgstr ""
 
 #: C/audio-video.page:95(title)
 msgid "Supported Account Types"
-msgstr ""
+msgstr "支持的账户类型"
 
 #: C/audio-video.page:97(p)
 msgid ""
@@ -2208,15 +2402,15 @@ msgstr ""
 
 #: C/audio-video.page:128(p)
 msgid "Service"
-msgstr ""
+msgstr "服务"
 
 #: C/audio-video.page:129(p)
 msgid "Audio"
-msgstr ""
+msgstr "音频"
 
 #: C/audio-video.page:130(p)
 msgid "Video"
-msgstr ""
+msgstr "视频"
 
 #: C/audio-video.page:136(p) C/audio-video.page:137(p)
 #: C/audio-video.page:141(p) C/audio-video.page:142(p)
@@ -2236,15 +2430,15 @@ msgstr ""
 
 #: C/audio-video.page:140(p)
 msgid "Facebook Chat"
-msgstr ""
+msgstr "Facebook 聊天"
 
 #: C/audio-video.page:145(p)
 msgid "gadugadu"
-msgstr ""
+msgstr "gadugadu"
 
 #: C/audio-video.page:150(p)
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
 #: C/audio-video.page:151(p) C/audio-video.page:152(p)
 #: C/audio-video.page:171(p) C/audio-video.page:172(p)
@@ -2255,71 +2449,106 @@ msgstr ""
 
 #: C/audio-video.page:155(p)
 msgid "Groupwise"
-msgstr ""
+msgstr "Groupwise"
 
 #: C/audio-video.page:180(p)
 msgid "myspace"
-msgstr ""
+msgstr "myspace"
 
 #: C/audio-video.page:185(p)
 msgid "qq"
-msgstr ""
+msgstr "qq"
 
 #: C/audio-video.page:195(p)
 msgid "sametime"
-msgstr ""
+msgstr "sametime"
 
 #: C/audio-video.page:200(p)
 msgid "silc"
-msgstr ""
+msgstr "silc"
 
 #: C/audio-video.page:215(p)
 msgid "zephyr"
-msgstr ""
+msgstr "zephyr"
 
 #: C/audio-call.page:9(desc)
 msgid "Call your contacts over the Internet."
 msgstr ""
 
-#: C/audio-call.page:33(title)
+#: C/audio-call.page:27(title)
 msgid "Start an audio conversation"
-msgstr ""
+msgstr "开始音频聊天"
 
-#: C/audio-call.page:35(p)
+#: C/audio-call.page:29(p)
 msgid ""
 "You can call your contacts and have an audio conversation with them. This "
 "features only works with certain types of accounts, and it requires the "
 "other person to have an application that supports audio calls."
 msgstr ""
 
-#: C/audio-call.page:46(p)
+#: C/audio-call.page:34(p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
+#| "mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+#| "next to the name of the contact you wish to call and choose <gui style="
+#| "\"menuitem\">Video Call</gui>. Alternatively, right click the contact and "
+#| "choose <gui style=\"menuitem\">Video Call</gui>."
 msgid ""
 "From the <gui>Contact List</gui> window, click the <media type=\"image\" "
-"mime=\"image/png\" src=\"figures/audio-input-microphone.png\">audio call</"
-"media> icon next to the name of the contact you wish to call and choose <gui "
-"style=\"menuitem\">Audio Call</gui>. Alternatively, right click the contact "
-"and choose <gui style=\"menuitem\">Audio Call</gui>."
+"mime=\"image/png\" src=\"figures/camera-web.png\">video call</media> icon "
+"next to the name of the contact you wish to call and choose <gui style="
+"\"menuitem\">Audio Call</gui>."
 msgstr ""
+"在<gui>联系人列表</gui>窗口，点击您想呼叫的联系人的名字旁的<media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media>"
+"图标并选择<gui style=\"menuitem\">视频呼叫</gui>。同样，也可以右击联系人并选"
+"择<gui style=\"menuitem\">视频呼叫</gui>。"
 
-#: C/audio-call.page:63(p)
+#: C/audio-call.page:55(p)
+#, fuzzy
+#| msgid ""
+#| "To turn a video conversation into an audio conversation, choose "
+#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</"
+#| "gui></guiseq>, or click the <media type=\"image\" mime=\"image/png\" src="
+#| "\"figures/camera-web.png\">video call</media> toolbar button to deselect "
+#| "it."
 msgid ""
 "To turn an audio conversation into a video conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>, "
-"or click the <media type=\"image\" mime=\"image/png\" src=\"figures/camera-"
-"web.png\">video call</media> toolbar button to select it."
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
 msgstr ""
+"要将视频会话转为音频会话，则选择<guiseq><gui style=\"menu\">视频</gui><gui "
+"style=\"menuitem\">关闭视频</gui></guiseq>，或者点击工具栏上的<media type="
+"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media>"
+"按钮以取消选择。"
+
+#: C/audio-call.page:63(title)
+#, fuzzy
+#| msgid "Start a video conversation with one of your contacts."
+msgid "Start an audio conversation with a meta-contact"
+msgstr "向您的联系人发起视频会话。"
+
+#: C/audio-call.page:71(p)
+#, fuzzy
+#| msgid ""
+#| "Right-click on the name of the contact you want to have a conversation "
+#| "with, and choose <gui>Chat</gui>."
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
+msgstr "右键点击您想要进行交谈的联系人的名字，然后选择 <gui>聊天</gui>"
 
 #: C/add-contact.page:9(desc)
 msgid "Add someone to the contact list."
-msgstr ""
+msgstr "添加某人到联系人列表。"
 
 #: C/add-contact.page:33(title)
 msgid "Add someone to your list of contacts"
-msgstr ""
+msgstr "添加某人到您的联系人列表"
 
 #: C/add-contact.page:37(p)
 msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
-msgstr ""
+msgstr "选择<guiseq><gui>聊天</gui><gui>添加联系人</gui></guiseq>。"
 
 #: C/add-contact.page:40(p)
 msgid ""
@@ -2352,11 +2581,11 @@ msgstr ""
 
 #: C/add-account.page:9(desc)
 msgid "Add a new account to <app>Empathy</app>."
-msgstr ""
+msgstr "向 <app>Empathy</app> 添加新账户。"
 
 #: C/add-account.page:39(title)
 msgid "Add a new account"
-msgstr ""
+msgstr "添加一个新账户"
 
 #: C/add-account.page:41(p)
 msgid ""
@@ -2368,7 +2597,7 @@ msgstr ""
 
 #: C/add-account.page:52(p)
 msgid "Click <gui style=\"button\">Add</gui>."
-msgstr ""
+msgstr "点击<gui style=\"button\">添加</gui>。"
 
 #: C/add-account.page:57(p)
 msgid ""
@@ -2405,21 +2634,21 @@ msgstr ""
 
 #: C/accounts-window.page:11(desc)
 msgid "Add, modify, and delete accounts."
-msgstr ""
+msgstr "添加、修改和删除账户。"
 
 #: C/accounts-window.page:33(title)
 msgid "Accounts Window"
-msgstr ""
+msgstr "账户窗口"
 
 #: C/accounts-window.page:35(p)
 msgid ""
 "The <gui>Accounts</gui> window allows you to add, modify, and delete "
 "accounts."
-msgstr ""
+msgstr "<gui>账户</gui>窗口允许您添加、修改和删除账户。"
 
 #: C/accounts-window.page:43(title)
 msgid "Account Details"
-msgstr ""
+msgstr "账户详细信息"
 
 #: C/accounts-window.page:44(p)
 msgid ""
@@ -2434,7 +2663,7 @@ msgstr ""
 
 #: C/account-jabber.page:29(title)
 msgid "Jabber account details"
-msgstr ""
+msgstr "Jabber 账户信息"
 
 #: C/account-jabber.page:31(p)
 msgid ""
@@ -2453,11 +2682,11 @@ msgstr ""
 
 #: C/account-jabber.page:45(gui)
 msgid "Encryption required (TLS/SSL)"
-msgstr ""
+msgstr "需要加密(TLS/SSL)"
 
 #: C/account-jabber.page:46(gui)
 msgid "Ignore SSL certificate errors"
-msgstr ""
+msgstr "忽略 SSL 证书错误"
 
 #: C/account-jabber.page:47(p)
 msgid ""
@@ -2478,11 +2707,11 @@ msgstr ""
 
 #: C/account-jabber.page:59(gui)
 msgid "Resource"
-msgstr ""
+msgstr "资源"
 
 #: C/account-jabber.page:60(gui)
 msgid "Priority"
-msgstr ""
+msgstr "优先级"
 
 #: C/account-jabber.page:61(p)
 msgid ""
@@ -2515,13 +2744,14 @@ msgstr ""
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/account-irc.page:106(None)
 msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-msgstr ""
+msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
 
 #. When image changes, this message will be marked fuzzy or untranslated for you.
 #. It doesn't matter what you translate it to: it's not used at all.
 #: C/account-irc.page:112(None)
 msgid "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
 msgstr ""
+"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
 
 #: C/account-irc.page:8(desc)
 msgid "Additional information necessary for connecting to IRC networks."
@@ -2529,7 +2759,7 @@ msgstr ""
 
 #: C/account-irc.page:31(title)
 msgid "IRC account details"
-msgstr ""
+msgstr "IRC 账户信息"
 
 #: C/account-irc.page:33(p)
 msgid ""
@@ -2541,7 +2771,7 @@ msgstr ""
 
 #: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
 msgid "Network"
-msgstr ""
+msgstr "网络"
 
 #: C/account-irc.page:46(p)
 msgid ""
@@ -2553,7 +2783,7 @@ msgstr ""
 
 #: C/account-irc.page:53(gui)
 msgid "Nickname"
-msgstr ""
+msgstr "昵称"
 
 #: C/account-irc.page:54(p)
 msgid ""
@@ -2565,7 +2795,7 @@ msgstr ""
 
 #: C/account-irc.page:60(gui)
 msgid "Password"
-msgstr ""
+msgstr "密码"
 
 #: C/account-irc.page:61(p)
 msgid ""
@@ -2576,7 +2806,7 @@ msgstr ""
 
 #: C/account-irc.page:65(title)
 msgid "NickServ Passwords"
-msgstr ""
+msgstr "NickServ 密码"
 
 #: C/account-irc.page:66(p)
 msgid ""
@@ -2611,11 +2841,11 @@ msgstr ""
 
 #: C/account-irc.page:94(title)
 msgid "IRC Networks"
-msgstr ""
+msgstr "IRC 网络"
 
 #: C/account-irc.page:97(title)
 msgid "Networks"
-msgstr ""
+msgstr "网络"
 
 #: C/account-irc.page:99(p)
 msgid ""
@@ -2657,7 +2887,7 @@ msgstr ""
 
 #: C/account-irc.page:125(gui)
 msgid "Charset"
-msgstr ""
+msgstr "字符集"
 
 #: C/account-irc.page:126(p)
 msgid ""
@@ -2679,7 +2909,7 @@ msgstr ""
 
 #: C/account-irc.page:141(gui)
 msgid "Servers"
-msgstr ""
+msgstr "服务器"
 
 #: C/account-irc.page:142(p)
 msgid ""
@@ -2708,4 +2938,4 @@ msgstr ""
 msgid "translator-credits"
 msgstr ""
 "Lavande  <lavande@thislove.cz.cc>, 2010\n"
-"Tao Wang <dancefire@gmail.com>, 2010"
+"Tao Wang <dancefire@gmail.com>, 2010lainme <lainme993@gmail.com>, 2011"