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

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

commit fd1ccf04926964b9434701791c5f62078c5a69c4
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Wed Oct 13 15:50:37 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  707 +++++++++++++++++++++++++++++++----------------------------
 po/zh_TW.po |  705 +++++++++++++++++++++++++++++++----------------------------
 2 files changed, 743 insertions(+), 669 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 849f4b2..f802e5a 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,12 +7,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.31.92\n"
+"Project-Id-Version: empathy 2.91.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 13:49+0800\n"
-"PO-Revision-Date: 2010-09-25 13:50+0800\n"
+"POT-Creation-Date: 2010-10-13 15:39+0800\n"
+"PO-Revision-Date: 2010-10-13 15:40+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,315 +109,307 @@ msgid "Empathy default download folder"
 msgstr "Empathy é ?設ä¸?è¼?è³?æ??夾"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy 已詢å??å?¯å?¥å¸³è??"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy 已�移 butterfly ��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy ç?¶é??ç½®æ??æ??該è?ªå??設ç?ºé?¢é??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy å??å??æ??è?ªå??é?£ç·?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy æ??é??ä½?ä½?ç½®ç??æº?確度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy è¦?使ç?¨è?¯çµ¡äººç??å¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Enable WebKit Developer Tools"
 msgstr "å??ç?¨ WebKit é??ç?¼è??å·¥å?·"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable popup notifications for new messages"
 msgstr "å??ç?¨æ?°è¨?æ?¯ç??å½?å?ºå¼?é??ç?¥"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Enable spell checker"
 msgstr "å??ç?¨æ?¼å­?檢æ?¥ç¨?å¼?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Hide main window"
 msgstr "é?±è??主è¦?çª?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Hide the main window."
 msgstr "é?±è??主è¦?çª?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Nick completed character"
 msgstr "網å??è£?é½?å­?符"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Path of the Adium theme to use"
 msgstr "è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "å¦?æ??è??天室使ç?¨ç??主é¡?æ?¯ Adium æ??è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Play a sound for incoming messages"
 msgstr "æ?¶å?°è¨?æ?¯æ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for new conversations"
 msgstr "ç?¶é??å??æ?°ç??è«?話æ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "é??å?ºè¨?æ?¯æ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound when a contact logs in"
 msgstr "ç?¶è?¯çµ¡äººç?»å?¥æ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when a contact logs out"
 msgstr "ç?¶æ??è?¯çµ¡äººç?»å?ºæ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when we log in"
 msgstr "ç?¶æ??å??ç?»å?¥æ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound when we log out"
 msgstr "ç?¶æ??å??ç?»å?ºæ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "å¦?æ??è??天è¦?çª?失å?»ç?¦é»?å??å½?å?ºé??ç?¥"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Pop up notifications when a contact logs in"
 msgstr "ç?¶è?¯çµ¡äººç?»å?¥æ??å½?å?ºé??ç?¥"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Pop up notifications when a contact logs out"
 msgstr "ç?¶è?¯çµ¡äººç?»å?ºæ??å½?å?ºé??ç?¥"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Show avatars"
 msgstr "é¡¯ç¤ºå¤§é ­è²¼"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show contact list in rooms"
 msgstr "å?¨è??天室顯示è?¯çµ¡äººæ¸?å?®"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show hint about closing the main window"
 msgstr "é??é??主è¦?çª?æ??顯示æ??示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show offline contacts"
 msgstr "顯示���絡人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Show protocols"
 msgstr "顯示å??å®?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Spell checking languages"
 msgstr "æ?¼å­?檢æ?¥ç??èª?è¨?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "The default folder to save file transfers in."
 msgstr "ç?¨ä¾?å?²å­?æª?æ¡?å?³è¼¸æ?¥æ?¶æª?æ¡?ç??é ?設è³?æ??夾ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ä¸?次é?¸æ??å¤§é ­è²¼å??ç??ç??ç?®é??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "The position for the chat window side pane"
 msgstr "è??天è¦?çª?å?´çª?æ ¼ç??ä½?ç½®"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "è??天è¦?çª?å?´çª?æ ¼ç??å?²å­?ä½?ç½® (å?®ä½?ç?ºå??ç´ )ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ç?¨ä¾?顯示å?¨è??天è¦?çª?ç??è«?話中ç??ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Use graphical smileys"
 msgstr "使ç?¨å??ç??å¼?表æ??符è??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use notification sounds"
 msgstr "使ç?¨é??ç?¥é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Use theme for chat rooms"
 msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??è?¯çµ¡äººã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨æµ?å??é?»è©±ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Empathy æ?¯å?¦æ??è©¢å??ä½ è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Empathy æ?¯å?¦æ??è½?移 butterfly æ?¥èª?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥ä½ ç??帳è??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy æ?¯å?¦æ??å?¨ä½¿ç?¨è??é??ç½®æ??è?ªå??å??æ??ç?ºé?¢é??模å¼?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy æ?¯å?¦å?ºæ?¼ç§?é?±ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?æ??é??æ?°é?£ç·?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "æ?¯å?¦å°?è«?話中ç??表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether to play a sound to notify of events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??æ?¶å?°è¨?æ?¯ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ?°ç??è«?話ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é??å?ºè¨?æ?¯ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether to play a sound when logging into a network."
 msgstr "ç?¶ç?»å?¥æ??網絡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ç?¶ç?»å?ºæ??網絡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦æ?­æ?¾é?³æ??é??ç?¥ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ç?¶è?¯çµ¡äººé?¢ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ç?¶è?¯çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ç?¶æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦å?¨è?¯çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??è?¯çµ¡äººã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "æ?¯å?¦è¦?å?¨è?¯çµ¡äººæ¸?å?®å?§é¡¯ç¤ºè?¯çµ¡äººä½¿ç?¨å??å®?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室中顯示è?¯çµ¡äººæ¸?å?®ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show the contact list in compact mode."
 msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示è?¯çµ¡äººæ¸?å?®ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to use the theme for chat rooms."
 msgstr "æ?¯å?¦ç?ºè??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../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 "
@@ -429,7 +422,7 @@ msgstr "管ç??è¨?æ?¯è?? VoIP 帳è??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2105
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP 帳è??"
 
@@ -501,9 +494,9 @@ msgstr "é?±è??"
 msgid "Offline"
 msgstr "��"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
-#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
-#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
@@ -615,16 +608,20 @@ msgid ""
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺æ??å?¨è­?æ?¸ç??é?·åº¦ï¼?æ??æ?¯ä¼ºæ??å?¨è­?æ?¸é??ç??深度è¶?é??å¯?碼å?½å¼?庫æ??è?½è??ç??ç??ç¯?å??"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "é??è¿?ç??人"
 
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:548
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ��"
 
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:578
 msgid "Facebook Chat"
 msgstr "Facebook è??天"
 
@@ -674,7 +671,7 @@ msgstr "��"
 
 #: ../libempathy-gtk/empathy-account-widget.c:514
 #: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "帳è??"
 
@@ -713,7 +710,7 @@ msgstr "��(_O)"
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-account-widget.c:1617
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1399
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1259,7 +1256,7 @@ msgstr "ä¸?æ??"
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
 msgid "Topic:"
 msgstr "主��"
 
@@ -1282,7 +1279,7 @@ msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
@@ -1350,31 +1347,31 @@ msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 msgid "%s is now known as %s"
 msgstr "%s ��被稱� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2910
 msgid "Wrong password; please try again:"
 msgstr "å¯?碼é?¯èª¤ï¼?è«?å??試ä¸?次ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:2911
 msgid "Retry"
 msgstr "é??試"
 
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:2916
 msgid "This room is protected by a password:"
 msgstr "æ­¤è??天室已被å¯?碼ä¿?è­·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:2917
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3057
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-chat.c:3110
 #: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "�話"
@@ -1397,17 +1394,17 @@ msgstr "é??å??é?£çµ?(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "編輯�絡人��"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
 msgid "Personal Information"
 msgstr "å??人è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
 msgid "New Contact"
 msgstr "���絡人"
 
@@ -1464,64 +1461,64 @@ msgid "_Add Contactâ?¦"
 msgstr "���絡人(_A)�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../libempathy-gtk/empathy-individual-menu.c:516
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "è??天(_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-individual-menu.c:559
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èª?é?³é??話(_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-individual-menu.c:601
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?å??é??話(_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:644
 #: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "��次�話(_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-individual-menu.c:685
 msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
 msgid "Share My Desktop"
 msgstr "å??享æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1539
-#: ../libempathy-gtk/empathy-individual-menu.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-menu.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1290
 msgid "Favorite"
 msgstr "å??好"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
 msgid "Infor_mation"
 msgstr "��(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:489
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:917
 msgid "Inviting you to this room"
 msgstr "é??è«?ä½ å?°é??å??è??天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
 msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??天室(_I)"
 
@@ -1529,178 +1526,178 @@ msgstr "é??è«?å?°è??天室(_I)"
 msgid "Select a contact"
 msgstr "é?¸æ??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-individual-widget.c:147
 msgid "Full name:"
 msgstr "å?¨å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
 msgid "Phone number:"
 msgstr "é?»è©±è??碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
 msgid "E-mail address:"
 msgstr "é?»å­?ä¿¡ç®±ä½?å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
 msgid "Website:"
 msgstr "網��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
 msgid "Birthday:"
 msgstr "ç??æ?¥ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Country ISO Code:"
 msgstr "å??家 ISO 碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country:"
 msgstr "å??家ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "City:"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:590
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Floor:"
 msgstr "�層�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Room:"
 msgstr "室�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Text:"
 msgstr "æ??å­?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Accuracy Level:"
 msgstr "�確度���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Error:"
 msgstr "�誤�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (ç±³)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:640
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (米)�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:642
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Bearing:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Last Updated on:"
 msgstr "�次����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Longitude:"
 msgstr "�度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Latitude:"
 msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Altitude:"
 msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:687
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:717
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-individual-widget.c:600
 #, c-format
 msgid "%s, %s"
 msgstr "%sã??%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:649
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-individual-widget.c:840
 msgid "Save Avatar"
 msgstr "å?²å­?å¤§é ­è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:898
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
 
@@ -1710,7 +1707,7 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
 msgid "Alias:"
 msgstr "å?¥å??ï¼?"
 
@@ -1730,7 +1727,7 @@ msgstr "è?¯çµ¡äººè©³ç´°è³?æ??"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1429
 msgid "Identifier:"
 msgstr "è­?å?¥èº«å??ï¼?"
 
@@ -1761,18 +1758,20 @@ msgstr "è«?é?¸æ??é??å??è?¯çµ¡äººè¦?顯ç?¾å?¨å?ªå??ç¾£çµ?ã??注æ??ä½ å?¯ä»¥é?¸æ??
 msgid "_Add Group"
 msgstr "å? å?¥ç¾£çµ?(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1247
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1250
 msgid "Group"
 msgstr "羣�"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
 msgid "Linked Contacts"
 msgstr "å·²é?£çµ?ç??è?¯çµ¡äºº"
 
@@ -1796,19 +1795,19 @@ msgstr "å?¨æ??æ?¹æ¸?å?®æ??é?¸ç??è?¯çµ¡äººå°?é?£çµ?å?¨ä¸?èµ·ã??"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ?¦"
 msgstr "���絡人(_L)�"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 #, c-format
 msgid "Meta-contact containing %u contact"
 msgid_plural "Meta-contact containing %u contacts"
@@ -1826,6 +1825,13 @@ msgstr "��網絡"
 msgid "Choose an IRC network"
 msgstr "é?¸æ?? IRC 網絡"
 
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "é?¸æ??"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°å¢?伺æ??å?¨"
@@ -1837,16 +1843,16 @@ msgstr "SSL"
 #. Translators: this is the title of the linking dialogue (reached by
 #. * right-clicking on a contact and selecting "Linkâ?¦"). "Link" in this title
 #. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:116
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
 msgid "Link Contacts"
 msgstr "���絡人"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
 msgctxt "Unlink individual (button)"
 msgid "_Unlinkâ?¦"
 msgstr "å??æ¶?é?£çµ?(_U)â?¦"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed meta-contact into the contacts it contains."
 msgstr "å°?顯示ç??å¾?設è?¯çµ¡äººå?¶å??å?«ç??è?¯çµ¡äººå®?å?¨å??é??ã??"
@@ -1855,22 +1861,22 @@ msgstr "å°?顯示ç??å¾?設è?¯çµ¡äººå?¶å??å?«ç??è?¯çµ¡äººå®?å?¨å??é??ã??"
 #. Translators: this is an action button in the linking dialogue. "Link" is
 #. * used here as a verb meaning "to connect two contacts to form a
 #. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:137
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
 msgid "_Link"
 msgstr "��(_L)"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
 #, c-format
 msgid "Unlink meta-contact '%s'?"
 msgstr "è¦?å??æ¶?å¾?設è?¯çµ¡äººã??%sã??ç??é?£æ?¥å??ï¼?"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
 msgid ""
 "Are you sure you want to unlink this meta-contact? This will completely "
 "split the meta-contact into the contacts it contains."
 msgstr "ä½ ç¢ºå®?è¦?å??æ¶?æ­¤å¾?設è?¯çµ¡äººç??é?£çµ?ï¼?å¾?設è?¯çµ¡äººæ??å??å?«ç??è?¯çµ¡äººå°?æ??å®?å?¨å??é??ã??"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "å??æ¶?é?£çµ?(_U)"
@@ -1974,6 +1980,15 @@ msgstr "設å®?ä½ ç??ä¸?ç·?è??ç?®å??ç??ç??æ??"
 msgid "Custom messagesâ?¦"
 msgstr "�����"
 
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "æ?°å¢? %s 帳è??"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Find:"
 msgstr "���"
@@ -2059,84 +2074,109 @@ msgid "Blue"
 msgstr "è??è?²"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
+#, fuzzy
+#| msgid "The identity provided by the chat server cannot be verified.\n"
+msgid "The identity provided by the chat server cannot be verified."
 msgstr "å°?話伺æ??å?¨æ??æ??ä¾?ç??è­?å?¥èº«å??ç?¡æ³?é??é??é©?è­?ã??\n"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#, fuzzy
+#| msgid "The certificate is not signed by a Certification Authority"
+msgid "The certificate is not signed by a Certification Authority."
 msgstr "該è­?æ?¸ä¸¦é??ç?±è­?æ?¸æ??æ¬?中å¿?æ??簽署"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#, fuzzy
+#| msgid "The certificate has expired"
+msgid "The certificate has expired."
 msgstr "è­?æ?¸å·²é?¾æ??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#, fuzzy
+#| msgid "The certificate hasn't yet been activated"
+msgid "The certificate hasn't yet been activated."
 msgstr "è­?æ?¸å°?æ?ªå??ç?¨"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#, fuzzy
+#| msgid "The certificate does not have the expected fingerprint"
+msgid "The certificate does not have the expected fingerprint."
 msgstr "è­?æ?¸ä¸¦æ?ªæ??æ??é ?æ??ç??æ??ç´?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#, fuzzy
+#| msgid ""
+#| "The hostname verified by the certificate doesn't match the server name"
+msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "è­?æ?¸æ??é©?è­?ç??主æ©?å??稱è??伺æ??å?¨å??稱ä¸?符"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#, fuzzy
+#| msgid "The certificate is self-signed"
+msgid "The certificate is self-signed."
 msgstr "è­?æ?¸ç?ºè?ªæ??簽署"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#, fuzzy
+#| msgid ""
+#| "The certificate has been revoked by the issuing Certification Authority"
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr "è­?æ?¸å·²è¢«å??æ?¬ç?¼å?ºç??è­?æ?¸æ??æ¬?æ©?æ§?æ?¤é?·"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#, fuzzy
+#| msgid "The certificate is cryptographically weak"
+msgid "The certificate is cryptographically weak."
 msgstr "����碼�護��弱"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#, fuzzy
+#| msgid "The certificate length exceeds verifiable limits"
+msgid "The certificate length exceeds verifiable limits."
 msgstr "è­?æ?¸é?·åº¦è¶?å?ºå?¯é©?è­?ç??ç¯?å??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#, fuzzy
+#| msgid "The certificate is malformed"
+msgid "The certificate is malformed."
 msgstr "è­?æ?¸æ ¼å¼?ä¸?è?¯"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "é ?æ??ç??è­?æ?¸ä¸»æ©?å??稱ï¼?%s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "è­?æ?¸ä¸»æ©?å??稱ï¼?%s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
 msgid "Continue"
 msgstr "繼�"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "æ­¤é?£ç·?æ?ªå??ä¿¡ä»»ã??ä½ ç?¡è«?å¦?ä½?é?½è¦?ç¹¼çº?å??ï¼?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
 msgid "Remember this choice for future connections"
 msgstr "è«?è¨?ä½?æ­¤é?¸æ??以ä¾?æ?ªä¾?é?£ç·?使ç?¨"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
 msgid "Certificate Details"
 msgstr "è­?æ?¸è©³ç´°è³?æ??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
 #, c-format
 msgid "Incoming file from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?"
@@ -2336,7 +2376,7 @@ msgstr "å??å??æ??ä¸?顯示è?¯çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?話çª?"
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??ç?¨æ?¶ç«¯"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -2344,7 +2384,7 @@ msgid ""
 "version."
 msgstr "Empathy æ?¯è?ªç?±è»?件ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è»?件å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2352,18 +2392,18 @@ msgid ""
 "details."
 msgstr "ç?¼ä½? Empathy ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
 
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr "ä½ æ??該已ç¶?å?? Empathy ä¸?èµ·æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è¨±å?¯è­?ç??å?¯æ?¬ï¼?å¦?æ??é??æ²?æ??ï¼?寫信給ï¼? Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME ç??å?³æ??è¨?æ?¯ç?¨æ?¶ç«¯ç¨?å¼?"
 
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -2403,45 +2443,35 @@ msgid ""
 msgstr "ä½ å?¯ä»¥å??å?°å??é ?å??次輸å?¥å¸³è??ç??詳細è³?æ??æ??çµ?æ??æ­¤å?©ç??ï¼?ç¨?å¾?å??å¾?ã??編輯ã??é?¸å?®å? å?¥å¸³è??ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
-#. To translator: %s is the protocol name
-#. Create account
-#. 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:614
-#, c-format
-msgid "New %s account"
-msgstr "æ?°å¢? %s 帳è??"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
 msgstr "ä½ ç??è??天帳è??æ?¯å?ªä¸?種ï¼?"
 
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "ä½ é??æ?³è¦?設å®?å?¶ä»?ç??è??天帳è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
 msgstr "è«?輸å?¥ä½ ç??帳è??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
 msgstr "ä½ æ?³è¦?建ç«?ä½?種è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?建ç«?å?¶ä»?è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
 msgstr "è«?輸å?¥æ?°å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:660
+#: ../src/empathy-account-assistant.c:612
 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 "
@@ -2449,41 +2479,41 @@ msgid ""
 "calls."
 msgstr "使ç?¨ Empathy å?¯ä»¥å?¨ç¶²ä¸?è·?é??è¿?ç??人è??天ï¼?æ??æ?¯å??使ç?¨ Google Talkã??AIMã??Windows Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網絡æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?å??é??話ã??"
 
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "ä½ æ?¯å?¦æ??使ç?¨å?¶ä»?è??天ç¨?å¼?ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??帳è??詳細è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?輸å?¥å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:753
+#: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:810
 #: ../src/empathy-new-chatroom-dialog.c:609
 #: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??樣"
 
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1082
 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 "
@@ -2491,16 +2521,16 @@ msgid ""
 "disable this feature by using the 'Accounts' dialog"
 msgstr "Empathy å?¯ä»¥è?ªå??æ?¢ç´¢è??ä½ é?£ç·?å?°ç?¸å??網絡ä¸?ç??人å??ï¼?並ä¸?å??ä»?å??è??天ã??å¦?æ??ä½ æ?³è¦?使ç?¨æ­¤å??è?½ï¼?è«?檢æ?¥ä¸?å??詳細è³?æ??æ?¯å?¦æ­£ç¢ºã??ä½ ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°æ?´æ?¹é??äº?ç´°ç¯?ï¼?æ??æ?¯ç?¨ã??帳è??ã??å°?話çª?ä¾?å??ç?¨æ­¤å??è?½"
 
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1088
+#: ../src/empathy-account-assistant.c:1144
 msgid "Edit->Accounts"
 msgstr "編輯 -> 帳è??"
 
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1104
 msgid "I don't want to enable this feature for now"
 msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
 
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1140
 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 "
@@ -2508,66 +2538,66 @@ msgid ""
 "the Accounts dialog"
 msgstr "ä½ ç?¡æ³?è??é?£ç·?å?°ä½ æ?¬æ©?網絡ç??人å??è??天ï¼?å? ç?º telepathy-salut å°?æ?ªå®?è£?ã??å¦?æ??ä½ æ?³è¦?å??ç?¨æ­¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?件ï¼?並å¾?ã??帳è??ã??å°?話çª?建ç«?ã??é??è¿?ç??人ã??帳è??"
 
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut ����"
 
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "è¨?æ?¯è?? VoIP 帳è??å?©ç??"
 
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
 msgid "Welcome to Empathy"
 msgstr "歡�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
 msgid "Please enter personal details"
 msgstr "è«?輸å?¥å??人詳細è³?æ??"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "æ??è??ä½ ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å­?ä½ ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
 msgid "Connectingâ?¦"
 msgstr "��中�"
 
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
 #, c-format
 msgid "Offline â?? %s"
 msgstr "é?¢ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
 #, c-format
 msgid "Disconnected â?? %s"
 msgstr "å·²æ?·ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
 msgid "Offline â?? No Network Connection"
 msgstr "é?¢ç·? â?? ç?¡ç¶²çµ¡é?£ç·?"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç??ç??æ??"
 
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
 msgid "Offline â?? Account Disabled"
 msgstr "é?¢ç·? â?? 帳è??å·²å??ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:759
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2575,16 +2605,16 @@ msgstr ""
 "ä½ å?³å°?建ç«?æ?°ç??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1106
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?ä½ ç??é?»è?¦ä¸?移é?¤ç¾£çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1110
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??移é?¤ä¼ºæ??å?¨ä¸?ç??ä½ ç??帳è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1348
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2592,7 +2622,7 @@ msgstr ""
 "ä½ å?³å°?建ç«?å?¦ä¸?å??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:1951
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2662,105 +2692,105 @@ msgstr "Gamma"
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1166
 msgid "_Sidebar"
 msgstr "å?´é??æ¬?(_S)"
 
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1186
 msgid "Audio input"
 msgstr "é?³æ??輸å?¥"
 
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1190
 msgid "Video input"
 msgstr "è¦?å??輸å?¥"
 
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1194
 msgid "Dialpad"
 msgstr "æ?­è??ç?¤"
 
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1199
 msgid "Details"
 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:1273
+#: ../src/empathy-call-window.c:1266
 #, 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:1352
+#: ../src/empathy-call-window.c:1345
 msgid "Call"
 msgstr "é??話"
 
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1499
 msgid "The IP address as seen by the machine"
 msgstr "æ©?å?¨ç??è¦?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1501
 msgid "The IP address as seen by a server on the Internet"
 msgstr "äº?è?¯ç¶²ä¸?ç??伺æ??å?¨ç??è¦?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1503
 msgid "The IP address of the peer as seen by the other side"
 msgstr "å?¶ä»?端ç??è¦?ç??é»?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1505
 msgid "The IP address of a relay server"
 msgstr "中繼伺æ??å?¨ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1507
 msgid "The IP address of the multicast group"
 msgstr "å¤?é»?廣æ?­ç¾£çµ?ç?? IP ä½?å??"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2254
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2315
 msgid "Technical Details"
 msgstr "æ??è¡?ç´°ç¯?"
 
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2353
 #, 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:2351
+#: ../src/empathy-call-window.c:2358
 #, 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:2357
+#: ../src/empathy-call-window.c:2364
 #, 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:2363
+#: ../src/empathy-call-window.c:2370
 msgid "There was a failure on the network"
 msgstr "é??å??網絡ä¸?æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2374
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??é?³è¨?æ ¼å¼?å°?æ?ªå?¨ä½ ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??è¦?å??æ ¼å¼?å°?æ?ªå?¨ä½ ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2387
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2768,19 +2798,19 @@ msgid ""
 "the Help menu."
 msgstr "å?¨ Telepathy å??件中ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å?¯å ±é??å??é?¯èª¤</a>並é??ä¸?å¾?æ±?å?©é?¸å?®å?§ç??ã??é?¤é?¯ã??è¦?çª?中æ??æ?¶é??ç??ç´?é??ã??"
 
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2395
 msgid "There was a failure in the call engine"
 msgstr "é??話å¼?æ??å?§æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2398
 msgid "The end of the stream was reached"
 msgstr "å·²é??串æµ?æ?«ç«¯"
 
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2438
 msgid "Can't establish audio stream"
 msgstr "��建���串�"
 
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2448
 msgid "Can't establish video stream"
 msgstr "ç?¡æ³?建ç«?è¦?å??串æµ?"
 
@@ -2880,31 +2910,31 @@ msgstr "é??話(_C)"
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:478
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (è?? %u å?¶ä»?ç??)"
 
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:494
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä¾?è?ªå?¶ä»?人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:503
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ä¾?è?ªæ??æ??人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:709
 msgid "Typing a message."
 msgstr "æ­£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -3220,15 +3250,15 @@ msgid "Import Accounts"
 msgstr "å?¯å?¥å¸³è??"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
 msgid "Import"
 msgstr "��"
 
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
 msgid "Source"
 msgstr "��"
 
@@ -3236,27 +3266,27 @@ msgstr "��"
 msgid "No match found"
 msgstr "æ?¾ä¸?å?°ç¬¦å??é ?ç?®"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:538
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:544
 msgid "Edit Account"
 msgstr "編輯帳è??"
 
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:550
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1232
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1557
 msgid "Contact List"
 msgstr "�絡人��"
 
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1666
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳è??"
 
@@ -3708,6 +3738,13 @@ msgstr "Empathy 帳è??"
 msgid "Empathy Debugger"
 msgstr "Empathy ����"
 
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy 已詢å??å?¯å?¥å¸³è??"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Empathy æ?¯å?¦æ??è©¢å??æ?¨è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
+
 #~ msgid "Use _Yahoo! Japan"
 #~ msgstr "使� Yahoo! ��(_Y)"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 56ddd18..41a79de 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,12 +7,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.31.92\n"
+"Project-Id-Version: empathy 2.91.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-25 13:49+0800\n"
+"POT-Creation-Date: 2010-10-13 15:39+0800\n"
 "PO-Revision-Date: 2010-09-23 20:50+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <chinese-l10n googlegroups com>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -108,315 +109,307 @@ msgid "Empathy default download folder"
 msgstr "Empathy é ?設ä¸?è¼?è³?æ??夾"
 
 #: ../data/org.gnome.Empathy.gschema.xml.in.h:18
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy 已詢å??å?¯å?¥å¸³è??"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy has migrated butterfly logs"
 msgstr "Empathy 已�移 butterfly ��"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
 msgid "Empathy should auto-away when idle"
 msgstr "Empathy ç?¶é??ç½®æ??æ??該è?ªå??設ç?ºé?¢é??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy å??å??æ??è?ªå??é?£ç·?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy æ??é??ä½?ä½?ç½®ç??æº?確度"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy è¦?使ç?¨é?£çµ¡äººç??å¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Enable WebKit Developer Tools"
 msgstr "å??ç?¨ WebKit é??ç?¼è??å·¥å?·"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable popup notifications for new messages"
 msgstr "å??ç?¨æ?°è¨?æ?¯ç??å½?å?ºå¼?é??ç?¥"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Enable spell checker"
 msgstr "å??ç?¨æ?¼å­?檢æ?¥ç¨?å¼?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Hide main window"
 msgstr "é?±è??主è¦?çª?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Hide the main window."
 msgstr "é?±è??主è¦?çª?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Nick completed character"
 msgstr "æ?±ç¨±è£?é½?å­?å??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??天"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
 msgid "Path of the Adium theme to use"
 msgstr "è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "å¦?æ??è??天室使ç?¨ç??主é¡?æ?¯ Adium æ??è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Play a sound for incoming messages"
 msgstr "æ?¶å?°è¨?æ?¯æ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for new conversations"
 msgstr "ç?¶é??å??æ?°ç??è«?話æ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "é??å?ºè¨?æ?¯æ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound when a contact logs in"
 msgstr "ç?¶é?£çµ¡äººç?»å?¥æ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when a contact logs out"
 msgstr "ç?¶æ??é?£çµ¡äººç?»å?ºæ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when we log in"
 msgstr "ç?¶æ??å??ç?»å?¥æ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound when we log out"
 msgstr "ç?¶æ??å??ç?»å?ºæ??æ?­æ?¾é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "å¦?æ??è??天è¦?çª?失å?»ç?¦é»?å??å½?å?ºé??ç?¥"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
 msgid "Pop up notifications when a contact logs in"
 msgstr "ç?¶é?£çµ¡äººç?»å?¥æ??å½?å?ºé??ç?¥"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
 msgid "Pop up notifications when a contact logs out"
 msgstr "ç?¶é?£çµ¡äººç?»å?ºæ??å½?å?ºé??ç?¥"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Show avatars"
 msgstr "é¡¯ç¤ºå¤§é ­è²¼"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show contact list in rooms"
 msgstr "å?¨è??天室顯示é?£çµ¡äººæ¸?å?®"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show hint about closing the main window"
 msgstr "é??é??主è¦?çª?æ??顯示æ??示"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show offline contacts"
 msgstr "顯示���絡人"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
 msgid "Show protocols"
 msgstr "顯示å??å®?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Spell checking languages"
 msgstr "æ?¼å­?檢æ?¥ç??èª?è¨?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "The default folder to save file transfers in."
 msgstr "ç?¨ä¾?å?²å­?æª?æ¡?å?³è¼¸æ?¥æ?¶æª?æ¡?ç??é ?設è³?æ??夾ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "The last directory that an avatar image was chosen from."
 msgstr "ä¸?次é?¸æ??å¤§é ­è²¼å??ç??ç??ç?®é??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
 msgid "The position for the chat window side pane"
 msgstr "è??天è¦?çª?å?´çª?æ ¼ç??ä½?ç½®"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
 msgid "The stored position (in pixels) of the chat window side pane."
 msgstr "è??天è¦?çª?å?´çª?æ ¼ç??å?²å­?ä½?ç½® (å?®ä½?ç?ºå??ç´ )ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "ç?¨ä¾?顯示å?¨è??天è¦?çª?ç??è«?話中ç??ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Use graphical smileys"
 msgstr "使ç?¨å??ç??å¼?表æ??符è??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use notification sounds"
 msgstr "使ç?¨é??ç?¥é?³æ??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Use theme for chat rooms"
 msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??é?£çµ¡äººã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨è¡?å??é?»è©±ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
-msgid "Whether Empathy has asked about importing accounts from other programs."
-msgstr "Empathy æ?¯å?¦æ??è©¢å??æ?¨è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
-
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
 msgid "Whether Empathy has migrated butterfly logs."
 msgstr "Empathy æ?¯å?¦æ??è½?移 butterfly æ?¥èª?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥æ?¨ç??帳è??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
 msgid ""
 "Whether Empathy should go into away mode automatically if the user is idle."
 msgstr "Empathy æ?¯å?¦æ??å?¨ä½¿ç?¨è??é??ç½®æ??è?ªå??å??æ??ç?ºé?¢é??模å¼?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy æ?¯å?¦å?ºæ?¼é?±ç§?ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:67
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:68
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?æ??é??æ?°é?£ç·?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:70
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "æ?¯å?¦å°?è«?話中ç??表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:72
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:73
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
 msgid "Whether to play a sound to notify of events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??æ?¶å?°è¨?æ?¯ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ?°ç??è«?話ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é??å?ºè¨?æ?¯ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
 msgid "Whether to play a sound when logging into a network."
 msgstr "ç?¶ç?»å?¥æ??網路æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ç?¶ç?»å?ºæ??網路æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦æ?­æ?¾é?³æ??é??ç?¥ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ç?¶é?£çµ¡äººé?¢ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ç?¶é?£çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:83
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ç?¶æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:85
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦å?¨é?£çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??é?£çµ¡äººã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "æ?¯å?¦è¦?å?¨è?¯çµ¡äººæ¸?å?®å?§é¡¯ç¤ºè?¯çµ¡äººä½¿ç?¨å??å®?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
 msgid "Whether to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室中顯示é?£çµ¡äººæ¸?å?®ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
 msgid "Whether to show the contact list in compact mode."
 msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示é?£çµ¡äººæ¸?å?®ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
+#: ../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/org.gnome.Empathy.gschema.xml.in.h:91
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
 msgid "Whether to use the theme for chat rooms."
 msgstr "æ?¯å?¦ç?ºè??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
 
-#: ../data/org.gnome.Empathy.gschema.xml.in.h:92
+#: ../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 "
@@ -431,7 +424,7 @@ msgstr "管ç??è¨?æ?¯è?? VoIP 帳è??"
 
 #. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/empathy-accounts-dialog.c:2157
+#: ../src/empathy-accounts-dialog.c:2105
 msgid "Messaging and VoIP Accounts"
 msgstr "è¨?æ?¯è?? VoIP 帳è??"
 
@@ -503,9 +496,9 @@ msgstr "é?±è??"
 msgid "Offline"
 msgstr "��"
 
-#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1893
-#: ../src/empathy-call-window.c:1894 ../src/empathy-call-window.c:1895
-#: ../src/empathy-call-window.c:1896 ../src/empathy-call-window.ui.h:18
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
@@ -617,16 +610,20 @@ msgid ""
 "chain, exceed the limits imposed by the cryptography library"
 msgstr "伺æ??å?¨æ??è­?ç??é?·åº¦ï¼?æ??æ?¯ä¼ºæ??å?¨æ??è­?é??ç??深度è¶?é??å¯?碼å?½å¼?庫æ??è?½è??ç??ç??ç¯?å??"
 
-#: ../libempathy/empathy-utils.c:544
+#: ../libempathy/empathy-utils.c:543
 #: ../libempathy-gtk/empathy-contact-list-store.h:73
 msgid "People Nearby"
 msgstr "é??è¿?ç??人"
 
-#: ../libempathy/empathy-utils.c:549
+#: ../libempathy/empathy-utils.c:548
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ��"
 
-#: ../libempathy/empathy-utils.c:550
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:578
 msgid "Facebook Chat"
 msgstr "Facebook è??天"
 
@@ -676,7 +673,7 @@ msgstr "��"
 
 #: ../libempathy-gtk/empathy-account-widget.c:514
 #: ../libempathy-gtk/empathy-log-window.c:646
-#: ../src/empathy-import-widget.c:312
+#: ../src/empathy-import-widget.c:321
 msgid "Account"
 msgstr "帳è??"
 
@@ -715,7 +712,7 @@ msgstr "��(_O)"
 #. Account and Identifier
 #: ../libempathy-gtk/empathy-account-widget.c:1617
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-individual-widget.c:1401
+#: ../libempathy-gtk/empathy-individual-widget.c:1399
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
 #: ../src/empathy-new-chatroom-dialog.ui.h:1
@@ -1266,7 +1263,7 @@ msgstr "ä¸?æ??"
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:691
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
 msgid "Topic:"
 msgstr "主��"
 
@@ -1289,7 +1286,7 @@ msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1847
-#: ../libempathy-gtk/empathy-ui-utils.c:1801
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
@@ -1357,31 +1354,31 @@ msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 msgid "%s is now known as %s"
 msgstr "%s ��被稱� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1932
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2934
+#: ../libempathy-gtk/empathy-chat.c:2910
 msgid "Wrong password; please try again:"
 msgstr "å¯?碼é?¯èª¤ï¼?è«?å??試ä¸?次ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2935
+#: ../libempathy-gtk/empathy-chat.c:2911
 msgid "Retry"
 msgstr "é??試"
 
-#: ../libempathy-gtk/empathy-chat.c:2940
+#: ../libempathy-gtk/empathy-chat.c:2916
 msgid "This room is protected by a password:"
 msgstr "æ­¤è??天室已被å¯?碼ä¿?è­·ï¼?"
 
-#: ../libempathy-gtk/empathy-chat.c:2941
+#: ../libempathy-gtk/empathy-chat.c:2917
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:3081
+#: ../libempathy-gtk/empathy-chat.c:3057
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:3134
+#: ../libempathy-gtk/empathy-chat.c:3110
 #: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "�話"
@@ -1404,17 +1401,17 @@ msgstr "é??å??é?£çµ?(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:243
-#: ../libempathy-gtk/empathy-individual-edit-dialog.c:248
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "編輯�絡人��"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:295
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
 msgid "Personal Information"
 msgstr "å??人è³?è¨?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:401
-#: ../libempathy-gtk/empathy-individual-dialogs.c:112
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
 msgid "New Contact"
 msgstr "���絡人"
 
@@ -1471,64 +1468,64 @@ msgid "_Add Contactâ?¦"
 msgstr "���絡人(_A)�"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:230
-#: ../libempathy-gtk/empathy-individual-menu.c:514
+#: ../libempathy-gtk/empathy-individual-menu.c:516
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "è??天(_C)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:260
-#: ../libempathy-gtk/empathy-individual-menu.c:557
+#: ../libempathy-gtk/empathy-individual-menu.c:559
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "èª?é?³é??話(_A)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:290
-#: ../libempathy-gtk/empathy-individual-menu.c:599
+#: ../libempathy-gtk/empathy-individual-menu.c:601
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "è¦?è¨?é??話(_V)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:330
-#: ../libempathy-gtk/empathy-individual-menu.c:642
+#: ../libempathy-gtk/empathy-individual-menu.c:644
 #: ../src/empathy-main-window.ui.h:25
 msgid "_Previous Conversations"
 msgstr "��次�話(_P)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:352
-#: ../libempathy-gtk/empathy-individual-menu.c:683
+#: ../libempathy-gtk/empathy-individual-menu.c:685
 msgid "Send File"
 msgstr "å?³é??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:375
-#: ../libempathy-gtk/empathy-individual-menu.c:725
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
 msgid "Share My Desktop"
 msgstr "å??享æ??ç??æ¡?é?¢"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:415
-#: ../libempathy-gtk/empathy-contact-widget.c:1539
-#: ../libempathy-gtk/empathy-individual-menu.c:759
-#: ../libempathy-gtk/empathy-individual-widget.c:1292
+#: ../libempathy-gtk/empathy-contact-menu.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1290
 msgid "Favorite"
 msgstr "å??好"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:444
-#: ../libempathy-gtk/empathy-individual-menu.c:786
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
 msgid "Infor_mation"
 msgstr "��(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:490
+#: ../libempathy-gtk/empathy-contact-menu.c:489
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:544
-#: ../libempathy-gtk/empathy-individual-menu.c:970
-#: ../src/empathy-chat-window.c:903
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:917
 msgid "Inviting you to this room"
 msgstr "é??è«?æ?¨å?°é??å??è??天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:575
-#: ../libempathy-gtk/empathy-individual-menu.c:1017
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
 msgid "_Invite to Chat Room"
 msgstr "é??è«?å?°è??天室(_I)"
 
@@ -1536,178 +1533,178 @@ msgstr "é??è«?å?°è??天室(_I)"
 msgid "Select a contact"
 msgstr "é?¸æ??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:217
-#: ../libempathy-gtk/empathy-individual-widget.c:148
+#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-individual-widget.c:147
 msgid "Full name:"
 msgstr "å?¨å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:218
-#: ../libempathy-gtk/empathy-individual-widget.c:149
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
 msgid "Phone number:"
 msgstr "é?»è©±è??碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:219
-#: ../libempathy-gtk/empathy-individual-widget.c:150
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
 msgid "E-mail address:"
 msgstr "é?»å­?ä¿¡ç®±ä½?å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:220
-#: ../libempathy-gtk/empathy-individual-widget.c:151
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
 msgid "Website:"
 msgstr "網��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:221
-#: ../libempathy-gtk/empathy-individual-widget.c:152
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
 msgid "Birthday:"
 msgstr "ç??æ?¥ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:578
-#: ../libempathy-gtk/empathy-individual-widget.c:454
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Country ISO Code:"
 msgstr "å??家 ISO 碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:580
-#: ../libempathy-gtk/empathy-individual-widget.c:456
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country:"
 msgstr "å??家ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:458
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:584
-#: ../libempathy-gtk/empathy-individual-widget.c:460
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "City:"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:586
-#: ../libempathy-gtk/empathy-individual-widget.c:462
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:588
-#: ../libempathy-gtk/empathy-individual-widget.c:464
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:590
-#: ../libempathy-gtk/empathy-individual-widget.c:466
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:592
-#: ../libempathy-gtk/empathy-individual-widget.c:468
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:594
-#: ../libempathy-gtk/empathy-individual-widget.c:470
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Floor:"
 msgstr "�層�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:596
-#: ../libempathy-gtk/empathy-individual-widget.c:472
+#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Room:"
 msgstr "室�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:598
-#: ../libempathy-gtk/empathy-individual-widget.c:474
+#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Text:"
 msgstr "æ??å­?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:600
-#: ../libempathy-gtk/empathy-individual-widget.c:476
+#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:602
-#: ../libempathy-gtk/empathy-individual-widget.c:478
+#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:604
-#: ../libempathy-gtk/empathy-individual-widget.c:480
+#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Accuracy Level:"
 msgstr "�確度���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:606
-#: ../libempathy-gtk/empathy-individual-widget.c:482
+#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Error:"
 msgstr "�誤�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:608
-#: ../libempathy-gtk/empathy-individual-widget.c:484
+#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·® (å?¬å°º)ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:610
-#: ../libempathy-gtk/empathy-individual-widget.c:486
+#: ../libempathy-gtk/empathy-contact-widget.c:640
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差 (�尺)�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:612
-#: ../libempathy-gtk/empathy-individual-widget.c:488
+#: ../libempathy-gtk/empathy-contact-widget.c:642
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:614
-#: ../libempathy-gtk/empathy-individual-widget.c:490
+#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Bearing:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:616
-#: ../libempathy-gtk/empathy-individual-widget.c:492
+#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:618
-#: ../libempathy-gtk/empathy-individual-widget.c:494
+#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Last Updated on:"
 msgstr "�次����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:620
-#: ../libempathy-gtk/empathy-individual-widget.c:496
+#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Longitude:"
 msgstr "�度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:622
-#: ../libempathy-gtk/empathy-individual-widget.c:498
+#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Latitude:"
 msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:624
-#: ../libempathy-gtk/empathy-individual-widget.c:500
+#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Altitude:"
 msgstr "緯度�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:687
-#: ../libempathy-gtk/empathy-contact-widget.c:704
-#: ../libempathy-gtk/empathy-individual-widget.c:582
-#: ../libempathy-gtk/empathy-individual-widget.c:599
+#: ../libempathy-gtk/empathy-contact-widget.c:717
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "ä½?ç½®"
 
 #. translators: format is "Location, $date"
-#: ../libempathy-gtk/empathy-contact-widget.c:706
-#: ../libempathy-gtk/empathy-individual-widget.c:601
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-individual-widget.c:600
 #, c-format
 msgid "%s, %s"
 msgstr "%sã??%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:758
-#: ../libempathy-gtk/empathy-individual-widget.c:650
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:649
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:841
-#: ../libempathy-gtk/empathy-individual-widget.c:841
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-individual-widget.c:840
 msgid "Save Avatar"
 msgstr "å?²å­?å¤§é ­è²¼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:897
-#: ../libempathy-gtk/empathy-individual-widget.c:899
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:898
 msgid "Unable to save avatar"
 msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
 
@@ -1717,7 +1714,7 @@ msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
 
 #. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
-#: ../libempathy-gtk/empathy-individual-widget.c:1227
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
 msgid "Alias:"
 msgstr "å?¥å??ï¼?"
 
@@ -1737,7 +1734,7 @@ msgstr "é?£çµ¡äººè©³ç´°è³?æ??"
 #. Identifier to connect to Instant Messaging network
 #. Translators: Identifier to connect to Instant Messaging network
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:8
-#: ../libempathy-gtk/empathy-individual-widget.c:1431
+#: ../libempathy-gtk/empathy-individual-widget.c:1429
 msgid "Identifier:"
 msgstr "è­?å?¥èº«å??ï¼?"
 
@@ -1769,18 +1766,20 @@ msgstr ""
 msgid "_Add Group"
 msgstr "å? å?¥ç¾¤çµ?(_G)"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:397
-#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:554
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb in a column header displaying group names"
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-groups-widget.c:407
-#: ../src/empathy-main-window.c:1247
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1250
 msgid "Group"
 msgstr "群�"
 
 #. Translators: the heading at the top of the Information dialogue
-#: ../libempathy-gtk/empathy-individual-information-dialog.c:282
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
 msgid "Linked Contacts"
 msgstr "å·²é?£çµ?ç??è?¯çµ¡äºº"
 
@@ -1804,19 +1803,19 @@ msgstr "å?¨æ??æ?¹æ¸?å?®æ??é?¸ç??è?¯çµ¡äººå°?é?£çµ?å?¨ä¸?èµ·ã??"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../libempathy-gtk/empathy-individual-menu.c:837
+#: ../libempathy-gtk/empathy-individual-menu.c:839
 msgctxt "Edit individual (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #. Translators: this is a verb meaning "to connect two contacts together
 #. * to form a meta-contact".
-#: ../libempathy-gtk/empathy-individual-menu.c:863
+#: ../libempathy-gtk/empathy-individual-menu.c:865
 msgctxt "Link individual (contextual menu)"
 msgid "_Link Contactsâ?¦"
 msgstr "���絡人(_L)�"
 
-#: ../libempathy-gtk/empathy-individual-widget.c:1569
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
 #, c-format
 msgid "Meta-contact containing %u contact"
 msgid_plural "Meta-contact containing %u contacts"
@@ -1834,6 +1833,13 @@ msgstr "��網路"
 msgid "Choose an IRC network"
 msgstr "é?¸æ?? IRC 網路"
 
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "é?¸æ??"
+
 #: ../libempathy-gtk/empathy-irc-network-dialog.c:280
 msgid "new server"
 msgstr "æ?°å¢?伺æ??å?¨"
@@ -1845,16 +1851,16 @@ msgstr "SSL"
 #. Translators: this is the title of the linking dialogue (reached by
 #. * right-clicking on a contact and selecting "Linkâ?¦"). "Link" in this title
 #. * is a verb.
-#: ../libempathy-gtk/empathy-linking-dialog.c:116
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
 msgid "Link Contacts"
 msgstr "���絡人"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:121
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
 msgctxt "Unlink individual (button)"
 msgid "_Unlinkâ?¦"
 msgstr "å??æ¶?é?£çµ?(_U)â?¦"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:122
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
 msgid ""
 "Completely split the displayed meta-contact into the contacts it contains."
 msgstr "å°?顯示ç??å¾?設è?¯çµ¡äººå?¶å??å?«ç??è?¯çµ¡äººå®?å?¨å??é??ã??"
@@ -1863,22 +1869,22 @@ msgstr "å°?顯示ç??å¾?設è?¯çµ¡äººå?¶å??å?«ç??è?¯çµ¡äººå®?å?¨å??é??ã??"
 #. Translators: this is an action button in the linking dialogue. "Link" is
 #. * used here as a verb meaning "to connect two contacts to form a
 #. * meta-contact".
-#: ../libempathy-gtk/empathy-linking-dialog.c:137
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
 msgid "_Link"
 msgstr "��(_L)"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:183
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
 #, c-format
 msgid "Unlink meta-contact '%s'?"
 msgstr "è¦?å??æ¶?å¾?設è?¯çµ¡äººã??%sã??ç??é?£æ?¥å??ï¼?"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:186
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
 msgid ""
 "Are you sure you want to unlink this meta-contact? This will completely "
 "split the meta-contact into the contacts it contains."
 msgstr "æ?¨ç¢ºå®?è¦?å??æ¶?æ­¤å¾?設è?¯çµ¡äººç??é?£çµ?ï¼?å¾?設è?¯çµ¡äººæ??å??å?«ç??è?¯çµ¡äººå°?æ??å®?å?¨å??é??ã??"
 
-#: ../libempathy-gtk/empathy-linking-dialog.c:191
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
 msgctxt "Unlink individual (button)"
 msgid "_Unlink"
 msgstr "å??æ¶?é?£çµ?(_U)"
@@ -1982,6 +1988,15 @@ msgstr "設å®?æ?¨ç??ä¸?ç·?è??ç?®å??ç??ç??æ??"
 msgid "Custom messagesâ?¦"
 msgstr "�����"
 
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "æ?°å¢? %s 帳è??"
+
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
 msgid "Find:"
 msgstr "���"
@@ -2067,84 +2082,109 @@ msgid "Blue"
 msgstr "è??è?²"
 
 #: ../libempathy-gtk/empathy-tls-dialog.c:150
-msgid "The identity provided by the chat server cannot be verified.\n"
+#, fuzzy
+#| msgid "The identity provided by the chat server cannot be verified.\n"
+msgid "The identity provided by the chat server cannot be verified."
 msgstr "å°?話伺æ??å?¨æ??æ??ä¾?ç??è­?å?¥èº«å??ç?¡æ³?é??é??é©?è­?ã??\n"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:156
-msgid "The certificate is not signed by a Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#, fuzzy
+#| msgid "The certificate is not signed by a Certification Authority"
+msgid "The certificate is not signed by a Certification Authority."
 msgstr "該æ??è­?並é??ç?±æ??è­?æ??æ¬?中å¿?æ??簽署"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:160
-msgid "The certificate has expired"
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#, fuzzy
+#| msgid "The certificate has expired"
+msgid "The certificate has expired."
 msgstr "æ??è­?å·²é?¾æ??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:163
-msgid "The certificate hasn't yet been activated"
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#, fuzzy
+#| msgid "The certificate hasn't yet been activated"
+msgid "The certificate hasn't yet been activated."
 msgstr "æ??è­?å°?æ?ªå??ç?¨"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:166
-msgid "The certificate does not have the expected fingerprint"
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#, fuzzy
+#| msgid "The certificate does not have the expected fingerprint"
+msgid "The certificate does not have the expected fingerprint."
 msgstr "æ??è­?並æ?ªæ??æ??é ?æ??ç??æ??ç´?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:169
-msgid "The hostname verified by the certificate doesn't match the server name"
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#, fuzzy
+#| msgid ""
+#| "The hostname verified by the certificate doesn't match the server name"
+msgid "The hostname verified by the certificate doesn't match the server name."
 msgstr "æ??è­?æ??é©?è­?ç??主æ©?å??稱è??伺æ??å?¨å??稱ä¸?符"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:173
-msgid "The certificate is self-signed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#, fuzzy
+#| msgid "The certificate is self-signed"
+msgid "The certificate is self-signed."
 msgstr "æ??è­?ç?ºè?ªæ??簽署"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:176
-msgid "The certificate has been revoked by the issuing Certification Authority"
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#, fuzzy
+#| msgid ""
+#| "The certificate has been revoked by the issuing Certification Authority"
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
 msgstr "æ??è­?已被å??æ?¬ç?¼å?ºç??æ??è­?æ??æ¬?æ©?æ§?æ?¤é?·"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:180
-msgid "The certificate is cryptographically weak"
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#, fuzzy
+#| msgid "The certificate is cryptographically weak"
+msgid "The certificate is cryptographically weak."
 msgstr "æ??è­?æ?¼å¯?碼é?²è­·ä¸?è¼?å¼±"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:183
-msgid "The certificate length exceeds verifiable limits"
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#, fuzzy
+#| msgid "The certificate length exceeds verifiable limits"
+msgid "The certificate length exceeds verifiable limits."
 msgstr "æ??è­?é?·åº¦è¶?å?ºå?¯é©?è­?ç??ç¯?å??"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:187
-msgid "The certificate is malformed"
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#, fuzzy
+#| msgid "The certificate is malformed"
+msgid "The certificate is malformed."
 msgstr "æ??è­?æ ¼å¼?ä¸?è?¯"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:205
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
 #, c-format
 msgid "Expected hostname: %s"
 msgstr "é ?æ??ç??æ??è­?主æ©?å??稱ï¼?%s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:208
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
 #, c-format
 msgid "Certificate hostname: %s"
 msgstr "æ??è­?主æ©?å??稱ï¼?%s"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:263
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
 msgid "Continue"
 msgstr "繼�"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:269
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
 msgid "This connection is untrusted. Would you like to continue anyway?"
 msgstr "æ­¤é?£ç·?æ?ªå??ä¿¡ä»»ã??æ?¨ç?¡è«?å¦?ä½?é?½è¦?ç¹¼çº?å??ï¼?"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:286
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
 msgid "Remember this choice for future connections"
 msgstr "è«?è¨?ä½?æ­¤é?¸æ??以ä¾?æ?ªä¾?é?£ç·?使ç?¨"
 
-#: ../libempathy-gtk/empathy-tls-dialog.c:294
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
 msgid "Certificate Details"
 msgstr "æ??è­?詳細è³?æ??"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1698
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1793
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1862
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
 #, c-format
 msgid "Incoming file from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?"
@@ -2344,7 +2384,7 @@ msgstr "å??å??æ??ä¸?顯示é?£çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?話çª?"
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??ç?¨æ?¶ç«¯"
 
-#: ../src/empathy-about-dialog.c:85
+#: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -2355,7 +2395,7 @@ msgstr ""
 "ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?"
 "é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../src/empathy-about-dialog.c:89
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2365,7 +2405,7 @@ msgstr ""
 "ç?¼ä½? Empathy ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??"
 "æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
 
-#: ../src/empathy-about-dialog.c:93
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -2375,11 +2415,11 @@ msgstr ""
 "給� Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:121
+#: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME ç??å?³æ??è¨?æ?¯ç?¨æ?¶ç«¯ç¨?å¼?"
 
-#: ../src/empathy-about-dialog.c:127
+#: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -2421,45 +2461,35 @@ msgstr ""
 "è??ã??"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1316
+#: ../src/empathy-account-assistant.c:1268
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
-#. To translator: %s is the protocol name
-#. Create account
-#. 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:614
-#, c-format
-msgid "New %s account"
-msgstr "æ?°å¢? %s 帳è??"
-
-#: ../src/empathy-account-assistant.c:515
+#: ../src/empathy-account-assistant.c:467
 msgid "What kind of chat account do you have?"
 msgstr "æ?¨ç??è??天帳è??æ?¯å?ªä¸?種ï¼?"
 
-#: ../src/empathy-account-assistant.c:521
+#: ../src/empathy-account-assistant.c:473
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "æ?¨é??æ?³è¦?設å®?å?¶ä»?ç??è??天帳è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:527
+#: ../src/empathy-account-assistant.c:479
 msgid "Enter your account details"
 msgstr "è«?輸å?¥æ?¨ç??帳è??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:532
+#: ../src/empathy-account-assistant.c:484
 msgid "What kind of chat account do you want to create?"
 msgstr "æ?¨æ?³è¦?建ç«?ä½?種è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:490
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?建ç«?å?¶ä»?è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:545
+#: ../src/empathy-account-assistant.c:497
 msgid "Enter the details for the new account"
 msgstr "è«?輸å?¥æ?°å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:660
+#: ../src/empathy-account-assistant.c:612
 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 "
@@ -2470,41 +2500,41 @@ msgstr ""
 "Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網路æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?"
 "è¨?é??話ã??"
 
-#: ../src/empathy-account-assistant.c:677
+#: ../src/empathy-account-assistant.c:629
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "æ?¨æ?¯å?¦æ??使ç?¨å?¶ä»?è??天ç¨?å¼?ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:652
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??帳è??詳細è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:721
+#: ../src/empathy-account-assistant.c:673
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?輸å?¥å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:743
+#: ../src/empathy-account-assistant.c:695
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:753
+#: ../src/empathy-account-assistant.c:705
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:774
+#: ../src/empathy-account-assistant.c:726
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:810
 #: ../src/empathy-new-chatroom-dialog.c:609
 #: ../src/empathy-new-chatroom-dialog.c:610
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:865
+#: ../src/empathy-account-assistant.c:817
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??樣"
 
-#: ../src/empathy-account-assistant.c:1130
+#: ../src/empathy-account-assistant.c:1082
 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 "
@@ -2515,16 +2545,16 @@ msgstr ""
 "ç?¨æ­¤å??è?½ï¼?è«?檢æ?¥ä¸?å??詳細è³?æ??æ?¯å?¦æ­£ç¢ºã??æ?¨ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°è®?æ?´é??äº?ç´°ç¯?ï¼?æ??æ?¯"
 "ç?¨ã??帳è??ã??å°?話çª?ä¾?å??ç?¨æ­¤å??è?½"
 
-#: ../src/empathy-account-assistant.c:1136
-#: ../src/empathy-account-assistant.c:1192
+#: ../src/empathy-account-assistant.c:1088
+#: ../src/empathy-account-assistant.c:1144
 msgid "Edit->Accounts"
 msgstr "編輯 -> 帳è??"
 
-#: ../src/empathy-account-assistant.c:1152
+#: ../src/empathy-account-assistant.c:1104
 msgid "I don't want to enable this feature for now"
 msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
 
-#: ../src/empathy-account-assistant.c:1188
+#: ../src/empathy-account-assistant.c:1140
 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 "
@@ -2535,66 +2565,66 @@ msgstr ""
 "å??ç?¨æ­¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?件ï¼?並å¾?ã??帳è??ã??å°?話çª?建ç«?ã??é??è¿?ç??人ã??帳"
 "è??"
 
-#: ../src/empathy-account-assistant.c:1194
+#: ../src/empathy-account-assistant.c:1146
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut ����"
 
-#: ../src/empathy-account-assistant.c:1240
+#: ../src/empathy-account-assistant.c:1192
 msgid "Messaging and VoIP Accounts Assistant"
 msgstr "è¨?æ?¯è?? VoIP 帳è??å?©ç??"
 
-#: ../src/empathy-account-assistant.c:1274
+#: ../src/empathy-account-assistant.c:1226
 msgid "Welcome to Empathy"
 msgstr "歡�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:1283
+#: ../src/empathy-account-assistant.c:1235
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:1301
+#: ../src/empathy-account-assistant.c:1253
 msgid "Please enter personal details"
 msgstr "è«?輸å?¥å??人詳細è³?æ??"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:65
+#: ../src/empathy-accounts-dialog.c:64
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "æ??è??æ?¨ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:69
+#: ../src/empathy-accounts-dialog.c:68
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å­?æ?¨ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:281 ../src/empathy-call-window.c:818
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
 msgid "Connectingâ?¦"
 msgstr "��中�"
 
-#: ../src/empathy-accounts-dialog.c:322
+#: ../src/empathy-accounts-dialog.c:321
 #, c-format
 msgid "Offline â?? %s"
 msgstr "é?¢ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:334
+#: ../src/empathy-accounts-dialog.c:333
 #, c-format
 msgid "Disconnected â?? %s"
 msgstr "å·²æ?·ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:345
+#: ../src/empathy-accounts-dialog.c:344
 msgid "Offline â?? No Network Connection"
 msgstr "é?¢ç·? â?? ç?¡ç¶²è·¯é?£ç·?"
 
-#: ../src/empathy-accounts-dialog.c:352
+#: ../src/empathy-accounts-dialog.c:351
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç??ç??æ??"
 
-#: ../src/empathy-accounts-dialog.c:364
+#: ../src/empathy-accounts-dialog.c:363
 msgid "Offline â?? Account Disabled"
 msgstr "é?¢ç·? â?? 帳è??å·²å??ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:811
+#: ../src/empathy-accounts-dialog.c:759
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2602,16 +2632,16 @@ msgstr ""
 "æ?¨å?³å°?建ç«?æ?°ç??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1158
+#: ../src/empathy-accounts-dialog.c:1106
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?æ?¨ç??é?»è?¦ä¸?移é?¤ç¾¤çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1162
+#: ../src/empathy-accounts-dialog.c:1110
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??移é?¤ä¼ºæ??å?¨ä¸?ç??æ?¨ç??帳è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1400
+#: ../src/empathy-accounts-dialog.c:1348
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2619,7 +2649,7 @@ msgstr ""
 "æ?¨å?³å°?建ç«?å?¦ä¸?å??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:2003
+#: ../src/empathy-accounts-dialog.c:1951
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2689,105 +2719,105 @@ msgstr "Gamma"
 msgid "Volume"
 msgstr "é?³é??"
 
-#: ../src/empathy-call-window.c:1173
+#: ../src/empathy-call-window.c:1166
 msgid "_Sidebar"
 msgstr "å?´é??æ¬?(_S)"
 
-#: ../src/empathy-call-window.c:1192
+#: ../src/empathy-call-window.c:1186
 msgid "Audio input"
 msgstr "é?³æ??輸å?¥"
 
-#: ../src/empathy-call-window.c:1196
+#: ../src/empathy-call-window.c:1190
 msgid "Video input"
 msgstr "��輸�"
 
-#: ../src/empathy-call-window.c:1200
+#: ../src/empathy-call-window.c:1194
 msgid "Dialpad"
 msgstr "æ?­è??ç?¤"
 
-#: ../src/empathy-call-window.c:1205
+#: ../src/empathy-call-window.c:1199
 msgid "Details"
 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:1273
+#: ../src/empathy-call-window.c:1266
 #, 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:1352
+#: ../src/empathy-call-window.c:1345
 msgid "Call"
 msgstr "é??話"
 
-#: ../src/empathy-call-window.c:1506
+#: ../src/empathy-call-window.c:1499
 msgid "The IP address as seen by the machine"
 msgstr "æ©?å?¨ç??è¦?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1508
+#: ../src/empathy-call-window.c:1501
 msgid "The IP address as seen by a server on the Internet"
 msgstr "網é??網路ä¸?ç??伺æ??å?¨ç??è¦?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1510
+#: ../src/empathy-call-window.c:1503
 msgid "The IP address of the peer as seen by the other side"
 msgstr "å?¶ä»?端ç??è¦?ç??é»?ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1512
+#: ../src/empathy-call-window.c:1505
 msgid "The IP address of a relay server"
 msgstr "中繼伺æ??å?¨ç?? IP ä½?å??"
 
-#: ../src/empathy-call-window.c:1514
+#: ../src/empathy-call-window.c:1507
 msgid "The IP address of the multicast group"
 msgstr "å¤?é»?廣æ?­ç¾¤çµ?ç?? IP ä½?å??"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:2247
+#: ../src/empathy-call-window.c:2254
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:2308
+#: ../src/empathy-call-window.c:2315
 msgid "Technical Details"
 msgstr "æ??è¡?ç´°ç¯?"
 
-#: ../src/empathy-call-window.c:2346
+#: ../src/empathy-call-window.c:2353
 #, 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:2351
+#: ../src/empathy-call-window.c:2358
 #, 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:2357
+#: ../src/empathy-call-window.c:2364
 #, 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:2363
+#: ../src/empathy-call-window.c:2370
 msgid "There was a failure on the network"
 msgstr "é??å??網路ä¸?æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2367
+#: ../src/empathy-call-window.c:2374
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??é?³è¨?æ ¼å¼?å°?æ?ªå?¨æ?¨ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2370
+#: ../src/empathy-call-window.c:2377
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??è¦?è¨?æ ¼å¼?å°?æ?ªå?¨æ?¨ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:2380
+#: ../src/empathy-call-window.c:2387
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2797,19 +2827,19 @@ msgstr ""
 "å?¨ Telepathy å??件中ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å??å ±é??å??é?¯èª¤</a>並é??ä¸?"
 "å¾?æ±?å?©é?¸å?®å?§ç??ã??é?¤é?¯ã??è¦?çª?中æ??æ?¶é??ç??ç´?é??ã??"
 
-#: ../src/empathy-call-window.c:2388
+#: ../src/empathy-call-window.c:2395
 msgid "There was a failure in the call engine"
 msgstr "é??話å¼?æ??å?§æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:2391
+#: ../src/empathy-call-window.c:2398
 msgid "The end of the stream was reached"
 msgstr "å·²é??串æµ?æ?«ç«¯"
 
-#: ../src/empathy-call-window.c:2431
+#: ../src/empathy-call-window.c:2438
 msgid "Can't establish audio stream"
 msgstr "��建���串�"
 
-#: ../src/empathy-call-window.c:2441
+#: ../src/empathy-call-window.c:2448
 msgid "Can't establish video stream"
 msgstr "��建���串�"
 
@@ -2909,31 +2939,31 @@ msgstr "é??話(_C)"
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../src/empathy-chat-window.c:452 ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:478
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (è?? %u å?¶ä»?ç??)"
 
-#: ../src/empathy-chat-window.c:480
+#: ../src/empathy-chat-window.c:494
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä¾?è?ªå?¶ä»?人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:489
+#: ../src/empathy-chat-window.c:503
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ä¾?è?ªæ??æ??人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:695
+#: ../src/empathy-chat-window.c:709
 msgid "Typing a message."
 msgstr "æ­£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -3249,15 +3279,15 @@ msgid "Import Accounts"
 msgstr "å?¯å?¥å¸³è??"
 
 #. Translators: this is the header of a treeview column
-#: ../src/empathy-import-widget.c:292
+#: ../src/empathy-import-widget.c:301
 msgid "Import"
 msgstr "��"
 
-#: ../src/empathy-import-widget.c:301
+#: ../src/empathy-import-widget.c:310
 msgid "Protocol"
 msgstr "é??è¨?å??å®?"
 
-#: ../src/empathy-import-widget.c:325
+#: ../src/empathy-import-widget.c:334
 msgid "Source"
 msgstr "��"
 
@@ -3265,27 +3295,27 @@ msgstr "��"
 msgid "No match found"
 msgstr "æ?¾ä¸?å?°ç¬¦å??é ?ç?®"
 
-#: ../src/empathy-main-window.c:535
+#: ../src/empathy-main-window.c:538
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:541
+#: ../src/empathy-main-window.c:544
 msgid "Edit Account"
 msgstr "編輯帳è??"
 
-#: ../src/empathy-main-window.c:547
+#: ../src/empathy-main-window.c:550
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1229
+#: ../src/empathy-main-window.c:1232
 msgid "Contact"
 msgstr "�絡人"
 
-#: ../src/empathy-main-window.c:1554
+#: ../src/empathy-main-window.c:1557
 msgid "Contact List"
 msgstr "�絡人��"
 
-#: ../src/empathy-main-window.c:1663
+#: ../src/empathy-main-window.c:1666
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳è??"
 
@@ -3740,6 +3770,13 @@ msgstr "Empathy 帳è??"
 msgid "Empathy Debugger"
 msgstr "Empathy ����"
 
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy 已詢å??å?¯å?¥å¸³è??"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Empathy æ?¯å?¦æ??è©¢å??æ?¨è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
+
 #~ msgid "Use _Yahoo! Japan"
 #~ msgstr "使� Yahoo! ��(_Y)"