Updated zh_CN translation

svn path=/trunk/; revision=1438

1 files changed, 1492 insertions, 715 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 775ce629c..025596b76 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,323 +1,1147 @@
-# traditional Chinese translation of gossip.
-# Convert to Simp. Chinese translation of gossip.
+# traditional Chinese translation of Empathy.
+# Convert to Simp. Chinese translation of Empathy.
 # Copyright (C) 2003-2004 Free Software Foundation, Inc.
 # Abel Cheung <maddog@linux.org.hk>, 2003.
 # Mai Haohui <maihaohui@hotmail.com>, 2003.
 # Rongjun Mu <elanmu@sina.com>, 2003.
-# 
+# YangZhang <zyangmath@gmail.com>, 2008
 msgid ""
 msgstr ""
 "Project-Id-Version: gossip\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-05-15 23:46+0200\n"
-"PO-Revision-Date: 2004-06-19 11:02+0800\n"
+"POT-Creation-Date: 2008-09-09 11:33+0000\n"
+"PO-Revision-Date: 2008-09-09 22:43+0800\n"
 "Last-Translator: Mai Haohui <maihaohui@hotmail.com>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: UTF-8\n"
 
-#: ../data/empathy.desktop.in.h:1
-#, fuzzy
+#: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy Instant Messenger"
-msgstr "即时通讯程序"
+msgstr "Empathy 即时通讯程序"
 
-#: ../data/empathy.desktop.in.h:2
-msgid "Instant Messenger"
-msgstr "即时通讯程序"
+#: ../data/empathy.desktop.in.in.h:2
+msgid "Send and receive instant messages"
+msgstr "发送和接收即时消息"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:2
-msgid "Chat window theme"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
 msgstr ""
 
 #: ../data/empathy.schemas.in.h:3
+msgid "Chat window theme"
+msgstr "聊天窗口主题"
+
+#: ../data/empathy.schemas.in.h:4
 msgid ""
 "Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr ""
+msgstr "以逗号分隔的用于拼写检查器的语言的列表(例如：en, fr, nl)。"
 
-#: ../data/empathy.schemas.in.h:4
+#: ../data/empathy.schemas.in.h:5
 #, fuzzy
 msgid "Compact contact list"
 msgstr "添加到您的联系人清单"
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/empathy.schemas.in.h:6
 msgid "Contact list sort criterium"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:6
+#: ../data/empathy.schemas.in.h:7
 msgid "Default directory to select an avatar image from"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/empathy.schemas.in.h:8
+msgid "Empathy should auto-connect on startup"
+msgstr "Empathy 启动时是否自动连接"
+
+#: ../data/empathy.schemas.in.h:9
+msgid "Empathy should use the avatar of the contact as the chat window icon"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:10
 msgid "Enable popup when contact is available"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/empathy.schemas.in.h:11
 #, fuzzy
 msgid "Enable sound when away"
 msgstr "当“离开”时关闭声音(_A)"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/empathy.schemas.in.h:12
 #, fuzzy
 msgid "Enable sound when busy"
 msgstr "当“忙碌”时关闭声音(_B)"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/empathy.schemas.in.h:13
 #, fuzzy
 msgid "Enable spell checker"
 msgstr "Gossip - 发送消息"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:14
 msgid "Hide main window"
 msgstr "隐藏主窗口"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:15
 msgid "Hide the main window."
 msgstr "隐藏主窗口。"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:16
+msgid "NetworkManager should be used"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:17
+msgid "Nick completed character"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Open new chats in separate windows"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Salut account is created"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
 #, fuzzy
 msgid "Show avatars"
 msgstr "显示联系人清单(_S)"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 #, fuzzy
 msgid "Show hint about closing the main window"
 msgstr "主窗口高度。"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Show offline contacts"
 msgstr "显示离线联系人"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Spell checking languages"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "The last directory that an avatar image was chosen from."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 #, fuzzy
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "此名称将在聊天窗口中标识您。"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Use graphical smileys"
 msgstr "使用表情图标"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
 msgid "Use notification sounds"
 msgstr "使用通知声音"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:28
 msgid "Use theme for chat rooms"
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:29
+msgid ""
+"Whether or not Empathy should automatically log in to your accounts on "
+"startup."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:30
+#, fuzzy
+msgid ""
+"Whether or not Empathy should use the avatar of the contact as the chat "
+"window icon."
+msgstr "是否显示联系人清单中离线的联系人。"
+
+#: ../data/empathy.schemas.in.h:31
+msgid ""
+"Whether or not the Salut account has been created on the first Empathy run."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:32
+msgid ""
+"Whether or not the network manager should be used to automatically "
+"disconnect/reconnect."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:33
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:34
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "对话时是否将表情符号转换为真正的图标。"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:35
 msgid "Whether or not to play a sound when messages arrive."
 msgstr "收到消息时是否播放声音。"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:36
 msgid "Whether or not to play sounds when away."
 msgstr "“离开”时是否播放声音。"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:37
 msgid "Whether or not to play sounds when busy."
 msgstr "“忙碌”时是否播放声音。"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:38
 #, fuzzy
 msgid "Whether or not to show a popup when a contact becomes available."
 msgstr "收到消息时是否播放声音。"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:39
 #, fuzzy
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "是否显示联系人清单中离线的联系人。"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "是否显示联系人清单中离线的联系人。"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:42
 #, fuzzy
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "是否显示联系人清单中离线的联系人。"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:43
 msgid "Whether to use the theme for chat rooms or not."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:44
 msgid ""
 "Which criterium to use when sorting the contact list. Default is to use sort "
 "by the contact's name with the value \"name\". A value of \"state\" will "
 "sort the contact list by state."
 msgstr ""
 
-#: ../libempathy/gossip-contact.c:654 ../libempathy/gossip-presence.c:184
-#: ../libempathy/gossip-presence.c:283
-msgid "Offline"
-msgstr "离线"
+#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:248
+msgid "People nearby"
+msgstr ""
 
-#: ../libempathy/gossip-presence.c:274
+#: ../libempathy/empathy-utils.c:345
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/gossip-presence.c:276
+#: ../libempathy/empathy-utils.c:347
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/gossip-presence.c:279
+#: ../libempathy/empathy-utils.c:350
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy-gtk/empathy-main-window.c:254
+#: ../libempathy/empathy-utils.c:352
+msgid "Hidden"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:355
+msgid "Offline"
+msgstr "离线"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:337
+msgid "All"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget.c:302
+#: ../libempathy-gtk/empathy-account-widget.c:347
+#, c-format
+msgid "%s:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-generic.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:1
+#, fuzzy
+msgid "<b>Advanced</b>"
+msgstr "<b>高级</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:2
+msgid "Forget password and clear the entry."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:3
+msgid "Pass_word:"
+msgstr "密码(_W)："
+
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
 #, fuzzy
-msgid "Show and edit accounts"
-msgstr "显示联系人清单(_S)"
+msgid "Screen _Name:"
+msgstr "名字："
 
-#: ../libempathy-gtk/empathy-main-window.c:456
-msgid "Group"
-msgstr "组"
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:8
+msgid "_Port:"
+msgstr "端口(_P)："
+
+#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:12
+#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:10
+#: ../src/empathy-new-chatroom-dialog.glade.h:10
+msgid "_Server:"
+msgstr "服务器(_S)："
 
-#: ../libempathy-gtk/empathy-main-window.c:477
+#: ../libempathy-gtk/empathy-account-widget-groupwise.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.glade.h:3
+msgid "Login I_D:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+msgid "ICQ _UIN:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
 #, fuzzy
-msgid "Contact"
-msgstr "添加联系人(_A)..."
+msgid "_Charset:"
+msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:1
+#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+msgid "New Network"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
 #, fuzzy
-msgid "Contact List - Empathy"
-msgstr "隐藏联系人清单(_H)"
+msgid "<b>Network</b>"
+msgstr "状态"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
 #, fuzzy
-msgid "Context"
-msgstr "连接"
+msgid "<b>Servers</b>"
+msgstr "<b>帐户设置</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+msgid "Charset:"
+msgstr "字符集："
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
+msgid "Create a new IRC network"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
+msgid "Edit the selected IRC network"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+msgid "Network"
+msgstr "网络"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+msgid "Network:"
+msgstr "网络："
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+msgid "Nickname:"
+msgstr "昵称："
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+msgid "Password:"
+msgstr "密码："
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
 #, fuzzy
-msgid "Join _Favorites"
-msgstr "编辑收藏夹(_E)..."
+msgid "Quit message:"
+msgstr "状态消息(_S)"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:4
-#: ../libempathy-gtk/gossip-chat.glade.h:10
-msgid "Join _New..."
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#, fuzzy
+msgid "Real name:"
+msgstr "用户名(_U)："
+
+#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
+msgid "Remove the selected IRC network"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:5
-msgid "Manage Favorites..."
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
+#, fuzzy
+msgid "<b>Override server settings</b>"
+msgstr "<b>帐户设置</b>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#, fuzzy
+msgid "Pri_ority:"
+msgstr "端口(_O)："
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#, fuzzy
+msgid "Reso_urce:"
+msgstr "资源(_R)："
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#, fuzzy
+msgid "Use old SS_L"
+msgstr "将消息用 SSL 加密(_E)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+msgid "_Encryption required (TLS/SSL)"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "显示离线联系人(_O)"
+#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+msgid "_Ignore SSL certificate errors"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
 #, fuzzy
-msgid "_About"
-msgstr "接受(_A)"
+msgid "_Email:"
+msgstr "电子邮件："
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
 #, fuzzy
-msgid "_Accounts"
-msgstr "接受(_A)"
+msgid "_First Name: "
+msgstr "名字："
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:9
-#: ../libempathy-gtk/gossip-chat.glade.h:15
-msgid "_Add Contact..."
-msgstr "添加联系人(_A)..."
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#, fuzzy
+msgid "_Jabber ID:"
+msgstr "Jabber ID:"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:10
-#: ../libempathy-gtk/gossip-contact-list.c:298
-msgid "_Chat"
-msgstr "聊天(_C)"
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#, fuzzy
+msgid "_Last Name:"
+msgstr "名字："
+
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
+#: ../src/empathy-chatrooms-window.glade.h:8
+msgid "_Nickname:"
+msgstr "昵称(_N)："
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
 #, fuzzy
-msgid "_Contents"
-msgstr "连接"
+msgid "_Published Name:"
+msgstr "名字："
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:12
-#: ../libempathy-gtk/gossip-chat.glade.h:21
-#: ../libempathy-gtk/gossip-contact-list.c:310
-msgid "_Edit"
+#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:3
+msgid "Discover STUN"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:13
-msgid "_Help"
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#, fuzzy
+msgid "STUN Server:"
+msgstr "服务器："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+msgid "STUN port:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#, fuzzy
+msgid "_Username:"
+msgstr "名字："
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+msgid "Use _Yahoo Japan"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+msgid "Yahoo I_D:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+msgid "_Ignore conference and chatroom invitations"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+msgid "_Room List locale:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:457
+msgid "Select Your Avatar Image"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:460
+msgid "No Image"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:520
+msgid "Images"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-chooser.c:524
+msgid "All Files"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-avatar-image.c:294
+msgid "Click to enlarge"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:497
+#, fuzzy
+msgid "offline"
+msgstr "离线"
+
+#: ../libempathy-gtk/empathy-chat.c:500
+#, fuzzy
+msgid "invalid contact"
+msgstr "加入一位联系人"
+
+#: ../libempathy-gtk/empathy-chat.c:503
+msgid "permission denied"
 msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:14
-#: ../libempathy-gtk/empathy-status-icon.glade.h:2
-msgid "_New Message..."
+#: ../libempathy-gtk/empathy-chat.c:506
+#, fuzzy
+msgid "too long message"
 msgstr "新建消息(_C)..."
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:15
+#: ../libempathy-gtk/empathy-chat.c:509
+msgid "not implemented"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:512
 #, fuzzy
-msgid "_Personal Information"
+msgid "unknown"
+msgstr "未知的错误"
+
+#: ../libempathy-gtk/empathy-chat.c:516
+#, c-format
+msgid "Error sending message '%s': %s"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:546
+#, fuzzy, c-format
+msgid "Topic set to: %s"
+msgstr "话题(_T)："
+
+#: ../libempathy-gtk/empathy-chat.c:548
+msgid "No topic defined"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-chat.c:963
+msgid "Insert Smiley"
+msgstr "插入表情"
+
+#: ../libempathy-gtk/empathy-chat.c:979
+msgid "_Send"
+msgstr "发送(_S)"
+
+#: ../libempathy-gtk/empathy-chat.c:1013
+msgid "_Check Word Spelling..."
+msgstr "拼写检查(_C)..."
+
+#: ../libempathy-gtk/empathy-chat.c:1119
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s 加入了聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:1122
+#, c-format
+msgid "%s has left the room"
+msgstr "%s 离开了聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:1236 ../src/empathy-call-window.c:406
+msgid "Disconnected"
+msgstr "已断开连接"
+
+#: ../libempathy-gtk/empathy-chat.c:1608
+msgid "Connected"
+msgstr "已连接"
+
+#: ../libempathy-gtk/empathy-chat.glade.h:1
+msgid "<b>Topic:</b>"
+msgstr "<b>主题：</b>"
+
+#: ../libempathy-gtk/empathy-chat.glade.h:2
+msgid "Group Chat"
+msgstr "群聊"
+
+#: ../libempathy-gtk/empathy-chat-view.c:430
+msgid "_Copy Link Address"
+msgstr "复制链接地址(_C)"
+
+#: ../libempathy-gtk/empathy-chat-view.c:438
+msgid "_Open Link"
+msgstr "打开链接(_O)"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:180
+msgid "Personal Information"
 msgstr "个人信息"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:16
-msgid "_Preferences"
-msgstr "首选项(_P)"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+msgid "Edit Contact Information"
+msgstr "编辑联系人信息"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:17
-#: ../libempathy-gtk/empathy-status-icon.glade.h:3
-msgid "_Quit"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:186
+msgid "Contact Information"
+msgstr "联系人信息"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:283
+msgid "I would like to add you to my contact list."
+msgstr "我希望可以将您加入我的联系人清单内。"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.c:307
+msgid "New Contact"
+msgstr "新建联系人..."
+
+#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+msgid "Decide _Later"
+msgstr "以后再决定(_L)"
+
+#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+msgid "Subscription Request"
+msgstr "订阅请求"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1244
+#, fuzzy, c-format
+msgid "Do you really want to remove the group '%s'?"
+msgstr "您真的要删除群组“%s”吗？"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1246
+#, fuzzy
+msgid "Removing group"
+msgstr "正在删除群组"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1293
+#: ../libempathy-gtk/empathy-contact-list-view.c:1372
+msgid "_Remove"
+msgstr "删除(_R)"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1323
+#, fuzzy, c-format
+msgid "Do you really want to remove the contact '%s'?"
 msgstr ""
+"您是否想从联系人清单中删除\n"
+"%s？"
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:18
-#: ../libempathy-gtk/gossip-chat.glade.h:25
+#: ../libempathy-gtk/empathy-contact-list-view.c:1325
 #, fuzzy
-msgid "_Room"
-msgstr "房间(_R)："
+msgid "Removing contact"
+msgstr "/删除联系人(_R)"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:1330
+msgid "Sorry, I don't want you in my contact list anymore."
+msgstr ""
 
-#: ../libempathy-gtk/empathy-main-window.glade.h:19
-#: ../libempathy-gtk/gossip-chat.glade.h:28
-#: ../libempathy-gtk/gossip-contact-list.c:326
+#: ../libempathy-gtk/empathy-contact-menu.c:109
+#: ../src/empathy-main-window.glade.h:9
+msgid "_Chat"
+msgstr "聊天(_C)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:130
+#, fuzzy
+msgid "_Call"
+msgstr "聊天(_C)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:169
+#: ../src/empathy-main-window.glade.h:17
 #, fuzzy
 msgid "_View Previous Conversations"
 msgstr "对话(_C)"
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:1
-msgid "Status"
+#: ../libempathy-gtk/empathy-contact-menu.c:197
+#, fuzzy
+msgid "Infor_mation"
+msgstr "联系人信息(_I)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:224
+#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+msgid "_Edit"
+msgstr "编辑(_E)"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:358
+msgid "Save Avatar"
+msgstr "保存头像"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:414
+msgid "Unable to save avatar"
+msgstr "无法保存头像"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:875
+msgid "Select"
+msgstr "选择"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:884
+#: ../src/empathy-main-window.c:853
+msgid "Group"
+msgstr "群组"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
+#, fuzzy
+msgid "<b>Client Information</b>"
+msgstr "客户信息"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
+#, fuzzy
+msgid "<b>Contact Details</b>"
 msgstr "状态"
 
-#: ../libempathy-gtk/empathy-status-icon.glade.h:4
-msgid "_Show Contact List"
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
+msgid "<b>Contact</b>"
+msgstr "<b>联系人</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
+msgid "<b>Groups</b>"
+msgstr "<b>群组</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:1
+#: ../src/empathy-chatrooms-window.glade.h:1
+#: ../src/empathy-new-chatroom-dialog.glade.h:1
+msgid "Account:"
+msgstr "帐户："
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+msgid "Alias:"
+msgstr "别名："
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+msgid "Birthday:"
+msgstr "生日："
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+msgid "Client:"
+msgstr "客户："
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
+msgid "Contact information"
+msgstr "联系人信息"
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+msgid "Email:"
+msgstr "电子邮件："
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+msgid "Fullname:"
+msgstr "全称："
+
+#. Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#, fuzzy
+msgid "Identifier:"
+msgstr "用户名："
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+msgid "Information requested..."
+msgstr "已请求信息..."
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+msgid "OS:"
+msgstr "操作系统："
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+msgid ""
+"Select the groups you want this contact to appear in.  Note that you can "
+"select more than one group or no groups."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:17
+msgid "Version:"
+msgstr "版本："
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+msgid "Web site:"
+msgstr "网站："
+
+#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+msgid "_Add Group"
+msgstr "添加群组(_A)"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+msgid "new server"
+msgstr "新建服务器"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+msgid "Server"
+msgstr "服务器"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+msgid "Port"
+msgstr "端口"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+msgid "SSL"
+msgstr "SSL"
+
+#: ../libempathy-gtk/empathy-log-window.c:497
+msgid "Account"
+msgstr "帐户"
+
+#: ../libempathy-gtk/empathy-log-window.c:504 ../src/empathy-chat-window.c:280
+msgid "Conversation"
+msgstr "会话"
+
+#: ../libempathy-gtk/empathy-log-window.c:514
+msgid "Date"
+msgstr "日期"
+
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.glade.h:2
+msgid "Conversations"
+msgstr "会话"
+
+#: ../libempathy-gtk/empathy-log-window.glade.h:3
+msgid "Previous Conversations"
+msgstr "以前的会话"
+
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.glade.h:5
+msgid "Search"
+msgstr "搜索"
+
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.glade.h:7
+msgid "_For:"
+msgstr "(_F)："
+
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+msgid "C_all"
+msgstr "呼叫(_A)"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+msgid "C_hat"
+msgstr "聊天(_H)"
+
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+msgid "Contact ID:"
+msgstr "联系人 ID："
+
+#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+msgid "New Conversation"
+msgstr "新建会话"
+
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:685
+#, fuzzy
+msgid "Custom messages..."
+msgstr "请求消息"
+
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
+#, fuzzy
+msgid "Custom message"
+msgstr "请求消息"
+
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
+msgid "Message:"
+msgstr "消息："
+
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
+msgid "Save message"
+msgstr "保存消息"
+
+#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
+msgid "Status:"
+msgstr "状态："
+
+#: ../libempathy-gtk/empathy-spell-dialog.c:88
+msgid "Word"
+msgstr "单词"
+
+#: ../libempathy-gtk/empathy-spell-dialog.c:265
+msgid "Suggestions for the word"
+msgstr "单词的拼写建议"
+
+#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
+msgid "Spell Checker"
+msgstr "拼写检查器"
+
+#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
+msgid "Suggestions for the word:"
+msgstr "单词的拼写建议："
+
+#: ../libempathy-gtk/empathy-theme-boxes.c:745
+#: ../libempathy-gtk/empathy-theme-irc.c:293
+msgid "%A %d %B %Y"
+msgstr "%Y年%-m月%-d日%A"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:73
+msgid "Classic"
+msgstr "经典"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:74
+msgid "Simple"
+msgstr "简洁"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:75
+msgid "Clean"
+msgstr "清爽"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:76
+msgid "Blue"
+msgstr "蓝色"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1330
+msgid "Unable to open URI"
+msgstr "无法打开 URI"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:158
+msgid "Current Locale"
+msgstr "当前 Locale"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:161
+#: ../libempathy-gtk/totem-subtitle-encoding.c:163
+#: ../libempathy-gtk/totem-subtitle-encoding.c:165
+#: ../libempathy-gtk/totem-subtitle-encoding.c:167
+msgid "Arabic"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:170
+msgid "Armenian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:173
+#: ../libempathy-gtk/totem-subtitle-encoding.c:175
+#: ../libempathy-gtk/totem-subtitle-encoding.c:177
+msgid "Baltic"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:180
+msgid "Celtic"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:183
+#: ../libempathy-gtk/totem-subtitle-encoding.c:185
+#: ../libempathy-gtk/totem-subtitle-encoding.c:187
+#: ../libempathy-gtk/totem-subtitle-encoding.c:189
+msgid "Central European"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:192
+#: ../libempathy-gtk/totem-subtitle-encoding.c:194
+#: ../libempathy-gtk/totem-subtitle-encoding.c:196
+#: ../libempathy-gtk/totem-subtitle-encoding.c:198
+msgid "Chinese Simplified"
+msgstr "简体中文"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:201
+#: ../libempathy-gtk/totem-subtitle-encoding.c:203
+#: ../libempathy-gtk/totem-subtitle-encoding.c:205
+msgid "Chinese Traditional"
+msgstr "繁体中文"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:208
+msgid "Croatian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:211
+#: ../libempathy-gtk/totem-subtitle-encoding.c:213
+#: ../libempathy-gtk/totem-subtitle-encoding.c:215
+#: ../libempathy-gtk/totem-subtitle-encoding.c:217
+#: ../libempathy-gtk/totem-subtitle-encoding.c:219
+#: ../libempathy-gtk/totem-subtitle-encoding.c:221
+msgid "Cyrillic"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:224
+msgid "Cyrillic/Russian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:227
+#: ../libempathy-gtk/totem-subtitle-encoding.c:229
+msgid "Cyrillic/Ukrainian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:232
+#, fuzzy
+msgid "Georgian"
+msgstr "版本："
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:235
+#: ../libempathy-gtk/totem-subtitle-encoding.c:237
+#: ../libempathy-gtk/totem-subtitle-encoding.c:239
+msgid "Greek"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:242
+msgid "Gujarati"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:245
+msgid "Gurmukhi"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:248
+#: ../libempathy-gtk/totem-subtitle-encoding.c:250
+#: ../libempathy-gtk/totem-subtitle-encoding.c:252
+#: ../libempathy-gtk/totem-subtitle-encoding.c:254
+msgid "Hebrew"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:257
+msgid "Hebrew Visual"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:260
+msgid "Hindi"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:263
+msgid "Icelandic"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:266
+#: ../libempathy-gtk/totem-subtitle-encoding.c:268
+#: ../libempathy-gtk/totem-subtitle-encoding.c:270
+msgid "Japanese"
+msgstr "日本语"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:273
+#: ../libempathy-gtk/totem-subtitle-encoding.c:275
+#: ../libempathy-gtk/totem-subtitle-encoding.c:277
+#: ../libempathy-gtk/totem-subtitle-encoding.c:279
+msgid "Korean"
+msgstr "韩语"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:282
+msgid "Nordic"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:285
+#, fuzzy
+msgid "Persian"
+msgstr "版本："
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:288
+#: ../libempathy-gtk/totem-subtitle-encoding.c:290
+msgid "Romanian"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:293
+msgid "South European"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:296
+msgid "Thai"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:299
+#: ../libempathy-gtk/totem-subtitle-encoding.c:301
+#: ../libempathy-gtk/totem-subtitle-encoding.c:303
+#: ../libempathy-gtk/totem-subtitle-encoding.c:305
+msgid "Turkish"
+msgstr ""
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:308
+#: ../libempathy-gtk/totem-subtitle-encoding.c:310
+#: ../libempathy-gtk/totem-subtitle-encoding.c:312
+#: ../libempathy-gtk/totem-subtitle-encoding.c:314
+#: ../libempathy-gtk/totem-subtitle-encoding.c:316
+msgid "Unicode"
+msgstr "Unicode"
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:319
+#: ../libempathy-gtk/totem-subtitle-encoding.c:321
+#: ../libempathy-gtk/totem-subtitle-encoding.c:323
+#: ../libempathy-gtk/totem-subtitle-encoding.c:325
+#: ../libempathy-gtk/totem-subtitle-encoding.c:327
+#, fuzzy
+msgid "Western"
+msgstr "Unicode网站："
+
+#: ../libempathy-gtk/totem-subtitle-encoding.c:330
+#: ../libempathy-gtk/totem-subtitle-encoding.c:332
+#: ../libempathy-gtk/totem-subtitle-encoding.c:334
+#, fuzzy
+msgid "Vietnamese"
+msgstr "用户名(_U)："
+
+#.
+#. * vim: sw=2 ts=8 cindent noai bs=2
+#.
+#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
+msgid ""
+"The contact to display in the applet. Empty means no contact is displayed."
+msgstr ""
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
+msgid "The contact's avatar token. Empty means contact has no avatar."
+msgstr ""
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
+msgid "Megaphone"
+msgstr ""
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
+#: ../megaphone/src/megaphone-applet.c:417
+msgid "Talk!"
+msgstr ""
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
+#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
+msgid "_About"
+msgstr "关于(_A)"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
+#, fuzzy
+msgid "_Information"
+msgstr "联系人信息(_I)"
+
+#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
+#: ../src/empathy-main-window.glade.h:15
+msgid "_Preferences"
+msgstr "首选项(_P)"
+
+#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
+#, fuzzy
+msgid "Presence"
+msgstr "首选项(_P)"
+
+#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
+#: ../nothere/src/nothere-applet.c:106
+msgid "Set your own presence"
+msgstr ""
+
+#: ../src/empathy.c:380
+msgid "Don't connect on startup"
+msgstr "启动时不自动登录"
+
+#: ../src/empathy.c:384
+#, fuzzy
+msgid "Don't show the contact list on startup"
+msgstr "启动时不自动登录"
+
+#: ../src/empathy.c:388
+#, fuzzy
+msgid "Show the accounts dialog"
 msgstr "显示联系人清单(_S)"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:63
+#: ../src/empathy.c:400
+msgid "- Empathy Instant Messenger"
+msgstr "- Empathy 即时通讯程序"
+
+#: ../src/empathy-about-dialog.c:84
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -325,7 +1149,7 @@ msgid ""
 "version."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-about-dialog.c:67
+#: ../src/empathy-about-dialog.c:88
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -333,19 +1157,19 @@ msgid ""
 "details."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-about-dialog.c:71
+#: ../src/empathy-about-dialog.c:92
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-about-dialog.c:99
+#: ../src/empathy-about-dialog.c:120
 #, fuzzy
 msgid "An Instant Messaging client for GNOME"
 msgstr "Gossip 即时通讯客户端"
 
-#: ../libempathy-gtk/gossip-about-dialog.c:105
+#: ../src/empathy-about-dialog.c:126
 #, fuzzy
 msgid "translator-credits"
 msgstr ""
@@ -355,55 +1179,29 @@ msgstr ""
 "Mai Haohui\n"
 "Rongjun Mu"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:224
-#, fuzzy
-msgid "Disable"
-msgstr "在线"
-
-#: ../libempathy-gtk/gossip-accounts-dialog.c:227
-msgid "Enable"
-msgstr ""
-
-#: ../libempathy-gtk/gossip-accounts-dialog.c:261
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:3
-#, fuzzy
-msgid "<b>No Account Selected</b>"
-msgstr "<b>帐户设置</b>"
-
-#: ../libempathy-gtk/gossip-accounts-dialog.c:263
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to start configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
+#: ../src/empathy-accounts-dialog.c:389
+msgid "Enabled"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:272
-#, fuzzy
-msgid "<b>No Accounts Configured</b>"
-msgstr "<b>帐户设置</b>"
-
-#: ../libempathy-gtk/gossip-accounts-dialog.c:274
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to start configuring."
-msgstr ""
-
-#: ../libempathy-gtk/gossip-accounts-dialog.c:362
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:6
-#, fuzzy
+#: ../src/empathy-accounts-dialog.c:399
+#: ../src/empathy-accounts-dialog.glade.h:4
 msgid "Accounts"
-msgstr "Jabber 帐户"
+msgstr "帐户"
+
+#. To translator: %s is the protocol name
+#: ../src/empathy-accounts-dialog.c:862
+#, c-format
+msgid "New %s account"
+msgstr "新建 %s 帐户"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:857
+#: ../src/empathy-accounts-dialog.c:972
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
 "Are you sure you want to proceed?"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.c:863
+#: ../src/empathy-accounts-dialog.c:978
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -412,547 +1210,751 @@ msgid ""
 "be available."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:1
+#: ../src/empathy-accounts-dialog.glade.h:1
 #, fuzzy
-msgid "<b>Account</b>"
+msgid "<b>New Account</b>"
 msgstr "<b>收藏夹：</b>"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:2
+#: ../src/empathy-accounts-dialog.glade.h:2
 #, fuzzy
-msgid "<b>New Account</b>"
-msgstr "<b>收藏夹：</b>"
+msgid "<b>No protocol installed</b>"
+msgstr "<b>帐户设置</b>"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.glade.h:3
 #, fuzzy
 msgid "<b>Settings</b>"
 msgstr "<b>帐户设置</b>"
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:5
-msgid "A unique name for this account to identify it personally to you."
+#: ../src/empathy-accounts-dialog.glade.h:5
+msgid "Cr_eate"
+msgstr "创建(_E)"
+
+#: ../src/empathy-accounts-dialog.glade.h:6
+msgid "I already have an account I want to use"
+msgstr "我已经拥有帐户，我想使用它"
+
+#: ../src/empathy-accounts-dialog.glade.h:7
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:7
-#, fuzzy
-msgid "Cr_eate"
-msgstr "聊天"
+#: ../src/empathy-accounts-dialog.glade.h:8
+msgid "Type:"
+msgstr "类型："
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:8
-msgid "Imendio "
+#: ../src/empathy-call-window.c:142
+msgid "Closed"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:9
-msgid "Jabber"
-msgstr "Jabber"
+#: ../src/empathy-call-window.c:254
+msgid "End this call?"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:10
-msgid ""
-"To add a new account, you can click on the 'Add' button and a new entry will "
-"be created for you to started configuring.\n"
-"\n"
-"If you do not want to add an account, simply click on the account you want "
-"to configure in the list on the left."
+#: ../src/empathy-call-window.c:256
+msgid "Closing this window will end the call in progress."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:13
-#, fuzzy
-msgid "_Name:"
-msgstr "名字："
+#: ../src/empathy-call-window.c:257
+msgid "_End Call"
+msgstr ""
+
+#: ../src/empathy-call-window.c:311
+msgid "Incoming call"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-accounts-dialog.glade.h:14
+#: ../src/empathy-call-window.c:313
+#, fuzzy, c-format
+msgid "%s is calling you, do you want to answer?"
+msgstr "您想使用什么用户名？"
+
+#: ../src/empathy-call-window.c:319
 #, fuzzy
-msgid "_Type:"
-msgstr "话题(_T)："
+msgid "_Reject"
+msgstr "选择"
 
-#: ../libempathy-gtk/gossip-account-widget-generic.c:144
-#: ../libempathy-gtk/gossip-account-widget-generic.c:186
-#, c-format
-msgid "%s:"
+#: ../src/empathy-call-window.c:324
+msgid "_Answer"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:1
-#, fuzzy
-msgid ""
-"<small><b><span foreground=\"#555\">Example: user@jabber.org</span></b></"
-"small>"
-msgstr "<span size=\"smaller\">例如：user@jabber.org</span>"
+#: ../src/empathy-call-window.c:379
+msgid "Empathy Call"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:2
-msgid "Forget password and clear the entry."
+#. To translators: Readying is the first state of the call, it is
+#. * preparing the connection and it does not yet ring.
+#: ../src/empathy-call-window.c:382
+msgid "Readying"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:3
-msgid "Login I_D:"
+#: ../src/empathy-call-window.c:391
+#, c-format
+msgid "%s - Empathy Call"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:4
+#: ../src/empathy-call-window.c:395
 #, fuzzy
-msgid "Pass_word:"
-msgstr "密码(_P)："
+msgid "Ringing"
+msgstr "加入(_J)"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:5
+#: ../src/empathy-call-window.c:408
 #, fuzzy
-msgid "Reso_urce:"
-msgstr "资源(_R)："
+msgid "Connecting"
+msgstr "连接"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:6
-#, fuzzy
-msgid "Use encryption (SS_L)"
-msgstr "将消息用 SSL 加密(_E)"
+#: ../src/empathy-call-window.c:524
+#, c-format
+msgid "Incoming call from %s rejected because there is already a running call."
+msgstr ""
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:7
-#, fuzzy
-msgid "_Port:"
-msgstr "端口(_O)："
+#: ../src/empathy-call-window.glade.h:1
+msgid "#"
+msgstr "#"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:8
-msgid "_Server:"
-msgstr "服务器(_S)："
+#: ../src/empathy-call-window.glade.h:2
+msgid "*"
+msgstr "*"
 
-#: ../libempathy-gtk/gossip-account-widget-jabber.glade.h:9
-#, fuzzy
-msgid "jabber account settings"
-msgstr "<b>帐户设置</b>"
+#: ../src/empathy-call-window.glade.h:3
+msgid "0"
+msgstr "0"
 
-#: ../libempathy-gtk/gossip-chat.c:314
-msgid "Disconnected"
-msgstr "已断开连接"
+#: ../src/empathy-call-window.glade.h:4
+msgid "1"
+msgstr "1"
 
-#: ../libempathy-gtk/gossip-chat.c:858
-msgid "Insert Smiley"
-msgstr ""
+#: ../src/empathy-call-window.glade.h:5
+msgid "2"
+msgstr "2"
 
-#: ../libempathy-gtk/gossip-chat.c:906
-msgid "_Check Word Spelling..."
-msgstr ""
+#: ../src/empathy-call-window.glade.h:6
+msgid "3"
+msgstr "3"
 
-#: ../libempathy-gtk/gossip-chat.c:1244
-msgid "Connected"
-msgstr "已连接"
+#: ../src/empathy-call-window.glade.h:7
+msgid "4"
+msgstr "4"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:1
-msgid "C_lear"
-msgstr "清除(_L)"
+#: ../src/empathy-call-window.glade.h:8
+msgid "5"
+msgstr "5"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:2
-msgid "Change _Topic..."
-msgstr ""
+#: ../src/empathy-call-window.glade.h:9
+msgid "6"
+msgstr "6"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:3
-msgid "Chat"
-msgstr "聊天"
+#: ../src/empathy-call-window.glade.h:10
+msgid "7"
+msgstr "7"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:4
-#, fuzzy
-msgid "Contact Infor_mation"
-msgstr "联系人信息(_I)"
+#: ../src/empathy-call-window.glade.h:11
+msgid "8"
+msgstr "8"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:5
-#, fuzzy
-msgid "Cu_t"
-msgstr "聊天"
+#: ../src/empathy-call-window.glade.h:12
+msgid "9"
+msgstr "9"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:6
+#. To translators: The keypad is numbers [0-9], asterisk (*) and hash (#). Presented like on any phone
+#: ../src/empathy-call-window.glade.h:14
 #, fuzzy
-msgid "In_vite..."
-msgstr "注册(_G)..."
+msgid "<b>Keypad</b>"
+msgstr "状态"
+
+#: ../src/empathy-call-window.glade.h:15
+msgid "<b>Volume</b>"
+msgstr "<b>音量</b>"
+
+#: ../src/empathy-call-window.glade.h:16
+msgid "Hang Up"
+msgstr "挂断"
+
+#: ../src/empathy-call-window.glade.h:17
+msgid "Send Video"
+msgstr "发送视频"
+
+#: ../src/empathy-chat-window.c:326
+#, c-format
+msgid "Conversations (%d)"
+msgstr "会话 (%d)"
+
+#: ../src/empathy-chat-window.c:418
+msgid "Topic:"
+msgstr "话题："
 
-#: ../libempathy-gtk/gossip-chat.glade.h:7
+#: ../src/empathy-chat-window.c:421
+msgid "Typing a message."
+msgstr "输入消息。"
+
+#: ../src/empathy-chat-window.glade.h:1
+msgid "C_lear"
+msgstr "清除(_L)"
+
+#: ../src/empathy-chat-window.glade.h:2
+msgid "Chat"
+msgstr "聊天"
+
+#: ../src/empathy-chat-window.glade.h:3
 msgid "Insert _Smiley"
-msgstr ""
+msgstr "插入表情(_M)："
 
-#: ../libempathy-gtk/gossip-chat.glade.h:8
-#, fuzzy
+#: ../src/empathy-chat-window.glade.h:4
 msgid "Invitation _message:"
-msgstr "输入状态消息："
+msgstr "邀请消息(_M)："
 
-#: ../libempathy-gtk/gossip-chat.glade.h:9
+#: ../src/empathy-chat-window.glade.h:5
 msgid "Invite"
-msgstr ""
+msgstr "邀请"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:11
+#: ../src/empathy-chat-window.glade.h:6
 msgid "Move Tab _Left"
 msgstr "左移标签(_L)"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:12
+#: ../src/empathy-chat-window.glade.h:7
 msgid "Move Tab _Right"
 msgstr "右移标签(_R)"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:13
+#: ../src/empathy-chat-window.glade.h:8
 msgid "Select who would you like to invite:"
-msgstr ""
+msgstr "选择您要邀请的人："
 
-#: ../libempathy-gtk/gossip-chat.glade.h:14
+#: ../src/empathy-chat-window.glade.h:9
 msgid "You have been invited to join a chat conference."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-chat.glade.h:16
-#, fuzzy
-msgid "_Add To Favorites"
-msgstr "编辑收藏夹(_E)..."
+#: ../src/empathy-chat-window.glade.h:10
+msgid "_Contact"
+msgstr "联系人(_C)"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:17
-msgid "_Close"
-msgstr ""
+#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+msgid "_Contents"
+msgstr "内容(_C)"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:18
+#: ../src/empathy-chat-window.glade.h:12
 msgid "_Conversation"
 msgstr "对话(_C)"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:19
-msgid "_Copy"
-msgstr ""
-
-#: ../libempathy-gtk/gossip-chat.glade.h:20
+#: ../src/empathy-chat-window.glade.h:13
 msgid "_Detach Tab"
 msgstr "分离标签(_D)"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:22
+#: ../src/empathy-chat-window.glade.h:15
+#, fuzzy
+msgid "_Favorite Chatroom"
+msgstr "Gossip - 编辑聊天组"
+
+#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+msgid "_Help"
+msgstr "帮助(_H)"
+
+#: ../src/empathy-chat-window.glade.h:17
 msgid "_Next Tab"
 msgstr "下一标签(_N)"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:23
-msgid "_Paste"
-msgstr ""
-
-#: ../libempathy-gtk/gossip-chat.glade.h:24
+#: ../src/empathy-chat-window.glade.h:18
 msgid "_Previous Tab"
 msgstr "上一标签(_P)"
 
-#: ../libempathy-gtk/gossip-chat.glade.h:26
-#, fuzzy
-msgid "_Show Contacts"
-msgstr "显示联系人清单(_S)"
-
-#: ../libempathy-gtk/gossip-chat.glade.h:27
+#: ../src/empathy-chat-window.glade.h:19
 msgid "_Tabs"
 msgstr "标签(_T)"
 
-#: ../libempathy-gtk/gossip-chat-view.c:544
-msgid "_Copy Link Address"
-msgstr "复制链接地址(_C)"
+#: ../src/empathy-chatrooms-window.c:262
+msgid "Name"
+msgstr "名称"
 
-#: ../libempathy-gtk/gossip-chat-view.c:552
-msgid "_Open Link"
-msgstr "打开链接(_O)"
+#: ../src/empathy-chatrooms-window.c:280
+msgid "Room"
+msgstr "聊天室"
 
-#: ../libempathy-gtk/gossip-chat-view.c:889
-msgid "%A %d %B %Y"
-msgstr "%Y年%-m月%-d日%A"
+#: ../src/empathy-chatrooms-window.c:289
+msgid "Auto-Connect"
+msgstr "自动连接"
 
-#: ../libempathy-gtk/gossip-chat-window.c:685
-#: ../libempathy-gtk/gossip-chat-window.c:715
+#: ../src/empathy-chatrooms-window.glade.h:2
 #, fuzzy
-msgid "New Message"
-msgid_plural "New Messages"
-msgstr[0] "新建消息(_C)..."
-msgstr[1] "新建消息(_C)..."
+msgid "Edit Favorite Room"
+msgstr "Gossip - 编辑聊天组"
 
-#: ../libempathy-gtk/gossip-chat-window.c:691
+#: ../src/empathy-chatrooms-window.glade.h:3
 #, fuzzy
-msgid "Chat Room"
-msgstr "Gossip - 聊天"
+msgid "Join room on start_up"
+msgstr "启动时不自动登录"
+
+#: ../src/empathy-chatrooms-window.glade.h:4
+msgid "Join this chat room when Empathy starts and you are connected"
+msgstr ""
+
+#: ../src/empathy-chatrooms-window.glade.h:5
+#, fuzzy
+msgid "Manage Favorite Rooms"
+msgstr "Gossip - 编辑聊天组"
+
+#: ../src/empathy-chatrooms-window.glade.h:6
+#, fuzzy
+msgid "N_ame:"
+msgstr "名字："
+
+#: ../src/empathy-chatrooms-window.glade.h:7
+#, fuzzy
+msgid "S_erver:"
+msgstr "服务器："
 
-#: ../libempathy-gtk/gossip-chat-window.c:696
-#: ../libempathy-gtk/gossip-chat-window.c:719
+#: ../src/empathy-chatrooms-window.glade.h:9
+#: ../src/empathy-new-chatroom-dialog.glade.h:9
+msgid "_Room:"
+msgstr "房间(_R)："
+
+#: ../src/empathy-event-manager.c:166
 #, fuzzy, c-format
-msgid "Conversation"
-msgid_plural "Conversations (%d)"
-msgstr[0] "对话(_C)"
-msgstr[1] "对话(_C)"
+msgid ""
+"New message from %s:\n"
+"%s"
+msgstr "收到来自 %s 的消息"
 
-#: ../libempathy-gtk/gossip-chat-window.c:1295
-msgid "Typing a message."
-msgstr "输入消息。"
+#: ../src/empathy-event-manager.c:205
+#, c-format
+msgid "Incoming call from %s"
+msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:290
+#: ../src/empathy-event-manager.c:238
+#, c-format
+msgid ""
+"%s is offering you an invitation, but you don't have the needed external "
+"application to handle it."
+msgstr ""
+
+#: ../src/empathy-event-manager.c:263
 #, fuzzy
-msgid "_Contact"
+msgid "Invitation Error"
+msgstr "输入状态消息："
+
+#: ../src/empathy-event-manager.c:289
+#, c-format
+msgid ""
+"%s is offering you an invitation. An external application will be started to "
+"handle it."
+msgstr ""
+
+#: ../src/empathy-event-manager.c:345
+#, fuzzy, c-format
+msgid "Subscription requested by %s"
+msgstr "订阅请求"
+
+#: ../src/empathy-event-manager.c:348
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Message: %s"
+msgstr "状态消息(_S)"
+
+#: ../src/empathy-main-window.c:466
+#, fuzzy
+msgid "Show and edit accounts"
+msgstr "显示联系人清单(_S)"
+
+#: ../src/empathy-main-window.c:836
+#, fuzzy
+msgid "Contact"
 msgstr "添加联系人(_A)..."
 
-#: ../libempathy-gtk/gossip-contact-list.c:294
+#: ../src/empathy-main-window.c:1038
+#, fuzzy
+msgid "_Edit account"
+msgstr "Jabber 帐户"
+
+#: ../src/empathy-main-window.c:1121
+msgid "No error specified"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1124
+msgid "Network error"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1127
+msgid "Authentication failed"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1130
+msgid "Encryption error"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1133
+msgid "Name in use"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1136
+msgid "Certificate not provided"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1139
+msgid "Certificate untrusted"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1142
+msgid "Certificate expired"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1145
+msgid "Certificate not activated"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1148
+msgid "Certificate hostname mismatch"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1151
+msgid "Certificate fingerprint mismatch"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1154
+msgid "Certificate self-signed"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1157
+msgid "Certificate error"
+msgstr ""
+
+#: ../src/empathy-main-window.c:1160
 #, fuzzy
-msgid "_Group"
-msgstr "组"
+msgid "Unknown error"
+msgstr "未知的错误"
 
-#: ../libempathy-gtk/gossip-contact-list.c:298
+#: ../src/empathy-main-window.glade.h:1
 #, fuzzy
-msgid "Chat with contact"
-msgstr "加入一位联系人"
+msgid "Contact List"
+msgstr "显示联系人清单(_S)"
 
-#: ../libempathy-gtk/gossip-contact-list.c:302
+#: ../src/empathy-main-window.glade.h:2
 #, fuzzy
-msgid "Infor_mation"
-msgstr "联系人信息(_I)"
+msgid "Context"
+msgstr "连接"
 
-#: ../libempathy-gtk/gossip-contact-list.c:302
+#: ../src/empathy-main-window.glade.h:3
 #, fuzzy
-msgid "View contact information"
-msgstr "联系人信息"
+msgid "Join _Favorites"
+msgstr "编辑收藏夹(_E)..."
 
-#: ../libempathy-gtk/gossip-contact-list.c:306
+#: ../src/empathy-main-window.glade.h:4
+msgid "Join _New..."
+msgstr ""
+
+#: ../src/empathy-main-window.glade.h:5
 #, fuzzy
-msgid "Re_name"
-msgstr "/更改组名(_N)"
+msgid "Manage Favorites"
+msgstr "编辑收藏夹(_E)..."
 
-#: ../libempathy-gtk/gossip-contact-list.c:306
+#: ../src/empathy-main-window.glade.h:6
+msgid "Show _Offline Contacts"
+msgstr "显示离线联系人(_O)"
+
+#: ../src/empathy-main-window.glade.h:7
 #, fuzzy
-msgid "Rename"
-msgstr "用户名(_U)："
+msgid "_Accounts"
+msgstr "接受(_A)"
+
+#: ../src/empathy-main-window.glade.h:8
+msgid "_Add Contact..."
+msgstr "添加联系人(_A)..."
 
-#: ../libempathy-gtk/gossip-contact-list.c:310
+#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
 #, fuzzy
-msgid "Edit the groups and name for this contact"
-msgstr "请输入联系人 %s 的新昵称"
+msgid "_New Conversation..."
+msgstr "对话(_C)"
 
-#: ../libempathy-gtk/gossip-contact-list.c:314
-msgid "_Remove"
-msgstr "删除(_R)"
+#: ../src/empathy-main-window.glade.h:14
+#, fuzzy
+msgid "_Personal Information"
+msgstr "个人信息"
 
-#: ../libempathy-gtk/gossip-contact-list.c:314
+#: ../src/empathy-main-window.glade.h:16
 #, fuzzy
-msgid "Remove contact"
-msgstr "/删除联系人(_R)"
+msgid "_Room"
+msgstr "房间(_R)："
 
-#: ../libempathy-gtk/gossip-contact-list.c:318
+#: ../src/empathy-new-chatroom-dialog.c:290
 #, fuzzy
-msgid "_Invite to Chat Room"
-msgstr "Gossip - 编辑聊天组"
+msgid "Chat Rooms"
+msgstr "Gossip - 聊天"
 
-#: ../libempathy-gtk/gossip-contact-list.c:318
-msgid "Invite to a currently open chat room"
+#: ../src/empathy-new-chatroom-dialog.glade.h:2
+msgid "Browse:"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:322
-msgid "_Send File..."
+#: ../src/empathy-new-chatroom-dialog.glade.h:3
+msgid ""
+"Enter the room name to join here or click on one or more rooms in the list."
 msgstr ""
 
-#: ../libempathy-gtk/gossip-contact-list.c:322
+#: ../src/empathy-new-chatroom-dialog.glade.h:4
+msgid ""
+"Enter the server which hosts the room, or leave it empty if the room is on "
+"the current account's server"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:5
 #, fuzzy
-msgid "Send a file"
-msgstr "选择"
+msgid "Join"
+msgstr "加入(_J)"
 
-#: ../libempathy-gtk/gossip-contact-list.c:326
+#: ../src/empathy-new-chatroom-dialog.glade.h:6
 #, fuzzy
-msgid "View previous conversations with this contact"
-msgstr "对话(_C)"
+msgid "Join New"
+msgstr "加入(_J)"
 
-#: ../libempathy-gtk/gossip-preferences.c:250
+#: ../src/empathy-new-chatroom-dialog.glade.h:7
+msgid "Re_fresh"
+msgstr ""
+
+#: ../src/empathy-new-chatroom-dialog.glade.h:8
+msgid ""
+"This list represents all chat rooms hosted on the server you have entered."
+msgstr ""
+
+#: ../src/empathy-preferences.c:264
 msgid "Language"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:1
+#: ../src/empathy-preferences.glade.h:1
 #, fuzzy
 msgid "<b>Appearance</b>"
 msgstr "外观"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:2
+#. To translators: Audio notifications preferences
+#: ../src/empathy-preferences.glade.h:3
 #, fuzzy
 msgid "<b>Audio</b>"
 msgstr "<b>收藏夹：</b>"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:3
+#: ../src/empathy-preferences.glade.h:4
 #, fuzzy
 msgid "<b>Behaviour</b>"
 msgstr "<b>收藏夹：</b>"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:4
+#: ../src/empathy-preferences.glade.h:5
 #, fuzzy
 msgid "<b>Contact List</b>"
 msgstr "状态"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:5
-msgid "<b>Languages</b>"
-msgstr ""
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:6
+#: ../src/empathy-preferences.glade.h:6
 #, fuzzy
-msgid "<b>Options</b>"
-msgstr "连接"
+msgid "<b>Enable spell checking for languages:</b>"
+msgstr "Gossip - 发送消息"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:7
+#. To translators: Visual notifications preferences, like notify bubbles, etc.
+#: ../src/empathy-preferences.glade.h:8
 #, fuzzy
 msgid "<b>Visual</b>"
 msgstr "<b>描述</b>"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:8
+#: ../src/empathy-preferences.glade.h:9
 msgid ""
 "<small>The list of languages reflects only the languages for which you have "
 "a dictionary installed.</small>"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:9
+#: ../src/empathy-preferences.glade.h:10
+#, fuzzy
+msgid "Automatically _connect on startup "
+msgstr "启动时不自动登录"
+
+#: ../src/empathy-preferences.glade.h:11
 msgid "Avatars are user chosen images shown in the contact list"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:10
-#, fuzzy
+#: ../src/empathy-preferences.glade.h:12
 msgid "Chat Th_eme:"
-msgstr "聊天名称(_N)："
+msgstr "聊天主题(_E)："
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:11
+#: ../src/empathy-preferences.glade.h:13
 msgid "Display notifications when contacts come _online"
-msgstr ""
+msgstr "联系人上线时显示通知(_O)"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:12
-#, fuzzy
+#: ../src/empathy-preferences.glade.h:14
 msgid "Enable sounds when _away"
-msgstr "当“离开”时关闭声音(_A)"
+msgstr "“离开”时启用声音(_A)"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:13
-#, fuzzy
+#: ../src/empathy-preferences.glade.h:15
 msgid "Enable sounds when _busy"
-msgstr "当“忙碌”时关闭声音(_B)"
+msgstr "“忙碌”时启用声音(_B)"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:14
+#: ../src/empathy-preferences.glade.h:16
 msgid "General"
-msgstr ""
+msgstr "常规"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:15
-#, fuzzy
+#: ../src/empathy-preferences.glade.h:17
 msgid "Notifications"
-msgstr "使用通知声音"
+msgstr "通知"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:16
-#, fuzzy
+#: ../src/empathy-preferences.glade.h:18
 msgid "Preferences"
-msgstr "首选项(_P)"
+msgstr "首选项"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:17
+#: ../src/empathy-preferences.glade.h:19
 msgid "Show _avatars"
 msgstr ""
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:18
-#, fuzzy
+#: ../src/empathy-preferences.glade.h:20
 msgid "Show _smileys as images"
-msgstr "将表情符号转换为图形(_S)"
+msgstr "显示表情符号为图形(_S)"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:19
-#, fuzzy
+#: ../src/empathy-preferences.glade.h:21
 msgid "Show co_mpact contact list"
-msgstr "显示联系人清单(_S)"
+msgstr "紧凑显示联系人列表(_M)"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:20
+#: ../src/empathy-preferences.glade.h:22
 msgid "Sort by _name"
-msgstr ""
+msgstr "按名称排序(_N)"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:21
+#: ../src/empathy-preferences.glade.h:23
 msgid "Sort by s_tate"
-msgstr ""
+msgstr "按状态排序(_T)"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:22
+#: ../src/empathy-preferences.glade.h:24
 msgid "Spell Checking"
-msgstr ""
+msgstr "拼写检查"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:23
+#: ../src/empathy-preferences.glade.h:25
 msgid "Themes"
-msgstr ""
-
-#: ../libempathy-gtk/gossip-preferences.glade.h:24
-msgid "_Enable spell checking"
-msgstr ""
+msgstr "主题"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:25
+#: ../src/empathy-preferences.glade.h:26
+#, fuzzy
 msgid "_Open new chats in separate windows"
-msgstr ""
+msgstr "在新窗口中打开新聊天(_O)"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:26
-#, fuzzy
+#: ../src/empathy-preferences.glade.h:27
 msgid "_Play sound when messages arrive"
-msgstr "收到消息时播放声音"
+msgstr "收到消息时播放声音(_P)"
+
+#: ../src/empathy-status-icon.glade.h:1
+msgid "Status"
+msgstr "状态"
+
+#: ../src/empathy-status-icon.glade.h:3
+msgid "_Quit"
+msgstr "退出(_Q)"
+
+#: ../src/empathy-status-icon.glade.h:4
+msgid "_Show Contact List"
+msgstr "显示联系人列表(_S)"
+
+#~ msgid "Instant Messenger"
+#~ msgstr "即时通讯程序"
 
-#: ../libempathy-gtk/gossip-preferences.glade.h:27
 #, fuzzy
-msgid "_Use for chat rooms"
-msgstr "Gossip - 编辑聊天组"
+#~ msgid "Contact List - Empathy"
+#~ msgstr "隐藏联系人清单(_H)"
+
+#~ msgid "_New Message..."
+#~ msgstr "新建消息(_C)..."
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:702
 #, fuzzy
-msgid "Custom message..."
-msgstr "请求消息"
+#~ msgid "Disable"
+#~ msgstr "在线"
 
-#. Clear list
-#: ../libempathy-gtk/gossip-presence-chooser.c:724
 #, fuzzy
-msgid "Clear List..."
-msgstr "清除(_L)"
+#~ msgid "<b>No Accounts Configured</b>"
+#~ msgstr "<b>帐户设置</b>"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:803
 #, fuzzy
-msgid "Are you sure you want to clear the list?"
-msgstr "您要接受请求吗？"
+#~ msgid "<b>Account</b>"
+#~ msgstr "<b>收藏夹：</b>"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:807
-msgid ""
-"This will remove any custom messages you have added to the list of preset "
-"status messages."
-msgstr ""
+#~ msgid "Jabber"
+#~ msgstr "Jabber"
 
-#: ../libempathy-gtk/gossip-presence-chooser.c:812
 #, fuzzy
-msgid "Clear List"
-msgstr "清除(_L)"
+#~ msgid ""
+#~ "<small><b><span foreground=\"#555\">Example: user@jabber.org</span></b></"
+#~ "small>"
+#~ msgstr "<span size=\"smaller\">例如：user@jabber.org</span>"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:1
-msgid "Enter status message:"
-msgstr "输入状态消息："
+#, fuzzy
+#~ msgid "jabber account settings"
+#~ msgstr "<b>帐户设置</b>"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:2
 #, fuzzy
-msgid "Status Message Presets"
-msgstr "状态消息"
+#~ msgid "Contact Infor_mation"
+#~ msgstr "联系人信息(_I)"
 
-#: ../libempathy-gtk/gossip-presence-chooser.glade.h:3
 #, fuzzy
-msgid "_Add to status message list"
-msgstr "预设状态消息"
+#~ msgid "Cu_t"
+#~ msgstr "聊天"
 
-#: ../libempathy-gtk/gossip-private-chat.c:198
-#, c-format
-msgid "%s went offline"
-msgstr "%s 离线了"
+#, fuzzy
+#~ msgid "In_vite..."
+#~ msgstr "注册(_G)..."
 
-#: ../libempathy-gtk/gossip-private-chat.c:212
-#, fuzzy, c-format
-msgid "%s has come online"
-msgstr "%s 上线了"
+#, fuzzy
+#~ msgid "_Add To Favorites"
+#~ msgstr "编辑收藏夹(_E)..."
 
-#: ../libempathy-gtk/gossip-theme-manager.c:87
-msgid "Classic"
-msgstr ""
+#, fuzzy
+#~ msgid "_Show Contacts"
+#~ msgstr "显示联系人清单(_S)"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:88
-msgid "Simple"
-msgstr ""
+#, fuzzy
+#~ msgid "Chat Room"
+#~ msgstr "Gossip - 聊天"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:89
 #, fuzzy
-msgid "Clean"
-msgstr "清除(_L)"
+#~ msgid "View contact information"
+#~ msgstr "联系人信息"
 
-#: ../libempathy-gtk/gossip-theme-manager.c:90
-msgid "Blue"
-msgstr ""
+#, fuzzy
+#~ msgid "Re_name"
+#~ msgstr "/更改组名(_N)"
 
-#: ../src/empathy-main.c:145
-msgid "Don't connect on startup"
-msgstr "启动时不自动登录"
+#, fuzzy
+#~ msgid "Edit the groups and name for this contact"
+#~ msgstr "请输入联系人 %s 的新昵称"
 
-#: ../src/empathy-main.c:155
 #, fuzzy
-msgid "- Empathy Instant Messenger"
-msgstr "即时通讯程序"
+#~ msgid "View previous conversations with this contact"
+#~ msgstr "对话(_C)"
 
 #, fuzzy
-#~ msgid "Gossip Instant Messenger"
-#~ msgstr "即时通讯程序"
+#~ msgid "<b>Options</b>"
+#~ msgstr "连接"
 
 #, fuzzy
-#~ msgid "Joining"
-#~ msgstr "加入(_J)"
+#~ msgid "_Use for chat rooms"
+#~ msgstr "Gossip - 编辑聊天组"
 
 #, fuzzy
-#~ msgid "Unknown"
-#~ msgstr "未知的错误"
+#~ msgid "Clear List..."
+#~ msgstr "清除(_L)"
+
+#, fuzzy
+#~ msgid "Are you sure you want to clear the list?"
+#~ msgstr "您要接受请求吗？"
+
+#, fuzzy
+#~ msgid "Clear List"
+#~ msgstr "清除(_L)"
+
+#~ msgid "Enter status message:"
+#~ msgstr "输入状态消息："
+
+#, fuzzy
+#~ msgid "Status Message Presets"
+#~ msgstr "状态消息"
+
+#, fuzzy
+#~ msgid "_Add to status message list"
+#~ msgstr "预设状态消息"
+
+#~ msgid "%s went offline"
+#~ msgstr "%s 离线了"
+
+#, fuzzy
+#~ msgid "%s has come online"
+#~ msgstr "%s 上线了"
+
+#, fuzzy
+#~ msgid "Gossip Instant Messenger"
+#~ msgstr "即时通讯程序"
 
 #, fuzzy
 #~ msgid "No affiliation"
@@ -978,10 +1980,6 @@ msgstr "即时通讯程序"
 #~ msgid "Connection timed out."
 #~ msgstr "已连接"
 
-#, fuzzy
-#~ msgid "new account"
-#~ msgstr "Jabber 帐户"
-
 #~ msgid "Home"
 #~ msgstr "首页"
 
@@ -1022,15 +2020,6 @@ msgstr "即时通讯程序"
 #~ msgid "Information requested, please wait..."
 #~ msgstr "<b>已请求信息，请稍等...</b>"
 
-#~ msgid "I would like to add you to my contact list."
-#~ msgstr "我希望可以将您加入我的联系人清单内。"
-
-#, fuzzy
-#~ msgid "%d new message"
-#~ msgid_plural "%d new messages"
-#~ msgstr[0] "新建消息(_C)..."
-#~ msgstr[1] "新建消息(_C)..."
-
 #, fuzzy
 #~ msgid "%d subscription request"
 #~ msgid_plural "%d subscription requests"
@@ -1041,44 +2030,16 @@ msgstr "即时通讯程序"
 #~ msgid "Edit Account _Details"
 #~ msgstr "修改帐户信息"
 
-#~ msgid "New message from %s"
-#~ msgstr "收到来自 %s 的消息"
-
 #, fuzzy
 #~ msgid "Accept"
 #~ msgstr "接受(_A)"
 
 #, fuzzy
-#~ msgid "Name"
-#~ msgstr "名字："
-
-#, fuzzy
-#~ msgid "Room"
-#~ msgstr "房间(_R)："
-
-#, fuzzy
-#~ msgid "Auto Connect"
-#~ msgstr "连接"
-
-#, fuzzy
-#~ msgid "Information requested..."
-#~ msgstr "<b>已请求信息，请稍等...</b>"
-
-#, fuzzy
-#~ msgid "Do you want to remove this contact from your roster?"
-#~ msgstr ""
-#~ "您是否想从联系人清单中删除\n"
-#~ "%s？"
-
-#, fuzzy
 #~ msgid ""
 #~ "Please enter a new name for the group:\n"
 #~ "%s"
 #~ msgstr "请为组 %s 输入新名称"
 
-#~ msgid "Select"
-#~ msgstr "选择"
-
 #~ msgid "Unsorted"
 #~ msgstr "未排序"
 
@@ -1111,23 +2072,12 @@ msgstr "即时通讯程序"
 #~ msgstr "您想使用什么昵称来代表这个联系人？"
 
 #, fuzzy
-#~ msgid "Topic: %s"
-#~ msgstr "话题(_T)："
-
-#, fuzzy
-#~ msgid "Account"
-#~ msgstr "Jabber 帐户"
-
-#, fuzzy
 #~ msgid "Conversation With"
 #~ msgstr "对话(_C)"
 
 #~ msgid "List the available accounts"
 #~ msgstr "列出可使用的帐户"
 
-#~ msgid "Which account to connect to on startup"
-#~ msgstr "启动时连接到哪个帐户"
-
 #~ msgid "ACCOUNT-NAME"
 #~ msgstr "帐户名称"
 
@@ -1141,18 +2091,6 @@ msgstr "即时通讯程序"
 #~ msgstr "没有名为“%s”的帐户。"
 
 #, fuzzy
-#~ msgid "Join"
-#~ msgstr "加入(_J)"
-
-#, fuzzy
-#~ msgid "Create"
-#~ msgstr "聊天"
-
-#, fuzzy
-#~ msgid "Chat Rooms"
-#~ msgstr "Gossip - 聊天"
-
-#, fuzzy
 #~ msgid "Browsing for conference rooms, please wait..."
 #~ msgstr "<b>已请求信息，请稍等...</b>"
 
@@ -1173,14 +2111,6 @@ msgstr "即时通讯程序"
 #~ msgstr "%s 将会被加入至您的联系人清单。"
 
 #, fuzzy
-#~ msgid "Subscription request"
-#~ msgstr "订阅请求"
-
-#, fuzzy
-#~ msgid "Contact Information"
-#~ msgstr "联系人信息(_I)"
-
-#, fuzzy
 #~ msgid "New subscription request from %s"
 #~ msgstr "订阅请求"
 
@@ -1223,9 +2153,6 @@ msgstr "即时通讯程序"
 #~ msgid "File size:"
 #~ msgstr "网站："
 
-#~ msgid "Web site:"
-#~ msgstr "网站："
-
 #~ msgid "_Accept"
 #~ msgstr "接受(_A)"
 
@@ -1233,60 +2160,10 @@ msgstr "即时通讯程序"
 #~ msgstr "拒绝(_D)"
 
 #, fuzzy
-#~ msgid "<b>Topic:</b>"
-#~ msgstr "<b>收藏夹：</b>"
-
-#, fuzzy
-#~ msgid "Account:"
-#~ msgstr "Jabber 帐户"
-
-#, fuzzy
-#~ msgid "Edit Favorite Room"
-#~ msgstr "Gossip - 编辑聊天组"
-
-#, fuzzy
-#~ msgid "Group Chat"
-#~ msgstr "Gossip - 聊天"
-
-#, fuzzy
-#~ msgid "Join New"
-#~ msgstr "加入(_J)"
-
-#, fuzzy
-#~ msgid "Join room on start_up"
-#~ msgstr "启动时不自动登录"
-
-#, fuzzy
-#~ msgid "N_ame:"
-#~ msgstr "名字："
-
-#, fuzzy
-#~ msgid "S_erver:"
-#~ msgstr "服务器："
-
-#~ msgid "_Nickname:"
-#~ msgstr "昵称(_N)："
-
-#~ msgid "_Room:"
-#~ msgstr "房间(_R)："
-
-#, fuzzy
 #~ msgid "<b>About</b>"
 #~ msgstr "<b>收藏夹：</b>"
 
 #, fuzzy
-#~ msgid "<b>Client Information</b>"
-#~ msgstr "客户信息"
-
-#, fuzzy
-#~ msgid "<b>Groups</b>"
-#~ msgstr "<b>收藏夹：</b>"
-
-#, fuzzy
-#~ msgid "<b>Name</b>"
-#~ msgstr "状态"
-
-#, fuzzy
 #~ msgid "<b>Personal Details</b>"
 #~ msgstr "个人信息"
 
@@ -1307,17 +2184,6 @@ msgstr "即时通讯程序"
 #~ msgstr "添加联系人(_A)..."
 
 #, fuzzy
-#~ msgid "Ch_at"
-#~ msgstr "聊天"
-
-#~ msgid "Client:"
-#~ msgstr "客户："
-
-#, fuzzy
-#~ msgid "Con_tact:"
-#~ msgstr "添加联系人(_A)..."
-
-#, fuzzy
 #~ msgid "Connect on S_tartup"
 #~ msgstr "启动时不自动登录"
 
@@ -1328,9 +2194,6 @@ msgstr "即时通讯程序"
 #~ msgid "Country:"
 #~ msgstr "国籍："
 
-#~ msgid "Decide _Later"
-#~ msgstr "以后再决定(_L)"
-
 #, fuzzy
 #~ msgid "Edit Contact"
 #~ msgstr "添加联系人(_A)..."
@@ -1338,9 +2201,6 @@ msgstr "即时通讯程序"
 #~ msgid "Edit Groups"
 #~ msgstr "编辑组"
 
-#~ msgid "Email:"
-#~ msgstr "电子邮件："
-
 #, fuzzy
 #~ msgid "ID:"
 #~ msgstr "JID"
@@ -1348,9 +2208,6 @@ msgstr "即时通讯程序"
 #~ msgid "Name:"
 #~ msgstr "名字："
 
-#~ msgid "OS:"
-#~ msgstr "操作系统："
-
 #, fuzzy
 #~ msgid "Personal Details"
 #~ msgstr "个人信息(_P)"
@@ -1360,18 +2217,6 @@ msgstr "即时通讯程序"
 #~ msgstr "注册(_G)..."
 
 #, fuzzy
-#~ msgid "Search"
-#~ msgstr "搜索(_S)..."
-
-#, fuzzy
-#~ msgid "Spell Checker"
-#~ msgstr "Gossip - 发送消息"
-
-#, fuzzy
-#~ msgid "Subscription Request"
-#~ msgstr "订阅请求"
-
-#, fuzzy
 #~ msgid "This is the name that will be used on your roster for this contact"
 #~ msgstr "您想使用什么昵称来代表这个联系人？"
 
@@ -1385,17 +2230,6 @@ msgstr "即时通讯程序"
 #~ "details"
 #~ msgstr "此名称将在聊天窗口中标识您。"
 
-#~ msgid "Version:"
-#~ msgstr "版本："
-
-#, fuzzy
-#~ msgid "View Previous Conversations"
-#~ msgstr "对话(_C)"
-
-#, fuzzy
-#~ msgid "Which account do you want to use?"
-#~ msgstr "您想使用什么用户名？"
-
 #, fuzzy
 #~ msgid "_Connect"
 #~ msgstr "连接"
@@ -1408,23 +2242,11 @@ msgstr "即时通讯程序"
 #~ msgstr "断开连接(_D)"
 
 #, fuzzy
-#~ msgid "_Email:"
-#~ msgstr "电子邮件："
-
-#, fuzzy
 #~ msgid ""
 #~ "_Enter the name or contact ID of the person you want to chat to below:"
 #~ msgstr "输入您想与他聊天的人的用户 ID"
 
 #, fuzzy
-#~ msgid "_For:"
-#~ msgstr "端口(_O)："
-
-#, fuzzy
-#~ msgid "_Full Name:"
-#~ msgstr "名字："
-
-#, fuzzy
 #~ msgid "_Group:"
 #~ msgstr "组"
 
@@ -1437,10 +2259,6 @@ msgstr "即时通讯程序"
 #~ msgstr "密码(_P)："
 
 #, fuzzy
-#~ msgid "_Quit Message:"
-#~ msgstr "状态消息(_S)"
-
-#, fuzzy
 #~ msgid "_Retrieve"
 #~ msgstr "删除(_R)"
 
@@ -1459,16 +2277,9 @@ msgstr "即时通讯程序"
 #~ msgid "msn account settings"
 #~ msgstr "<b>帐户设置</b>"
 
-#~ msgid "Preset status messages"
-#~ msgstr "预设状态消息"
-
 #~ msgid "Preset status messages."
 #~ msgstr "预设状态消息。"
 
-#, fuzzy
-#~ msgid "Connecting"
-#~ msgstr "连接"
-
 #~ msgid "%s will be added to your contact list."
 #~ msgstr "%s 将会被加入至您的联系人清单。"
 
@@ -1551,10 +2362,6 @@ msgstr "即时通讯程序"
 #~ msgstr "个人信息"
 
 #, fuzzy
-#~ msgid "Do you already have an account set up on a server?"
-#~ msgstr "您是否已经在 Jabber 服务器中有帐户了？"
-
-#, fuzzy
 #~ msgid "Enter the port used in the connection for this account"
 #~ msgstr "请输入联系人 %s 的新昵称"
 
@@ -1594,16 +2401,6 @@ msgstr "即时通讯程序"
 #~ msgid "In which group do you want to place this contact?"
 #~ msgstr "您想将这个联系人加入哪个组之内？"
 
-#~ msgid "Jabber ID:"
-#~ msgstr "Jabber ID:"
-
-#~ msgid "Nickname:"
-#~ msgstr "昵称："
-
-#, fuzzy
-#~ msgid "Port:"
-#~ msgstr "端口(_O)："
-
 #, fuzzy
 #~ msgid "Registering Account"
 #~ msgstr "正在注册帐户"
@@ -1615,9 +2412,6 @@ msgstr "即时通讯程序"
 #~ msgid "Sending request"
 #~ msgstr "发送请求"
 
-#~ msgid "Server:"
-#~ msgstr "服务器："
-
 #, fuzzy
 #~ msgid "Web Site:"
 #~ msgstr "网站："
@@ -1714,10 +2508,6 @@ msgstr "即时通讯程序"
 #~ msgstr "帐户信息(_A)"
 
 #, fuzzy
-#~ msgid "Send Message"
-#~ msgstr "状态消息"
-
-#, fuzzy
 #~ msgid "%s has gone offline"
 #~ msgstr "%s 离线了"
 
@@ -1768,9 +2558,6 @@ msgstr "即时通讯程序"
 #~ msgid "Written by:"
 #~ msgstr "作者："
 
-#~ msgid "Artwork by:"
-#~ msgstr "美工："
-
 #~ msgid "Translated by:"
 #~ msgstr "翻译："
 
@@ -1784,10 +2571,6 @@ msgstr "即时通讯程序"
 #~ msgid "/Show _Log"
 #~ msgstr "/显示日志(_L)"
 
-#, fuzzy
-#~ msgid "Persian"
-#~ msgstr "版本："
-
 #~ msgid "View Lo_g"
 #~ msgstr "查看日志(_G)"
 
@@ -1868,9 +2651,6 @@ msgstr "即时通讯程序"
 #~ msgid "Gossip will now try to register the account:"
 #~ msgstr "Gossip 现在会尝试注册帐户："
 
-#~ msgid "*"
-#~ msgstr "*"
-
 #~ msgid "From:"
 #~ msgstr "来自："
 
@@ -1886,9 +2666,6 @@ msgstr "即时通讯程序"
 #~ msgid "_Reply..."
 #~ msgstr "回复(_R)..."
 
-#~ msgid "_Send"
-#~ msgstr "发送(_S)"
-
 #~ msgid "C_onnect"
 #~ msgstr "连接(_O)"