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

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

commit 88597272bf17b0922f27c4ae58f372bae79aa1cf
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Sat Jun 26 14:05:49 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1154 ++++++++++++++++++++++++++++++-----------------------------
 po/zh_TW.po | 1154 ++++++++++++++++++++++++++++++-----------------------------
 2 files changed, 1170 insertions(+), 1138 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 53a58a0..516d290 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.31.1\n"
+"Project-Id-Version: empathy 2.31.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-08 19:00+0800\n"
-"PO-Revision-Date: 2010-05-08 19:00+0800\n"
+"POT-Creation-Date: 2010-06-26 14:05+0800\n"
+"PO-Revision-Date: 2010-06-26 14:05+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -23,389 +23,389 @@ msgid "Empathy"
 msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "Empathy å?³æ??é??客æ?¶ç«¯"
+msgid "Empathy Internet Messaging"
+msgstr "Empathy äº?è?¯ç¶²é??è¨?ç¨?å¼?"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "IM Client"
-msgstr "å?³æ??é??客æ?¶ç«¯"
+msgstr "å?³æ??é??ç?¨æ?¶ç«¯"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "Send and receive messages"
 msgstr "å?³é??è??æ?¥æ?¶è¨?æ?¯"
 
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "æ°¸é? ç?ºæ¯?å??æ?°ç??è??天é??å??æ?°ç??è??天è¦?çª?ã??"
 
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "å?¨ç¾£çµ?è??天中使ç?¨ç¶²å??è£?é½? (tab) æ??è¦?å? å?°ç¶²å??ä¹?å¾?ç??å­?符ã??"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Chat window theme"
 msgstr "è??天è¦?çª?ä½?æ?¯ä¸»é¡?"
 
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "以é??è??å??é??è¦?使ç?¨æ?¼å­?檢æ?¥ç??èª?è¨?æ¸?å?®ï¼?å¦?ï¼?ã?? en,fr,nlã??ï¼?ã??"
+msgstr "以é??è??å??é??è¦?使ç?¨æ?¼å­?檢æ?¥ç??èª?è¨?æ¸?å?® (å¦?ï¼?ã?? en,fr,nlã??)ã??"
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
 msgstr "精簡�絡人��"
 
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Connection managers should be used"
 msgstr "使ç?¨é?£ç·?管ç??ç¨?å¼?"
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Contact list sort criterion"
 msgstr "è?¯çµ¡äººæ¸?å?®æ??åº?æº?å??"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "ç?¨ä¾?é?¸æ??å¤§é ­è²¼å??ç??ç??é ?設ç?®é??"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å??ç?¨å½?å?ºå¼?é??ç?¥"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Disable sounds when away"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å??ç?¨é?³æ??"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Empathy can publish the user's location"
 msgstr "Empathy å?¯ä»¥ç?¼ä½?使ç?¨è??ç??ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy �以�� GPS ��測�置"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy å?¯ä»¥å?©ç?¨æµ?å??é?»è©±ç¶²çµ¡å?ºå?°å?°ä¾?æ?¨æ¸¬ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy �以��網絡��測�置"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy default download folder"
 msgstr "Empathy é ?設ä¸?è¼?è³?æ??夾"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy 已詢å??å?¯å?¥å¸³è??"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy 已�移 butterfly ��"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy ç?¶é??ç½®æ??æ??該è?ªå??設ç?ºé?¢é??"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy å??å??æ??è?ªå??é?£ç·?"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy æ??é??ä½?ä½?ç½®ç??æº?確度"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy è¦?使ç?¨è?¯çµ¡äººç??å¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Enable WebKit Developer Tools"
 msgstr "å??ç?¨ WebKit é??ç?¼è??å·¥å?·"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Enable popup notifications for new messages"
 msgstr "å??ç?¨æ?°è¨?æ?¯ç??å½?å?ºå¼?é??ç?¥"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable spell checker"
 msgstr "å??ç?¨æ?¼å­?檢æ?¥ç¨?å¼?"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Hide main window"
 msgstr "é?±è??主è¦?çª?"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Hide the main window."
 msgstr "é?±è??主è¦?çª?ã??"
 
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4 帳è??å·²ç¶?å?¯å?¥"
-
-#: ../data/empathy.schemas.in.h:28
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4 帳è??å·²ç¶?å?¯å?¥ã??"
-
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Nick completed character"
 msgstr "網å??è£?é½?å­?符"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??天"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Path of the Adium theme to use"
 msgstr "è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "å¦?æ??è??天室使ç?¨ç??主é¡?æ?¯ Adium æ??è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?ã??"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Play a sound for incoming messages"
 msgstr "æ?¶å?°è¨?æ?¯æ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Play a sound for new conversations"
 msgstr "ç?¶é??å??æ?°ç??è«?話æ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for outgoing messages"
 msgstr "é??å?ºè¨?æ?¯æ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound when a contact logs in"
 msgstr "ç?¶è?¯çµ¡äººç?»å?¥æ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound when a contact logs out"
 msgstr "ç?¶æ??è?¯çµ¡äººç?»å?ºæ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when we log in"
 msgstr "ç?¶æ??å??ç?»å?¥æ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when we log out"
 msgstr "ç?¶æ??å??ç?»å?ºæ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "å¦?æ??è??天è¦?çª?失å?»ç?¦é»?å??å½?å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Pop up notifications when a contact logs in"
 msgstr "ç?¶è?¯çµ¡äººç?»å?¥æ??å½?å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Pop up notifications when a contact logs out"
 msgstr "ç?¶è?¯çµ¡äººç?»å?ºæ??å½?å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Show avatars"
 msgstr "é¡¯ç¤ºå¤§é ­è²¼"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Show contact list in rooms"
 msgstr "å?¨è??天室顯示è?¯çµ¡äººæ¸?å?®"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show hint about closing the main window"
 msgstr "é??é??主è¦?çª?æ??顯示æ??示"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show offline contacts"
 msgstr "顯示���絡人"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show protocols"
 msgstr "顯示å??å®?"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Spell checking languages"
 msgstr "æ?¼å­?檢æ?¥ç??èª?è¨?"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "The default folder to save file transfers in."
 msgstr "ç?¨ä¾?å?²å­?æª?æ¡?å?³è¼¸æ?¥æ?¶æª?æ¡?ç??é ?設è³?æ??夾ã??"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ä¸?次é?¸æ??å¤§é ­è²¼å??ç??ç??ç?®é??ã??"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "The position for the chat window side pane"
+msgstr "è??天è¦?çª?å?´çª?æ ¼ç??ä½?ç½®"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "è??天è¦?çª?å?´çª?æ ¼ç??å?²å­?ä½?ç½® (å?®ä½?ç?ºå??ç´ )ã??"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ç?¨ä¾?顯示å?¨è??天è¦?çª?ç??è«?話中ç??ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Use graphical smileys"
 msgstr "使ç?¨å??ç??å¼?表æ??符è??"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Use notification sounds"
 msgstr "使ç?¨é??ç?¥é?³æ??"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use theme for chat rooms"
 msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??è?¯çµ¡äººã??"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨æµ?å??é?»è©±ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr "Empathy æ?¯å?¦æ??è©¢å??ä½ è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Empathy æ?¯å?¦æ??è½?移 butterfly æ?¥èª?ã??"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥ä½ ç??帳è??ã??"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether Empathy should go into away mode automatically if user is idle."
 msgstr "Empathy æ?¯å?¦æ??å?¨ä½¿ç?¨è??é??ç½®æ??è?ªå??å??æ??ç?ºé?¢é??模å¼?ã??"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy æ?¯å?¦å?ºæ?¼ç§?é?±ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨è?¯çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "æ?¯å?¦å??ç?¨ WebKit é??ç?¼è??å·¥å?·ï¼?ä¾?å¦? Web Inspectorã??"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
-msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?/é??æ?°é?£ç·?ã??"
+msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?æ??é??æ?°é?£ç·?ã??"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "æ?¯å?¦ä»¥ä½ 設å®?ç??èª?è¨?檢æ?¥è¼¸å?¥æ??ç?¡é?¯å­?ã??"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "æ?¯å?¦å°?è«?話中ç??表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è?¯çµ¡äººç?»å?¥ç¶²çµ¡ã??"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è?¯çµ¡äººç?»å?ºç¶²çµ¡ã??"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether to play a sound to notify of events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??æ?¶å?°è¨?æ?¯ã??"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ?°ç??è«?話ã??"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é??å?ºè¨?æ?¯ã??"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether to play a sound when logging into a network."
 msgstr "ç?¶ç?»å?¥æ??網絡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ç?¶ç?»å?ºæ??網絡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦æ?­æ?¾é?³æ??é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ç?¶è?¯çµ¡äººé?¢ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ç?¶è?¯çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
 "Whether 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:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ç?¶æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "æ?¯å?¦å?¨è?¯çµ¡äººæ¸?å?®è??è??天è¦?çª?顯示è?¯çµ¡äººå¤§é ­è²¼ã??"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦å?¨è?¯çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??è?¯çµ¡äººã??"
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "æ?¯å?¦è¦?å?¨è?¯çµ¡äººæ¸?å?®å?§é¡¯ç¤ºè?¯çµ¡äººä½¿ç?¨å??å®?ã??"
 
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室中顯示è?¯çµ¡äººæ¸?å?®ã??"
 
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show the contact list in compact mode."
 msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示è?¯çµ¡äººæ¸?å?®ã??"
 
-#: ../data/empathy.schemas.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid ""
 "Whether 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:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to use the theme for chat rooms."
 msgstr "æ?¯å?¦ç?ºè??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/empathy.schemas.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -418,7 +418,7 @@ msgstr "管ç??è¨?æ?¯è?? VoIP 帳è??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2064 ../src/cc-empathy-accounts-page.c:244
+#: ../src/empathy-accounts-dialog.c:2094 ../src/cc-empathy-accounts-page.c:244
 #: ../src/cc-empathy-accounts-panel.c:91
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP 帳è??"
@@ -469,7 +469,7 @@ msgstr "å?¶ä»?ç??å??è??è??ç?¡æ³?å?³è¼¸è©²æª?æ¡?"
 
 #: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:315
 msgid "Unknown reason"
-msgstr "ä¸?æ??ç??å??å? "
+msgstr "ä¸?æ??å??å? "
 
 #: ../libempathy/empathy-utils.c:238
 msgid "Available"
@@ -551,7 +551,7 @@ msgstr "è­?æ?¸ç?ºè?ªæ??簽署"
 msgid "Certificate error"
 msgstr "���誤"
 
-#: ../libempathy/empathy-utils.c:430 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:430
 msgid "People Nearby"
 msgstr "é??è¿?ç??人"
 
@@ -611,7 +611,7 @@ msgstr "��"
 #: ../libempathy-gtk/empathy-account-widget.c:605
 #, c-format
 msgid "%s:"
-msgstr "%s:"
+msgstr "%sï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1136
 msgid "Username:"
@@ -686,11 +686,11 @@ msgstr "é?²é??"
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
-msgstr "�碼(_W):"
+msgstr "�碼(_W)�"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 msgid "Screen _Name:"
-msgstr "è?¢å¹?å??稱(_N):"
+msgstr "è?¢å¹?å??稱(_N)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 msgid "What is your AIM password?"
@@ -707,7 +707,7 @@ msgstr "ä½ ç?? AIM è?¢å¹?å??稱æ?¯ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
-msgstr "é?£æ?¥å? (_P):"
+msgstr "é?£æ?¥å? (_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
@@ -717,7 +717,7 @@ msgstr "é?£æ?¥å? (_P):"
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
-msgstr "伺æ??å?¨(_S):"
+msgstr "伺æ??å?¨(_S)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
@@ -728,7 +728,7 @@ msgstr "<b>ç¯?ä¾?ï¼?</b> 使ç?¨è??å??稱"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
-msgstr "�� I_D:"
+msgstr "�� I_D�"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 msgid "What is your GroupWise User ID?"
@@ -744,7 +744,7 @@ msgstr "<b>���</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
+msgstr "ICQ _UINï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 msgid "What is your ICQ UIN?"
@@ -759,7 +759,7 @@ msgstr "ä½ ç?? ICQ å¯?碼æ?¯ï¼?"
 msgid "_Character set:"
 msgstr "å­?é??(_C)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
+#: ../libempathy-gtk/empathy-account-widget-irc.c:245
 msgid "New Network"
 msgstr "��網絡"
 
@@ -806,23 +806,23 @@ msgstr "網絡"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
-msgstr "網絡:"
+msgstr "網絡�"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
-msgstr "網å??:"
+msgstr "網å??ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
-msgstr "�碼:"
+msgstr "�碼�"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
-msgstr "é?¢é??è¨?æ?¯:"
+msgstr "é?¢é??è¨?æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
-msgstr "ç??實å§?å??:"
+msgstr "ç??實å§?å??ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Servers"
@@ -842,11 +842,11 @@ msgstr "è¦?è??伺æ??å?¨è¨­å®?å?¼"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Pri_ority:"
-msgstr "å?ªå??æ¬?(_O):"
+msgstr "å?ªå??æ¬?(_O)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "Reso_urce:"
-msgstr "��(_U):"
+msgstr "��(_U)�"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
@@ -862,7 +862,7 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "Use old SS_L"
-msgstr "使ç?¨è??ç?? SS_L"
+msgstr "使ç?¨è??ç?? SS_L"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid "What is your Facebook password?"
@@ -918,11 +918,11 @@ msgstr "ä½ ç?? Windows Live å¯?碼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 msgid "_E-mail address:"
-msgstr "é?»å­?é?µä»¶ä½?å??(_E):"
+msgstr "é?»å­?é?µä»¶ä½?å??(_E)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
-msgstr "å??(_F):"
+msgstr "å??(_F)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_Jabber ID:"
@@ -930,15 +930,15 @@ msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Last Name:"
-msgstr "�(_L):"
+msgstr "�(_L)�"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Nickname:"
-msgstr "網å??(_N):"
+msgstr "網å??(_N)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
-msgstr "ç?¼ä½?ç??å??稱(_P):"
+msgstr "ç?¼ä½?ç??å??稱(_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<b>Example:</b> user my sip server"
@@ -950,7 +950,7 @@ msgstr "èª?è­?使ç?¨è??å??稱ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
-msgstr "�索�� (Binding)"
+msgstr "�索��"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
@@ -958,7 +958,7 @@ msgstr "è?ªå??æ?¢ç´¢ STUN 伺æ??å?¨"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "Interval (seconds)"
-msgstr "é??é??ï¼?ç§?ï¼?"
+msgstr "é??é?? (ç§?)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Keep-Alive Options"
@@ -990,15 +990,15 @@ msgstr "Proxy é?¸é ?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "STUN Server:"
-msgstr "STUN 伺æ??å?¨:"
+msgstr "STUN 伺æ??å?¨ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Server:"
-msgstr "伺æ??å?¨:"
+msgstr "伺æ??å?¨ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "Transport:"
-msgstr "å?³é??é??è¨?å? :"
+msgstr "å?³é??é??è¨?å? ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "What is your SIP account password?"
@@ -1010,7 +1010,7 @@ msgstr "ä½ æ?³è¦?ç?? SIP ç?»å?¥ ID æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "_Username:"
-msgstr "使ç?¨è??å??稱(_U):"
+msgstr "使ç?¨è??å??稱(_U)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Use _Yahoo! Japan"
@@ -1034,30 +1034,30 @@ msgstr "忽ç?¥æ??è­°è??è??天室é??è«?(_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
-msgstr "è??天室æ¸?å?®å?°å??(_R):"
+msgstr "è??天室æ¸?å?®å?°å??(_R)ï¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
 msgid "Couldn't convert image"
 msgstr "ç?¡æ³?è½?æ??å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
 msgid "None of the accepted image formats are supported on your system"
 msgstr "ä½ ç??系統ä¸?æ²?æ??æ?¯æ?´å·²æ?¥å??ç??å??ç??æ ¼å¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
 msgid "Select Your Avatar Image"
 msgstr "é?¸æ??ä½ ç??å¤§é ­è²¼å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
 msgid "No Image"
 msgstr "æ²?æ??å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
 msgid "All Files"
 msgstr "æ??æ??æª?æ¡?"
 
@@ -1065,149 +1065,149 @@ msgstr "æ??æ??æª?æ¡?"
 msgid "Click to enlarge"
 msgstr "è«?æ??é??è£?æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:235
+#: ../libempathy-gtk/empathy-chat.c:239
 msgid "Failed to reconnect this chat"
 msgstr "ç?¡æ³?é??é?£é??å??è??天æ??è­°"
 
-#: ../libempathy-gtk/empathy-chat.c:657
+#: ../libempathy-gtk/empathy-chat.c:661
 msgid "Failed to join chat room"
 msgstr "å? å?¥è??天室失æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:675
+#: ../libempathy-gtk/empathy-chat.c:679
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?人å°?話失æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:714
+#: ../libempathy-gtk/empathy-chat.c:718
 msgid "Topic not supported on this conversation"
 msgstr "æ­¤è«?話ç??主é¡?ä¸?被æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:720
+#: ../libempathy-gtk/empathy-chat.c:724
 msgid "You are not allowed to change the topic"
 msgstr "ä½ ä¸?被å??許æ?´æ?¹é??å??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:855
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: æ¸?é?¤ç?®å??è«?話ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:858
 msgid "/topic <topic>: set the topic of the current conversation"
-msgstr "/topic <主é¡?>: 設置ç?®å??è«?話ç??主é¡?"
+msgstr "/topic <主é¡?>ï¼?設置ç?®å??è«?話ç??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:857
+#: ../libempathy-gtk/empathy-chat.c:861
 msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <è??天室 ID>: å? å?¥æ?°ç??è??天室"
+msgstr "/join <è??天室 ID>ï¼?å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:860
+#: ../libempathy-gtk/empathy-chat.c:864
 msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <è??天室 ID>: å? å?¥æ?°ç??è??天室"
+msgstr "/j <è??天室 ID>ï¼?å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:863
+#: ../libempathy-gtk/empathy-chat.c:867
 msgid "/query <contact ID> [<message>]: open a private chat"
-msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]: é??å??ç§?人å°?話"
+msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]ï¼?é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:870
 msgid "/msg <contact ID> <message>: open a private chat"
-msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>: é??å??ç§?人å°?話"
+msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>ï¼?é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:869
+#: ../libempathy-gtk/empathy-chat.c:873
 msgid "/nick <nickname>: change your nickname on the current server"
-msgstr "/nick <網å??>: æ?´æ?¹å?¨ç?®å??伺æ??å?¨ä¸?ç??ä½ ç??網å??"
+msgstr "/nick <網å??>ï¼?æ?´æ?¹å?¨ç?®å??伺æ??å?¨ä¸?ç??ä½ ç??網å??"
 
-#: ../libempathy-gtk/empathy-chat.c:872
+#: ../libempathy-gtk/empathy-chat.c:876
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr "/me <è¨?æ?¯>: é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?話中"
+msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?話中"
 
-#: ../libempathy-gtk/empathy-chat.c:875
+#: ../libempathy-gtk/empathy-chat.c:879
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
-msgstr "/say <è¨?æ?¯>: é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?話中ã??é??ç?¨æ?¼å?³é??以ã??/ã??é??é ­ç??è¨?æ?¯ã??è??ä¾?ä¾?說ï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??天室ã??"
+msgstr "/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?話中ã??é??ç?¨æ?¼å?³é??以ã??/ã??é??é ­ç??è¨?æ?¯ã??è??ä¾?ä¾?說ï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??天室ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:880
+#: ../libempathy-gtk/empathy-chat.c:884
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
-msgstr "/help [<å?½ä»¤>]: 顯示æ??æ??æ?¯æ?´ç??æ??令ã??å¦?æ??æ??å®?義é??å?? <å?½ä»¤> ç??話ï¼?便顯示å®?ç??ç?¨æ³?ã??"
+msgstr "/help [<å?½ä»¤>]ï¼?顯示æ??æ??æ?¯æ?´ç??æ??令ã??å¦?æ??æ??å®?義é??å?? <å?½ä»¤> ç??話ï¼?便顯示å®?ç??ç?¨æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:890
+#: ../libempathy-gtk/empathy-chat.c:894
 #, c-format
 msgid "Usage: %s"
-msgstr "��: %s"
+msgstr "���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:919
+#: ../libempathy-gtk/empathy-chat.c:923
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1044
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??令ï¼?è«?å??è¦? /help 以å??å¾?å?¯ç?¨ç??æ??令"
 
-#: ../libempathy-gtk/empathy-chat.c:1178
+#: ../libempathy-gtk/empathy-chat.c:1182
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1185
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1184
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1191
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1190
+#: ../libempathy-gtk/empathy-chat.c:1194
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1197
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1197
+#: ../libempathy-gtk/empathy-chat.c:1201
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1307 ../src/empathy-chat-window.c:687
+#: ../libempathy-gtk/empathy-chat.c:1311 ../src/empathy-chat-window.c:691
 msgid "Topic:"
-msgstr "主�:"
+msgstr "主��"
 
-#: ../libempathy-gtk/empathy-chat.c:1319
+#: ../libempathy-gtk/empathy-chat.c:1323
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1321
+#: ../libempathy-gtk/empathy-chat.c:1325
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:1717
+#: ../libempathy-gtk/empathy-chat.c:1804
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1771
+#: ../libempathy-gtk/empathy-chat.c:1858
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1789
-#: ../libempathy-gtk/empathy-ui-utils.c:1634
+#: ../libempathy-gtk/empathy-chat.c:1876
+#: ../libempathy-gtk/empathy-ui-utils.c:1618
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1910
 msgid "_Spelling Suggestions"
 msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1917
+#: ../libempathy-gtk/empathy-chat.c:1987
 msgid "Failed to retrieve recent logs"
 msgstr "ç?¡æ³?å??å¾?æ??è¿?ç??æ?¥èª?"
 
-#: ../libempathy-gtk/empathy-chat.c:2048
+#: ../libempathy-gtk/empathy-chat.c:2093
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已��"
@@ -1215,30 +1215,30 @@ msgstr "%s 已��"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2055
+#: ../libempathy-gtk/empathy-chat.c:2100
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢��"
 
-#: ../libempathy-gtk/empathy-chat.c:2058
+#: ../libempathy-gtk/empathy-chat.c:2103
 #, c-format
 msgid "%s was kicked"
-msgstr "%s 被踢���"
+msgstr "%s 被踢�"
 
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2066
+#: ../libempathy-gtk/empathy-chat.c:2111
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2069
+#: ../libempathy-gtk/empathy-chat.c:2114
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2073
+#: ../libempathy-gtk/empathy-chat.c:2118
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
@@ -1248,77 +1248,77 @@ msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2127
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2107
+#: ../libempathy-gtk/empathy-chat.c:2152
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2132
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��被稱� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2271 ../src/empathy-call-window.c:1643
+#: ../libempathy-gtk/empathy-chat.c:2316 ../src/empathy-call-window.c:1653
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2801
+#: ../libempathy-gtk/empathy-chat.c:2947
 msgid "Wrong password; please try again:"
-msgstr "å¯?碼é?¯èª¤ï¼?è«?å??試ä¸?次:"
+msgstr "å¯?碼é?¯èª¤ï¼?è«?å??試ä¸?次ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2948
 msgid "Retry"
 msgstr "é??試"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2953
 msgid "This room is protected by a password:"
-msgstr "æ­¤è??天室已被å¯?碼ä¿?è­·:"
+msgstr "æ­¤è??天室已被å¯?碼ä¿?è­·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2808
+#: ../libempathy-gtk/empathy-chat.c:2954
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2948
+#: ../libempathy-gtk/empathy-chat.c:3094
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3001
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3147
+#: ../libempathy-gtk/empathy-log-window.c:639
 msgid "Conversation"
 msgstr "�話"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:786
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:785
 msgid "_Copy Link Address"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:793
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:792
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
 msgid "Edit Contact Information"
 msgstr "編輯�絡人��"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
 msgid "Personal Information"
 msgstr "å??人è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
 msgid "New Contact"
 msgstr "���絡人"
 
@@ -1330,214 +1330,234 @@ msgstr "ç¨?å¾?å??決å®?"
 msgid "Subscription Request"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-view.c:1984
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤ç¾£çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
 msgid "Removing group"
 msgstr "正�移�羣�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
+#: ../libempathy-gtk/empathy-contact-list-view.c:2035
+#: ../libempathy-gtk/empathy-contact-list-view.c:2112
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:2065
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤è?¯çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:209
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "���絡人(_A)�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "è??天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:268
+#: ../libempathy-gtk/empathy-contact-menu.c:263
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èª?é?³é??話(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:300
+#: ../libempathy-gtk/empathy-contact-menu.c:296
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?å??é??話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:351
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "��次�話(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:373
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:358
+msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:396
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:381
+msgid "Share My Desktop"
 msgstr "å??享æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-contact-widget.c:1444
+#: ../libempathy-gtk/empathy-contact-menu.c:421
+#: ../libempathy-gtk/empathy-contact-widget.c:1818
 msgid "Favorite"
 msgstr "å??好"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:466
+#: ../libempathy-gtk/empathy-contact-menu.c:450
 msgid "Infor_mation"
 msgstr "��(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:512
+#: ../libempathy-gtk/empathy-contact-menu.c:496
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:566
-#: ../src/empathy-chat-window.c:872
+#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "é??è«?ä½ å?°é??å??è??天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:597
-msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:581
+msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??天室(_I)"
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é?¸æ??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:238
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+msgid "Full name:"
+msgstr "å?¨å??ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+msgid "Phone number:"
+msgstr "é?»è©±è??碼ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+msgid "E-mail address:"
+msgstr "é?»å­?ä¿¡ç®±ä½?å??ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:222
+msgid "Website:"
+msgstr "網��"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:223
+msgid "Birthday:"
+msgstr "ç??æ?¥ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:614
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1073
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../src/empathy-main-window.c:1171
 msgid "Group"
 msgstr "羣�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:854
 msgid "Country ISO Code:"
 msgstr "å??家 ISO 碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:856
 msgid "Country:"
 msgstr "å??家ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:858
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:860
 msgid "City:"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:862
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:864
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:866
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:868
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:870
 msgid "Floor:"
 msgstr "�層�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:872
 msgid "Room:"
 msgstr "室�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:874
 msgid "Text:"
 msgstr "æ??å­?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:876
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:878
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:880
 msgid "Accuracy Level:"
 msgstr "�確度���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:882
 msgid "Error:"
 msgstr "�誤�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:884
 msgid "Vertical Error (meters):"
-msgstr "å??ç?´èª¤å·®ï¼?ç±³ï¼?ï¼?"
+msgstr "å??ç?´èª¤å·® (ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:886
 msgid "Horizontal Error (meters):"
-msgstr "水平誤差�米��"
+msgstr "水平誤差 (米)�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:888
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:890
 msgid "Bearing:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:892
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:894
 msgid "Last Updated on:"
 msgstr "�次����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:896
 msgid "Longitude:"
-msgstr "�度:"
+msgstr "�度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:898
 msgid "Latitude:"
-msgstr "緯度:"
+msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:900
 msgid "Altitude:"
-msgstr "緯度:"
+msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:963
+#: ../src/empathy-preferences.ui.h:11
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:979
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®<b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:1029
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:1112
 msgid "Save Avatar"
 msgstr "å?²å­?å¤§é ­è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:1168
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
 
@@ -1547,64 +1567,48 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
-msgstr "å?¥å??:"
+msgstr "å?¥å??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "ç??æ?¥:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client Information"
-msgstr "客�端��"
+msgstr "��端��"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
-msgstr "客�端:"
+msgstr "��端�"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Contact Details"
 msgstr "è?¯çµ¡äººè©³ç´°è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr "é?»å­?ä¿¡ç®±ä½?å??ï¼?"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "å?¨å??:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 msgid "Groups"
 msgstr "羣�"
 
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Identifier:"
-msgstr "���:"
+msgstr "è­?å?¥èº«å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Information requestedâ?¦"
 msgstr "��已���"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
 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.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Version:"
-msgstr "ç??æ?¬:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "網�:"
+msgstr "ç??æ?¬ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "_Add Group"
 msgstr "å? å?¥ç¾£çµ?(_G)"
 
@@ -1624,12 +1628,12 @@ msgstr "é?£æ?¥å? "
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:310
+#: ../libempathy-gtk/empathy-log-window.c:632
+#: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "帳è??"
 
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-log-window.c:649
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1647,11 +1651,11 @@ msgstr "æ??å°?"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
-msgstr "æ??å°?(_F):"
+msgstr "ä½?è??(_F)ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
-msgstr "�絡人 ID:"
+msgstr "�絡人 ID�"
 
 #. add chat button
 #: ../libempathy-gtk/empathy-new-message-dialog.c:145
@@ -1664,18 +1668,18 @@ msgid "New Conversation"
 msgstr "���話"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:190
 msgid "Send _Video"
 msgstr "å?³é??è¦?å??(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../libempathy-gtk/empathy-new-call-dialog.c:198
 #: ../src/empathy-call-window.ui.h:17
 msgid "_Call"
 msgstr "é??話(_C)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:208
 msgid "New Call"
 msgstr "æ?°å¢?é??話"
 
@@ -1728,43 +1732,43 @@ msgstr "符å??æ¢?件"
 msgid "Phrase not found"
 msgstr "�����"
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
 msgid "Received an instant message"
 msgstr "æ?¶å?°å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
 msgid "Sent an instant message"
 msgstr "å?³é??å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
 msgid "Incoming chat request"
 msgstr "æ?¶å?°è??天è¦?æ±?"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
 msgid "Contact connected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
 msgid "Contact disconnected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
 msgid "Connected to server"
 msgstr "é?£æ?¥å?°ä¼ºæ??å?¨"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
 msgid "Disconnected from server"
 msgstr "è??伺æ??å?¨æ?·ç·?"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
 msgid "Incoming voice call"
 msgstr "æ?¶å?°èª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
 msgid "Outgoing voice call"
 msgstr "æ?­å?ºèª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
 msgid "Voice call ended"
 msgstr "èª?é?³é??話çµ?æ??"
 
@@ -1800,15 +1804,15 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1509
+#: ../libempathy-gtk/empathy-ui-utils.c:1515
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1626
+#: ../libempathy-gtk/empathy-ui-utils.c:1610
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1690
+#: ../libempathy-gtk/empathy-ui-utils.c:1674
 msgid "Select a destination"
 msgstr "é?¸å??ç?®ç??å?°"
 
@@ -1995,17 +1999,17 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:601
+#: ../src/empathy.c:559
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:605
+#: ../src/empathy.c:563
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?顯示è?¯çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?話çª?"
 
-#: ../src/empathy.c:617
+#: ../src/empathy.c:575
 msgid "- Empathy IM Client"
-msgstr "- Empathy å?³æ??é??客æ?¶ç«¯"
+msgstr "- Empathy å?³æ??é??ç?¨æ?¶ç«¯"
 
 #: ../src/empathy-about-dialog.c:85
 msgid ""
@@ -2032,7 +2036,7 @@ msgstr "ä½ æ??該已ç¶?å?? Empathy ä¸?èµ·æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è¨±å?¯è­?
 
 #: ../src/empathy-about-dialog.c:121
 msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME ç??å?³æ??è¨?æ?¯å®¢æ?¶ç«¯ç¨?å¼?"
+msgstr "GNOME ç??å?³æ??è¨?æ?¯ç?¨æ?¶ç«¯ç¨?å¼?"
 
 #: ../src/empathy-about-dialog.c:127
 msgid "translator-credits"
@@ -2074,7 +2078,7 @@ msgid ""
 msgstr "ä½ å?¯ä»¥å??å?°å??é ?å??次輸å?¥å¸³è??ç??詳細è³?æ??æ??çµ?æ??æ­¤å?©ç??ï¼?ç¨?å¾?å??å¾?ã??編輯ã??é?¸å?®å? å?¥å¸³è??ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1308
+#: ../src/empathy-account-assistant.c:1315
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
@@ -2083,36 +2087,36 @@ msgstr "ç?¼ç??é?¯èª¤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:579
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:606
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å¢? %s 帳è??"
 
-#: ../src/empathy-account-assistant.c:507
+#: ../src/empathy-account-assistant.c:510
 msgid "What kind of chat account do you have?"
 msgstr "ä½ ç??è??天帳è??æ?¯å?ªä¸?種ï¼?"
 
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:516
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "ä½ é??æ?³è¦?設å®?å?¶ä»?ç??è??天帳è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:522
 msgid "Enter your account details"
 msgstr "è«?輸å?¥ä½ ç??帳è??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:524
+#: ../src/empathy-account-assistant.c:527
 msgid "What kind of chat account do you want to create?"
 msgstr "ä½ æ?³è¦?建ç«?ä½?種è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:530
+#: ../src/empathy-account-assistant.c:533
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?建ç«?å?¶ä»?è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:537
+#: ../src/empathy-account-assistant.c:540
 msgid "Enter the details for the new account"
 msgstr "è«?輸å?¥æ?°å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2120,41 +2124,41 @@ msgid ""
 "calls."
 msgstr "使ç?¨ Empathy å?¯ä»¥å?¨ç¶²ä¸?è·?é??è¿?ç??人è??天ï¼?æ??æ?¯å??使ç?¨ Google Talkã??AIMã??Windows Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網絡æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?å??é??話ã??"
 
-#: ../src/empathy-account-assistant.c:669
+#: ../src/empathy-account-assistant.c:672
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "ä½ æ?¯å?¦æ??使ç?¨å?¶ä»?è??天ç¨?å¼?ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:692
+#: ../src/empathy-account-assistant.c:695
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??帳è??詳細è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:713
+#: ../src/empathy-account-assistant.c:716
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?輸å?¥å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:735
+#: ../src/empathy-account-assistant.c:738
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:745
+#: ../src/empathy-account-assistant.c:748
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:766
+#: ../src/empathy-account-assistant.c:769
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:850
+#: ../src/empathy-account-assistant.c:853
 #: ../src/empathy-new-chatroom-dialog.c:607
 #: ../src/empathy-new-chatroom-dialog.c:608
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:857
+#: ../src/empathy-account-assistant.c:860
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??樣"
 
-#: ../src/empathy-account-assistant.c:1122
+#: ../src/empathy-account-assistant.c:1129
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2162,16 +2166,16 @@ msgid ""
 "disable this feature by using the 'Accounts' dialog"
 msgstr "Empathy å?¯ä»¥è?ªå??æ?¢ç´¢è??ä½ é?£ç·?å?°ç?¸å??網絡ä¸?ç??人å??ï¼?並ä¸?å??ä»?å??è??天ã??å¦?æ??ä½ æ?³è¦?使ç?¨æ­¤å??è?½ï¼?è«?檢æ?¥ä¸?å??詳細è³?æ??æ?¯å?¦æ­£ç¢ºã??ä½ ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°æ?´æ?¹é??äº?ç´°ç¯?ï¼?æ??æ?¯ç?¨ã??帳è??ã??å°?話çª?ä¾?å??ç?¨æ­¤å??è?½"
 
-#: ../src/empathy-account-assistant.c:1128
-#: ../src/empathy-account-assistant.c:1184
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
 msgid "Edit->Accounts"
 msgstr "編輯 -> 帳è??"
 
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1151
 msgid "I don't want to enable this feature for now"
 msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
 
-#: ../src/empathy-account-assistant.c:1180
+#: ../src/empathy-account-assistant.c:1187
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2179,23 +2183,23 @@ msgid ""
 "the Accounts dialog"
 msgstr "ä½ ç?¡æ³?è??é?£ç·?å?°ä½ æ?¬æ©?網絡ç??人å??è??天ï¼?å? ç?º telepathy-salut å°?æ?ªå®?è£?ã??å¦?æ??ä½ æ?³è¦?å??ç?¨æ­¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?件ï¼?並å¾?ã??帳è??ã??å°?話çª?建ç«?ã??é??è¿?ç??人ã??帳è??"
 
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1193
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut ����"
 
-#: ../src/empathy-account-assistant.c:1232
+#: ../src/empathy-account-assistant.c:1239
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "è¨?æ?¯è?? VoIP 帳è??å?©ç??"
 
-#: ../src/empathy-account-assistant.c:1266
+#: ../src/empathy-account-assistant.c:1273
 msgid "Welcome to Empathy"
 msgstr "歡�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:1275
+#: ../src/empathy-account-assistant.c:1282
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:1293
+#: ../src/empathy-account-assistant.c:1300
 msgid "Please enter personal details"
 msgstr "è«?輸å?¥å??人詳細è³?æ??"
 
@@ -2212,33 +2216,33 @@ msgstr "æ??è??ä½ ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å­?ä½ ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:262 ../src/empathy-call-window.c:789
+#: ../src/empathy-accounts-dialog.c:273 ../src/empathy-call-window.c:792
 msgid "Connectingâ?¦"
 msgstr "��中�"
 
-#: ../src/empathy-accounts-dialog.c:289
-#, c-format
-msgid "Disconnected â?? %s"
-msgstr "å·²æ?·ç·? â?? %s"
-
-#: ../src/empathy-accounts-dialog.c:294
+#: ../src/empathy-accounts-dialog.c:314
 #, c-format
 msgid "Offline â?? %s"
 msgstr "é?¢ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:307
+#: ../src/empathy-accounts-dialog.c:326
+#, c-format
+msgid "Disconnected â?? %s"
+msgstr "å·²æ?·ç·? â?? %s"
+
+#: ../src/empathy-accounts-dialog.c:337
 msgid "Offline â?? No Network Connection"
 msgstr "é?¢ç·? â?? ç?¡ç¶²çµ¡é?£ç·?"
 
-#: ../src/empathy-accounts-dialog.c:315
+#: ../src/empathy-accounts-dialog.c:344
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç??ç??æ??"
 
-#: ../src/empathy-accounts-dialog.c:326
+#: ../src/empathy-accounts-dialog.c:356
 msgid "Offline â?? Account Disabled"
 msgstr "é?¢ç·? â?? 帳è??å·²å??ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:767
+#: ../src/empathy-accounts-dialog.c:797
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2246,16 +2250,16 @@ msgstr ""
 "ä½ å?³å°?建ç«?æ?°ç??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1114
+#: ../src/empathy-accounts-dialog.c:1144
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?ä½ ç??é?»è?¦ä¸?移é?¤ç¾£çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1118
+#: ../src/empathy-accounts-dialog.c:1148
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??移é?¤ä¼ºæ??å?¨ä¸?ç??ä½ ç??帳è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1355
+#: ../src/empathy-accounts-dialog.c:1385
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2263,7 +2267,7 @@ msgstr ""
 "ä½ å?³å°?建ç«?å?¦ä¸?å??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1932
+#: ../src/empathy-accounts-dialog.c:1962
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2293,101 +2297,101 @@ msgstr "å? å?¥(_A)â?¦"
 msgid "_Importâ?¦"
 msgstr "��(_I)�"
 
-#: ../src/empathy-auto-salut-account-helper.c:77
+#: ../src/empathy-auto-salut-account-helper.c:78
 msgid "People nearby"
 msgstr "é??è¿?ç??人"
 
-#: ../src/empathy-call-window.c:462
+#: ../src/empathy-call-window.c:463
 msgid "Contrast"
 msgstr "��"
 
-#: ../src/empathy-call-window.c:465
+#: ../src/empathy-call-window.c:466
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:468
+#: ../src/empathy-call-window.c:469
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:573
+#: ../src/empathy-call-window.c:574
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1120
+#: ../src/empathy-call-window.c:1134
 msgid "_Sidebar"
-msgstr "å?´é??å??(_S)"
+msgstr "å?´é??æ¬?(_S)"
 
-#: ../src/empathy-call-window.c:1139
+#: ../src/empathy-call-window.c:1153
 msgid "Audio input"
 msgstr "é?³æ??輸å?¥"
 
-#: ../src/empathy-call-window.c:1143
+#: ../src/empathy-call-window.c:1157
 msgid "Video input"
 msgstr "è¦?å??輸å?¥"
 
-#: ../src/empathy-call-window.c:1147
+#: ../src/empathy-call-window.c:1161
 msgid "Dialpad"
 msgstr "æ?­è??ç?¤"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1218
+#: ../src/empathy-call-window.c:1232
 #, c-format
 msgid "Call with %s"
 msgstr "è?? %s é??話中"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1299
+#: ../src/empathy-call-window.c:1309
 msgid "Call"
 msgstr "é??話"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1956
+#: ../src/empathy-call-window.c:1966
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:2017
+#: ../src/empathy-call-window.c:2027
 msgid "Technical Details"
 msgstr "æ??è¡?ç´°ç¯?"
 
-#: ../src/empathy-call-window.c:2055
+#: ../src/empathy-call-window.c:2065
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s ç??è»?件ä¸?ç?­è§£ä»»ä½?ä½ é?»è?¦ä¸?æ??æ?¯æ?´ç??é?³è¨?æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2060
+#: ../src/empathy-call-window.c:2070
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s ç??è»?件ä¸?ç?­è§£ä»»ä½?ä½ é?»è?¦ä¸?æ??æ?¯æ?´ç??è¦?å??æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2066
+#: ../src/empathy-call-window.c:2076
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "ç?¡æ³?å?? %s 建ç«?é?£ç·?ã??ä½ å??å?¶ä¸­ä¹?ä¸?å?¯è?½å?¨ä¸?å??ä¸?å??許ç?´æ?¥é?£ç·?ç??網絡ä¹?ä¸?ã??"
 
-#: ../src/empathy-call-window.c:2072
+#: ../src/empathy-call-window.c:2082
 msgid "There was a failure on the network"
 msgstr "é??å??網絡ä¸?æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2076
+#: ../src/empathy-call-window.c:2086
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??é?³è¨?æ ¼å¼?å°?æ?ªå?¨ä½ ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2079
+#: ../src/empathy-call-window.c:2089
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??è¦?å??æ ¼å¼?å°?æ?ªå?¨ä½ ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2089
+#: ../src/empathy-call-window.c:2099
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2395,15 +2399,15 @@ msgid ""
 "the Help menu."
 msgstr "å?¨ Telepathy å??件中ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å?¯å ±é??å??é?¯èª¤</a>並é??ä¸?å¾?æ±?å?©é?¸å?®å?§ç??ã??é?¤é?¯ã??è¦?çª?中æ??æ?¶é??ç??ç´?é??ã??"
 
-#: ../src/empathy-call-window.c:2097
+#: ../src/empathy-call-window.c:2107
 msgid "There was a failure in the call engine"
 msgstr "é??話å¼?æ??å?§æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2136
+#: ../src/empathy-call-window.c:2146
 msgid "Can't establish audio stream"
 msgstr "��建���串�"
 
-#: ../src/empathy-call-window.c:2146
+#: ../src/empathy-call-window.c:2156
 msgid "Can't establish video stream"
 msgstr "ç?¡æ³?建ç«?è¦?å??串æµ?"
 
@@ -2471,35 +2475,35 @@ msgstr "è¦?å??é??å??"
 msgid "Video Preview"
 msgstr "è¦?å??é ?覽"
 
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:27
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../src/empathy-chat-window.c:451 ../src/empathy-chat-window.c:471
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:463
+#: ../src/empathy-chat-window.c:464
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (è?? %u å?¶ä»?ç??)"
 
-#: ../src/empathy-chat-window.c:479
+#: ../src/empathy-chat-window.c:480
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä¾?è?ªå?¶ä»?人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:489
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ä¾?è?ªæ??æ??人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:691
+#: ../src/empathy-chat-window.c:695
 msgid "Typing a message."
 msgstr "æ­£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -2516,74 +2520,78 @@ msgid "Chat"
 msgstr "è??天"
 
 #: ../src/empathy-chat-window.ui.h:4
+msgid "Important Room"
+msgstr "é??è¦?è??天室"
+
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Insert _Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??(_S)"
 
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Invite _Participantâ?¦"
 msgstr "é??è«?å??è??(_P)â?¦"
 
-#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Left"
 msgstr "å°?å??é ?左移(_L)"
 
-#: ../src/empathy-chat-window.ui.h:7
+#: ../src/empathy-chat-window.ui.h:8
 msgid "Move Tab _Right"
 msgstr "å°?å??é ?å?³ç§»(_R)"
 
-#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "�話(_C)"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Detach Tab"
 msgstr "å??é?¢å??é ?(_D)"
 
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "å??好ç??è??天室(_F)"
 
-#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "ä¸?å??å??é ?(_N)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
 msgstr "ä¸?å??å??é ?(_P)"
 
-#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "顯示�絡人��(_S)"
 
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Tabs"
 msgstr "å??é ?(_T)"
 
-#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:19
 msgid "_Undo Close Tab"
 msgstr "復å??é??é??ç??å??é ?(_U)"
 
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chatrooms-window.c:241
 msgid "Name"
 msgstr "å??稱"
 
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
 msgid "Room"
 msgstr "è??天室"
 
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
 msgid "Auto-Connect"
 msgstr "è?ªå??é?£ç·?"
 
@@ -2591,76 +2599,76 @@ msgstr "è?ªå??é?£ç·?"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??å??好ç??è??天室"
 
-#: ../src/empathy-event-manager.c:351
+#: ../src/empathy-event-manager.c:431
 msgid "Incoming video call"
 msgstr "å?³å?¥ç??è¦?å??é??話"
 
-#: ../src/empathy-event-manager.c:351
+#: ../src/empathy-event-manager.c:431
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:355
+#: ../src/empathy-event-manager.c:435
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s è¦?è??ä½ é?²è¡?è¦?å??é??話ã??ä½ æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:356
+#: ../src/empathy-event-manager.c:436
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s è¦?è??ä½ é?²è¡?é??話ã??ä½ æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:378
+#: ../src/empathy-event-manager.c:458
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:384
+#: ../src/empathy-event-manager.c:464
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:575
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "ä¾?è?ª %s ç??è¦?å??é?»è©±"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:575
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:598
+#: ../src/empathy-event-manager.c:651
 msgid "Room invitation"
 msgstr "è??天é??è«?"
 
-#: ../src/empathy-event-manager.c:601
+#: ../src/empathy-event-manager.c:654
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£å?¨é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:609
+#: ../src/empathy-event-manager.c:662
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:614
+#: ../src/empathy-event-manager.c:667
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:653
+#: ../src/empathy-event-manager.c:705
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:679
+#: ../src/empathy-event-manager.c:732
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:929
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
 
-#: ../src/empathy-event-manager.c:841
+#: ../src/empathy-event-manager.c:933
 #, c-format
 msgid ""
 "\n"
@@ -2669,118 +2677,116 @@ msgstr ""
 "\n"
 "���%s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:881
+#: ../src/empathy-event-manager.c:976
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
-#. someone is logging in
-#: ../src/empathy-event-manager.c:897
+#: ../src/empathy-event-manager.c:996
 #, c-format
 msgid "%s is now online."
 msgstr "%s ç?¾å?¨ä¸?ç·?ã??"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s æ?¼ %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, 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:306
+#: ../src/empathy-ft-manager.c:305
 #, 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:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "æ­£å?¨å?³é??ã??%sã??給 %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "å¾? %2$s æ?¥æ?¶ã??%1$sã??æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "æ?¥æ?¶æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "å?³é??ã??%sã??給 %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "å?³é??æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "ã??%sã??æ?¥æ?¶è?ª %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "ã??%sã??å?³é??給 %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "���輸��"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
 msgid "Waiting for the other participant's response"
 msgstr "æ­£å?¨ç­?å¾?å?¶ä»?å??è??è??ç??å??æ??"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "æ­£å?¨æª¢æ?¥æª?æ¡?ã??%sã??ç??å®?æ?´æ?§"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "æ­£å?¨è¨?ç®?ã??%sã??é??æ¹?å?¼"
 
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:990
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1002
 msgid "File"
 msgstr "��"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1024
 msgid "Remaining"
 msgstr "��"
 
@@ -2803,124 +2809,119 @@ msgid "Import Accounts"
 msgstr "å?¯å?¥å¸³è??"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:292
 msgid "Import"
 msgstr "��"
 
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:301
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:325
 msgid "Source"
 msgstr "��"
 
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "%s 帳è??"
-
-#: ../src/empathy-main-window.c:440
+#: ../src/empathy-main-window.c:457
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:446
+#: ../src/empathy-main-window.c:463
 msgid "Edit Account"
 msgstr "編輯帳è??"
 
-#: ../src/empathy-main-window.c:452
+#: ../src/empathy-main-window.c:469
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1056
+#: ../src/empathy-main-window.c:1154
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../src/empathy-main-window.c:1437
+#: ../src/empathy-main-window.c:1476
+msgid "Contact List"
+msgstr "�絡人��"
+
+#: ../src/empathy-main-window.c:1583
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳è??"
 
 #: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "�絡人��"
-
-#: ../src/empathy-main-window.ui.h:2
 msgid "Contacts on a _Map"
 msgstr "è?¯çµ¡äººå?°å??(_M)"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
 msgid "Context"
 msgstr "é?¸é ?"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
 msgstr "å? å?¥å??好(_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
 msgstr "管ç??å??好"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
 msgid "N_ormal Size"
 msgstr "正常大�(_O)"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ?¦"
 msgstr "æ?°å¢?é??話(_C)â?¦"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
 msgstr "正常大å°?è??å¤§é ­è²¼(_A)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
 msgid "P_references"
 msgstr "å??好設å®?(_R)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
 msgid "Show P_rotocols"
 msgstr "顯示å??å®?(_R)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
 msgid "Sort by _Name"
 msgstr "æ ¹æ??å??稱æ??åº?(_N)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Status"
 msgstr "æ ¹æ??ç??æ??æ??åº?(_S)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Accounts"
 msgstr "帳è??(_A)"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Compact Size"
 msgstr "精簡大�(_C)"
 
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
 msgid "_Debug"
 msgstr "��(_D)"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
 msgid "_File Transfers"
 msgstr "���輸(_F)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
 msgid "_Joinâ?¦"
 msgstr "å? å?¥(_J)â?¦"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ?¦"
 msgstr "���話(_N)�"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Offline Contacts"
 msgstr "���絡人(_O)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Personal Information"
 msgstr "å??人è³?æ??(_P)"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Room"
 msgstr "è??天室(_R)"
 
@@ -2985,170 +2986,170 @@ msgstr "è??天室æ¸?å?®"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "_Room:"
-msgstr "è??天室(_R):"
+msgstr "è??天室(_R)ï¼?"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:135
 msgid "Message received"
 msgstr "��已��"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:136
 msgid "Message sent"
 msgstr "è¨?æ?¯å·²é??å?º"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:137
 msgid "New conversation"
 msgstr "���話"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes online"
 msgstr "�絡人��"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:139
 msgid "Contact goes offline"
 msgstr "�絡人��"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:140
 msgid "Account connected"
 msgstr "帳è??å·²é?£ç·?"
 
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:141
 msgid "Account disconnected"
 msgstr "帳è??å·²æ?·ç·?"
 
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:430
 msgid "Language"
 msgstr "��"
 
+#: ../src/empathy-preferences.c:866
+msgid "Preferences"
+msgstr "å??好設å®?"
+
 #: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "��"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "å??å??æ??è?ªå??é?£ç·?(_C)"
-
-#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "è¡?ç?º"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
 msgid "Chat Th_eme:"
 msgstr "è??天ä½?æ?¯ä¸»é¡?(_E):"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
 msgid "Disable notifications when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é??ç?¥(_D)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable sounds when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é?³æ??(_A)"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:6
 msgid "Enable notifications when a contact comes online"
 msgstr "ç?¶è?¯çµ¡äººä¸?ç·?æ??å??ç?¨é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact goes offline"
 msgstr "ç?¶è?¯çµ¡äººé?¢ç·?æ??å??ç?¨é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:8
 msgid "Enable notifications when the _chat is not focused"
 msgstr "ç?¶è??天è¦?çª?失å?»ç?¦é»?æ??å??ç?¨é??ç?¥(_C)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable spell checking for languages:"
 msgstr "ç?ºèª?è¨?å??ç?¨æ?¼å­?檢æ?¥ï¼?"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:10
 msgid "General"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:12
 msgid "Location sources:"
 msgstr "�置���"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:13
 msgid "Notifications"
 msgstr "é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:14
 msgid "Play sound for events"
 msgstr "æ?­æ?¾äº?件é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "å??好設å®?"
-
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:15
 msgid "Privacy"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:16
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
 "decimal place."
 msgstr "é??ä½?ä½?ç½®æº?確度æ??æ??é?¤äº?ä½ æ??å?¨ç??å??å¸?ã??æ´²å??å??家æ??被å?¬é??ä¹?å¤?ï¼?ä¸?æ??æ??ä¾?å?¶ä»?è¨?æ?¯ã??GPS ç??座æ¨?æº?確度å°?æ??é??ç?ºå??ä½?æ?¸ã??"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Show _smileys as images"
 msgstr "å°?表æ??符è??以å??ç??顯示(_S)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Show contact _list in rooms"
 msgstr "å?¨è??天室顯示è?¯çµ¡äººæ¸?å?®(_L)"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Sounds"
 msgstr "é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Spell Checking"
 msgstr "��檢�"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é??è£?ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºä½ å·²ç¶?å®?è£?å­?å?¸ç??èª?è¨?ã??"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Themes"
 msgstr "��主�"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
+msgid "_Automatically connect on startup"
+msgstr "å??å??æ??è?ªå??é?£ç·?(_A)"
+
+#: ../src/empathy-preferences.ui.h:24
 msgid "_Cellphone"
 msgstr "æ??æ©?(_C)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:25
 msgid "_Enable bubble notifications"
 msgstr "å??ç?¨æ°£æ³¡å¼?é??ç?¥(_E)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Enable sound notifications"
 msgstr "å??ç?¨é?³æ??é??ç?¥(_E)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:27
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Network (IP, Wi-Fi)"
-msgstr "網絡�IP, Wi-Fi�(_N)"
+msgstr "網絡 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??天(_O)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Publish location to my contacts"
 msgstr "å°?æ??ç??è?¯çµ¡äººå?¬é??ä½?ç½®(_P)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®æº?確度(_R)"
 
-#: ../src/empathy-status-icon.c:178
+#: ../src/empathy-status-icon.c:179
 msgid "Respond"
 msgstr "å??æ??"
 
@@ -3164,63 +3165,63 @@ msgstr "çµ?æ??(_Q)"
 msgid "Contact Map View"
 msgstr "è?¯çµ¡äººå?°å??檢è¦?"
 
-#: ../src/empathy-debug-window.c:1078
+#: ../src/empathy-debug-window.c:1161
 msgid "Save"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1251
+#: ../src/empathy-debug-window.c:1337
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1417
 msgid "Pause"
 msgstr "æ?«å??"
 
-#: ../src/empathy-debug-window.c:1343
+#: ../src/empathy-debug-window.c:1429
 msgid "Level "
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1363
+#: ../src/empathy-debug-window.c:1449
 msgid "Debug"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1369
+#: ../src/empathy-debug-window.c:1455
 msgid "Info"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1375 ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1461 ../src/empathy-debug-window.c:1510
 msgid "Message"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1381
+#: ../src/empathy-debug-window.c:1467
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1473
 msgid "Critical"
 msgstr "å?´é??"
 
-#: ../src/empathy-debug-window.c:1393
+#: ../src/empathy-debug-window.c:1479
 msgid "Error"
 msgstr "�誤"
 
-#: ../src/empathy-debug-window.c:1412
+#: ../src/empathy-debug-window.c:1498
 msgid "Time"
 msgstr "æ??å?»"
 
-#: ../src/empathy-debug-window.c:1415
+#: ../src/empathy-debug-window.c:1501
 msgid "Domain"
 msgstr "網å??"
 
-#: ../src/empathy-debug-window.c:1417
+#: ../src/empathy-debug-window.c:1503
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../src/empathy-debug-window.c:1419
+#: ../src/empathy-debug-window.c:1505
 msgid "Level"
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1456
+#: ../src/empathy-debug-window.c:1542
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3235,28 +3236,31 @@ msgstr "é??è«?å??è??"
 msgid "Choose a contact to invite into the conversation:"
 msgstr "é?¸æ??æ?³è¦?é??è«?é?²å?¥è«?話ç??è?¯çµ¡äººï¼?"
 
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "é??è«?"
+
+#: ../src/empathy-accounts.c:182
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ä¸?è¦?顯示任ä½?å°?話çª?ï¼?å?·è¡?ä»»ä½?ä½?業ï¼?ä¾?ï¼?å?¯å?¥ï¼?並é?¢é??"
 
-#: ../src/empathy-accounts.c:217
+#: ../src/empathy-accounts.c:186
 msgid "Don't display any dialogs if there are any non-salut accounts"
 msgstr "å¦?æ??æ??ä»»ä½?é?? salut ç??帳è??ï¼?å°±ä¸?è¦?顯示任ä½?å°?話çª?"
 
-#: ../src/empathy-accounts.c:221
-#, fuzzy
+#: ../src/empathy-accounts.c:190
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "å??å§?å??é?¸å??æ??給äº?ç??帳è??ï¼?ä¾?ï¼?gabble/jabber/foo_40example_2eorg0ï¼?"
+msgstr "å??å§?é?¸å??æ??給äº?ç??帳è?? (ä¾?ï¼?gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帳è??"
 
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
 msgid "Empathy Accounts"
 msgstr "Empathy 帳è??"
 
@@ -3264,6 +3268,18 @@ msgstr "Empathy 帳è??"
 msgid "Empathy Debugger"
 msgstr "Empathy ����"
 
+#~ msgid "Empathy IM Client"
+#~ msgstr "Empathy å?³æ??é??客æ?¶ç«¯"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "MC 4 帳è??å·²ç¶?å?¯å?¥"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4 帳è??å·²ç¶?å?¯å?¥ã??"
+
+#~ msgid "%s account"
+#~ msgstr "%s 帳è??"
+
 #~ msgid "Hostname of the proxy for outbound requests."
 #~ msgstr "è³?æ??å?³å?ºè¦?æ±?æ??使ç?¨ç?? proxy 主æ©?å??稱ã??"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index acdba56..fa0690d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.31.1\n"
+"Project-Id-Version: empathy 2.31.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-08 19:00+0800\n"
-"PO-Revision-Date: 2010-04-26 18:04+0800\n"
+"POT-Creation-Date: 2010-06-26 14:05+0800\n"
+"PO-Revision-Date: 2010-06-25 15:42+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
 "MIME-Version: 1.0\n"
@@ -23,389 +23,389 @@ msgid "Empathy"
 msgstr "Empathy"
 
 #: ../data/empathy.desktop.in.in.h:2
-msgid "Empathy IM Client"
-msgstr "Empathy å?³æ??é??客æ?¶ç«¯"
+msgid "Empathy Internet Messaging"
+msgstr "Empathy 網é??網路é??è¨?ç¨?å¼?"
 
 #: ../data/empathy.desktop.in.in.h:3
 msgid "IM Client"
-msgstr "å?³æ??é??客æ?¶ç«¯"
+msgstr "å?³æ??é??ç?¨æ?¶ç«¯"
 
 #: ../data/empathy.desktop.in.in.h:4
 msgid "Send and receive messages"
 msgstr "å?³é??è??æ?¥æ?¶è¨?æ?¯"
 
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "æ°¸é? ç?ºæ¯?å??æ?°ç??è??天é??å??æ?°ç??è??天è¦?çª?ã??"
 
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "å?¨ç¾¤çµ?è??天中使ç?¨æ?±ç¨±è£?é½? (tab) æ??è¦?å? å?°æ?±ç¨±ä¹?å¾?ç??å­?å??ã??"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Chat window theme"
 msgstr "è??天è¦?çª?ä½?æ?¯ä¸»é¡?"
 
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
 "Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
-msgstr "以é??è??å??é??è¦?使ç?¨æ?¼å­?檢æ?¥ç??èª?è¨?æ¸?å?®ï¼?å¦?ï¼?ã?? en,fr,nlã??ï¼?ã??"
+msgstr "以é??è??å??é??è¦?使ç?¨æ?¼å­?檢æ?¥ç??èª?è¨?æ¸?å?® (å¦?ï¼?ã?? en,fr,nlã??)ã??"
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
 msgstr "精簡�絡人��"
 
-#: ../data/empathy.schemas.in.h:6
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
 msgid "Connection managers should be used"
 msgstr "使ç?¨é?£ç·?管ç??ç¨?å¼?"
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
 msgid "Contact list sort criterion"
 msgstr "é?£çµ¡äººæ¸?å?®æ??åº?æº?å??"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "ç?¨ä¾?é?¸æ??å¤§é ­è²¼å??ç??ç??é ?設ç?®é??"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å??ç?¨å½?å?ºå¼?é??ç?¥"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Disable sounds when away"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å??ç?¨é?³æ??"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
 msgid "Empathy can publish the user's location"
 msgstr "Empathy å?¯ä»¥ç?¼ä½?使ç?¨è??ç??ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy �以�� GPS ��測�置"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can use the cellular network to guess the location"
 msgstr "Empathy å?¯ä»¥å?©ç?¨è¡?å??é?»è©±ç¶²è·¯å?ºå?°å?°ä¾?æ?¨æ¸¬ä½?ç½®"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy �以��網路��測�置"
 
-#: ../data/empathy.schemas.in.h:15
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy default download folder"
 msgstr "Empathy é ?設ä¸?è¼?è³?æ??夾"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy has asked about importing accounts"
 msgstr "Empathy 已詢å??å?¯å?¥å¸³è??"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy 已�移 butterfly ��"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy ç?¶é??ç½®æ??æ??該è?ªå??設ç?ºé?¢é??"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy å??å??æ??è?ªå??é?£ç·?"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy æ??é??ä½?ä½?ç½®ç??æº?確度"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy è¦?使ç?¨é?£çµ¡äººç??å¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Enable WebKit Developer Tools"
 msgstr "å??ç?¨ WebKit é??ç?¼è??å·¥å?·"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Enable popup notifications for new messages"
 msgstr "å??ç?¨æ?°è¨?æ?¯ç??å½?å?ºå¼?é??ç?¥"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable spell checker"
 msgstr "å??ç?¨æ?¼å­?檢æ?¥ç¨?å¼?"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Hide main window"
 msgstr "é?±è??主è¦?çª?"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Hide the main window."
 msgstr "é?±è??主è¦?çª?ã??"
 
-#: ../data/empathy.schemas.in.h:27
-msgid "MC 4 accounts have been imported"
-msgstr "MC 4 帳è??å·²ç¶?å?¯å?¥"
-
-#: ../data/empathy.schemas.in.h:28
-msgid "MC 4 accounts have been imported."
-msgstr "MC 4 帳è??å·²ç¶?å?¯å?¥ã??"
-
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Nick completed character"
 msgstr "æ?±ç¨±è£?é½?å­?å??"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??天"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Path of the Adium theme to use"
 msgstr "è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "å¦?æ??è??天室使ç?¨ç??主é¡?æ?¯ Adium æ??è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?ã??"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Play a sound for incoming messages"
 msgstr "æ?¶å?°è¨?æ?¯æ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Play a sound for new conversations"
 msgstr "ç?¶é??å??æ?°ç??è«?話æ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for outgoing messages"
 msgstr "é??å?ºè¨?æ?¯æ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound when a contact logs in"
 msgstr "ç?¶é?£çµ¡äººç?»å?¥æ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound when a contact logs out"
 msgstr "ç?¶æ??é?£çµ¡äººç?»å?ºæ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when we log in"
 msgstr "ç?¶æ??å??ç?»å?¥æ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when we log out"
 msgstr "ç?¶æ??å??ç?»å?ºæ??æ?­æ?¾é?³æ??"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "å¦?æ??è??天è¦?çª?失å?»ç?¦é»?å??å½?å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Pop up notifications when a contact logs in"
 msgstr "ç?¶é?£çµ¡äººç?»å?¥æ??å½?å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Pop up notifications when a contact logs out"
 msgstr "ç?¶é?£çµ¡äººç?»å?ºæ??å½?å?ºé??ç?¥"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Show avatars"
 msgstr "é¡¯ç¤ºå¤§é ­è²¼"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Show contact list in rooms"
 msgstr "å?¨è??天室顯示é?£çµ¡äººæ¸?å?®"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show hint about closing the main window"
 msgstr "é??é??主è¦?çª?æ??顯示æ??示"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show offline contacts"
 msgstr "顯示���絡人"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show protocols"
 msgstr "顯示å??å®?"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Spell checking languages"
 msgstr "æ?¼å­?檢æ?¥ç??èª?è¨?"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "The default folder to save file transfers in."
 msgstr "ç?¨ä¾?å?²å­?æª?æ¡?å?³è¼¸æ?¥æ?¶æª?æ¡?ç??é ?設è³?æ??夾ã??"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ä¸?次é?¸æ??å¤§é ­è²¼å??ç??ç??ç?®é??ã??"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+msgid "The position for the chat window side pane"
+msgstr "è??天è¦?çª?å?´çª?æ ¼ç??ä½?ç½®"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "è??天è¦?çª?å?´çª?æ ¼ç??å?²å­?ä½?ç½® (å?®ä½?ç?ºå??ç´ )ã??"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ç?¨ä¾?顯示å?¨è??天è¦?çª?ç??è«?話中ç??ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "Use graphical smileys"
 msgstr "使ç?¨å??ç??å¼?表æ??符è??"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Use notification sounds"
 msgstr "使ç?¨é??ç?¥é?³æ??"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use theme for chat rooms"
 msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??é?£çµ¡äººã??"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨è¡?å??é?»è©±ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr "Empathy æ?¯å?¦æ??è©¢å??æ?¨è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Empathy æ?¯å?¦æ??è½?移 butterfly æ?¥èª?ã??"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥æ?¨ç??帳è??ã??"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid "Whether Empathy should go into away mode automatically if user is idle."
 msgstr "Empathy æ?¯å?¦æ??å?¨ä½¿ç?¨è??é??ç½®æ??è?ªå??å??æ??ç?ºé?¢é??模å¼?ã??"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy æ?¯å?¦å?ºæ?¼é?±ç§?ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨é?£çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "æ?¯å?¦å??ç?¨ WebKit é??ç?¼è??å·¥å?·ï¼?ä¾?å¦? Web Inspectorã??"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
-msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?/é??æ?°é?£ç·?ã??"
+msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?æ??é??æ?°é?£ç·?ã??"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "æ?¯å?¦ä»¥æ?¨è¨­å®?ç??èª?è¨?檢æ?¥è¼¸å?¥æ??ç?¡é?¯å­?ã??"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "æ?¯å?¦å°?è«?話中ç??表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é?£çµ¡äººç?»å?¥ç¶²è·¯ã??"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é?£çµ¡äººç?»å?ºç¶²è·¯ã??"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether to play a sound to notify of events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??æ?¶å?°è¨?æ?¯ã??"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ?°ç??è«?話ã??"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é??å?ºè¨?æ?¯ã??"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether to play a sound when logging into a network."
 msgstr "ç?¶ç?»å?¥æ??網路æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ç?¶ç?»å?ºæ??網路æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦æ?­æ?¾é?³æ??é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ç?¶é?£çµ¡äººé?¢ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ç?¶é?£çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
 "Whether 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:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ç?¶æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "æ?¯å?¦å?¨é?£çµ¡äººæ¸?å?®è??è??天è¦?çª?顯示é?£çµ¡äººå¤§é ­è²¼ã??"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦å?¨é?£çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??é?£çµ¡äººã??"
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/empathy.schemas.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "æ?¯å?¦è¦?å?¨è?¯çµ¡äººæ¸?å?®å?§é¡¯ç¤ºè?¯çµ¡äººä½¿ç?¨å??å®?ã??"
 
-#: ../data/empathy.schemas.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室中顯示é?£çµ¡äººæ¸?å?®ã??"
 
-#: ../data/empathy.schemas.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show the contact list in compact mode."
 msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示é?£çµ¡äººæ¸?å?®ã??"
 
-#: ../data/empathy.schemas.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
 msgid ""
 "Whether 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:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to use the theme for chat rooms."
 msgstr "æ?¯å?¦ç?ºè??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/empathy.schemas.in.h:90
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -420,7 +420,7 @@ msgstr "管ç??è¨?æ?¯è?? VoIP 帳è??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2064 ../src/cc-empathy-accounts-page.c:244
+#: ../src/empathy-accounts-dialog.c:2094 ../src/cc-empathy-accounts-page.c:244
 #: ../src/cc-empathy-accounts-panel.c:91
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP 帳è??"
@@ -471,7 +471,7 @@ msgstr "å?¶ä»?ç??å??è??è??ç?¡æ³?å?³è¼¸è©²æª?æ¡?"
 
 #: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:315
 msgid "Unknown reason"
-msgstr "ä¸?æ??ç??å??å? "
+msgstr "ä¸?æ??å??å? "
 
 #: ../libempathy/empathy-utils.c:238
 msgid "Available"
@@ -553,7 +553,7 @@ msgstr "æ??è­?ç?ºè?ªæ??簽署"
 msgid "Certificate error"
 msgstr "æ??è­?é?¯èª¤"
 
-#: ../libempathy/empathy-utils.c:430 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:430
 msgid "People Nearby"
 msgstr "é??è¿?ç??人"
 
@@ -613,7 +613,7 @@ msgstr "��"
 #: ../libempathy-gtk/empathy-account-widget.c:605
 #, c-format
 msgid "%s:"
-msgstr "%s:"
+msgstr "%sï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget.c:1136
 msgid "Username:"
@@ -688,11 +688,11 @@ msgstr "é?²é??"
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
-msgstr "�碼(_W):"
+msgstr "�碼(_W)�"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 msgid "Screen _Name:"
-msgstr "è?¢å¹?å??稱(_N):"
+msgstr "è?¢å¹?å??稱(_N)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
 msgid "What is your AIM password?"
@@ -709,7 +709,7 @@ msgstr "æ?¨ç?? AIM è?¢å¹?å??稱æ?¯ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
-msgstr "é?£æ?¥å? (_P):"
+msgstr "é?£æ?¥å? (_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
@@ -719,7 +719,7 @@ msgstr "é?£æ?¥å? (_P):"
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
-msgstr "伺æ??å?¨(_S):"
+msgstr "伺æ??å?¨(_S)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
@@ -730,7 +730,7 @@ msgstr "<b>ç¯?ä¾?ï¼?</b> 使ç?¨è??å??稱"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
-msgstr "�� I_D:"
+msgstr "�� I_D�"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
 msgid "What is your GroupWise User ID?"
@@ -746,7 +746,7 @@ msgstr "<b>���</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
+msgstr "ICQ _UINï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
 msgid "What is your ICQ UIN?"
@@ -761,7 +761,7 @@ msgstr "æ?¨ç?? ICQ å¯?碼æ?¯ï¼?"
 msgid "_Character set:"
 msgstr "å­?é??(_C)ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:244
+#: ../libempathy-gtk/empathy-account-widget-irc.c:245
 msgid "New Network"
 msgstr "��網路"
 
@@ -808,23 +808,23 @@ msgstr "網路"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
-msgstr "網路:"
+msgstr "網路�"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
-msgstr "�稱:"
+msgstr "�稱�"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
-msgstr "�碼:"
+msgstr "�碼�"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
-msgstr "é?¢é??è¨?æ?¯:"
+msgstr "é?¢é??è¨?æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
-msgstr "ç??實å§?å??:"
+msgstr "ç??實å§?å??ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Servers"
@@ -844,11 +844,11 @@ msgstr "è¦?è??伺æ??å?¨è¨­å®?å?¼"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Pri_ority:"
-msgstr "å?ªå??æ¬?(_O):"
+msgstr "å?ªå??æ¬?(_O)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "Reso_urce:"
-msgstr "��(_U):"
+msgstr "��(_U)�"
 
 #. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
@@ -865,7 +865,7 @@ msgstr ""
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "Use old SS_L"
-msgstr "使ç?¨è??ç?? SS_L"
+msgstr "使ç?¨è??ç?? SS_L"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid "What is your Facebook password?"
@@ -921,11 +921,11 @@ msgstr "æ?¨ç?? Windows Live å¯?碼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
 msgid "_E-mail address:"
-msgstr "é?»å­?é?µä»¶ä½?å??(_E):"
+msgstr "é?»å­?é?µä»¶ä½?å??(_E)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
-msgstr "å??(_F):"
+msgstr "å??(_F)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_Jabber ID:"
@@ -933,15 +933,15 @@ msgstr "_Jabber ID:"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Last Name:"
-msgstr "�(_L):"
+msgstr "�(_L)�"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Nickname:"
-msgstr "�稱(_N):"
+msgstr "�稱(_N)�"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
-msgstr "ç?¼ä½?ç??å??稱(_P):"
+msgstr "ç?¼ä½?ç??å??稱(_P)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
 msgid "<b>Example:</b> user my sip server"
@@ -953,7 +953,7 @@ msgstr "èª?è­?使ç?¨è??å??稱ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
-msgstr "�索�� (Binding)"
+msgstr "�索��"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
@@ -961,7 +961,7 @@ msgstr "è?ªå??æ?¢ç´¢ STUN 伺æ??å?¨"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "Interval (seconds)"
-msgstr "é??é??ï¼?ç§?ï¼?"
+msgstr "é??é?? (ç§?)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Keep-Alive Options"
@@ -993,15 +993,15 @@ msgstr "Proxy é?¸é ?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "STUN Server:"
-msgstr "STUN 伺æ??å?¨:"
+msgstr "STUN 伺æ??å?¨ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Server:"
-msgstr "伺æ??å?¨:"
+msgstr "伺æ??å?¨ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "Transport:"
-msgstr "å?³é??é??è¨?å? :"
+msgstr "å?³é??é??è¨?å? ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "What is your SIP account password?"
@@ -1013,7 +1013,7 @@ msgstr "æ?¨æ?³è¦?ç?? SIP ç?»å?¥ ID æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "_Username:"
-msgstr "使ç?¨è??å??稱(_U):"
+msgstr "使ç?¨è??å??稱(_U)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
 msgid "Use _Yahoo! Japan"
@@ -1037,30 +1037,30 @@ msgstr "忽ç?¥æ??è­°è??è??天室é??è«?(_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 msgid "_Room List locale:"
-msgstr "è??天室æ¸?å?®å?°å??(_R):"
+msgstr "è??天室æ¸?å?®å?°å??(_R)ï¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
 msgid "Couldn't convert image"
 msgstr "ç?¡æ³?è½?æ??å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
 msgid "None of the accepted image formats are supported on your system"
 msgstr "æ?¨ç??系統ä¸?æ²?æ??æ?¯æ?´å·²æ?¥å??ç??å??ç??æ ¼å¼?"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:915
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
 msgid "Select Your Avatar Image"
 msgstr "é?¸æ??æ?¨ç??å¤§é ­è²¼å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:918
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
 msgid "No Image"
 msgstr "æ²?æ??å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:980
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
 msgid "Images"
 msgstr "å??ç??"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:984
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
 msgid "All Files"
 msgstr "æ??æ??æª?æ¡?"
 
@@ -1068,153 +1068,153 @@ msgstr "æ??æ??æª?æ¡?"
 msgid "Click to enlarge"
 msgstr "è«?æ??é??裡æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:235
+#: ../libempathy-gtk/empathy-chat.c:239
 msgid "Failed to reconnect this chat"
 msgstr "ç?¡æ³?é??é?£é??å??è??天æ??è­°"
 
-#: ../libempathy-gtk/empathy-chat.c:657
+#: ../libempathy-gtk/empathy-chat.c:661
 msgid "Failed to join chat room"
 msgstr "å? å?¥è??天室失æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:675
+#: ../libempathy-gtk/empathy-chat.c:679
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?人å°?話失æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:714
+#: ../libempathy-gtk/empathy-chat.c:718
 msgid "Topic not supported on this conversation"
 msgstr "æ­¤è«?話ç??主é¡?ä¸?被æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:720
+#: ../libempathy-gtk/empathy-chat.c:724
 msgid "You are not allowed to change the topic"
 msgstr "æ?¨ä¸?被å??許è®?æ?´é??å??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:851
+#: ../libempathy-gtk/empathy-chat.c:855
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: æ¸?é?¤ç?®å??è«?話ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:854
+#: ../libempathy-gtk/empathy-chat.c:858
 msgid "/topic <topic>: set the topic of the current conversation"
-msgstr "/topic <主é¡?>: 設置ç?®å??è«?話ç??主é¡?"
+msgstr "/topic <主é¡?>ï¼?設置ç?®å??è«?話ç??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:857
+#: ../libempathy-gtk/empathy-chat.c:861
 msgid "/join <chat room ID>: join a new chat room"
-msgstr "/join <è??天室 ID>: å? å?¥æ?°ç??è??天室"
+msgstr "/join <è??天室 ID>ï¼?å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:860
+#: ../libempathy-gtk/empathy-chat.c:864
 msgid "/j <chat room ID>: join a new chat room"
-msgstr "/j <è??天室 ID>: å? å?¥æ?°ç??è??天室"
+msgstr "/j <è??天室 ID>ï¼?å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:863
+#: ../libempathy-gtk/empathy-chat.c:867
 msgid "/query <contact ID> [<message>]: open a private chat"
-msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]: é??å??ç§?人å°?話"
+msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]ï¼?é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:866
+#: ../libempathy-gtk/empathy-chat.c:870
 msgid "/msg <contact ID> <message>: open a private chat"
-msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>: é??å??ç§?人å°?話"
+msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>ï¼?é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:869
+#: ../libempathy-gtk/empathy-chat.c:873
 msgid "/nick <nickname>: change your nickname on the current server"
-msgstr "/nick <æ?±ç¨±>: è®?æ?´å?¨ç?®å??伺æ??å?¨ä¸?ç??æ?¨ç??æ?±ç¨±"
+msgstr "/nick <æ?±ç¨±>ï¼?è®?æ?´å?¨ç?®å??伺æ??å?¨ä¸?ç??æ?¨ç??æ?±ç¨±"
 
-#: ../libempathy-gtk/empathy-chat.c:872
+#: ../libempathy-gtk/empathy-chat.c:876
 msgid "/me <message>: send an ACTION message to the current conversation"
-msgstr "/me <è¨?æ?¯>: é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?話中"
+msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?話中"
 
-#: ../libempathy-gtk/empathy-chat.c:875
+#: ../libempathy-gtk/empathy-chat.c:879
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
 "join a new chat room\""
 msgstr ""
-"/say <è¨?æ?¯>: é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?話中ã??é??ç?¨æ?¼å?³é??以ã??/ã??é??é ­ç??è¨?æ?¯ã??è??ä¾?ä¾?"
+"/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?話中ã??é??ç?¨æ?¼å?³é??以ã??/ã??é??é ­ç??è¨?æ?¯ã??è??ä¾?ä¾?"
 "說ï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??天室ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:880
+#: ../libempathy-gtk/empathy-chat.c:884
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<å?½ä»¤>]: 顯示æ??æ??æ?¯æ?´ç??æ??令ã??å¦?æ??æ??å®?義é??å?? <å?½ä»¤> ç??話ï¼?便顯示å®?ç??ç?¨"
+"/help [<å?½ä»¤>]ï¼?顯示æ??æ??æ?¯æ?´ç??æ??令ã??å¦?æ??æ??å®?義é??å?? <å?½ä»¤> ç??話ï¼?便顯示å®?ç??ç?¨"
 "æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:890
+#: ../libempathy-gtk/empathy-chat.c:894
 #, c-format
 msgid "Usage: %s"
-msgstr "��: %s"
+msgstr "���%s"
 
-#: ../libempathy-gtk/empathy-chat.c:919
+#: ../libempathy-gtk/empathy-chat.c:923
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:1040
+#: ../libempathy-gtk/empathy-chat.c:1044
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??令ï¼?è«?å??è¦? /help 以å??å¾?å?¯ç?¨ç??æ??令"
 
-#: ../libempathy-gtk/empathy-chat.c:1178
+#: ../libempathy-gtk/empathy-chat.c:1182
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1185
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1184
+#: ../libempathy-gtk/empathy-chat.c:1188
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1187
+#: ../libempathy-gtk/empathy-chat.c:1191
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1190
+#: ../libempathy-gtk/empathy-chat.c:1194
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1197
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1197
+#: ../libempathy-gtk/empathy-chat.c:1201
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1307 ../src/empathy-chat-window.c:687
+#: ../libempathy-gtk/empathy-chat.c:1311 ../src/empathy-chat-window.c:691
 msgid "Topic:"
-msgstr "主�:"
+msgstr "主��"
 
-#: ../libempathy-gtk/empathy-chat.c:1319
+#: ../libempathy-gtk/empathy-chat.c:1323
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1321
+#: ../libempathy-gtk/empathy-chat.c:1325
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:1717
+#: ../libempathy-gtk/empathy-chat.c:1804
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1771
+#: ../libempathy-gtk/empathy-chat.c:1858
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1789
-#: ../libempathy-gtk/empathy-ui-utils.c:1634
+#: ../libempathy-gtk/empathy-chat.c:1876
+#: ../libempathy-gtk/empathy-ui-utils.c:1618
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1823
+#: ../libempathy-gtk/empathy-chat.c:1910
 msgid "_Spelling Suggestions"
 msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1917
+#: ../libempathy-gtk/empathy-chat.c:1987
 msgid "Failed to retrieve recent logs"
 msgstr "ç?¡æ³?å??å¾?æ??è¿?ç??æ?¥èª?"
 
-#: ../libempathy-gtk/empathy-chat.c:2048
+#: ../libempathy-gtk/empathy-chat.c:2093
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已��"
@@ -1222,30 +1222,30 @@ msgstr "%s 已��"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2055
+#: ../libempathy-gtk/empathy-chat.c:2100
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢��"
 
-#: ../libempathy-gtk/empathy-chat.c:2058
+#: ../libempathy-gtk/empathy-chat.c:2103
 #, c-format
 msgid "%s was kicked"
-msgstr "%s 被踢���"
+msgstr "%s 被踢�"
 
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:2066
+#: ../libempathy-gtk/empathy-chat.c:2111
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2069
+#: ../libempathy-gtk/empathy-chat.c:2114
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:2073
+#: ../libempathy-gtk/empathy-chat.c:2118
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
@@ -1255,77 +1255,77 @@ msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:2082
+#: ../libempathy-gtk/empathy-chat.c:2127
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2107
+#: ../libempathy-gtk/empathy-chat.c:2152
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2132
+#: ../libempathy-gtk/empathy-chat.c:2177
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��被稱� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2271 ../src/empathy-call-window.c:1643
+#: ../libempathy-gtk/empathy-chat.c:2316 ../src/empathy-call-window.c:1653
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2801
+#: ../libempathy-gtk/empathy-chat.c:2947
 msgid "Wrong password; please try again:"
-msgstr "å¯?碼é?¯èª¤ï¼?è«?å??試ä¸?次:"
+msgstr "å¯?碼é?¯èª¤ï¼?è«?å??試ä¸?次ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2802
+#: ../libempathy-gtk/empathy-chat.c:2948
 msgid "Retry"
 msgstr "é??試"
 
-#: ../libempathy-gtk/empathy-chat.c:2807
+#: ../libempathy-gtk/empathy-chat.c:2953
 msgid "This room is protected by a password:"
-msgstr "æ­¤è??天室已被å¯?碼ä¿?è­·:"
+msgstr "æ­¤è??天室已被å¯?碼ä¿?è­·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2808
+#: ../libempathy-gtk/empathy-chat.c:2954
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2948
+#: ../libempathy-gtk/empathy-chat.c:3094
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3001
-#: ../libempathy-gtk/empathy-log-window.c:707
+#: ../libempathy-gtk/empathy-chat.c:3147
+#: ../libempathy-gtk/empathy-log-window.c:639
 msgid "Conversation"
 msgstr "�話"
 
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:318
-#: ../libempathy-gtk/empathy-theme-adium.c:786
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:785
 msgid "_Copy Link Address"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:325
-#: ../libempathy-gtk/empathy-theme-adium.c:793
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:792
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:423
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:249
+#: ../libempathy-gtk/empathy-contact-dialogs.c:243
 msgid "Edit Contact Information"
 msgstr "編輯�絡人��"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:301
+#: ../libempathy-gtk/empathy-contact-dialogs.c:295
 msgid "Personal Information"
 msgstr "å??人è³?è¨?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:406
+#: ../libempathy-gtk/empathy-contact-dialogs.c:401
 msgid "New Contact"
 msgstr "���絡人"
 
@@ -1337,214 +1337,234 @@ msgstr "ç¨?å¾?å??決å®?"
 msgid "Subscription Request"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1633
+#: ../libempathy-gtk/empathy-contact-list-view.c:1984
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤ç¾¤çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1635
+#: ../libempathy-gtk/empathy-contact-list-view.c:1986
 msgid "Removing group"
 msgstr "正�移�群�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1684
-#: ../libempathy-gtk/empathy-contact-list-view.c:1761
+#: ../libempathy-gtk/empathy-contact-list-view.c:2035
+#: ../libempathy-gtk/empathy-contact-list-view.c:2112
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1714
+#: ../libempathy-gtk/empathy-contact-list-view.c:2065
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤é?£çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1716
+#: ../libempathy-gtk/empathy-contact-list-view.c:2067
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:209
-#: ../src/empathy-main-window.ui.h:14
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
 msgid "_Add Contactâ?¦"
 msgstr "���絡人(_A)�"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:237
-#: ../src/empathy-main-window.ui.h:15
+#: ../libempathy-gtk/empathy-contact-menu.c:231
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "è??天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:268
+#: ../libempathy-gtk/empathy-contact-menu.c:263
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èª?é?³é??話(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:300
+#: ../libempathy-gtk/empathy-contact-menu.c:296
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?è¨?é??話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:351
-#: ../src/empathy-main-window.ui.h:26
+#: ../libempathy-gtk/empathy-contact-menu.c:336
+#: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "��次�話(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:373
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:358
+msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:396
-msgid "Share my desktop"
+#: ../libempathy-gtk/empathy-contact-menu.c:381
+msgid "Share My Desktop"
 msgstr "å??享æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:436
-#: ../libempathy-gtk/empathy-contact-widget.c:1444
+#: ../libempathy-gtk/empathy-contact-menu.c:421
+#: ../libempathy-gtk/empathy-contact-widget.c:1818
 msgid "Favorite"
 msgstr "å??好"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:466
+#: ../libempathy-gtk/empathy-contact-menu.c:450
 msgid "Infor_mation"
 msgstr "��(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:512
+#: ../libempathy-gtk/empathy-contact-menu.c:496
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:566
-#: ../src/empathy-chat-window.c:872
+#: ../libempathy-gtk/empathy-contact-menu.c:550
+#: ../src/empathy-chat-window.c:903
 msgid "Inviting you to this room"
 msgstr "é??è«?æ?¨å?°é??å??è??天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:597
-msgid "_Invite to chat room"
+#: ../libempathy-gtk/empathy-contact-menu.c:581
+msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??天室(_I)"
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é?¸æ??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:238
+#: ../libempathy-gtk/empathy-contact-widget.c:219
+msgid "Full name:"
+msgstr "å?¨å??ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:220
+msgid "Phone number:"
+msgstr "é?»è©±è??碼ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:221
+msgid "E-mail address:"
+msgstr "é?»å­?ä¿¡ç®±ä½?å??ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:222
+msgid "Website:"
+msgstr "網��"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:223
+msgid "Birthday:"
+msgstr "ç??æ?¥ï¼?"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:614
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:247
-#: ../src/empathy-main-window.c:1073
+#: ../libempathy-gtk/empathy-contact-widget.c:623
+#: ../src/empathy-main-window.c:1171
 msgid "Group"
 msgstr "群�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:854
 msgid "Country ISO Code:"
 msgstr "å??家 ISO 碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:856
 msgid "Country:"
 msgstr "å??家ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:858
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:860
 msgid "City:"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:862
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:864
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:866
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:868
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:870
 msgid "Floor:"
 msgstr "�層�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:872
 msgid "Room:"
 msgstr "室�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:874
 msgid "Text:"
 msgstr "æ??å­?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:876
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:502
+#: ../libempathy-gtk/empathy-contact-widget.c:878
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:504
+#: ../libempathy-gtk/empathy-contact-widget.c:880
 msgid "Accuracy Level:"
 msgstr "�確度���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:506
+#: ../libempathy-gtk/empathy-contact-widget.c:882
 msgid "Error:"
 msgstr "�誤�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:508
+#: ../libempathy-gtk/empathy-contact-widget.c:884
 msgid "Vertical Error (meters):"
-msgstr "å??ç?´èª¤å·®ï¼?å?¬å°ºï¼?ï¼?"
+msgstr "å??ç?´èª¤å·® (å?¬å°º)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:510
+#: ../libempathy-gtk/empathy-contact-widget.c:886
 msgid "Horizontal Error (meters):"
-msgstr "水平誤差��尺��"
+msgstr "水平誤差 (�尺)�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:512
+#: ../libempathy-gtk/empathy-contact-widget.c:888
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:514
+#: ../libempathy-gtk/empathy-contact-widget.c:890
 msgid "Bearing:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:516
+#: ../libempathy-gtk/empathy-contact-widget.c:892
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:518
+#: ../libempathy-gtk/empathy-contact-widget.c:894
 msgid "Last Updated on:"
 msgstr "�次����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:520
+#: ../libempathy-gtk/empathy-contact-widget.c:896
 msgid "Longitude:"
-msgstr "�度:"
+msgstr "�度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:522
+#: ../libempathy-gtk/empathy-contact-widget.c:898
 msgid "Latitude:"
-msgstr "緯度:"
+msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:524
+#: ../libempathy-gtk/empathy-contact-widget.c:900
 msgid "Altitude:"
-msgstr "緯度:"
+msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:587
-#: ../src/empathy-preferences.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.c:963
+#: ../src/empathy-preferences.ui.h:11
 msgid "Location"
 msgstr "ä½?ç½®"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:603
+#: ../libempathy-gtk/empathy-contact-widget.c:979
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®<b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:653
+#: ../libempathy-gtk/empathy-contact-widget.c:1029
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-contact-widget.c:1112
 msgid "Save Avatar"
 msgstr "å?²å­?å¤§é ­è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:792
+#: ../libempathy-gtk/empathy-contact-widget.c:1168
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
 
@@ -1554,65 +1574,49 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
 msgid "Alias:"
-msgstr "å?¥å??:"
+msgstr "å?¥å??ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "ç??æ?¥:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client Information"
-msgstr "客�端��"
+msgstr "��端��"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
-msgstr "客�端:"
+msgstr "��端�"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
 msgid "Contact Details"
 msgstr "é?£çµ¡äººè©³ç´°è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-msgid "E-mail address:"
-msgstr "é?»å­?ä¿¡ç®±ä½?å??ï¼?"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Full name:"
-msgstr "å?¨å??:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
 msgid "Groups"
 msgstr "群�"
 
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
 msgid "Identifier:"
-msgstr "���:"
+msgstr "è­?å?¥èº«å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Information requestedâ?¦"
 msgstr "��已���"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
 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.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
 msgid "Version:"
-msgstr "ç??æ?¬:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Website:"
-msgstr "網�:"
+msgstr "ç??æ?¬ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "_Add Group"
 msgstr "å? å?¥ç¾¤çµ?(_G)"
 
@@ -1632,12 +1636,12 @@ msgstr "é?£æ?¥å? "
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:700
-#: ../src/empathy-import-widget.c:310
+#: ../libempathy-gtk/empathy-log-window.c:632
+#: ../src/empathy-import-widget.c:312
 msgid "Account"
 msgstr "帳è??"
 
-#: ../libempathy-gtk/empathy-log-window.c:717
+#: ../libempathy-gtk/empathy-log-window.c:649
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1655,11 +1659,11 @@ msgstr "æ??å°?"
 
 #: ../libempathy-gtk/empathy-log-window.ui.h:4
 msgid "_For:"
-msgstr "æ??å°?(_F):"
+msgstr "ä½?è??(_F)ï¼?"
 
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
 msgid "Contact ID:"
-msgstr "�絡人 ID:"
+msgstr "�絡人 ID�"
 
 #. add chat button
 #: ../libempathy-gtk/empathy-new-message-dialog.c:145
@@ -1672,18 +1676,18 @@ msgid "New Conversation"
 msgstr "���話"
 
 #. add video toggle
-#: ../libempathy-gtk/empathy-new-call-dialog.c:188
+#: ../libempathy-gtk/empathy-new-call-dialog.c:190
 msgid "Send _Video"
 msgstr "å?³é??è¦?è¨?(_V)"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-call-dialog.c:196
+#: ../libempathy-gtk/empathy-new-call-dialog.c:198
 #: ../src/empathy-call-window.ui.h:17
 msgid "_Call"
 msgstr "é??話(_C)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-call-dialog.c:206
+#: ../libempathy-gtk/empathy-new-call-dialog.c:208
 msgid "New Call"
 msgstr "æ?°å¢?é??話"
 
@@ -1736,43 +1740,43 @@ msgstr "符å??æ¢?件"
 msgid "Phrase not found"
 msgstr "�����"
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
 msgid "Received an instant message"
 msgstr "æ?¶å?°å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
 msgid "Sent an instant message"
 msgstr "å?³é??å?³æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
 msgid "Incoming chat request"
 msgstr "æ?¶å?°è??天è¦?æ±?"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
 msgid "Contact connected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
 msgid "Contact disconnected"
 msgstr "�絡人已��"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
 msgid "Connected to server"
 msgstr "é?£æ?¥å?°ä¼ºæ??å?¨"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
 msgid "Disconnected from server"
 msgstr "è??伺æ??å?¨æ?·ç·?"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
 msgid "Incoming voice call"
 msgstr "æ?¶å?°èª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
 msgid "Outgoing voice call"
 msgstr "æ?­å?ºèª?é?³é??話"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
 msgid "Voice call ended"
 msgstr "èª?é?³é??話çµ?æ??"
 
@@ -1808,15 +1812,15 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1509
+#: ../libempathy-gtk/empathy-ui-utils.c:1515
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1626
+#: ../libempathy-gtk/empathy-ui-utils.c:1610
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1690
+#: ../libempathy-gtk/empathy-ui-utils.c:1674
 msgid "Select a destination"
 msgstr "é?¸å??ç?®ç??å?°"
 
@@ -2003,17 +2007,17 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:601
+#: ../src/empathy.c:559
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:605
+#: ../src/empathy.c:563
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?顯示é?£çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?話çª?"
 
-#: ../src/empathy.c:617
+#: ../src/empathy.c:575
 msgid "- Empathy IM Client"
-msgstr "- Empathy å?³æ??é??客æ?¶ç«¯"
+msgstr "- Empathy å?³æ??é??ç?¨æ?¶ç«¯"
 
 #: ../src/empathy-about-dialog.c:85
 msgid ""
@@ -2048,7 +2052,7 @@ msgstr ""
 
 #: ../src/empathy-about-dialog.c:121
 msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME ç??å?³æ??è¨?æ?¯å®¢æ?¶ç«¯ç¨?å¼?"
+msgstr "GNOME ç??å?³æ??è¨?æ?¯ç?¨æ?¶ç«¯ç¨?å¼?"
 
 #: ../src/empathy-about-dialog.c:127
 msgid "translator-credits"
@@ -2092,7 +2096,7 @@ msgstr ""
 "è??ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1308
+#: ../src/empathy-account-assistant.c:1315
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
@@ -2101,36 +2105,36 @@ msgstr "ç?¼ç??é?¯èª¤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:579
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:606
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å¢? %s 帳è??"
 
-#: ../src/empathy-account-assistant.c:507
+#: ../src/empathy-account-assistant.c:510
 msgid "What kind of chat account do you have?"
 msgstr "æ?¨ç??è??天帳è??æ?¯å?ªä¸?種ï¼?"
 
-#: ../src/empathy-account-assistant.c:513
+#: ../src/empathy-account-assistant.c:516
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "æ?¨é??æ?³è¦?設å®?å?¶ä»?ç??è??天帳è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:522
 msgid "Enter your account details"
 msgstr "è«?輸å?¥æ?¨ç??帳è??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:524
+#: ../src/empathy-account-assistant.c:527
 msgid "What kind of chat account do you want to create?"
 msgstr "æ?¨æ?³è¦?建ç«?ä½?種è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:530
+#: ../src/empathy-account-assistant.c:533
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?建ç«?å?¶ä»?è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:537
+#: ../src/empathy-account-assistant.c:540
 msgid "Enter the details for the new account"
 msgstr "è«?輸å?¥æ?°å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:652
+#: ../src/empathy-account-assistant.c:655
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -2141,41 +2145,41 @@ msgstr ""
 "Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網路æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?"
 "è¨?é??話ã??"
 
-#: ../src/empathy-account-assistant.c:669
+#: ../src/empathy-account-assistant.c:672
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "æ?¨æ?¯å?¦æ??使ç?¨å?¶ä»?è??天ç¨?å¼?ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:692
+#: ../src/empathy-account-assistant.c:695
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??帳è??詳細è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:713
+#: ../src/empathy-account-assistant.c:716
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?輸å?¥å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:735
+#: ../src/empathy-account-assistant.c:738
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:745
+#: ../src/empathy-account-assistant.c:748
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:766
+#: ../src/empathy-account-assistant.c:769
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:850
+#: ../src/empathy-account-assistant.c:853
 #: ../src/empathy-new-chatroom-dialog.c:607
 #: ../src/empathy-new-chatroom-dialog.c:608
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:857
+#: ../src/empathy-account-assistant.c:860
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??樣"
 
-#: ../src/empathy-account-assistant.c:1122
+#: ../src/empathy-account-assistant.c:1129
 msgid ""
 "Empathy can automatically discover and chat with the people connected on the "
 "same network as you. If you want to use this feature, please check that the "
@@ -2186,16 +2190,16 @@ msgstr ""
 "ç?¨æ­¤å??è?½ï¼?è«?檢æ?¥ä¸?å??詳細è³?æ??æ?¯å?¦æ­£ç¢ºã??æ?¨ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°è®?æ?´é??äº?ç´°ç¯?ï¼?æ??æ?¯"
 "ç?¨ã??帳è??ã??å°?話çª?ä¾?å??ç?¨æ­¤å??è?½"
 
-#: ../src/empathy-account-assistant.c:1128
-#: ../src/empathy-account-assistant.c:1184
+#: ../src/empathy-account-assistant.c:1135
+#: ../src/empathy-account-assistant.c:1191
 msgid "Edit->Accounts"
 msgstr "編輯 -> 帳è??"
 
-#: ../src/empathy-account-assistant.c:1144
+#: ../src/empathy-account-assistant.c:1151
 msgid "I don't want to enable this feature for now"
 msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
 
-#: ../src/empathy-account-assistant.c:1180
+#: ../src/empathy-account-assistant.c:1187
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2206,23 +2210,23 @@ msgstr ""
 "å??ç?¨æ­¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?件ï¼?並å¾?ã??帳è??ã??å°?話çª?建ç«?ã??é??è¿?ç??人ã??帳"
 "è??"
 
-#: ../src/empathy-account-assistant.c:1186
+#: ../src/empathy-account-assistant.c:1193
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut ����"
 
-#: ../src/empathy-account-assistant.c:1232
+#: ../src/empathy-account-assistant.c:1239
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "è¨?æ?¯è?? VoIP 帳è??å?©ç??"
 
-#: ../src/empathy-account-assistant.c:1266
+#: ../src/empathy-account-assistant.c:1273
 msgid "Welcome to Empathy"
 msgstr "歡�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:1275
+#: ../src/empathy-account-assistant.c:1282
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:1293
+#: ../src/empathy-account-assistant.c:1300
 msgid "Please enter personal details"
 msgstr "è«?輸å?¥å??人詳細è³?æ??"
 
@@ -2239,33 +2243,33 @@ msgstr "æ??è??æ?¨ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å­?æ?¨ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:262 ../src/empathy-call-window.c:789
+#: ../src/empathy-accounts-dialog.c:273 ../src/empathy-call-window.c:792
 msgid "Connectingâ?¦"
 msgstr "��中�"
 
-#: ../src/empathy-accounts-dialog.c:289
-#, c-format
-msgid "Disconnected â?? %s"
-msgstr "å·²æ?·ç·? â?? %s"
-
-#: ../src/empathy-accounts-dialog.c:294
+#: ../src/empathy-accounts-dialog.c:314
 #, c-format
 msgid "Offline â?? %s"
 msgstr "é?¢ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:307
+#: ../src/empathy-accounts-dialog.c:326
+#, c-format
+msgid "Disconnected â?? %s"
+msgstr "å·²æ?·ç·? â?? %s"
+
+#: ../src/empathy-accounts-dialog.c:337
 msgid "Offline â?? No Network Connection"
 msgstr "é?¢ç·? â?? ç?¡ç¶²è·¯é?£ç·?"
 
-#: ../src/empathy-accounts-dialog.c:315
+#: ../src/empathy-accounts-dialog.c:344
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç??ç??æ??"
 
-#: ../src/empathy-accounts-dialog.c:326
+#: ../src/empathy-accounts-dialog.c:356
 msgid "Offline â?? Account Disabled"
 msgstr "é?¢ç·? â?? 帳è??å·²å??ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:767
+#: ../src/empathy-accounts-dialog.c:797
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2273,16 +2277,16 @@ msgstr ""
 "æ?¨å?³å°?建ç«?æ?°ç??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1114
+#: ../src/empathy-accounts-dialog.c:1144
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?æ?¨ç??é?»è?¦ä¸?移é?¤ç¾¤çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1118
+#: ../src/empathy-accounts-dialog.c:1148
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??移é?¤ä¼ºæ??å?¨ä¸?ç??æ?¨ç??帳è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1355
+#: ../src/empathy-accounts-dialog.c:1385
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2290,7 +2294,7 @@ msgstr ""
 "æ?¨å?³å°?建ç«?å?¦ä¸?å??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1932
+#: ../src/empathy-accounts-dialog.c:1962
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2320,101 +2324,101 @@ msgstr "å? å?¥(_A)â?¦"
 msgid "_Importâ?¦"
 msgstr "��(_I)�"
 
-#: ../src/empathy-auto-salut-account-helper.c:77
+#: ../src/empathy-auto-salut-account-helper.c:78
 msgid "People nearby"
 msgstr "é??è¿?ç??人"
 
-#: ../src/empathy-call-window.c:462
+#: ../src/empathy-call-window.c:463
 msgid "Contrast"
 msgstr "��"
 
-#: ../src/empathy-call-window.c:465
+#: ../src/empathy-call-window.c:466
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:468
+#: ../src/empathy-call-window.c:469
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:573
+#: ../src/empathy-call-window.c:574
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1120
+#: ../src/empathy-call-window.c:1134
 msgid "_Sidebar"
-msgstr "å?´é??å??(_S)"
+msgstr "å?´é??æ¬?(_S)"
 
-#: ../src/empathy-call-window.c:1139
+#: ../src/empathy-call-window.c:1153
 msgid "Audio input"
 msgstr "é?³æ??輸å?¥"
 
-#: ../src/empathy-call-window.c:1143
+#: ../src/empathy-call-window.c:1157
 msgid "Video input"
 msgstr "��輸�"
 
-#: ../src/empathy-call-window.c:1147
+#: ../src/empathy-call-window.c:1161
 msgid "Dialpad"
 msgstr "æ?­è??ç?¤"
 
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1218
+#: ../src/empathy-call-window.c:1232
 #, c-format
 msgid "Call with %s"
 msgstr "è?? %s é??話中"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1299
+#: ../src/empathy-call-window.c:1309
 msgid "Call"
 msgstr "é??話"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1956
+#: ../src/empathy-call-window.c:1966
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:2017
+#: ../src/empathy-call-window.c:2027
 msgid "Technical Details"
 msgstr "æ??è¡?ç´°ç¯?"
 
-#: ../src/empathy-call-window.c:2055
+#: ../src/empathy-call-window.c:2065
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s ç??è»?é«?ä¸?ç?­è§£ä»»ä½?æ?¨é?»è?¦ä¸?æ??æ?¯æ?´ç??é?³è¨?æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2060
+#: ../src/empathy-call-window.c:2070
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s ç??è»?é«?ä¸?ç?­è§£ä»»ä½?æ?¨é?»è?¦ä¸?æ??æ?¯æ?´ç??è¦?è¨?æ ¼å¼?"
 
-#: ../src/empathy-call-window.c:2066
+#: ../src/empathy-call-window.c:2076
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "ç?¡æ³?å?? %s 建ç«?é?£ç·?ã??æ?¨å??å?¶ä¸­ä¹?ä¸?å?¯è?½å?¨ä¸?å??ä¸?å??許ç?´æ?¥é?£ç·?ç??網路ä¹?ä¸?ã??"
 
-#: ../src/empathy-call-window.c:2072
+#: ../src/empathy-call-window.c:2082
 msgid "There was a failure on the network"
 msgstr "é??å??網路ä¸?æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2076
+#: ../src/empathy-call-window.c:2086
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??é?³è¨?æ ¼å¼?å°?æ?ªå?¨æ?¨ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2079
+#: ../src/empathy-call-window.c:2089
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??è¦?è¨?æ ¼å¼?å°?æ?ªå?¨æ?¨ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2089
+#: ../src/empathy-call-window.c:2099
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2424,15 +2428,15 @@ msgstr ""
 "å?¨ Telepathy å??件中ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å??å ±é??å??é?¯èª¤</a>並é??ä¸?"
 "å¾?æ±?å?©é?¸å?®å?§ç??ã??é?¤é?¯ã??è¦?çª?中æ??æ?¶é??ç??ç´?é??ã??"
 
-#: ../src/empathy-call-window.c:2097
+#: ../src/empathy-call-window.c:2107
 msgid "There was a failure in the call engine"
 msgstr "é??話å¼?æ??å?§æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2136
+#: ../src/empathy-call-window.c:2146
 msgid "Can't establish audio stream"
 msgstr "��建���串�"
 
-#: ../src/empathy-call-window.c:2146
+#: ../src/empathy-call-window.c:2156
 msgid "Can't establish video stream"
 msgstr "��建���串�"
 
@@ -2500,35 +2504,35 @@ msgstr "è¦?è¨?é??å??"
 msgid "Video Preview"
 msgstr "è¦?è¨?é ?覽"
 
-#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:28
+#: ../src/empathy-call-window.ui.h:18 ../src/empathy-main-window.ui.h:27
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../src/empathy-chat-window.c:451 ../src/empathy-chat-window.c:471
+#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:463
+#: ../src/empathy-chat-window.c:464
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (è?? %u å?¶ä»?ç??)"
 
-#: ../src/empathy-chat-window.c:479
+#: ../src/empathy-chat-window.c:480
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä¾?è?ªå?¶ä»?人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:488
+#: ../src/empathy-chat-window.c:489
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ä¾?è?ªæ??æ??人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:691
+#: ../src/empathy-chat-window.c:695
 msgid "Typing a message."
 msgstr "æ­£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -2545,74 +2549,78 @@ msgid "Chat"
 msgstr "è??天"
 
 #: ../src/empathy-chat-window.ui.h:4
+msgid "Important Room"
+msgstr "é??è¦?è??天室"
+
+#: ../src/empathy-chat-window.ui.h:5
 msgid "Insert _Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??(_S)"
 
-#: ../src/empathy-chat-window.ui.h:5
+#: ../src/empathy-chat-window.ui.h:6
 msgid "Invite _Participantâ?¦"
 msgstr "é??è«?å??è??(_P)â?¦"
 
-#: ../src/empathy-chat-window.ui.h:6
+#: ../src/empathy-chat-window.ui.h:7
 msgid "Move Tab _Left"
 msgstr "å°?å??é ?左移(_L)"
 
-#: ../src/empathy-chat-window.ui.h:7
+#: ../src/empathy-chat-window.ui.h:8
 msgid "Move Tab _Right"
 msgstr "å°?å??é ?å?³ç§»(_R)"
 
-#: ../src/empathy-chat-window.ui.h:8 ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
 msgid "_Contents"
 msgstr "�容(_C)"
 
-#: ../src/empathy-chat-window.ui.h:9
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
 msgstr "�話(_C)"
 
-#: ../src/empathy-chat-window.ui.h:10
+#: ../src/empathy-chat-window.ui.h:11
 msgid "_Detach Tab"
 msgstr "å??é?¢å??é ?(_D)"
 
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../src/empathy-chat-window.ui.h:12
+#: ../src/empathy-chat-window.ui.h:13
 msgid "_Favorite Chat Room"
 msgstr "å??好ç??è??天室(_F)"
 
-#: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
-#: ../src/empathy-chat-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
 msgstr "ä¸?å??å??é ?(_N)"
 
-#: ../src/empathy-chat-window.ui.h:15
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
 msgstr "ä¸?å??å??é ?(_P)"
 
-#: ../src/empathy-chat-window.ui.h:16 ../src/empathy-status-icon.ui.h:5
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "顯示�絡人��(_S)"
 
-#: ../src/empathy-chat-window.ui.h:17
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Tabs"
 msgstr "å??é ?(_T)"
 
-#: ../src/empathy-chat-window.ui.h:18
+#: ../src/empathy-chat-window.ui.h:19
 msgid "_Undo Close Tab"
 msgstr "復å??é??é??ç??å??é ?(_U)"
 
-#: ../src/empathy-chatrooms-window.c:256
+#: ../src/empathy-chatrooms-window.c:241
 msgid "Name"
 msgstr "å??稱"
 
-#: ../src/empathy-chatrooms-window.c:274
+#: ../src/empathy-chatrooms-window.c:259
 msgid "Room"
 msgstr "è??天室"
 
-#: ../src/empathy-chatrooms-window.c:282
+#: ../src/empathy-chatrooms-window.c:267
 msgid "Auto-Connect"
 msgstr "è?ªå??é?£ç·?"
 
@@ -2620,76 +2628,76 @@ msgstr "è?ªå??é?£ç·?"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??å??好ç??è??天室"
 
-#: ../src/empathy-event-manager.c:351
+#: ../src/empathy-event-manager.c:431
 msgid "Incoming video call"
 msgstr "å?³å?¥ç??è¦?è¨?é??話"
 
-#: ../src/empathy-event-manager.c:351
+#: ../src/empathy-event-manager.c:431
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:355
+#: ../src/empathy-event-manager.c:435
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s è¦?è??æ?¨é?²è¡?è¦?è¨?é??話ã??æ?¨æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:356
+#: ../src/empathy-event-manager.c:436
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s è¦?è??æ?¨é?²è¡?é??話ã??æ?¨æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:378
+#: ../src/empathy-event-manager.c:458
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:384
+#: ../src/empathy-event-manager.c:464
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:575
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "ä¾?è?ª %s ç??è¦?è¨?é?»è©±"
 
-#: ../src/empathy-event-manager.c:501
+#: ../src/empathy-event-manager.c:575
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:598
+#: ../src/empathy-event-manager.c:651
 msgid "Room invitation"
 msgstr "è??天é??è«?"
 
-#: ../src/empathy-event-manager.c:601
+#: ../src/empathy-event-manager.c:654
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£å?¨é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:609
+#: ../src/empathy-event-manager.c:662
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:614
+#: ../src/empathy-event-manager.c:667
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:653
+#: ../src/empathy-event-manager.c:705
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:679
+#: ../src/empathy-event-manager.c:732
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:837
+#: ../src/empathy-event-manager.c:929
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
 
-#: ../src/empathy-event-manager.c:841
+#: ../src/empathy-event-manager.c:933
 #, c-format
 msgid ""
 "\n"
@@ -2698,118 +2706,116 @@ msgstr ""
 "\n"
 "���%s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:881
+#: ../src/empathy-event-manager.c:976
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
-#. someone is logging in
-#: ../src/empathy-event-manager.c:897
+#: ../src/empathy-event-manager.c:996
 #, c-format
 msgid "%s is now online."
 msgstr "%s ç?¾å?¨ä¸?ç·?ã??"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:100
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:103
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:179
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../src/empathy-ft-manager.c:274
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s æ?¼ %s/s"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:274
 #, 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:306
+#: ../src/empathy-ft-manager.c:305
 #, 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:309
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "æ­£å?¨å?³é??ã??%sã??給 %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:339
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "å¾? %2$s æ?¥æ?¶ã??%1$sã??æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:342
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "æ?¥æ?¶æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:347
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "å?³é??ã??%sã??給 %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../src/empathy-ft-manager.c:350
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "å?³é??æª?æ¡?æ??ç?¼ç??é?¯èª¤"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:489
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "ã??%sã??æ?¥æ?¶è?ª %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:494
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "ã??%sã??å?³é??給 %s"
 
-#: ../src/empathy-ft-manager.c:497
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "���輸��"
 
-#: ../src/empathy-ft-manager.c:616 ../src/empathy-ft-manager.c:783
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
 msgid "Waiting for the other participant's response"
 msgstr "æ­£å?¨ç­?å¾?å?¶ä»?å??è??è??ç??å??æ??"
 
-#: ../src/empathy-ft-manager.c:642 ../src/empathy-ft-manager.c:680
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "æ­£å?¨æª¢æ?¥æª?æ¡?ã??%sã??ç??å®?æ?´æ?§"
 
-#: ../src/empathy-ft-manager.c:645 ../src/empathy-ft-manager.c:683
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "æ­£å?¨è¨?ç®?ã??%sã??é??æ¹?å?¼"
 
-#: ../src/empathy-ft-manager.c:991
+#: ../src/empathy-ft-manager.c:990
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1003
+#: ../src/empathy-ft-manager.c:1002
 msgid "File"
 msgstr "��"
 
-#: ../src/empathy-ft-manager.c:1025
+#: ../src/empathy-ft-manager.c:1024
 msgid "Remaining"
 msgstr "��"
 
@@ -2832,124 +2838,119 @@ msgid "Import Accounts"
 msgstr "å?¯å?¥å¸³è??"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:290
+#: ../src/empathy-import-widget.c:292
 msgid "Import"
 msgstr "��"
 
-#: ../src/empathy-import-widget.c:299
+#: ../src/empathy-import-widget.c:301
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../src/empathy-import-widget.c:323
+#: ../src/empathy-import-widget.c:325
 msgid "Source"
 msgstr "��"
 
-#: ../src/empathy-import-mc4-accounts.c:106
-#, c-format
-msgid "%s account"
-msgstr "%s 帳è??"
-
-#: ../src/empathy-main-window.c:440
+#: ../src/empathy-main-window.c:457
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:446
+#: ../src/empathy-main-window.c:463
 msgid "Edit Account"
 msgstr "編輯帳è??"
 
-#: ../src/empathy-main-window.c:452
+#: ../src/empathy-main-window.c:469
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1056
+#: ../src/empathy-main-window.c:1154
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../src/empathy-main-window.c:1437
+#: ../src/empathy-main-window.c:1476
+msgid "Contact List"
+msgstr "�絡人��"
+
+#: ../src/empathy-main-window.c:1583
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳è??"
 
 #: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "�絡人��"
-
-#: ../src/empathy-main-window.ui.h:2
 msgid "Contacts on a _Map"
 msgstr "é?£çµ¡äººå?°å??(_M)"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
 msgid "Context"
 msgstr "é?¸é ?"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
 msgstr "å? å?¥å??好(_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
 msgstr "管ç??å??好"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
 msgid "N_ormal Size"
 msgstr "正常大�(_O)"
 
-#: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
 msgid "New _Callâ?¦"
 msgstr "æ?°å¢?é??話(_C)â?¦"
 
-#: ../src/empathy-main-window.ui.h:8
+#: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
 msgstr "正常大å°?è??å¤§é ­è²¼(_A)"
 
-#: ../src/empathy-main-window.ui.h:9
+#: ../src/empathy-main-window.ui.h:8
 msgid "P_references"
 msgstr "å??好設å®?(_R)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:9
 msgid "Show P_rotocols"
 msgstr "顯示å??å®?(_R)"
 
-#: ../src/empathy-main-window.ui.h:11
+#: ../src/empathy-main-window.ui.h:10
 msgid "Sort by _Name"
 msgstr "ä¾?å??稱æ??åº?(_N)"
 
-#: ../src/empathy-main-window.ui.h:12
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Status"
 msgstr "ä¾?ç??æ??æ??åº?(_S)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Accounts"
 msgstr "帳è??(_A)"
 
-#: ../src/empathy-main-window.ui.h:16
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Compact Size"
 msgstr "精簡大�(_C)"
 
-#: ../src/empathy-main-window.ui.h:18
+#: ../src/empathy-main-window.ui.h:17
 msgid "_Debug"
 msgstr "��(_D)"
 
-#: ../src/empathy-main-window.ui.h:20
+#: ../src/empathy-main-window.ui.h:19
 msgid "_File Transfers"
 msgstr "���輸(_F)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:21
 msgid "_Joinâ?¦"
 msgstr "å? å?¥(_J)â?¦"
 
-#: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversationâ?¦"
 msgstr "���話(_N)�"
 
-#: ../src/empathy-main-window.ui.h:24
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Offline Contacts"
 msgstr "���絡人(_O)"
 
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Personal Information"
 msgstr "å??人è³?è¨?(_P)"
 
-#: ../src/empathy-main-window.ui.h:27
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Room"
 msgstr "è??天室(_R)"
 
@@ -3015,105 +3016,101 @@ msgstr "è??天室æ¸?å?®"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "_Room:"
-msgstr "è??天室(_R):"
+msgstr "è??天室(_R)ï¼?"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:135
 msgid "Message received"
 msgstr "��已��"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:136
 msgid "Message sent"
 msgstr "è¨?æ?¯å·²é??å?º"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:137
 msgid "New conversation"
 msgstr "���話"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:138
 msgid "Contact goes online"
 msgstr "�絡人��"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:139
 msgid "Contact goes offline"
 msgstr "�絡人��"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:140
 msgid "Account connected"
 msgstr "帳è??å·²é?£ç·?"
 
-#: ../src/empathy-preferences.c:154
+#: ../src/empathy-preferences.c:141
 msgid "Account disconnected"
 msgstr "帳è??å·²æ?·ç·?"
 
-#: ../src/empathy-preferences.c:394
+#: ../src/empathy-preferences.c:430
 msgid "Language"
 msgstr "��"
 
+#: ../src/empathy-preferences.c:866
+msgid "Preferences"
+msgstr "å??好設å®?"
+
 #: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "��"
 
 #: ../src/empathy-preferences.ui.h:2
-msgid "Automatically _connect on startup "
-msgstr "å??å??æ??è?ªå??é?£ç·?(_C)"
-
-#: ../src/empathy-preferences.ui.h:3
 msgid "Behavior"
 msgstr "è¡?ç?º"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:3
 msgid "Chat Th_eme:"
 msgstr "è??天ä½?æ?¯ä¸»é¡?(_E):"
 
-#: ../src/empathy-preferences.ui.h:5
+#: ../src/empathy-preferences.ui.h:4
 msgid "Disable notifications when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é??ç?¥(_D)"
 
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable sounds when _away or busy"
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??å??ç?¨é?³æ??(_A)"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:6
 msgid "Enable notifications when a contact comes online"
 msgstr "ç?¶é?£çµ¡äººä¸?ç·?æ??å??ç?¨é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact goes offline"
 msgstr "ç?¶é?£çµ¡äººé?¢ç·?æ??å??ç?¨é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:8
 msgid "Enable notifications when the _chat is not focused"
 msgstr "ç?¶è??天è¦?çª?失å?»ç?¦é»?æ??å??ç?¨é??ç?¥(_C)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable spell checking for languages:"
 msgstr "ç?ºèª?è¨?å??ç?¨æ?¼å­?檢æ?¥ï¼?"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:10
 msgid "General"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:12
 msgid "Location sources:"
 msgstr "�置���"
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:13
 msgid "Notifications"
 msgstr "é??ç?¥"
 
-#: ../src/empathy-preferences.ui.h:15
+#: ../src/empathy-preferences.ui.h:14
 msgid "Play sound for events"
 msgstr "æ?­æ?¾äº?件é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:16
-msgid "Preferences"
-msgstr "å??好設å®?"
-
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:15
 msgid "Privacy"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:16
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
 "state and country will be published.  GPS coordinates will be accurate to 1 "
@@ -3122,65 +3119,69 @@ msgstr ""
 "é??ä½?ä½?ç½®æº?確度æ??æ??é?¤äº?ä½ æ??å?¨ç??å??å¸?ã??æ´²å??å??家æ??被å?¬é??ä¹?å¤?ï¼?ä¸?æ??æ??ä¾?å?¶ä»?è¨?æ?¯ã??"
 "GPS ç??座æ¨?æº?確度å°?æ??é??ç?ºå??ä½?æ?¸ã??"
 
-#: ../src/empathy-preferences.ui.h:19
+#: ../src/empathy-preferences.ui.h:17
 msgid "Show _smileys as images"
 msgstr "å°?表æ??符è??以å??ç??顯示(_S)"
 
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:18
 msgid "Show contact _list in rooms"
 msgstr "å?¨è??天室顯示é?£çµ¡äººæ¸?å?®(_L)"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:19
 msgid "Sounds"
 msgstr "é?³æ??"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:20
 msgid "Spell Checking"
 msgstr "��檢�"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:21
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "é??裡ç??èª?è¨?æ¸?å?®å?ªå??æ? å?ºæ?¨å·²ç¶?å®?è£?å­?å?¸ç??èª?è¨?ã??"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:22
 msgid "Themes"
 msgstr "��主�"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:23
+msgid "_Automatically connect on startup"
+msgstr "å??å??æ??è?ªå??é?£ç·?(_A)"
+
+#: ../src/empathy-preferences.ui.h:24
 msgid "_Cellphone"
 msgstr "æ??æ©?(_C)"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:25
 msgid "_Enable bubble notifications"
 msgstr "å??ç?¨æ°£æ³¡å¼?é??ç?¥(_E)"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:26
 msgid "_Enable sound notifications"
 msgstr "å??ç?¨é?³æ??é??ç?¥(_E)"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:27
 msgid "_GPS"
 msgstr "_GPS"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Network (IP, Wi-Fi)"
-msgstr "網路�IP, Wi-Fi�(_N)"
+msgstr "網路 (IP, Wi-Fi)(_N)"
 
-#: ../src/empathy-preferences.ui.h:30
+#: ../src/empathy-preferences.ui.h:29
 msgid "_Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??天(_O)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:30
 msgid "_Publish location to my contacts"
 msgstr "å°?æ??ç??é?£çµ¡äººå?¬é??ä½?ç½®(_P)"
 
-#: ../src/empathy-preferences.ui.h:32
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®æº?確度(_R)"
 
-#: ../src/empathy-status-icon.c:178
+#: ../src/empathy-status-icon.c:179
 msgid "Respond"
 msgstr "å??æ??"
 
@@ -3196,63 +3197,63 @@ msgstr "çµ?æ??(_Q)"
 msgid "Contact Map View"
 msgstr "é?£çµ¡äººå?°å??檢è¦?"
 
-#: ../src/empathy-debug-window.c:1078
+#: ../src/empathy-debug-window.c:1161
 msgid "Save"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1251
+#: ../src/empathy-debug-window.c:1337
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1417
 msgid "Pause"
 msgstr "æ?«å??"
 
-#: ../src/empathy-debug-window.c:1343
+#: ../src/empathy-debug-window.c:1429
 msgid "Level "
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1363
+#: ../src/empathy-debug-window.c:1449
 msgid "Debug"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1369
+#: ../src/empathy-debug-window.c:1455
 msgid "Info"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1375 ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1461 ../src/empathy-debug-window.c:1510
 msgid "Message"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1381
+#: ../src/empathy-debug-window.c:1467
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1473
 msgid "Critical"
 msgstr "å?´é??"
 
-#: ../src/empathy-debug-window.c:1393
+#: ../src/empathy-debug-window.c:1479
 msgid "Error"
 msgstr "�誤"
 
-#: ../src/empathy-debug-window.c:1412
+#: ../src/empathy-debug-window.c:1498
 msgid "Time"
 msgstr "æ??å?»"
 
-#: ../src/empathy-debug-window.c:1415
+#: ../src/empathy-debug-window.c:1501
 msgid "Domain"
 msgstr "網å??"
 
-#: ../src/empathy-debug-window.c:1417
+#: ../src/empathy-debug-window.c:1503
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../src/empathy-debug-window.c:1419
+#: ../src/empathy-debug-window.c:1505
 msgid "Level"
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1456
+#: ../src/empathy-debug-window.c:1542
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3267,28 +3268,31 @@ msgstr "é??è«?å??è??"
 msgid "Choose a contact to invite into the conversation:"
 msgstr "é?¸æ??æ?³è¦?é??è«?é?²å?¥è«?話ç??è?¯çµ¡äººï¼?"
 
-#: ../src/empathy-accounts.c:213
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "é??è«?"
+
+#: ../src/empathy-accounts.c:182
 msgid "Don't display any dialogs; do any work (eg, importing) and exit"
 msgstr "ä¸?è¦?顯示任ä½?å°?話çª?ï¼?å?·è¡?ä»»ä½?ä½?業ï¼?ä¾?ï¼?å?¯å?¥ï¼?並é?¢é??"
 
-#: ../src/empathy-accounts.c:217
+#: ../src/empathy-accounts.c:186
 msgid "Don't display any dialogs if there are any non-salut accounts"
 msgstr "å¦?æ??æ??ä»»ä½?é?? salut ç??帳è??ï¼?å°±ä¸?è¦?顯示任ä½?å°?話çª?"
 
-#: ../src/empathy-accounts.c:221
-#, fuzzy
+#: ../src/empathy-accounts.c:190
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "å??å§?å??é?¸å??æ??給äº?ç??帳è??ï¼?ä¾?ï¼?gabble/jabber/foo_40example_2eorg0ï¼?"
+msgstr "å??å§?é?¸å??æ??給äº?ç??帳è?? (ä¾?ï¼?gabble/jabber/foo_40example_2eorg0)"
 
-#: ../src/empathy-accounts.c:223
+#: ../src/empathy-accounts.c:192
 msgid "<account-id>"
 msgstr "<account-id>"
 
-#: ../src/empathy-accounts.c:231
+#: ../src/empathy-accounts.c:200
 msgid "- Empathy Accounts"
 msgstr "- Empathy 帳è??"
 
-#: ../src/empathy-accounts.c:247
+#: ../src/empathy-accounts.c:216
 msgid "Empathy Accounts"
 msgstr "Empathy 帳è??"
 
@@ -3296,6 +3300,18 @@ msgstr "Empathy 帳è??"
 msgid "Empathy Debugger"
 msgstr "Empathy ����"
 
+#~ msgid "Empathy IM Client"
+#~ msgstr "Empathy å?³æ??é??客æ?¶ç«¯"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "MC 4 帳è??å·²ç¶?å?¯å?¥"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4 帳è??å·²ç¶?å?¯å?¥ã??"
+
+#~ msgid "%s account"
+#~ msgstr "%s 帳è??"
+
 #~ msgid "Hostname of the proxy for outbound requests."
 #~ msgstr "è³?æ??å?³å?ºè¦?æ±?æ??使ç?¨ç?? proxy 主æ©?å??稱ã??"