[empathy] Updated Traditional Chinese translation(Hong Kong and Taiwan)

[Chao-Hsiung Liao <chliao src gnome org>]

commit 771b69208c4c3bb4b32057e53f97d4c79995a5cc
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Sun Aug 2 16:11:05 2009 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2051 +++++++++++++++++++++++++++++++++++------------------------
 po/zh_TW.po | 2054 +++++++++++++++++++++++++++++++++++------------------------
 2 files changed, 2423 insertions(+), 1682 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 293b5a3..0730c8f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -2,25 +2,29 @@
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Abel Cheung <abel oaka org>, 2003, 2004.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005.
+# Tryneeds translation team, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.25.92\n"
+"Project-Id-Version: empathy 2.27.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 21:30+0800\n"
-"PO-Revision-Date: 2009-02-17 21:30+0800\n"
+"POT-Creation-Date: 2009-08-02 16:10+0800\n"
+"PO-Revision-Date: 2009-08-02 16:10+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=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"
-msgstr "Empathy å?³æ??é??è¨?ç¨?å¼?"
+msgid "Empathy IM Client"
+msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+#, fuzzy
+#| msgid "Send and receive instant messages"
+msgid "Send and receive messages"
 msgstr "å?³é??è??æ?¥æ?¶å?³æ??è¨?æ?¯"
 
 #: ../data/empathy.schemas.in.h:1
@@ -63,963 +67,1296 @@ 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 "Empathy æ??é??ä½?ä½?ç½®ç??æº?確度"
+
+#: ../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 "å¦?æ??è??天室使ç?¨ç??主é¡?æ?¯ adium æ??è¦?使ç?¨ç?? adium ä½?æ?¯ä¸»é¡?è·¯å¾?ã??"
+
+#: ../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 "å¦?æ??è??天è¦?çª?失å?»ç?¦é»?å??å½?å?ºé??ç?¥"
 
-#: ../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 帳è??"
 
-#: ../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 "Empathy æ?¯å?¦ä½¿ç?¨è?¯çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
 
-#: ../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 "å?¨æ?·ç·?/é??æ?°é?£ç·?æ??æ?¯å?¦è?ªå??使ç?¨ç¶²çµ¡ç®¡ç??ç¨?å¼?ã??"
 
-#: ../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
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è?¯çµ¡äººç?»å?¥ç¶²çµ¡ã??"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è?¯çµ¡äººç?»å?ºç¶²çµ¡ã??"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯æ?µé??ã??"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥é??å??æ?°ç??è«?話ã??"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯é??å?ºã??"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "ç?¶ç?»å?¥ç¶²çµ¡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "ç?¶ç?»å?ºç¶²çµ¡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 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
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 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
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 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 "
 "sort the contact list by state."
 msgstr "æ??åº?è?¯çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æ¢?件ã??é ?設å?¼æ?¯ä½¿ç?¨è?¯çµ¡äººç??å??稱ã??nameã??æ?¸å?¼ä¾?æ??åº?ã??è??æ?¸å?¼ã??stateã??å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?è?¯çµ¡äººæ¸?å?®ã??"
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../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
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 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 "è??天室æ¸?å?®å?°å??(_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 "ä½ ç??系統ä¸?æ?¯æ?´é??äº?å??ç??æ ¼å¼?"
 
-#: ../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 "è«?æ??é??è£?æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "ç?¡æ³?é??é?£é??å??è??天æ??è­°"
+
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
+msgstr "ä¸?æ?¯æ?´æ­¤æ??令"
+
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../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:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "檢���(_C)..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../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: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:1134
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. 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:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../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:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "å??人è³?æ??"
-
-#: ../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:394
 msgid "New Contact"
 msgstr "���絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "ç¨?å¾?å??決å®?"
 
-#: ../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:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1404
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤ç¾£çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1406
 msgid "Removing group"
 msgstr "正�移�羣�"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1453
+#: ../libempathy-gtk/empathy-contact-list-view.c:1530
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1483
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤è?¯çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1485
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-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 "é??話(_C)"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "èª?é?³é??話(_A)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "è¦?å??é??話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../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-chat-window.ui.h:10 ../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 "é??è«?å?°é??å??è??天室"
 
-#: ../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
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é?¸æ??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "å?²å­?å¤§é ­è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:996
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1005
+#: ../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:1256
+msgid "Country ISO Code:"
+msgstr "å??家 ISO 碼ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "Country:"
+msgstr "å??家ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "State:"
+msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>è?¯çµ¡äººè©³ç´°è³?æ??</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "City:"
+msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>�絡人</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Area:"
+msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>羣�</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Postal Code:"
+msgstr "é?µé??å??è??ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Street:"
+msgstr "è¡?ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Building:"
+msgstr "建��"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Floor:"
+msgstr "�層�"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Room:"
+msgstr "室�"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Text:"
+msgstr "æ??å­?ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Description:"
+msgstr "æ??è¿°ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "URI:"
+msgstr "URIï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Accuracy Level:"
+msgstr "�確度���"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Error:"
+msgstr "�誤�"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Vertical Error (meters):"
+msgstr "å??ç?´èª¤å·®ï¼?ç±³ï¼?ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Horizontal Error (meters):"
+msgstr "水平誤差�米��"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Speed:"
+msgstr "é??度ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#, fuzzy
+msgid "Bearing:"
+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:1294
+msgid "Climb Speed:"
+msgstr "ç?¬å??é??度ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Last Updated on:"
+msgstr "�次����"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Longitude:"
+msgstr "�度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Latitude:"
+msgstr "緯度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Altitude:"
+msgstr "緯度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1349
+msgid "<b>Location</b>"
+msgstr "<b>ä½?ç½®</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1362
+msgid "<b>Location</b>, "
+msgstr "<b>ä½?ç½®<b>ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1412
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y æ?¼ %R UTC"
+
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
+
+#: ../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.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "è?¯çµ¡äººè©³ç´°è³?æ??"
+
+#: ../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 "���:"
 
-#: ../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 "OS:"
 
-#: ../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 "å? å?¥ç¾£çµ?(_G)"
 
-#: ../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:277
+#: ../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 "è??天(_C)"
 
-#: ../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_STATUS_TEXT
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:172
+#: ../libempathy-gtk/empathy-presence-chooser.c:208
+msgid "Custom Message..."
 msgstr "����..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "����"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "��:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "����"
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "編輯����..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "ç??æ??:"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+msgstr "æ??é??è£?å°?é??å??ç??æ??å¾?å??好中移é?¤"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "å­?"
+#: ../libempathy-gtk/empathy-presence-chooser.c:335
+msgid "Click to make this status a favorite"
+msgstr "æ??é??è£?å°?é??å??ç??æ??設ç?ºå??好"
 
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "å°?é??å??å­?ç??建議"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+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-presence-chooser.c:782
+msgid "Set your presence and current status"
+msgstr "設å®?ä½ ç??ä¸?ç·?è??ç?®å??ç??ç??æ??"
 
-#: ../libempathy-gtk/empathy-theme-manager.c:61
-msgid "Simple"
-msgstr "ç°¡æ??"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:62
-msgid "Clean"
-msgstr "��"
-
-#: ../libempathy-gtk/empathy-theme-manager.c:63
-msgid "Blue"
-msgstr "è??è?²"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-msgid "Unable to open URI"
-msgstr "ç?¡æ³?é??å?? URI"
-
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a file"
-msgstr "é?¸æ??ä¸?å??æª?æ¡?"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "����..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "æ?¶å?°å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "å?³é??å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "æ?¶å?°è??天è¦?æ±?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "é?£æ?¥å?°ä¼ºæ??å?¨"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "è??伺æ??å?¨æ?·ç·?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "æ?¶å?°èª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "æ?­å?ºèª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../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 "å? å?¥æ?°ç??é ?å??設å®?(_N)"
+
+#: ../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 "gtk-add"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../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 "ç?®å??ç??å?°å??設å®?"
@@ -1204,7 +1541,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 "�話�"
 
@@ -1218,15 +1555,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 "é?¸æ??è?¯çµ¡äºº..."
 
@@ -1239,23 +1576,25 @@ msgstr "ä¸?ç·?ç??æ??"
 msgid "Set your own presence"
 msgstr "設å®?ä½ è?ªå·±ç??ä¸?ç·?ç??æ??"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "å??å??æ??ä¸?顯示è?¯çµ¡äººæ¸?å?®"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "顯示帳è??å°?話ç??"
 
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:587
+#, fuzzy
+#| msgid "- Empathy Instant Messenger"
+msgid "- Empathy IM Client"
 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 "
@@ -1263,7 +1602,7 @@ msgid ""
 "version."
 msgstr "Empathy æ?¯è?ªç?±è»?件ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è»?件å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../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 "
@@ -1271,18 +1610,18 @@ msgid ""
 "details."
 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 "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr "ä½ æ??該已ç¶?å?? Empathy ä¸?èµ·æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è¨±å?¯è­?ç??å?¯æ?¬ï¼?å¦?æ??é??æ²?æ??ï¼?寫信給ï¼? Free Software Foundation, Inc., 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 ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -1293,22 +1632,21 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../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"
@@ -1317,7 +1655,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"
@@ -1329,301 +1667,299 @@ 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:258
+#: ../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 "��"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "��中..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "å?´é??å??(_S)"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "æ?­è??ç?¤"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "é?³æ??輸å?¥"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "è¦?å??輸å?¥"
 
-#: ../src/empathy-call-window.c:407
-msgid "Connecting..."
-msgstr "��中..."
+#: ../src/empathy-call-window.c:835
+#, c-format
+msgid "Call with %s"
+msgstr "è?? %s é??話中"
 
-#: ../src/empathy-call-window.c:572
+#: ../src/empathy-call-window.c:904
+msgid "Call"
+msgstr "é??話"
+
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1335
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "已�� -- %d:%02dm"
+msgid "Connected â?? %d:%02dm"
+msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "æ??æ?·"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "é??æ?¥"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "å?³é??é?³è¨?"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../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 "è¦?å??é ?覽"
 
-#: ../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 "檢�(_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:424
-#, c-format
-msgid "New message from %s"
-msgstr "ä¾?è?ª %s ç??æ?°è¨?æ?¯"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
+#, fuzzy
+#| msgid "Clean"
 msgid "C_lear"
-msgstr "��(_L)"
+msgstr "��"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
+#, fuzzy
+#| msgid "_Chat"
 msgid "Chat"
-msgstr "è??天"
+msgstr "è??天(_C)"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
+#, fuzzy
+#| msgid "Insert Smiley"
 msgid "Insert _Smiley"
-msgstr "æ??å?¥è¡¨æ??符è??(_S)"
-
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "é??è«?è¨?æ?¯(_M):"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "é??è«?"
+msgstr "æ??å?¥è¡¨æ??符è??"
 
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
-msgstr "å°?å??é ?左移(_L)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 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 "ä½ å·²ç¶?被é??è«?å? å?¥è??天æ??è­°ã??"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
+#, fuzzy
+#| msgid "Contact"
 msgid "_Contact"
-msgstr "�絡人(_C)"
+msgstr "�絡人"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
+#, fuzzy
+#| msgid "Conversation"
 msgid "_Conversation"
-msgstr "�話(_C)"
+msgstr "�話"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
-msgstr "������(_D)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
+#, fuzzy
+#| msgid "_Invite to chatroom"
 msgid "_Favorite Chatroom"
-msgstr "å??好ç??è??天室(_F)"
+msgstr "é??è«?å?°é??å??è??天室(_I)"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
-msgstr "ä¸?ä¸?å??å??é ?(_N)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
+#, fuzzy
+#| msgid "_Previous Conversations"
 msgid "_Previous Tab"
-msgstr "ä¸?ä¸?å??å??é ?(_P)"
+msgstr "��次�話(_P)"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "顯示�絡人��(_S)"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
-msgstr "å??é ?(_T)"
+msgstr ""
 
-#: ../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 "è??天室"
 
-#: ../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:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:375
+#: ../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:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s æ­£å?¨é??è«?ä½ "
 
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "å°?å??å??å¤?é?¨æ??ç?¨ç¨?å¼?ä¾?è??ç??å®?ã??"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "ä½ æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨æ??ç?¨ç¨?å¼?ã??"
 
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "è??天é??è«?"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£å?¨é??è«?ä½ å? å?¥ %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1632,595 +1968,628 @@ msgstr ""
 "\n"
 "���%s"
 
-#: ../src/empathy-ft-manager.c:113
+#. 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:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-msgid "No reason was specified"
-msgstr "æ²?æ??æ??å®?å??å? "
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "å·²è¦?æ±?æ?´æ?¹ç??æ??"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "ä½ å·²å??æ¶?æª?æ¡?å?³è¼¸"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "å?¶ä»?ç??å??è??è??å??æ¶?äº?æª?æ¡?å?³è¼¸"
-
-#: ../src/empathy-ft-manager.c:172
-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:174
-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 "%s / %s æ?¼ %s/s"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "ä¸?æ??ç??å??å? "
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:224
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "æ­£å?¨æ?¥æ?¶ %2$s é??å?ºç??ã??%1$sã??"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "æ­£å?¨å?³é??ã??%sã??給 %s"
 
-#: ../src/empathy-ft-manager.c:237
-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ã??æ??ç?¼ç??é?¯èª¤"
 
-#. translators: first %s is the transferred size, second %s is
-#. * the total file size
-#: ../src/empathy-ft-manager.c:245
+#: ../src/empathy-ft-manager.c:343
+msgid "Error receiving a file"
+msgstr "æ?¥æ?¶æª?æ¡?æ??ç?¼ç??é?¯èª¤"
+
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s / %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "å?³é??ã??%sã??給 %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:252
-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:262
+#. 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 "ã??%sã??æ?¥æ?¶è?ª %s"
 
-#: ../src/empathy-ft-manager.c:268
+#. 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 "ã??%sã??å?³é??給 %s"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "���輸��"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "ã??%sã??æ­£æ?¥æ?¶è?ª %s"
+#: ../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:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "ã??%sã??æ­£å?³é??給 %s"
+msgid "Checking integrity of \"%s\""
+msgstr "æ­£å?¨æª¢æ?¥æª?æ¡?ã??%sã??ç??å®?æ?´æ?§"
 
-#: ../src/empathy-ft-manager.c:289
+#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
 #, c-format
-msgid "File transfer canceled: %s"
-msgstr "æª?æ¡?å?³è¼¸å·²å??æ¶?ï¼?%s"
+msgid "Hashing \"%s\""
+msgstr "æ­£å?¨è¨?ç®?ã??%sã??é??æ¹?å?¼"
 
-#: ../src/empathy-ft-manager.c:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "��"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "��"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "ç?¡æ³?å°?æª?æ¡?å?²å­?å?°é??å??ä½?ç½®"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "����..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "ä¸?æ??ç??大å°?"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr " %s æ?³è¦?å?³é??çµ¦ä½ ä¸?å??æª?æ¡?"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "æ?¯å?¦è¦?æ?¥æ?¶æª?æ¡?ã??%sã??(%s)ï¼?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "æ?¥å??(_A)"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.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 "å¾?æ¸?å?®ä¸­ç§»é?¤å·²å®?æ??ã??å·²å??æ¶?å??失æ??ç??æª?æ¡?å?³è¼¸"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "��"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "��"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../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 "è?¯çµ¡äººå?°å??(_M)"
+
+#: ../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)..."
-
-#: ../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 ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+#| msgid "Sort by _name"
+msgid "Sort by _Name"
+msgstr "æ ¹æ??å??稱æ??åº?(_N)"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+#| msgid "Sort by s_tate"
+msgid "Sort by _Status"
+msgstr "æ ¹æ??ç??æ??æ??åº?(_T)"
+
+#: ../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 ""
+
+#: ../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.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)"
 
-#: ../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 "ç??覽:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "æ??å?¡"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:3
+#: ../src/empathy-new-chatroom-dialog.c:496
+#, c-format
+msgctxt ""
+msgid ""
+"<b>%s</b>\n"
+"Invite required: %s\n"
+"Password required: %s\n"
+"Members: %s"
+"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no and a number."
+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 "å?¨é??è£?輸å?¥è¦?å? å?¥ç??è??天室å??稱æ??å¾?æ¸?å?®ä¸­é»?é?¸ä¸?æ??å¤?å??è??天室ã??"
 
-#: ../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 "å? å?¥"
+#: ../src/empathy-new-chatroom-dialog.ui.h:5
+msgid "Join Room"
+msgstr "å? å?¥è??天室"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:6
-msgid "Join New"
-msgstr "å??å? æ?°ç??"
+#: ../src/empathy-new-chatroom-dialog.ui.h:6
+msgid "Room List"
+msgstr "è??天室æ¸?å?®"
 
-#: ../src/empathy-new-chatroom-dialog.glade.h:7
-msgid "Re_fresh"
-msgstr "é??æ?°æ?´ç??(_F)"
-
-#: ../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.ui.h:1
+msgid "Allow _GPS usage"
+msgstr "å??許使ç?¨ _GPS"
 
-#: ../src/empathy-preferences.glade.h:2
-msgid "<b>Behavior</b>"
-msgstr "<b>è¡?ç?º</b>"
+#: ../src/empathy-preferences.ui.h:2
+msgid "Allow _cellphone usage"
+msgstr "å??許使ç?¨æµ?å??é?»è©±(_C)"
 
-#: ../src/empathy-preferences.glade.h:3
-msgid "<b>Contact List</b>"
-msgstr "<b>�絡人��</b>"
+#: ../src/empathy-preferences.ui.h:3
+msgid "Allow _network usage"
+msgstr "å??許使ç?¨ç¶²çµ¡(_N)"
 
-#: ../src/empathy-preferences.glade.h:4
-msgid "<b>Enable spell checking for languages:</b>"
-msgstr "<b>å??ç?¨æ?¼å­?檢æ?¥ç¨?å¼?èª?è¨?ï¼?</b>"
+#: ../src/empathy-preferences.ui.h:4
+msgid "Appearance"
+msgstr "��"
 
-#: ../src/empathy-preferences.glade.h:5
-msgid "<b>Play sound for events</b>"
-msgstr "<b>æ?­æ?¾äº?件é?³æ??</b>"
-
-#: ../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)"
 
-#: ../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
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é??ç?¥(_D)"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é?³æ??(_A)"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "ç?¶è?¯çµ¡äººä¸?ç·?æ??å??ç?¨é??ç?¥"
+
+#: ../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 "ç?¶è??天è¦?çª?失å?»ç?¦é»?æ??å??ç?¨é??ç?¥(_C)"
 
-#: ../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
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Geoclue 設��"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "ä½?ç½®"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 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.glade.h:17
+#: ../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 "é??ä½?ä½?ç½®æº?確度æ??æ??é?¤äº?ä½ æ??å?¨ç??å??å¸?ã??æ´²å??å??家æ??被å?¬é??ä¹?å¤?ï¼?ä¸?æ??æ??ä¾?å?¶ä»?è¨?æ?¯ã??å?¨ç??å®?ä½?系統ç??座æ¨?å°?æ??é?¨æ©?å? å?¥æ?¸å?¼(&#xB1;0.25&#xB0;)ã??"
+
+#: ../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
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "å??ç?¨æ°£æ³¡å¼?é??ç?¥(_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
-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 "ç?¡æ³?å??å??æ??å?? %s ç??æ??ç?¨ç¨?å¼?ï¼?%s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../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 ç??é??è«?ï¼?ä½?æ?¯ä½ æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨æ??ç?¨ç¨?å¼?ã??"
 
-#~ msgid "Closed"
-#~ msgstr "å·²é??é??"
-
-#~ msgid "End this call?"
-#~ msgstr "çµ?æ??é??次é??話ï¼?"
-
-#~ msgid "Closing this window will end the call in progress."
-#~ msgstr "é??é??é??å??è¦?çª?æ??çµ?æ??é??å?¨é?²è¡?中ç??é??話ã??"
-
-#~ msgid "_End Call"
-#~ msgstr "çµ?æ??é??話(_E)"
-
-#~ msgid "Empathy Call"
-#~ msgstr "Empathy �話"
-
-#~ msgid "Readying"
-#~ msgstr "æ­£å?¨æº?å??"
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
 
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - Empathy �話"
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "è?¯çµ¡äººå?°å??檢è¦?"
 
-#~ msgid "Ringing"
-#~ msgstr "�話��"
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "�誤"
 
-#~ msgid ""
-#~ "Incoming call from %s rejected because there is already a running call."
-#~ msgstr "å·²æ??çµ? %s ç??ä¾?é?»ï¼?å? ç?ºç?®å??å·²ç¶?å?¨é??話中ã??"
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "å?´é??"
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "è­¦å??"
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "��"
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "��"
 
-#~ msgid "1"
-#~ msgstr "1"
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "��"
 
-#~ msgid "2"
-#~ msgstr "2"
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "��"
 
-#~ msgid "3"
-#~ msgstr "3"
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "����"
 
-#~ msgid "4"
-#~ msgstr "4"
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "æ?«å??"
 
-#~ msgid "5"
-#~ msgstr "5"
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "ç­?ç´?"
 
-#~ msgid "6"
-#~ msgstr "6"
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "æ??å?»"
 
-#~ msgid "7"
-#~ msgstr "7"
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "網å??"
 
-#~ msgid "8"
-#~ msgstr "8"
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "å??é¡?"
 
-#~ msgid "9"
-#~ msgstr "9"
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "ç­?ç´?"
 
-#~ msgid "<b>Keypad</b>"
-#~ msgstr "<b>æ?¥è??ç?¤</b>"
-
-#~ msgid "Enable popup when contact is available"
-#~ msgstr "ç?¶é?£çµ¡äººæ??空æ??å??ç?¨å½?å?ºè¦?çª?"
-
-#~ msgid "Enable sound when busy"
-#~ msgstr "ç?¶å¿?ç¢?æ??å??ç?¨é?³æ??"
-
-#~ msgid "Invitation Error"
-#~ msgstr "é??è«?ç?¼ç??é?¯èª¤"
-
-#~ msgid "<b>Audio</b>"
-#~ msgstr "<b>é?³æ??æ??示</b>"
-
-#~ msgid "<b>Visual</b>"
-#~ msgstr "<b>è¦?覺æ??示</b>"
-
-#~ msgid "Enable sounds when _busy"
-#~ msgstr "ç?¶å¿?ç¢?æ??å??ç?¨é?³æ??(_B)"
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "é?¸å??ç??é?£ç·?管ç??ç¨?å¼?ä¸?æ?¯æ?´é? 端å?µé?¯æ?´å??å??è?½ã??"
 
-#~ msgid "Configure Telepathy account settings"
-#~ msgstr "設å®? Telepathy 帳è??設å®?å?¼"
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy å?³æ??é??è¨?ç¨?å¼?"
 
-#~ msgid ""
-#~ "To add a new account, you can click on the 'Add' button and a new entry "
-#~ "will be created for you to start configuring."
-#~ msgstr ""
-#~ "è¦?å? å?¥æ?°ç??帳è??ï¼?æ?¨å?¯ä»¥æ??ä¸?ã??å? å?¥ã??æ??é??ï¼?é??樣就æ??建ç«?ä¸?å??æ?°ç??é ?ç?®è®?æ?¨é??å§?設"
-#~ "å®?ã??"
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "å?¨é?£ç·?人æ¸?å?®ä¸­é¡¯ç¤ºä½¿ç?¨è??é?¸æ??ç??å¤§é ­è²¼"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "If you do not want to add an account, simply click on the account you "
-#~ "want to configure in the list on the left."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "å¦?æ??æ?¨ä¸?æ?³å? å?¥å¸³è??ï¼?å?ªè¦?å?¨å·¦é??æ¸?å?®ä¸­é»?é?¸æ?³è¦?設å®?ç??帳è??å?³å?¯ã??"
+#~ msgid "Show _avatars"
+#~ msgstr "é¡¯ç¤ºå¤§é ­è²¼(_A)"
 
-#~ msgid "<b>No Accounts Configured</b>"
-#~ msgstr "<b>å°?æ?ªè¨­å®?帳è??</b>"
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "顯示精簡�絡人��(_M)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5574d98..5dabbf5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -2,25 +2,29 @@
 # Copyright (C) 2003, 2004 Free Software Foundation, Inc.
 # Abel Cheung <abel oaka org>, 2003, 2004.
 # Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2005.
+# Tryneeds translation team, 2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.25.92\n"
+"Project-Id-Version: empathy 2.27.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-17 21:30+0800\n"
-"PO-Revision-Date: 2009-02-17 21:30+0800\n"
+"POT-Creation-Date: 2009-08-02 16:10+0800\n"
+"PO-Revision-Date: 2009-06-19 08:17+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=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"
-msgstr "Empathy å?³æ??é??è¨?ç¨?å¼?"
+msgid "Empathy IM Client"
+msgstr ""
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Send and receive instant messages"
+#, fuzzy
+#| msgid "Send and receive instant messages"
+msgid "Send and receive messages"
 msgstr "å?³é??è??æ?¥æ?¶å?³æ??è¨?æ?¯"
 
 #: ../data/empathy.schemas.in.h:1
@@ -63,244 +67,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 "Empathy æ??é??ä½?ä½?ç½®ç??æº?確度"
+
+#: ../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 "å¦?æ??è??天室使ç?¨ç??主é¡?æ?¯ adium æ??è¦?使ç?¨ç?? adium ä½?æ?¯ä¸»é¡?è·¯å¾?ã??"
+
+#: ../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 "å¦?æ??è??天è¦?çª?失å?»ç?¦é»?å??å½?å?ºé??ç?¥"
 
-#: ../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 帳è??"
 
-#: ../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 "Empathy æ?¯å?¦ä½¿ç?¨é?£çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
 
-#: ../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 "å?¨æ?·ç·?/é??æ?°é?£ç·?æ??æ?¯å?¦è?ªå??使ç?¨ç¶²è·¯ç®¡ç??ç¨?å¼?ã??"
 
-#: ../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
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether or not to play a sound to notify for contacts logging in the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é?£çµ¡äººç?»å?¥ç¶²è·¯ã??"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether or not to play a sound to notify for contacts logging off the "
 "network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é?£çµ¡äººç?»å?ºç¶²è·¯ã??"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:66
 msgid "Whether or not to play a sound to notify for events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:67
 msgid "Whether or not to play a sound to notify for incoming messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯æ?µé??ã??"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether or not to play a sound to notify for new conversations."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥é??å??æ?°ç??è«?話ã??"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether or not to play a sound to notify for outgoing messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯é??å?ºã??"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:70
 msgid "Whether or not to play a sound when logging in a network."
 msgstr "ç?¶ç?»å?¥ç¶²è·¯æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether or not to play a sound when logging off a network."
 msgstr "ç?¶ç?»å?ºç¶²è·¯æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether or not to play sound notifications when away or busy."
 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
+#: ../data/empathy.schemas.in.h:76
 msgid ""
 "Whether or not to show a popup notification when receiving a new message."
 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
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether or not to show popup notifications when away or busy."
 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 "
@@ -309,720 +398,968 @@ msgstr ""
 "æ??åº?é?£çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æ¢?件ã??é ?設å?¼æ?¯ä½¿ç?¨é?£çµ¡äººç??å??稱ã??nameã??æ?¸å?¼ä¾?æ??åº?ã??"
 "è??æ?¸å?¼ã??stateã??å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?é?£çµ¡äººæ¸?å?®ã??"
 
-#: ../libempathy/empathy-tp-contact-list.c:731 ../src/empathy.c:269
+#: ../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
+#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
 msgid "_First Name:"
 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 "è??天室æ¸?å?®å?°å??(_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 "æ?¨ç??系統ä¸?æ?¯æ?´é??äº?å??ç??æ ¼å¼?"
 
-#: ../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 "è«?æ??é??裡æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:507
+#: ../libempathy-gtk/empathy-chat.c:186
+msgid "Failed to reconnect this chat"
+msgstr "ç?¡æ³?é??é?£é??å??è??天æ??è­°"
+
+#: ../libempathy-gtk/empathy-chat.c:404
+msgid "Unsupported command"
+msgstr "ä¸?æ?¯æ?´æ­¤æ??令"
+
+#: ../libempathy-gtk/empathy-chat.c:539
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:510
+#: ../libempathy-gtk/empathy-chat.c:542
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:513
+#: ../libempathy-gtk/empathy-chat.c:545
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:516
+#: ../libempathy-gtk/empathy-chat.c:548
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:519
+#: ../libempathy-gtk/empathy-chat.c:551
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:522
+#: ../libempathy-gtk/empathy-chat.c:554
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:526
+#: ../libempathy-gtk/empathy-chat.c:558
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:556
+#: ../libempathy-gtk/empathy-chat.c:588
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:590
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:973
+#: ../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:991
-#: ../libempathy-gtk/empathy-ui-utils.c:1538
+#: ../libempathy-gtk/empathy-chat.c:1032
+#: ../libempathy-gtk/empathy-ui-utils.c:1480
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1025
-msgid "_Check Word Spelling..."
-msgstr "檢���(_C)..."
+#: ../libempathy-gtk/empathy-chat.c:1066
+msgid "_Spelling Suggestions"
+msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1131
+#: ../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: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:1134
+#: ../libempathy-gtk/empathy-chat.c:1200
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1248 ../src/empathy-call-window.c:548
+#. 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:1365 ../src/empathy-call-window.c:1225
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:1644
+#: ../libempathy-gtk/empathy-chat.c:1800
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:1694
-#: ../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:340
+#. Copy Link Address menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:316
+#: ../libempathy-gtk/empathy-theme-adium.c:267
 msgid "_Copy Link Address"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:348
+#. Open Link menu item
+#: ../libempathy-gtk/empathy-chat-text-view.c:323
+#: ../libempathy-gtk/empathy-theme-adium.c:275
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
-#: ../libempathy-gtk/empathy-chat-text-view.c:439
+#. Translators: timestamp displayed between conversations in
+#. * chat windows (strftime format string)
+#: ../libempathy-gtk/empathy-chat-text-view.c:421
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:180
-msgid "Personal Information"
-msgstr "å??人è³?è¨?"
-
-#: ../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:394
 msgid "New Contact"
 msgstr "���絡人"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.glade.h:1
+#: ../libempathy-gtk/empathy-contact-dialogs.ui.h:1
 msgid "Decide _Later"
 msgstr "ç¨?å¾?å??決å®?"
 
-#: ../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:1249
+#: ../libempathy-gtk/empathy-contact-list-view.c:1404
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤ç¾¤çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1251
+#: ../libempathy-gtk/empathy-contact-list-view.c:1406
 msgid "Removing group"
 msgstr "正�移�群�"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1298
-#: ../libempathy-gtk/empathy-contact-list-view.c:1377
+#. Remove
+#: ../libempathy-gtk/empathy-contact-list-view.c:1453
+#: ../libempathy-gtk/empathy-contact-list-view.c:1530
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1328
+#: ../libempathy-gtk/empathy-contact-list-view.c:1483
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤é?£çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1330
+#: ../libempathy-gtk/empathy-contact-list-view.c:1485
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1335
-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 "é??話(_C)"
+#: ../libempathy-gtk/empathy-contact-menu.c:253
+msgctxt "menu item"
+msgid "_Audio Call"
+msgstr "èª?é?³é??話(_A)"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:285
+msgctxt "menu item"
+msgid "_Video Call"
+msgstr "è¦?è¨?é??話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:200
-#: ../src/empathy-main-window.glade.h:17
+#: ../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-chat-window.ui.h:10 ../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 "é??è«?å?°é??å??è??天室"
 
-#: ../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
+#: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é?¸æ??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:358
+#: ../libempathy-gtk/empathy-contact-widget.c:447
 msgid "Save Avatar"
 msgstr "å?²å­?å¤§é ­è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:503
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:895
+#: ../libempathy-gtk/empathy-contact-widget.c:996
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:904
-#: ../src/empathy-main-window.c:991
+#: ../libempathy-gtk/empathy-contact-widget.c:1005
+#: ../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:1256
+msgid "Country ISO Code:"
+msgstr "å??家 ISO 碼ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1258
+msgid "Country:"
+msgstr "å??家ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1260
+msgid "State:"
+msgstr "å·?ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1262
+msgid "City:"
+msgstr "��"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1264
+msgid "Area:"
+msgstr "å??å??ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1266
+msgid "Postal Code:"
+msgstr "é?µé??å??è??ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1268
+msgid "Street:"
+msgstr "è¡?ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1270
+msgid "Building:"
+msgstr "建��"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1272
+msgid "Floor:"
+msgstr "�層�"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1274
+msgid "Room:"
+msgstr "室�"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1276
+msgid "Text:"
+msgstr "æ??å­?ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1278
+msgid "Description:"
+msgstr "æ??è¿°ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1280
+msgid "URI:"
+msgstr "URIï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1282
+msgid "Accuracy Level:"
+msgstr "�確度���"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1284
+msgid "Error:"
+msgstr "�誤�"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1286
+msgid "Vertical Error (meters):"
+msgstr "å??ç?´èª¤å·®ï¼?å?¬å°ºï¼?ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1288
+msgid "Horizontal Error (meters):"
+msgstr "水平誤差��尺��"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:2
-msgid "<b>Contact Details</b>"
-msgstr "<b>é?£çµ¡äººè©³ç´°è³?æ??</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1290
+msgid "Speed:"
+msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:3
-msgid "<b>Contact</b>"
-msgstr "<b>�絡人</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1292
+#, fuzzy
+msgid "Bearing:"
+msgstr "ç??æ?¬:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1294
+msgid "Climb Speed:"
+msgstr "ç?¬å??é??度ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1296
+msgid "Last Updated on:"
+msgstr "�次����"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1298
+msgid "Longitude:"
+msgstr "�度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1300
+msgid "Latitude:"
+msgstr "緯度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1302
+msgid "Altitude:"
+msgstr "緯度:"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1349
+msgid "<b>Location</b>"
+msgstr "<b>ä½?ç½®</b>"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:1362
+msgid "<b>Location</b>, "
+msgstr "<b>ä½?ç½®<b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.glade.h:4
-msgid "<b>Groups</b>"
-msgstr "<b>群�</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:1412
+msgid "%B %e, %Y at %R UTC"
+msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../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.ui.h:1
+msgid "<b>Location</b> at (date)\t"
+msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
+
+#: ../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.glade.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "Contact Details"
+msgstr "é?£çµ¡äººè©³ç´°è³?æ??"
+
+#: ../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 "���:"
 
-#: ../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 "OS:"
 
-#: ../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 "å? å?¥ç¾¤çµ?(_G)"
 
-#: ../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:277
+#: ../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 "è??天(_C)"
 
-#: ../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_STATUS_TEXT
+#. COL_STATE_ICON_NAME
+#. COL_STATE
+#. COL_DISPLAY_MARKUP
+#. COL_STATUS_CUSTOMISABLE
+#. COL_TYPE
+#: ../libempathy-gtk/empathy-presence-chooser.c:172
+#: ../libempathy-gtk/empathy-presence-chooser.c:208
+msgid "Custom Message..."
 msgstr "����..."
 
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:1
-msgid "Custom message"
-msgstr "����"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:2
-msgid "Message:"
-msgstr "��:"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:3
-msgid "Save message"
-msgstr "����"
-
-#: ../libempathy-gtk/empathy-presence-chooser.glade.h:4
-msgid "Status:"
-msgstr "ç??æ??:"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:88
-msgid "Word"
-msgstr "å­?"
-
-#: ../libempathy-gtk/empathy-spell-dialog.c:265
-msgid "Suggestions for the word"
-msgstr "å°?é??å??å­?ç??建議"
-
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:1
-msgid "Spell Checker"
-msgstr "��檢�"
+#: ../libempathy-gtk/empathy-presence-chooser.c:225
+#: ../libempathy-gtk/empathy-presence-chooser.c:227
+msgid "Edit Custom Messages..."
+msgstr "編輯����..."
 
-#: ../libempathy-gtk/empathy-spell-dialog.glade.h:2
-msgid "Suggestions for the word:"
-msgstr "å°?é??å??å­?ç??建議ï¼?"
+#: ../libempathy-gtk/empathy-presence-chooser.c:326
+msgid "Click to remove this status as a favorite"
+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 "è??è?²"
+#: ../libempathy-gtk/empathy-presence-chooser.c:369
+msgid "Set status"
+msgstr "設å®?ç??æ??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1385
-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:1530
-msgid "Select a file"
-msgstr "é?¸æ??ä¸?å??æª?æ¡?"
+#. Custom messages
+#: ../libempathy-gtk/empathy-presence-chooser.c:1017
+msgid "Custom messages..."
+msgstr "����..."
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1566
+#: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "æ?¶å?°å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1568
+#: ../libempathy-gtk/empathy-sound.c:53
 msgid "Sent an instant message"
 msgstr "å?³é??å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1570
+#: ../libempathy-gtk/empathy-sound.c:55
 msgid "Incoming chat request"
 msgstr "æ?¶å?°è??天è¦?æ±?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1572
+#: ../libempathy-gtk/empathy-sound.c:57
 msgid "Contact connected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1574
+#: ../libempathy-gtk/empathy-sound.c:59
 msgid "Contact disconnected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1576
+#: ../libempathy-gtk/empathy-sound.c:61
 msgid "Connected to server"
 msgstr "é?£æ?¥å?°ä¼ºæ??å?¨"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1578
+#: ../libempathy-gtk/empathy-sound.c:63
 msgid "Disconnected from server"
 msgstr "è??伺æ??å?¨æ?·ç·?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1580
+#: ../libempathy-gtk/empathy-sound.c:65
 msgid "Incoming voice call"
 msgstr "æ?¶å?°èª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1582
+#: ../libempathy-gtk/empathy-sound.c:67
 msgid "Outgoing voice call"
 msgstr "æ?­å?ºèª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1584
+#: ../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 "å? å?¥æ?°ç??é ?å??設å®?(_N)"
+
+#: ../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 "gtk-add"
+
+#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
+msgid "gtk-remove"
+msgstr "gtk-remove"
+
+#: ../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 "ç?®å??ç??å?°å??設å®?"
@@ -1207,7 +1544,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 "�話�"
 
@@ -1221,15 +1558,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 "é?¸æ??é?£çµ¡äºº..."
 
@@ -1242,23 +1579,25 @@ msgstr "ä¸?ç·?ç??æ??"
 msgid "Set your own presence"
 msgstr "設å®?æ?¨è?ªå·±ç??ä¸?ç·?ç??æ??"
 
-#: ../src/empathy.c:426
+#: ../src/empathy.c:567
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:430
+#: ../src/empathy.c:571
 msgid "Don't show the contact list on startup"
 msgstr "å??å??æ??ä¸?顯示é?£çµ¡äººæ¸?å?®"
 
-#: ../src/empathy.c:434
+#: ../src/empathy.c:575
 msgid "Show the accounts dialog"
 msgstr "顯示帳è??å°?話ç??"
 
-#: ../src/empathy.c:446
-msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:587
+#, fuzzy
+#| msgid "- Empathy Instant Messenger"
+msgid "- Empathy IM Client"
 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 "
@@ -1269,7 +1608,7 @@ msgstr ""
 "ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?"
 "é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../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 "
@@ -1279,7 +1618,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 "
@@ -1289,11 +1628,11 @@ msgstr ""
 "給� Free Software Foundation, Inc., 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 ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -1304,22 +1643,21 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../src/empathy-accounts-dialog.c:391
+#: ../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"
@@ -1328,7 +1666,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"
@@ -1340,301 +1678,299 @@ msgstr ""
 "\n"
 "ç?¶æ?¨å¾?å¾?決å®?è¦?å°?該帳è??é??æ?°å? å?¥æ??ï¼?ä¸?è¿°è³?æº?å°?ä»?ç?¶å?¯ä»¥å??ç?¨ã??"
 
-#: ../src/empathy-accounts-dialog.glade.h:1
-msgid "<b>New Account</b>"
-msgstr "<b>æ?°å¢?帳è??</b>"
-
-#: ../src/empathy-accounts-dialog.glade.h:2
-msgid "<b>No protocol installed</b>"
-msgstr "<b>å°?æ?ªå®?è£?é??è¨?å??å®?</b>"
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "Add Account"
+msgstr "å? å?¥å¸³è??"
 
-#: ../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:258
+#: ../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 "��"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:423
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:258
+#: ../src/empathy-call-window.c:426
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:290
+#: ../src/empathy-call-window.c:531
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:366
+#: ../src/empathy-call-window.c:662
+msgid "Connecting..."
+msgstr "��中..."
+
+#: ../src/empathy-call-window.c:746
 msgid "_Sidebar"
 msgstr "å?´é??å??(_S)"
 
-#: ../src/empathy-call-window.c:384
+#: ../src/empathy-call-window.c:765
 msgid "Dialpad"
 msgstr "æ?­è??ç?¤"
 
-#: ../src/empathy-call-window.c:390
+#: ../src/empathy-call-window.c:771
 msgid "Audio input"
 msgstr "é?³æ??輸å?¥"
 
-#: ../src/empathy-call-window.c:394
+#: ../src/empathy-call-window.c:775
 msgid "Video input"
 msgstr "��輸�"
 
-#: ../src/empathy-call-window.c:407
-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 "é??話"
 
-#: ../src/empathy-call-window.c:572
+#. Translators: number of minutes:seconds the caller has been connected
+#: ../src/empathy-call-window.c:1335
 #, c-format
-msgid "Connected -- %d:%02dm"
-msgstr "已�� -- %d:%02dm"
+msgid "Connected â?? %d:%02dm"
+msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.glade.h:1
+#: ../src/empathy-call-window.ui.h:1
 msgid "Hang up"
 msgstr "æ??æ?·"
 
-#: ../src/empathy-call-window.glade.h:2
+#: ../src/empathy-call-window.ui.h:2
+msgid "Redial"
+msgstr "é??æ?¥"
+
+#: ../src/empathy-call-window.ui.h:3
 msgid "Send Audio"
 msgstr "å?³é??é?³è¨?"
 
-#: ../src/empathy-call-window.glade.h:3
+#: ../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 "è¦?è¨?é ?覽"
 
-#: ../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 "檢�(_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:424
-#, c-format
-msgid "New message from %s"
-msgstr "ä¾?è?ª %s ç??æ?°è¨?æ?¯"
-
-#: ../src/empathy-chat-window.glade.h:1
+#: ../src/empathy-chat-window.ui.h:1
+#, fuzzy
+#| msgid "Clean"
 msgid "C_lear"
-msgstr "��(_L)"
+msgstr "��"
 
-#: ../src/empathy-chat-window.glade.h:2
+#: ../src/empathy-chat-window.ui.h:2
+#, fuzzy
+#| msgid "_Chat"
 msgid "Chat"
-msgstr "è??天"
+msgstr "è??天(_C)"
 
-#: ../src/empathy-chat-window.glade.h:3
+#: ../src/empathy-chat-window.ui.h:3
+#, fuzzy
+#| msgid "Insert Smiley"
 msgid "Insert _Smiley"
-msgstr "æ??å?¥è¡¨æ??符è??(_S)"
-
-#: ../src/empathy-chat-window.glade.h:4
-msgid "Invitation _message:"
-msgstr "é??è«?è¨?æ?¯(_M):"
-
-#: ../src/empathy-chat-window.glade.h:5
-msgid "Invite"
-msgstr "é??è«?"
+msgstr "æ??å?¥è¡¨æ??符è??"
 
-#: ../src/empathy-chat-window.glade.h:6
+#: ../src/empathy-chat-window.ui.h:4
 msgid "Move Tab _Left"
-msgstr "å°?å??é ?左移(_L)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:7
+#: ../src/empathy-chat-window.ui.h:5
 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 "æ?¨å·²ç¶?被é??è«?å? å?¥è??天æ??è­°ã??"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:6
+#, fuzzy
+#| msgid "Contact"
 msgid "_Contact"
-msgstr "�絡人(_C)"
+msgstr "�絡人"
 
-#: ../src/empathy-chat-window.glade.h:11 ../src/empathy-main-window.glade.h:10
+#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../src/empathy-chat-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:8
+#, fuzzy
+#| msgid "Conversation"
 msgid "_Conversation"
-msgstr "�話(_C)"
+msgstr "�話"
 
-#: ../src/empathy-chat-window.glade.h:13
+#: ../src/empathy-chat-window.ui.h:9
 msgid "_Detach Tab"
-msgstr "������(_D)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:15
+#: ../src/empathy-chat-window.ui.h:11
+#, fuzzy
+#| msgid "_Invite to chatroom"
 msgid "_Favorite Chatroom"
-msgstr "å??好ç??è??天室(_F)"
+msgstr "é??è«?å?°é??å??è??天室(_I)"
 
-#: ../src/empathy-chat-window.glade.h:16 ../src/empathy-main-window.glade.h:12
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../src/empathy-chat-window.glade.h:17
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Next Tab"
-msgstr "ä¸?ä¸?å??å??é ?(_N)"
+msgstr ""
 
-#: ../src/empathy-chat-window.glade.h:18
+#: ../src/empathy-chat-window.ui.h:14
+#, fuzzy
+#| msgid "_Previous Conversations"
 msgid "_Previous Tab"
-msgstr "ä¸?ä¸?å??å??é ?(_P)"
+msgstr "��次�話(_P)"
 
-#: ../src/empathy-chat-window.glade.h:19
+#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+msgid "_Show Contact List"
+msgstr "顯示�絡人��(_S)"
+
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Tabs"
-msgstr "å??é ?(_T)"
+msgstr ""
 
-#: ../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 "è??天室"
 
-#: ../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:372
+#: ../src/empathy-event-manager.c:321
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:375
+#: ../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:382
+#: ../src/empathy-event-manager.c:331
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:388
+#: ../src/empathy-event-manager.c:337
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:511
+#: ../src/empathy-event-manager.c:452
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:559
+#: ../src/empathy-event-manager.c:496
 #, c-format
 msgid "%s is offering you an invitation"
 msgstr "%s æ­£å?¨é??è«?æ?¨"
 
-#: ../src/empathy-event-manager.c:565
+#: ../src/empathy-event-manager.c:502
 msgid "An external application will be started to handle it."
 msgstr "å°?å??å??å¤?é?¨æ??ç?¨ç¨?å¼?ä¾?è??ç??å®?ã??"
 
-#: ../src/empathy-event-manager.c:570
+#: ../src/empathy-event-manager.c:507
 msgid "You don't have the needed external application to handle it."
 msgstr "æ?¨æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨æ??ç?¨ç¨?å¼?ã??"
 
-#: ../src/empathy-event-manager.c:692
+#: ../src/empathy-event-manager.c:634
 msgid "Room invitation"
 msgstr "è??天é??è«?"
 
-#: ../src/empathy-event-manager.c:695
+#: ../src/empathy-event-manager.c:637
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£å?¨é??è«?æ?¨å? å?¥ %s"
 
-#. Decline button
-#: ../src/empathy-event-manager.c:703 ../src/empathy-ft-manager.c:1021
+#: ../src/empathy-event-manager.c:645
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:708
+#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:738
+#: ../src/empathy-event-manager.c:689
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:860
+#: ../src/empathy-event-manager.c:715
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:954
+#: ../src/empathy-event-manager.c:895
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
 
-#: ../src/empathy-event-manager.c:958
+#: ../src/empathy-event-manager.c:899
 #, c-format
 msgid ""
 "\n"
@@ -1643,596 +1979,632 @@ msgstr ""
 "\n"
 "���%s"
 
-#: ../src/empathy-ft-manager.c:113
+#. 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:101
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:115
+#. Translators: time left, when is is less than one hour
+#: ../src/empathy-ft-manager.c:104
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:164
-msgid "No reason was specified"
-msgstr "æ²?æ??æ??å®?å??å? "
-
-#: ../src/empathy-ft-manager.c:166
-msgid "The change in state was requested"
-msgstr "å·²è¦?æ±?è®?æ?´ç??æ??"
-
-#: ../src/empathy-ft-manager.c:168
-msgid "You canceled the file transfer"
-msgstr "æ?¨å·²å??æ¶?æª?æ¡?å?³è¼¸"
-
-#: ../src/empathy-ft-manager.c:170
-msgid "The other participant canceled the file transfer"
-msgstr "å?¶ä»?ç??å??è??è??å??æ¶?äº?æª?æ¡?å?³è¼¸"
-
-#: ../src/empathy-ft-manager.c:172
-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:174
-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 "%s / %s æ?¼ %s/s"
 
-#: ../src/empathy-ft-manager.c:176
-msgid "Unknown reason"
-msgstr "ä¸?æ??ç??å??å? "
+#: ../src/empathy-ft-manager.c:276
+#, c-format
+msgid "%s of %s"
+msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:224
+#: ../src/empathy-ft-manager.c:307
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "æ­£å?¨æ?¥æ?¶ %2$s é??å?ºç??ã??%1$sã??"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:227
+#: ../src/empathy-ft-manager.c:310
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "æ­£å?¨å?³é??ã??%sã??給 %s"
 
-#: ../src/empathy-ft-manager.c:237
-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:245
+#: ../src/empathy-ft-manager.c:348
 #, c-format
-msgid "%s of %s"
-msgstr "%s / %s"
+msgid "Error sending \"%s\" to %s"
+msgstr "å?³é??ã??%sã??給 %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:252
-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:262
+#. 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 "ã??%sã??æ?¥æ?¶è?ª %s"
 
-#: ../src/empathy-ft-manager.c:268
+#. 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 "ã??%sã??å?³é??給 %s"
 
-#: ../src/empathy-ft-manager.c:271
+#: ../src/empathy-ft-manager.c:498
 msgid "File transfer completed"
 msgstr "���輸��"
 
-#: ../src/empathy-ft-manager.c:280
-#, c-format
-msgid "\"%s\" receiving from %s"
-msgstr "ã??%sã??æ­£æ?¥æ?¶è?ª %s"
+#: ../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:286
+#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
 #, c-format
-msgid "\"%s\" sending to %s"
-msgstr "ã??%sã??æ­£å?³é??給 %s"
+msgid "Checking integrity of \"%s\""
+msgstr "æ­£å?¨æª¢æ?¥æª?æ¡?ã??%sã??ç??å®?æ?´æ?§"
 
-#: ../src/empathy-ft-manager.c:289
+#: ../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:304
-msgctxt "remaining time"
-msgid "Unknown"
-msgstr "ä¸?æ??"
+msgid "Hashing \"%s\""
+msgstr "æ­£å?¨è¨?ç®?ã??%sã??é??æ¹?å?¼"
 
-#: ../src/empathy-ft-manager.c:364
-msgctxt "file transfer percent"
-msgid "Unknown"
-msgstr "ä¸?æ??"
-
-#: ../src/empathy-ft-manager.c:700
+#: ../src/empathy-ft-manager.c:1024
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:712
+#: ../src/empathy-ft-manager.c:1036
 msgid "File"
 msgstr "��"
 
-#: ../src/empathy-ft-manager.c:734
+#: ../src/empathy-ft-manager.c:1058
 msgid "Remaining"
 msgstr "��"
 
-#: ../src/empathy-ft-manager.c:885
-msgid "Cannot save file to this location"
-msgstr "ç?¡æ³?å°?æª?æ¡?å?²å­?å?°é??å??ä½?ç½®"
-
-#: ../src/empathy-ft-manager.c:931
-msgid "Save file as..."
-msgstr "����..."
-
-#: ../src/empathy-ft-manager.c:1001
-msgid "unknown size"
-msgstr "ä¸?æ??ç??大å°?"
-
-#: ../src/empathy-ft-manager.c:1007
-#, c-format
-msgid "%s would like to send you a file"
-msgstr " %s æ?³è¦?å?³é??給æ?¨ä¸?å??æª?æ¡?"
-
-#: ../src/empathy-ft-manager.c:1012
-#, c-format
-msgid "Do you want to accept the file \"%s\" (%s)?"
-msgstr "æ?¯å?¦è¦?æ?¥æ?¶æª?æ¡?ã??%sã??(%s)ï¼?"
-
-#. Accept button
-#: ../src/empathy-ft-manager.c:1030
-msgid "_Accept"
-msgstr "æ?¥å??(_A)"
-
-#: ../src/empathy-ft-manager.glade.h:1
-msgid "File transfers"
+#: ../src/empathy-ft-manager.ui.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 "å¾?æ¸?å?®ä¸­ç§»é?¤å·²å®?æ??ã??å·²å??æ¶?å??失æ??ç??æª?æ¡?å?³è¼¸"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:255
+#: ../src/empathy-import-dialog.c:263
 msgid "Import"
 msgstr "��"
 
-#: ../src/empathy-import-dialog.c:264
+#: ../src/empathy-import-dialog.c:272
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../src/empathy-import-dialog.c:290
+#: ../src/empathy-import-dialog.c:298
 msgid "Source"
 msgstr "��"
 
-#: ../src/empathy-import-dialog.c:378
+#: ../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 "é?£çµ¡äººå?°å??(_M)"
+
+#: ../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)..."
-
-#: ../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 ""
+
+#: ../src/empathy-main-window.ui.h:7
+msgid "Normal Size With _Avatars"
+msgstr ""
+
+#: ../src/empathy-main-window.ui.h:8
+#, fuzzy
+#| msgid "Sort by _name"
+msgid "Sort by _Name"
+msgstr "ä¾?å??稱æ??åº?(_N)"
 
-#: ../src/empathy-main-window.glade.h:7
+#: ../src/empathy-main-window.ui.h:9
+#, fuzzy
+#| msgid "Sort by s_tate"
+msgid "Sort by _Status"
+msgstr "ä¾?ç??æ??æ??åº?(_T)"
+
+#: ../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 ""
+
+#: ../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:19
+msgid "_Join..."
+msgstr "å? å?¥(_J)..."
 
-#: ../src/empathy-main-window.glade.h:13 ../src/empathy-status-icon.glade.h:2
+#: ../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)"
 
-#: ../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 "ç??覽:"
+#: ../src/empathy-new-chatroom-dialog.c:347
+msgid "Members"
+msgstr "æ??å?¡"
 
-#: ../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 "å?¨é??裡輸å?¥è¦?å? å?¥ç??è??天室å??稱æ??å¾?æ¸?å?®ä¸­é»?é?¸ä¸?æ??å¤?å??è??天室ã??"
 
-#: ../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 "å? å?¥"
-
-#: ../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
-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.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.ui.h:4
+msgid "Appearance"
+msgstr "��"
 
-#: ../src/empathy-preferences.glade.h:7
+#: ../src/empathy-preferences.ui.h:5
 msgid "Automatically _connect on startup "
 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
+#: ../src/empathy-preferences.ui.h:8
 msgid "Disable notifications when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é??ç?¥(_D)"
 
-#: ../src/empathy-preferences.glade.h:11
+#: ../src/empathy-preferences.ui.h:9
 msgid "Disable sounds when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é?³æ??(_A)"
 
-#: ../src/empathy-preferences.glade.h:12
+#: ../src/empathy-preferences.ui.h:10
+msgid "Enable notifications when a contact comes online"
+msgstr "ç?¶é?£çµ¡äººä¸?ç·?æ??å??ç?¨é??ç?¥"
+
+#: ../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 "ç?¶è??天è¦?çª?失å?»ç?¦é»?æ??å??ç?¨é??ç?¥(_C)"
 
-#: ../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
+#: ../src/empathy-preferences.ui.h:15
+msgid "Geoclue Settings"
+msgstr "Geoclue 設��"
+
+#: ../src/empathy-preferences.ui.h:16
+msgid "Location"
+msgstr "ä½?ç½®"
+
+#: ../src/empathy-preferences.ui.h:17
 msgid "Notifications"
 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 ""
+"é??ä½?ä½?ç½®æº?確度æ??æ??é?¤äº?ä½ æ??å?¨ç??å??å¸?ã??æ´²å??å??家æ??被å?¬é??ä¹?å¤?ï¼?ä¸?æ??æ??ä¾?å?¶ä»?è¨?æ?¯ã??"
+"å?¨ç??å®?ä½?系統ç??座æ¨?å°?æ??é?¨æ©?å? å?¥æ?¸å?¼(&#xB1;0.25&#xB0;)ã??"
 
-#: ../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
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable bubble notifications"
 msgstr "å??ç?¨æ°£æ³¡å¼?é??ç?¥(_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
-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 "ç?¡æ³?å??å??æ??å?? %s ç??æ??ç?¨ç¨?å¼?ï¼?%s"
 
-#: ../src/empathy-tube-dispatch.c:435
+#: ../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 ç??é??è«?ï¼?ä½?æ?¯æ?¨æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨æ??ç?¨ç¨?å¼?ã??"
 
-#~ msgid "Closed"
-#~ msgstr "å·²é??é??"
-
-#~ msgid "End this call?"
-#~ msgstr "çµ?æ??é??次é??話ï¼?"
-
-#~ msgid "Closing this window will end the call in progress."
-#~ msgstr "é??é??é??å??è¦?çª?æ??çµ?æ??é??å?¨é?²è¡?中ç??é??話ã??"
-
-#~ msgid "_End Call"
-#~ msgstr "çµ?æ??é??話(_E)"
-
-#~ msgid "Empathy Call"
-#~ msgstr "Empathy �話"
-
-#~ msgid "Readying"
-#~ msgstr "æ­£å?¨æº?å??"
+#: ../src/empathy-call-window-fullscreen.ui.h:1
+msgid "gtk-leave-fullscreen"
+msgstr "gtk-leave-fullscreen"
 
-#~ msgid "%s - Empathy Call"
-#~ msgstr "%s - Empathy �話"
+#: ../src/empathy-map-view.ui.h:1
+msgid "Contact Map View"
+msgstr "é?£çµ¡äººå?°å??檢è¦?"
 
-#~ msgid "Ringing"
-#~ msgstr "�話��"
+#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
+msgid "Error"
+msgstr "�誤"
 
-#~ msgid ""
-#~ "Incoming call from %s rejected because there is already a running call."
-#~ msgstr "å·²æ??çµ? %s ç??ä¾?é?»ï¼?å? ç?ºç?®å??å·²ç¶?å?¨é??話中ã??"
+#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
+msgid "Critical"
+msgstr "å?´é??"
 
-#~ msgid "#"
-#~ msgstr "#"
+#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
+msgid "Warning"
+msgstr "è­¦å??"
 
-#~ msgid "*"
-#~ msgstr "*"
+#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
+#: ../src/empathy-debug-dialog.c:1113
+msgid "Message"
+msgstr "��"
 
-#~ msgid "0"
-#~ msgstr "0"
+#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
+msgid "Info"
+msgstr "��"
 
-#~ msgid "1"
-#~ msgstr "1"
+#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
+msgid "Debug"
+msgstr "��"
 
-#~ msgid "2"
-#~ msgstr "2"
+#: ../src/empathy-debug-dialog.c:845
+msgid "Save"
+msgstr "��"
 
-#~ msgid "3"
-#~ msgstr "3"
+#: ../src/empathy-debug-dialog.c:948
+msgid "Debug Window"
+msgstr "����"
 
-#~ msgid "4"
-#~ msgstr "4"
+#: ../src/empathy-debug-dialog.c:1021
+msgid "Pause"
+msgstr "æ?«å??"
 
-#~ msgid "5"
-#~ msgstr "5"
+#: ../src/empathy-debug-dialog.c:1033
+msgid "Level "
+msgstr "ç­?ç´?"
 
-#~ msgid "6"
-#~ msgstr "6"
+#: ../src/empathy-debug-dialog.c:1102
+msgid "Time"
+msgstr "æ??å?»"
 
-#~ msgid "7"
-#~ msgstr "7"
+#: ../src/empathy-debug-dialog.c:1104
+msgid "Domain"
+msgstr "網å??"
 
-#~ msgid "8"
-#~ msgstr "8"
+#: ../src/empathy-debug-dialog.c:1106
+msgid "Category"
+msgstr "å??é¡?"
 
-#~ msgid "9"
-#~ msgstr "9"
+#: ../src/empathy-debug-dialog.c:1108
+msgid "Level"
+msgstr "ç­?ç´?"
 
-#~ msgid "<b>Keypad</b>"
-#~ msgstr "<b>æ?¥è??ç?¤</b>"
-
-#~ msgid "Enable popup when contact is available"
-#~ msgstr "ç?¶é?£çµ¡äººæ??空æ??å??ç?¨å½?å?ºè¦?çª?"
-
-#~ msgid "Enable sound when busy"
-#~ msgstr "ç?¶å¿?ç¢?æ??å??ç?¨é?³æ??"
-
-#~ msgid "Invitation Error"
-#~ msgstr "é??è«?ç?¼ç??é?¯èª¤"
-
-#~ msgid "<b>Audio</b>"
-#~ msgstr "<b>é?³æ??æ??示</b>"
-
-#~ msgid "<b>Visual</b>"
-#~ msgstr "<b>è¦?覺æ??示</b>"
-
-#~ msgid "Enable sounds when _busy"
-#~ msgstr "ç?¶å¿?ç¢?æ??å??ç?¨é?³æ??(_B)"
+#: ../src/empathy-debug-dialog.c:1140
+msgid ""
+"The selected connection manager does not support the remote debugging "
+"extension."
+msgstr "é?¸å??ç??é?£ç·?管ç??ç¨?å¼?ä¸?æ?¯æ?´é? 端å?µé?¯æ?´å??å??è?½ã??"
 
-#~ msgid "Configure Telepathy account settings"
-#~ msgstr "設å®? Telepathy 帳è??設å®?å?¼"
+#~ msgid "Empathy Instant Messenger"
+#~ msgstr "Empathy å?³æ??é??è¨?ç¨?å¼?"
 
-#~ msgid ""
-#~ "To add a new account, you can click on the 'Add' button and a new entry "
-#~ "will be created for you to start configuring."
-#~ msgstr ""
-#~ "è¦?å? å?¥æ?°ç??帳è??ï¼?æ?¨å?¯ä»¥æ??ä¸?ã??å? å?¥ã??æ??é??ï¼?é??樣就æ??建ç«?ä¸?å??æ?°ç??é ?ç?®è®?æ?¨é??å§?設"
-#~ "å®?ã??"
+#~ msgid "Avatars are user chosen images shown in the contact list"
+#~ msgstr "å?¨é?£ç·?人æ¸?å?®ä¸­é¡¯ç¤ºä½¿ç?¨è??é?¸æ??ç??å¤§é ­è²¼"
 
-#~ msgid ""
-#~ "\n"
-#~ "\n"
-#~ "If you do not want to add an account, simply click on the account you "
-#~ "want to configure in the list on the left."
-#~ msgstr ""
-#~ "\n"
-#~ "\n"
-#~ "å¦?æ??æ?¨ä¸?æ?³å? å?¥å¸³è??ï¼?å?ªè¦?å?¨å·¦é??æ¸?å?®ä¸­é»?é?¸æ?³è¦?設å®?ç??帳è??å?³å?¯ã??"
+#~ msgid "Show _avatars"
+#~ msgstr "é¡¯ç¤ºå¤§é ­è²¼(_A)"
 
-#~ msgid "<b>No Accounts Configured</b>"
-#~ msgstr "<b>å°?æ?ªè¨­å®?帳è??</b>"
+#~ msgid "Show co_mpact contact list"
+#~ msgstr "顯示精簡�絡人��(_M)"