Updated Simplified Chinese translation.

diff --git a/po/zh_CN.po b/po/zh_CN.po
index fce50d7a5baa06304d52d7932222e810bec95470..2cedfd1c85d814d4a6753b343b61d96850a10041 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,23 +1,28 @@
 # Simplified Chinese translation of Empathy.
 # Convert to Simp. Chinese translation of Empathy.
 # Copyright (C) 2003-2009 Free Software Foundation, Inc.
+# This file is distributed under the same license as the Empathy package.
+#
 # Abel Cheung <maddog@linux.org.hk>, 2003.
 # Mai Haohui <maihaohui@hotmail.com>, 2003.
 # Rongjun Mu <elanmu@sina.com>, 2003.
 # YangZhang <zyangmath@gmail.com>, 2008.
 # Funda Wang <fundawang@gmail.com>, 2009.
+# Aron Xu <aronxu@gnome.org>, 2009.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gossip\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=empathy&component=general\n"
-"POT-Creation-Date: 2009-04-03 14:58+0000\n"
-"PO-Revision-Date: 2009-01-08 08:49+0800\n"
-"Last-Translator: Mai Haohui <maihaohui@hotmail.com>\n"
-"Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
+"POT-Creation-Date: 2009-07-25 07:51+0000\n"
+"PO-Revision-Date: 2009-07-25 21:28+0000\n"
+"Last-Translator: Aron Xu <aronxu@gnome.org>\n"
+"Language-Team: Simplified Chinese <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"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
 msgid "Empathy Instant Messenger"
@@ -25,7 +30,7 @@ msgstr "Empathy 即时通讯程序"
 
 #: ../data/empathy.desktop.in.in.h:2
 msgid "Send and receive instant messages"
-msgstr "发送和接收即时消息"
+msgstr "发送接收即时消息"
 
 #: ../data/empathy.schemas.in.h:1
 msgid "Always open a separate chat window for new chats."
@@ -67,258 +72,329 @@ msgid "Disable sounds when away"
 msgstr "离开时禁用声音"
 
 #: ../data/empathy.schemas.in.h:10
+msgid "Empathy can publish the user's location"
+msgstr "Empathy 能够发布用户的位置"
+
+#: ../data/empathy.schemas.in.h:11
+msgid "Empathy can use the GPS to guess the location"
+msgstr "Empathy 能够通过 GPS 来估算位置"
+
+#: ../data/empathy.schemas.in.h:12
+msgid "Empathy can use the cellular network to guess the location"
+msgstr "Empathy 能够通过手机来估算位置"
+
+#: ../data/empathy.schemas.in.h:13
+msgid "Empathy can use the network to guess the location"
+msgstr "Empathy 能够通过网络来估算位置"
+
+#: ../data/empathy.schemas.in.h:14
 msgid "Empathy default download folder"
 msgstr "Empathy 默认下载文件夹"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/empathy.schemas.in.h:15
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy 已经询问导入账户"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/empathy.schemas.in.h:16
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 启动时是否自动连接"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/empathy.schemas.in.h:17
+msgid "Empathy should reduce the location's accuracy"
+msgstr "降低 Emapthy 位置信息的准确度"
+
+#: ../data/empathy.schemas.in.h:18
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 是否使用联系人头像作为聊天窗口图标"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/empathy.schemas.in.h:19
+msgid "Enable WebKit Developer Tools"
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:20
 msgid "Enable popup notifications for new messages"
 msgstr "启用弹出提示"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/empathy.schemas.in.h:21
 msgid "Enable spell checker"
 msgstr "启用拼写检查器"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/empathy.schemas.in.h:22
 msgid "Hide main window"
 msgstr "隐藏主窗口"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/empathy.schemas.in.h:23
 msgid "Hide the main window."
 msgstr "隐藏主窗口。"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:24
 msgid "NetworkManager should be used"
 msgstr "是否使用 NetworkManager"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:25
 msgid "Nick completed character"
 msgstr "昵称补全字符"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:26
 msgid "Open new chats in separate windows"
 msgstr "在单独窗口中打开新聊天"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:27
+msgid "Path of the adium theme to use"
+msgstr "Adium 主题的路径"
+
+#: ../data/empathy.schemas.in.h:28
+msgid "Path of the adium theme to use if the theme used for chat is adium."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:29
 msgid "Play a sound for incoming messages"
 msgstr "收到消息时播放声音"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:30
 msgid "Play a sound for new conversations"
 msgstr "新对话时播放声音"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for outgoing messages"
 msgstr "发出消息时播放声音"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:32
 msgid "Play a sound when a contact logs in"
 msgstr "联系人登录时播放声音"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound when a contact logs out"
 msgstr "联系人注销时播放声音"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound when we log in"
 msgstr "登录时播放声音"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound when we log out"
 msgstr "注销时播放声音"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:36
 msgid "Popup notifications if the chat isn't focused"
-msgstr ""
+msgstr "如果聊天窗口不是焦点则弹出消息通知"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:37
+msgid "Popup notifications when a contact sign in"
+msgstr "当联系人登录时弹出通知"
+
+#: ../data/empathy.schemas.in.h:38
+msgid "Popup notifications when a contact sign out"
+msgstr "当联系人注销时弹出通知"
+
+#: ../data/empathy.schemas.in.h:39
 msgid "Salut account is created"
-msgstr "创建 Salut 账户"
+msgstr "å·²å\88\9b建 Salut è´¦æ\88·"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:40
 msgid "Show avatars"
 msgstr "显示头像"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:41
+msgid "Show contact list in rooms"
+msgstr "在聊天室显示联系人列表"
+
+#: ../data/empathy.schemas.in.h:42
 msgid "Show hint about closing the main window"
 msgstr "关闭主窗口时显示提示"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:43
 msgid "Show offline contacts"
 msgstr "显示离线联系人"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:44
 msgid "Spell checking languages"
 msgstr "拼写检查器语言"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:45
 msgid "The default folder to save file transfers in."
 msgstr "保存传送文件的默认文件夹。"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:46
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次选取头像图片的目录。"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:47
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用于在聊天窗口中显示会话的主题。"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:48
 msgid "Use graphical smileys"
 msgstr "使用表情图标"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:49
 msgid "Use notification sounds"
 msgstr "使用通知声音"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:50
 msgid "Use theme for chat rooms"
 msgstr "为聊天室使用主题"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:51
+msgid ""
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr ""
+
+#: ../data/empathy.schemas.in.h:52
+msgid "Whether or not Empathy can publish the user's location to his contacts."
+msgstr "是否允许 Empathy 将用户的位置共享给联系人"
+
+#: ../data/empathy.schemas.in.h:53
+msgid "Whether or not Empathy can use the GPS to guess the location."
+msgstr "是否允许 Empathy 通过 GPS 估算位置"
+
+#: ../data/empathy.schemas.in.h:54
+msgid ""
+"Whether or not Empathy can use the cellular network to guess the location."
+msgstr "是否允许 Empathy 通过手机估算位置"
+
+#: ../data/empathy.schemas.in.h:55
+msgid "Whether or not Empathy can use the network to guess the location."
+msgstr "是否允许 Empathy 通过网络估算位置"
+
+#: ../data/empathy.schemas.in.h:56
 msgid ""
 "Whether or not Empathy has asked about importing accounts from other "
 "programs."
 msgstr "Empathy 是否应该已经询问过要从其它程序中导入账户。"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:57
 msgid ""
 "Whether or not Empathy should automatically log in to your accounts on "
 "startup."
 msgstr "Empathy 是否在启动时自动登入您的账户。"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:58
+msgid ""
+"Whether or not Empathy should reduce the location's accuracy for privacy "
+"reasons."
+msgstr "是否出于隐私原因降低 Empathy 位置信息的准确度。"
+
+#: ../data/empathy.schemas.in.h:59
 msgid ""
 "Whether or not Empathy should use the avatar of the contact as the chat "
 "window icon."
 msgstr "是否使用联系人的头像作为聊天窗口的图标。"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:60
 msgid ""
 "Whether or not the Salut account has been created on the first Empathy run."
 msgstr "是否在 Empathy 第一次运行时创建 Salut 账户。"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:61
 msgid ""
 "Whether or not the network manager should be used to automatically "
 "disconnect/reconnect."
 msgstr "是否使用 NetworkManager(网络管理器) 自动断开连接/重新连接。"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:62
 msgid ""
 "Whether or not to check words typed against the languages you want to check "
 "with."
 msgstr "是否对您想要作拼写检查的单词作拼写检查。"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether or not to convert smileys into graphical images in conversations."
 msgstr "对话时是否将表情符号转换为真正的图标。"
 
-#: ../data/empathy.schemas.in.h:47
-#, fuzzy
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
-msgstr "是否在联系人列表和聊天窗口中显示头像。"
+msgstr "是否需要联系人上线提示音。"
 
-#: ../data/empathy.schemas.in.h:48
-#, fuzzy
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
-msgstr "是否在联系人列表和聊天窗口中显示头像。"
+msgstr "是否需要联系人下线提示音。"
 
-#: ../data/empathy.schemas.in.h:49
-#, fuzzy
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
-msgstr "忙碌时是否播放声音。"
+msgstr "是否需要事件提示音。"
 
-#: ../data/empathy.schemas.in.h:50
-#, fuzzy
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "æ\94¶å\88°æ¶\88æ\81¯æ\97¶æ\98¯å\90¦æ\92­æ\94¾å£°音。"
+msgstr "æ\98¯å\90¦é\9c\80è¦\81æ¶\88æ\81¯å\88°è¾¾æ\8f\90示音。"
 
-#: ../data/empathy.schemas.in.h:51
-#, fuzzy
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "æ\94¶å\88°æ¶\88æ\81¯æ\97¶æ\98¯å\90¦æ\92­æ\94¾å£°音。"
+msgstr "æ\98¯å\90¦é\9c\80è¦\81æ\96°ä¼\9aè¯\9dæ\8f\90示音。"
 
-#: ../data/empathy.schemas.in.h:52
-#, fuzzy
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "æ\94¶å\88°æ¶\88æ\81¯æ\97¶æ\98¯å\90¦æ\92­æ\94¾å£°é\9f³。"
+msgstr "æ\98¯å\90¦ä¸ºå¤\96å\87ºæ¶\88æ\81¯ä½¿ç\94¨è¯­é\9f³æ\8f\90示。"
 
-#: ../data/empathy.schemas.in.h:53
-#, fuzzy
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
-msgstr "离开时是否播放声音。"
+msgstr "当联网登录时是否播放提示音。"
 
-#: ../data/empathy.schemas.in.h:54
-#, fuzzy
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
-msgstr "离开时是否播放声音。"
+msgstr "当网络断开时是否播放提示音。"
 
-#: ../data/empathy.schemas.in.h:55
-#, fuzzy
-#| msgid "Whether or not to play a sound notifications when away or busy."
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
-msgstr "离开或忙碌时是否播放声音通知。"
+msgstr "当离开或忙碌时是否使用语音通知。"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:73
+msgid ""
+"Whether or not to show a popup notification when a contact goes offline."
+msgstr "当联系人离线时是否显示弹出通知。"
+
+#: ../data/empathy.schemas.in.h:74
+msgid "Whether or not to show a popup notification when a contact goes online."
+msgstr "当联系人上线时是否显示弹出通知"
+
+#: ../data/empathy.schemas.in.h:75
 msgid ""
 "Whether or not to show a popup notification when receiving a new message "
 "even if the chat is already opened, but not focused."
 msgstr ""
 
-#: ../data/empathy.schemas.in.h:57
-#, fuzzy
-#| msgid "Whether or not to play a sound notifications when away or busy."
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
-msgstr "离开或忙碌时是否播放声音通知。"
+msgstr "当收到新消息时是否弹出显示提示框。"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:77
 msgid ""
 "Whether or not to show avatars for contacts in the contact list and chat "
 "windows."
 msgstr "是否在联系人列表和聊天窗口中显示头像。"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether or not to show contacts that are offline in the contact list."
 msgstr "是否显示联系人清单中离线的联系人。"
 
-#: ../data/empathy.schemas.in.h:60
-#, fuzzy
-#| msgid "Whether or not to play a sound notifications when away or busy."
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
-msgstr "离开或忙碌时是否播放声音通知。"
+msgstr "当离开活忙碌时是否弹出显示提示框。"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:80
+msgid "Whether or not to show the contact list in chat rooms."
+msgstr "是否在聊天室显示联系人列表。"
+
+#: ../data/empathy.schemas.in.h:81
 msgid ""
 "Whether or not to show the message dialog about closing the main window with "
 "the 'x' button in the title bar."
 msgstr "是否对使用标题栏中的“X”按钮关闭主窗口显示消息对话框。"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:82
 msgid "Whether to show the contact list in compact mode or not."
 msgstr "是否以紧凑格式显示联系人列表。"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to use the theme for chat rooms or not."
 msgstr "是否对聊天室使用主题。"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:84
 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 "
@@ -327,732 +403,964 @@ msgstr ""
 "使用何种准则来排序联系人列表。默认情况下使用值“name”以按联系人姓名\n"
 "排序。取值为“state”时将按状态排序联系人列表。"
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:271
+#: ../libempathy/empathy-ft-handler.c:838
+msgid "The hash of the received file and the sent one do not match"
+msgstr "接收到的文件和发送的那个文件哈希值不匹配"
+
+#: ../libempathy/empathy-ft-handler.c:1098
+msgid "File transfer not supported by remote contact"
+msgstr "文件传输不支持远程连接"
+
+#: ../libempathy/empathy-ft-handler.c:1156
+msgid "The selected file is not a regular file"
+msgstr "所选文件是非正常的文件"
+
+#: ../libempathy/empathy-ft-handler.c:1165
+msgid "The selected file is empty"
+msgstr "所选文件是空的"
+
+#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
 msgid "People nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:252
+#: ../libempathy/empathy-tp-file.c:279
+msgid "Socket type not supported"
+msgstr "不支持Socket类型"
+
+#: ../libempathy/empathy-tp-file.c:398
+msgid "No reason was specified"
+msgstr "未指定原因"
+
+#: ../libempathy/empathy-tp-file.c:401
+msgid "The change in state was requested"
+msgstr "需要状态改变信息"
+
+#: ../libempathy/empathy-tp-file.c:404
+msgid "You canceled the file transfer"
+msgstr "您取消了文件传输"
+
+#: ../libempathy/empathy-tp-file.c:407
+msgid "The other participant canceled the file transfer"
+msgstr "另外的参与者取消了文件的传输"
+
+#: ../libempathy/empathy-tp-file.c:410
+msgid "Error while trying to transfer the file"
+msgstr "当传输这个文件的时候发生错误"
+
+#: ../libempathy/empathy-tp-file.c:413
+msgid "The other participant is unable to transfer the file"
+msgstr "另外的参与者无法传输这个文件"
+
+#: ../libempathy/empathy-tp-file.c:416
+msgid "Unknown reason"
+msgstr "未知原因"
+
+#: ../libempathy/empathy-utils.c:265
 msgid "Available"
 msgstr "在线"
 
-#: ../libempathy/empathy-utils.c:254
+#: ../libempathy/empathy-utils.c:267
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:257
+#: ../libempathy/empathy-utils.c:270
 msgid "Away"
 msgstr "离开"
 
-#: ../libempathy/empathy-utils.c:259
+#: ../libempathy/empathy-utils.c:272
 msgid "Hidden"
 msgstr "隐身"
 
-#: ../libempathy/empathy-utils.c:262
+#: ../libempathy/empathy-utils.c:274
 msgid "Offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:326
+#: ../libempathy/empathy-time.c:137
+#, c-format
+msgid "%d second ago"
+msgid_plural "%d seconds ago"
+msgstr[0] "%d 秒钟前"
+
+#: ../libempathy/empathy-time.c:142
+#, c-format
+msgid "%d minute ago"
+msgid_plural "%d minutes ago"
+msgstr[0] "%d 分钟前"
+
+#: ../libempathy/empathy-time.c:147
+#, c-format
+msgid "%d hour ago"
+msgid_plural "%d hours ago"
+msgstr[0] "%d 小时前"
+
+#: ../libempathy/empathy-time.c:152
+#, c-format
+msgid "%d day ago"
+msgid_plural "%d days ago"
+msgstr[0] "%d 天前"
+
+#: ../libempathy/empathy-time.c:157
+#, c-format
+msgid "%d week ago"
+msgid_plural "%d weeks ago"
+msgstr[0] "%d 星期前"
+
+#: ../libempathy/empathy-time.c:162
+#, c-format
+msgid "%d month ago"
+msgid_plural "%d months ago"
+msgstr[0] "%d 月前"
+
+#: ../libempathy/empathy-time.c:167
+msgid "in the future"
+msgstr "将来"
+
+#: ../libempathy-gtk/empathy-account-chooser.c:426
 msgid "All"
 msgstr "全部"
 
 #: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:347
+#: ../libempathy-gtk/empathy-account-widget.c:354
 #, c-format
 msgid "%s:"
 msgstr "%s："
 
-#: ../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
-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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "Advanced"
+msgstr "高级"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Pass_word:"
 msgstr "密码(_W)："
 
-#: ../libempathy-gtk/empathy-account-widget-aim.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 msgid "Screen _Name:"
 msgstr "用户名(_N)："
 
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
 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
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+#: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
 msgstr "服务器(_S)："
 
-#: ../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
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 msgid "Login I_D:"
 msgstr "登录 I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
 msgid "ICQ _UIN:"
 msgstr "ICQ _UIN："
 
-#: ../libempathy-gtk/empathy-account-widget-icq.glade.h:5
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "_Charset:"
 msgstr "字符集(_C)："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:245
+#: ../libempathy-gtk/empathy-account-widget-irc.c:240
 msgid "New Network"
 msgstr "新建网络"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:1
-msgid "<b>Network</b>"
-msgstr "<b>网络</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:2
-msgid "<b>Servers</b>"
-msgstr "<b>服务器</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
 msgid "Charset:"
 msgstr "字符集："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:4
-msgid "Create a new IRC network"
-msgstr "创建新的 IRC 网络"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:5
-msgid "Edit the selected IRC network"
-msgstr "编辑选中的 IRC 网络"
-
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
 msgstr "网络"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
 msgstr "网络："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
 msgstr "昵称："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
 msgstr "密码："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
 msgstr "退出消息："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:11
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
 msgstr "全名："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.glade.h:12
-msgid "Remove the selected IRC network"
-msgstr "删除选中的 IRC 网络"
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
+msgid "Servers"
+msgstr "服务器"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:2
-msgid "<b>Override server settings</b>"
-msgstr "<b>覆盖服务器设置</b>"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+msgid "Override server settings"
+msgstr "覆盖服务器设置"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Pri_ority:"
 msgstr "优先级(_O)："
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 msgid "Reso_urce:"
 msgstr "资源(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Use old SS_L"
 msgstr "使用旧的 SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "_Encryption required (TLS/SSL)"
 msgstr "需要加密(TLS/SSL)(_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.glade.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "_Ignore SSL certificate errors"
 msgstr "忽略 SSL 证书错误(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:2
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
 msgid "_Email:"
 msgstr "电子邮件(_E)："
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:3
-#, fuzzy
-#| msgid "_First Name: "
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
-msgstr "名(_F)："
+msgstr "名(_F)"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
 msgid "_Jabber ID:"
 msgstr "_Jabber ID："
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
 msgid "_Last Name:"
 msgstr "姓(_L)："
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:6
-#: ../src/empathy-chatrooms-window.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
 msgid "_Nickname:"
 msgstr "昵称(_N)："
 
-#: ../libempathy-gtk/empathy-account-widget-salut.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
 msgid "_Published Name:"
 msgstr "公开的名字(_P)："
 
 #. 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
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
 msgid "Discover STUN"
 msgstr "搜索 STUN"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "STUN Server:"
 msgstr "STUN 服务器："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "STUN port:"
 msgstr "STUN 端口："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.glade.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "_Username:"
 msgstr "用户名(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:4
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Use _Yahoo Japan"
 msgstr "使用 _Yahoo 日本"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:5
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Yahoo I_D:"
 msgstr "Yahoo I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:7
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
 msgid "_Ignore conference and chatroom invitations"
 msgstr "忽略会议和聊天室邀请(_I)"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.glade.h:9
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
 msgid "_Room List locale:"
-msgstr "房间列表 locale(_R)："
+msgstr "聊天室列表 locale(_R)："
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:462
-#: ../libempathy-gtk/empathy-avatar-chooser.c:537
+#: ../libempathy-gtk/empathy-avatar-chooser.c:449
+#: ../libempathy-gtk/empathy-avatar-chooser.c:525
 msgid "Couldn't convert image"
 msgstr "无法转换图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:463
+#: ../libempathy-gtk/empathy-avatar-chooser.c:450
 msgid "None of the accepted image formats is supported on your system"
-msgstr ""
+msgstr "没有一个公认的图片格式能被您的系统支持"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:956
+#: ../libempathy-gtk/empathy-avatar-chooser.c:933
 msgid "Select Your Avatar Image"
 msgstr "选择您的头像图片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:959
+#: ../libempathy-gtk/empathy-avatar-chooser.c:936
 msgid "No Image"
 msgstr "无图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1021
+#: ../libempathy-gtk/empathy-avatar-chooser.c:998
 msgid "Images"
 msgstr "图像"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1025
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
 msgid "All Files"
 msgstr "所有文件"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:294
+#: ../libempathy-gtk/empathy-avatar-image.c:324
 msgid "Click to enlarge"
 msgstr "单击以放大"
 
-#. This is an unknown command, display a message to the user
-#: ../libempathy-gtk/empathy-chat.c:378
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "重新连接到对话失败"
+
+#: ../libempathy-gtk/empathy-chat.c:404
 msgid "Unsupported command"
-msgstr ""
+msgstr "不支持的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:506
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "离线"
 
-#: ../libempathy-gtk/empathy-chat.c:509
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "无效联系人"
 
-#: ../libempathy-gtk/empathy-chat.c:512
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
-msgstr "权限不够"
+msgstr "权限不足"
 
-#: ../libempathy-gtk/empathy-chat.c:515
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "消息太长"
 
-#: ../libempathy-gtk/empathy-chat.c:518
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "尚未实现"
 
-#: ../libempathy-gtk/empathy-chat.c:521
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "未知"
 
-#: ../libempathy-gtk/empathy-chat.c:525
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "发送消息“%s”出错：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:555
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "话题被设置为：%s"
 
-#: ../libempathy-gtk/empathy-chat.c:557
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "未设置话题"
 
-#: ../libempathy-gtk/empathy-chat.c:972
+#: ../libempathy-gtk/empathy-chat.c:960
+msgid "(No Suggestions)"
+msgstr "(没有建议)"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
 msgid "Insert Smiley"
 msgstr "插入表情"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:990
-#: ../libempathy-gtk/empathy-ui-utils.c:1559
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1024
-msgid "_Check Word Spelling..."
-msgstr "拼写检查(_C)..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "拼写建议(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1181
 #, c-format
-msgid "%s has joined the room"
-msgstr "%s 加入了房间"
+msgid "%s has disconnected"
+msgstr "%s 已断开连接"
+
+#: ../libempathy-gtk/empathy-chat.c:1185
+#, c-format
+msgid "%s was kicked by %s"
+msgstr "%s 被 %s 踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1188
+#, c-format
+msgid "%s was kicked"
+msgstr "%s 被踢出"
+
+#: ../libempathy-gtk/empathy-chat.c:1193
+#, c-format
+msgid "%s was banned by %s"
+msgstr "%s 被 %s 禁止"
+
+#: ../libempathy-gtk/empathy-chat.c:1196
+#, c-format
+msgid "%s was banned"
+msgstr "%s 被禁止"
+
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
-msgstr "%s 离开了房间"
+msgstr "%s 离开了聊天室"
+
+#. Note to translators: this string is appended to
+#. * notifications like "foo has left the room", with the message
+#. * given by the user living the room. If this poses a problem,
+#. * please let us know. :-)
+#.
+#: ../libempathy-gtk/empathy-chat.c:1209
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#: ../libempathy-gtk/empathy-chat.c:1232
+#, c-format
+msgid "%s has joined the room"
+msgstr "%s 加入了聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1260 ../src/empathy-call-window.c:764
+#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#: ../libempathy-gtk/empathy-chat.c:1657
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "已连接"
 
-#: ../libempathy-gtk/empathy-chat.c:1707
-#: ../libempathy-gtk/empathy-log-window.c:505
+#: ../libempathy-gtk/empathy-chat.c:1850
+#: ../libempathy-gtk/empathy-log-window.c:502
 msgid "Conversation"
 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.ui.h:1 ../src/empathy-chat-window.c:472
+msgid "Topic:"
+msgstr "话题："
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:264
 msgid "_Copy Link Address"
 msgstr "复制链接地址(_C)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:339
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:272
 msgid "_Open Link"
 msgstr "打开链接(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:432
-#, fuzzy
-#| msgid "%A %d %B %Y"
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
-msgstr "%Y年%-m月%-d日%A"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "个人信息"
+msgstr "%A %B %d %Y"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:183
+#: ../libempathy-gtk/empathy-contact-dialogs.c:179
+#: ../libempathy-gtk/empathy-contact-dialogs.c:238
 msgid "Edit Contact Information"
 msgstr "编辑联系人信息"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:186
-msgid "Contact Information"
-msgstr "联系人信息"
-
-#: ../libempathy-gtk/empathy-contact-dialogs.c:267
-msgid "I would like to add you to my contact list."
-msgstr "我希望可以将您加入我的联系人列表中。"
+#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+msgid "Personal Information"
+msgstr "个人信息"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:291
+#: ../libempathy-gtk/empathy-contact-dialogs.c:393
 msgid "New Contact"
 msgstr "新建联系人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "以后再决定(_L)"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:2
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:2
 msgid "Subscription Request"
 msgstr "订阅请求"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1255
+#: ../libempathy-gtk/empathy-contact-list-view.c:1400
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "您真的要删除群组“%s”吗？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1257
+#: ../libempathy-gtk/empathy-contact-list-view.c:1402
 msgid "Removing group"
 msgstr "删除群组"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1304
-#: ../libempathy-gtk/empathy-contact-list-view.c:1383
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1449
+#: ../libempathy-gtk/empathy-contact-list-view.c:1526
 msgid "_Remove"
 msgstr "删除(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1334
+#: ../libempathy-gtk/empathy-contact-list-view.c:1479
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "您真的想要删除联系人“%s”吗？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1336
+#: ../libempathy-gtk/empathy-contact-list-view.c:1481
 msgid "Removing contact"
 msgstr "删除联系人"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1341
-msgid "Sorry, I don't want you in my contact list anymore."
-msgstr "对不起，我不想让你以后出现在我的联系人列表中了。"
+#: ../libempathy-gtk/empathy-contact-menu.c:195
+#: ../src/empathy-main-window.ui.h:11
+msgid "_Add Contact..."
+msgstr "添加联系人(_A)..."
 
-#: ../libempathy-gtk/empathy-contact-menu.c:130
-#: ../src/empathy-main-window.glade.h:9
+#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:161
-#: ../src/empathy-call-window.glade.h:5
-msgid "_Call"
-msgstr "é\80\9aè¯\9d(_C)"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "é\9f³é¢\91å\91¼å\8f«(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "视频呼叫(_V)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:324
 msgid "_View Previous Conversations"
 msgstr "查看以前对话(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
+#: ../libempathy-gtk/empathy-contact-menu.c:346
 msgid "Send file"
 msgstr "发送文件"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:250
+#: ../libempathy-gtk/empathy-contact-menu.c:369
+msgid "Share my desktop"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-menu.c:397
 msgid "Infor_mation"
 msgstr "信息(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:277
-#: ../src/empathy-chat-window.glade.h:14 ../src/empathy-main-window.glade.h:11
+#: ../libempathy-gtk/empathy-contact-menu.c:441
+#: ../src/empathy-main-window.ui.h:16
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../libempathy-gtk/empathy-contact-menu.c:501
 msgid "Inviting to this room"
-msgstr "邀请到此房间"
+msgstr "邀请到此聊天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
+#: ../libempathy-gtk/empathy-contact-menu.c:532
 msgid "_Invite to chatroom"
 msgstr "邀请到聊天室(_I)"
 
-#: ../libempathy-gtk/empathy-contact-selector.c:111
-#, fuzzy
-#| msgid "Select contact..."
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
-msgstr "选择联系人..."
+msgstr "选择一个联系"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:361
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:417
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "无法保存头像"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:912
+#: ../libempathy-gtk/empathy-contact-widget.c:992
 msgid "Select"
 msgstr "选择"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:921
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../src/empathy-main-window.c:1023
 msgid "Group"
 msgstr "群组"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:1
-msgid "<b>Client Information</b>"
-msgstr "<b>客户端信息</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1252
+msgid "Country ISO Code:"
+msgstr "包括 ISO 编码"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1254
+msgid "Country:"
+msgstr "国家"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1256
+msgid "State:"
+msgstr "省"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "City:"
+msgstr "市"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "Area:"
+msgstr "地区"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "Postal Code:"
+msgstr "邮政编码"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Street:"
+msgstr "街"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Building:"
+msgstr "建筑物"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>联系人详情</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Floor:"
+msgstr "楼层："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>联系人</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Room:"
+msgstr "房间："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>群组</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Text:"
+msgstr "文本："
 
-#: ../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
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Description:"
+msgstr "描述："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "URI:"
+msgstr "URI："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Accuracy Level:"
+msgstr "准确程度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "Error:"
+msgstr "错误："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Vertical Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Horizontal Error (meters):"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Speed:"
+msgstr "速度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Bearing:"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Climb Speed:"
+msgstr "爬升速度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+msgid "Last Updated on:"
+msgstr "最近更新于:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Longitude:"
+msgstr "经度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Latitude:"
+msgstr "纬度："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Altitude:"
+msgstr "海拔："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1345
+msgid "<b>Location</b>"
+msgstr "<b>位置</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1358
+msgid "<b>Location</b>, "
+msgstr "<b>位置</b>，"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1408
+msgid "%B %e, %Y at %R UTC"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
 msgid "Account:"
 msgstr "账户："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
 msgstr "别名："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:4
 msgid "Birthday:"
 msgstr "生日："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
+msgid "Client Information"
+msgstr "客户端信息"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Client:"
 msgstr "客户端："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:9
-msgid "Contact information"
-msgstr "联系人信息"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../src/empathy-main-window.c:1006
+msgid "Contact"
+msgstr "联系人"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Email:"
 msgstr "电子邮件："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Fullname:"
 msgstr "全称："
 
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Groups"
+msgstr ""
+
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Identifier:"
 msgstr "用户 ID："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "Information requested..."
 msgstr "已请求信息..."
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid "OS:"
 msgstr "操作系统："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.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
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
 msgid "Version:"
 msgstr "版本："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "Web site:"
 msgstr "网站："
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
 msgid "_Add Group"
 msgstr "添加群组(_A)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:284
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
 msgid "new server"
 msgstr "新建服务器"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:513
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
 msgid "Server"
 msgstr "服务器"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:528
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
 msgid "Port"
 msgstr "端口"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:541
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:498
-#: ../src/empathy-import-dialog.c:282
+#: ../libempathy-gtk/empathy-log-window.c:495
+#: ../src/empathy-import-dialog.c:285
 msgid "Account"
 msgstr "账户"
 
-#: ../libempathy-gtk/empathy-log-window.c:515
+#: ../libempathy-gtk/empathy-log-window.c:512
 msgid "Date"
 msgstr "日期"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:1
 msgid "Conversations"
 msgstr "对话"
 
-#: ../libempathy-gtk/empathy-log-window.glade.h:3
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Previous Conversations"
 msgstr "以前的对话"
 
-#. Tab Label
-#: ../libempathy-gtk/empathy-log-window.glade.h:5
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
 msgid "Search"
 msgstr "搜索"
 
-#. Searching *for* something
-#: ../libempathy-gtk/empathy-log-window.glade.h:7
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
 msgstr "包含(_F)："
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:2
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
 msgid "C_all"
 msgstr "通话(_A)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:3
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
 msgid "C_hat"
 msgstr "聊天(_H)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:4
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
 msgid "Contact ID:"
 msgstr "联系人 ID："
 
-#: ../libempathy-gtk/empathy-new-message-dialog.glade.h:5
+#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
 msgid "New Conversation"
 msgstr "新建对话"
 
-#. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:685
-msgid "Custom messages..."
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_STATUS_TEXT
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:172
+msgid "Custom Message..."
 msgstr "自定义消息..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "自定义消息"
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "编辑自定义消息..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "消息："
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+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-manager.c:60
-msgid "Classic"
-msgstr "经典"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "简洁"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "清爽"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "è\93\9dè\89²"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "设置ç\8a¶æ\80\81"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1406
-msgid "Unable to open URI"
-msgstr "无法打开 URI"
+#: ../libempathy-gtk/empathy-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr ""
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1551
-msgid "Select a file"
-msgstr "选择文件"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "自定义消息..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1587
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "收到了即时消息"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1589
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "发送即时消息"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1591
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "收到的聊天请求"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1593
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "联系人已连接"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1595
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "联系人已断开"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1597
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "已连接到服务器"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1599
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "已从服务器断开连接"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1601
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "呼入的语音通话"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1603
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "呼出的语音通话"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1605
+#: ../libempathy-gtk/empathy-sound.c:69
 msgid "Voice call ended"
 msgstr "语音通话结束"
 
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+msgid "Enter Custom Message"
+msgstr "输入自定义消息"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+msgid "Edit Custom Messages"
+msgstr "编辑自定义消息"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:1
+msgid "Add _New Preset"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:2
+msgid "Saved Presets"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
+msgid "gtk-add"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-theme-manager.c:67
+msgid "Classic"
+msgstr "经典"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:68
+msgid "Simple"
+msgstr "简洁"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:69
+msgid "Clean"
+msgstr "清爽"
+
+#: ../libempathy-gtk/empathy-theme-manager.c:70
+msgid "Blue"
+msgstr "蓝色"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1382
+msgid "Unable to open URI"
+msgstr "无法打开 URI"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1472
+msgid "Select a file"
+msgstr "选择文件"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1530
+msgid "Select a destination"
+msgstr "选择目的地"
+
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
 msgstr "当前 Locale"
@@ -1237,7 +1545,7 @@ msgid "Megaphone"
 msgstr "话筒"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:417
+#: ../megaphone/src/megaphone-applet.c:519
 msgid "Talk!"
 msgstr "说吧！"
 
@@ -1251,15 +1559,15 @@ msgid "_Information"
 msgstr "信息(_I)"
 
 #: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.glade.h:15
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../megaphone/src/megaphone-applet.c:255
+#: ../megaphone/src/megaphone-applet.c:168
 msgid "Please configure a contact."
 msgstr "请配置一个联系人。"
 
-#: ../megaphone/src/megaphone-applet.c:348
+#: ../megaphone/src/megaphone-applet.c:258
 msgid "Select contact..."
 msgstr "选择联系人..."
 
@@ -1272,23 +1580,23 @@ msgstr "状态"
 msgid "Set your own presence"
 msgstr "设置您的状态"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "启动时不自动登录"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "启动时不显示联系人列表"
 
-#: ../src/empathy.c:438
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "显示账户对话框"
 
-#: ../src/empathy.c:450
+#: ../src/empathy.c:587
 msgid "- Empathy Instant Messenger"
 msgstr "- Empathy 即时通讯程序"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:83
 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 "
@@ -1298,7 +1606,7 @@ msgstr ""
 "Empathy 是自由软件；您可以在自由软件基金会发布的 GNU 通用公共许可证下重新发布"
 "或修改它；许可证可使用第二版或您想选择的更新的版本。"
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:87
 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 "
@@ -1308,7 +1616,7 @@ msgstr ""
 "Empathy 发布的目的是希望它对您有用，但是没有任何担保；即使是对商业应用以及其"
 "它特定目的。查阅 GNU 通用公共许可证以获取更多细节。"
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:91
 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 "
@@ -1318,33 +1626,41 @@ msgstr ""
 "给自由软件基金会写信。地址是：51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:119
 msgid "An Instant Messaging client for GNOME"
 msgstr "一个 GNOME 即时消息客户端"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:125
 msgid "translator-credits"
 msgstr ""
-"开源软件国际化简体中文组，2003\n"
-"(http://i18n.linux.net.cn)\n"
-"YangZhang, <zyangmath@gmail.com>, 2008"
 
-#: ../src/empathy-accounts-dialog.c:391
+"YangZhang, <zyangmath@gmail.com>\n"
+"Aron Xu <aronxu@gnome.org>\n"
+""
+"Launchpad Contributions:\n"
+"  =KK= https://launchpad.net/~sevkme\n"
+"  AnThOnYhO https://launchpad.net/~anthonyho\n"
+"  HeaJO_o https://launchpad.net/~zhejo\n"
+"  Mai Haohui https://launchpad.net/~maihaohui\n"
+"  Sean.Z https://launchpad.net/~onepill-gmail\n"
+"  fujianwzh https://launchpad.net/~fujianwzh\n"
+"  yuane https://launchpad.net/~yuane"
+
+#: ../src/empathy-accounts-dialog.c:392
 msgid "Enabled"
 msgstr "启用"
 
-#: ../src/empathy-accounts-dialog.c:401
-#: ../src/empathy-accounts-dialog.glade.h:4
+#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
 msgid "Accounts"
 msgstr "账户"
 
 #. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:833
+#: ../src/empathy-accounts-dialog.c:837
 #, c-format
 msgid "New %s account"
 msgstr "新建 %s 账户"
 
-#: ../src/empathy-accounts-dialog.c:943
+#: ../src/empathy-accounts-dialog.c:950
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1353,7 +1669,7 @@ msgstr ""
 "您将要删除您的 %s 账户！\n"
 "您确定要继续吗？"
 
-#: ../src/empathy-accounts-dialog.c:949
+#: ../src/empathy-accounts-dialog.c:956
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1365,331 +1681,225 @@ msgstr ""
 "\n"
 "如果将来您重新添加此账户，它们将仍然存在。"
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>新建账户</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "添加帐户"
 
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>未安装协议</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:3
-msgid "<b>Settings</b>"
-msgstr "<b>设置</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:5
+#: ../src/empathy-accounts-dialog.ui.h:3
 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.ui.h:4
+msgid "Gmail"
+msgstr "Gmail"
 
-#: ../src/empathy-accounts-dialog.glade.h:7
+#: ../src/empathy-accounts-dialog.ui.h:5
 msgid "Import Accounts..."
 msgstr "导入账户..."
 
-#: ../src/empathy-accounts-dialog.glade.h:8
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "No protocol installed"
+msgstr "尚未安装协议"
+
+#: ../src/empathy-accounts-dialog.ui.h:7
+msgid "Settings"
+msgstr "设置"
+
+#: ../src/empathy-accounts-dialog.ui.h:8
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "要添加一个新账户，您首先需要为您想要使用的每个协议安装后端。"
 
-#: ../src/empathy-accounts-dialog.glade.h:9
+#: ../src/empathy-accounts-dialog.ui.h:9
 msgid "Type:"
 msgstr "类型："
 
-#: ../src/empathy-call-window.c:346
-#, fuzzy
-#| msgid "Contact"
+#: ../src/empathy-accounts-dialog.ui.h:10
+msgid "_Add..."
+msgstr "添加(_A)..."
+
+#: ../src/empathy-accounts-dialog.ui.h:11
+msgid "_Create a new account"
+msgstr "创建新的帐户(_C)"
+
+#: ../src/empathy-accounts-dialog.ui.h:12
+msgid "_Reuse an existing account"
+msgstr "启用现有帐户(_R)"
+
+#: ../src/empathy-call-window.c:420
 msgid "Contrast"
-msgstr "联系人"
+msgstr "对比度"
 
-#: ../src/empathy-call-window.c:349
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
-msgstr ""
+msgstr "亮度"
 
-#: ../src/empathy-call-window.c:352
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
-msgstr ""
+msgstr "伽马"
 
-#: ../src/empathy-call-window.c:456
-#, fuzzy
-#| msgid "<b>Volume</b>"
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
-msgstr "<b>音量</b>"
+msgstr "音量"
 
-#: ../src/empathy-call-window.c:547
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "正在连接..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
-msgstr ""
+msgstr "侧边栏(_S)"
 
-#: ../src/empathy-call-window.c:565
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr ""
 
-#: ../src/empathy-call-window.c:571
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
-msgstr ""
+msgstr "音频输入"
 
-#: ../src/empathy-call-window.c:575
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
-msgstr ""
+msgstr "视频输入"
 
-#: ../src/empathy-call-window.c:588
-#, fuzzy
-#| msgid "Connecting"
-msgid "Connecting..."
-msgstr "正在连接"
+#: ../src/empathy-call-window.c:835
+#, c-format
+msgid "Call with %s"
+msgstr "与 %s 通话"
+
+#: ../src/empathy-call-window.c:904
+msgid "Call"
+msgstr "通话"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:844
+#: ../src/empathy-call-window.c:1335
 #, c-format
 msgid "Connected — %d:%02dm"
-msgstr ""
+msgstr "已连接 — %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
-#, fuzzy
-#| msgid "Hang Up"
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
-msgstr "挂断"
+msgstr "挂起"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "重播"
 
-#: ../src/empathy-call-window.glade.h:2
-#, fuzzy
-#| msgid "Send Video"
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
-msgstr "发送视频"
+msgstr "发送音频"
 
-#: ../src/empathy-call-window.glade.h:3
-#, fuzzy
-#| msgid "Send Video"
+#: ../src/empathy-call-window.ui.h:4
 msgid "Send video"
 msgstr "发送视频"
 
-#: ../src/empathy-call-window.glade.h:4
+#: ../src/empathy-call-window.ui.h:5
 msgid "Video preview"
-msgstr ""
+msgstr "视频预览"
 
-#: ../src/empathy-call-window.glade.h:6
+#: ../src/empathy-call-window.ui.h:6
+msgid "_Call"
+msgstr "通话(_C)"
+
+#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
 msgid "_View"
-msgstr ""
+msgstr "查看(_V)"
 
-#: ../src/empathy-chat-window.c:313
+#: ../src/empathy-chat-window.c:344
 #, c-format
 msgid "Conversations (%d)"
 msgstr "对话 (%d)"
 
-#: ../src/empathy-chat-window.c:418
-msgid "Topic:"
-msgstr "话题："
-
-#: ../src/empathy-chat-window.c:423
+#: ../src/empathy-chat-window.c:476
 msgid "Typing a message."
 msgstr "输入消息。"
 
-#: ../src/empathy-chat-window.c:892 ../src/empathy-event-manager.c:429
-#, fuzzy, c-format
-#| msgid ""
-#| "New message from %s:\n"
-#| "%s"
-msgid "New message from %s"
-msgstr ""
-"来自 %s 的新消息：\n"
-"%s"
-
-#: ../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 "插入表情(_M)"
-
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "邀请消息(_M)："
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "邀请"
-
-#: ../src/empathy-chat-window.glade.h:6
-msgid "Move Tab _Left"
-msgstr "左移标签(_L)"
-
-#: ../src/empathy-chat-window.glade.h:7
-msgid "Move Tab _Right"
-msgstr "右移标签(_R)"
-
-#: ../src/empathy-chat-window.glade.h:8
-msgid "Select who would you like to invite:"
-msgstr "选择您要邀请的人："
-
-#: ../src/empathy-chat-window.glade.h:9
-msgid "You have been invited to join a chat conference."
-msgstr "您被邀请加入一个聊天会议。"
-
-#: ../src/empathy-chat-window.glade.h:10
-msgid "_Contact"
-msgstr "联系人(_C)"
-
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
-msgid "_Contents"
-msgstr "内容(_C)"
-
-#: ../src/empathy-chat-window.glade.h:12
-msgid "_Conversation"
-msgstr "对话(_C)"
-
-#: ../src/empathy-chat-window.glade.h:13
-msgid "_Detach Tab"
-msgstr "漂移标签(_D)"
-
-#: ../src/empathy-chat-window.glade.h:15
-msgid "_Favorite Chatroom"
-msgstr "收藏聊天室(_F)"
-
-#: ../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)"
-
-#: ../src/empathy-chat-window.glade.h:18
-msgid "_Previous Tab"
-msgstr "上一标签(_P)"
-
-#: ../src/empathy-chat-window.glade.h:19
-msgid "_Tabs"
-msgstr "标签(_T)"
-
-#: ../src/empathy-chatrooms-window.c:262
+#: ../src/empathy-chatrooms-window.c:258
 msgid "Name"
 msgstr "名称"
 
-#: ../src/empathy-chatrooms-window.c:280
+#: ../src/empathy-chatrooms-window.c:276
 msgid "Room"
-msgstr "房间"
+msgstr "聊天室"
 
-#: ../src/empathy-chatrooms-window.c:289
+#: ../src/empathy-chatrooms-window.c:285
 msgid "Auto-Connect"
 msgstr "自动连接"
 
-#: ../src/empathy-chatrooms-window.glade.h:2
-msgid "Edit Favorite Room"
-msgstr "编辑房间收藏"
-
-#: ../src/empathy-chatrooms-window.glade.h:3
-msgid "Join room on start_up"
-msgstr "启动时加入房间(_U)"
-
-#: ../src/empathy-chatrooms-window.glade.h:4
-msgid "Join this chat room when Empathy starts and you are connected"
-msgstr "在 Empathy 启动并且您已经连接上时加入此聊天室"
-
-#: ../src/empathy-chatrooms-window.glade.h:5
+#: ../src/empathy-chatrooms-window.ui.h:2
 msgid "Manage Favorite Rooms"
 msgstr "管理聊天室收藏"
 
-#: ../src/empathy-chatrooms-window.glade.h:6
-msgid "N_ame:"
-msgstr "名称(_A)："
-
-#: ../src/empathy-chatrooms-window.glade.h:7
-msgid "S_erver:"
-msgstr "服务器(_E)："
-
-#: ../src/empathy-chatrooms-window.glade.h:9
-#: ../src/empathy-new-chatroom-dialog.glade.h:9
-msgid "_Room:"
-msgstr "房间(_R)："
-
-#: ../src/empathy-event-manager.c:377
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "来电"
 
-#: ../src/empathy-event-manager.c:380
+#: ../src/empathy-event-manager.c:324
 #, c-format
 msgid "%s is calling you, do you want to answer?"
 msgstr "%s 来电，您想要接听吗？"
 
-#: ../src/empathy-event-manager.c:387
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "拒绝(_R)"
 
-#: ../src/empathy-event-manager.c:393
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "接听(_A)"
 
-#: ../src/empathy-event-manager.c:516
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的来电"
 
-#: ../src/empathy-event-manager.c:564
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
-msgstr ""
+msgstr "%s 正发送邀请给您"
 
-#: ../src/empathy-event-manager.c:570
-#, fuzzy
-#| msgid ""
-#| "%s is offering you an invitation. An external application will be started "
-#| "to handle it."
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
-msgstr "%s 给您发送了一份邀请。将启动一个外部程序来处理它。"
+msgstr "将启动一个外部应用程序来处理它."
 
-#: ../src/empathy-event-manager.c:575
-#, fuzzy
-#| msgid ""
-#| "%s is offering you an invitation, but you don't have the needed external "
-#| "application to handle it."
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
-msgstr "%s 给您发送了一份邀请，但是您没有处理它所需的外部程序。"
+msgstr "您没有必需的外部应用程序来处理它."
 
-#: ../src/empathy-event-manager.c:698
-#, fuzzy
-#| msgid "Romanian"
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
-msgstr "罗马尼亚语"
+msgstr "聊天室邀请"
 
-#: ../src/empathy-event-manager.c:701
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
-msgstr ""
+msgstr "%s 正邀请您加入 %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:709 ../src/empathy-ft-manager.c:1032
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "拒绝(_D)"
 
-#: ../src/empathy-event-manager.c:714
-#, fuzzy
-#| msgid "Join"
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
-msgstr "加入"
+msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:744
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
-msgstr ""
+msgstr "%s 已邀请您加入 %s"
 
-#: ../src/empathy-event-manager.c:867
-#, fuzzy, c-format
+#: ../src/empathy-event-manager.c:715
+#, c-format
 msgid "Incoming file transfer from %s"
-msgstr "%s 的来电"
+msgstr "接收 %s 文件传输"
 
-#: ../src/empathy-event-manager.c:961
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "%s 的订阅请求"
 
-#: ../src/empathy-event-manager.c:965
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1698,504 +1908,876 @@ msgstr ""
 "\n"
 "消息：%s"
 
+#. someone is logging off
+#: ../src/empathy-event-manager.c:935
+#, c-format
+msgid "%s is now offline."
+msgstr "%s 当前离线。"
+
+#. someone is logging in
+#: ../src/empathy-event-manager.c:951
+#, c-format
+msgid "%s is now online."
+msgstr "%s 当前在线。"
+
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:114
+#: ../src/empathy-ft-manager.c:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:117
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:166
-msgid "No reason was specified"
-msgstr "未指定原因"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "The change in state was requested"
-msgstr ""
-
-#: ../src/empathy-ft-manager.c:170
-msgid "You canceled the file transfer"
-msgstr ""
-
-#: ../src/empathy-ft-manager.c:172
-msgid "The other participant canceled the file transfer"
-msgstr ""
-
-#: ../src/empathy-ft-manager.c:174
-msgid "Error while trying to transfer the file"
-msgstr ""
+#: ../src/empathy-ft-manager.c:180
+msgctxt "file transfer percent"
+msgid "Unknown"
+msgstr "未知"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "The other participant is unable to transfer the file"
-msgstr ""
+#: ../src/empathy-ft-manager.c:275
+#, c-format
+msgid "%s of %s at %s/s"
+msgstr "%2$s 中的 %1$s，速度 %3$s/s"
 
-#: ../src/empathy-ft-manager.c:178
-msgid "Unknown reason"
-msgstr "未知原因"
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%2$s 中的 %1$s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:226
-#, fuzzy, c-format
+#: ../src/empathy-ft-manager.c:307
+#, c-format
 msgid "Receiving \"%s\" from %s"
-msgstr "%s 的来电"
+msgstr "正在从 %2$s 接收 \"%1$s\""
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:229
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
-msgstr ""
+msgstr "正在向 %2$s 发送 \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:239
-msgctxt "file size"
-msgid "Unknown"
-msgstr "未知"
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:340
+#, c-format
+msgid "Error receiving \"%s\" from %s"
+msgstr "从 %2$s 接收 \"%1$s\" 出错"
+
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "接收文件出错"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:247
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr ""
+msgid "Error sending \"%s\" to %s"
+msgstr "向 %2$s 发送 \"%1$s\" 出错"
 
-#: ../src/empathy-ft-manager.c:254
-msgid "Waiting the other participant's response"
-msgstr "正在等待其他参与者的响应"
+#: ../src/empathy-ft-manager.c:351
+msgid "Error sending a file"
+msgstr "发送文件出错"
 
-#: ../src/empathy-ft-manager.c:264
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:490
 #, c-format
 msgid "\"%s\" received from %s"
-msgstr ""
+msgstr "已经从 %2$s 完成接收 \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:270
+#. translators: first %s is filename, second %s
+#. * is the contact name
+#: ../src/empathy-ft-manager.c:495
 #, c-format
 msgid "\"%s\" sent to %s"
-msgstr ""
+msgstr "已经向 %2$s 完成发送 \"%1$s\""
 
-#: ../src/empathy-ft-manager.c:273
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "文件传送完成"
 
-#: ../src/empathy-ft-manager.c:282
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr ""
+#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+msgid "Waiting for the other participant's response"
+msgstr "正在等待其他参与者的回应"
 
-#: ../src/empathy-ft-manager.c:288
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
+msgid "Checking integrity of \"%s\""
 msgstr ""
 
-#: ../src/empathy-ft-manager.c:291
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "文件传送已传送：%s"
-
-#: ../src/empathy-ft-manager.c:306
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "未知"
-
-#: ../src/empathy-ft-manager.c:366
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "未知"
+msgid "Hashing \"%s\""
+msgstr ""
 
-#: ../src/empathy-ft-manager.c:663
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:675
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "文件"
 
-#: ../src/empathy-ft-manager.c:697
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "剩余"
 
-#: ../src/empathy-ft-manager.c:895
-msgid "Cannot save file to this location"
-msgstr "无法将文件保存到此位置"
-
-#: ../src/empathy-ft-manager.c:941
-msgid "Save file as..."
-msgstr "文件另存为..."
-
-#: ../src/empathy-ft-manager.c:1011
-msgid "unknown size"
-msgstr "未知大小"
+#: ../src/empathy-ft-manager.ui.h:1
+msgid "File Transfers"
+msgstr "文件传输"
 
-#: ../src/empathy-ft-manager.c:1017
-#, c-format
-msgid "%s would like to send you a file"
-msgstr "%s 想要给您发送一个文件"
-
-#. Translators: the first %s is the file name, the second %s is the file size
-#: ../src/empathy-ft-manager.c:1023
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "你想要接收文件“%s”(%s)吗？"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1041
-msgid "_Accept"
-msgstr "接受(_A)"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
-msgstr "文件传送"
-
-#: ../src/empathy-ft-manager.glade.h:2
+#: ../src/empathy-ft-manager.ui.h:2
 msgid "Remove completed, canceled and failed file transfers from the list"
-msgstr ""
+msgstr "从列表移除已完成、已取消及已失败的文件传输"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:260
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "导入"
 
-#: ../src/empathy-import-dialog.c:269
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "协议"
 
-#: ../src/empathy-import-dialog.c:295
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "源"
 
-#: ../src/empathy-import-dialog.c:389
+#: ../src/empathy-import-dialog.c:392
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "未找到可导入的账户。Empathy 目前只能支持从 Pidgin 导入账户。"
 
-#: ../src/empathy-import-dialog.glade.h:1
+#: ../src/empathy-import-dialog.ui.h:1
 msgid "Import Accounts"
 msgstr "导入账户"
 
-#: ../src/empathy-main-window.c:391
+#: ../src/empathy-main-window.c:402
+msgid "_Edit account"
+msgstr "编辑账户(_E)"
+
+#: ../src/empathy-main-window.c:505
 msgid "No error specified"
 msgstr "没有说明错误"
 
-#: ../src/empathy-main-window.c:394
+#: ../src/empathy-main-window.c:508
 msgid "Network error"
 msgstr "网络错误"
 
-#: ../src/empathy-main-window.c:397
+#: ../src/empathy-main-window.c:511
 msgid "Authentication failed"
 msgstr "验证失败"
 
-#: ../src/empathy-main-window.c:400
+#: ../src/empathy-main-window.c:514
 msgid "Encryption error"
 msgstr "加密错误"
 
-#: ../src/empathy-main-window.c:403
+#: ../src/empathy-main-window.c:517
 msgid "Name in use"
 msgstr "用户名已经被占用"
 
-#: ../src/empathy-main-window.c:406
+#: ../src/empathy-main-window.c:520
 msgid "Certificate not provided"
 msgstr "未提供证书"
 
-#: ../src/empathy-main-window.c:409
+#: ../src/empathy-main-window.c:523
 msgid "Certificate untrusted"
 msgstr "证书不被信任"
 
-#: ../src/empathy-main-window.c:412
+#: ../src/empathy-main-window.c:526
 msgid "Certificate expired"
 msgstr "证书已过期"
 
-#: ../src/empathy-main-window.c:415
+#: ../src/empathy-main-window.c:529
 msgid "Certificate not activated"
 msgstr "证书尚未激活"
 
-#: ../src/empathy-main-window.c:418
+#: ../src/empathy-main-window.c:532
 msgid "Certificate hostname mismatch"
 msgstr "证书主机名不匹配"
 
-#: ../src/empathy-main-window.c:421
+#: ../src/empathy-main-window.c:535
 msgid "Certificate fingerprint mismatch"
 msgstr "证书指纹不匹配"
 
-#: ../src/empathy-main-window.c:424
+#: ../src/empathy-main-window.c:538
 msgid "Certificate self-signed"
 msgstr "证书是自签属的"
 
-#: ../src/empathy-main-window.c:427
+#: ../src/empathy-main-window.c:541
 msgid "Certificate error"
 msgstr "证书错误"
 
-#: ../src/empathy-main-window.c:430
+#: ../src/empathy-main-window.c:544
 msgid "Unknown error"
 msgstr "未知的错误"
 
-#: ../src/empathy-main-window.c:594
+#: ../src/empathy-main-window.c:1293
 msgid "Show and edit accounts"
 msgstr "显示和编辑账户"
 
-#: ../src/empathy-main-window.c:974
-msgid "Contact"
-msgstr "联系人"
-
-#: ../src/empathy-main-window.c:1176
-msgid "_Edit account"
-msgstr "编辑账户(_E)"
-
-#: ../src/empathy-main-window.glade.h:1
+#: ../src/empathy-main-window.ui.h:1
 msgid "Contact List"
 msgstr "联系人列表"
 
-#: ../src/empathy-main-window.glade.h:2
+#: ../src/empathy-main-window.ui.h:2
+msgid "Contacts on a _Map"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:3
 msgid "Context"
 msgstr "上下文"
 
-#: ../src/empathy-main-window.glade.h:3
+#: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
-msgstr "加入已收藏的房间(_F)"
-
-#: ../src/empathy-main-window.glade.h:4
-msgid "Join _New..."
-msgstr "加入新房间(_N)..."
+msgstr "加入已收藏的聊天室(_F)"
 
-#: ../src/empathy-main-window.glade.h:5
+#: ../src/empathy-main-window.ui.h:5
 msgid "Manage Favorites"
 msgstr "管理收藏夹"
 
-#: ../src/empathy-main-window.glade.h:6
-msgid "Show _Offline Contacts"
-msgstr "显示离线联系人(_O)"
+#: ../src/empathy-main-window.ui.h:6
+msgid "N_ormal Size"
+msgstr "正常尺寸(_O)"
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+msgid "Sort by _Name"
+msgstr "按姓姓名序(_N)"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:9
+msgid "Sort by _Status"
+msgstr "按状态排序(_S)"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "_Accounts"
 msgstr "账户(_A)"
 
-#: ../src/empathy-main-window.glade.h:8
-msgid "_Add Contact..."
-msgstr "添加联系人(_A)..."
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Compact Size"
+msgstr "紧凑模式(_C)"
+
+#: ../src/empathy-main-window.ui.h:14
+msgid "_Contents"
+msgstr "内容(_C)"
+
+#: ../src/empathy-main-window.ui.h:15
+msgid "_Debug"
+msgstr "调试(_D)"
+
+#: ../src/empathy-main-window.ui.h:17
+msgid "_File Transfers"
+msgstr "文件传输(_F)"
+
+#: ../src/empathy-main-window.ui.h:18
+msgid "_Help"
+msgstr "帮助(_H)"
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../src/empathy-main-window.ui.h:19
+msgid "_Join..."
+msgstr "加入(_J)..."
+
+#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
 msgid "_New Conversation..."
 msgstr "新建对话(_N)..."
 
-#: ../src/empathy-main-window.glade.h:14
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Offline Contacts"
+msgstr "离线联系人(_O)"
+
+#: ../src/empathy-main-window.ui.h:22
 msgid "_Personal Information"
 msgstr "个人信息(_P)"
 
-#: ../src/empathy-main-window.glade.h:16
+#: ../src/empathy-main-window.ui.h:24
+msgid "_Previous Conversations"
+msgstr "最近会话(_P)"
+
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Room"
-msgstr "房间(_R)"
+msgstr "聊天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:291
-msgid "Chat Rooms"
+#: ../src/empathy-new-chatroom-dialog.c:331
+msgid "Chat Room"
 msgstr "聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:2
-msgid "Browse:"
-msgstr "æµ\8fè§\88ï¼\9a"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "æ\88\90å\91\98"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
+"and a number."
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+msgstr ""
+"<b>%s</b>\n"
+"需要邀请：%s\n"
+"需要邀请：%s\n"
+"成员：%s"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "Yes"
+msgstr "是"
+
+#: ../src/empathy-new-chatroom-dialog.c:498
+#: ../src/empathy-new-chatroom-dialog.c:499
+msgid "No"
+msgstr "否"
+
+#: ../src/empathy-new-chatroom-dialog.c:526
+msgid "Could not start room listing"
+msgstr "无法开始聊天室列表"
+
+#: ../src/empathy-new-chatroom-dialog.c:536
+msgid "Could not stop room listing"
+msgstr "无法停止聊天室列表"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:2
+msgid "Couldn't load room list"
+msgstr "无法载入聊天室列表"
+
+#: ../src/empathy-new-chatroom-dialog.ui.h:3
 msgid ""
 "Enter the room name to join here or click on one or more rooms in the list."
-msgstr "输入房间名以加入或在列表中点击一个或多个房间。"
+msgstr "输入聊天室名以加入或在列表中点击一个或多个聊天室。"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:4
+#: ../src/empathy-new-chatroom-dialog.ui.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
-msgid "Join"
-msgstr "加入"
+msgstr "输入聊天室所在的服务器，或为空表示聊天室在当前账户的服务器上。"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "加入新房间"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "加入聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "刷新(_F)"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+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-new-chatroom-dialog.ui.h:8
+msgid "_Room:"
+msgstr "聊天室(_R)："
 
-#: ../src/empathy-preferences.c:157
+#: ../src/empathy-preferences.c:147
 msgid "Message received"
 msgstr "收到了消息"
 
-#: ../src/empathy-preferences.c:158
+#: ../src/empathy-preferences.c:148
 msgid "Message sent"
 msgstr "发出了消息"
 
-#: ../src/empathy-preferences.c:159
+#: ../src/empathy-preferences.c:149
 msgid "New conversation"
 msgstr "新对话"
 
-#: ../src/empathy-preferences.c:160
+#: ../src/empathy-preferences.c:150
 msgid "Contact goes online"
 msgstr "离线人上线"
 
-#: ../src/empathy-preferences.c:161
+#: ../src/empathy-preferences.c:151
 msgid "Contact goes offline"
 msgstr "联系人离线"
 
-#: ../src/empathy-preferences.c:162
+#: ../src/empathy-preferences.c:152
 msgid "Account connected"
 msgstr "账户已连接"
 
-#: ../src/empathy-preferences.c:163
+#: ../src/empathy-preferences.c:153
 msgid "Account disconnected"
 msgstr "账户已断开连接"
 
-#: ../src/empathy-preferences.c:397
+#: ../src/empathy-preferences.c:393
 msgid "Language"
 msgstr "语言"
 
-#: ../src/empathy-preferences.glade.h:1
-msgid "<b>Appearance</b>"
-msgstr "<b>外观</b>"
-
-#: ../src/empathy-preferences.glade.h:2
-#, fuzzy
-#| msgid "<b>Behaviour</b>"
-msgid "<b>Behavior</b>"
-msgstr "<b>行为</b>"
+#: ../src/empathy-preferences.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "允许使用 _GPS 信息"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>联系人列表</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "允许使用网络信息(_C)"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>启用拼写检查的语言：</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "允许使用网络信息(_N)"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>播放声音的事件</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "外观"
 
-#: ../src/empathy-preferences.glade.h:6
-msgid ""
-"<small>The list of languages reflects only the languages for which you have "
-"a dictionary installed.</small>"
-msgstr "<small>语言列表仅包含您已安装词典的语言。</small>"
-
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
-msgstr "启动时自动登录(_C)"
+msgstr "启动时自动登录(_C) "
 
-#: ../src/empathy-preferences.glade.h:8
-msgid "Avatars are user chosen images shown in the contact list"
-msgstr "头像是用户选择的显示在联系人列表中的图片"
+#: ../src/empathy-preferences.ui.h:6
+msgid "Behavior"
+msgstr "行为"
 
-#: ../src/empathy-preferences.glade.h:9
+#: ../src/empathy-preferences.ui.h:7
 msgid "Chat Th_eme:"
 msgstr "聊天主题(_E)："
 
-#: ../src/empathy-preferences.glade.h:10
-#, fuzzy
-#| msgid "Disable sounds when _away or busy"
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
-msgstr "离开或忙时禁用声音(_A)"
+msgstr "离开或忙碌时禁用提示(_A)"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
-msgstr "离开或忙时禁用声音(_A)"
+msgstr "离开或忙碌时禁用声音(_A)"
+
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "当联系人上线时允许提示"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:11
+msgid "Enable notifications when a contact goes offline"
+msgstr "当联系人离线时允许提示"
+
+#: ../src/empathy-preferences.ui.h:12
 msgid "Enable notifications when the _chat is not focused"
 msgstr ""
 
-#: ../src/empathy-preferences.glade.h:13
+#: ../src/empathy-preferences.ui.h:13
+msgid "Enable spell checking for languages:"
+msgstr "允许拼写检查的语言："
+
+#: ../src/empathy-preferences.ui.h:14
 msgid "General"
 msgstr "常规"
 
-#: ../src/empathy-preferences.glade.h:14
-#, fuzzy
-#| msgid "Use notification sounds"
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "位置"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
-msgstr "使用通知声音"
+msgstr "提示"
 
-#: ../src/empathy-preferences.glade.h:15
+#: ../src/empathy-preferences.ui.h:18
+msgid "Play sound for events"
+msgstr "播放事件声音"
+
+#: ../src/empathy-preferences.ui.h:19
 msgid "Preferences"
 msgstr "首选项"
 
-#: ../src/empathy-preferences.glade.h:16
-msgid "Show _avatars"
-msgstr "显示头像(_A)"
+#: ../src/empathy-preferences.ui.h:20
+msgid "Privacy"
+msgstr "隐私"
+
+#: ../src/empathy-preferences.ui.h:21
+msgid ""
+"Reduced location accuracy means that nothing more precise than your city, "
+"state and country will be published.  GPS coordinates will have a random "
+"value added (&#xB1;0.25&#xB0;)."
+msgstr ""
 
-#: ../src/empathy-preferences.glade.h:17
+#: ../src/empathy-preferences.ui.h:22
 msgid "Show _smileys as images"
 msgstr "显示表情符号为图形(_S)"
 
-#: ../src/empathy-preferences.glade.h:18
-msgid "Show co_mpact contact list"
-msgstr "紧凑显示联系人列表(_M)"
-
-#: ../src/empathy-preferences.glade.h:19
-msgid "Sort by _name"
-msgstr "按名称排序(_N)"
+#: ../src/empathy-preferences.ui.h:23
+msgid "Show contact _list in rooms"
+msgstr "在聊天室显示联系人列表(_L)"
 
-#: ../src/empathy-preferences.glade.h:20
-msgid "Sort by s_tate"
-msgstr "按状态排序(_T)"
-
-#: ../src/empathy-preferences.glade.h:21
+#: ../src/empathy-preferences.ui.h:24
 msgid "Sounds"
 msgstr "声音"
 
-#: ../src/empathy-preferences.glade.h:22
+#: ../src/empathy-preferences.ui.h:25
 msgid "Spell Checking"
 msgstr "拼写检查"
 
-#: ../src/empathy-preferences.glade.h:23
+#: ../src/empathy-preferences.ui.h:26
+msgid ""
+"The list of languages reflects only the languages for which you have a "
+"dictionary installed."
+msgstr ""
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "Themes"
 msgstr "主题"
 
-#: ../src/empathy-preferences.glade.h:24
-#, fuzzy
-#| msgid "_Enable sound notifications"
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
-msgstr "å\90¯ç\94¨å£°é\9f³通知(_E)"
+msgstr "å\85\81许æ°\94泡通知(_E)"
 
-#: ../src/empathy-preferences.glade.h:25
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Enable sound notifications"
 msgstr "启用声音通知(_E)"
 
-#: ../src/empathy-preferences.glade.h:26
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
 msgstr "在单独窗口中打开新聊天(_O)"
 
-#: ../src/empathy-status-icon.glade.h:1
+#: ../src/empathy-preferences.ui.h:31
+msgid "_Publish location to my contacts"
+msgstr "向我的联系人公布位置信息(_P)"
+
+#: ../src/empathy-preferences.ui.h:32
+msgid "_Reduce location accuracy"
+msgstr "降低位置信息精度(_R)"
+
+#: ../src/empathy-status-icon.ui.h:1
 msgid "Status"
 msgstr "状态"
 
-#: ../src/empathy-status-icon.glade.h:3
+#: ../src/empathy-status-icon.ui.h:3
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/empathy-status-icon.glade.h:4
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Show Contact List"
 msgstr "显示联系人列表(_S)"
 
-#: ../src/empathy-tube-dispatch.c:364
+#: ../src/empathy-tube-dispatch.c:375
 #, c-format
 msgid "Unable to start application for service %s: %s"
 msgstr ""
 
-#: ../src/empathy-tube-dispatch.c:435
-#, fuzzy, c-format
-#| msgid ""
-#| "%s is offering you an invitation, but you don't have the needed external "
-#| "application to handle it."
+#: ../src/empathy-tube-dispatch.c:446
+#, c-format
 msgid ""
 "An invitation was offered for service %s, but you don't have the needed "
 "application to handle it"
-msgstr "%s 给您发送了一份邀请，但是您没有处理它所需的外部程序。"
+msgstr ""
+
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr ""
+
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "错误"
+
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr ""
+
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "警告"
+
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "消息"
+
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "信息"
+
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "调试"
+
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "保存"
+
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "调试窗口"
+
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "暂停"
+
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "级别 "
+
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "时间"
+
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "域"
+
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "类别"
+
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "级别"
+
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr ""
+
+#~ msgid "<b>Advanced</b>"
+#~ msgstr "<b>高级</b>"
+
+#~ msgid "Forget password and clear the entry."
+#~ msgstr "忘记密码并清空输入框。"
+
+#~ msgid "<b>Network</b>"
+#~ msgstr "<b>网络</b>"
+
+#~ msgid "<b>Servers</b>"
+#~ msgstr "<b>服务器</b>"
+
+#~ msgid "Create a new IRC network"
+#~ msgstr "创建新的 IRC 网络"
+
+#~ msgid "Edit the selected IRC network"
+#~ msgstr "编辑选中的 IRC 网络"
+
+#~ msgid "Remove the selected IRC network"
+#~ msgstr "删除选中的 IRC 网络"
+
+#~ msgid "<b>Override server settings</b>"
+#~ msgstr "<b>覆盖服务器设置</b>"
+
+#~ msgid "_Check Word Spelling..."
+#~ msgstr "拼写检查(_C)..."
+
+#~ msgid "<b>Topic:</b>"
+#~ msgstr "<b>话题：</b>"
+
+#~ msgid "Group Chat"
+#~ msgstr "群聊"
+
+#~ msgid "Contact Information"
+#~ msgstr "联系人信息"
+
+#~ msgid "I would like to add you to my contact list."
+#~ msgstr "我希望可以将您加入我的联系人列表中。"
+
+#~ msgid "Sorry, I don't want you in my contact list anymore."
+#~ msgstr "对不起，我不想让您以后出现在我的联系人列表中了。"
+
+#~ msgid "<b>Client Information</b>"
+#~ msgstr "<b>客户端信息</b>"
+
+#~ msgid "<b>Contact Details</b>"
+#~ msgstr "<b>联系人详情</b>"
+
+#~ msgid "<b>Contact</b>"
+#~ msgstr "<b>联系人</b>"
+
+#~ msgid "<b>Groups</b>"
+#~ msgstr "<b>群组</b>"
+
+#~ msgid "Contact information"
+#~ msgstr "联系人信息"
+
+#~ msgid "Custom message"
+#~ msgstr "自定义消息"
+
+#~ msgid "Message:"
+#~ msgstr "消息："
+
+#~ msgid "Save message"
+#~ msgstr "保存消息"
+
+#~ msgid "Status:"
+#~ msgstr "状态："
+
+#~ msgid "Word"
+#~ msgstr "单词"
+
+#~ msgid "Suggestions for the word"
+#~ msgstr "单词的拼写建议"
+
+#~ msgid "Spell Checker"
+#~ msgstr "拼写检查器"
+
+#~ msgid "Suggestions for the word:"
+#~ msgstr "单词的拼写建议："
+
+#~ msgid "<b>New Account</b>"
+#~ msgstr "<b>新建账户</b>"
+
+#~ msgid "<b>No protocol installed</b>"
+#~ msgstr "<b>未安装协议</b>"
+
+#~ msgid "<b>Settings</b>"
+#~ msgstr "<b>设置</b>"
+
+#~ msgid "I already have an account I want to use"
+#~ msgstr "我已经拥有账户，我想使用它"
+
+#~ msgid "C_lear"
+#~ msgstr "清除(_L)"
+
+#~ msgid "Chat"
+#~ msgstr "聊天"
+
+#~ msgid "Insert _Smiley"
+#~ msgstr "插入表情(_M)"
+
+#~ msgid "Invitation _message:"
+#~ msgstr "邀请消息(_M)："
+
+#~ msgid "Invite"
+#~ msgstr "邀请"
+
+#~ msgid "Move Tab _Left"
+#~ msgstr "左移标签(_L)"
+
+#~ msgid "Move Tab _Right"
+#~ msgstr "右移标签(_R)"
+
+#~ msgid "Select who would you like to invite:"
+#~ msgstr "选择您要邀请的人："
+
+#~ msgid "You have been invited to join a chat conference."
+#~ msgstr "您被邀请加入一个聊天会议。"
+
+#~ msgid "_Contact"
+#~ msgstr "联系人(_C)"
+
+#~ msgid "_Conversation"
+#~ msgstr "对话(_C)"
+
+#~ msgid "_Detach Tab"
+#~ msgstr "漂移标签(_D)"
+
+#~ msgid "_Favorite Chatroom"
+#~ msgstr "收藏聊天室(_F)"
+
+#~ msgid "_Next Tab"
+#~ msgstr "下一标签(_N)"
+
+#~ msgid "_Previous Tab"
+#~ msgstr "上一标签(_P)"
+
+#~ msgid "_Tabs"
+#~ msgstr "标签(_T)"
+
+#~ msgid "Edit Favorite Room"
+#~ msgstr "编辑聊天室收藏"
+
+#~ msgid "Join room on start_up"
+#~ msgstr "启动时加入聊天室(_U)"
+
+#~ msgid "Join this chat room when Empathy starts and you are connected"
+#~ msgstr "在 Empathy 启动并且您已经连接上时加入此聊天室"
+
+#~ msgid "N_ame:"
+#~ msgstr "名称(_A)："
+
+#~ msgid "S_erver:"
+#~ msgstr "服务器(_E)："
+
+#~ msgctxt "file size"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgid "Waiting the other participant's response"
+#~ msgstr "正在等待其他参与者的响应"
+
+#~ msgid "File transfer canceled: %s"
+#~ msgstr "文件传送已传送：%s"
+
+#~ msgctxt "remaining time"
+#~ msgid "Unknown"
+#~ msgstr "未知"
+
+#~ msgid "Cannot save file to this location"
+#~ msgstr "无法将文件保存到此位置"
+
+#~ msgid "Save file as..."
+#~ msgstr "文件另存为..."
+
+#~ msgid "unknown size"
+#~ msgstr "未知大小"
+
+#~ msgid "%s would like to send you a file"
+#~ msgstr "%s 想要给您发送一个文件"
+
+#~ msgid "Do you want to accept the file \"%s\" (%s)?"
+#~ msgstr "您想要接收文件“%s”(%s)吗？"
+
+#~ msgid "_Accept"
+#~ msgstr "接受(_A)"
+
+#~ msgid "File transfers"
+#~ msgstr "文件传送"
+
+#~ msgid "Join _New..."
+#~ msgstr "加入新聊天室(_N)..."
+
+#~ msgid "Show _Offline Contacts"
+#~ msgstr "显示离线联系人(_O)"
+
+#~ msgid "Chat Rooms"
+#~ msgstr "聊天室"
+
+#~ msgid "Browse:"
+#~ msgstr "浏览："
+
+#~ msgid "Join"
+#~ msgstr "加入"
+
+#~ msgid "Join New"
+#~ msgstr "加入新聊天室"
+
+#~ msgid "Re_fresh"
+#~ msgstr "刷新(_F)"
+
+#~ msgid ""
+#~ "This list represents all chat rooms hosted on the server you have entered."
+#~ msgstr "此列表显示您所进入的服务器上的所有聊天室。"
+
+#~ msgid "<b>Appearance</b>"
+#~ msgstr "<b>外观</b>"
+
+#~ msgid "<b>Contact List</b>"
+#~ msgstr "<b>联系人列表</b>"
+
+#~ msgid "<b>Enable spell checking for languages:</b>"
+#~ msgstr "<b>启用拼写检查的语言：</b>"
+
+#~ msgid "<b>Play sound for events</b>"
+#~ msgstr "<b>播放声音的事件</b>"
+
+#~ msgid ""
+#~ "<small>The list of languages reflects only the languages for which you "
+#~ "have a dictionary installed.</small>"
+#~ msgstr "<small>语言列表仅包含您已安装词典的语言。</small>"
+
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "头像是用户选择的显示在联系人列表中的图片"
+
+#~ msgid "Show _avatars"
+#~ msgstr "显示头像(_A)"
+
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "紧凑显示联系人列表(_M)"
+
+#~ msgid "Sort by _name"
+#~ msgstr "按名称排序(_N)"
+
+#~ msgid "Sort by s_tate"
+#~ msgstr "按状态排序(_T)"
 
 #~ msgid "Enable popup when contact is available"
 #~ msgstr "启用联系人上线时弹出通知"