Update Simplified Chinese help translation

1 files changed, 2691 insertions, 2280 deletions

diff --git a/help/zh_CN/zh_CN.po b/help/zh_CN/zh_CN.po
index c70bd5cd2..de41b6a30 100644
--- a/help/zh_CN/zh_CN.po
+++ b/help/zh_CN/zh_CN.po
@@ -5,1716 +5,1714 @@
 # Tao Wang <dancefire@gmail.com>, 2010
 # lainme <lainme993@gmail.com>, 2011
 # Guanhao Yin <yinguanhao@gmail.com>, 2011
+# tuhaihe <wangdianjin@linuxdeepin.com>, 2012
+# Wylmer Wang <wantinghard@gmail.com>, 2012
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: empathy master\n"
-"POT-Creation-Date: 2011-12-11 14:58+0000\n"
-"PO-Revision-Date: 2011-12-09 21:36+0800\n"
-"Last-Translator: Guanhao Yin <yinguanhao@gmail.com>\n"
+"POT-Creation-Date: 2013-04-15 22:03+0000\n"
+"PO-Revision-Date: 2012-02-14 13:34+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
+"Language: zh-CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: zh-CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. 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:38(None) C/audio-video.page:70(None)
-#: C/audio-call.page:36(None)
-msgid "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+#. Put one translator per line, in the form NAME <EMAIL>, YEAR1, YEAR2
+#, fuzzy
+#| msgid "translator-credits"
+msgctxt "_"
+msgid "translator-credits"
 msgstr ""
-"@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+"Lavande  <lavande@thislove.cz.cc>, 2010\n"
+"Tao Wang <dancefire@gmail.com>, 2010\n"
+"lainme <lainme993@gmail.com>, 2011\n"
+"Guanhao Yin <yinguanhao@gmail.com>, 2011\n"
+"tuhaihe <wangdianjin@linuxdeepin.com>, 2012"
 
-#: C/video-call.page:10(desc)
-msgid "Start a video conversation with one of your contacts."
-msgstr "同您的联系人进行视频聊天。"
+#: C/index.page:8(info/title)
+#, fuzzy
+#| msgid "Empathy Internet Messenger"
+msgctxt "link"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy 网络聊天工具"
+
+#: C/index.page:9(info/title)
+#, fuzzy
+#| msgid "Empathy Internet Messenger"
+msgctxt "text"
+msgid "Empathy Internet Messenger"
+msgstr "Empathy 网络聊天工具"
 
-#: C/video-call.page:21(name) C/status-icons.page:16(name)
-#: C/share-desktop.page:14(name) C/set-custom-status.page:19(name)
-#: C/send-file.page:21(name) C/salut-protocol.page:18(name)
-#: 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/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:20(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)
+#: C/index.page:20(credit/name) C/add-account.page:21(credit/name)
+#: C/audio-call.page:22(credit/name) C/audio-video.page:17(credit/name)
+#: C/create-account.page:19(credit/name)
+#: C/disable-account.page:21(credit/name)
+#: C/favorite-rooms.page:14(credit/name) C/geolocation.page:17(credit/name)
+#: C/geolocation-not-showing.page:17(credit/name)
+#: C/geolocation-privacy.page:17(credit/name)
+#: C/geolocation-supported.page:16(credit/name)
+#: C/geolocation-turn.page:18(credit/name)
+#: C/geolocation-what-is.page:18(credit/name)
+#: C/group-conversations.page:19(credit/name)
+#: C/hide-contacts.page:11(credit/name) C/import-account.page:23(credit/name)
+#: C/introduction.page:13(credit/name) C/irc-commands.page:10(credit/name)
+#: C/irc-join-pwd.page:17(credit/name) C/irc-join-room.page:16(credit/name)
+#: C/irc-manage.page:19(credit/name) C/irc-nick-password.page:18(credit/name)
+#: C/irc-send-file.page:16(credit/name)
+#: C/irc-start-conversation.page:15(credit/name)
+#: C/link-contacts.page:15(credit/name) C/prev-conv.page:17(credit/name)
+#: C/prob-conn-acctdisabled.page:19(credit/name)
+#: C/prob-conn-auth.page:21(credit/name) C/prob-conn-name.page:18(credit/name)
+#: C/prob-conn-neterror.page:19(credit/name)
+#: C/remove-account.page:19(credit/name) C/salut-protocol.page:18(credit/name)
+#: C/send-file.page:21(credit/name) C/set-custom-status.page:19(credit/name)
+#: C/share-desktop.page:14(credit/name) C/status-icons.page:16(credit/name)
+#: C/video-call.page:25(credit/name)
 msgid "Milo Casagrande"
 msgstr "Milo Casagrande"
 
-#: C/video-call.page:22(email) C/status-icons.page:17(email)
-#: C/share-desktop.page:15(email) C/set-custom-status.page:20(email)
-#: C/send-file.page:22(email) C/salut-protocol.page:19(email)
-#: 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/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:21(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: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:22(p) C/set-custom-status.page:23(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/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:24(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)
+#: C/index.page:24(license/p) C/account-irc.page:20(license/p)
+#: C/account-jabber.page:18(license/p) C/accounts-window.page:22(license/p)
+#: C/add-account.page:29(license/p) C/add-contact.page:22(license/p)
+#: C/audio-call.page:31(license/p) C/audio-video.page:21(license/p)
+#: C/change-status.page:28(license/p) C/create-account.page:23(license/p)
+#: C/disable-account.page:29(license/p) C/favorite-rooms.page:18(license/p)
+#: C/geolocation.page:21(license/p)
+#: C/geolocation-not-showing.page:21(license/p)
+#: C/geolocation-privacy.page:21(license/p)
+#: C/geolocation-supported.page:20(license/p)
+#: C/geolocation-turn.page:22(license/p)
+#: C/geolocation-what-is.page:22(license/p)
+#: C/group-conversations.page:23(license/p) C/hide-contacts.page:15(license/p)
+#: C/import-account.page:31(license/p) C/introduction.page:17(license/p)
+#: C/irc-commands.page:14(license/p) C/irc-join-pwd.page:21(license/p)
+#: C/irc-join-room.page:20(license/p) C/irc-manage.page:28(license/p)
+#: C/irc-nick-password.page:22(license/p) C/irc-send-file.page:20(license/p)
+#: C/irc-start-conversation.page:19(license/p)
+#: C/link-contacts.page:19(license/p) C/overview.page:20(license/p)
+#: C/prev-conv.page:25(license/p) C/prob-conn-acctdisabled.page:23(license/p)
+#: C/prob-conn-auth.page:25(license/p) C/prob-conn-name.page:22(license/p)
+#: C/prob-conn-neterror.page:23(license/p) C/prob-conn.page:18(license/p)
+#: C/remove-account.page:23(license/p) C/salut-protocol.page:22(license/p)
+#: C/send-file.page:25(license/p) C/send-message.page:21(license/p)
+#: C/set-custom-status.page:23(license/p) C/share-desktop.page:22(license/p)
+#: C/status-icons.page:24(license/p) C/video-call.page:34(license/p)
 msgid "Creative Commons Share Alike 3.0"
 msgstr "知识共享-相同方式共享 (Creative Commons Share Alike) 3.0"
 
-#: C/video-call.page:28(title)
-msgid "Start a video conversation"
-msgstr "开始视频聊天"
+#: C/index.page:30(media/span)
+#, fuzzy
+#| msgid "Empathy Internet Messenger"
+msgid "Empathy Internet Messenger logo"
+msgstr "Empathy 网络聊天工具"
 
-#: C/video-call.page:30(p)
-msgid ""
-"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."
-msgstr ""
-"如果您有网络摄像头，您可以呼叫您的联系人并和他们进行视频聊天。此功能仅特定类"
-"型的账户可用，并需要对方使用的程序支持视频呼叫。"
+#: C/index.page:28(page/title)
+#, fuzzy
+#| msgid "Empathy Internet Messenger"
+msgid "<_:media-1/> Empathy Internet Messenger"
+msgstr "Empathy 网络聊天工具"
 
-#: C/video-call.page:37(p)
-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>."
-msgstr ""
-"在<gui>联系人列表</gui>窗口，点击您想呼叫的联系人的名字旁的<media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media>"
-"图标并选择<gui style=\"menuitem\">视频呼叫</gui>。"
+#: C/index.page:36(section/title)
+msgid "Account Management"
+msgstr "帐号管理"
 
-#: 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>，以及总会"
-"话时间。"
+#: C/index.page:40(section/title)
+msgid "Contact Management"
+msgstr "联系人管理"
 
-#: 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/index.page:44(section/title)
+msgid "Text Conversations"
+msgstr "文字聊天"
 
-#: C/video-call.page:54(p)
-msgid ""
-"To turn a video conversation into an audio conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
-msgstr ""
-"要将视频会话转为语音会话，选择 <guiseq><gui style=\"menu\">视频</gui><gui "
-"style=\"menuitem\">视频关闭</gui></guiseq>。"
+#: C/index.page:48(section/title)
+msgid "Audio and Video Conversations"
+msgstr "语音和视频聊天"
 
-#: C/video-call.page:60(title)
-msgid "Start a video conversation with a meta-contact"
-msgstr "和一位元联系人进行视频聊天。"
+#: C/index.page:52(section/title)
+msgid "Advanced Actions"
+msgstr "高级操作"
 
-#: C/video-call.page:63(p) C/send-message.page:53(p) C/audio-call.page:66(p)
-msgid ""
-"From the <gui>Contact List</gui> window, right-click on the meta-contact."
-msgstr "在<gui>联系人列表</gui>窗口，右键点击该元联系人。"
+#: C/index.page:56(section/title) C/irc-manage.page:64(section/title)
+msgid "Common Problems"
+msgstr "常见问题"
 
-#: C/video-call.page:68(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/account-irc.page:106(media)
+#, fuzzy
+#| msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+msgctxt "_"
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Video Call</gui>."
-msgstr ""
-"选择要聊天的联系人，然后在菜单中选择<gui style=\"menuitem\">视频呼叫</gui>"
+"external ref='figures/gtk-add.png' md5='a856b499d8d4681b70b5ce6f25bc5c6d'"
+msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
 
-#: C/video-call.page:75(p) C/send-message.page:65(p) C/audio-call.page:78(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/account-irc.page:109(media) C/prob-conn-auth.page:58(media)
+#: C/prob-conn-name.page:44(media) C/prob-conn-neterror.page:59(media)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+msgctxt "_"
+msgid ""
+"external ref='figures/gtk-edit.png' md5='4f21b451732817be0604fe3e2c8da98b'"
+msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/account-irc.page:112(media)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
+msgctxt "_"
 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."
+"external ref='figures/gtk-remove.png' md5='215e3a325a3dd619874e35c30a018bb6'"
 msgstr ""
-"要识别一个联系人是否是<em>元联系人</em>，将您的鼠标移动到<gui>联系人列表</"
-"gui>窗口中的一个联系人上，并停留几秒钟：一个小弹出消息会显示这个元联系人是由"
-"几个联系人组成的。"
-
-#. 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=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=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=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=c5b0c21181cbd6e13f8909243c0fa964"
-msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+"@@image: 'figures/gtk-remove.png'; md5=215e3a325a3dd619874e35c30a018bb6"
 
-#: C/status-icons.page:7(desc)
-msgid "Understanding the various statuses and status icons."
-msgstr "理解各种状态和状态图标。"
+#: C/account-irc.page:8(info/desc)
+msgid "Additional information necessary for connecting to IRC networks."
+msgstr "连接 IRC 网络需要的额外信息。"
 
-#: C/status-icons.page:20(name) C/salut-protocol.page:36(cite)
-#: C/prev-conv.page:20(name) C/prev-conv.page:38(cite)
-#: C/import-account.page:27(name) C/disable-account.page:24(name)
-#: C/audio-video.page:109(cite) C/audio-video.page:117(cite)
-#: C/add-account.page:24(name) C/accounts-window.page:18(name)
-#: C/account-jabber.page:14(name) C/account-irc.page:16(name)
+#: C/account-irc.page:16(credit/name) C/account-jabber.page:14(credit/name)
+#: C/accounts-window.page:18(credit/name) C/add-account.page:25(credit/name)
+#: C/disable-account.page:25(credit/name)
+#: C/import-account.page:27(credit/name) C/prev-conv.page:21(credit/name)
+#: C/status-icons.page:20(credit/name)
 msgid "Shaun McCance"
 msgstr "Shaun McCance"
 
-#: C/status-icons.page:21(email) C/prev-conv.page:21(email)
-#: C/import-account.page:28(email) C/disable-account.page:25(email)
-#: C/add-account.page:25(email) C/accounts-window.page:19(email)
-#: C/account-jabber.page:15(email) C/account-irc.page:17(email)
-msgid "shaunm@gnome.org"
-msgstr "shaunm@gnome.org"
+#: C/account-irc.page:31(page/title)
+msgid "IRC account details"
+msgstr "IRC 帐号详情"
 
-#: C/status-icons.page:35(title)
-msgid "Status Types and Icons"
-msgstr "状态的类别及其图标"
+#: C/account-irc.page:33(page/p)
+msgid ""
+"IRC accounts require different information than many other types of "
+"accounts. To create an IRC account, you must specify at least an IRC network "
+"and a nickname. This page details the information you can provide for an IRC "
+"account."
+msgstr ""
+"IRC 帐号需要与其他类型的帐号不同的信息。要创建 IRC 帐号，您至少需要指定一个 "
+"IRC 网络和一个昵称。本页详细介绍了您可以为一个 IRC 帐号提供的信息。"
 
-#: C/status-icons.page:39(media)
-msgid "Available icon"
-msgstr "在线图标"
+#: C/account-irc.page:39(note/p) C/irc-manage.page:42(note/p)
+msgid ""
+"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
+"<app>Empathy</app>."
+msgstr ""
+"要在 <app>Empathy</app> 中使用 IRC，您必须安装 <sys>telepathy-idle</sys> 包。"
 
-#: C/status-icons.page:40(gui)
-msgid "Available"
-msgstr "在线"
+#: C/account-irc.page:45(item/title) C/account-irc.page:120(item/title)
+msgid "<gui>Network</gui>"
+msgstr ""
 
-#: C/status-icons.page:41(p)
+#: C/account-irc.page:46(item/p)
 msgid ""
-"Use the <em>Available</em> status when you are at your computer and able to "
-"chat with your contacts. You can set a custom message for this status."
+"IRC is an open system that allows people to run separate IRC networks. Each "
+"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
+"lists the most popular networks in the <gui>Network</gui> drop-down list. "
+"You can add additional networks. See <link xref=\"#networks\"/> below."
 msgstr ""
-"当您在电脑旁并且有空和您的联系人聊天时，使用<em>在线</em>状态。您可以为此状态"
-"自定一条消息。"
-
-#: C/status-icons.page:45(media)
-msgid "Busy icon"
-msgstr "忙碌图标"
+"IRC 是一种开放的系统，它允许人们运行各自的 IRC 网络。每个网络是独立的，有特有"
+"的用户和聊天室。<app>Empathy</app> 在 <gui>网络</gui> 下拉列表中列出了一些最"
+"流行的网络。您可以添加其他的网络。参看下面的<link xref=\"#networks\"/>。"
 
-#: C/status-icons.page:46(gui)
-msgid "Busy"
-msgstr "忙碌"
+#: C/account-irc.page:53(item/title)
+msgid "<gui>Nickname</gui>"
+msgstr ""
 
-#: C/status-icons.page:47(p)
+#: C/account-irc.page:54(item/p)
 msgid ""
-"Use the <em>Busy</em> status to let your contacts know that you don’t want "
-"to chat right now. They can still contact you, for instance if they have "
-"something urgent they need to discuss. By default, <app>Empathy</app> will "
-"not use notification bubbles and sounds when you are busy. You can set a "
-"custom message for this status."
+"Your nickname is your unique name on the IRC network. Only one person on a "
+"network may use a given nickname. If you get an error message that says "
+"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
+"your nickname."
 msgstr ""
-"使用<em>忙碌</em>以让您的联系人知道您当前不想聊天。他们仍然可以联系您，比如他"
-"们可能有急事需要讨论。默认地，当您忙碌时，<app>Empathy</app> 不会使用气泡提示"
-"和声音提示。您可以为此状态自定一条消息。"
-
-#: C/status-icons.page:53(media)
-msgid "Away icon"
-msgstr "离开图标"
+"您的昵称是您在 IRC 网络上的唯一性的名字。只有一个人可以使用某个特定的昵称。如"
+"果您得到<link xref=\"prob-conn-name\" role=\"error-msg\"/>错误信息，您需要改"
+"变您的昵称。"
 
-#: C/status-icons.page:54(gui)
-msgid "Away"
-msgstr "离开"
+#: C/account-irc.page:60(item/title)
+msgid "<gui>Password</gui>"
+msgstr ""
 
-#: C/status-icons.page:55(p)
+#: C/account-irc.page:61(item/p)
 msgid ""
-"Use the <em>Away</em> status when you are going away from your computer. "
-"<app>Empathy</app> automatically sets your status to Away if you do not use "
-"your computer for a while, or if your screensaver is on. By default, "
-"<app>Empathy</app> will not use notification bubbles and sounds when you are "
-"away. You can set a custom message for this status."
+"Some servers, particularly those on private networks, require a password to "
+"connect. If you are authorized to use the network, the network "
+"administrators should provide you with a password."
 msgstr ""
-"当您不在电脑旁时，使用<em>离开</em>状态。如果您一段时间内不使用电脑，或者屏幕"
-"保护打开了，<app>Empathy</app> 将自动设置您的状态为离开。默认地，当您离开时，"
-"<app>Empathy</app> 不会使用气泡提示和声音提示。您可以为此状态自定一条消息。"
-
-#: C/status-icons.page:62(media) C/status-icons.page:69(media)
-msgid "Offline icon"
-msgstr "离线图标"
+"一些服务器，尤其是那些私有网络，需要密码才能连接。如果您被授权使用，网络的管"
+"理员应当为您提供了密码。"
 
-#: C/status-icons.page:63(gui)
-msgid "Invisible"
-msgstr "隐身"
+#: C/account-irc.page:65(note/title)
+msgid "NickServ Passwords"
+msgstr "NickServ 密码"
 
-#: C/status-icons.page:64(p)
+#: C/account-irc.page:66(note/p)
 msgid ""
-"When you set your status to <em>Invisible</em>, you will appear as offline "
-"to your contacts. You will still be connected to your accounts, and you "
-"still see your contacts’ statuses and start conversations with them."
+"On some networks, nicknames can be registered using a service known as "
+"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
+"On some networks, including the popular freenode network, server passwords "
+"are automatically forwarded to NickServ, allowing you to set this field to "
+"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
+"more details."
 msgstr ""
-"当您将状态设置为<em>隐身</em>时，您的联系人会看到您已离线。但您仍然连接着您的"
-"账户，并且可以看到您的联系人的状态，或者和他们聊天。"
+"在某些网络上，昵称可以通过一种叫做 NickServ 的服务被注册。<app>Empathy</app> "
+"并不直接支持昵称密码。在某些网络上，包括流行的 freenode 网络，服务器密码会被"
+"自动转发给 NickServ，从而允许您设置此项向 NickServ 证明您自己。更多信息参见"
+"<link xref=\"irc-nick-password\"/>。"
 
-#: C/status-icons.page:70(gui)
-msgid "Offline"
-msgstr "离线"
+#: C/account-irc.page:76(item/title)
+#, fuzzy
+#| msgid "Real name"
+msgid "<gui>Real name</gui>"
+msgstr "真实姓名"
 
-#: C/status-icons.page:71(p)
+#: C/account-irc.page:77(item/p)
 msgid ""
-"Setting your status to <em>Offline</em> disconnects you from all of your "
-"accounts."
-msgstr "将状态设置为<em>离线</em>将会断开您所有账户的连接。"
+"You can provide your real name in addition to your nickname. Other users "
+"will be able to see this when they view your information."
+msgstr ""
+"除了昵称，您还可以提供您的真实姓名。其他用户查看您的信息时可以看到您的真实姓"
+"名。"
 
-#: C/share-desktop.page:7(desc)
-msgid "Show your desktop to your contacts."
-msgstr "向您的联系人展示您的桌面。"
+#: C/account-irc.page:81(item/title)
+#, fuzzy
+#| msgid "Select <gui>Edit Custom Message</gui>."
+msgid "<gui>Quit message</gui>"
+msgstr "选择<gui>编辑自定义消息</gui>。"
 
-#: C/share-desktop.page:18(name)
-msgid "Ekaterina Gerasimova"
-msgstr "Ekaterina Gerasimova"
+#: C/account-irc.page:82(item/p)
+msgid ""
+"When you go offline, a quit message is sent to all the chat rooms you’re in "
+"and to all the users you’re having a private conversation with. Use this "
+"field to provide a custom quit message."
+msgstr ""
+"当您离线时，一个退出消息会被发送给所有您加入的聊天室和正在与您进行私人聊天的"
+"用户。设置此项以提供自定义的退出消息。"
 
-#: C/share-desktop.page:19(email)
-msgid "kittykat3756@gmail.com"
-msgstr "kittykat3756@gmail.com"
+#: C/account-irc.page:94(info/title)
+#, fuzzy
+#| msgid "IRC Networks"
+msgctxt "link"
+msgid "IRC Networks"
+msgstr "IRC 网络"
 
-#: C/share-desktop.page:33(title)
-msgid "Share your desktop"
-msgstr "共享您的桌面"
+#: C/account-irc.page:97(section/title)
+msgid "Networks"
+msgstr "网络"
 
-#: C/share-desktop.page:35(p)
+#: C/account-irc.page:99(section/p)
 msgid ""
-"It is possible to share your desktop with some of your contacts. You can use "
-"this functionality to show your desktop to your contacts to, for example, "
-"ask for help or help your contacts resolve a problem."
+"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
+"another IRC network, you can add it to the list. You can also modify "
+"networks and remove them from the list."
 msgstr ""
-"您可以和联系人共享桌面。使用这个功能，您可以向联系人展示您的桌面，来寻求帮助"
-"或帮助联系人解决问题。"
+"<app>Empathy</app> 包括了一份常用 IRC 网络的列表。如果您想使用其他的 IRC 网"
+"络，您可以将其添加到这个列表中。您也可以修改网络或从列表中删除网络。"
 
-#: C/share-desktop.page:42(p)
+#: C/account-irc.page:104(item/p)
 msgid ""
-"To be able to share your desktop, you need to have a VNC server, which has "
-"support for the feature, installed on your system. <app>Vino</app>, the "
-"GNOME VNC server, has the required support."
+"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
+"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
 msgstr ""
-"要共享您的桌面，您的系统中必须安装支持此功能的 VNC 服务器。<app>Vino</app>，"
-"GNOME 的 VNC 服务器，就有这项功能。"
-
-#: C/share-desktop.page:51(p)
-msgid "From the <gui>Contact List</gui> window, do one of the following:"
-msgstr "在<gui>联系人列表</gui>窗口，执行下列操作之一："
+"要想列表中添加网络，点击<media type=\"image\" mime=\"image/png\" src="
+"\"figures/gtk-add.png\" width=\"16\" height=\"16\">添加</media>。"
 
-#: C/share-desktop.page:56(p)
+#: C/account-irc.page:107(item/p)
 msgid ""
-"Select the contact you want to share your desktop with and choose "
-"<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></"
-"guiseq>."
+"To modify a network in the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
+"height=\"16\">Edit</media>."
 msgstr ""
-"选择您想要共享您的桌面的联系人，并选择 <guiseq><gui>编辑</gui><gui>联系人</"
-"gui><gui>共享我的桌面</gui></guiseq>。"
+"要修改列表中的网络，选择那个网络并点击<media type=\"image\" mime=\"image/png"
+"\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">编辑</media>。"
 
-#: C/share-desktop.page:63(p)
+#: C/account-irc.page:110(item/p)
 msgid ""
-"Right-click on the name of the contact you want to share your desktop with "
-"and select <gui>Share My Desktop</gui>."
+"To remove a network from the list, select the network and click <media type="
+"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
+"height=\"16\">Remove</media>."
 msgstr ""
-"右键点击您想要共享您桌面的联系人的名字，然后选择<gui>共享我的桌面</gui>。"
+"要从列表中删除网络，选择要删除的网络并点击<media type=\"image\" mime=\"image/"
+"png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">删除</"
+"media>。"
 
-#: C/share-desktop.page:71(p)
+#: C/account-irc.page:115(section/p)
 msgid ""
-"An invitation to view your desktop will be sent to the contact you have "
-"selected. To view your desktop, they will need to accept it."
-msgstr ""
-"您选择的联系人会收到一个查看您桌面的邀请。要查看您的桌面，他们需要接受邀请。"
+"When adding or modifying a network, you can enter the following information:"
+msgstr "在添加或修改一个网络时，您可以输入下列信息："
 
-#: C/share-desktop.page:77(p)
+#: C/account-irc.page:121(item/p)
 msgid ""
-"You can disconnect the contact from your computer using your desktop sharing "
-"application."
-msgstr "在您的桌面共享程序中，您可以断开您的联系人到您的计算机的连接。"
+"This is the name of the network as you want it to appear in the list of "
+"networks."
+msgstr "这是您希望网络显示在网络列表中的名字。"
 
-#: C/share-desktop.page:82(p)
+#: C/account-irc.page:125(item/title)
+#, fuzzy
+#| msgid "<gui>Contact List</gui> window"
+msgid "<gui>Charset</gui>"
+msgstr "<gui>联系人列表</gui>窗口"
+
+#: C/account-irc.page:126(item/p)
 msgid ""
-"For more information about how to use the remote desktop sharing "
-"application, refer to its help."
-msgstr "如果需要更多关于如何使用远程桌面查共享程序的信息，请参看其帮助。"
+"This specifies the character encoding that is typically used on this "
+"network. A character encoding is a specific way of recording characters "
+"internally in a computer. There are many character encodings, and you need "
+"to use the same character encoding as other users to see their messages "
+"correctly."
+msgstr ""
+"这指明了网络上常用的字符编码。字符编码是计算机内部记录字符的一种特定方式。有"
+"许多不同的字符编码，您需要与其他用户使用同样的字符编码才能正确地看到他们的信"
+"息。"
 
-#: C/share-desktop.page:90(p)
+#: C/account-irc.page:135(item/p)
 msgid ""
-"When you share your desktop with someone else, it is possible to experience "
-"system performance slowdown and low Internet speed."
+"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
+"can handle text from most of the world's languages. Another common encoding "
+"for English and some other Western languages is ISO-8859-1."
 msgstr ""
-"当您与其他人共享您的桌面的时候，可能会出现系统性能降低和网络速度下降的现象。"
+"默认地，<app>Empathy</app> 使用 UTF-8，一种能够处理世界上大多数语言的现代化的"
+"字符编码。简体中文常用的编码还有 GB18030，GBK 和 GB2312。"
 
-#: C/share-desktop.page:96(p)
+#: C/account-irc.page:141(item/title)
+msgid "<gui>Servers</gui>"
+msgstr ""
+
+#: C/account-irc.page:142(item/p)
 msgid ""
-"Some of your contacts may not be able to use this feature. It is necessary "
-"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
-"compatible remote desktop viewer application installed in their system."
+"An IRC network may have many servers you can connect to. When you are "
+"connected to a server on a particular network, you can communicate with all "
+"users on all other servers on that network. You can add and remove servers "
+"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
 msgstr ""
-"并非您的所有联系人都可以使用这个功能。他们必须使用 2.28 或更新版本的 "
-"<app>Empathy</app> 并且在安装了兼容的远程桌面查看器程序。"
+"一个 IRC 网络可能有许多服务器供您连接。当您连接到一个特定网络的服务器后，您可"
+"以和同一网络中所有服务器的用户交流。您可以为一个网络添加或删除服务器，使用"
+"<gui>添加</gui>或<gui>删除</gui>按钮。"
 
-#: C/set-custom-status.page:9(desc)
-msgid "Add, edit or delete personal messages for your status."
-msgstr "为您的状态添加、编辑或删除个人消息。"
+#: C/account-irc.page:147(item/p)
+msgid ""
+"When a server is selected, click the field under <gui>Server</gui> or "
+"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
+"to focus the field, and press the space bar to begin editing."
+msgstr ""
+"当一个服务器被选择后，点击<gui>服务器</gui>或<gui>端口</gui>下方的字段来编辑"
+"它。或者，使用左右方向键来聚焦某个字段，并按空格键开始编辑。"
 
-#: C/set-custom-status.page:15(name)
-msgid "Jim Campbell"
-msgstr "Jim Campbell"
+#: C/account-irc.page:151(item/p)
+msgid ""
+"Select the check box in the <gui>SSL</gui> column to encrypt all "
+"communication with a server. Note that this does not prevent other users on "
+"the network from seeing what you write on public chat rooms."
+msgstr ""
+"选择 <gui>SSL</gui> 列中的复选框以加密与服务器间的所有通讯。注意这并不能意味"
+"着其他用户不能看到您在公共聊天室中的发言。"
 
-#: C/set-custom-status.page:16(email)
-msgid "jwcampbell@gmail.com"
-msgstr "jwcampbell@gmail.com"
+#: C/account-jabber.page:7(info/desc)
+msgid "Advanced options for Jabber and Google Talk accounts."
+msgstr "Jabber 和 Google Talk 帐号的高级选项。"
 
-#: C/set-custom-status.page:34(title)
-msgid "Set a custom message"
-msgstr "设置一个自定义消息"
+#: C/account-jabber.page:29(page/title)
+msgid "Jabber account details"
+msgstr "Jabber 帐号详情"
 
-#: C/set-custom-status.page:36(p)
+#: C/account-jabber.page:31(page/p)
 msgid ""
-"Sometimes you may want to set a custom message for your status, for example "
-"to let people know that you will be unavailable for a certain period of time."
+"Most Jabber accounts will require only a login ID and a password to connect. "
+"For some accounts or on certain types of networks, you may need to enter "
+"additional information in the <gui>Advanced</gui> section. Normally, you "
+"will not need to use the advanced options below. For general instructions on "
+"adding an account, see <link xref=\"add-account\"/>."
 msgstr ""
-"有时您也许想要为您的状态设置一个自定义消息，例如，让别人知道您可能在一段时间"
-"内不在。"
+"大多 Jabber 帐号只需要登录 ID 和密码就可以连接。但对于某些帐号或某些网络，您"
+"可能需要在<gui>高级</gui>选项卡中输入一些额外的信息。通常，您不需要使用下面的"
+"这些高级选项。添加帐号的一般指导参见<link xref=\"add-account\"/>。"
 
-#: C/set-custom-status.page:40(p)
+#: C/account-jabber.page:39(note/p)
 msgid ""
-"It is possible to set a custom message based on the different statuses "
-"available."
-msgstr "可以根据不同的状态来设置自定义消息。"
+"Google Talk is a type of Jabber account. These instructions hold for Google "
+"Talk accounts as well."
+msgstr "Google Talk 是一种 Jabber 帐号。这些指南对 Google Talk 帐号同样适用。"
 
-#: C/set-custom-status.page:46(p) C/set-custom-status.page:82(p)
-msgid ""
-"From the <gui>Contact List</gui> window, click on the drop-down list at the "
-"top."
-msgstr "在<gui>联系人列表</gui>窗口，点击顶部的下拉列表。"
+#: C/account-jabber.page:45(item/title)
+#, fuzzy
+#| msgid "Encryption required (TLS/SSL)"
+msgid "<gui>Encryption required (TLS/SSL)</gui>"
+msgstr "需要加密(TLS/SSL)"
 
-#: C/set-custom-status.page:52(p)
+#: C/account-jabber.page:46(item/title)
+#, fuzzy
+#| msgid "Ignore SSL certificate errors"
+msgid "<gui>Ignore SSL certificate errors</gui>"
+msgstr "忽略 SSL 证书错误"
+
+#: C/account-jabber.page:47(item/p)
 msgid ""
-"Select the status you want to add a custom message to. You have to select "
-"the one identified with the label <gui>Custom Message</gui>."
+"Whenever possible, communication between <app>Empathy</app> and the Jabber "
+"server is encrypted. If encrypted communication is not possible, messages "
+"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
+"<app>Empathy</app> from communicating with the Jabber server when encryption "
+"is not possible."
 msgstr ""
-"选择您希望添加自定义消息的状态。您必须选择有<gui>自定义消息</gui>标签标记的状"
-"态。"
+"只要有可能，<app>Empathy</app> 与 Jabber 服务器之间的通讯就会被加密。如果不可"
+"能加密，消息就可能被明文发送。选择<gui>需要加密</gui>以阻止不能加密时 "
+"<app>Empathy</app> 与 Jabber 服务器进行明文通讯。"
 
-#: C/set-custom-status.page:58(p)
+#: C/account-jabber.page:52(item/p)
 msgid ""
-"Enter your custom message in the text box at the top of the window, and "
-"press <key>Enter</key> to set the message."
+"Some Jabber servers may encrypt data using invalid certificates, or using "
+"certificates from unknown authorities. If you trust the server you are "
+"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
+"allow encrypted communication with invalid certificates."
 msgstr ""
-"在窗口顶部的文本框中输入您的自定义消息，然后按<key>Enter</key>来设定这个消"
-"息。"
+"有些 Jabber 服务器可能使用不合法的证书加密数据，或者使用来自未知的证书认证机"
+"构的证书。如果您信任您的服务器，您可以选择<gui>忽略 SSL 证书错误</gui>以允许"
+"使用不合法的证书进行加密通讯。"
 
-#: C/set-custom-status.page:64(p)
-msgid ""
-"If you want to set the custom message as a favorite, saving it in order to "
-"use it again, click on the little star on the right of the text box where "
-"you wrote your custom message."
+#: C/account-jabber.page:59(item/title)
+msgid "<gui>Resource</gui>"
 msgstr ""
-"如果您希望收藏一个自定义消息，即将它保存下来方便日后使用，请点击您撰写自定义"
-"消息的文本框右侧的小星星。"
 
-#: C/set-custom-status.page:69(p)
-msgid ""
-"If you do not do it, the custom message will not be available the next time "
-"you use <app>Empathy</app>. It will be saved only for the current session."
+#: C/account-jabber.page:60(item/title)
+msgid "<gui>Priority</gui>"
 msgstr ""
-"如果您不这么做，那么下次您使用 <app>Empathy</app> 的时候，这个自定义消息就不"
-"会再出现。它只在 <app>Empathy</app> 本次运行期间被保留。"
 
-#: C/set-custom-status.page:78(title)
-msgid "Edit, remove and add a custom message"
-msgstr "编辑、删除和添加自定义消息"
+#: C/account-jabber.page:61(item/p)
+msgid ""
+"If you have multiple applications (for instance, on separate computers) "
+"connected to your account at the same time, you can set a resource to "
+"uniquely identify each one. By default, <app>Empathy</app> will use "
+"<input>Telepathy</input> as the resource."
+msgstr ""
+"如果您有多个应用程序(比如，在另一台计算机上)同时连接了您的帐号，您可以设置“资"
+"源”以唯一地标识每一个连接的程序。默认地，<app>Empathy</app> 会使用 "
+"<input>Telepathy</input> 作为“资源”。"
 
-#: C/set-custom-status.page:88(p)
-msgid "Select <gui>Edit Custom Message</gui>."
-msgstr "选择<gui>编辑自定义消息</gui>。"
+#: C/account-jabber.page:65(item/p)
+msgid ""
+"You can set the priority to specify which application should receive "
+"incoming messages from your contacts. New messages will be sent to the "
+"application with the highest priority."
+msgstr ""
+"您可以设置优先级以指定哪一个程序优先收到您的联系人发送来的消息。新的消息会被"
+"发送给优先级最高的程序。"
 
-#: C/set-custom-status.page:95(p)
-msgid "To edit a custom message:"
-msgstr "要编辑自定义消息："
+#: C/account-jabber.page:70(item/title)
+#, fuzzy
+#| msgid "Override server settings"
+msgid "<gui>Override server settings</gui>"
+msgstr "覆盖服务器设置"
 
-#: C/set-custom-status.page:100(p)
+#: C/account-jabber.page:71(item/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"edit and double-click on it."
-msgstr "在<gui>已保存的自定义状态</gui>中，选择您想要编辑的状态消息并双击它。"
+"<app>Empathy</app> will use default settings to connect to the Jabber server "
+"based on your login ID. For some Jabber servers, you will need to enter "
+"custom server settings manually. These settings should be provided for you "
+"by your Jabber provider."
+msgstr ""
+"<app>Empathy</app> 会根据您的登录 ID 以默认的设置连接 Jabber 服务器。对某些 "
+"Jabber 服务器，您需要人工输入一些服务器设置。这些设置应该由您的 Jabber 服务提"
+"供商提供。"
 
-#: C/set-custom-status.page:106(p)
-msgid "Type the new custom message and press <key>Enter</key> to modify it."
-msgstr "输入新的自定义消息并且按<key>Enter</key>来修改它。"
+#: C/accounts-window.page:11(info/desc)
+msgid "Add, modify, and delete accounts."
+msgstr "添加、修改和删除帐号。"
 
-#: C/set-custom-status.page:113(p)
-msgid "To remove a custom message:"
-msgstr "要删除自定义消息："
+#: C/accounts-window.page:33(page/title)
+msgid "Accounts Window"
+msgstr "帐号窗口"
 
-#: C/set-custom-status.page:118(p)
+#: C/accounts-window.page:35(page/p)
 msgid ""
-"From the <gui>Saved Presets</gui> box, select the status message you want to "
-"remove."
-msgstr "在<gui>已保存的自定义状态</gui>中，选择要删除的状态消息。"
-
-#: C/set-custom-status.page:124(p)
-msgid "Click on the <gui>Remove</gui> button."
-msgstr "点击<gui>删除</gui>按钮。"
+"The <gui>Accounts</gui> window allows you to add, modify, and delete "
+"accounts."
+msgstr "<gui>帐号</gui>窗口允许您添加、修改和删除帐号。"
 
-#: C/set-custom-status.page:131(p)
-msgid ""
-"To add a new custom message, from the <gui>Add New Preset</gui> section:"
-msgstr "要添加一条新的自定义消息，在<gui>添加新自定义状态</gui>选项卡："
+#: C/accounts-window.page:43(section/title)
+msgid "Account Details"
+msgstr "帐号详细信息"
 
-#: C/set-custom-status.page:136(p)
+#: C/accounts-window.page:44(section/p)
 msgid ""
-"Click on the drop-down list to select the status you want to set a custom "
-"message to."
-msgstr "点击下拉列表选择您想要设定自定义消息的状态。"
-
-#: C/set-custom-status.page:142(p)
-msgid "Click on the text box, and type the new custom message."
-msgstr "点击文本框，输入新的自定义消息。"
+"For most types of accounts, you can simply enter a login ID and a password. "
+"Certain accounts or account types, however, may require additional "
+"information."
+msgstr ""
+"对于大多数的帐号，您只需要输入登录 ID 和密码。但有些帐号或有些类型的帐号可能"
+"需要额外的信息。"
 
-#: C/set-custom-status.page:147(p)
-msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
-msgstr "点击<gui>添加</gui>将新消息添加到已保存的的自定义消息列表中。"
+#: C/add-account.page:9(info/desc)
+msgid "Add a new account to <app>Empathy</app>."
+msgstr "向 <app>Empathy</app> 添加新帐号。"
 
-#: C/set-custom-status.page:156(p)
-msgid "When finished, click on <gui>Close</gui>."
-msgstr "完成后，点击<gui>关闭</gui>。"
+#: C/add-account.page:40(page/title)
+msgid "Add a new account"
+msgstr "添加一个新帐号"
 
-#: C/set-custom-status.page:163(p)
+#: C/add-account.page:42(page/p)
 msgid ""
-"When you edit or add a new custom message, it will not be set as the current "
-"status message. You will need to select it from the <gui>Contact List</gui> "
-"window."
+"You can add instant messaging accounts from any supported service to "
+"communicate with all of your contacts in <app>Empathy</app>. For some "
+"account providers, these steps will also allow you to register for a new "
+"account. For more details, see <link xref=\"create-account\"/>."
 msgstr ""
-"当你编辑或添加新自定义消息的时候，它不会被设为当前状态消息。您需要在<gui>联系"
-"人列表</gui>窗口中选中它。"
-
-#: C/send-message.page:8(desc)
-msgid "Send a message to one of your contacts."
-msgstr "发送消息给一个您的联系人。"
-
-#: 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"
+"您可以添加任何支持的服务的即时消息帐号，以在 <app>Empathy</app> 中与您的联系"
+"人交流。对于某些帐号提供商，这些步骤也允许您注册新帐号。更多细节参见<link "
+"xref=\"create-account\"/>。"
 
-#: 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/add-account.page:49(item/p) C/disable-account.page:49(item/p)
+#: C/irc-nick-password.page:50(item/p) C/remove-account.page:43(item/p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
+#| "gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</gui> "
+"<gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+msgstr ""
+"在<gui>联系人列表</gui>窗口中，选择<guiseq><gui>编辑</gui><gui>帐号</gui></"
+"guiseq>，或按<key>F4</key>。"
 
-#: C/send-message.page:32(title)
-msgid "Send a message to someone"
-msgstr "向某人发送消息"
+# 这个在显示时，也是一个“+“，建议保留
+#: C/add-account.page:53(item/p)
+msgid "Click <gui style=\"button\">+</gui>."
+msgstr "点击<gui style=\"button\">+</gui>。"
 
-#: C/send-message.page:36(p)
+#: C/add-account.page:58(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, double-click the name of the "
-"contact that you want to have a conversation with."
-msgstr "在<gui>联系人列表</gui>窗口中，双击要与之聊天的联系人的名字。"
+"From the <gui>Protocol</gui> drop-down list, select the type of account you "
+"wish to add."
+msgstr "在<gui>协议</gui>下拉列表，选择您要创建的帐号类型。"
 
-#: C/send-message.page:42(p)
+#: C/add-account.page:62(item/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."
+"If you do not already have a registered account, select <gui>Create a new "
+"account on the server</gui>. This feature is not available for all account "
+"types, and may not work with some account providers. See <link xref=\"create-"
+"account\"/> for more information."
 msgstr ""
-"一个新窗口会被打开。在窗口底部的文本框中输入一条消息，然后按<key>Enter</key>"
-"发送。"
-
-#: C/send-message.page:50(title)
-msgid "Send a message to a meta-contact"
-msgstr "向一位元联系人发送消息"
+"如果您还没有注册帐号，选择<gui>在服务器上创建新的帐号</gui>。这个功能并不是对"
+"于每一种帐号都可用，也可能对于某些帐号提供商不可用。更多信息参见<link xref="
+"\"create-account\"/>。"
 
-#: C/send-message.page:58(p)
+#: C/add-account.page:69(item/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Chat</gui>."
+"Enter the required information. For most accounts, you will only need a "
+"login ID and a password. Some accounts may require additional information. "
+"See <link xref=\"accounts-window#details\"/>for more information."
 msgstr ""
-"选择您想要与之聊天的联系人，并在菜单中选择 <gui style=\"menuitem\">聊天</"
-"gui>。"
-
-#: C/send-file.page:8(desc)
-msgid "Send a file from your computer to one of your contacts."
-msgstr "从您的计算机发送文件给您的联系人。"
-
-#: C/send-file.page:36(title)
-msgid "Send files"
-msgstr "发送文件"
-
-#: 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>窗口，执行下列操作之一："
+"输入必要的信息。对于大多数帐号，您只需要输入登录 ID 和密码。有些帐号可能需要"
+"更多信息。参见<link xref=\"accounts-window#details\"/>获取更多信息。"
 
-#: C/send-file.page:45(p)
-msgid ""
-"Right click on the contact you want to send a file to, and choose <gui>Send "
-"file</gui>."
-msgstr "右键点击要向其发送文件的联系人，然后选择<gui>发送文件</gui>。"
+#: C/add-account.page:74(item/p) C/import-account.page:61(item/p)
+#: C/irc-nick-password.page:63(item/p)
+msgid "Click <gui style=\"button\">Apply</gui>."
+msgstr "点击<gui style=\"button\">应用</gui>。"
 
-#: C/send-file.page:50(p)
+#: C/add-account.page:81(note/p)
 msgid ""
-"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
-"gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+"To change the name that identifies the account in the <gui>Accounts</gui> "
+"window, select the account from the list on the left and either click on the "
+"name or press the space bar. Edit the account name and press <key>Enter</"
+"key> when you’re finished."
 msgstr ""
-"点击要向其发送文件的联系人，然后选择<guiseq><gui>编辑</gui><gui>联系人</"
-"gui><gui>发送文件</gui></guiseq>。"
+"要改变帐号在<gui>帐号</gui>窗口中的作为标识的名字，在左侧的列表中选择帐号，然"
+"后点击名字或者按空格键。编辑帐号的名字，完成后按<key>Enter</key>。"
 
-#: C/send-file.page:58(p)
-msgid "Select the file to send, and click on <gui>Send</gui>."
-msgstr "选择要发送的文件，并点击<gui>发送</gui>。"
+#: C/add-contact.page:9(info/desc)
+msgid "Add someone to the contact list."
+msgstr "添加某人到联系人列表。"
 
-#: C/send-file.page:63(p)
-msgid "The <gui>File Transfers</gui> window will appear."
-msgstr "<gui>文件传输</gui>窗口会被显示。"
+#: C/add-contact.page:18(credit/name) C/change-status.page:24(credit/name)
+#: C/prob-conn-acctdisabled.page:15(credit/name)
+#: C/prob-conn-auth.page:17(credit/name)
+#: C/prob-conn-neterror.page:15(credit/name) C/prob-conn.page:14(credit/name)
+#: C/send-file.page:17(credit/name) C/send-message.page:17(credit/name)
+msgid "Phil Bull"
+msgstr "Phil Bull"
 
-#: C/send-file.page:66(p)
-msgid ""
-"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
-"to halt the transfer."
-msgstr "请等待您的联系人接受文件传输，或点击<gui>停止</gui>来终止传输。"
+#: C/add-contact.page:33(page/title)
+msgid "Add someone to your list of contacts"
+msgstr "添加某人到您的联系人列表"
 
-#: C/send-file.page:72(p)
-msgid ""
-"Once the transfer is finished, it is possible to close the <gui>File "
-"Transfers</gui> window."
-msgstr "传输结束之后，就可以关闭<gui>文件传输</gui>窗口了。"
+#: C/add-contact.page:37(item/p)
+msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
+msgstr "选择<guiseq><gui>聊天</gui><gui>添加联系人</gui></guiseq>。"
 
-#: C/send-file.page:80(p)
+#: C/add-contact.page:40(item/p)
 msgid ""
-"If you have multiple finished transfers listed in the window, click on "
-"<gui>Clear</gui> to empty the list. This will only remove the files from the "
-"list and will not delete them from your computer."
+"From the <gui>Account</gui> drop-down list, select the account you wish to "
+"use to connect to your contact. Your contact will need to be using the same "
+"service as the account you select."
 msgstr ""
-"如果窗口中列出了很多已经完成的传输，点击<gui>清除</gui>可以清空列表。这只会将"
-"列表清空，而不会从您的计算机上删除这些文件。"
+"在 <gui>帐号</gui> 下拉列表中，选择您用来与您的联系人联系的帐号。您的联系人需"
+"要使用与您选择的帐号相同的服务。"
 
-#: C/send-file.page:87(p)
+#: C/add-contact.page:45(item/p)
 msgid ""
-"It is possible to send files only using the following services: <em>Jabber</"
-"em>, <em>Google Talk</em> and <em>People Nearby</em>."
+"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
+"screen name, or other appropriate identifier for the service type."
 msgstr ""
-"只有使用下列服务才能发送文件：<em>Jabber</em>、<em>Google Talk</em>和<em>附近"
-"的人</em>。"
+"在 <gui>标识符</gui> 一栏中，输入这种服务中您的联系人的登录 ID，用户名，显示"
+"名或其他合适的标识符。"
 
-#: C/send-file.page:93(p)
+#: C/add-contact.page:49(item/p)
 msgid ""
-"In order to send a file to someone, you need to be connected to the "
-"Internet, or to a local area network."
-msgstr "要向别人发送文件，您需要连接到互联网，或本地局域网。"
+"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
+"to appear in your contact list."
+msgstr "在 <gui>别名</gui> 中，输入您希望这个联系人显示在联系人列表中的名字。"
 
-#: C/salut-protocol.page:8(desc)
-msgid "Understanding the People Nearby feature."
-msgstr "理解附近的人(People Nearby)功能"
+#: C/add-contact.page:53(item/p)
+msgid "Click <gui>Add</gui> to add the person to your list of contacts."
+msgstr "点击<gui>添加</gui>将此人添加到您的联系人列表。"
 
-#: C/salut-protocol.page:33(title)
-msgid "What is People Nearby?"
-msgstr "什么是“附近的人”？"
+#: C/add-contact.page:61(note/p)
+msgid ""
+"To add a new person to your list of contacts, you need to be connected to "
+"the Internet and to your account."
+msgstr "要添加联系人到您的联系人列表，您需要连接因特网和您的帐号。"
+
+#: C/audio-call.page:10(info/desc)
+msgid "Call your contacts over the Internet."
+msgstr "通过互联网呼叫您的联系人。"
 
-#: C/salut-protocol.page:37(p)
-msgid "I'd like to see this played up a bit more."
-msgstr "我希望看到更多的人来用这个。"
+#: C/audio-call.page:26(credit/name) C/overview.page:16(credit/name)
+#: C/share-desktop.page:18(credit/name) C/video-call.page:29(credit/name)
+msgid "Ekaterina Gerasimova"
+msgstr "Ekaterina Gerasimova"
+
+#: C/audio-call.page:35(page/title)
+msgid "Start an audio conversation"
+msgstr "开始语音聊天"
 
-#: C/salut-protocol.page:40(p)
+#: C/audio-call.page:37(page/p)
+#, fuzzy
+#| 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."
 msgid ""
-"The People Nearby service is a serverless communication service: you do not "
-"need to connect and authenticate to a central server in order to use it."
+"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 ""
-"附近的人(People Nearby)服务是一个无服务器的通讯服务：您不需要连接并认证到一个"
-"中央服务器来使用这个功能。"
+"您可以呼叫您的联系人，与他们进行语音聊天。这个功能仅对于一些特定类型的帐号可"
+"用，并且需要另一个人使用的应用程序也支持语音呼叫。"
 
-#: C/salut-protocol.page:45(p)
+#: C/audio-call.page:43(item/p)
+#, fuzzy
+#| msgid ""
+#| "Select the contact you want to have the conversation, and from the menu "
+#| "select <gui style=\"menuitem\">Audio Call</gui>."
 msgid ""
-"This kind of serverless messaging system is restricted to a local area "
-"network and an active Internet connection is not necessary."
-msgstr "这类无服务器的通讯系统只局限于本地局域网，并且不需要互联网链接。"
+"Right-click on the contact that you want to call and select <gui style="
+"\"menuitem\">Audio Call</gui>."
+msgstr ""
+"选择您想要交谈的联系人，然后在菜单中选择<gui style=\"menuitem\">语音呼叫</"
+"gui>。"
 
-#: C/salut-protocol.page:49(p)
+#: C/audio-call.page:49(item/p) C/video-call.page:50(item/p)
+#, fuzzy
+#| 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."
 msgid ""
-"The people that use this service inside the same local area network will be "
-"auto-discovered, and it will be possible to send them messages and files as "
-"with other services."
+"A new window will open. When the connection is established, you will see the "
+"total conversation time at the bottom of the window."
 msgstr ""
-"会自动的发现在同一个局域网中使用这个服务的人，并且可以给他们发送消息甚至文"
-"件，想其它服务一样。"
+"一个新窗口会被打开。连接建立后，您将在窗口底部看到<gui>已连接</gui>，以及总会"
+"话时间。"
 
-#: C/salut-protocol.page:54(p)
+#: C/audio-call.page:55(item/p)
+#, fuzzy
+#| msgid ""
+#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgid ""
-"All the modern local area networks should be able to support this kind of "
-"service."
-msgstr "所有现代的本地局域网都应该可以支持这类服务。"
+"To end the conversation, click the <gui style=\"button\">hand up</gui> "
+"button."
+msgstr "点击<gui style=\"button\">挂断</gui>以结束会话。"
 
-#: C/remove-account.page:8(desc)
-msgid "Completely remove an account from <app>Empathy</app>."
-msgstr "从 <app>Empathy</app> 中完全地删除一个账户。"
+#: C/audio-call.page:63(note/p)
+#, fuzzy
+#| msgid ""
+#| "To turn an audio conversation into a video conversation, choose "
+#| "<guiseq><gui style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</"
+#| "gui></guiseq>."
+msgid ""
+"To turn an audio conversation into a video conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui> <gui style=\"menuitem\">Video On</gui></guiseq>."
+msgstr ""
+"要将语音会话转为视频会话，选择 <guiseq><gui style=\"menu\">视频</gui><gui "
+"style=\"menuitem\">视频开启</gui></guiseq>。"
 
-#: C/remove-account.page:33(title)
-msgid "Remove an account"
-msgstr "删除账户"
+#: C/audio-call.page:71(section/title)
+msgid "Start an audio conversation with a meta-contact"
+msgstr "向一位元联系人发起语音会话"
 
-#: C/remove-account.page:35(p)
+#: C/audio-call.page:74(item/p) C/send-message.page:53(item/p)
+#: C/video-call.page:68(item/p)
 msgid ""
-"You can completely remove an account from <app>Empathy</app> if you no "
-"longer wish to use the account. If you wish to use the account in "
-"<app>Empathy</app> again in the future, you will have to add your account "
-"details again."
-msgstr ""
-"如果你不想再使用某个账户，您可以从 <app>Empathy</app> 中完全地删除这个账户。"
-"如果您将来又希望在 <app>Empathy</app> 中使用这个账户了，您可以再添加这个账"
-"户。"
+"From the <gui>Contact List</gui> window, right-click on the meta-contact."
+msgstr "在<gui>联系人列表</gui>窗口，右键点击该元联系人。"
 
-#: C/remove-account.page:42(p) C/irc-nick-password.page:50(p)
-#: C/disable-account.page:48(p) C/add-account.page:48(p)
+#: C/audio-call.page:79(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Edit</"
-"gui><gui>Accounts</gui></guiseq>, or press <key>F4</key>."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Audio Call</gui>."
 msgstr ""
-"在<gui>联系人列表</gui>窗口中，选择<guiseq><gui>编辑</gui><gui>账户</gui></"
-"guiseq>，或按<key>F4</key>。"
+"选择您想要交谈的联系人，然后在菜单中选择<gui style=\"menuitem\">语音呼叫</"
+"gui>。"
 
-#: C/remove-account.page:46(p)
+#: C/audio-call.page:86(note/p) C/send-message.page:65(note/p)
+#: C/video-call.page:80(note/p)
 msgid ""
-"Select the account you wish to remove from the accounts list on the left "
-"side of the window."
-msgstr "在窗口左侧的账户列表中选择您想要删除的账户。"
+"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 ""
+"要识别一个联系人是否是<em>元联系人</em>，将您的鼠标移动到<gui>联系人列表</"
+"gui>窗口中的一个联系人上，并停留几秒钟：一个小弹出消息会显示这个元联系人是由"
+"几个联系人组成的。"
 
-#: C/remove-account.page:50(p)
-msgid "Click on <gui style=\"button\">Remove</gui>."
-msgstr "点击<gui style=\"button\">删除</gui>。"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/audio-video.page:58(media)
+msgctxt "_"
+msgid "external ref='figures/audio-input-microphone.png' md5='__failed__'"
+msgstr ""
 
-#: C/remove-account.page:53(p)
-msgid ""
-"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
-"button to permanently remove the account."
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/audio-video.page:70(media)
+msgctxt "_"
+msgid "external ref='figures/camera-web.png' md5='__failed__'"
 msgstr ""
-"一个弹出对话框会要求您确认删除。点击<gui>删除</gui>按钮来永久的删除这个账户。"
 
-#: C/remove-account.page:59(p)
+#: C/audio-video.page:8(info/desc)
 msgid ""
-"Even after removing an account, <app>Empathy</app> does not delete your "
-"conversation history for that account."
-msgstr "即使删除了账户，<app>Empathy</app> 也不会删除这个账户的聊天记录。"
-
-#: C/prob-conn.page:7(desc)
-msgid "Diagnose common problems connecting to an instant messaging service."
-msgstr "诊断连接到一个即时消息服务的常见问题。"
-
-#: C/prob-conn.page:29(title)
-msgid "Problems connecting to an instant messaging service"
-msgstr "连接到即时消息服务时的问题"
+"Information on when it is possible to have an audio or video conversation."
+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/prob-conn-neterror.page:58(None) C/prob-conn-name.page:43(None)
-#: C/prob-conn-auth.page:58(None) C/account-irc.page:109(None)
-msgid "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
-msgstr "@@image: 'figures/gtk-edit.png'; md5=4f21b451732817be0604fe3e2c8da98b"
+#: C/audio-video.page:32(page/title)
+msgid "Audio and video support"
+msgstr "语音和视频支持"
 
-#: C/prob-conn-neterror.page:7(desc)
+#: C/audio-video.page:34(page/p)
 msgid ""
-"An error message which says “<gui>Network error</gui>” appears in the main "
-"window."
-msgstr "主窗口中显示了一个错误提示信息，“<gui>网络错误</gui>”。"
+"You can only have audio and video conversation with contacts who are using "
+"an application which also supports this feature. When your contacts support "
+"audio or video conversations, you will see the following icons next to their "
+"names in the contact list:"
+msgstr ""
+"您的联系人也在使用支持语音和视频会话的程序时，您才可以和他们进行语音、视频会"
+"话。如果您的联系人可以进行语音或视频会话，您将在联系人列表中他们的姓名旁看到"
+"下列图标："
 
-#: C/prob-conn-neterror.page:33(title)
-msgid "I get a message that says “Network error”"
-msgstr "我收到“网络错误”的错误提示信息"
+#: C/audio-video.page:43(td/p)
+msgid "Icon"
+msgstr "图标"
 
-#: C/prob-conn-neterror.page:36(cite)
-msgid "shaunm"
-msgstr "shaunm"
+#: C/audio-video.page:48(td/p)
+msgid "Description"
+msgstr "描述"
 
-#: C/prob-conn-neterror.page:37(p)
+#: C/audio-video.page:57(td/p)
+#, fuzzy
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"Empathy no longer allows you to create an IRC account without a valid nick. "
-"I've removed the guide link. Remove the text."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/audio-input-"
+"microphone.png\"> Icon for audio conversation </media>"
 msgstr ""
+"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/prob-conn-neterror.page:41(p)
+#: C/audio-video.page:64(td/p)
+msgid "The contact is able to have an audio conversation."
+msgstr "联系人可以进行语音聊天。"
+
+#: C/audio-video.page:69(td/p)
+#, fuzzy
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"This kind of error happens when <app>Empathy</app> cannot communicate with "
-"the instant messaging service for some reason."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/camera-web.png\"> "
+"Icon for video conversation </media>"
 msgstr ""
-"这种错误在 <app>Empathy</app> 由于某种原因而无法和即时通讯服务器连上时出现。"
+"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/prob-conn-neterror.page:45(p)
+#: C/audio-video.page:76(td/p)
+msgid "The contact is able to have a video conversation."
+msgstr "联系人可以进行视频聊天。"
+
+#: C/audio-video.page:83(note/p)
 msgid ""
-"Also, this kind of error happens when you try to use an IRC account without "
-"setting a nickname."
-msgstr "此外，这种错误也在您试图不设置昵称而使用 IRC 账户时出现。"
+"In order to have an audio conversation, you need to have a sound card that "
+"is supported by your operating system, and a working microphone."
+msgstr ""
+"要进行语音聊天，您需要有一块声卡，且您的操作系统必需支持它，还需要一个能正常"
+"工作的麦克风。"
 
-#: C/prob-conn-neterror.page:52(p) C/prob-conn-auth.page:45(p)
-#: C/prob-conn-acctdisabled.page:43(p)
+#: C/audio-video.page:87(note/p)
 msgid ""
-"Make sure that you are connected to the Internet, or to a local area network."
-msgstr "确保您已经连接到互联网，或者一个本地网络。"
+"In order to have a video conversation, you need to have a webcam that is "
+"supported by your operating system, and a working microphone."
+msgstr "要进行视频聊天，您需要操作系统支持的摄像头，及可以正常工作的麦克风。"
 
-#: C/prob-conn-neterror.page:57(p) C/prob-conn-name.page:42(p)
-#: C/prob-conn-auth.page:57(p)
+#: C/audio-video.page:95(section/title)
+msgid "Supported Account Types"
+msgstr "支持的帐号类型"
+
+#: C/audio-video.page:97(section/p)
 msgid ""
-"Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png"
-"\">edit</media> icon in the error message."
+"You can only have audio and video conversations using accounts on certain "
+"supported services. The following table lists whether audio and video is "
+"supported for each type of account."
 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)
+#: C/audio-video.page:102(note/p)
 msgid ""
-"Check in the <gui>Advanced</gui> section that all the details are correct. "
-"You should be able to find these details from the website of the messaging "
-"service."
+"Account types are provided by plugins. Your system may not have all of the "
+"following types available, or it may have types not listed here. Updated "
+"plugins may make audio or video conversations possible on account types that "
+"are listed as unsupported here."
 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 "取消选择<gui>已启用</gui>，然后再次选中以重新连接到服务器。"
+#: C/audio-video.page:128(td/p)
+msgid "Service"
+msgstr "服务"
 
-#: C/prob-conn-neterror.page:90(title)
-msgid "Proxy support"
-msgstr "代理支持"
+#: C/audio-video.page:129(td/p)
+msgid "Audio"
+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 "目前 <app>Empathy</app> 无法在代理下工作。"
+#: C/audio-video.page:130(td/p)
+msgid "Video"
+msgstr "视频"
 
-#: C/prob-conn-name.page:9(title)
-msgid "“Name in use”"
-msgstr "“用户名已经被占用”"
+#: C/audio-video.page:135(td/p)
+msgid "AIM"
+msgstr "AIM"
 
-#: C/prob-conn-name.page:10(desc)
-msgid ""
-"An error message which says “<gui>Name in use</gui>” appears in the main "
-"window."
-msgstr "主窗口中显示了一个错误提示信息，“<gui>用户名已被占用</gui>”。"
+#: C/audio-video.page:136(td/p) C/audio-video.page:137(td/p)
+#: C/audio-video.page:141(td/p) C/audio-video.page:142(td/p)
+#: C/audio-video.page:146(td/p) C/audio-video.page:147(td/p)
+#: C/audio-video.page:156(td/p) C/audio-video.page:157(td/p)
+#: C/audio-video.page:161(td/p) C/audio-video.page:162(td/p)
+#: C/audio-video.page:166(td/p) C/audio-video.page:167(td/p)
+#: C/audio-video.page:181(td/p) C/audio-video.page:182(td/p)
+#: C/audio-video.page:186(td/p) C/audio-video.page:187(td/p)
+#: C/audio-video.page:191(td/p) C/audio-video.page:192(td/p)
+#: C/audio-video.page:196(td/p) C/audio-video.page:197(td/p)
+#: C/audio-video.page:201(td/p) C/audio-video.page:202(td/p)
+#: C/audio-video.page:211(td/p) C/audio-video.page:212(td/p)
+#: C/audio-video.page:216(td/p) C/audio-video.page:217(td/p)
+msgid "No"
+msgstr "否"
 
-#: C/prob-conn-name.page:32(title)
-msgid "I get a message that says “Name in use”"
-msgstr "我收到“用户名已经被占用”的错误提示信息"
+#: C/audio-video.page:140(td/p)
+msgid "Facebook Chat"
+msgstr "Facebook 聊天"
 
-#: C/prob-conn-name.page:34(p)
-msgid ""
-"This kind of error happens when you try to connect to your IRC account and "
-"you are using a nickname that is already being used by someone else on that "
-"particular network."
-msgstr ""
-"这种错误出现在您尝试连接到 IRC 账户，然而您使用的昵称正在被该网络上其他人使用"
-"的情况下。"
+#: C/audio-video.page:145(td/p)
+msgid "gadugadu"
+msgstr "gadugadu"
 
-#: C/prob-conn-name.page:50(p)
-msgid "In the <gui>Nickname</gui> text box, type a new nickname."
-msgstr "在<gui>昵称</gui>文本框中，输入一个新昵称。"
+#: C/audio-video.page:150(td/p)
+msgid "Google Talk"
+msgstr "Google Talk"
 
-#: C/prob-conn-name.page:55(p)
-msgid ""
-"If you have registered that nickname within the network you are using, set "
-"the password for that nickname. For more information, see <link xref=\"irc-"
-"nick-password\"/>."
-msgstr ""
-"如果您在所用的网路中注册了这个昵称，请为该昵称设置密码。更多信息参见<link "
-"xref=\"irc-nick-password\"/>。"
+#: C/audio-video.page:151(td/p) C/audio-video.page:152(td/p)
+#: C/audio-video.page:171(td/p) C/audio-video.page:172(td/p)
+#: C/audio-video.page:176(td/p) C/audio-video.page:177(td/p)
+#: C/audio-video.page:206(td/p) C/audio-video.page:207(td/p)
+msgid "Yes"
+msgstr "是"
 
-#: 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/audio-video.page:155(td/p)
+msgid "Groupwise"
+msgstr "Groupwise"
 
-#: C/prob-conn-auth.page:8(desc)
-msgid ""
-"An error message which says “<gui>Authentication failed</gui>” appears in "
-"the main window."
-msgstr "主窗口中显示了一个错误提示信息，“<gui>验证失败</gui>”。"
+#: C/audio-video.page:160(td/p)
+msgid "ICQ"
+msgstr "ICQ"
 
-#: C/prob-conn-auth.page:36(title)
-msgid "I get a message that says “Authentication failed”"
-msgstr "我收到“验证失败”的错误提示信息"
+#: C/audio-video.page:165(td/p) C/create-account.page:107(section/title)
+msgid "IRC"
+msgstr "IRC"
 
-#: C/prob-conn-auth.page:38(p)
-msgid ""
-"This kind of error happens when your instant messaging service is not "
-"allowing you to connect because it does not recognize your username or "
-"password for some reason."
-msgstr ""
-"这种错误发生在您的即时通信服务器无法确认您的身份，不允许您连接时。比如，因为"
-"某种原因，它无法识别您的用户名或者密码。"
+#: C/audio-video.page:170(td/p) C/create-account.page:60(section/title)
+msgid "Jabber"
+msgstr "Jabber"
 
-#: C/prob-conn-auth.page:50(p)
-msgid ""
-"Make sure that you have registered an account with the service you are "
-"trying to connect to. If you do not have an account, most services will not "
-"allow you to connect."
-msgstr ""
-"确保您已经在要连接的服务上注册了账户。如果没有账户，多数服务都不会允许您连"
-"接。"
+#: C/audio-video.page:175(td/p)
+msgid "MSN"
+msgstr "MSN"
 
-#: 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 "再次输入您的用户名和密码，以确保它们是正确的。"
+#: C/audio-video.page:180(td/p)
+msgid "myspace"
+msgstr "myspace"
 
-#: 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 "您要连接的即时通信账户没有在账户列表中启用。"
+#: C/audio-video.page:185(td/p)
+msgid "qq"
+msgstr "qq"
 
-#: C/prob-conn-acctdisabled.page:33(title)
-msgid "My account is not enabled"
-msgstr "我的账户没有启用"
+#: C/audio-video.page:190(td/p) C/create-account.page:78(section/title)
+msgid "People Nearby"
+msgstr "附近的人"
 
-#: C/prob-conn-acctdisabled.page:35(p)
-msgid ""
-"If the instant messaging account that you want to use is not enabled in the "
-"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/audio-video.page:195(td/p)
+msgid "sametime"
+msgstr "sametime"
 
-#: 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/audio-video.page:200(td/p)
+msgid "silc"
+msgstr "silc"
 
-#: 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/audio-video.page:205(td/p) C/create-account.page:89(section/title)
+msgid "SIP"
+msgstr "SIP"
 
-#: C/prev-conv.page:8(desc)
-msgid "Browse or search your previous conversations."
-msgstr "浏览或搜索您之前的会话。"
+#: C/audio-video.page:210(td/p)
+msgid "Yahoo!"
+msgstr "Yahoo!"
 
-#: C/prev-conv.page:35(title)
-msgid "View previous conversations"
-msgstr "查看之前的会话"
+#: C/audio-video.page:215(td/p)
+msgid "zephyr"
+msgstr "zephyr"
 
-#: C/prev-conv.page:39(p)
-msgid ""
-"Highlighting text is quirky: <link href=\"http://bugzilla.gnome.org/show_bug."
-"cgi?id=593733\">#593733</link>. If there's an actual highlighting going on, "
-"independent of the selection (like in yellow or something), we can use the "
-"term \"highlight\". Otherwise we need to use the term \"select\". Watch that "
-"bug."
-msgstr ""
+#: C/change-status.page:9(info/desc)
+msgid "Change your status to advertise your availability to your contacts."
+msgstr "改变您的状态以向您的联系人表明您是否闲暇。"
 
-#: C/prev-conv.page:46(p)
+#: C/change-status.page:39(page/title)
+msgid "Change your status"
+msgstr "改变您的状态"
+
+#: C/change-status.page:41(page/p)
 msgid ""
-"<app>Empathy</app> automatically saves all your text conversations you have "
-"with your contacts. You can <link xref=\"#search\">search through all of "
-"your previous conversations</link> or <link xref=\"#browse\">browse previous "
-"conversations</link> by contact and date."
+"You can set your status to indicate your availability to your contacts. "
+"<app>Empathy</app> allows you to select from a list of defined statuses."
 msgstr ""
-"<app>Empathy</app> 自动保存您和联系人的所有文字会话。您可以<link xref="
-"\"#search\">搜索之前全部的会话</link>或者根据联系人和日期<link xref=\"#browse"
-"\">浏览之前的会话</link>。"
+"您可以改变您的状态，从而向联系人表明您现在是否闲暇。<app>Empathy</app> 允许您"
+"从一些定义好的状态中选择一个。"
 
-#: C/prev-conv.page:54(p)
+#: C/change-status.page:46(item/p)
 msgid ""
-"You do not need to be connected to the Internet to view and search your "
-"previous conversations."
-msgstr "您不需要连接到网络来查看和搜索您之前的会话。"
+"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
+msgstr "点击 <gui>联系人列表</gui> 窗口顶部的下拉列表。"
 
-#: C/prev-conv.page:61(title)
-msgid "Search previous conversations"
-msgstr "搜索之前的会话"
+#: C/change-status.page:51(item/p)
+msgid "Select a status from the list."
+msgstr "从列表中选择一个状态。"
 
-#: C/prev-conv.page:63(p)
+#: C/change-status.page:57(page/p)
 msgid ""
-"You can perform a full-text search through all of your previous "
-"conversations."
-msgstr "您可以在之前的所有会话中进行全文搜索。"
+"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
+"what they mean. You can also <link xref=\"set-custom-status\">add custom "
+"status messages</link> to provide more information about your availability "
+"to your contacts."
+msgstr ""
+"内置状态及其含义参见<link xref=\"status-icons\"/>。您也可以<link xref=\"set-"
+"custom-message\">添加自定义消息</link>来向您的联系人提供更多有关您当前状态的"
+"信息。"
 
-#: C/prev-conv.page:67(p) C/prev-conv.page:96(p)
+#: C/change-status.page:63(note/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
-"<key>F3</key>."
+"If you do not use your computer for a while, or if the screensaver is on, "
+"the status will be automatically set to Away."
 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 "选择<gui>搜索</gui>标签。"
+#: C/create-account.page:9(info/desc)
+msgid "Register for an account with one of the supported messaging services."
+msgstr "为某种支持的服务注册帐号。"
 
-#: C/prev-conv.page:74(p)
-msgid ""
-"In the <gui>For</gui> field, type the text you want to search for. Click "
-"<gui>Find</gui> or press <key>Enter</key>."
-msgstr ""
-"在<gui>关键词</gui>中，输入您想要搜索的文字。点击<gui>查找</gui>或按"
-"<key>Enter</key>。"
+#: C/create-account.page:34(page/title)
+msgid "Register for a new account"
+msgstr "注册一个新帐号"
 
-#: C/prev-conv.page:78(p)
+#: C/create-account.page:36(page/p)
 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 "符合搜索条件的会话会显示在下面的列表中。会话默认按日期排序。"
+"Most account types require you to create an account with a account provider "
+"before you can connect using instant messaging applications like "
+"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
+"app> to register for a new account, using the same steps as you would to "
+"<link xref=\"add-account\">add an account</link>."
+msgstr ""
+"大多帐号类型需要您在使用 <app>Empathy</app> 这样的即时通讯软件连接之前先建立"
+"帐号。但对于某些帐号提供商，您可以使用 <app>Empathy</app> 来注册新帐号，使用"
+"与 <link xref=\"add-account\">添加帐号</link> 相同的步骤。"
 
-#: C/prev-conv.page:82(p)
+#: C/create-account.page:42(page/p)
 msgid ""
-"Click on a conversation to view it. <app>Empathy</app> will select the text "
-"in the conversation that matched your search terms."
+"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 "
+"password, as well as any additional information you need to connect using "
+"<app>Empathy</app>."
 msgstr ""
-"点击一个会话以查看。<app>Empathy</app> 会选择这个会话中符合您搜索条件的文字。"
+"这一页是关于建立各种类型的帐号的。您应当已经从您的帐号提供商那里得到了登录 "
+"ID 和密码，以及其他使用 <app>Empathy</app> 连接这个帐号需要的信息。"
 
-#: C/prev-conv.page:89(title)
-msgid "Browse previous conversations"
-msgstr "浏览之前的会话"
+#: C/create-account.page:47(section/title)
+msgid "Facebook"
+msgstr "Facebook"
 
-#: C/prev-conv.page:91(p)
+#: C/create-account.page:48(section/p)
 msgid ""
-"You can browse your previous conversations with your contacts or in chat "
-"rooms by date."
-msgstr "您可以按时间顺序浏览之前和联系人或在聊天室中的会话。"
-
-#: C/prev-conv.page:100(p)
-msgid "Select the <gui>Conversations</gui> tab."
-msgstr "选择<gui>会话</gui>标签。"
+"Facebook is one of the most-used social networks. It allows users to create "
+"their own profile and to communicate with their friends."
+msgstr ""
+"Facebook 是最常用的社交网络之一。它允许用户对自己进行个性化的描述并与朋友们交"
+"流。"
 
-#: C/prev-conv.page:103(p)
+#: C/create-account.page:52(section/p)
 msgid ""
-"Select an account from the drop-down list in the top left. A list of "
-"contacts and chat room for that account will be shown below."
+"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 ""
-"在左上的下拉列表中选择一个账户。下方会显示这个账户的联系人和聊天室列表。"
+"要使用 Facebook 与您的朋友们交流，您需要在其网站上建立一个新帐号：<link href="
+"\"http://www.facebook.com\">www.facebook.com</link>。"
 
-#: C/prev-conv.page:107(p)
+#: C/create-account.page:62(section/p)
 msgid ""
-"Select a contact or chat room to view your previous conversations from. By "
-"default the most recent conversation will be shown."
-msgstr "选择一个联系人或聊天室以查看之前的会话。默认显示的是最近的会话。"
+"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 ""
+"Jabber 是一种开放的即时通讯系统。像 email 一样，Jabber 允许您选择帐号提供商，"
+"并与其他 Jabber 用户交流，无论他们使用哪里帐号提供商。"
 
-#: C/prev-conv.page:111(p)
+#: C/create-account.page:66(section/p)
 msgid ""
-"You can browse your conversations by date. Days on which you had a "
-"conversation with the selected contact will be shown in bold text. Click a "
-"date to select it. Click the arrows next to the month and year to browse "
-"earlier dates."
+"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 ""
-"您可以按日期浏览您的会话。如果在某日您所选择的账户有过会话，该日会以粗体显"
-"示。点击一个日期以选择它。点击月和年旁的箭头以浏览更早的日期。"
+"您需要在某个 Jabber 服务提供商那里建立帐号。有许多 Jabber 服务提供商，<link "
+"href=\"http://register.jabber.org/\">Jabber.org</link> 是很流行的一个。"
 
-#: C/prev-conv.page:117(p)
+#: C/create-account.page:71(note/p)
 msgid ""
-"You can search for text in the displayed conversation by typing into the "
-"search field at the top. The matching text will be highlighted."
+"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 ""
-"您可以在上方的搜索栏中输入文字，以在显示的会话中搜索文字。匹配的文字会被高亮"
-"显示。"
+"如果您使用 Google Mail 或者 Google Talk，那么您已经拥有 Jabber 帐号了。"
+"Google Talk 就是一个 Jabber 服务。您只需要使用您的 Google Mail 地址和密码在 "
+"<app>Empathy</app> 中连接。"
 
-#: C/prev-conv.page:121(p)
+#: C/create-account.page:80(section/p)
 msgid ""
-"You can quickly view the previous conversations with one of your contacts "
-"from the <gui>Contact List</gui> window. Simply right click the contact and "
-"choose <gui>View Previous Conversations</gui>. The <gui>Previous "
-"Conversations</gui> window will open with that contact already selected."
+"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, "
+"such as a wireless hotspot. It automatically finds all other users on the "
+"network who are also using this service."
 msgstr ""
-"在 <gui>联系人列表</gui> 窗口中，您可以快速的查看与某个联系人之前进行过的会"
-"话。右键点击该联系人并选择 <gui>查看以前的对话</gui>。<gui>最近会话</gui>窗口"
-"会打开，且该联系人会被选中。"
-
-#: 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/create-account.page:85(section/p)
+msgid "For more information, see <link xref=\"salut-protocol\"/>."
+msgstr "更多信息参见<link xref=\"salut-protocol\"/>。"
 
-#: C/link-contacts.page:26(p)
+#: C/create-account.page:91(section/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 "如果您的联系人有多个聊天服务的多个账户，您可以将他们合并成一个联系人。"
+"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 "
+"provider. You can communicate with all other SIP users, regardless of which "
+"SIP provider they use."
+msgstr ""
+"SIP 是一种允许用户通过互联网进行语音和视频会话的开放系统。您需要在某个 SIP 服"
+"务提供商处创建帐号。您可以和其他的 SIP 用户交流，无论他们的 SIP 服务提供商与"
+"您是否相同。"
 
-#: C/link-contacts.page:30(p)
+#: C/create-account.page:97(note/p)
 msgid ""
-"The resulting contact is called a <em>meta-contact</em>: a contact composed "
-"from different single contacts."
-msgstr "产生的联系人称为一个<em>元联系人</em>：由多个不同联系人组成的联系人。"
+"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 ""
+"由于技术上的差别，免费的 <link href=\"https://www.ekiga.net/index.php?"
+"page=register\">Ekiga.net</link> 服务目前在 <app>Empathy</app> 中还不能使用。"
 
-#: C/link-contacts.page:34(p)
+#: C/create-account.page:102(section/p)
 msgid ""
-"If you have a Jane Smith contact that is using three different messaging "
-"services like:"
-msgstr "如果您有一个叫做 Jane Smith 的联系人，她使用三种不同的聊天服务："
-
-#: 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 "您可以将这些联系人合并成一个 Jane Smith."
+"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 ""
+"有些 SIP 服务提供商允许用您的计算机呼叫一般的电话。通常，您需要订阅某种付费服"
+"务才能使用这个功能。"
 
-#: C/link-contacts.page:60(title)
-msgid "Combining contacts"
-msgstr "合并联系人"
+#: C/create-account.page:109(section/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 "
+"is only established each time you connect. If another user is using the "
+"nickname, you will need to choose a new nickname."
+msgstr ""
+"您不需要注册帐号就可以使用 IRC。尽管您在 <app>Empathy</app> 中添加 IRC 帐号时"
+"指定了一个昵称，这个昵称只是您每次连接时才建立。如果有其他用户在使用这个昵"
+"称，您需要选择一个其他昵称。"
 
-#: C/link-contacts.page:63(p)
+#: C/create-account.page:114(section/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>."
+"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 ""
-"在 <gui>联系人列表</gui> 窗口，右键点击有不同账户的联系人，并选择 <gui style="
-"\"menuitem\">绑定联系人…</gui>"
+"有些 IRC 网络上有一种叫做 NickServ 的服务，允许用户保护他们的昵称。更多信息参"
+"见<link xref=\"irc-nick-password\"/>。"
 
-#: C/link-contacts.page:70(p)
+#: C/create-account.page:117(section/p)
 msgid ""
-"From the left pane in the <gui>Link Contacts</gui> window, select the "
-"contacts you want to combine."
-msgstr "在 <gui>绑定联系人</gui> 窗口的左窗格，选择您想要关联起来的联系人。"
+"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 ""
+"有些 IRC 服务器是被密码保护的。您需要知道密码才能连接到这些服务器。通常，这样"
+"的服务器是私有的。"
 
-#: C/link-contacts.page:76(p)
-msgid "Click <gui style=\"button\">Link</gui>."
-msgstr "点击 <gui style=\"button\">绑定</gui>."
+#: C/create-account.page:122(section/title)
+msgid "Proprietary Services"
+msgstr "专有的服务"
 
-#: C/link-contacts.page:82(p)
+#: C/create-account.page:124(section/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."
+"There are many proprietary instant messaging services that have been "
+"developed by different companies or organizations. <app>Empathy</app> allows "
+"you to connect to an existing account for most popular services. To create a "
+"new account with one of these services, you will need to visit the service’s "
+"web site and agree to its terms of use."
 msgstr ""
-"当一个元联系人被创建后，您双击该联系人时默认使用的联系人是有最高的在线状态的"
-"联系人。"
+"许多不同的公司或组织开发了一些专营的即时消息服务。<app>Empathy</app> 允许您连"
+"接大多常见服务的既存帐号。要为这样的服务创建帐号，您需要访问其网站并同意其使"
+"用条款。"
 
-#: C/link-contacts.page:91(title)
-msgid "Separating contacts"
-msgstr "分割联系人"
+#: C/create-account.page:132(item/p)
+msgid "<link href=\"http://dashboard.aim.com/aim\">AIM</link>"
+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>."
+#: C/create-account.page:137(item/p)
+msgid "<link href=\"https://www.icq.com/register/\">ICQ</link>"
 msgstr ""
-"在 <gui>联系人列表</gui> 窗口中，右键点击要分割的联系人，并选择 <gui style="
-"\"menuitem\">绑定联系人…</gui>"
 
-#: C/link-contacts.page:100(p)
-msgid "Click <gui style=\"button\">Unlink</gui>."
-msgstr "点击 <gui style=\"button\">解除绑定</gui>。"
+#: C/create-account.page:142(item/p)
+msgid "<link href=\"https://accountservices.passport.net\">MSN</link>"
+msgstr ""
 
-#: C/license.page:8(desc)
-msgid "Legal information."
-msgstr "法律信息。"
+#: C/create-account.page:147(item/p)
+msgid "<link href=\"https://login.yahoo.com/config/login\">Yahoo!</link>"
+msgstr ""
 
-#: C/license.page:11(title)
-msgid "License"
-msgstr "许可"
+#: C/disable-account.page:9(info/desc)
+msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
+msgstr "使 <app>Empathy</app> 不要自动登录一个帐号。"
+
+#: C/disable-account.page:40(page/title)
+msgid "Disable an account"
+msgstr "禁用一个帐号"
 
-#: C/license.page:12(p)
+#: C/disable-account.page:42(page/p)
 msgid ""
-"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
-"Unported license."
+"You can disable an account to prevent <app>Empathy</app> from logging in to "
+"it without removing the account entirely. You may wish to disable and re-"
+"enable an account if you only want to be logged in to the account at certain "
+"times, but you still want to use <app>Empathy</app> for other accounts."
 msgstr ""
-"本作品在 CreativeCommons Attribution-Share Alike 3.0 Unported license下发布。"
+"您可以禁用一个帐号以阻止 <app>Empathy</app> 自动登录这个帐号而不必将其彻底删"
+"除。您可能想要禁用、启用某个帐号如果您只想偶尔登录这个帐号，但又想使用 "
+"<app>Empathy</app> 中的其他帐号。"
 
-#: C/license.page:20(p)
-msgid "You are free:"
-msgstr "您可以自由："
+#: C/disable-account.page:53(item/p)
+msgid ""
+"Select the account you wish to disable from the accounts list on the left "
+"side of the window."
+msgstr "在窗口左侧的帐号列表中，选择您想要禁用的帐号。"
 
-#: C/license.page:25(em)
-msgid "To share"
-msgstr "分享"
+#: C/disable-account.page:57(item/p)
+msgid "On the right side of the window, switch it off."
+msgstr "在窗口的右侧关闭它。"
 
-#: C/license.page:26(p)
-msgid "To copy, distribute and transmit the work."
-msgstr "复制、分发或者传播作品。"
+#: C/disable-account.page:62(page/p)
+msgid "To re-enable the account, switch it on."
+msgstr "要重新启用这个帐号，则开启它。"
 
-#: C/license.page:29(em)
-msgid "To remix"
-msgstr "再创作"
+#: C/favorite-rooms.page:10(info/desc)
+msgid "Set, join and manage favorite rooms."
+msgstr "设立，加入或管理聊天室收藏。"
 
-#: C/license.page:30(p)
-msgid "To adapt the work."
-msgstr "修改作品。"
+#: C/favorite-rooms.page:29(page/title)
+msgid "Favorite rooms"
+msgstr "聊天室收藏"
 
-#: C/license.page:33(p)
-msgid "Under the following conditions:"
-msgstr "需遵守一下条件："
+#: C/favorite-rooms.page:32(section/title)
+msgid "Set a room as a favorite"
+msgstr "收藏一个聊天室"
 
-#: C/license.page:38(em)
-msgid "Attribution"
-msgstr "署名"
+#: C/favorite-rooms.page:35(item/p)
+msgid "Join a room."
+msgstr "加入一个聊天室。"
 
-#: C/license.page:39(p)
+#: C/favorite-rooms.page:40(item/p)
 msgid ""
-"You must attribute the work in the manner specified by the author or "
-"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 "相同方式共享"
+"See <link xref=\"irc-join-room\"/> for more information on how to join an "
+"IRC room."
+msgstr "关于如何加入 IRC 聊天室，参见 <link xref=\"irc-join-room\"/>。"
 
-#: C/license.page:47(p)
+#: C/favorite-rooms.page:46(item/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."
+"See <link xref=\"group-conversations\"/> for more information on how to "
+"start or join a group conversation."
 msgstr ""
-"如果您改变、转换本作品或者以本作品为基础进行再创作，您应以相同、相似或者兼容"
-"的协议发布修改后的作品。"
+"关于如何发起或加入群组聊天，参见 <link xref=\"group-conversations\"/>。"
 
-#: C/license.page:53(p)
+#: C/favorite-rooms.page:54(item/p)
 msgid ""
-"For the full text of the license, see the <link href=\"http://"
-"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
-"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
-"sa/3.0/\">Commons Deed</link>."
+"From the conversation window, choose <guiseq><gui>Conversation</"
+"gui><gui>Favorite Chat Room</gui></guiseq>."
 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>。"
+"在会话窗口，选择 <guiseq><gui>会话</gui><gui>收藏聊天室</gui></guiseq>。"
 
-#: C/irc-start-conversation.page:8(desc)
-msgid "Start a conversation with an IRC contact."
-msgstr "向一位 IRC 联系人发起会话。"
+#: C/favorite-rooms.page:63(section/title)
+msgid "Join favorite rooms"
+msgstr "加入收藏的聊天室"
 
-#: C/irc-start-conversation.page:30(title)
-msgid "Chat with somebody on IRC"
-msgstr "与 IRC 中某人聊天"
+#: C/favorite-rooms.page:66(item/p) C/send-file.page:40(item/p)
+msgid "From the <gui>Contact List</gui> window, perform one of the following:"
+msgstr "在<gui>联系人列表</gui>窗口，执行下列操作之一："
 
-#: C/irc-start-conversation.page:32(p)
-msgid ""
-"You can hold private conversations with other IRC users, outside of the "
-"public IRC chat rooms. To start a conversation with another IRC user:"
-msgstr ""
-"您可以在公共的 IRC 聊天室之外与其他的 IRC 用户进行私人聊天。要与另一位 IRC 用"
-"户进行会话："
+#: C/favorite-rooms.page:71(item/p)
+msgid "Press <key>F5</key>."
+msgstr "按 <key>F5</key> 键。"
 
-#: C/irc-start-conversation.page:37(p)
+#: C/favorite-rooms.page:76(item/p)
 msgid ""
-"In the contact list for an IRC chat room, double click the name of the user "
-"you want to chat with. Alternatively, right click the name of the user and "
-"choose <gui>Chat</gui>."
+"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
+"all your favorite rooms."
 msgstr ""
-"在一个 IRC 聊天室的联系人列表中，双击您想要聊天的用户。或者，右键点击用户的姓"
-"名并选择 <gui>聊天</gui>"
+"选择 <guiseq><gui>聊天室</gui><gui>加入已收藏的聊天室</gui></guiseq>，以加入"
+"您之前收藏的聊天室。"
 
-#: C/irc-start-conversation.page:45(p)
-msgid ""
-"The IRC room contact list is not the same as <app>Empathy</app> contact "
-"list. It contains a list of users in the IRC chat room you joined. Different "
-"rooms can have different contacts listed."
-msgstr ""
-"IRC 聊天室的联系人列表与 <app>Empathy</app> 的联系人列表不同。它包含了您加入"
-"的这个 IRC 聊天室中的用户列表。不同的聊天室可能有不同的联系人列表。"
+#: C/favorite-rooms.page:82(item/p)
+msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
+msgstr "选择 <gui>聊天室</gui>，并选择您要加入的已收藏的聊天室。"
 
-#: C/irc-start-conversation.page:52(p)
+#: C/favorite-rooms.page:90(note/p)
 msgid ""
-"The IRC room contact list is usually on the right side of the IRC room "
-"window. If you do not see it, choose <guiseq><gui>Conversation</"
-"gui><gui>Show Contact List</gui></guiseq>."
-msgstr ""
-"IRC 聊天室的联系人列表通常位于窗口右侧。如果您没有看到它，选择 <guiseq><gui>"
-"对话</gui><gui>显示联系人列表</gui></guiseq>。"
-
-#: C/irc-send-file.page:9(desc)
-msgid "<app>Empathy</app> does not currently support sending files using IRC."
-msgstr "<app>Empathy</app> 目前不支持 IRC 传文件。"
-
-#: C/irc-send-file.page:31(title)
-msgid "Send files over IRC"
-msgstr "通过 IRC 传送文件"
-
-#: C/irc-send-file.page:33(p)
-msgid "It is not currently possible to send files using IRC."
-msgstr "目前无法用 IRC 传送文件。"
-
-#: C/irc-nick-password.page:10(desc)
-msgid "Protect your nickname to prevent other IRC users from using it."
-msgstr "保护您的昵称，以防其他 IRC 用户使用。"
+"To join a favorite room, you need to be connected to the Internet and to "
+"your account."
+msgstr "要加入一个已收藏的聊天室，您必须连接互联网和您的帐号。"
 
-#: C/irc-nick-password.page:33(title)
-msgid "Use a nickname password on IRC"
-msgstr "在 IRC 中使用昵称和密码"
+#: C/favorite-rooms.page:98(section/title)
+msgid "Manage favorite rooms"
+msgstr "管理聊天室收藏"
 
-#: C/irc-nick-password.page:35(p)
+#: C/favorite-rooms.page:101(item/p)
 msgid ""
-"On some IRC networks, you can register your nickname with a service called "
-"NickServ. By sending special messages to NickServ, you can set your password "
-"and identify yourself. Some IRC chat rooms may not allow you to join without "
-"a registered nickname."
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Manage Favorites</gui></guiseq>."
 msgstr ""
-"在某些 IRC 网络上，您可以通过 NickServ 服务注册您的昵称。通过向 NickServ 发送"
-"特殊的消息，您可以设置密码来认证您自己。一些 IRC 聊天室可能不允许您加入，除非"
-"您有注册过的昵称。"
+"在 <gui>联系人列表</gui> 窗口，选择 <guiseq><gui>聊天室</gui><gui>管理收藏夹"
+"</gui></guiseq>。"
 
-#: C/irc-nick-password.page:40(p)
+#: C/favorite-rooms.page:107(item/p)
 msgid ""
-"<app>Empathy</app> does not currently support nickname registration. Some "
-"IRC networks, however, will automatically forward a <em>server password</em> "
-"to NickServ. On these networks, you can use the IRC password in "
-"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
-"network is known to have this feature."
-msgstr ""
-"<app>Empathy</app> 目前还不支持昵称注册。但一些 IRC 网络会自动向 NickServ 发"
-"送一个 <em>服务器密码</em>。在这样的网络上，您可以在 <app>Empathy</app> 中使"
-"用这样的密码向 NickServ 认证您自己。流行的 freenode 网络就有这个功能。"
-
-#: C/irc-nick-password.page:46(p)
-msgid "To set an IRC server password:"
-msgstr "设置一个 IRC 密码："
-
-#: C/irc-nick-password.page:54(p)
-msgid "Select the IRC account from the list on the left of the dialog."
-msgstr "在左侧的对话框中选择一个 IRC 账户"
+"From the <gui>Account</gui> drop-down list, select the account you want to "
+"manage the favorite rooms of."
+msgstr "在 <gui>帐号</gui> 下拉列表中，选择您要管理聊天室收藏的帐号。"
 
-#: C/irc-nick-password.page:57(p)
-msgid ""
-"In the <gui>Password</gui> field, type the password you used to register "
-"your nikcname."
-msgstr "在 <gui>密码</gui> 一栏中，输入您注册您的昵称时使用的密码。"
+#: C/favorite-rooms.page:111(item/p)
+msgid "Select <gui>All</gui> to see all you favorite rooms."
+msgstr "选择 <gui>全部</gui> 以看到搜有您收藏的聊天室。"
 
-#: C/irc-nick-password.page:63(p) C/import-account.page:61(p)
-msgid "Click <gui style=\"button\">Apply</gui>."
-msgstr "点击<gui style=\"button\">应用</gui>。"
+#: C/favorite-rooms.page:116(item/p)
+msgid "Select the favorite room you want to manage:"
+msgstr "选择您要管理的收藏："
 
-#: C/irc-nick-password.page:69(p)
+#: C/favorite-rooms.page:121(item/p)
 msgid ""
-"These instructions only allow you to use a password-protected nickname on "
-"certain IRC networks. It is not currently possible to register an IRC "
-"nickname or change your nickname password using <app>Empathy</app>."
-msgstr ""
-"这些说明只是允许您在特定的 IRC 网络上使用密码保护的昵称。目前在 "
-"<app>Empathy</app> 中还不能注册 IRC 昵称或修改密码。"
-
-#: C/irc-manage.page:10(desc)
-msgid "How to use IRC with <app>Empathy</app>."
-msgstr "如何在 <app>Empathy</app> 中使用 IRC。"
-
-#: C/irc-manage.page:35(title)
-msgid "Internet Relay Chat (IRC)"
-msgstr "互联网中继聊天(IRC)"
+"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
+"that room when you connect to your account."
+msgstr "选择 <gui>自动连接</gui>，则您连接到您的帐号后，会自动加入这个聊天室。"
 
-#: C/irc-manage.page:38(p) C/account-irc.page:39(p)
-msgid ""
-"You must have the <sys>telepathy-idle</sys> package installed to use IRC in "
-"<app>Empathy</app>."
-msgstr ""
-"要在 <app>Empathy</app> 中使用 IRC，您必须安装 <sys>telepathy-idle</sys> 包。"
+#: C/favorite-rooms.page:127(item/p)
+msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
+msgstr "点击 <gui>删除</gui> 以从收藏夹中删除这个聊天室。"
 
-#: C/irc-manage.page:42(link)
-msgid "Install telepathy-idle"
-msgstr "安装 telepathy-idle"
+#: C/favorite-rooms.page:134(item/p)
+msgid "When done, click <gui>Close</gui>."
+msgstr "完成后，点击 <gui>关闭</gui>。"
 
-#: C/irc-manage.page:49(title)
-msgid "IRC Chat Rooms and Conversations"
-msgstr "IRC 聊天室和会话"
+#: C/geolocation.page:8(info/desc)
+msgid "Use and understand geolocation in <app>Empathy</app>."
+msgstr "使用和了解 <app>Empathy</app> 中的地理位置。"
 
-#: C/irc-manage.page:51(title)
-msgid "Chat Rooms and Conversations"
-msgstr "聊天室和会话"
+#: C/geolocation.page:32(page/title)
+msgid "Geographical position"
+msgstr "地理位置"
 
-#: C/irc-manage.page:56(title)
-msgid "Common IRC Problems"
-msgstr "常见 IRC 问题"
+#: C/geolocation.page:35(section/title)
+msgid "Geolocation"
+msgstr "地理位置"
 
-#: C/irc-manage.page:58(title) C/index.page:55(title)
-msgid "Common Problems"
-msgstr "常见问题"
+#: C/geolocation.page:39(section/title)
+msgid "Fix common problems"
+msgstr "修复常见问题"
 
-#: C/irc-join-room.page:8(desc)
-msgid "Join an IRC channel."
-msgstr "加入一个 IRC 频道。"
+#: C/geolocation-not-showing.page:8(info/desc)
+msgid "<app>Empathy</app> does not publish my geographical position."
+msgstr "<app>Empathy</app> 没有发布我的地理位置。"
 
-#: C/irc-join-room.page:31(title)
-msgid "Join an IRC chat room"
-msgstr "加入一个 IRC 聊天室"
+#: C/geolocation-not-showing.page:32(page/title)
+msgid "Geographical position not published"
+msgstr "地理位置没有被公布。"
 
-#: C/irc-join-room.page:33(p)
+#: C/geolocation-not-showing.page:34(page/p)
 msgid ""
-"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
-"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
-"account\"/> and <link xref=\"account-irc\"/>."
+"If your contacts cannot see your location, <app>Empathy</app> might not be "
+"able to discover with a good margin of precision your geographical position."
 msgstr ""
-"您可以加入您已经连接的所有 IRC 网络上的 IRC 聊天室(也称为 IRC 频道)。要连接一"
-"个 IRC 网络，参见 <link xref=\"add-account\"/> and <link xref=\"account-irc"
-"\"/>。"
+"如果您的联系人不能看到您的位置，可能是因为 <app>Empathy</app> 无法发现有一定"
+"精度的您的地理位置信息。"
 
-#: C/irc-join-room.page:39(p) C/group-conversations.page:58(p)
-#: C/group-conversations.page:122(p)
+#: C/geolocation-not-showing.page:38(page/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Join</gui></guiseq>."
+"In this case, your position will not be published, but you are still able to "
+"see the location of your contacts."
 msgstr ""
-"在 <gui>联系人列表</gui> 窗口，选择 <guiseq><gui>聊天室</gui><gui>加入</"
-"gui></guiseq>。"
+"在这种情况下，您的位置信息不会被公布，但您仍可以看到您的联系人的位置信息。"
 
-#: C/irc-join-room.page:45(p)
+#: C/geolocation-not-showing.page:42(page/p)
 msgid ""
-"From the <gui>Account</gui> drop-down list, select the IRC account that "
-"corresponds to the network you want to use."
-msgstr "在 <gui>账户</gui> 下拉列表中，选择与您想要使用的网络对应的 IRC 账户。"
+"If you want to publish your geographical position, you can try to use an "
+"external device such as a GPS."
+msgstr "如果您想要公布您的地理位置，您可以试一试使用 GPS 等外部设备。"
 
-#: C/irc-join-room.page:51(p)
+#: C/geolocation-not-showing.page:48(note/p)
 msgid ""
-"In the <gui>Room</gui> text box, type the name of the channel you want to "
-"join. IRC channel names start with the hash character (<sys>#</sys>)."
+"In order to publish your geographical location, your Jabber server needs to "
+"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
+"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
+"PEP</link> is maintained online. Google Talk does not support this feature "
+"at this time."
 msgstr ""
-"在 <gui>聊天室</gui> 文本框中，输入您想要加入的频道的名称。IRC 频道名称以井号"
-"(<sys>#</sys>)开头。"
-
-#: C/irc-join-room.page:57(p)
-msgid "Click <gui>Join</gui> to enter the room."
-msgstr "点击<gui>加入</gui>来进入房间。"
+"要发布您的地理位置，您的 Jabber 服务器必须支持 Personal Eventing Protocal "
+"(PEP)。互联网上有人维护着一份<link href=\"http://coccinella.im/servers/"
+"servers_by_pubsub_pep.html\">支持 PEP 的服务器列表</link>。Google Talk 目前不"
+"支持 PEP。"
 
-#: C/irc-join-room.page:64(p)
-msgid ""
-"To join multiple rooms, you need to repeat the steps above for each room."
-msgstr "要加入多个房间，您需要对每个房间重复上面的步骤。"
+#: C/geolocation-privacy.page:8(info/desc)
+msgid "What information are sent and to who."
+msgstr "发送了什么信息，发送给谁了？"
 
-#: C/irc-join-pwd.page:9(desc)
-msgid "Enter password-protected IRC chat rooms."
-msgstr "进入有密码保护的 IRC 聊天室。"
+#: C/geolocation-privacy.page:32(page/title)
+msgid "Geolocation Privacy"
+msgstr "地理位置隐私"
 
-#: C/irc-join-pwd.page:25(title)
-msgid "Join a protected IRC chat room"
-msgstr "加入一个受保护的 IRC 聊天室"
+#: C/geolocation-privacy.page:35(section/title)
+msgid "What information is sent"
+msgstr "什么信息被发送了"
 
-#: C/irc-join-pwd.page:27(p)
+#: C/geolocation-privacy.page:36(section/p)
 msgid ""
-"On some IRC networks, private IRC rooms may be protected with a password. If "
-"you know the password, use the following steps to join:"
+"What is possible to send is: your country, region, locality, area, street, "
+"building, floor, room, and postal code, longitude, latitude and altitude, "
+"speed and bearing."
 msgstr ""
-"在某些 IRC 网络上，私人的 IRC 房间可以被密码保护。如果您知道这密码，按照下面"
-"的步骤加入："
-
-#: C/irc-join-pwd.page:33(p)
-msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
-msgstr "如往常一样<link xref=\"irc-join-room\">加入房间</link>。"
+"有可能被发送的信息：您所在的国家，地区，地方，区域，街道，建筑，楼层，房间，"
+"邮政编码及经纬度，您的速度和方向。"
 
-#: C/irc-join-pwd.page:38(p)
+#: C/geolocation-privacy.page:40(section/p)
 msgid ""
-"Empathy will prompt you for a password. Enter the password for the IRC chat "
-"room and click <gui style=\"button\">Join</gui>."
-msgstr ""
-"Empathy 会提示您输入密码。输入这个 IRC 聊天室的密码并点击 <gui style=\"button"
-"\">加入</gui>。"
-
-#: C/irc-commands.page:7(desc)
-msgid "The supported IRC commands."
-msgstr "支持的 IRC 命令。"
-
-#: C/irc-commands.page:18(title)
-msgid "Supported IRC commands"
-msgstr "支持的 IRC 命令"
+"The accuracy and the quantity of information about your geographical "
+"position are based on the software or on the infrastructure used to discover "
+"your position."
+msgstr "您的地理位置信息的精度和质量取决于软件或者用于发现您的位置的设施。"
 
-#: C/irc-commands.page:19(p)
+#: C/geolocation-privacy.page:44(section/p)
 msgid ""
-"To see the list of the supported IRC commands, in a chat room type <input>/"
-"help</input> and press <key>Enter</key>."
+"Different kind of networks may have different accuracy settings, and may "
+"send different information. The use of external devices such as GPS or "
+"mobile phone will increase the accuracy of the information sent."
 msgstr ""
-"要查看支持的 IRC 命令的列表，在一个聊天室中输入<input>/help</input>并按"
-"<key>Enter</key>。"
-
-#: C/irc-commands.page:24(p)
-msgid "All commands available have a small description on their usage."
-msgstr "所有可用命令都有一个简单的用法描述。"
+"不同的网络可能有不同的精度设置，可能发送不同的信息。使用外部设备，如 GPS 或手"
+"机，可以增加发送的信息的精度。"
 
-#. 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)
+#: C/geolocation-privacy.page:49(section/p)
 msgid ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=54908dcb2588beddb15ef0968d2c2582"
+"When the privacy mode is enabled, nothing more precise than your city will "
+"be sent, even if you are using an external device."
 msgstr ""
-"@@image: 'figures/empathy-main-window.png'; "
-"md5=54908dcb2588beddb15ef0968d2c2582"
+"当隐私模式被启用后，只有您所在的城市信息会被发送，即使您正在使用外部设备。"
 
-#: C/introduction.page:9(desc)
-msgid "Introduction to the <app>Empathy</app> instant messenger."
-msgstr "介绍 <app>Empathy</app> 即时聊天工具。"
+#: C/geolocation-privacy.page:56(section/title)
+msgid "Who can see the information sent"
+msgstr "谁会看到这些发送出去的信息"
 
-#: C/introduction.page:21(title)
-msgid "Introduction"
-msgstr "介绍"
+#: C/geolocation-privacy.page:57(section/p)
+msgid "Only your contacts can see your geographical position."
+msgstr "只有您的联系人可以看到您的地理位置。"
+
+#: C/geolocation-privacy.page:63(section/title)
+msgid "What is the privacy mode"
+msgstr "什么是隐私模式"
 
-#: C/introduction.page:23(p)
+#: C/geolocation-privacy.page:64(section/p)
 msgid ""
-"<app>Empathy</app> is an instant messaging application for the GNOME "
-"Desktop. It supports text messaging, voice &amp; video calls, file "
-"transfers, and all the most used messaging systems such as MSN and Google "
-"Talk."
+"The privacy mode, enabled by default, is a reduced accuracy mode that will "
+"decrease the accuracy of the geographical position sent to your contacts."
 msgstr ""
-"<app>Empathy</app> 是 GNOME 桌面的即时通讯程序。它支持文字消息，语音和视频呼"
-"叫，文件传输，支持最常用的即时通讯系统，包括 MSN 和 Google Talk."
+"隐私模式是精度降低模式，它会降低发送给您的联系人的地理位置信息的精度。隐私模"
+"式默认开启。"
+
+#: C/geolocation-privacy.page:71(section/title)
+msgid "Privacy overview"
+msgstr "隐私概述"
 
-#: C/introduction.page:28(p)
+#: C/geolocation-privacy.page:72(section/p)
 msgid ""
-"<app>Empathy</app> includes features that help you better collaborate while "
-"at work, and that let you easily keep in touch with your friends."
-msgstr ""
-"<app>Empathy</app> 可以帮助您在工作中更好的合作，也可以帮助您与您的朋友们保持"
-"联系。"
+"Overview of the various geolocation privacy settings in <app>Empathy</app>."
+msgstr "<app>Empathy</app> 中一些关于地理位置隐私的选项的概况。"
 
-#: C/introduction.page:32(p)
+#: C/geolocation-privacy.page:77(item/p)
+msgid "Geolocation is not enabled by default."
+msgstr "地理位置默认不开启。"
+
+#: C/geolocation-privacy.page:82(item/p)
+msgid "Privacy mode is enabled by default."
+msgstr "隐私模式默认被激活"
+
+#: C/geolocation-privacy.page:87(item/p)
 msgid ""
-"Using <app>Empathy</app>, you can group all the conversations in a single "
-"window, have multiple windows for different kind of conversations, easily "
-"search through your previous conversations, and share your desktop in just "
-"two clicks."
-msgstr ""
-"使用 <app>Empathy</app>，您可以将所有的会话组织在同一个窗口中，或者为不同类型"
-"的会话使用不同的窗口，还可以很容易地搜索之前的会话，或者共享您的桌面，只需要"
-"两次点击。"
+"Privacy mode prevails even when using external and more precise devices."
+msgstr "即使在使用精度更高的外部设备，隐私模式也会发挥作用。"
 
-#: C/introduction.page:39(title)
-msgid "<gui>Contact List</gui> window"
-msgstr "<gui>联系人列表</gui>窗口"
+#: C/geolocation-privacy.page:92(item/p)
+msgid "Only your contacts can see your position."
+msgstr "只有您的联系人可以看到您的位置。"
 
-#: C/introduction.page:40(desc)
-msgid "<app>Empathy</app> main window"
-msgstr "<app>Empathy</app> 主窗口"
+#: C/geolocation-supported.page:7(info/desc)
+msgid "Services that supports geolocation and compatibility."
+msgstr "支持地理位置的服务和及其兼容性。"
 
-#: C/introduction.page:42(p)
-msgid "<app>Empathy</app> main window."
-msgstr "<app>Empathy</app> 主窗口。"
+#: C/geolocation-supported.page:31(page/title)
+msgid "Supported services"
+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/index.page:28(None)
+#: C/geolocation-supported.page:33(page/p)
 msgid ""
-"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+"The geolocation feature at the moment is compatible only with the Jabber "
+"service. In order to use it, you and your contacts need to have a Jabber "
+"account."
 msgstr ""
-"@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
-
-#: C/index.page:7(title) C/index.page:8(title)
-msgid "Empathy Internet Messenger"
-msgstr "Empathy 网络聊天工具"
+"目前，只有 Jabber 服务与地理位置功能兼容。要使用地理位置，您和您的联系人必须"
+"有 Jabber 帐号。"
 
-#: C/index.page:27(title)
+#: C/geolocation-supported.page:39(note/p)
 msgid ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy Internet Messenger logo </media> Empathy Internet Messenger"
+"It is necessary that also the server you are using supports the geolocation "
+"feature. Most of the Jabber servers support it. See your service website "
+"documentation for more information."
 msgstr ""
-"<media type=\"image\" mime=\"image/png\" src=\"figures/empathy-logo.png\"> "
-"Empathy 网络聊天工具标识</media> Empathy 网络聊天工具"
-
-#: C/index.page:35(title)
-msgid "Account Management"
-msgstr "账户管理"
+"而且，您使用的服务器也需要支持地理位置功能。大多 Jabber 服务器都支持。要了解"
+"更多，请参看您的服务提供者的网站文档。"
 
-#: C/index.page:39(title)
-msgid "Contact Management"
-msgstr "联系人管理"
+#: C/geolocation-supported.page:47(section/title)
+msgid "Compatibility"
+msgstr "兼容性"
 
-#: C/index.page:43(title)
-msgid "Text Conversations"
-msgstr "文字聊天"
+#: C/geolocation-supported.page:49(section/p)
+msgid ""
+"<app>Empathy</app> geolocation feature is not compatible with other "
+"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
+"Fire Eagle</em> or <em>Brightkite</em>."
+msgstr ""
+"<app>Empathy</app> 的地理位置功能与其他一些地理位置信息服务并不兼容，如 "
+"<em>Google Latitude</em>，<em>Yahoo Fire Eggle</em> 和 <em>Brightkite</em>。"
 
-#: C/index.page:47(title)
-msgid "Audio and Video Conversations"
-msgstr "语音和视频聊天"
+#: C/geolocation-turn.page:9(info/desc)
+msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
+msgstr "在 <app>Empathy</app> 中如何激活和禁用地理位置。"
 
-#: C/index.page:51(title)
-msgid "Advanced Actions"
-msgstr "高级操作"
+#: C/geolocation-turn.page:33(page/title)
+msgid "Activate/Deactivate geolocation"
+msgstr "激活/禁用地理位置"
 
-#: C/import-account.page:10(desc)
-msgid "Import an account from another instant messaging application."
-msgstr "从其他即时聊天程序中导入账户。"
+#: C/geolocation-turn.page:37(item/p)
+msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
+msgstr "选择<guiseq><gui>编辑</gui><gui>首选项</gui></guiseq>。"
 
-#: C/import-account.page:19(name)
-msgid "Peter Haslam"
-msgstr "Peter Haslam"
+#: C/geolocation-turn.page:42(item/p)
+msgid "Select the <gui>Location</gui> tab."
+msgstr "选择<gui>位置</gui>标签。"
 
-#: C/import-account.page:20(email)
-msgid "peter.haslam@freenet.de"
-msgstr "peter.haslam@freenet.de"
+#: C/geolocation-turn.page:47(item/p)
+msgid ""
+"Select <gui>Publish location to my contacts</gui> to activate geolocation."
+msgstr "选择 <gui>向我的联系人公布位置信息</gui> 以激活地理位置。"
 
-#: C/import-account.page:42(title)
-msgid "Import an existing account"
-msgstr "导入已存在的账户"
+#: C/geolocation-turn.page:50(item/p)
+msgid "To deactivate geolocation, deselect it."
+msgstr "要禁用地理位置，请取消选择。"
 
-#: C/import-account.page:44(p)
+#: C/geolocation-turn.page:55(item/p)
 msgid ""
-"The first time you run <app>Empathy</app>, it will offer to import your "
-"accounts from other instant messaging applications. Currently, the only "
-"supported application is <app>Pidgin</app>."
-msgstr ""
-"<app>Empathy</app> 第一次运行时，会提示您可以从其他即时通讯程序中导入账户。目"
-"前，支持的程序只有 <app>Pidgin</app>。"
+"To increase the accuracy of your position, deselect <gui>Reduce location "
+"accuracy</gui>."
+msgstr "要提高您的位置的精度，请取消选择 <gui>降低位置信息精度</gui>。"
 
-#: C/import-account.page:50(p)
+#: C/geolocation-turn.page:61(item/p)
 msgid ""
-"Run <app>Empathy</app> for the first time. An assistant will offer you a "
-"number of options to create new accounts."
+"If you have an external device like a GPS or want to send a more accurate "
+"position, select the appropriate option in the <gui>Location sources</gui> "
+"section."
 msgstr ""
-"第一次运行 <app>Empathy</app>，一个助理程序会提供若干选项以创建新账户。"
+"如果您有 GPS 这样的外部设备，或者想要发送更加精确的位置信息，在<gui>位置来源"
+"</gui>选项卡中选择适当的选项。"
 
-#: C/import-account.page:54(p)
-msgid ""
-"Select <gui>Yes, import my account details from</gui> and click "
-"<gui>Forward</gui>."
-msgstr "选择 <gui>有，请导入我的账户信息</gui> 并点击 <gui>前进</gui>。"
+#: C/geolocation-what-is.page:9(info/desc)
+msgid "Understanding geolocation."
+msgstr "了解地理位置。"
 
-#: C/import-account.page:58(p)
-msgid "Select the check box next to each account you wish to import."
-msgstr "选择每个您想要导入的账户旁的复选框。"
+#: C/geolocation-what-is.page:33(page/title)
+msgid "What is geolocation"
+msgstr "什么是地理位置"
 
-#: C/import-account.page:66(p)
+#: C/geolocation-what-is.page:35(page/p)
 msgid ""
-"It is not currently possible to import accounts after you have completed the "
-"first-run assistant."
-msgstr "目前，您只能在第一次运行时的助理程序中导入账户。"
-
-#: C/hide-contacts.page:8(desc)
-msgid "Hide the offline contacts from your <gui>Contact List</gui>."
-msgstr "在 <gui>联系人列表</gui> 中隐藏离线联系人。"
+"Geolocation allows you to identify the real geographical location of a "
+"computer or a device connected to the Internet."
+msgstr "地理位置允许您确定连接到网络的一台电脑或设备在地理上的真实位置。"
 
-#: C/hide-contacts.page:19(title)
-msgid "Hide offline contacts"
-msgstr "隐藏离线的联系人"
+#: C/geolocation-what-is.page:37(page/p)
+msgid "With geolocation in <app>Empathy</app> you can:"
+msgstr "通过 <app>Empathy</app> 中的地理位置，您可以："
 
-#: C/hide-contacts.page:21(p)
-msgid ""
-"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
-"with which you can have a conversation, and also those that are offline."
-msgstr ""
-"一般情况下，<app>Empathy</app> 会显示您所有的联系人：您可以与之进行会话的在线"
-"的联系人，和那些离线的联系人。"
+#: C/geolocation-what-is.page:42(item/p)
+msgid "Publish your geographical location to your contacts."
+msgstr "公布您的地理位置给联系人。"
 
-#: C/hide-contacts.page:25(p)
-msgid "To hide the contacts that are offline:"
-msgstr "要隐藏离线的联系人："
+#: C/geolocation-what-is.page:47(item/p)
+msgid "See your contacts’ geographical location and quickly contact them."
+msgstr "查看联系人的地址位置并快速联系他们。"
 
-#: C/hide-contacts.page:31(p)
+#: C/geolocation-what-is.page:52(item/p)
 msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
-"gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
-"key><key>H</key></keyseq>."
-msgstr ""
-"在 <gui>联系人列表</gui> 窗口，选择 <guiseq><gui>查看</gui><gui>离线联系人</"
-"gui></guiseq>，或按下 <keyseq><key>Ctrl</key><key>H</key></keyseq>。"
+"Set the accuracy of your location and the device used to discover your "
+"location."
+msgstr "设置您的地理位置的精度及可以用来发现您的地理位置的设备。"
 
-#: C/hide-contacts.page:36(p)
-msgid "To show the offline contacts again, repeat the same procedure above."
-msgstr "要再次显示离线的联系人，重复上面的步骤。"
+#: C/geolocation-what-is.page:60(note/p)
+msgid ""
+"In order to see your contacts’ geographical locations, they need to use a "
+"service and an application that supports geolocation."
+msgstr "您的联系人必须使用支持地理位置的程序，您才能看到他们的地理位置。"
 
-#: C/group-conversations.page:8(desc)
+#: C/group-conversations.page:8(info/desc)
 msgid "Start or join a group conversation with your contacts."
 msgstr "开始和您的联系人进行群组聊天，或加入群组聊天。"
 
-#: C/group-conversations.page:34(title)
+#: C/group-conversations.page:34(page/title)
 msgid "Group conversations"
 msgstr "群组聊天"
 
-#: C/group-conversations.page:36(p)
+#: C/group-conversations.page:36(page/p)
 msgid ""
 "Group conversations permits you to have text conversations with more than "
 "one contact at the same time."
 msgstr "在群组聊天中，您可以和不止一位联系人同时进行文字交谈。"
 
-#: C/group-conversations.page:40(p)
+#: C/group-conversations.page:40(page/p)
 msgid ""
 "To have a group conversation you need to have a registered account with "
 "either Jabber or Google Talk, or a People Nearby account."
 msgstr ""
-"要进行群组聊天您需要注册有 Jabber 账户或者 Google Talk 账户，或者“附近的人”账"
+"要进行群组聊天您需要注册有 Jabber 帐号或者 Google Talk 帐号，或者“附近的人”账"
 "户。"
 
-#: C/group-conversations.page:46(p)
+#: C/group-conversations.page:46(note/p)
 msgid ""
 "You can have a group conversation only with the contacts that are using the "
 "same service as yours."
 msgstr "您只能和那些与您使用同样的服务的联系人进行群组聊天。"
 
-#: C/group-conversations.page:54(title)
+#: C/group-conversations.page:54(section/title)
 msgid "Start a group conversation"
 msgstr "开始群组聊天"
 
-#: C/group-conversations.page:63(p)
+#: C/group-conversations.page:58(item/p)
+#: C/group-conversations.page:122(item/p) C/irc-join-room.page:39(item/p)
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
+"gui><gui>Join</gui></guiseq>."
+msgstr ""
+"在 <gui>联系人列表</gui> 窗口，选择 <guiseq><gui>聊天室</gui><gui>加入</"
+"gui></guiseq>。"
+
+#: C/group-conversations.page:63(item/p)
 msgid ""
 "From the <gui>Account</gui> drop-down list, select the account you want to "
 "use for the group conversation."
-msgstr "在 <gui>账户</gui> 下拉列表中，选择一个账户用来进行群组聊天。"
+msgstr "在 <gui>帐号</gui> 下拉列表中，选择一个帐号用来进行群组聊天。"
 
-#: C/group-conversations.page:69(p)
+#: C/group-conversations.page:69(item/p)
 msgid ""
 "In the <gui>Server</gui> text box, type the name of server in which the "
 "conversation will be hosted."
 msgstr "在 <gui>服务器</gui> 文本框中，输入将会承载这次聊天的服务器名称。"
 
-#: C/group-conversations.page:73(p)
+#: C/group-conversations.page:73(item/p)
 msgid "Leave it empty if it will be on the current server."
 msgstr "如果要使用当前服务器，请将其留空。"
 
-#: C/group-conversations.page:78(p)
+#: C/group-conversations.page:78(item/p)
 msgid ""
 "In the <gui>Room</gui> text box, type the name you want to give to the "
 "conversation."
 msgstr "在 <gui>聊天室</gui> 文本框中，输入您为这次群组聊天起的名字。"
 
-#: C/group-conversations.page:82(p)
+#: C/group-conversations.page:82(note/p)
 msgid ""
 "This will be the name of the room you are going to have a conversation. This "
 "name will be publicly available for other people to join. It is not possible "
@@ -1723,7 +1721,7 @@ msgstr ""
 "这将是您进行群组聊天的聊天室的名字。这个名字会被大家看到以使大家可以加入。您"
 "不能建立一个私人的聊天室。"
 
-#: C/group-conversations.page:90(p)
+#: C/group-conversations.page:90(item/p)
 msgid ""
 "To invite other contacts to join the group conversation, from the "
 "<gui>Contact List</gui> window, select the contact you want to invite, and "
@@ -1732,11 +1730,11 @@ msgstr ""
 "要邀请其他联系人加入这次群组聊天，在 <gui>联系人列表</gui> 窗口，选择您想要邀"
 "请的联系人，并进行下列操作中的某一项："
 
-#: C/group-conversations.page:97(p)
+#: C/group-conversations.page:97(item/p)
 msgid "Right-click on the contact and choose <gui>Invite to chatroom</gui>."
 msgstr "右键点击联系人，并选择 <gui>邀请到聊天室</gui>。"
 
-#: C/group-conversations.page:102(p)
+#: C/group-conversations.page:102(item/p)
 msgid ""
 "Choose <guiseq><gui>Edit</gui><gui>Contact</gui><gui>Invite to chatroom</"
 "gui></guiseq>."
@@ -1744,25 +1742,25 @@ msgstr ""
 "选择 <guiseq><gui>编辑</gui><gui>联系人</gui><gui>邀请到聊天室</gui></"
 "guiseq>。"
 
-#: C/group-conversations.page:107(p)
+#: C/group-conversations.page:107(item/p)
 msgid ""
 "If you have more than one group conversation open, select the one you want "
 "to invite your contacts."
 msgstr "如果您打开了不止一个群组聊天，选择您想要邀请联系人加入的那个。"
 
-#: C/group-conversations.page:118(title)
+#: C/group-conversations.page:118(section/title)
 msgid "Join a group conversation"
 msgstr "加入群组聊天。"
 
-#: C/group-conversations.page:128(p)
+#: C/group-conversations.page:128(item/p)
 msgid "Expand the <gui>Room List</gui> section to see all the existing rooms."
 msgstr "展开<gui>聊天室列表</gui>选项卡来查看所有存在的房间。"
 
-#: C/group-conversations.page:133(p)
+#: C/group-conversations.page:133(item/p)
 msgid "Double-click on the name of a room to join it."
 msgstr "双击房间的名称加入。"
 
-#: C/group-conversations.page:139(p)
+#: C/group-conversations.page:139(section/p)
 msgid ""
 "It is not possible to join all existing rooms. Some of the rooms might "
 "require a password, or might be invitation only. <app>Empathy</app> does not "
@@ -1771,1347 +1769,1760 @@ msgstr ""
 "并非所有的聊天室都可以加入。有些聊天室可能需要密码，有些只有收到邀请才能加"
 "入。<app>Empathy</app> 不支持这些房间。"
 
-#: C/geolocation-what-is.page:9(desc)
-msgid "Understanding geolocation."
-msgstr "了解地理位置。"
+#: C/hide-contacts.page:8(info/desc)
+msgid "Hide the offline contacts from your <gui>Contact List</gui>."
+msgstr "在 <gui>联系人列表</gui> 中隐藏离线联系人。"
 
-#: C/geolocation-what-is.page:33(title)
-msgid "What is geolocation"
-msgstr "什么是地理位置"
+#: C/hide-contacts.page:19(page/title)
+msgid "Hide offline contacts"
+msgstr "隐藏离线的联系人"
 
-#: C/geolocation-what-is.page:35(p)
+#: C/hide-contacts.page:21(page/p)
 msgid ""
-"Geolocation allows you to identify the real geographical location of a "
-"computer or a device connected to the Internet."
-msgstr "地理位置允许您确定连接到网络的一台电脑或设备在地理上的真实位置。"
-
-#: C/geolocation-what-is.page:37(p)
-msgid "With geolocation in <app>Empathy</app> you can:"
-msgstr "通过 <app>Empathy</app> 中的地理位置，您可以："
-
-#: C/geolocation-what-is.page:42(p)
-msgid "Publish your geographical location to your contacts."
-msgstr "公布您的地理位置给联系人。"
-
-#: C/geolocation-what-is.page:47(p)
-msgid "See your contacts’ geographical location and quickly contact them."
-msgstr "查看联系人的地址位置并快速联系他们。"
+"Normally, <app>Empathy</app> shows all your contacts: those that are online, "
+"with which you can have a conversation, and also those that are offline."
+msgstr ""
+"一般情况下，<app>Empathy</app> 会显示您所有的联系人：您可以与之进行会话的在线"
+"的联系人，和那些离线的联系人。"
 
-#: C/geolocation-what-is.page:52(p)
-msgid ""
-"Set the accuracy of your location and the device used to discover your "
-"location."
-msgstr "设置您的地理位置的精度及可以用来发现您的地理位置的设备。"
+#: C/hide-contacts.page:25(page/p)
+msgid "To hide the contacts that are offline:"
+msgstr "要隐藏离线的联系人："
 
-#: C/geolocation-what-is.page:60(p)
+#: C/hide-contacts.page:31(item/p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
+#| "gui><gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</"
+#| "key><key>H</key></keyseq>."
 msgid ""
-"In order to see your contacts’ geographical locations, they need to use a "
-"service and an application that supports geolocation."
-msgstr "您的联系人必须使用支持地理位置的程序，您才能看到他们的地理位置。"
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> "
+"<gui>Offline Contacts</gui></guiseq>, or press <keyseq><key>Ctrl</key> "
+"<key>H</key></keyseq>."
+msgstr ""
+"在 <gui>联系人列表</gui> 窗口，选择 <guiseq><gui>查看</gui><gui>离线联系人</"
+"gui></guiseq>，或按下 <keyseq><key>Ctrl</key><key>H</key></keyseq>。"
 
-#: C/geolocation-turn.page:9(desc)
-msgid "How to activate and deactivate geolocation in <app>Empathy</app>."
-msgstr "在 <app>Empathy</app> 中如何激活和禁用地理位置。"
+#: C/hide-contacts.page:36(item/p)
+msgid "To show the offline contacts again, repeat the same procedure above."
+msgstr "要再次显示离线的联系人，重复上面的步骤。"
 
-#: C/geolocation-turn.page:33(title)
-msgid "Activate/Deactivate geolocation"
-msgstr "激活/禁用地理位置"
+#: C/import-account.page:10(info/desc)
+msgid "Import an account from another instant messaging application."
+msgstr "从其他即时聊天程序中导入帐号。"
 
-#: C/geolocation-turn.page:37(p)
-msgid "Choose <guiseq><gui>Edit</gui><gui>Preferences</gui></guiseq>."
-msgstr "选择<guiseq><gui>编辑</gui><gui>首选项</gui></guiseq>。"
+#: C/import-account.page:19(credit/name)
+msgid "Peter Haslam"
+msgstr "Peter Haslam"
 
-#: C/geolocation-turn.page:42(p)
-msgid "Select the <gui>Location</gui> tab."
-msgstr "选择<gui>位置</gui>标签。"
+#: C/import-account.page:42(page/title)
+msgid "Import an existing account"
+msgstr "导入已存在的帐号"
 
-#: C/geolocation-turn.page:47(p)
+#: C/import-account.page:44(page/p)
 msgid ""
-"Select <gui>Publish location to my contacts</gui> to activate geolocation."
-msgstr "选择 <gui>向我的联系人公布位置信息</gui> 以激活地理位置。"
+"The first time you run <app>Empathy</app>, it will offer to import your "
+"accounts from other instant messaging applications. Currently, the only "
+"supported application is <app>Pidgin</app>."
+msgstr ""
+"<app>Empathy</app> 第一次运行时，会提示您可以从其他即时通讯程序中导入帐号。目"
+"前，支持的程序只有 <app>Pidgin</app>。"
 
-#: C/geolocation-turn.page:50(p)
-msgid "To deactivate geolocation, deselect it."
-msgstr "要禁用地理位置，请取消选择。"
+#: C/import-account.page:50(item/p)
+msgid ""
+"Run <app>Empathy</app> for the first time. An assistant will offer you a "
+"number of options to create new accounts."
+msgstr ""
+"第一次运行 <app>Empathy</app>，一个助理程序会提供若干选项以创建新帐号。"
 
-#: C/geolocation-turn.page:55(p)
+#: C/import-account.page:54(item/p)
 msgid ""
-"To increase the accuracy of your position, deselect <gui>Reduce location "
-"accuracy</gui>."
-msgstr "要提高您的位置的精度，请取消选择 <gui>降低位置信息精度</gui>。"
+"Select <gui>Yes, import my account details from</gui> and click "
+"<gui>Forward</gui>."
+msgstr "选择 <gui>有，请导入我的帐号信息</gui> 并点击 <gui>前进</gui>。"
+
+#: C/import-account.page:58(item/p)
+msgid "Select the check box next to each account you wish to import."
+msgstr "选择每个您想要导入的帐号旁的复选框。"
 
-#: C/geolocation-turn.page:61(p)
+#: C/import-account.page:66(note/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>Location sources</gui> "
-"section."
+"It is not currently possible to import accounts after you have completed the "
+"first-run assistant."
+msgstr "目前，您只能在第一次运行时的助理程序中导入帐号。"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/introduction.page:41(media)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/empathy-main-window.png'; "
+#| "md5=54908dcb2588beddb15ef0968d2c2582"
+msgctxt "_"
+msgid ""
+"external ref='figures/empathy-main-window.png' "
+"md5='54908dcb2588beddb15ef0968d2c2582'"
 msgstr ""
-"如果您有 GPS 这样的外部设备，或者想要发送更加精确的位置信息，在<gui>位置来源"
-"</gui>选项卡中选择适当的选项。"
+"@@image: 'figures/empathy-main-window.png'; "
+"md5=54908dcb2588beddb15ef0968d2c2582"
 
-#: C/geolocation-supported.page:7(desc)
-msgid "Services that supports geolocation and compatibility."
-msgstr "支持地理位置的服务和及其兼容性。"
+#: C/introduction.page:9(info/desc)
+msgid "Introduction to the <app>Empathy</app> instant messenger."
+msgstr "介绍 <app>Empathy</app> 即时聊天工具。"
 
-#: C/geolocation-supported.page:31(title)
-msgid "Supported services"
-msgstr "支持的设备"
+#: C/introduction.page:21(page/title)
+msgid "Introduction"
+msgstr "介绍"
 
-#: C/geolocation-supported.page:33(p)
+#: C/introduction.page:23(page/p)
 msgid ""
-"The geolocation feature at the moment is compatible only with the Jabber "
-"service. In order to use it, you and your contacts need to have a Jabber "
-"account."
+"<app>Empathy</app> is an instant messaging application for the GNOME "
+"Desktop. It supports text messaging, voice &amp; video calls, file "
+"transfers, and all the most used messaging systems such as MSN and Google "
+"Talk."
 msgstr ""
-"目前，只有 Jabber 服务与地理位置功能兼容。要使用地理位置，您和您的联系人必须"
-"有 Jabber 账户。"
+"<app>Empathy</app> 是 GNOME 桌面的即时通讯程序。它支持文字消息，语音和视频呼"
+"叫，文件传输，支持最常用的即时通讯系统，包括 MSN 和 Google Talk."
 
-#: C/geolocation-supported.page:39(p)
+#: C/introduction.page:28(page/p)
 msgid ""
-"It is necessary that also the server you are using supports the geolocation "
-"feature. Most of the Jabber servers support it. See your service website "
-"documentation for more information."
+"<app>Empathy</app> includes features that help you better collaborate while "
+"at work, and that let you easily keep in touch with your friends."
 msgstr ""
-"而且，您使用的服务器也需要支持地理位置功能。大多 Jabber 服务器都支持。要了解"
-"更多，请参看您的服务提供者的网站文档。"
-
-#: C/geolocation-supported.page:47(title)
-msgid "Compatibility"
-msgstr "兼容性"
+"<app>Empathy</app> 可以帮助您在工作中更好的合作，也可以帮助您与您的朋友们保持"
+"联系。"
 
-#: C/geolocation-supported.page:49(p)
+#: C/introduction.page:32(page/p)
 msgid ""
-"<app>Empathy</app> geolocation feature is not compatible with other "
-"geographical position services such as <em>Google Latitude</em>, <em>Yahoo "
-"Fire Eagle</em> or <em>Brightkite</em>."
+"Using <app>Empathy</app>, you can group all the conversations in a single "
+"window, have multiple windows for different kind of conversations, easily "
+"search through your previous conversations, and share your desktop in just "
+"two clicks."
 msgstr ""
-"<app>Empathy</app> 的地理位置功能与其他一些地理位置信息服务并不兼容，如 "
-"<em>Google Latitude</em>，<em>Yahoo Fire Eggle</em> 和 <em>Brightkite</em>。"
+"使用 <app>Empathy</app>，您可以将所有的会话组织在同一个窗口中，或者为不同类型"
+"的会话使用不同的窗口，还可以很容易地搜索之前的会话，或者共享您的桌面，只需要"
+"两次点击。"
 
-#: C/geolocation-privacy.page:8(desc)
-msgid "What information are sent and to who."
-msgstr "发送了什么信息，发送给谁了？"
+#: C/introduction.page:39(figure/title)
+msgid "<gui>Contact List</gui> window"
+msgstr "<gui>联系人列表</gui>窗口"
 
-#: C/geolocation-privacy.page:32(title)
-msgid "Geolocation Privacy"
-msgstr "地理位置隐私"
+#: C/introduction.page:40(figure/desc)
+msgid "<app>Empathy</app> main window"
+msgstr "<app>Empathy</app> 主窗口"
 
-#: C/geolocation-privacy.page:35(title)
-msgid "What information is sent"
-msgstr "什么信息被发送了"
+#: C/introduction.page:42(media/p)
+msgid "<app>Empathy</app> main window."
+msgstr "<app>Empathy</app> 主窗口。"
+
+#: C/irc-commands.page:7(info/desc)
+msgid "The supported IRC commands."
+msgstr "支持的 IRC 命令。"
+
+#: C/irc-commands.page:18(page/title)
+msgid "Supported IRC commands"
+msgstr "支持的 IRC 命令"
 
-#: C/geolocation-privacy.page:36(p)
+#: C/irc-commands.page:19(page/p)
 msgid ""
-"What is possible to send is: your country, region, locality, area, street, "
-"building, floor, room, and postal code, longitude, latitude and altitude, "
-"speed and bearing."
+"To see the list of the supported IRC commands, in a chat room type <input>/"
+"help</input> and press <key>Enter</key>."
 msgstr ""
-"有可能被发送的信息：您所在的国家，地区，地方，区域，街道，建筑，楼层，房间，"
-"邮政编码及经纬度，您的速度和方向。"
+"要查看支持的 IRC 命令的列表，在一个聊天室中输入<input>/help</input>并按"
+"<key>Enter</key>。"
 
-#: C/geolocation-privacy.page:40(p)
-msgid ""
-"The accuracy and the quantity of information about your geographical "
-"position are based on the software or on the infrastructure used to discover "
-"your position."
-msgstr "您的地理位置信息的精度和质量取决于软件或者用于发现您的位置的设施。"
+#: C/irc-commands.page:24(note/p)
+msgid "All commands available have a small description on their usage."
+msgstr "所有可用命令都有一个简单的用法描述。"
+
+#: C/irc-join-pwd.page:9(info/desc)
+msgid "Enter password-protected IRC chat rooms."
+msgstr "进入有密码保护的 IRC 聊天室。"
+
+#: C/irc-join-pwd.page:25(page/title)
+msgid "Join a protected IRC chat room"
+msgstr "加入一个受保护的 IRC 聊天室"
 
-#: C/geolocation-privacy.page:44(p)
+#: C/irc-join-pwd.page:27(page/p)
 msgid ""
-"Different kind of networks may have different accuracy settings, and may "
-"send different information. The use of external devices such as GPS or "
-"mobile phone will increase the accuracy of the information sent."
+"On some IRC networks, private IRC rooms may be protected with a password. If "
+"you know the password, use the following steps to join:"
 msgstr ""
-"不同的网络可能有不同的精度设置，可能发送不同的信息。使用外部设备，如 GPS 或手"
-"机，可以增加发送的信息的精度。"
+"在某些 IRC 网络上，私人的 IRC 房间可以被密码保护。如果您知道这密码，按照下面"
+"的步骤加入："
 
-#: C/geolocation-privacy.page:49(p)
+#: C/irc-join-pwd.page:33(item/p)
+msgid "<link xref=\"irc-join-room\">Join the room</link> as normal."
+msgstr "如往常一样<link xref=\"irc-join-room\">加入房间</link>。"
+
+#: C/irc-join-pwd.page:38(item/p)
 msgid ""
-"When the privacy mode is enabled, nothing more precise than your city will "
-"be sent, even if you are using an external device."
+"Empathy will prompt you for a password. Enter the password for the IRC chat "
+"room and click <gui style=\"button\">Join</gui>."
 msgstr ""
-"当隐私模式被启用后，只有您所在的城市信息会被发送，即使您正在使用外部设备。"
+"Empathy 会提示您输入密码。输入这个 IRC 聊天室的密码并点击 <gui style=\"button"
+"\">加入</gui>。"
 
-#: C/geolocation-privacy.page:56(title)
-msgid "Who can see the information sent"
-msgstr "谁会看到这些发送出去的信息"
+#: C/irc-join-room.page:8(info/desc)
+msgid "Join an IRC channel."
+msgstr "加入一个 IRC 频道。"
 
-#: C/geolocation-privacy.page:57(p)
-msgid "Only your contacts can see your geographical position."
-msgstr "只有您的联系人可以看到您的地理位置。"
+#: C/irc-join-room.page:31(page/title)
+msgid "Join an IRC chat room"
+msgstr "加入一个 IRC 聊天室"
 
-#: C/geolocation-privacy.page:63(title)
-msgid "What is the privacy mode"
-msgstr "什么是隐私模式"
+#: C/irc-join-room.page:33(page/p)
+msgid ""
+"You can join IRC chat rooms (also known as IRC channels) on any IRC network "
+"you’re connected to. To connect to an IRC network, see <link xref=\"add-"
+"account\"/> and <link xref=\"account-irc\"/>."
+msgstr ""
+"您可以加入您已经连接的所有 IRC 网络上的 IRC 聊天室(也称为 IRC 频道)。要连接一"
+"个 IRC 网络，参见 <link xref=\"add-account\"/> and <link xref=\"account-irc"
+"\"/>。"
 
-#: C/geolocation-privacy.page:64(p)
+#: C/irc-join-room.page:45(item/p)
 msgid ""
-"The privacy mode, enabled by default, is a reduced accuracy mode that will "
-"decrease the accuracy of the geographical position sent to your contacts."
+"From the <gui>Account</gui> drop-down list, select the IRC account that "
+"corresponds to the network you want to use."
+msgstr "在 <gui>帐号</gui> 下拉列表中，选择与您想要使用的网络对应的 IRC 帐号。"
+
+#: C/irc-join-room.page:51(item/p)
+msgid ""
+"In the <gui>Room</gui> text box, type the name of the channel you want to "
+"join. IRC channel names start with the hash character (<sys>#</sys>)."
 msgstr ""
-"隐私模式是精度降低模式，它会降低发送给您的联系人的地理位置信息的精度。隐私模"
-"式默认开启。"
+"在 <gui>聊天室</gui> 文本框中，输入您想要加入的频道的名称。IRC 频道名称以井号"
+"(<sys>#</sys>)开头。"
 
-#: C/geolocation-privacy.page:71(title)
-msgid "Privacy overview"
-msgstr "隐私概述"
+#: C/irc-join-room.page:57(item/p)
+msgid "Click <gui>Join</gui> to enter the room."
+msgstr "点击<gui>加入</gui>来进入房间。"
 
-#: C/geolocation-privacy.page:72(p)
+#: C/irc-join-room.page:64(note/p)
 msgid ""
-"Overview of the various geolocation privacy settings in <app>Empathy</app>."
-msgstr "<app>Empathy</app> 中一些关于地理位置隐私的选项的概况。"
+"To join multiple rooms, you need to repeat the steps above for each room."
+msgstr "要加入多个房间，您需要对每个房间重复上面的步骤。"
 
-#: C/geolocation-privacy.page:77(p)
-msgid "Geolocation is not enabled by default."
-msgstr "地理位置默认不开启。"
+#: C/irc-manage.page:9(info/desc)
+msgid "How to use IRC with <app>Empathy</app>."
+msgstr "如何在 <app>Empathy</app> 中使用 IRC。"
 
-#: C/geolocation-privacy.page:82(p)
-msgid "Privacy mode is enabled by default."
-msgstr "隐私模式默认被激活"
+#: C/irc-manage.page:23(credit/name)
+msgid "Sindhu S"
+msgstr ""
 
-#: C/geolocation-privacy.page:87(p)
+#: C/irc-manage.page:39(page/title)
+msgid "Internet Relay Chat (IRC)"
+msgstr "互联网中继聊天(IRC)"
+
+#: C/irc-manage.page:47(when/p)
 msgid ""
-"Privacy mode prevails even when using external and more precise devices."
-msgstr "即使在使用精度更高的外部设备，隐私模式也会发挥作用。"
+"<link action=\"install:telepathy-idle\" xref=\"index\"> Install telepathy-"
+"idle</link>"
+msgstr ""
 
-#: C/geolocation-privacy.page:92(p)
-msgid "Only your contacts can see your position."
-msgstr "只有您的联系人可以看到您的位置。"
+#: C/irc-manage.page:55(info/title)
+#, fuzzy
+#| msgid "IRC Chat Rooms and Conversations"
+msgctxt "link"
+msgid "IRC Chat Rooms and Conversations"
+msgstr "IRC 聊天室和会话"
 
-#: C/geolocation-not-showing.page:8(desc)
-msgid "<app>Empathy</app> does not publish my geographical position."
-msgstr "<app>Empathy</app> 没有发布我的地理位置。"
+#: C/irc-manage.page:57(section/title)
+msgid "Chat Rooms and Conversations"
+msgstr "聊天室和会话"
 
-#: C/geolocation-not-showing.page:32(title)
-msgid "Geographical position not published"
-msgstr "地理位置没有被公布。"
+#: C/irc-manage.page:62(info/title)
+#, fuzzy
+#| msgid "Common IRC Problems"
+msgctxt "link"
+msgid "Common IRC Problems"
+msgstr "常见 IRC 问题"
 
-#: C/geolocation-not-showing.page:34(p)
+#: C/irc-nick-password.page:10(info/desc)
+msgid "Protect your nickname to prevent other IRC users from using it."
+msgstr "保护您的昵称，以防其他 IRC 用户使用。"
+
+#: C/irc-nick-password.page:33(page/title)
+msgid "Use a nickname password on IRC"
+msgstr "在 IRC 中使用昵称和密码"
+
+#: C/irc-nick-password.page:35(page/p)
 msgid ""
-"If your contacts cannot see your location, <app>Empathy</app> might not be "
-"able to discover with a good margin of precision your geographical position."
+"On some IRC networks, you can register your nickname with a service called "
+"NickServ. By sending special messages to NickServ, you can set your password "
+"and identify yourself. Some IRC chat rooms may not allow you to join without "
+"a registered nickname."
 msgstr ""
-"如果您的联系人不能看到您的位置，可能是因为 <app>Empathy</app> 无法发现有一定"
-"精度的您的地理位置信息。"
+"在某些 IRC 网络上，您可以通过 NickServ 服务注册您的昵称。通过向 NickServ 发送"
+"特殊的消息，您可以设置密码来认证您自己。一些 IRC 聊天室可能不允许您加入，除非"
+"您有注册过的昵称。"
 
-#: C/geolocation-not-showing.page:38(p)
+#: C/irc-nick-password.page:40(page/p)
 msgid ""
-"In this case, your position will not be published, but you are still able to "
-"see the location of your contacts."
+"<app>Empathy</app> does not currently support nickname registration. Some "
+"IRC networks, however, will automatically forward a <em>server password</em> "
+"to NickServ. On these networks, you can use the IRC password in "
+"<app>Empathy</app> to identify yourself to NickServ. The popular freenode "
+"network is known to have this feature."
 msgstr ""
-"在这种情况下，您的位置信息不会被公布，但您仍可以看到您的联系人的位置信息。"
+"<app>Empathy</app> 目前还不支持昵称注册。但一些 IRC 网络会自动向 NickServ 发"
+"送一个 <em>服务器密码</em>。在这样的网络上，您可以在 <app>Empathy</app> 中使"
+"用这样的密码向 NickServ 认证您自己。流行的 freenode 网络就有这个功能。"
+
+#: C/irc-nick-password.page:46(page/p)
+msgid "To set an IRC server password:"
+msgstr "设置一个 IRC 密码："
 
-#: C/geolocation-not-showing.page:42(p)
+#: C/irc-nick-password.page:54(item/p)
+msgid "Select the IRC account from the list on the left of the dialog."
+msgstr "在左侧的对话框中选择一个 IRC 帐号"
+
+#: C/irc-nick-password.page:57(item/p)
 msgid ""
-"If you want to publish your geographical position, you can try to use an "
-"external device such as a GPS."
-msgstr "如果您想要公布您的地理位置，您可以试一试使用 GPS 等外部设备。"
+"In the <gui>Password</gui> field, type the password you used to register "
+"your nikcname."
+msgstr "在 <gui>密码</gui> 一栏中，输入您注册您的昵称时使用的密码。"
 
-#: C/geolocation-not-showing.page:48(p)
+#: C/irc-nick-password.page:69(note/p)
 msgid ""
-"In order to publish your geographical location, your Jabber server needs to "
-"support the Personal Eventing Protocal (PEP). A list of <link href=\"http://"
-"coccinella.im/servers/servers_by_pubsub_pep.html\">servers which support "
-"PEP</link> is maintained online. Google Talk does not support this feature "
-"at this time."
+"These instructions only allow you to use a password-protected nickname on "
+"certain IRC networks. It is not currently possible to register an IRC "
+"nickname or change your nickname password using <app>Empathy</app>."
 msgstr ""
-"要发布您的地理位置，您的 Jabber 服务器必须支持 Personal Eventing Protocal "
-"(PEP)。互联网上有人维护着一份<link href=\"http://coccinella.im/servers/"
-"servers_by_pubsub_pep.html\">支持 PEP 的服务器列表</link>。Google Talk 目前不"
-"支持 PEP。"
-
-#: C/geolocation.page:8(desc)
-msgid "Use and understand geolocation in <app>Empathy</app>."
-msgstr "使用和了解 <app>Empathy</app> 中的地理位置。"
-
-#: C/geolocation.page:32(title)
-msgid "Geographical position"
-msgstr "地理位置"
+"这些说明只是允许您在特定的 IRC 网络上使用密码保护的昵称。目前在 "
+"<app>Empathy</app> 中还不能注册 IRC 昵称或修改密码。"
 
-#: C/geolocation.page:35(title)
-msgid "Geolocation"
-msgstr "地理位置"
+#: C/irc-send-file.page:9(info/desc)
+msgid "<app>Empathy</app> does not currently support sending files using IRC."
+msgstr "<app>Empathy</app> 目前不支持 IRC 传文件。"
 
-#: C/geolocation.page:39(title)
-msgid "Fix common problems"
-msgstr "修复常见问题"
+#: C/irc-send-file.page:31(page/title)
+msgid "Send files over IRC"
+msgstr "通过 IRC 传送文件"
 
-#: C/favorite-rooms.page:10(desc)
-msgid "Set, join and manage favorite rooms."
-msgstr "设立，加入或管理聊天室收藏。"
+#: C/irc-send-file.page:33(page/p)
+msgid "It is not currently possible to send files using IRC."
+msgstr "目前无法用 IRC 传送文件。"
 
-#: C/favorite-rooms.page:29(title)
-msgid "Favorite rooms"
-msgstr "聊天室收藏"
+#: C/irc-start-conversation.page:8(info/desc)
+msgid "Start a conversation with an IRC contact."
+msgstr "向一位 IRC 联系人发起会话。"
 
-#: C/favorite-rooms.page:32(title)
-msgid "Set a room as a favorite"
-msgstr "收藏一个聊天室"
+#: C/irc-start-conversation.page:30(page/title)
+msgid "Chat with somebody on IRC"
+msgstr "与 IRC 中某人聊天"
 
-#: C/favorite-rooms.page:35(p)
-msgid "Join a room."
-msgstr "加入一个聊天室。"
+#: C/irc-start-conversation.page:32(page/p)
+msgid ""
+"You can hold private conversations with other IRC users, outside of the "
+"public IRC chat rooms. To start a conversation with another IRC user:"
+msgstr ""
+"您可以在公共的 IRC 聊天室之外与其他的 IRC 用户进行私人聊天。要与另一位 IRC 用"
+"户进行会话："
 
-#: C/favorite-rooms.page:40(p)
+#: C/irc-start-conversation.page:37(item/p)
 msgid ""
-"See <link xref=\"irc-join-room\"/> for more information on how to join an "
-"IRC room."
-msgstr "关于如何加入 IRC 聊天室，参见 <link xref=\"irc-join-room\"/>。"
+"In the contact list for an IRC chat room, double click the name of the user "
+"you want to chat with. Alternatively, right click the name of the user and "
+"choose <gui>Chat</gui>."
+msgstr ""
+"在一个 IRC 聊天室的联系人列表中，双击您想要聊天的用户。或者，右键点击用户的姓"
+"名并选择 <gui>聊天</gui>"
 
-#: C/favorite-rooms.page:46(p)
+#: C/irc-start-conversation.page:45(item/p)
 msgid ""
-"See <link xref=\"group-conversations\"/> for more information on how to "
-"start or join a group conversation."
+"The IRC room contact list is not the same as <app>Empathy</app> contact "
+"list. It contains a list of users in the IRC chat room you joined. Different "
+"rooms can have different contacts listed."
 msgstr ""
-"关于如何发起或加入群组聊天，参见 <link xref=\"group-conversations\"/>。"
+"IRC 聊天室的联系人列表与 <app>Empathy</app> 的联系人列表不同。它包含了您加入"
+"的这个 IRC 聊天室中的用户列表。不同的聊天室可能有不同的联系人列表。"
 
-#: C/favorite-rooms.page:54(p)
+#: C/irc-start-conversation.page:52(item/p)
 msgid ""
-"From the conversation window, choose <guiseq><gui>Conversation</"
-"gui><gui>Favorite Chat Room</gui></guiseq>."
+"The IRC room contact list is usually on the right side of the IRC room "
+"window. If you do not see it, choose <guiseq><gui>Conversation</"
+"gui><gui>Show Contact List</gui></guiseq>."
 msgstr ""
-"在会话窗口，选择 <guiseq><gui>会话</gui><gui>收藏聊天室</gui></guiseq>。"
+"IRC 聊天室的联系人列表通常位于窗口右侧。如果您没有看到它，选择 <guiseq><gui>"
+"对话</gui><gui>显示联系人列表</gui></guiseq>。"
 
-#: C/favorite-rooms.page:63(title)
-msgid "Join favorite rooms"
-msgstr "加入收藏的聊天室"
+#: C/license.page:8(info/desc)
+msgid "Legal information."
+msgstr "法律信息。"
 
-#: C/favorite-rooms.page:71(p)
-msgid "Press <key>F5</key>."
-msgstr "按 <key>F5</key> 键。"
+#: C/license.page:11(page/title)
+msgid "License"
+msgstr "许可"
 
-#: C/favorite-rooms.page:76(p)
+#: C/license.page:12(page/p)
 msgid ""
-"Choose <guiseq><gui>Room</gui><gui>Join Favorites</gui></guiseq>, to join "
-"all your favorite rooms."
+"This work is distributed under a CreativeCommons Attribution-Share Alike 3.0 "
+"Unported license."
 msgstr ""
-"选择 <guiseq><gui>聊天室</gui><gui>加入已收藏的聊天室</gui></guiseq>，以加入"
-"您之前收藏的聊天室。"
+"本作品在 CreativeCommons Attribution-Share Alike 3.0 Unported license下发布。"
 
-#: C/favorite-rooms.page:82(p)
-msgid "Choose <gui>Room</gui>, and select the favorite room you want to join."
-msgstr "选择 <gui>聊天室</gui>，并选择您要加入的已收藏的聊天室。"
+#: C/license.page:20(page/p)
+msgid "You are free:"
+msgstr "您可以自由："
 
-#: C/favorite-rooms.page:90(p)
-msgid ""
-"To join a favorite room, you need to be connected to the Internet and to "
-"your account."
-msgstr "要加入一个已收藏的聊天室，您必须连接互联网和您的账户。"
+#: C/license.page:25(item/title)
+#, fuzzy
+#| msgid "To share"
+msgid "<em>To share</em>"
+msgstr "分享"
 
-#: C/favorite-rooms.page:98(title)
-msgid "Manage favorite rooms"
-msgstr "管理聊天室收藏"
+#: C/license.page:26(item/p)
+msgid "To copy, distribute and transmit the work."
+msgstr "复制、分发或者传播作品。"
 
-#: C/favorite-rooms.page:101(p)
-msgid ""
-"From the <gui>Contact List</gui> window, choose <guiseq><gui>Room</"
-"gui><gui>Manage Favorites</gui></guiseq>."
-msgstr ""
-"在 <gui>联系人列表</gui> 窗口，选择 <guiseq><gui>聊天室</gui><gui>管理收藏夹"
-"</gui></guiseq>。"
+#: C/license.page:29(item/title)
+#, fuzzy
+#| msgid "To remix"
+msgid "<em>To remix</em>"
+msgstr "再创作"
 
-#: C/favorite-rooms.page:107(p)
-msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you want to "
-"manage the favorite rooms of."
-msgstr "在 <gui>账户</gui> 下拉列表中，选择您要管理聊天室收藏的账户。"
+#: C/license.page:30(item/p)
+msgid "To adapt the work."
+msgstr "修改作品。"
 
-#: C/favorite-rooms.page:111(p)
-msgid "Select <gui>All</gui> to see all you favorite rooms."
-msgstr "选择 <gui>全部</gui> 以看到搜有您收藏的聊天室。"
+#: C/license.page:33(page/p)
+msgid "Under the following conditions:"
+msgstr "需遵守一下条件："
 
-#: C/favorite-rooms.page:116(p)
-msgid "Select the favorite room you want to manage:"
-msgstr "选择您要管理的收藏："
+#: C/license.page:38(item/title)
+#, fuzzy
+#| msgid "Attribution"
+msgid "<em>Attribution</em>"
+msgstr "署名"
 
-#: C/favorite-rooms.page:121(p)
+#: C/license.page:39(item/p)
 msgid ""
-"Select the <gui>Auto-Connect</gui> check-box in order to automatically join "
-"that room when you connect to your account."
-msgstr "选择 <gui>自动连接</gui>，则您连接到您的账户后，会自动加入这个聊天室。"
-
-#: C/favorite-rooms.page:127(p)
-msgid "Click on <gui>Remove</gui> to remove the room from your favorites."
-msgstr "点击 <gui>删除</gui> 以从收藏夹中删除这个聊天室。"
-
-#: C/favorite-rooms.page:134(p)
-msgid "When done, click <gui>Close</gui>."
-msgstr "完成后，点击 <gui>关闭</gui>。"
+"You must attribute the work in the manner specified by the author or "
+"licensor (but not in any way that suggests that they endorse you or your use "
+"of the work)."
+msgstr ""
+"您必须按照作者或许可人指定的方式对作品署名(但不能以任何方式暗示他们认可您或者"
+"您对作品的使用)。"
 
-#: C/disable-account.page:9(desc)
-msgid "Prevent <app>Empathy</app> from automatically logging in to an account."
-msgstr "使 <app>Empathy</app> 不要自动登录一个账户。"
+#: C/license.page:46(item/title)
+#, fuzzy
+#| msgid "Share Alike"
+msgid "<em>Share Alike</em>"
+msgstr "相同方式共享"
 
-#: C/disable-account.page:39(title)
-msgid "Disable an account"
-msgstr "禁用一个账户"
+#: C/license.page:47(item/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/disable-account.page:41(p)
+#: C/license.page:53(page/p)
 msgid ""
-"You can disable an account to prevent <app>Empathy</app> from logging in to "
-"it without removing the account entirely. You may wish to disable and re-"
-"enable an account if you only want to be logged in to the account at certain "
-"times, but you still want to use <app>Empathy</app> for other accounts."
+"For the full text of the license, see the <link href=\"http://"
+"creativecommons.org/licenses/by-sa/3.0/legalcode\">CreativeCommons website</"
+"link>, or read the full <link href=\"http://creativecommons.org/licenses/by-"
+"sa/3.0/\">Commons Deed</link>."
 msgstr ""
-"您可以禁用一个账户以阻止 <app>Empathy</app> 自动登录这个账户而不必将其彻底删"
-"除。您可能想要禁用、启用某个账户如果您只想偶尔登录这个账户，但又想使用 "
-"<app>Empathy</app> 中的其他账户。"
+"许可的全文参见 <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/link-contacts.page:11(info/desc)
+msgid "Merge and separate different contacts into a single one."
+msgstr "将不同的联系人合并分割为一个联系人。"
 
-#: C/disable-account.page:52(p)
+#: C/link-contacts.page:25(page/title)
+msgid "Combine and separate contacts"
+msgstr "合并和分割联系人"
+
+#: C/link-contacts.page:26(page/p)
 msgid ""
-"Select the account you wish to disable from the accounts list on the left "
-"side of the window."
-msgstr "在窗口左侧的账户列表中，选择您想要禁用的账户。"
+"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/disable-account.page:56(p)
+#: C/link-contacts.page:30(page/p)
 msgid ""
-"Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
-"window."
-msgstr "在窗口右侧，取消选择 <gui style=\"checkbox\">启用</gui>。"
+"The resulting contact is called a <em>meta-contact</em>: a contact composed "
+"from different single contacts."
+msgstr "产生的联系人称为一个<em>元联系人</em>：由多个不同联系人组成的联系人。"
 
-#: C/disable-account.page:62(p)
+#: C/link-contacts.page:34(page/p)
 msgid ""
-"To re-enable the account, simply select <gui style=\"checkbox\">Enabled</"
-"gui>."
-msgstr "要重新启用这个账户，只需选择 <gui style=\"checkbox\">启用</gui>。"
+"If you have a Jane Smith contact that is using three different messaging "
+"services like:"
+msgstr "如果您有一个叫做 Jane Smith 的联系人，她使用三种不同的聊天服务："
 
-#: C/create-account.page:9(desc)
-msgid "Register for an account with one of the supported messaging services."
-msgstr "为某种支持的服务注册账户。"
+#: C/link-contacts.page:40(item/p)
+msgid "janes@facebook"
+msgstr "janes@facebook"
 
-#: C/create-account.page:34(title)
-msgid "Register for a new account"
-msgstr "注册一个新账户"
+#: C/link-contacts.page:45(item/p)
+msgid "jane.smith@gmail"
+msgstr "jane.smith@gmail"
+
+#: C/link-contacts.page:50(item/p)
+msgid "jane_smith@hotmail"
+msgstr "jane_smith@hotmail"
+
+#: C/link-contacts.page:55(page/p)
+msgid "You can combine these contacts into a single Jane Smith one."
+msgstr "您可以将这些联系人合并成一个 Jane Smith."
 
-#: C/create-account.page:36(p)
+#: C/link-contacts.page:60(section/title)
+msgid "Combining contacts"
+msgstr "合并联系人"
+
+#: C/link-contacts.page:63(item/p)
 msgid ""
-"Most account types require you to create an account with a account provider "
-"before you can connect using instant messaging applications like "
-"<app>Empathy</app>. With some account providers, you can use <app>Empathy</"
-"app> to register for a new account, using the same steps as you would to "
-"<link xref=\"add-account\">add an account</link>."
+"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 ""
-"大多账户类型需要您在使用 <app>Empathy</app> 这样的即时通讯软件连接之前先建立"
-"账户。但对于某些账户提供商，您可以使用 <app>Empathy</app> 来注册新账户，使用"
-"与 <link xref=\"add-account\">添加账户</link> 相同的步骤。"
+"在 <gui>联系人列表</gui> 窗口，右键点击有不同帐号的联系人，并选择 <gui style="
+"\"menuitem\">绑定联系人…</gui>"
 
-#: C/create-account.page:42(p)
+#: C/link-contacts.page:70(item/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 "
-"password, as well as any additional information you need to connect using "
-"<app>Empathy</app>."
-msgstr ""
-"这一页是关于建立各种类型的账户的。您应当已经从您的账户提供商那里得到了登录 "
-"ID 和密码，以及其他使用 <app>Empathy</app> 连接这个账户需要的信息。"
+"From the left pane in the <gui>Link Contacts</gui> window, select the "
+"contacts you want to combine."
+msgstr "在 <gui>绑定联系人</gui> 窗口的左窗格，选择您想要关联起来的联系人。"
 
-#: C/create-account.page:47(title)
-msgid "Facebook"
-msgstr "Facebook"
+#: C/link-contacts.page:76(item/p)
+msgid "Click <gui style=\"button\">Link</gui>."
+msgstr "点击 <gui style=\"button\">绑定</gui>."
 
-#: C/create-account.page:48(p)
+#: C/link-contacts.page:82(note/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."
+"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 ""
-"Facebook 是最常用的社交网络之一。它允许用户对自己进行个性化的描述并与朋友们交"
-"流。"
+"当一个元联系人被创建后，您双击该联系人时默认使用的联系人是有最高的在线状态的"
+"联系人。"
 
-#: C/create-account.page:52(p)
+#: C/link-contacts.page:91(section/title)
+msgid "Separating contacts"
+msgstr "分割联系人"
+
+#: C/link-contacts.page:94(item/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>."
+"From the <gui>Contact List</gui>, right-click the contact to separate, and "
+"select <gui style=\"menuitem\">Link Contacts...</gui>."
 msgstr ""
-"要使用 Facebook 与您的朋友们交流，您需要在其网站上建立一个新账户：<link href="
-"\"http://www.facebook.com\">www.facebook.com</link>。"
+"在 <gui>联系人列表</gui> 窗口中，右键点击要分割的联系人，并选择 <gui style="
+"\"menuitem\">绑定联系人…</gui>"
 
-#: C/create-account.page:60(title) C/audio-video.page:170(p)
-msgid "Jabber"
-msgstr "Jabber"
+#: C/link-contacts.page:100(item/p)
+msgid "Click <gui style=\"button\">Unlink</gui>."
+msgstr "点击 <gui style=\"button\">解除绑定</gui>。"
 
-#: C/create-account.page:62(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/overview.page:37(media)
+msgctxt "_"
 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."
+"external ref='figures/video_overview.png' "
+"md5='6cfcfbd833bf2234537d402185c40596'"
 msgstr ""
-"Jabber 是一种开放的即时通讯系统。像 email 一样，Jabber 允许您选择账户提供商，"
-"并与其他 Jabber 用户交流，无论他们使用哪里账户提供商。"
 
-#: C/create-account.page:66(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/overview.page:38(media)
+msgctxt "_"
 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>."
+"external ref='figures/conf_overview.png' "
+"md5='74c58668fe89c84060f12f6b70a6b903'"
 msgstr ""
-"您需要在某个 Jabber 服务提供商那里建立账户。有许多 Jabber 服务提供商，<link "
-"href=\"http://register.jabber.org/\">Jabber.org</link> 是很流行的一个。"
 
-#: C/create-account.page:71(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/overview.page:39(media)
+msgctxt "_"
 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."
+"external ref='figures/croom_overview.png' "
+"md5='e9619d2c8420bc48a880c03dbc1ae084'"
 msgstr ""
-"如果您使用 Google Mail 或者 Google Talk，那么您已经拥有 Jabber 账户了。"
-"Google Talk 就是一个 Jabber 服务。您只需要使用您的 Google Mail 地址和密码在 "
-"<app>Empathy</app> 中连接。"
 
-#: C/create-account.page:78(title) C/audio-video.page:190(p)
-msgid "People Nearby"
-msgstr "附近的人"
-
-#: 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, "
-"such as a wireless hotspot. It automatically finds all other users on the "
-"network who are also using this service."
+#: C/overview.page:8(info/desc)
+msgid "What instant messaging is and how you can use it."
 msgstr ""
-"要使用这个服务，您并不需要在某个服务提供商那里创建账户，只需要连接到一个本地"
-"网络，比如一个无线热点。它会自动发现网络中使用这个服务的其他用户。"
-
-#: C/create-account.page:85(p)
-msgid "For more information, see <link xref=\"salut-protocol\"/>."
-msgstr "更多信息参见<link xref=\"salut-protocol\"/>。"
 
-#: C/create-account.page:89(title) C/audio-video.page:205(p)
-msgid "SIP"
-msgstr "SIP"
+#: C/overview.page:12(credit/name)
+msgid "Aruna S"
+msgstr ""
 
-#: 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 "
-"provider. You can communicate with all other SIP users, regardless of which "
-"SIP provider they use."
+#: C/overview.page:24(page/title)
+msgid "Overview of instant messaging"
 msgstr ""
-"SIP 是一种允许用户通过互联网进行语音和视频会话的开放系统。您需要在某个 SIP 服"
-"务提供商处创建账户。您可以和其他的 SIP 用户交流，无论他们的 SIP 服务提供商与"
-"您是否相同。"
 
-#: C/create-account.page:97(p)
+#: C/overview.page:26(page/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>."
+"Instant messaging, sometimes abbreviated to IM, is a text-based means to "
+"communicate instantly over the internet and the local network. While some IM "
+"applications work with only one type of account, others, including <link "
+"xref=\"introduction\">Empathy</link>, provide IM facilities by using <link "
+"xref=\"add-account\">accounts</link> from different service providers. Some "
+"of these even support audio and video calling."
 msgstr ""
-"由于技术上的差别，免费的 <link href=\"https://www.ekiga.net/index.php?"
-"page=register\">Ekiga.net</link> 服务目前在 <app>Empathy</app> 中还不能使用。"
 
-#: 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."
+#: C/overview.page:42(td/p)
+msgid "Video Conference"
 msgstr ""
-"有些 SIP 服务提供商允许用您的计算机呼叫一般的电话。通常，您需要订阅某种付费服"
-"务才能使用这个功能。"
 
-#: C/create-account.page:107(title) C/audio-video.page:165(p)
-msgid "IRC"
-msgstr "IRC"
+#: C/overview.page:43(td/p)
+#, fuzzy
+#| msgid "Group conversations"
+msgid "Group chats"
+msgstr "群组聊天"
 
-#: C/create-account.page:109(p)
+#: C/overview.page:44(td/p)
+#, fuzzy
+#| msgid "Favorite rooms"
+msgid "Chat rooms"
+msgstr "聊天室收藏"
+
+#: C/overview.page:48(page/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 "
-"is only established each time you connect. If another user is using the "
-"nickname, you will need to choose a new nickname."
+"Some instant messaging applications can be used to connect to chat rooms, "
+"online places where like-minded people meet to talk. One popular means to "
+"connect to several chat rooms is the Internet Relay Chat, also known as "
+"<link xref=\"irc-manage\">IRC</link>. IRC provides <link xref=\"irc-join-room"
+"\">public</link> chat rooms, which are open to anyone who creates an account "
+"on the IRC Server, and private chat rooms, which are <link xref=\"irc-join-"
+"pwd\">password protected</link> and open only to a select few."
 msgstr ""
-"您不需要注册账户就可以使用 IRC。尽管您在 <app>Empathy</app> 中添加 IRC 账户时"
-"指定了一个昵称，这个昵称只是您每次连接时才建立。如果有其他用户在使用这个昵"
-"称，您需要选择一个其他昵称。"
 
-#: C/create-account.page:114(p)
+#: C/prev-conv.page:8(info/desc)
+msgid "Browse or search your previous conversations."
+msgstr "浏览或搜索您之前的会话。"
+
+#: C/prev-conv.page:36(page/title)
+msgid "View previous conversations"
+msgstr "查看之前的会话"
+
+#: C/prev-conv.page:38(page/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."
+"<app>Empathy</app> automatically saves all your text conversations you have "
+"with your contacts. You can <link xref=\"#search\">search through all of "
+"your previous conversations</link> or <link xref=\"#browse\">browse previous "
+"conversations</link> by contact and date."
 msgstr ""
-"有些 IRC 网络上有一种叫做 NickServ 的服务，允许用户保护他们的昵称。更多信息参"
-"见<link xref=\"irc-nick-password\"/>。"
+"<app>Empathy</app> 自动保存您和联系人的所有文字会话。您可以<link xref="
+"\"#search\">搜索之前全部的会话</link>或者根据联系人和日期<link xref=\"#browse"
+"\">浏览之前的会话</link>。"
 
-#: C/create-account.page:117(p)
+#: C/prev-conv.page:46(note/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 ""
-"有些 IRC 服务器是被密码保护的。您需要知道密码才能连接到这些服务器。通常，这样"
-"的服务器是私有的。"
+"You do not need to be connected to the Internet to view and search your "
+"previous conversations."
+msgstr "您不需要连接到网络来查看和搜索您之前的会话。"
 
-#: C/create-account.page:122(title)
-msgid "Proprietary Services"
-msgstr "专有的服务"
+#: C/prev-conv.page:53(section/title)
+msgid "Search previous conversations"
+msgstr "搜索之前的会话"
 
-#: C/create-account.page:124(p)
+#: C/prev-conv.page:55(section/p)
 msgid ""
-"There are many proprietary instant messaging services that have been "
-"developed by different companies or organizations. <app>Empathy</app> allows "
-"you to connect to an existing account for most popular services. To create a "
-"new account with one of these services, you will need to visit the service’s "
-"web site and agree to its terms of use."
-msgstr ""
-"许多不同的公司或组织开发了一些专营的即时消息服务。<app>Empathy</app> 允许您连"
-"接大多常见服务的既存账户。要为这样的服务创建账户，您需要访问其网站并同意其使"
-"用条款。"
+"You can perform a full-text search through all of your previous "
+"conversations."
+msgstr "您可以在之前的所有会话中进行全文搜索。"
 
-#: C/create-account.page:133(link) C/audio-video.page:135(p)
-msgid "AIM"
-msgstr "AIM"
+#: C/prev-conv.page:59(item/p) C/prev-conv.page:87(item/p)
+#, fuzzy
+#| msgid ""
+#| "From the <gui>Contact List</gui> window, choose <guiseq><gui>View</"
+#| "gui><gui>Previous Conversations</gui></guiseq>. Alternatively, press "
+#| "<key>F3</key>."
+msgid ""
+"From the <gui>Contact List</gui> window, choose <guiseq><gui>View</gui> "
+"<gui>Previous Conversations</gui></guiseq>. Alternatively, press <key>F3</"
+"key>."
+msgstr ""
+"从<gui>联系人列表</gui>窗口，选择<guiseq><gui>查看</gui><gui>最近会话</gui></"
+"guiseq>。或者可以按<key>F3</key>键。"
 
-#: C/create-account.page:138(link) C/audio-video.page:160(p)
-msgid "ICQ"
-msgstr "ICQ"
+#: C/prev-conv.page:63(item/p)
+msgid ""
+"Select an account from the drop-down list in the top. A list of contacts and "
+"chat room for that account will be shown below."
+msgstr "在顶部的下拉列表中选择一个帐号。下方显示该帐号的联系人列表和聊天室。"
 
-#: C/create-account.page:143(link) C/audio-video.page:175(p)
-msgid "MSN"
-msgstr "MSN"
+#: C/prev-conv.page:67(item/p)
+msgid ""
+"Type the text you want to search for in the <gui>Search</gui> text field."
+msgstr "在<gui>搜索</gui>文本框输入您要搜索的文本。"
 
-#: C/create-account.page:148(link) C/audio-video.page:210(p)
-msgid "Yahoo!"
-msgstr "Yahoo!"
+#: C/prev-conv.page:71(item/p)
+msgid ""
+"Any conversations that matched your search terms will be shown. By default, "
+"conversations are ordered by date."
+msgstr "符合搜索条件的会话会显示在下面的列表中。会话默认按日期排序。"
 
-#: C/change-status.page:9(desc)
-msgid "Change your status to advertise your availability to your contacts."
-msgstr "改变您的状态以向您的联系人表明您是否闲暇。"
+#: C/prev-conv.page:80(section/title)
+msgid "Browse previous conversations"
+msgstr "浏览之前的会话"
 
-#: C/change-status.page:34(title)
-msgid "Change your status"
-msgstr "改变您的状态"
+#: C/prev-conv.page:82(section/p)
+msgid ""
+"You can browse your previous conversations with your contacts or in chat "
+"rooms by date."
+msgstr "您可以按时间顺序浏览之前和联系人或在聊天室中的会话。"
 
-#: C/change-status.page:36(p)
+#: C/prev-conv.page:91(item/p)
 msgid ""
-"You can set your status to indicate your availability to your contacts. "
-"<app>Empathy</app> allows you to select from a list of defined statuses."
+"Select an account from the drop-down list in the top left. A list of "
+"contacts and chat room for that account will be shown below."
 msgstr ""
-"您可以改变您的状态，从而向联系人表明您现在是否闲暇。<app>Empathy</app> 允许您"
-"从一些定义好的状态中选择一个。"
+"在左上的下拉列表中选择一个帐号。下方会显示这个帐号的联系人和聊天室列表。"
 
-#: C/change-status.page:41(p)
+#: C/prev-conv.page:95(item/p)
 msgid ""
-"Click on the drop-down list at the top of the <gui>Contact List</gui> window."
-msgstr "点击 <gui>联系人列表</gui> 窗口顶部的下拉列表。"
-
-#: C/change-status.page:46(p)
-msgid "Select a status from the list."
-msgstr "从列表中选择一个状态。"
+"Select a contact or chat room to view your previous conversations from. By "
+"default the most recent conversation will be shown."
+msgstr "选择一个联系人或聊天室以查看之前的会话。默认显示的是最近的会话。"
 
-#: C/change-status.page:52(p)
+#: C/prev-conv.page:99(item/p)
 msgid ""
-"See <link xref=\"status-icons\"/> for a list of the built-in statuses and "
-"what they mean. You can also <link xref=\"set-custom-message\">add custom "
-"status messages</link> to provide more information about your availability "
-"to your contacts."
+"You can browse your conversations by date. Days on which you had a "
+"conversation with the selected contact will be shown in bold text. Click a "
+"date to select it. Click the arrows next to the month and year to browse "
+"earlier dates."
 msgstr ""
-"内置的状态和它们的含义参见<link xref=\"status-icons\"/>。您也可以<link xref="
-"\"set-custom-message\">添加自定义的状态信息</link>来向您的联系人提供更多有关"
-"您当前状态的信息。"
+"您可以按日期浏览您的会话。如果在某日您所选择的帐号有过会话，该日会以粗体显"
+"示。点击一个日期以选择它。点击月和年旁的箭头以浏览更早的日期。"
 
-#: C/change-status.page:58(p)
+#: C/prev-conv.page:105(section/p)
 msgid ""
-"If you do not use your computer for a while, or if the screensaver is on, "
-"the status will be automatically set to Away."
+"You can search for text in the conversations by typing into the search field "
+"at the top. The matching conversations will be showed."
 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/prev-conv.page:111(note/p)
 msgid ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"You can quickly view the previous conversations with one of your contacts "
+"from the <gui>Contact List</gui> window. Simply right click the contact and "
+"choose <gui>Previous Conversations</gui>. The <gui>Previous Conversations</"
+"gui> window will open with that contact already selected."
 msgstr ""
-"@@image: 'figures/audio-input-microphone.png'; "
-"md5=8d89026b66a263a3bc5b1f0665948567"
+"在 <gui>联系人列表</gui> 窗口中，您可以快速查看与某个联系人之前进行过的会话。"
+"右键点击该联系人，选择 <gui>最近回话</gui>。与该联系人的<gui>最近会话</gui>窗"
+"口将会打开，并且选中该联系人。"
 
-#: C/audio-video.page:8(desc)
+#: C/prob-conn-acctdisabled.page:7(info/desc)
 msgid ""
-"Information on when it is possible to have an audio or video conversation."
-msgstr "语音或视频会话的条件。"
+"The instant messaging account that you want to use is not enabled in the "
+"list of accounts."
+msgstr "您要连接的即时通信帐号没有在帐号列表中启用。"
 
-#: C/audio-video.page:32(title)
-msgid "Audio and video support"
-msgstr "语音和视频支持"
+#: C/prob-conn-acctdisabled.page:34(page/title)
+msgid "My account is not enabled"
+msgstr "我的帐号没有启用"
 
-#: C/audio-video.page:34(p)
+#: C/prob-conn-acctdisabled.page:36(page/p)
 msgid ""
-"You can only have audio and video conversation with contacts who are using "
-"an application which also supports this feature. When your contacts support "
-"audio or video conversations, you will see the following icons next to their "
-"names in the contact list:"
+"If the instant messaging account that you want to use is not enabled in the "
+"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/audio-video.page:43(p)
-msgid "Icon"
-msgstr "图标"
-
-#: C/audio-video.page:48(p)
-msgid "Description"
-msgstr "描述"
-
-#: C/audio-video.page:58(media)
-msgid "Icon for audio conversation"
-msgstr "语音聊天的图标"
+"如果当您尝试开始一个新会话或者加入房间时，要使用的即时聊天帐号没有在下拉的账"
+"户列表中启用，您的帐号信息可能不正确。"
 
-#: C/audio-video.page:64(p)
-msgid "The contact is able to have an audio conversation."
-msgstr "联系人可以进行语音聊天。"
+#: C/prob-conn-acctdisabled.page:44(item/p) C/prob-conn-auth.page:45(item/p)
+#: C/prob-conn-neterror.page:53(item/p)
+msgid ""
+"Make sure that you are connected to the Internet, or to a local area network."
+msgstr "确保您已经连接到互联网，或者一个本地网络。"
 
-#: C/audio-video.page:70(media)
-msgid "Icon for video conversation"
-msgstr "视频聊天的图标"
+#: C/prob-conn-acctdisabled.page:49(item/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/audio-video.page:76(p)
-msgid "The contact is able to have a video conversation."
-msgstr "联系人可以进行视频聊天。"
+#: C/prob-conn-acctdisabled.page:55(item/p) C/prob-conn-auth.page:63(item/p)
+msgid ""
+"Type your username and password again to make sure that they are correct."
+msgstr "再次输入您的用户名和密码，以确保它们是正确的。"
 
-#: C/audio-video.page:83(p)
+#: C/prob-conn-acctdisabled.page:60(item/p)
+#: C/prob-conn-neterror.page:64(item/p)
 msgid ""
-"In order to have an audio conversation, you need to have a sound card that "
-"is supported by your operating system, and a working microphone."
+"Check in the <gui>Advanced</gui> section that all the details are correct. "
+"You should be able to find these details from the website of the messaging "
+"service."
 msgstr ""
-"要进行语音聊天，您需要有一块声卡，且您的操作系统必需支持它，还需要一个能正常"
-"工作的麦克风。"
+"检查<gui>高级</gui>选项卡中的所有细节是否正确。您应当可以从即时通讯服务商的网"
+"站上找到这些信息。"
 
-#: C/audio-video.page:87(p)
+#: C/prob-conn-acctdisabled.page:66(item/p)
+msgid "Check that the account is switched on."
+msgstr "检查帐号是否开启。"
+
+#: C/prob-conn-auth.page:8(info/desc)
 msgid ""
-"In order to have a video conversation, you need to have a webcam that is "
-"supported by your operating system, and a working microphone."
-msgstr "要进行视频聊天，您需要操作系统支持的摄像头，及可以正常工作的麦克风。"
+"An error message which says “<gui>Authentication failed</gui>” appears in "
+"the main window."
+msgstr "主窗口中显示了一个错误提示信息，“<gui>验证失败</gui>”。"
 
-#: C/audio-video.page:95(title)
-msgid "Supported Account Types"
-msgstr "支持的账户类型"
+#: C/prob-conn-auth.page:36(page/title)
+msgid "I get a message that says “Authentication failed”"
+msgstr "我收到“验证失败”的错误提示信息"
 
-#: C/audio-video.page:97(p)
+#: C/prob-conn-auth.page:38(page/p)
 msgid ""
-"You can only have audio and video conversations using accounts on certain "
-"supported services. The following table lists whether audio and video is "
-"supported for each type of account."
+"This kind of error happens when your instant messaging service is not "
+"allowing you to connect because it does not recognize your username or "
+"password for some reason."
 msgstr ""
-"只有一些特定类型的账户支持语音或视频聊天。下表列出了每种类型的账户的语音、视"
-"频支持情况。"
+"这种错误发生在您的即时通信服务器无法确认您的身份，不允许您连接时。比如，因为"
+"某种原因，它无法识别您的用户名或者密码。"
 
-#: C/audio-video.page:102(p)
+#: C/prob-conn-auth.page:50(item/p)
 msgid ""
-"Account types are provided by plugins. Your system may not have all of the "
-"following types available, or it may have types not listed here. Updated "
-"plugins may make audio or video conversations possible on account types that "
-"are listed as unsupported here."
+"Make sure that you have registered an account with the service you are "
+"trying to connect to. If you do not have an account, most services will not "
+"allow you to connect."
 msgstr ""
-"账户类型是由插件提供的。您的系统上不一定有以下列出的全部类型，也可能有一些类"
-"型没有在下面列出。插件的升级可能使下表中不支持语音或视频的账户类型获得支持。"
+"确保您已经在要连接的服务上注册了帐号。如果没有帐号，多数服务都不会允许您连"
+"接。"
 
-#: C/audio-video.page:110(p)
+#: C/prob-conn-auth.page:57(item/p) C/prob-conn-name.page:43(item/p)
+#: C/prob-conn-neterror.page:58(item/p)
 msgid ""
-"I'd like to do tables like this using nothing for No and ✔ for Yes, but we "
-"need to look at the accessibility impact. I've <link href=\"http://mail."
-"gnome.org/archives/gnome-doc-list/2009-September/msg00006.html\">asked the "
-"accessibility team</link> for input."
+"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/audio-video.page:118(p)
+#: C/prob-conn-auth.page:68(item/p)
 msgid ""
-"There's recent work on telepathy-butterfly and papyon to support audio and "
-"video for MSN. It might be released in time for 2.28, but since it doesn't "
-"follow the Gnome release schedule, I can't be sure. If it looks like it's "
-"going to ship, let's mark it Yes."
-msgstr ""
+"Deselect the <gui>Enabled</gui>, and then select it again to try to "
+"reconnect to the service."
+msgstr "取消选择<gui>已启用</gui>，然后再次选中以重新连接到服务器。"
 
-#: C/audio-video.page:128(p)
-msgid "Service"
-msgstr "服务"
+#: C/prob-conn-name.page:9(info/title)
+#, fuzzy
+#| msgid "“Name in use”"
+msgctxt "link:error-msg"
+msgid "“Name in use”"
+msgstr "“用户名已经被占用”"
 
-#: C/audio-video.page:129(p)
-msgid "Audio"
-msgstr "语音"
+#: C/prob-conn-name.page:10(info/desc)
+msgid ""
+"An error message which says “<gui>Name in use</gui>” appears in the main "
+"window."
+msgstr "主窗口中显示了一个错误提示信息，“<gui>用户名已被占用</gui>”。"
 
-#: C/audio-video.page:130(p)
-msgid "Video"
-msgstr "视频"
+#: C/prob-conn-name.page:33(page/title)
+msgid "I get a message that says “Name in use”"
+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)
-#: C/audio-video.page:146(p) C/audio-video.page:147(p)
-#: C/audio-video.page:156(p) C/audio-video.page:157(p)
-#: C/audio-video.page:161(p) C/audio-video.page:162(p)
-#: C/audio-video.page:166(p) C/audio-video.page:167(p)
-#: C/audio-video.page:181(p) C/audio-video.page:182(p)
-#: C/audio-video.page:186(p) C/audio-video.page:187(p)
-#: C/audio-video.page:191(p) C/audio-video.page:192(p)
-#: C/audio-video.page:196(p) C/audio-video.page:197(p)
-#: C/audio-video.page:201(p) C/audio-video.page:202(p)
-#: C/audio-video.page:211(p) C/audio-video.page:212(p)
-#: C/audio-video.page:216(p) C/audio-video.page:217(p)
-msgid "No"
-msgstr "否"
+#: C/prob-conn-name.page:35(page/p)
+msgid ""
+"This kind of error happens when you try to connect to your IRC account and "
+"you are using a nickname that is already being used by someone else on that "
+"particular network."
+msgstr ""
+"这种错误出现在您尝试连接到 IRC 帐号，然而您使用的昵称正在被该网络上其他人使用"
+"的情况下。"
 
-#: C/audio-video.page:140(p)
-msgid "Facebook Chat"
-msgstr "Facebook 聊天"
+#: C/prob-conn-name.page:51(item/p)
+msgid "In the <gui>Nickname</gui> text box, type a new nickname."
+msgstr "在<gui>昵称</gui>文本框中，输入一个新昵称。"
 
-#: C/audio-video.page:145(p)
-msgid "gadugadu"
-msgstr "gadugadu"
+#: C/prob-conn-name.page:56(item/p)
+msgid ""
+"If you have registered that nickname within the network you are using, set "
+"the password for that nickname. For more information, see <link xref=\"irc-"
+"nick-password\"/>."
+msgstr ""
+"如果您在所用的网路中注册了这个昵称，请为该昵称设置密码。更多信息参见<link "
+"xref=\"irc-nick-password\"/>。"
 
-#: C/audio-video.page:150(p)
-msgid "Google Talk"
-msgstr "Google Talk"
+#: C/prob-conn-name.page:65(item/p) C/prob-conn-neterror.page:79(item/p)
+msgid ""
+"Switch the account off, and then switch it on to try to reconnect to the "
+"service."
+msgstr "关闭帐号，然后开启该帐号并尝试重新连接到服务。"
 
-#: C/audio-video.page:151(p) C/audio-video.page:152(p)
-#: C/audio-video.page:171(p) C/audio-video.page:172(p)
-#: C/audio-video.page:176(p) C/audio-video.page:177(p)
-#: C/audio-video.page:206(p) C/audio-video.page:207(p)
-msgid "Yes"
-msgstr "是"
+#: C/prob-conn-neterror.page:7(info/desc)
+msgid ""
+"An error message which says “<gui>Network error</gui>” appears in the main "
+"window."
+msgstr "主窗口中显示了一个错误提示信息，“<gui>网络错误</gui>”。"
 
-#: C/audio-video.page:155(p)
-msgid "Groupwise"
-msgstr "Groupwise"
+#: C/prob-conn-neterror.page:34(page/title)
+msgid "I get a message that says “Network error”"
+msgstr "我收到“网络错误”的错误提示信息"
 
-#: C/audio-video.page:180(p)
-msgid "myspace"
-msgstr "myspace"
+#: C/prob-conn-neterror.page:42(page/p)
+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/audio-video.page:185(p)
-msgid "qq"
-msgstr "qq"
+#: C/prob-conn-neterror.page:46(page/p)
+msgid ""
+"Also, this kind of error happens when you try to use an IRC account without "
+"setting a nickname."
+msgstr "此外，这种错误也在您试图不设置昵称而使用 IRC 帐号时出现。"
 
-#: C/audio-video.page:195(p)
-msgid "sametime"
-msgstr "sametime"
+#: C/prob-conn-neterror.page:87(section/title)
+msgid "Proxy support"
+msgstr "代理支持"
 
-#: C/audio-video.page:200(p)
-msgid "silc"
-msgstr "silc"
+#: C/prob-conn-neterror.page:88(section/p)
+msgid ""
+"At the moment <app>Empathy</app> can not be configured to work with a proxy."
+msgstr "目前 <app>Empathy</app> 无法在代理下工作。"
 
-#: C/audio-video.page:215(p)
-msgid "zephyr"
-msgstr "zephyr"
+#: C/prob-conn.page:7(info/desc)
+msgid "Diagnose common problems connecting to an instant messaging service."
+msgstr "诊断连接到一个即时消息服务的常见问题。"
 
-#: C/audio-call.page:9(desc)
-msgid "Call your contacts over the Internet."
-msgstr "通过互联网呼叫您的联系人。"
+#: C/prob-conn.page:29(page/title)
+msgid "Problems connecting to an instant messaging service"
+msgstr "连接到即时消息服务时的问题"
 
-#: C/audio-call.page:27(title)
-msgid "Start an audio conversation"
-msgstr "开始语音聊天"
+#: C/remove-account.page:8(info/desc)
+msgid "Completely remove an account from <app>Empathy</app>."
+msgstr "从 <app>Empathy</app> 中完全地删除一个帐号。"
 
-#: 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/remove-account.page:34(page/title)
+msgid "Remove an account"
+msgstr "删除帐号"
 
-#: C/audio-call.page:34(p)
+#: C/remove-account.page:36(page/p)
 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\">Audio Call</gui>."
+"You can completely remove an account from <app>Empathy</app> if you no "
+"longer wish to use the account. If you wish to use the account in "
+"<app>Empathy</app> again in the future, you will have to add your account "
+"details again."
 msgstr ""
-"在 <gui>联系人列表</gui> 窗口，点击您想呼叫的联系人的名字旁的 <media type="
-"\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</media> "
-"图标并选择 <gui style=\"menuitem\">语音呼叫</gui>。"
+"如果你不想再使用某个帐号，您可以从 <app>Empathy</app> 中完全地删除这个帐号。"
+"如果您将来又希望在 <app>Empathy</app> 中使用这个帐号了，您可以再添加这个账"
+"户。"
 
-#: C/audio-call.page:55(p)
+#: C/remove-account.page:47(item/p)
 msgid ""
-"To turn an audio conversation into a video conversation, choose <guiseq><gui "
-"style=\"menu\">Video</gui><gui style=\"menuitem\">Video On</gui></guiseq>."
-msgstr ""
-"要将语音会话转为视频会话，选择 <guiseq><gui style=\"menu\">视频</gui><gui "
-"style=\"menuitem\">视频开启</gui></guiseq>。"
+"Select the account you wish to remove from the accounts list on the left "
+"side of the window."
+msgstr "在窗口左侧的帐号列表中选择您想要删除的帐号。"
 
-#: C/audio-call.page:63(title)
-msgid "Start an audio conversation with a meta-contact"
-msgstr "向一位元联系人发起语音会话"
+# 有个"-"的按钮图标，可以保持 - 不变。
+#: C/remove-account.page:51(item/p)
+msgid "Click <gui style=\"button\">-</gui>."
+msgstr "点击<gui style=\"button\">-</gui>。"
 
-#: C/audio-call.page:71(p)
+#: C/remove-account.page:54(item/p)
 msgid ""
-"Select the contact you want to have the conversation, and from the menu "
-"select <gui style=\"menuitem\">Audio Call</gui>."
+"A dialog will be shown asking for confirmation. Click the <gui>Remove</gui> "
+"button to permanently remove the account."
 msgstr ""
-"选择您想要交谈的联系人，然后在菜单中选择<gui style=\"menuitem\">语音呼叫</"
-"gui>。"
+"一个弹出对话框会要求您确认删除。点击<gui>删除</gui>按钮来永久的删除这个帐号。"
 
-#: C/add-contact.page:9(desc)
-msgid "Add someone to the contact list."
-msgstr "添加某人到联系人列表。"
+#: C/remove-account.page:60(note/p)
+msgid ""
+"Even after removing an account, <app>Empathy</app> does not delete your "
+"conversation history for that account."
+msgstr "即使删除了帐号，<app>Empathy</app> 也不会删除这个帐号的聊天记录。"
 
-#: C/add-contact.page:33(title)
-msgid "Add someone to your list of contacts"
-msgstr "添加某人到您的联系人列表"
+#: C/salut-protocol.page:8(info/desc)
+msgid "Understanding the People Nearby feature."
+msgstr "理解附近的人(People Nearby)功能"
 
-#: C/add-contact.page:37(p)
-msgid "Choose <guiseq><gui>Chat</gui><gui>Add Contact</gui></guiseq>."
-msgstr "选择<guiseq><gui>聊天</gui><gui>添加联系人</gui></guiseq>。"
+#: C/salut-protocol.page:33(page/title)
+msgid "What is People Nearby?"
+msgstr "什么是“附近的人”？"
 
-#: C/add-contact.page:40(p)
+#: C/salut-protocol.page:40(page/p)
 msgid ""
-"From the <gui>Account</gui> drop-down list, select the account you wish to "
-"use to connect to your contact. Your contact will need to be using the same "
-"service as the account you select."
+"The People Nearby service is a serverless communication service: you do not "
+"need to connect and authenticate to a central server in order to use it."
 msgstr ""
-"在 <gui>账户</gui> 下拉列表中，选择您用来与您的联系人联系的账户。您的联系人需"
-"要使用与您选择的账户相同的服务。"
+"附近的人(People Nearby)服务是一个无服务器的通讯服务：您不需要连接并认证到一个"
+"中央服务器来使用这个功能。"
 
-#: C/add-contact.page:45(p)
+#: C/salut-protocol.page:45(page/p)
 msgid ""
-"In the <gui>Identifier</gui> field, enter your contact’s login ID, username, "
-"screen name, or other appropriate identifier for the service type."
-msgstr ""
-"在 <gui>标识符</gui> 一栏中，输入这种服务中您的联系人的登录 ID，用户名，显示"
-"名或其他合适的标识符。"
+"This kind of serverless messaging system is restricted to a local area "
+"network and an active Internet connection is not necessary."
+msgstr "这类无服务器的通讯系统只局限于本地局域网，并且不需要互联网链接。"
 
-#: C/add-contact.page:49(p)
+#: C/salut-protocol.page:49(page/p)
 msgid ""
-"In the <gui>Alias</gui> field, type your contact’s name as you would like it "
-"to appear in your contact list."
-msgstr "在 <gui>别名</gui> 中，输入您希望这个联系人显示在联系人列表中的名字。"
-
-#: C/add-contact.page:53(p)
-msgid "Click <gui>Add</gui> to add the person to your list of contacts."
-msgstr "点击<gui>添加</gui>将此人添加到您的联系人列表。"
+"The people that use this service inside the same local area network will be "
+"auto-discovered, and it will be possible to send them messages and files as "
+"with other services."
+msgstr ""
+"会自动的发现在同一个局域网中使用这个服务的人，并且可以给他们发送消息甚至文"
+"件，想其它服务一样。"
 
-#: C/add-contact.page:61(p)
+#: C/salut-protocol.page:54(page/p)
 msgid ""
-"To add a new person to your list of contacts, you need to be connected to "
-"the Internet and to your account."
-msgstr "要添加联系人到您的联系人列表，您需要连接因特网和您的账户。"
+"All the modern local area networks should be able to support this kind of "
+"service."
+msgstr "所有现代的本地局域网都应该可以支持这类服务。"
 
-#: C/add-account.page:9(desc)
-msgid "Add a new account to <app>Empathy</app>."
-msgstr "向 <app>Empathy</app> 添加新账户。"
+#: C/send-file.page:8(info/desc)
+msgid "Send a file from your computer to one of your contacts."
+msgstr "从您的计算机发送文件给您的联系人。"
 
-#: C/add-account.page:39(title)
-msgid "Add a new account"
-msgstr "添加一个新账户"
+#: C/send-file.page:36(page/title)
+msgid "Send files"
+msgstr "发送文件"
 
-#: C/add-account.page:41(p)
+#: C/send-file.page:45(item/p)
 msgid ""
-"You can add instant messaging accounts from any supported service to "
-"communicate with all of your contacts in <app>Empathy</app>. For some "
-"account providers, these steps will also allow you to register for a new "
-"account. For more details, see <link xref=\"create-account\"/>."
+"Right click on the contact you want to send a file to, and choose <gui>Send "
+"file</gui>."
+msgstr "右键点击要向其发送文件的联系人，然后选择<gui>发送文件</gui>。"
+
+#: C/send-file.page:50(item/p)
+#, fuzzy
+#| msgid ""
+#| "Click on the contact you want to send a file, and choose "
+#| "<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Send file</gui></guiseq>."
+msgid ""
+"Click on the contact you want to send a file, and choose <guiseq><gui>Edit</"
+"gui> <gui>Contact</gui><gui>Send file</gui></guiseq>."
 msgstr ""
-"您可以添加任何支持的服务的即时消息账户，以在 <app>Empathy</app> 中与您的联系"
-"人交流。对于某些账户提供商，这些步骤也允许您注册新账户。更多细节参见<link "
-"xref=\"create-account\"/>。"
+"点击要向其发送文件的联系人，然后选择<guiseq><gui>编辑</gui><gui>联系人</"
+"gui><gui>发送文件</gui></guiseq>。"
+
+#: C/send-file.page:58(item/p)
+msgid "Select the file to send, and click on <gui>Send</gui>."
+msgstr "选择要发送的文件，并点击<gui>发送</gui>。"
 
-#: C/add-account.page:52(p)
-msgid "Click <gui style=\"button\">Add</gui>."
-msgstr "点击<gui style=\"button\">添加</gui>。"
+#: C/send-file.page:63(item/p)
+msgid "The <gui>File Transfers</gui> window will appear."
+msgstr "<gui>文件传输</gui>窗口会被显示。"
 
-#: C/add-account.page:57(p)
+#: C/send-file.page:66(item/p)
 msgid ""
-"From the <gui>Protocol</gui> drop-down list, select the type of account you "
-"wish to add."
-msgstr "在<gui>协议</gui>下拉列表，选择您要创建的账户类型。"
+"Wait for your contact to accept the file transfer, or click <gui>Stop</gui> "
+"to halt the transfer."
+msgstr "请等待您的联系人接受文件传输，或点击<gui>停止</gui>来终止传输。"
 
-#: C/add-account.page:61(p)
+#: C/send-file.page:72(item/p)
 msgid ""
-"If you do not already have a registered account, select <gui>Create a new "
-"account on the server</gui>. This feature is not available for all account "
-"types, and may not work with some account providers. See <link xref=\"create-"
-"account\"/> for more information."
-msgstr ""
-"如果您还没有注册账户，选择<gui>在服务器上创建新的账户</gui>。这个功能并不是对"
-"于每一种账户都可用，也可能对于某些账户提供商不可用。更多信息参见<link xref="
-"\"create-account\"/>。"
+"Once the transfer is finished, it is possible to close the <gui>File "
+"Transfers</gui> window."
+msgstr "传输结束之后，就可以关闭<gui>文件传输</gui>窗口了。"
 
-#: C/add-account.page:66(p)
+#: C/send-file.page:80(note/p)
 msgid ""
-"Enter the required information. For most accounts, you will only need a "
-"login ID and a password. Some accounts may require additional information. "
-"See <link xref=\"accounts-window#details\"/> for more information."
+"If you have multiple finished transfers listed in the window, click on "
+"<gui>Clear</gui> to empty the list. This will only remove the files from the "
+"list and will not delete them from your computer."
 msgstr ""
-"输入必要的信息。对于大多数账户，您只需要输入登录 ID 和密码。有些账户可能需要"
-"更多信息。参见<link xref=\"accounts-window#details\"/>。"
-
-#: C/add-account.page:71(p)
-msgid "Click <gui style=\"button\">Log in</gui>."
-msgstr "点击<gui style=\"button\">登入</gui>。"
+"如果窗口中列出了很多已经完成的传输，点击<gui>清除</gui>可以清空列表。这只会将"
+"列表清空，而不会从您的计算机上删除这些文件。"
 
-#: C/add-account.page:78(p)
+#: C/send-file.page:87(note/p)
 msgid ""
-"To change the name that identifies the account in the <gui>Accounts</gui> "
-"window, select the account from the list on the left and either click on the "
-"name or press the space bar. Edit the account name and press <key>Enter</"
-"key> when you’re finished."
+"It is possible to send files only using the following services: <em>Jabber</"
+"em>, <em>Google Talk</em> and <em>People Nearby</em>."
 msgstr ""
-"要改变账户在<gui>账户</gui>窗口中的作为标识的名字，在左侧的列表中选择账户，然"
-"后点击名字或者按空格键。编辑账户的名字，完成后按<key>Enter</key>。"
+"只有使用下列服务才能发送文件：<em>Jabber</em>、<em>Google Talk</em>和<em>附近"
+"的人</em>。"
 
-#: C/accounts-window.page:11(desc)
-msgid "Add, modify, and delete accounts."
-msgstr "添加、修改和删除账户。"
+#: C/send-file.page:93(note/p)
+msgid ""
+"In order to send a file to someone, you need to be connected to the "
+"Internet, or to a local area network."
+msgstr "要向别人发送文件，您需要连接到互联网，或本地局域网。"
 
-#: C/accounts-window.page:33(title)
-msgid "Accounts Window"
-msgstr "账户窗口"
+#: C/send-message.page:8(info/desc)
+msgid "Send a message to one of your contacts."
+msgstr "发送消息给一个您的联系人。"
 
-#: C/accounts-window.page:35(p)
+#: C/send-message.page:32(page/title)
+msgid "Send a message to someone"
+msgstr "向某人发送消息"
+
+#: C/send-message.page:36(item/p)
 msgid ""
-"The <gui>Accounts</gui> window allows you to add, modify, and delete "
-"accounts."
-msgstr "<gui>账户</gui>窗口允许您添加、修改和删除账户。"
+"From the <gui>Contact List</gui> window, double-click the name of the "
+"contact that you want to have a conversation with."
+msgstr "在<gui>联系人列表</gui>窗口中，双击要与之聊天的联系人的名字。"
 
-#: C/accounts-window.page:43(title)
-msgid "Account Details"
-msgstr "账户详细信息"
+#: C/send-message.page:42(item/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."
+msgstr ""
+"一个新窗口会被打开。在窗口底部的文本框中输入一条消息，然后按<key>Enter</key>"
+"发送。"
 
-#: C/accounts-window.page:44(p)
+#: C/send-message.page:50(section/title)
+msgid "Send a message to a meta-contact"
+msgstr "向一位元联系人发送消息"
+
+#: C/send-message.page:58(item/p)
 msgid ""
-"For most types of accounts, you can simply enter a login ID and a password. "
-"Certain accounts or account types, however, may require additional "
-"information."
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Chat</gui>."
 msgstr ""
-"对于大多数的账户，您只需要输入登录 ID 和密码。但有些账户或有些类型的账户可能"
-"需要额外的信息。"
+"选择您想要与之聊天的联系人，并在菜单中选择 <gui style=\"menuitem\">聊天</"
+"gui>。"
 
-#: C/account-jabber.page:7(desc)
-msgid "Advanced options for Jabber and Google Talk accounts."
-msgstr "Jabber 和 Google Talk 账户的高级选项。"
+#: C/set-custom-status.page:9(info/desc)
+msgid "Add, edit or delete personal messages for your status."
+msgstr "为您的状态添加、编辑或删除个人消息。"
 
-#: C/account-jabber.page:29(title)
-msgid "Jabber account details"
-msgstr "Jabber 账户详情"
+#: C/set-custom-status.page:15(credit/name)
+msgid "Jim Campbell"
+msgstr "Jim Campbell"
 
-#: C/account-jabber.page:31(p)
+#: C/set-custom-status.page:34(page/title)
+msgid "Set a custom message"
+msgstr "设置一个自定义消息"
+
+#: C/set-custom-status.page:36(page/p)
 msgid ""
-"Most Jabber accounts will require only a login ID and a password to connect. "
-"For some accounts or on certain types of networks, you may need to enter "
-"additional information in the <gui>Advanced</gui> section. Normally, you "
-"will not need to use the advanced options below. For general instructions on "
-"adding an account, see <link xref=\"add-account\"/>."
+"Sometimes you may want to set a custom message for your status, for example "
+"to let people know that you will be unavailable for a certain period of time."
 msgstr ""
-"大多 Jabber 账户只需要登录 ID 和密码就可以连接。但对于某些账户或某些网络，您"
-"可能需要在<gui>高级</gui>选项卡中输入一些额外的信息。通常，您不需要使用下面的"
-"这些高级选项。添加账户的一般指导参见<link xref=\"add-account\"/>。"
+"有时您也许想要为您的状态设置一个自定义消息，例如，让别人知道您可能在一段时间"
+"内不在。"
 
-#: C/account-jabber.page:39(p)
+#: C/set-custom-status.page:40(page/p)
 msgid ""
-"Google Talk is a type of Jabber account. These instructions hold for Google "
-"Talk accounts as well."
-msgstr "Google Talk 是一种 Jabber 账户。这些指南对 Google Talk 账户同样适用。"
-
-#: C/account-jabber.page:45(gui)
-msgid "Encryption required (TLS/SSL)"
-msgstr "需要加密(TLS/SSL)"
+"It is possible to set a custom message based on the different statuses "
+"available."
+msgstr "可以根据不同的状态来设置自定义消息。"
 
-#: C/account-jabber.page:46(gui)
-msgid "Ignore SSL certificate errors"
-msgstr "忽略 SSL 证书错误"
+#: C/set-custom-status.page:46(item/p) C/set-custom-status.page:82(item/p)
+msgid ""
+"From the <gui>Contact List</gui> window, click on the drop-down list at the "
+"top."
+msgstr "在<gui>联系人列表</gui>窗口，点击顶部的下拉列表。"
 
-#: C/account-jabber.page:47(p)
+#: C/set-custom-status.page:52(item/p)
 msgid ""
-"Whenever possible, communication between <app>Empathy</app> and the Jabber "
-"server is encrypted. If encrypted communication is not possible, messages "
-"may be sent unencrypted. Select <gui>Encryption required</gui> to prevent "
-"<app>Empathy</app> from communicating with the Jabber server when encryption "
-"is not possible."
+"Select the status you want to add a custom message to. You have to select "
+"the one identified with the label <gui>Custom Message</gui>."
 msgstr ""
-"只要有可能，<app>Empathy</app> 与 Jabber 服务器之间的通讯就会被加密。如果不可"
-"能加密，消息就可能被明文发送。选择<gui>需要加密</gui>以阻止不能加密时 "
-"<app>Empathy</app> 与 Jabber 服务器进行明文通讯。"
+"选择您希望添加自定义消息的状态。您必须选择有<gui>自定义消息</gui>标签标记的状"
+"态。"
 
-#: C/account-jabber.page:52(p)
+#: C/set-custom-status.page:58(item/p)
 msgid ""
-"Some Jabber servers may encrypt data using invalid certificates, or using "
-"certificates from unknown authorities. If you trust the server you are "
-"connecting to, you can select <gui>Ignore SSL certificate errors</gui> to "
-"allow encrypted communication with invalid certificates."
+"Enter your custom message in the text box at the top of the window, and "
+"press <key>Enter</key> to set the message."
 msgstr ""
-"有些 Jabber 服务器可能使用不合法的证书加密数据，或者使用来自未知的证书认证机"
-"构的证书。如果您信任您的服务器，您可以选择<gui>忽略 SSL 证书错误</gui>以允许"
-"使用不合法的证书进行加密通讯。"
-
-#: C/account-jabber.page:59(gui)
-msgid "Resource"
-msgstr "资源"
-
-#: C/account-jabber.page:60(gui)
-msgid "Priority"
-msgstr "优先级"
+"在窗口顶部的文本框中输入您的自定义消息，然后按<key>Enter</key>来设定这个消"
+"息。"
 
-#: C/account-jabber.page:61(p)
+#: C/set-custom-status.page:64(item/p)
 msgid ""
-"If you have multiple applications (for instance, on separate computers) "
-"connected to your account at the same time, you can set a resource to "
-"uniquely identify each one. By default, <app>Empathy</app> will use "
-"<input>Telepathy</input> as the resource."
+"If you want to set the custom message as a favorite, saving it in order to "
+"use it again, click on the little heart on the right of the text box where "
+"you wrote your custom message."
 msgstr ""
-"如果您有多个应用程序(比如，在另一台计算机上)同时连接了您的账户，您可以设置“资"
-"源”以唯一地标识每一个连接的程序。默认地，<app>Empathy</app> 会使用 "
-"<input>Telepathy</input> 作为“资源”。"
+"如果您希望收藏一个自定义消息，即将它保存下来方便日后使用，请点击您撰写自定义"
+"消息的文本框右侧的心形符号。"
 
-#: C/account-jabber.page:65(p)
+#: C/set-custom-status.page:69(item/p)
 msgid ""
-"You can set the priority to specify which application should receive "
-"incoming messages from your contacts. New messages will be sent to the "
-"application with the highest priority."
+"If you do not do it, the custom message will not be available the next time "
+"you use <app>Empathy</app>. It will be saved only for the current session."
 msgstr ""
-"您可以设置优先级以指定哪一个程序优先收到您的联系人发送来的消息。新的消息会被"
-"发送给优先级最高的程序。"
+"如果您不这么做，那么下次您使用 <app>Empathy</app> 的时候，这个自定义消息就不"
+"会再出现。它只在 <app>Empathy</app> 本次运行期间被保留。"
 
-#: C/account-jabber.page:70(gui)
-msgid "Override server settings"
-msgstr "覆盖服务器设置"
+#: C/set-custom-status.page:78(section/title)
+msgid "Edit and remove a custom message"
+msgstr "编辑和删除自定义消息"
+
+#: C/set-custom-status.page:88(item/p)
+msgid "Select <gui>Edit Custom Message</gui>."
+msgstr "选择<gui>编辑自定义消息</gui>。"
 
-#: C/account-jabber.page:71(p)
+#: C/set-custom-status.page:95(item/p)
+msgid "To edit a custom message:"
+msgstr "要编辑自定义消息："
+
+#: C/set-custom-status.page:100(item/p)
 msgid ""
-"<app>Empathy</app> will use default settings to connect to the Jabber server "
-"based on your login ID. For some Jabber servers, you will need to enter "
-"custom server settings manually. These settings should be provided for you "
-"by your Jabber provider."
-msgstr ""
-"<app>Empathy</app> 会根据您的登录 ID 以默认的设置连接 Jabber 服务器。对某些 "
-"Jabber 服务器，您需要人工输入一些服务器设置。这些设置应该由您的 Jabber 服务提"
-"供商提供。"
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"edit and double-click on it."
+msgstr "在<gui>已保存的自定义状态</gui>中，选择您想要编辑的状态消息并双击它。"
 
-#. 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:106(None)
-msgid "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
-msgstr "@@image: 'figures/gtk-add.png'; md5=a856b499d8d4681b70b5ce6f25bc5c6d"
+#: C/set-custom-status.page:106(item/p)
+msgid "Type the new custom message and press <key>Enter</key> to modify it."
+msgstr "输入新的自定义消息并且按<key>Enter</key>来修改它。"
 
-#. 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/set-custom-status.page:113(item/p)
+msgid "To remove a custom message:"
+msgstr "要删除自定义消息："
 
-#: C/account-irc.page:8(desc)
-msgid "Additional information necessary for connecting to IRC networks."
-msgstr "连接 IRC 网络需要的额外信息。"
+#: C/set-custom-status.page:118(item/p)
+msgid ""
+"From the <gui>Saved Presets</gui> box, select the status message you want to "
+"remove."
+msgstr "在<gui>已保存的自定义状态</gui>中，选择要删除的状态消息。"
 
-#: C/account-irc.page:31(title)
-msgid "IRC account details"
-msgstr "IRC 账户详情"
+#: C/set-custom-status.page:124(item/p)
+msgid "Click on the <gui>Remove</gui> button."
+msgstr "点击<gui>删除</gui>按钮。"
+
+#: C/set-custom-status.page:133(item/p)
+msgid "When finished, click on <gui>Close</gui>."
+msgstr "完成后，点击<gui>关闭</gui>。"
 
-#: C/account-irc.page:33(p)
+#: C/set-custom-status.page:140(note/p)
 msgid ""
-"IRC accounts require different information than many other types of "
-"accounts. To create an IRC account, you must specify at least an IRC network "
-"and a nickname. This page details the information you can provide for an IRC "
-"account."
+"When you edit a custom message, it will not be set as the current status "
+"message. You will need to select it from the <gui>Contact List</gui> window."
 msgstr ""
-"IRC 账户需要与其他类型的账户不同的信息。要创建 IRC 账户，您至少需要指定一个 "
-"IRC 网络和一个昵称。本页详细介绍了您可以为一个 IRC 账户提供的信息。"
+"当您编辑自定义消息时，它不会被设为当前状态消息。您需要在<gui>联系人列表</gui>"
+"窗口中选中它。"
 
-#: C/account-irc.page:45(gui) C/account-irc.page:120(gui)
-msgid "Network"
-msgstr "网络"
+#: C/share-desktop.page:7(info/desc)
+msgid "Show your desktop to your contacts."
+msgstr "向您的联系人展示您的桌面。"
+
+#: C/share-desktop.page:33(page/title)
+msgid "Share your desktop"
+msgstr "共享您的桌面"
 
-#: C/account-irc.page:46(p)
+#: C/share-desktop.page:35(page/p)
 msgid ""
-"IRC is an open system that allows people to run separate IRC networks. Each "
-"network is distinct and has its own users and chat rooms. <app>Empathy</app> "
-"lists the most popular networks in the <gui>Network</gui> drop-down list. "
-"You can add additional networks. See <link xref=\"#networks\"/> below."
+"It is possible to share your desktop with some of your contacts. You can use "
+"this functionality to show your desktop to your contacts to, for example, "
+"ask for help or help your contacts resolve a problem."
 msgstr ""
-"IRC 是一种开放的系统，它允许人们运行各自的 IRC 网络。每个网络是独立的，有特有"
-"的用户和聊天室。<app>Empathy</app> 在 <gui>网络</gui> 下拉列表中列出了一些最"
-"流行的网络。您可以添加其他的网络。参看下面的<link xref=\"#networks\"/>。"
-
-#: C/account-irc.page:53(gui)
-msgid "Nickname"
-msgstr "昵称"
+"您可以和联系人共享桌面。使用这个功能，您可以向联系人展示您的桌面，来寻求帮助"
+"或帮助联系人解决问题。"
 
-#: C/account-irc.page:54(p)
+#: C/share-desktop.page:42(note/p)
 msgid ""
-"Your nickname is your unique name on the IRC network. Only one person on a "
-"network may use a given nickname. If you get an error message that says "
-"<link xref=\"prob-conn-name\" role=\"error-msg\"/> you will need to change "
-"your nickname."
+"To be able to share your desktop, you need to have a VNC server, which has "
+"support for the feature, installed on your system. <app>Vino</app>, the "
+"GNOME VNC server, has the required support."
 msgstr ""
-"您的昵称是您在 IRC 网络上的唯一性的名字。只有一个人可以使用某个特定的昵称。如"
-"果您得到<link xref=\"prob-conn-name\" role=\"error-msg\"/>错误信息，您需要改变"
-"您的昵称。"
+"要共享您的桌面，您的系统中必须安装支持此功能的 VNC 服务器。<app>Vino</app>，"
+"GNOME 的 VNC 服务器，就有这项功能。"
 
-#: C/account-irc.page:60(gui)
-msgid "Password"
-msgstr "密码"
+#: C/share-desktop.page:51(item/p)
+msgid "From the <gui>Contact List</gui> window, do one of the following:"
+msgstr "在<gui>联系人列表</gui>窗口，执行下列操作之一："
 
-#: C/account-irc.page:61(p)
+#: C/share-desktop.page:56(item/p)
+#, fuzzy
+#| msgid ""
+#| "Select the contact you want to share your desktop with and choose "
+#| "<guiseq><gui>Edit</gui><gui>Contact</gui><gui>Share My Desktop</gui></"
+#| "guiseq>."
 msgid ""
-"Some servers, particularly those on private networks, require a password to "
-"connect. If you are authorized to use the network, the network "
-"administrators should provide you with a password."
+"Select the contact you want to share your desktop with and choose "
+"<guiseq><gui>Edit</gui><gui>Contact</gui> <gui>Share My Desktop</gui></"
+"guiseq>."
 msgstr ""
-"一些服务器，尤其是那些私有网络，需要密码才能连接。如果您被授权使用，网络的管"
-"理员应当为您提供了密码。"
+"选择您想要共享您的桌面的联系人，并选择 <guiseq><gui>编辑</gui><gui>联系人</"
+"gui><gui>共享我的桌面</gui></guiseq>。"
 
-#: C/account-irc.page:65(title)
-msgid "NickServ Passwords"
-msgstr "NickServ 密码"
+#: C/share-desktop.page:63(item/p)
+msgid ""
+"Right-click on the name of the contact you want to share your desktop with "
+"and select <gui>Share My Desktop</gui>."
+msgstr ""
+"右键点击您想要共享您桌面的联系人的名字，然后选择<gui>共享我的桌面</gui>。"
 
-#: C/account-irc.page:66(p)
+#: C/share-desktop.page:71(item/p)
 msgid ""
-"On some networks, nicknames can be registered using a service known as "
-"NickServ. <app>Empathy</app> does not directly support nickname passwords. "
-"On some networks, including the popular freenode network, server passwords "
-"are automatically forwarded to NickServ, allowing you to set this field to "
-"identify yourself with NickServ. See <link xref=\"irc-nick-password\"/> for "
-"more details."
+"An invitation to view your desktop will be sent to the contact you have "
+"selected. To view your desktop, they will need to accept it."
 msgstr ""
-"在某些网络上，昵称可以通过一种叫做 NickServ 的服务被注册。<app>Empathy</app> "
-"并不直接支持昵称密码。在某些网络上，包括流行的 freenode 网络，服务器密码会被"
-"自动转发给 NickServ，从而允许您设置此项向 NickServ 证明您自己。更多信息参见"
-"<link xref=\"irc-nick-password\"/>。"
+"您选择的联系人会收到一个查看您桌面的邀请。要查看您的桌面，他们需要接受邀请。"
 
-#: C/account-irc.page:76(gui)
-msgid "Real name"
-msgstr "真实姓名"
+#: C/share-desktop.page:77(item/p)
+msgid ""
+"You can disconnect the contact from your computer using your desktop sharing "
+"application."
+msgstr "在您的桌面共享程序中，您可以断开您的联系人到您的计算机的连接。"
 
-#: C/account-irc.page:77(p)
+#: C/share-desktop.page:82(note/p)
 msgid ""
-"You can provide your real name in addition to your nickname. Other users "
-"will be able to see this when they view your information."
-msgstr ""
-"除了昵称，您还可以提供您的真实姓名。其他用户查看您的信息时可以看到您的真实姓"
-"名。"
+"For more information about how to use the remote desktop sharing "
+"application, refer to its help."
+msgstr "如果需要更多关于如何使用远程桌面查共享程序的信息，请参看其帮助。"
 
-#: C/account-irc.page:81(gui)
-msgid "Quit message"
-msgstr "退出消息"
+#: C/share-desktop.page:90(page/p)
+msgid ""
+"When you share your desktop with someone else, it is possible to experience "
+"system performance slowdown and low Internet speed."
+msgstr ""
+"当您与其他人共享您的桌面的时候，可能会出现系统性能降低和网络速度下降的现象。"
 
-#: C/account-irc.page:82(p)
+#: C/share-desktop.page:96(note/p)
 msgid ""
-"When you go offline, a quit message is sent to all the chat rooms you’re in "
-"and to all the users you’re having a private conversation with. Use this "
-"field to provide a custom quit message."
+"Some of your contacts may not be able to use this feature. It is necessary "
+"for them to have version 2.28, or newer, of <app>Empathy</app> and a "
+"compatible remote desktop viewer application installed in their system."
 msgstr ""
-"当您离线时，一个退出消息会被发送给所有您加入的聊天室和正在与您进行私人聊天的"
-"用户。设置此项以提供自定义的退出消息。"
+"并非您的所有联系人都可以使用这个功能。他们必须使用 2.28 或更新版本的 "
+"<app>Empathy</app> 并且在安装了兼容的远程桌面查看器程序。"
 
-#: C/account-irc.page:94(title)
-msgid "IRC Networks"
-msgstr "IRC 网络"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:39(media)
+#, fuzzy
+#| msgid ""
+#| "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
+msgctxt "_"
+msgid ""
+"external ref='figures/available.png' md5='2196b2f0ad4ce26fdb7b9d48e75d1947'"
+msgstr "@@image: 'figures/available.png'; md5=2196b2f0ad4ce26fdb7b9d48e75d1947"
 
-#: C/account-irc.page:97(title)
-msgid "Networks"
-msgstr "网络"
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:45(media)
+#, fuzzy
+#| msgid "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+msgctxt "_"
+msgid "external ref='figures/busy.png' md5='15eb2adff5faedf97b0cb9105d09410a'"
+msgstr "@@image: 'figures/busy.png'; md5=15eb2adff5faedf97b0cb9105d09410a"
+
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:53(media)
+#, fuzzy
+#| msgid "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
+msgctxt "_"
+msgid "external ref='figures/away.png' md5='9c504d6ffa0cf1a9cc8933d16e1bea33'"
+msgstr "@@image: 'figures/away.png'; md5=9c504d6ffa0cf1a9cc8933d16e1bea33"
 
-#: C/account-irc.page:99(p)
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#.
+#. This is a reference to an external file such as an image or video. When
+#. the file changes, the md5 hash will change to let you know you need to
+#. update your localized copy. The msgstr is not used at all. Set it to
+#. whatever you like once you have updated your copy of the file.
+#: C/status-icons.page:62(media) C/status-icons.page:69(media)
+#, fuzzy
+#| msgid "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+msgctxt "_"
 msgid ""
-"<app>Empathy</app> includes a list of popular IRC networks. If you wish to "
-"another IRC network, you can add it to the list. You can also modify "
-"networks and remove them from the list."
+"external ref='figures/offline.png' md5='c5b0c21181cbd6e13f8909243c0fa964'"
+msgstr "@@image: 'figures/offline.png'; md5=c5b0c21181cbd6e13f8909243c0fa964"
+
+#: C/status-icons.page:7(info/desc)
+msgid "Understanding the various statuses and status icons."
+msgstr "理解各种状态和状态图标。"
+
+#: C/status-icons.page:35(page/title)
+msgid "Status Types and Icons"
+msgstr "状态的类别及其图标"
+
+#: C/status-icons.page:39(item/title)
+#, fuzzy
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/available.png"
+"\">Available icon</media> <gui>Available</gui>"
 msgstr ""
-"<app>Empathy</app> 包括了一份常用 IRC 网络的列表。如果您想使用其他的 IRC 网"
-"络，您可以将其添加到这个列表中。您也可以修改网络或从列表中删除网络。"
+"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/account-irc.page:104(p)
+#: C/status-icons.page:41(item/p)
 msgid ""
-"To add a network to the list, click <media type=\"image\" mime=\"image/png\" "
-"src=\"figures/gtk-add.png\" width=\"16\" height=\"16\">Add</media>."
+"Use the <em>Available</em> status when you are at your computer and able to "
+"chat with your contacts. You can set a custom message for this status."
 msgstr ""
-"要想列表中添加网络，点击<media type=\"image\" mime=\"image/png\" src="
-"\"figures/gtk-add.png\" width=\"16\" height=\"16\">添加</media>。"
+"当您在电脑旁并且有空和您的联系人聊天时，使用<em>在线</em>状态。您可以为此状态"
+"自定一条消息。"
 
-#: C/account-irc.page:107(p)
+#: C/status-icons.page:45(item/title)
+#, fuzzy
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"To modify a network in the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-edit.png\" width=\"16\" "
-"height=\"16\">Edit</media>."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/busy.png\">Busy icon</"
+"media> <gui>Busy</gui>"
 msgstr ""
-"要修改列表中的网络，选择那个网络并点击<media type=\"image\" mime=\"image/png"
-"\" src=\"figures/gtk-edit.png\" width=\"16\" height=\"16\">编辑</media>。"
+"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/account-irc.page:110(p)
+#: C/status-icons.page:47(item/p)
 msgid ""
-"To remove a network from the list, select the network and click <media type="
-"\"image\" mime=\"image/png\" src=\"figures/gtk-remove.png\" width=\"16\" "
-"height=\"16\">Remove</media>."
+"Use the <em>Busy</em> status to let your contacts know that you don’t want "
+"to chat right now. They can still contact you, for instance if they have "
+"something urgent they need to discuss. By default, <app>Empathy</app> will "
+"not use notification bubbles and sounds when you are busy. You can set a "
+"custom message for this status."
 msgstr ""
-"要从列表中删除网络，选择要删除的网络并点击<media type=\"image\" mime=\"image/"
-"png\" src=\"figures/gtk-remove.png\" width=\"16\" height=\"16\">删除</"
-"media>。"
+"使用<em>忙碌</em>以让您的联系人知道您当前不想聊天。他们仍然可以联系您，比如他"
+"们可能有急事需要讨论。默认地，当您忙碌时，<app>Empathy</app> 不会使用气泡提示"
+"和声音提示。您可以为此状态自定一条消息。"
 
-#: C/account-irc.page:115(p)
+#: C/status-icons.page:53(item/title)
+#, fuzzy
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"When adding or modifying a network, you can enter the following information:"
-msgstr "在添加或修改一个网络时，您可以输入下列信息："
+"<media type=\"image\" mime=\"image/png\" src=\"figures/away.png\">Away icon</"
+"media> <gui>Away</gui>"
+msgstr ""
+"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/account-irc.page:121(p)
+#: C/status-icons.page:55(item/p)
 msgid ""
-"This is the name of the network as you want it to appear in the list of "
-"networks."
-msgstr "这是您希望网络显示在网络列表中的名字。"
+"Use the <em>Away</em> status when you are going away from your computer. "
+"<app>Empathy</app> automatically sets your status to Away if you do not use "
+"your computer for a while, or if your screensaver is on. By default, "
+"<app>Empathy</app> will not use notification bubbles and sounds when you are "
+"away. You can set a custom message for this status."
+msgstr ""
+"当您不在电脑旁时，使用<em>离开</em>状态。如果您一段时间内不使用电脑，或者屏幕"
+"保护打开了，<app>Empathy</app> 将自动设置您的状态为离开。默认地，当您离开时，"
+"<app>Empathy</app> 不会使用气泡提示和声音提示。您可以为此状态自定一条消息。"
 
-#: C/account-irc.page:125(gui)
-msgid "Charset"
-msgstr "字符集"
+#: C/status-icons.page:62(item/title)
+#, fuzzy
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
+msgid ""
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline "
+"icon</media> <gui>Invisible</gui>"
+msgstr ""
+"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/account-irc.page:126(p)
+#: C/status-icons.page:64(item/p)
 msgid ""
-"This specifies the character encoding that is typically used on this "
-"network. A character encoding is a specific way of recording characters "
-"internally in a computer. There are many character encodings, and you need "
-"to use the same character encoding as other users to see their messages "
-"correctly."
+"When you set your status to <em>Invisible</em>, you will appear as offline "
+"to your contacts. You will still be connected to your accounts, and you "
+"still see your contacts’ statuses and start conversations with them."
 msgstr ""
-"这指明了网络上常用的字符编码。字符编码是计算机内部记录字符的一种特定方式。有"
-"许多不同的字符编码，您需要与其他用户使用同样的字符编码才能正确地看到他们的信"
-"息。"
+"当您将状态设置为<em>隐身</em>时，您的联系人会看到您已离线。但您仍然连接着您的"
+"帐号，并且可以看到您的联系人的状态，或者和他们聊天。"
 
-#. Translators: Recommend character encodings that are common
-#.             for your language.
-#: C/account-irc.page:135(p)
+#: C/status-icons.page:69(item/title)
+#, fuzzy
+#| msgid ""
+#| "Click the <media type=\"image\" mime=\"image/png\" src=\"figures/gtk-edit."
+#| "png\">edit</media> icon in the error message."
 msgid ""
-"By default, <app>Empathy</app> uses UTF-8, a modern character encoding that "
-"can handle text from most of the world's languages. Another common encoding "
-"for English and some other Western languages is ISO-8859-1."
+"<media type=\"image\" mime=\"image/png\" src=\"figures/offline.png\">Offline "
+"icon</media> <gui>Offline</gui>"
 msgstr ""
-"默认地，<app>Empathy</app> 使用 UTF-8，一种能够处理世界上大多数语言的现代化的"
-"字符编码。简体中文常用的编码还有 GB18030，GBK 和 GB2312。"
+"点击错误提示信息上的<media type=\"image\" mime=\"image/png\" src=\"figures/"
+"gtk-edit.png\">编辑</media>图标。"
 
-#: C/account-irc.page:141(gui)
-msgid "Servers"
-msgstr "服务器"
+#: C/status-icons.page:71(item/p)
+msgid ""
+"Setting your status to <em>Offline</em> disconnects you from all of your "
+"accounts."
+msgstr "将状态设置为<em>离线</em>将会断开您所有帐号的连接。"
+
+#: C/video-call.page:11(info/desc)
+msgid "Start a video conversation with one of your contacts."
+msgstr "同您的联系人进行视频聊天。"
 
-#: C/account-irc.page:142(p)
+#: C/video-call.page:37(page/title)
+msgid "Start a video conversation"
+msgstr "开始视频聊天"
+
+#: C/video-call.page:39(page/p)
 msgid ""
-"An IRC network may have many servers you can connect to. When you are "
-"connected to a server on a particular network, you can communicate with all "
-"users on all other servers on that network. You can add and remove servers "
-"for this network using the <gui>Add</gui> and <gui>Remove</gui> buttons."
+"If you have a webcam, you can call your contacts and have a video "
+"conversation with them. This feature only works with certain types of "
+"accounts, and it requires the other person to have an application that "
+"supports video calls."
 msgstr ""
-"一个 IRC 网络可能有许多服务器供您连接。当您连接到一个特定网络的服务器后，您可"
-"以和同一网络中所有服务器的用户交流。您可以为一个网络添加或删除服务器，使用"
-"<gui>添加</gui>或<gui>删除</gui>按钮。"
+"如果您有网络摄像头，您可以呼叫您的联系人并和他们进行视频聊天。此功能仅特定类"
+"型的帐号可用，并需要对方使用的程序支持视频呼叫。"
 
-#: C/account-irc.page:147(p)
+#: C/video-call.page:46(item/p)
+#, fuzzy
+#| msgid ""
+#| "Select the contact you want to have the conversation, and from the menu "
+#| "select <gui style=\"menuitem\">Video Call</gui>."
 msgid ""
-"When a server is selected, click the field under <gui>Server</gui> or "
-"<gui>Port</gui> to edit it. Alternatively, use the left and right arrow keys "
-"to focus the field, and press the space bar to begin editing."
+"Right-click on the contact that you want to call and select <gui style="
+"\"menuitem\">Video Call</gui>."
 msgstr ""
-"当一个服务器被选择后，点击<gui>服务器</gui>或<gui>端口</gui>下方的字段来编辑"
-"它。或者，使用左右方向键来聚焦某个字段，并按空格键开始编辑。"
+"选择要聊天的联系人，然后在菜单中选择<gui style=\"menuitem\">视频呼叫</gui>"
 
-#: C/account-irc.page:151(p)
+#: C/video-call.page:54(item/p)
+#, fuzzy
+#| msgid ""
+#| "To end the conversation, click on <gui style=\"button\">Hang up</gui>."
 msgid ""
-"Select the check box in the <gui>SSL</gui> column to encrypt all "
-"communication with a server. Note that this does not prevent other users on "
-"the network from seeing what you write on public chat rooms."
+"To end the conversation, click on the <gui style=\"button\">hang up</gui> "
+"button."
+msgstr "点击<gui style=\"button\">挂断</gui>以结束会话。"
+
+#: C/video-call.page:60(note/p)
+msgid ""
+"To turn a video conversation into an audio conversation, choose <guiseq><gui "
+"style=\"menu\">Video</gui><gui style=\"menuitem\">Video Off</gui></guiseq>."
 msgstr ""
-"选择 <gui>SSL</gui> 列中的复选框以加密与服务器间的所有通讯。注意这并不能意味"
-"着其他用户不能看到您在公共聊天室中的发言。"
+"要将视频会话转为语音会话，选择 <guiseq><gui style=\"menu\">视频</gui><gui "
+"style=\"menuitem\">视频关闭</gui></guiseq>。"
 
-#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2
-#: C/index.page:0(None)
-msgid "translator-credits"
+#: C/video-call.page:65(section/title)
+msgid "Start a video conversation with a meta-contact"
+msgstr "和一位元联系人进行视频聊天。"
+
+#: C/video-call.page:73(item/p)
+msgid ""
+"Select the contact you want to have the conversation, and from the menu "
+"select <gui style=\"menuitem\">Video Call</gui>."
 msgstr ""
-"Lavande  <lavande@thislove.cz.cc>, 2010\n"
-"Tao Wang <dancefire@gmail.com>, 2010\n"
-"lainme <lainme993@gmail.com>, 2011\n"
-"Guanhao Yin <yinguanhao@gmail.com>, 2011"
+"选择要聊天的联系人，然后在菜单中选择<gui style=\"menuitem\">视频呼叫</gui>"
+
+#~ msgid ""
+#~ "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+#~ msgstr ""
+#~ "@@image: 'figures/camera-web.png'; md5=8166b4372f25b78cbf5a64fe2eac2ce5"
+
+#~ msgid "milo@ubuntu.com"
+#~ msgstr "milo@ubuntu.com"
+
+#~ 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>."
+#~ msgstr ""
+#~ "在<gui>联系人列表</gui>窗口，点击您想呼叫的联系人的名字旁的<media type="
+#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</"
+#~ "media>图标并选择<gui style=\"menuitem\">视频呼叫</gui>。"
+
+#~ msgid "shaunm@gnome.org"
+#~ msgstr "shaunm@gnome.org"
+
+#~ msgid "Available icon"
+#~ msgstr "在线图标"
+
+#~ msgid "Available"
+#~ msgstr "在线"
+
+#~ msgid "Busy icon"
+#~ msgstr "忙碌图标"
+
+#~ msgid "Busy"
+#~ msgstr "忙碌"
+
+#~ msgid "Away icon"
+#~ msgstr "离开图标"
+
+#~ msgid "Away"
+#~ msgstr "离开"
+
+#~ msgid "Offline icon"
+#~ msgstr "离线图标"
+
+#~ msgid "Invisible"
+#~ msgstr "隐身"
+
+#~ msgid "Offline"
+#~ msgstr "离线"
+
+#~ msgid "kittykat3756@gmail.com"
+#~ msgstr "kittykat3756@gmail.com"
+
+#~ msgid "jwcampbell@gmail.com"
+#~ msgstr "jwcampbell@gmail.com"
+
+#~ msgid "philbull@gmail.com"
+#~ msgstr "philbull@gmail.com"
+
+#~ msgid "I'd like to see this played up a bit more."
+#~ msgstr "我希望看到更多的人来用这个。"
+
+#~ msgid "shaunm"
+#~ msgstr "shaunm"
+
+#~ msgid ""
+#~ "Empathy no longer allows you to create an IRC account without a valid "
+#~ "nick. I've removed the guide link. Remove the text."
+#~ msgstr ""
+#~ "没有有效昵称，Empathy 不允许您创建 IRC 帐号。软件已经移除指南链接。请移除"
+#~ "文本。"
+
+#~ msgid "Install telepathy-idle"
+#~ msgstr "安装 telepathy-idle"
+
+#~ msgid ""
+#~ "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+#~ msgstr ""
+#~ "@@image: 'figures/empathy-logo.png'; md5=1afc419a644e90b16393807e35cb5cb2"
+
+#~ msgid ""
+#~ "<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 网络聊天工具"
+
+#~ msgid "peter.haslam@freenet.de"
+#~ msgstr "peter.haslam@freenet.de"
+
+#~ msgid ""
+#~ "@@image: 'figures/audio-input-microphone.png'; "
+#~ "md5=8d89026b66a263a3bc5b1f0665948567"
+#~ msgstr ""
+#~ "@@image: 'figures/audio-input-microphone.png'; "
+#~ "md5=8d89026b66a263a3bc5b1f0665948567"
+
+#~ msgid "Icon for audio conversation"
+#~ msgstr "语音聊天的图标"
+
+#~ msgid "Icon for video conversation"
+#~ msgstr "视频聊天的图标"
+
+#~ msgid ""
+#~ "I'd like to do tables like this using nothing for No and ✔ for Yes, but "
+#~ "we need to look at the accessibility impact. I've <link href=\"http://"
+#~ "mail.gnome.org/archives/gnome-doc-list/2009-September/msg00006.html"
+#~ "\">asked the accessibility team</link> for input."
+#~ msgstr ""
+#~ "我喜欢做表格时，用空白代替 No，✔ 代表 Yes，但还是要看通用性如何。我已经"
+#~ "<link href=\"http://mail.gnome.org/archives/gnome-doc-list/2009-September/"
+#~ "msg00006.html\">咨询通用性团队</link>发出请求。"
+
+#, fuzzy
+#~ msgid ""
+#~ "There's recent work on telepathy-butterfly and papyon to support audio "
+#~ "and video for MSN. It might be released in time for 2.28, but since it "
+#~ "doesn't follow the Gnome release schedule, I can't be sure. If it looks "
+#~ "like it's going to ship, let's mark it Yes."
+#~ msgstr ""
+#~ "最近 telepathy-butterfly 和 papyon 已经支持 MSN 音频呼叫和视频呼叫。有可能"
+#~ "它们在2月28日前及时发布，但该时间没有遵循 Gnome 发布计划，因此我不太确定。"
+#~ "如果八成能搭载的话，就标为 Yes。"
+
+#~ 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\">Audio Call</gui>."
+#~ msgstr ""
+#~ "在 <gui>联系人列表</gui> 窗口，点击您想呼叫的联系人的名字旁的 <media type="
+#~ "\"image\" mime=\"image/png\" src=\"figures/camera-web.png\">视频呼叫</"
+#~ "media> 图标并选择 <gui style=\"menuitem\">语音呼叫</gui>。"
+
+#~ msgid "Resource"
+#~ msgstr "资源"
+
+#~ msgid "Priority"
+#~ msgstr "优先级"
+
+#~ msgid "Network"
+#~ msgstr "网络"
+
+#~ msgid "Nickname"
+#~ msgstr "昵称"
+
+#~ msgid "Password"
+#~ msgstr "密码"
+
+#~ msgid "Quit message"
+#~ msgstr "退出消息"
+
+#~ msgid "Charset"
+#~ msgstr "字符集"
+
+#~ msgid "Servers"
+#~ msgstr "服务器"
+
+#~ msgid "Edit, remove and add a custom message"
+#~ msgstr "编辑、删除和添加自定义消息"
+
+#~ msgid ""
+#~ "To add a new custom message, from the <gui>Add New Preset</gui> section:"
+#~ msgstr "要添加一条新的自定义消息，在<gui>添加新自定义状态</gui>选项卡："
+
+#~ msgid ""
+#~ "Click on the drop-down list to select the status you want to set a custom "
+#~ "message to."
+#~ msgstr "点击下拉列表选择您想要设定自定义消息的状态。"
+
+#~ msgid "Click on the text box, and type the new custom message."
+#~ msgstr "点击文本框，输入新的自定义消息。"
+
+#~ msgid "Click on <gui>Add</gui> to add the new message to the presets ones."
+#~ msgstr "点击<gui>添加</gui>将新消息添加到已保存的的自定义消息列表中。"
+
+#~ msgid "Click on <gui style=\"button\">Remove</gui>."
+#~ msgstr "点击<gui style=\"button\">删除</gui>。"
+
+#~ 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>复选框，然后再次选中以重新连接到服务"
+#~ "器。"
+
+#~ 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>选框是否勾选。没有的勾选它已启用账"
+#~ "户。"
+
+#~ msgid "Select the <gui>Search</gui> tab."
+#~ msgstr "选择<gui>搜索</gui>标签。"
+
+#~ msgid ""
+#~ "In the <gui>For</gui> field, type the text you want to search for. Click "
+#~ "<gui>Find</gui> or press <key>Enter</key>."
+#~ msgstr ""
+#~ "在<gui>关键词</gui>中，输入您想要搜索的文字。点击<gui>查找</gui>或按"
+#~ "<key>Enter</key>。"
+
+#~ msgid ""
+#~ "Click on a conversation to view it. <app>Empathy</app> will select the "
+#~ "text in the conversation that matched your search terms."
+#~ msgstr ""
+#~ "点击一个会话以查看。<app>Empathy</app> 会选择这个会话中符合您搜索条件的文"
+#~ "字。"
+
+#~ msgid "Select the <gui>Conversations</gui> tab."
+#~ msgstr "选择<gui>会话</gui>标签。"
+
+#~ msgid ""
+#~ "Deselect <gui style=\"checkbox\">Enabled</gui> on the right side of the "
+#~ "window."
+#~ msgstr "在窗口右侧，取消选择 <gui style=\"checkbox\">启用</gui>。"
+
+#~ msgid "Click <gui style=\"button\">Log in</gui>."
+#~ msgstr "点击<gui style=\"button\">登入</gui>。"