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

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

commit 4f6e6ebe6c3213a71a6566e07f46921c1066e365
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Tue Jan 26 05:59:53 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1095 +++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po | 1098 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 1071 insertions(+), 1122 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 329bda2..c21efde 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.28.0\n"
+"Project-Id-Version: empathy 2.29.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 15:02+0800\n"
-"PO-Revision-Date: 2010-01-01 15:06+0800\n"
+"POT-Creation-Date: 2010-01-26 05:54+0800\n"
+"PO-Revision-Date: 2010-01-26 05:59+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "MIME-Version: 1.0\n"
@@ -49,9 +49,10 @@ msgid "Chat window theme"
 msgstr "è??天è¦?çª?ä½?æ?¯ä¸»é¡?"
 
 #: ../data/empathy.schemas.in.h:4
+#, fuzzy
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr "è¦?使ç?¨æ?¼å­?檢æ?¥ç??èª?è¨?æ¸?å?®ï¼?以é??è??å??é??ï¼?å¦? en,fr,nlï¼?ã??"
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "以é??è??å??é??è¦?使ç?¨æ?¼å­?檢æ?¥ç??èª?è¨?æ¸?å?®ï¼?å¦?ï¼?ã?? en,fr,nlã??ï¼?ã??"
 
 #: ../data/empathy.schemas.in.h:5
 msgid "Compact contact list"
@@ -150,12 +151,12 @@ msgid "Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??天"
 
 #: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
-msgstr "è¦?使ç?¨ç?? adium ä½?æ?¯ä¸»é¡?è·¯å¾?"
+msgid "Path of the Adium theme to use"
+msgstr "è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?"
 
 #: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "å¦?æ??è??天室使ç?¨ç??主é¡?æ?¯ adium æ??è¦?使ç?¨ç?? adium ä½?æ?¯ä¸»é¡?è·¯å¾?ã??"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "å¦?æ??è??天室使ç?¨ç??主é¡?æ?¯ Adium æ??è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?ã??"
 
 #: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for incoming messages"
@@ -186,15 +187,15 @@ msgid "Play a sound when we log out"
 msgstr "ç?¶æ??å??ç?»å?ºæ??æ?­æ?¾é?³æ??"
 
 #: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
+msgid "Pop up notifications if the chat isn't focused"
 msgstr "å¦?æ??è??天è¦?çª?失å?»ç?¦é»?å??å½?å?ºé??ç?¥"
 
 #: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
+msgid "Pop up notifications when a contact logs in"
 msgstr "ç?¶è?¯çµ¡äººç?»å?¥æ??å½?å?ºé??ç?¥"
 
 #: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
+msgid "Pop up notifications when a contact logs out"
 msgstr "ç?¶è?¯çµ¡äººç?»å?ºæ??å½?å?ºé??ç?¥"
 
 #: ../data/empathy.schemas.in.h:41
@@ -250,192 +251,212 @@ msgid "Use theme for chat rooms"
 msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
 #: ../data/empathy.schemas.in.h:54
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "æ?¯å?¦å??ç?¨ WebKit é??ç?¼è??å·¥å?·ï¼?ä¾?å¦? Web Inspectorã??"
+#, fuzzy
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??è?¯çµ¡äººã??"
 
 #: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??è?¯çµ¡äººã??"
+#, fuzzy
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:56
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
+#, fuzzy
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy æ?¯å?¦ä½¿ç?¨æµ?å??é?»è©±ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:57
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
-msgstr "Empathy æ?¯å?¦ä½¿ç?¨æµ?å??é?»è©±ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
+#, fuzzy
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:58
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
+#, fuzzy
+msgid "Whether Empathy has asked about importing accounts from other programs."
+msgstr "Empathy æ?¯å?¦æ??è©¢å??ä½ è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
 
 #: ../data/empathy.schemas.in.h:59
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "Empathy æ?¯å?¦æ??è©¢å??ä½ è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
+#, fuzzy
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥ä½ ç??帳è??ã??"
 
 #: ../data/empathy.schemas.in.h:60
+#, fuzzy
 msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥ä½ ç??帳è??ã??"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy æ?¯å?¦å?ºæ?¼ç§?é?±ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
 
 #: ../data/empathy.schemas.in.h:61
+#, fuzzy
 msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr "Empathy æ?¯å?¦å?ºæ?¼ç§?é?±æ¬?ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Empathy æ?¯å?¦ä½¿ç?¨è?¯çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
 
 #: ../data/empathy.schemas.in.h:62
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
-msgstr "Empathy æ?¯å?¦ä½¿ç?¨è?¯çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "æ?¯å?¦å??ç?¨ WebKit é??ç?¼è??å·¥å?·ï¼?ä¾?å¦? Web Inspectorã??"
 
 #: ../data/empathy.schemas.in.h:63
+#, fuzzy
 msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?/é??æ?°é?£ç·?ã??"
 
 #: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
+#, fuzzy
+msgid "Whether the Salut account has been created on the first Empathy run."
 msgstr "æ?¯å?¦å?¨ Empathy 第ä¸?次å?·è¡?æ??建ç«? Salut 帳è??ã??"
 
 #: ../data/empathy.schemas.in.h:65
+#, fuzzy
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr "æ?¯å?¦ä»¥ä½ 設å®?ç??èª?è¨?檢æ?¥è¼¸å?¥æ??ç?¡é?¯å­?ã??"
 
 #: ../data/empathy.schemas.in.h:66
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+#, fuzzy
+msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "å?¨è«?話中æ?¯å?¦å°?表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
 
 #: ../data/empathy.schemas.in.h:67
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+#, fuzzy
+msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è?¯çµ¡äººç?»å?¥ç¶²çµ¡ã??"
 
 #: ../data/empathy.schemas.in.h:68
+#, fuzzy
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è?¯çµ¡äººç?»å?ºç¶²çµ¡ã??"
 
 #: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for events."
+#, fuzzy
+msgid "Whether to play a sound to notify of events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
 #: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯æ?µé??ã??"
+#, fuzzy
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??æ?¶å?°è¨?æ?¯ã??"
 
 #: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for new conversations."
+#, fuzzy
+msgid "Whether to play a sound to notify of new conversations."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥é??å??æ?°ç??è«?話ã??"
 
 #: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯é??å?ºã??"
+#, fuzzy
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é??å?ºè¨?æ?¯ã??"
 
 #: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging in a network."
-msgstr "ç?¶ç?»å?¥ç¶²çµ¡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
+#, fuzzy
+msgid "Whether to play a sound when logging into a network."
+msgstr "ç?¶ç?»å?¥æ??網絡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
 #: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "ç?¶ç?»å?ºç¶²çµ¡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
+#, fuzzy
+msgid "Whether to play a sound when logging out of a network."
+msgstr "ç?¶ç?»å?ºæ??網絡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
 #: ../data/empathy.schemas.in.h:75
-msgid "Whether or not to play sound notifications when away or busy."
+#, fuzzy
+msgid "Whether to play sound notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦æ?­æ?¾é?³æ??é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:76
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#, fuzzy
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ç?¶è?¯çµ¡äººé?¢ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:77
-msgid "Whether or not to show a popup notification when a contact goes online."
+#, fuzzy
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ç?¶è?¯çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:78
+#, fuzzy
 msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 msgstr "æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ï¼?å?³ä½¿å·²é??å??è??天è¦?çª?ï¼?ä½?æ²?æ??ç?²å¾?ç?¦é»?ï¼?ã??"
 
 #: ../data/empathy.schemas.in.h:79
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#, fuzzy
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ç?¶æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:80
+#, fuzzy
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "æ?¯å?¦å?¨è?¯çµ¡äººæ¸?å?®è??è??天è¦?çª?顯示è?¯çµ¡äººå¤§é ­è²¼ã??"
 
 #: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show contacts that are offline in the contact list."
+#, fuzzy
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦å?¨è?¯çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??è?¯çµ¡äººã??"
 
 #: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show popup notifications when away or busy."
+#, fuzzy
+msgid "Whether to show popup notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:83
-msgid "Whether or not to show protocols for contacts in the contact list."
+#, fuzzy
+msgid "Whether to show protocols for contacts in the contact list."
 msgstr "æ?¯å?¦è¦?顯示è?¯çµ¡äººæ¸?å?®å?§ç??è?¯çµ¡äººä½¿ç?¨å??å®?ã??"
 
 #: ../data/empathy.schemas.in.h:84
-msgid "Whether or not to show the contact list in chat rooms."
+#, fuzzy
+msgid "Whether to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室中顯示è?¯çµ¡äººæ¸?å?®ã??"
 
 #: ../data/empathy.schemas.in.h:85
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
-msgstr "使ç?¨æ¨?é¡?å??ç??ã??xã??æ??é??é??é??主è¦?çª?æ??æ?¯å?¦é¡¯ç¤ºè¨?æ?¯ã??"
+#, fuzzy
+msgid "Whether to show the contact list in compact mode."
+msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示è?¯çµ¡äººæ¸?å?®ã??"
 
 #: ../data/empathy.schemas.in.h:86
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示è?¯çµ¡äººæ¸?å?®ã??"
+#, fuzzy
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "æ?¯å?¦å?¨ä½¿ç?¨æ¨?é¡?å??ç??ã??xã??æ??é??é??é??主è¦?çª?æ??ï¼?顯示è¨?æ?¯å°?話çª?ã??"
 
 #: ../data/empathy.schemas.in.h:87
-msgid "Whether to use the theme for chat rooms or not."
+#, fuzzy
+msgid "Whether to use the theme for chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
 
 #: ../data/empathy.schemas.in.h:88
+#, fuzzy
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
-msgstr "æ??åº?è?¯çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æº?å??ã??é ?設å?¼æ?¯ä½¿ç?¨è?¯çµ¡äººç??å??稱ã??nameã??æ?¸å?¼ä¾?æ??åº?ã??è??æ?¸å?¼ã??stateã??å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?è?¯çµ¡äººæ¸?å?®ã??"
+"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 "
+"the contact list by state."
+msgstr "æ??åº?è?¯çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æº?å??ã??é ?設å?¼æ?¯ä½¿ç?¨è?¯çµ¡äººç??å??稱ã??nameã??å?¼ä¾?æ??åº?ã??è??ã??stateã??å?¼å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?è?¯çµ¡äººæ¸?å?®ã??"
 
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../libempathy/empathy-ft-handler.c:840
 msgid "The hash of the received file and the sent one do not match"
 msgstr "å·²æ?¥æ?¶æª?æ¡?ç??é??æ¹?å?¼è??é??å?ºç??ä¸?符"
 
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1100
 msgid "File transfer not supported by remote contact"
 msgstr "é? 端è?¯çµ¡äººä¸?æ?¯æ?´æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1158
 msgid "The selected file is not a regular file"
 msgstr "é?¸å??ç??æª?æ¡?ä¸?æ?¯æ­£è¦?ç??æª?æ¡?"
 
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is empty"
 msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 
-#: ../libempathy/empathy-tp-contact-list.c:834 ../src/empathy.c:293
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:96
 msgid "People nearby"
 msgstr "��人�"
 
@@ -484,7 +505,7 @@ msgid "Away"
 msgstr "é?¢é??"
 
 #: ../libempathy/empathy-utils.c:245
-msgid "Hidden"
+msgid "Invisible"
 msgstr "é?±è??"
 
 #: ../libempathy/empathy-utils.c:247
@@ -496,8 +517,8 @@ msgid "No reason specified"
 msgstr "æ²?æ??æ??å®?å??å? "
 
 #: ../libempathy/empathy-utils.c:288
-msgid "User requested disconnect"
-msgstr "é?£æ?¥ä¸?ä¸?è¦?æ±?ç??使ç?¨è??"
+msgid "Status is set to offline"
+msgstr "ç??æ??設ç?ºé?¢ç·?"
 
 #: ../libempathy/empathy-utils.c:290
 msgid "Network error"
@@ -609,11 +630,11 @@ msgstr "��"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1320
+#: ../libempathy-gtk/empathy-account-widget.c:1329
 msgid "L_og in"
 msgstr "��(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1387
+#: ../libempathy-gtk/empathy-account-widget.c:1396
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -621,15 +642,15 @@ msgstr "��(_O)"
 msgid "Account:"
 msgstr "帳è??ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget.c:1407
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1460
+#: ../libempathy-gtk/empathy-account-widget.c:1472
 msgid "This account already exists on the server"
 msgstr "此帳è??å·²ç¶?å­?å?¨é??å??伺æ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1463
+#: ../libempathy-gtk/empathy-account-widget.c:1475
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??伺æ??å?¨ä¸?建ç«?æ?°ç??帳è??"
 
@@ -638,25 +659,25 @@ msgstr "å?¨é??å??伺æ??å?¨ä¸?建ç«?æ?°ç??帳è??"
 #. * like: "MyUserName on chat.freenode.net".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1846
+#: ../libempathy-gtk/empathy-account-widget.c:1858
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ç?? %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:1864
+#: ../libempathy-gtk/empathy-account-widget.c:1876
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1868
+#: ../libempathy-gtk/empathy-account-widget.c:1880
 msgid "New account"
 msgstr "æ?°å¢?帳è??"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??稱</span>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??稱"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -665,7 +686,7 @@ msgstr "<span size=\"small\"><b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??稱</span>"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "é?²é??"
@@ -675,7 +696,7 @@ msgstr "é?²é??"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "�碼(_W):"
@@ -713,8 +734,8 @@ msgstr "伺æ??å?¨(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>ç¯?ä¾?ï¼?</b> 使ç?¨è??å??稱</span>"
+msgid "<b>Example:</b> username"
+msgstr "<b>ç¯?ä¾?ï¼?</b> 使ç?¨è??å??稱"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
@@ -731,8 +752,8 @@ msgid "What is your GroupWise password?"
 msgstr "ä½ ç?? GroupWise å¯?碼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>���</b> 123456789</span>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>���</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
@@ -748,8 +769,8 @@ msgstr "ä½ ç?? ICQ å¯?碼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
-msgstr "編碼(_C):"
+msgid "_Character set:"
+msgstr "å­?é??(_C)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.c:244
 msgid "New Network"
@@ -789,8 +810,8 @@ msgid "None"
 msgstr "ç?¡"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
-msgstr "編碼:"
+msgid "Character set:"
+msgstr "å­?é??ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
@@ -821,12 +842,12 @@ msgid "Servers"
 msgstr "伺æ??å?¨"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user gmail com</span>"
-msgstr "<span size=\"small\"><b>���</b> user gmail com</span>"
+msgid "<b>Example:</b> user gmail com"
+msgstr "<b>���</b> user gmail com"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user jabber org</span>"
-msgstr "<span size=\"small\"><b>���</b> user jabber org</span>"
+msgid "<b>Example:</b> user jabber org"
+msgstr "<b>���</b> user jabber org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Override server settings"
@@ -877,20 +898,20 @@ msgid "_Ignore SSL certificate errors"
 msgstr "忽� SSL ���誤(_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user hotmail com</span>"
-msgstr "<span size=\"small\"><b>���</b> user hotmail com</span>"
+msgid "<b>Example:</b> user hotmail com"
+msgstr "<b>���</b> user hotmail com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "ä½ ç?? Windows Live å¯?碼æ?¯ï¼?"
+msgid "What is your Windows Live ID?"
+msgstr "ä½ ç?? Windows Live ID æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "ä½ ç?? Windows Live 使ç?¨è??å??稱æ?¯ï¼?"
+msgid "What is your Windows Live password?"
+msgstr "ä½ ç?? Windows Live å¯?碼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
-msgstr "���件(_E):"
+msgid "_E-mail address:"
+msgstr "é?»å­?é?µä»¶ä½?å??(_E):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
@@ -913,69 +934,68 @@ msgid "_Published Name:"
 msgstr "ç?¼ä½?ç??å??稱(_P):"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#, fuzzy
-msgid "<b>Keep-Alive Options</b>"
-msgstr "顯示æ??é?? GNOME ç??é?¸é ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "<b>Miscellaneous Options</b>"
-msgstr "<b>é??é ?</b>"
+msgid "<b>Example:</b> user my sip server"
+msgstr "<b>���</b> user my sip server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-#, fuzzy
-msgid "<b>NAT Traversal Options</b>"
-msgstr "顯示æ??é?? GNOME ç??é?¸é ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "<b>Proxy Options</b>"
-msgstr "<b>Proxy é?¸é ?</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
-msgstr "<span size=\"small\"><b>���</b> user my sip server</span>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Authentication username:"
 msgstr "èª?è­?使ç?¨è??å??稱ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
 msgstr "�索 Binding"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
 msgstr "è?ªå??æ?¢ç´¢ STUN 伺æ??å?¨"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "Hostname of the proxy for outbound requests."
 msgstr "è³?æ??å?³å?ºè¦?æ±?æ??使ç?¨ç?? proxy 主æ©?å??稱ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "é??é??ï¼?ç§?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#, fuzzy
+msgid "Keep-Alive Options"
+msgstr "ä¿?æ??ä¸?æ?·ç·?é?¸é ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid ""
 "Look up the DNS SRV record at the service's domain for the host name of a "
 "STUN server."
 msgstr "æ?¥è©¢ä½?æ?¼ä¼ºæ??å?¨ domain ç?? DNS SRV ç´?é??以å??å¾?æ??å?? STUN 伺æ??å?¨ç??主æ©?å??稱ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Loose Routing"
 msgstr "寬�路�"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Mechanism:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "é??é ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr "NAT å?³è¼¸é?¸é ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Port of the proxy for outbound requests."
 msgstr "è³?æ??å?³å?ºè¦?æ±?æ??使ç?¨ç?? proxy é?£æ?¥å? ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Port:"
 msgstr "é?£æ?¥å? ï¼?"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "Proxy é?¸é ?"
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN 伺æ??å?¨:"
@@ -1021,8 +1041,8 @@ msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "使� _Yahoo ��"
+msgid "Use _Yahoo! Japan"
+msgstr "使� Yahoo! ��(_Y)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "What is your Yahoo! ID?"
@@ -1033,11 +1053,11 @@ msgid "What is your Yahoo! password?"
 msgstr "ä½ ç?? Yahoo! å¯?碼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
+msgid "Yahoo! I_D:"
 msgstr "Yahoo I_D:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
+msgid "_Ignore conference and chat room invitations"
 msgstr "忽ç?¥æ??è­°è??è??天室é??è«?(_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
@@ -1050,8 +1070,8 @@ msgid "Couldn't convert image"
 msgstr "ç?¡æ³?è½?æ??å??ç??"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
-msgstr "ä½ ç??系統ä¸?æ?¯æ?´é??äº?å??ç??æ ¼å¼?"
+msgid "None of the accepted image formats are supported on your system"
+msgstr "ä½ ç??系統ä¸?æ²?æ??æ?¯æ?´å·²æ?¥å??ç??å??ç??æ ¼å¼?"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:915
 msgid "Select Your Avatar Image"
@@ -1073,141 +1093,141 @@ msgstr "æ??æ??æª?æ¡?"
 msgid "Click to enlarge"
 msgstr "è«?æ??é??è£?æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:199
+#: ../libempathy-gtk/empathy-chat.c:201
 msgid "Failed to reconnect this chat"
 msgstr "ç?¡æ³?é??é?£é??å??è??天æ??è­°"
 
-#: ../libempathy-gtk/empathy-chat.c:621
-msgid "Failed to join chatroom"
+#: ../libempathy-gtk/empathy-chat.c:623
+msgid "Failed to join chat room"
 msgstr "å? å?¥è??天室失æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:641
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?人å°?話失æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:678
+#: ../libempathy-gtk/empathy-chat.c:680
 msgid "Topic not supported on this conversation"
-msgstr "æ­¤å°?話ç??主é¡?ä¸?被æ?¯æ?´"
+msgstr "æ­¤è«?話ç??主é¡?ä¸?被æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:684
+#: ../libempathy-gtk/empathy-chat.c:686
 msgid "You are not allowed to change the topic"
 msgstr "ä½ ä¸?被å??許æ?´æ?¹é??å??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:802
-msgid "/clear, clear all messages from the current conversation"
-msgstr "/clearï¼?æ¸?é?¤ç?®å??å°?話ç??æ??æ??è¨?æ?¯"
+#: ../libempathy-gtk/empathy-chat.c:815
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: æ¸?é?¤ç?®å??è«?話ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:805
-msgid "/topic <topic>, set the topic of the current conversation"
-msgstr "/topic <主é¡?>ï¼?設置ç?®å??å°?話ç??主é¡?"
+#: ../libempathy-gtk/empathy-chat.c:818
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <主é¡?>: 設置ç?®å??è«?話ç??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:808
-msgid "/join <chatroom id>, join a new chatroom"
-msgstr "/join <è??天室 id>ï¼?å? å?¥æ?°ç??è??天室"
+#: ../libempathy-gtk/empathy-chat.c:821
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <è??天室 ID>: å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:811
-msgid "/j <chatroom id>, join a new chatroom"
-msgstr "/j <è??天室 id>ï¼?å? å?¥æ?°ç??è??天室"
+#: ../libempathy-gtk/empathy-chat.c:824
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <è??天室 ID>: å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:814
-msgid "/query <contact id> [<message>], open a private chat"
-msgstr "/query <è?¯çµ¡äºº id> [<è¨?æ?¯>]ï¼?é??å??ç§?人å°?話"
+#: ../libempathy-gtk/empathy-chat.c:827
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]: é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:817
-msgid "/msg <contact id> <message>, open a private chat"
-msgstr "/msg <è?¯çµ¡äºº id> <è¨?æ?¯>ï¼?é??å??ç§?人å°?話"
+#: ../libempathy-gtk/empathy-chat.c:830
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>: é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:820
-msgid "/nick <nickname>, change your nickname on current server"
-msgstr "/nick <網å??>ï¼?æ?´æ?¹å?¨ç?®å??伺æ??å?¨ä¸?ç??ä½ ç??網å??"
+#: ../libempathy-gtk/empathy-chat.c:833
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <網å??>: æ?´æ?¹å?¨ç?®å??伺æ??å?¨ä¸?ç??ä½ ç??網å??"
 
-#: ../libempathy-gtk/empathy-chat.c:823
-msgid "/me <message>, send an ACTION message to the current conversation"
-msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??å°?話中"
+#: ../libempathy-gtk/empathy-chat.c:836
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <è¨?æ?¯>: é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?話中"
 
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:839
 msgid ""
-"/say <message>, send <message> to the current conversation. This is used to "
+"/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chatroom\""
-msgstr "/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??å°?話中ã??é??ç?¨æ?¼å?³é??以ã??/ã??é??é ­ç??è¨?æ?¯ã??è??ä¾?ä¾?說ï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??天室ã??"
+"join a new chat room\""
+msgstr "/say <è¨?æ?¯>: é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?話中ã??é??ç?¨æ?¼å?³é??以ã??/ã??é??é ­ç??è¨?æ?¯ã??è??ä¾?ä¾?說ï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??天室ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:844
 msgid ""
-"/help [<command>], show all supported commands. If <command> is defined, "
+"/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
-msgstr "/help [<å?½ä»¤>]ï¼?顯示æ??æ??æ?¯æ?´ç??æ??令ã??å¦?æ??æ??å®?義é??å?? <å?½ä»¤> ç??話ï¼?便顯示å®?ç??ç?¨æ³?ã??"
+msgstr "/help [<å?½ä»¤>]: 顯示æ??æ??æ?¯æ?´ç??æ??令ã??å¦?æ??æ??å®?義é??å?? <å?½ä»¤> ç??話ï¼?便顯示å®?ç??ç?¨æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:841
+#: ../libempathy-gtk/empathy-chat.c:854
 #, c-format
 msgid "Usage: %s"
 msgstr "��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:870
+#: ../libempathy-gtk/empathy-chat.c:883
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:991
-msgid "Unknown command, see /help for the available commands"
-msgstr "æ?ªç?¥ç??æ??令ï¼?è«?å??è¦? /help 以å??å¾?å?¯ç?¨ç??æ??令"
+#: ../libempathy-gtk/empathy-chat.c:1004
+msgid "Unknown command; see /help for the available commands"
+msgstr "æ?ªç?¥ç??æ??令ï¼?è«?å??è¦? /help 以å??å¾?å?¯ç?¨ç??æ??令"
 
-#: ../libempathy-gtk/empathy-chat.c:1130
+#: ../libempathy-gtk/empathy-chat.c:1143
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1133
+#: ../libempathy-gtk/empathy-chat.c:1146
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1136
+#: ../libempathy-gtk/empathy-chat.c:1149
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1139
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1162
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1192
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1194
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:1554
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1608
+#: ../libempathy-gtk/empathy-chat.c:1647
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1626
-#: ../libempathy-gtk/empathy-ui-utils.c:1657
+#: ../libempathy-gtk/empathy-chat.c:1665
+#: ../libempathy-gtk/empathy-ui-utils.c:1658
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1660
+#: ../libempathy-gtk/empathy-chat.c:1699
 msgid "_Spelling Suggestions"
 msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1814
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已��"
@@ -1215,12 +1235,12 @@ msgstr "%s 已��"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1782
+#: ../libempathy-gtk/empathy-chat.c:1821
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢��"
 
-#: ../libempathy-gtk/empathy-chat.c:1785
+#: ../libempathy-gtk/empathy-chat.c:1824
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢���"
@@ -1228,17 +1248,17 @@ msgstr "%s 被踢���"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1793
+#: ../libempathy-gtk/empathy-chat.c:1832
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1796
+#: ../libempathy-gtk/empathy-chat.c:1835
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1839
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
@@ -1248,63 +1268,63 @@ msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1809
+#: ../libempathy-gtk/empathy-chat.c:1848
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1873
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-chat.c:1898
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��被稱� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1537
+#: ../libempathy-gtk/empathy-chat.c:2033 ../src/empathy-call-window.c:1531
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2521
+#: ../libempathy-gtk/empathy-chat.c:2568
 msgid "Wrong password; please try again:"
 msgstr "å¯?碼é?¯èª¤ï¼?è«?å??試ä¸?次:"
 
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2569
 msgid "Retry"
 msgstr "é??試"
 
-#: ../libempathy-gtk/empathy-chat.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2574
 msgid "This room is protected by a password:"
 msgstr "æ­¤è??天室已被å¯?碼ä¿?è­·:"
 
-#: ../libempathy-gtk/empathy-chat.c:2528
+#: ../libempathy-gtk/empathy-chat.c:2575
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2668
+#: ../libempathy-gtk/empathy-chat.c:2715
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:2721
-#: ../libempathy-gtk/empathy-log-window.c:546
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../libempathy-gtk/empathy-log-window.c:548
 msgid "Conversation"
 msgstr "�話"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:679
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:681
 msgid "Topic:"
 msgstr "主�:"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:817
+#: ../libempathy-gtk/empathy-theme-adium.c:823
 msgid "_Copy Link Address"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:824
+#: ../libempathy-gtk/empathy-theme-adium.c:830
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
@@ -1334,33 +1354,34 @@ msgstr "ç¨?å¾?å??決å®?"
 msgid "Subscription Request"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1557
+#: ../libempathy-gtk/empathy-contact-list-view.c:1512
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤ç¾£çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1559
+#: ../libempathy-gtk/empathy-contact-list-view.c:1514
 msgid "Removing group"
 msgstr "正�移�羣�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1606
-#: ../libempathy-gtk/empathy-contact-list-view.c:1683
+#: ../libempathy-gtk/empathy-contact-list-view.c:1561
+#: ../libempathy-gtk/empathy-contact-list-view.c:1638
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1636
+#: ../libempathy-gtk/empathy-contact-list-view.c:1591
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤è?¯çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1638
+#: ../libempathy-gtk/empathy-contact-list-view.c:1593
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:195
 #: ../src/empathy-main-window.ui.h:14
-msgid "_Add Contact..."
+msgid "_Add Contactâ?¦"
 msgstr "���絡人(_A)..."
 
 #: ../libempathy-gtk/empathy-contact-menu.c:222
@@ -1401,143 +1422,144 @@ msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:496
-#: ../src/empathy-chat-window.c:864
+#: ../src/empathy-chat-window.c:866
 msgid "Inviting you to this room"
 msgstr "é??è«?ä½ å?°é??å??è??天室"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:527
-msgid "_Invite to chatroom"
-msgstr "é??è«?å?°é??å??è??天室(_I)"
+msgid "_Invite to chat room"
+msgstr "é??è«?å?°è??天室(_I)"
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é?¸æ??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "å?²å­?å¤§é ­è²¼"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../libempathy-gtk/empathy-contact-widget.c:235
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1010
-#: ../src/empathy-main-window.c:1038
+#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../src/empathy-main-window.c:1042
 msgid "Group"
 msgstr "羣�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
+#: ../libempathy-gtk/empathy-contact-widget.c:476
 msgid "Country ISO Code:"
 msgstr "å??家 ISO 碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
+#: ../libempathy-gtk/empathy-contact-widget.c:478
 msgid "Country:"
 msgstr "å??家ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
+#: ../libempathy-gtk/empathy-contact-widget.c:480
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
+#: ../libempathy-gtk/empathy-contact-widget.c:482
 msgid "City:"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
+#: ../libempathy-gtk/empathy-contact-widget.c:484
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
+#: ../libempathy-gtk/empathy-contact-widget.c:486
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
+#: ../libempathy-gtk/empathy-contact-widget.c:488
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
+#: ../libempathy-gtk/empathy-contact-widget.c:490
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
+#: ../libempathy-gtk/empathy-contact-widget.c:492
 msgid "Floor:"
 msgstr "�層�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:494
 msgid "Room:"
 msgstr "室�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:496
 msgid "Text:"
 msgstr "æ??å­?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:498
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:500
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1287
+#: ../libempathy-gtk/empathy-contact-widget.c:502
 msgid "Accuracy Level:"
 msgstr "�確度���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1289
+#: ../libempathy-gtk/empathy-contact-widget.c:504
 msgid "Error:"
 msgstr "�誤�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1291
+#: ../libempathy-gtk/empathy-contact-widget.c:506
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·®ï¼?ç±³ï¼?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1293
+#: ../libempathy-gtk/empathy-contact-widget.c:508
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差�米��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1295
+#: ../libempathy-gtk/empathy-contact-widget.c:510
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1297
+#: ../libempathy-gtk/empathy-contact-widget.c:512
 msgid "Bearing:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1299
+#: ../libempathy-gtk/empathy-contact-widget.c:514
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1301
+#: ../libempathy-gtk/empathy-contact-widget.c:516
 msgid "Last Updated on:"
 msgstr "�次����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1303
+#: ../libempathy-gtk/empathy-contact-widget.c:518
 msgid "Longitude:"
 msgstr "�度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1305
+#: ../libempathy-gtk/empathy-contact-widget.c:520
 msgid "Latitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1307
+#: ../libempathy-gtk/empathy-contact-widget.c:522
 msgid "Altitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1368
-msgid "<b>Location</b>"
-msgstr "<b>ä½?ç½®</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "ä½?ç½®"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1381
+#: ../libempathy-gtk/empathy-contact-widget.c:600
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®<b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1431
+#: ../libempathy-gtk/empathy-contact-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:721
+msgid "Save Avatar"
+msgstr "å?²å­?å¤§é ­è²¼"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+msgid "Unable to save avatar"
+msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
@@ -1559,54 +1581,49 @@ msgid "Client:"
 msgstr "客�端:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1021
-msgid "Contact"
-msgstr "�絡人"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Contact Details"
 msgstr "è?¯çµ¡äººè©³ç´°è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "���件:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr "é?»å­?ä¿¡ç®±ä½?å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Full name:"
 msgstr "å?¨å??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Groups"
 msgstr "羣�"
 
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
 msgid "Identifier:"
 msgstr "���:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "����..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Information requested&#x2026;"
+msgstr "����&#x2026;"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr "è«?é?¸æ??é??å??è?¯çµ¡äººè¦?顯ç?¾å?¨å?ªå??ç¾£çµ?ã??注æ??ä½ å?¯ä»¥é?¸æ??ä¸?å??以ä¸?ç??ç¾£çµ?æ??ä¸?é?¸æ??ç¾£çµ?ã??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid "Version:"
 msgstr "ç??æ?¬:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+msgid "Website:"
 msgstr "網�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "_Add Group"
 msgstr "å? å?¥ç¾£çµ?(_G)"
 
@@ -1626,12 +1643,12 @@ msgstr "é?£æ?¥å? "
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../libempathy-gtk/empathy-log-window.c:541
 #: ../src/empathy-import-widget.c:310
 msgid "Account"
 msgstr "帳è??"
 
-#: ../libempathy-gtk/empathy-log-window.c:556
+#: ../libempathy-gtk/empathy-log-window.c:558
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1689,12 +1706,12 @@ msgstr "æ?°é??話"
 #. COL_TYPE
 #: ../libempathy-gtk/empathy-presence-chooser.c:167
 #: ../libempathy-gtk/empathy-presence-chooser.c:203
-msgid "Custom Message..."
+msgid "Custom Messageâ?¦"
 msgstr "����..."
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:220
 #: ../libempathy-gtk/empathy-presence-chooser.c:222
-msgid "Edit Custom Messages..."
+msgid "Edit Custom Messagesâ?¦"
 msgstr "編輯����..."
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:344
@@ -1715,9 +1732,21 @@ msgstr "設å®?ä½ ç??ä¸?ç·?è??ç?®å??ç??ç??æ??"
 
 #. Custom messages
 #: ../libempathy-gtk/empathy-presence-chooser.c:1083
-msgid "Custom messages..."
+msgid "Custom messagesâ?¦"
 msgstr "����..."
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "���"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "æ?¶å?°å?³æ??è¨?æ?¯"
@@ -1790,15 +1819,15 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1519
+#: ../libempathy-gtk/empathy-ui-utils.c:1520
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1649
+#: ../libempathy-gtk/empathy-ui-utils.c:1650
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1709
+#: ../libempathy-gtk/empathy-ui-utils.c:1710
 msgid "Select a destination"
 msgstr "é?¸å??ç?®ç??å?°"
 
@@ -1970,11 +1999,11 @@ msgid "Vietnamese"
 msgstr "è¶?å??æ??"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The contact selected cannot receive files."
+msgid "The selected contact cannot receive files."
 msgstr "æ??é?¸ç??è?¯çµ¡äººç?¡æ³?æ?¥æ?¶æª?æ¡?ã??"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The contact selected is offline."
+msgid "The selected contact is offline."
 msgstr "æ??é?¸ç??è?¯çµ¡äººå·²ç¶?é?¢ç·?ã??"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
@@ -1985,19 +2014,19 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:893
+#: ../src/empathy.c:762
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:897
+#: ../src/empathy.c:766
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?顯示è?¯çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?話çª?"
 
-#: ../src/empathy.c:901
+#: ../src/empathy.c:770
 msgid "Show the accounts dialog"
 msgstr "顯示帳è??å°?話ç??"
 
-#: ../src/empathy.c:913
+#: ../src/empathy.c:782
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??客æ?¶ç«¯"
 
@@ -2039,34 +2068,35 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
+#: ../src/empathy-account-assistant.c:165
+msgid "There was an error while importing the accounts."
 msgstr "å?¯å?¥å¸³è??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
+#: ../src/empathy-account-assistant.c:168
+msgid "There was an error while parsing the account details."
 msgstr "解æ??帳è??詳細è³?æ??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
+#: ../src/empathy-account-assistant.c:171
+msgid "There was an error while creating the account."
 msgstr "建ç«?帳è??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error."
 msgstr "æ??é?¯èª¤ç?¼ç??ã??"
 
-#: ../src/empathy-account-assistant.c:141
-#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "�誤���� <span style=\"italic\">%s</span>"
+#: ../src/empathy-account-assistant.c:177
+#, fuzzy, c-format
+msgid "The error message was: %s"
+msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 
-#: ../src/empathy-account-assistant.c:149
+#: ../src/empathy-account-assistant.c:181
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
 msgstr "ä½ å?¯ä»¥å??å?°å??é ?å??次輸å?¥å¸³è??ç??詳細è³?æ??æ??çµ?æ??æ­¤å?©ç??ï¼?ç¨?å¾?å??å¾?ã??編輯ã??é?¸å?®å? å?¥å¸³è??ã??"
 
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:218
+#: ../src/empathy-account-assistant.c:1241
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
@@ -2076,36 +2106,36 @@ msgstr "ç?¼ç??é?¯èª¤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:331 ../src/empathy-accounts-dialog.c:506
+#: ../src/empathy-account-assistant.c:395 ../src/empathy-accounts-dialog.c:552
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å¢? %s 帳è??"
 
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:472
 msgid "What kind of chat account do you have?"
 msgstr "ä½ ç??è??天帳è??æ?¯å?ªä¸?種ï¼?"
 
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:478
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "ä½ é??æ?³è¦?設å®?å?¶ä»?ç??è??天帳è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:415
+#: ../src/empathy-account-assistant.c:484
 msgid "Enter your account details"
 msgstr "è«?輸å?¥ä½ ç??帳è??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:420
+#: ../src/empathy-account-assistant.c:489
 msgid "What kind of chat account do you want to create?"
 msgstr "ä½ æ?³è¦?建ç«?ä½?種è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:426
+#: ../src/empathy-account-assistant.c:495
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?建ç«?å?¶ä»?è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:433
+#: ../src/empathy-account-assistant.c:502
 msgid "Enter the details for the new account"
 msgstr "è«?輸å?¥æ?°å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:617
 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 "
@@ -2113,54 +2143,90 @@ msgid ""
 "calls."
 msgstr "使ç?¨ Empathy å?¯ä»¥å?¨ç¶²ä¸?è·?é?°è¿?ç??人å?¡è??天ï¼?æ??æ?¯å??使ç?¨ Google Talkã??AIMã??Windows Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網絡æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?å??é??話ã??"
 
-#: ../src/empathy-account-assistant.c:536
+#: ../src/empathy-account-assistant.c:634
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "ä½ æ?¯å?¦æ??使ç?¨å?¶ä»?è??天ç¨?å¼?ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:559
+#: ../src/empathy-account-assistant.c:657
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??帳è??詳細è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:580
+#: ../src/empathy-account-assistant.c:678
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?輸å?¥å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:700
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:710
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:633
+#: ../src/empathy-account-assistant.c:731
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-account-assistant.c:815
 #: ../src/empathy-new-chatroom-dialog.c:541
 #: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:727
+#: ../src/empathy-account-assistant.c:822
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??樣"
 
-#: ../src/empathy-account-assistant.c:920
+#: ../src/empathy-account-assistant.c:1064
+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 "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1070
+#: ../src/empathy-account-assistant.c:1126
+#, fuzzy
+msgid "Edit->Accounts"
+msgstr "編輯帳è??"
+
+#: ../src/empathy-account-assistant.c:1086
+#, fuzzy
+msgid "I don't want to enable this feature for now"
+msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
+
+#: ../src/empathy-account-assistant.c:1122
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed.\n"
+"If you want to enable this feature, please install the telepathy-salut "
+"package\n"
+"and create a People Nearby account from the Accounts dialog "
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1128
+msgid "telepathy-salut not installed"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1205
 msgid "Welcome to Empathy"
 msgstr "歡�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:929
+#: ../src/empathy-account-assistant.c:1214
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??帳è??"
 
+#: ../src/empathy-account-assistant.c:1232
+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
 #, c-format
-msgid "There are unsaved modification regarding your %s account."
-msgstr "é??æ??è??ä½ ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
+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
@@ -2168,33 +2234,33 @@ msgstr "é??æ??è??ä½ ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å­?ä½ ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:232 ../src/empathy-call-window.c:729
-msgid "Connecting..."
+#: ../src/empathy-accounts-dialog.c:259 ../src/empathy-call-window.c:729
+msgid "Connectingâ?¦"
 msgstr "��中..."
 
-#: ../src/empathy-accounts-dialog.c:259
+#: ../src/empathy-accounts-dialog.c:286
 #, c-format
-msgid "Disconnected - %s"
-msgstr "已�� - %s"
+msgid "Disconnected â?? %s"
+msgstr "å·²æ?·ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:264
+#: ../src/empathy-accounts-dialog.c:291
 #, c-format
-msgid "Offline - %s"
-msgstr "�� - %s"
+msgid "Offline â?? %s"
+msgstr "é?¢ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:277
-msgid "Offline - No Network Connection"
-msgstr "�� - �網絡��"
+#: ../src/empathy-accounts-dialog.c:304
+msgid "Offline â?? No Network Connection"
+msgstr "é?¢ç·? â?? ç?¡ç¶²çµ¡é?£ç·?"
 
-#: ../src/empathy-accounts-dialog.c:285
+#: ../src/empathy-accounts-dialog.c:312
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç??ç??æ??"
 
-#: ../src/empathy-accounts-dialog.c:296
-msgid "Offline - Account disabled"
-msgstr "é?¢ç·? - 帳è??å·²å??ç?¨"
+#: ../src/empathy-accounts-dialog.c:323
+msgid "Offline â?? Account Disabled"
+msgstr "é?¢ç·? â?? 帳è??å·²å??ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:645
+#: ../src/empathy-accounts-dialog.c:720
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2202,16 +2268,16 @@ msgstr ""
 "ä½ å?³å°?建ç«?æ?°ç??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:934
+#: ../src/empathy-accounts-dialog.c:1054
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?ä½ ç??é?»è?¦ä¸?移é?¤ç¾£çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:938
+#: ../src/empathy-accounts-dialog.c:1058
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??移é?¤ä¼ºæ??å?¨ä¸?ç??ä½ ç??帳è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1120
+#: ../src/empathy-accounts-dialog.c:1286
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2219,7 +2285,7 @@ msgstr ""
 "ä½ å?³å°?建ç«?å?¦ä¸?å??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1537
+#: ../src/empathy-accounts-dialog.c:1829
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2227,31 +2293,34 @@ msgstr ""
 "ä½ å?³å°?é??é??é??å??è¦?çª?ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.ui.h:1
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:1956
 msgid "Accounts"
 msgstr "帳è??"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:1
 msgid "No protocol installed"
 msgstr "å°?æ?ªå®?è£?é??è¨?å??å®?"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Protocol:"
 msgstr "å??å®?ï¼?"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "è¦?å? å?¥æ?°ç??帳è??ï¼?ä½ å¿?é ?å??å®?è£?æ¯?å??æ??ç?¨å?°ç??é??è¨?å??å®?å¾?端ç¨?å¼?ã??"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add..."
-msgstr "å? å?¥(_A)..."
+#: ../src/empathy-accounts-dialog.ui.h:4
+#, fuzzy
+msgid "_Add&#x2026;"
+msgstr "å? å?¥(_A)&#x2026;"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Import..."
-msgstr "��...(_I)"
+#: ../src/empathy-accounts-dialog.ui.h:5
+#, fuzzy
+msgid "_Import&#x2026;"
+msgstr "��(_I)&#x2026;"
 
 #: ../src/empathy-call-window.c:453
 msgid "Contrast"
@@ -2299,67 +2368,67 @@ msgid "Call"
 msgstr "é??話"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1700
+#: ../src/empathy-call-window.c:1694
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:1761
+#: ../src/empathy-call-window.c:1755
 msgid "Technical Details"
 msgstr "æ??è¡?ç´°ç¯?"
 
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:1793
 #, 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:1804
+#: ../src/empathy-call-window.c:1798
 #, 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:1810
+#: ../src/empathy-call-window.c:1804
 #, 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:1816
+#: ../src/empathy-call-window.c:1810
 msgid "There was a failure on the network"
 msgstr "é??å??網絡ä¸?æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:1820
+#: ../src/empathy-call-window.c:1814
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??é?³è¨?æ ¼å¼?å°?æ?ªå?¨ä½ ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:1823
+#: ../src/empathy-call-window.c:1817
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??è¦?å??æ ¼å¼?å°?æ?ªå?¨ä½ ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:1833
+#: ../src/empathy-call-window.c:1827
 #, c-format
 msgid ""
-"Something not expected happened in a Telepathy component. Please <a href=\"%s"
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
-msgstr "å?¨ Telepathy å??件中ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å?¯å ±é??å??é?¯èª¤</a>並é??ä¸?å¾?æ±?å?©é?¸å?®ç??ã??é?¤é?¯ã??è¦?çª?中æ?¶é??ç??ç´?é??ã??"
+msgstr "å?¨ Telepathy å??件中ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å?¯å ±é??å??é?¯èª¤</a>並é??ä¸?å¾?æ±?å?©é?¸å?®å?§ç??ã??é?¤é?¯ã??è¦?çª?中æ??æ?¶é??ç??ç´?é??ã??"
 
-#: ../src/empathy-call-window.c:1841
+#: ../src/empathy-call-window.c:1835
 msgid "There was a failure in the call engine"
 msgstr "é??話å¼?æ??å?§æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:1880
+#: ../src/empathy-call-window.c:1874
 msgid "Can't establish audio stream"
 msgstr "��建���串�"
 
-#: ../src/empathy-call-window.c:1890
+#: ../src/empathy-call-window.c:1884
 msgid "Can't establish video stream"
 msgstr "ç?¡æ³?建ç«?è¦?å??串æµ?"
 
@@ -2431,31 +2500,31 @@ msgstr "è¦?å??é ?覽"
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
+#: ../src/empathy-chat-window.c:437 ../src/empathy-chat-window.c:457
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:447
+#: ../src/empathy-chat-window.c:449
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (è?? %u å?¶ä»?ç??)"
 
-#: ../src/empathy-chat-window.c:463
+#: ../src/empathy-chat-window.c:465
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä¾?è?ªå?¶ä»?人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:474
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ä¾?è?ªæ??æ??人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:683
+#: ../src/empathy-chat-window.c:685
 msgid "Typing a message."
 msgstr "æ­£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -2476,8 +2545,8 @@ msgid "Insert _Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??(_S)"
 
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant..."
-msgstr "é??è«?å??è??...(_P)"
+msgid "Invite _Participantâ?¦"
+msgstr "é??è«?å??è??(_P)..."
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -2500,7 +2569,7 @@ msgid "_Detach Tab"
 msgstr "å??é?¢å??é ?(_D)"
 
 #: ../src/empathy-chat-window.ui.h:12
-msgid "_Favorite Chatroom"
+msgid "_Favorite Chat Room"
 msgstr "å??好ç??è??天室(_F)"
 
 #: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
@@ -2539,89 +2608,76 @@ msgstr "è?ªå??é?£ç·?"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??å??好ç??è??天室"
 
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:339
 msgid "Incoming video call"
 msgstr "å?³å?¥ç??è¦?å??é??話"
 
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:339
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:349
+#: ../src/empathy-event-manager.c:343
 #, c-format
-msgid "%s is video calling you, do you want to answer?"
-msgstr "%s è¦?è??ä½ é?²è¡?è¦?å??é??話ï¼?æ?¯å?¦è¦?æ?¥è?½ï¼?"
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s è¦?è??ä½ é?²è¡?è¦?å??é??話ã??ä½ æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:350
+#: ../src/empathy-event-manager.c:344
 #, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s è¦?è??ä½ é??話ï¼?æ?¯å?¦è¦?æ?¥è?½ï¼?"
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s è¦?è??ä½ é?²è¡?é??話ã??ä½ æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:366
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:378
+#: ../src/empathy-event-manager.c:372
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:495
+#: ../src/empathy-event-manager.c:489
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "ä¾?è?ª %s ç??è¦?å??é?»è©±"
 
-#: ../src/empathy-event-manager.c:495
+#: ../src/empathy-event-manager.c:489
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:541
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s æ­£å?¨é??è«?ä½ "
-
-#: ../src/empathy-event-manager.c:547
-msgid "An external application will be started to handle it."
-msgstr "å°?å??å??å¤?é?¨æ??ç?¨ç¨?å¼?ä¾?è??ç??å®?ã??"
-
-#: ../src/empathy-event-manager.c:552
-msgid "You don't have the needed external application to handle it."
-msgstr "ä½ æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨æ??ç?¨ç¨?å¼?ã??"
-
-#: ../src/empathy-event-manager.c:680
+#: ../src/empathy-event-manager.c:579
 msgid "Room invitation"
 msgstr "è??天é??è«?"
 
-#: ../src/empathy-event-manager.c:683
+#: ../src/empathy-event-manager.c:582
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£å?¨é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:691
+#: ../src/empathy-event-manager.c:590
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:696
+#: ../src/empathy-event-manager.c:595
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:735
+#: ../src/empathy-event-manager.c:634
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?ä½ å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:660
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:941
+#: ../src/empathy-event-manager.c:818
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:822
 #, c-format
 msgid ""
 "\n"
@@ -2631,13 +2687,13 @@ msgstr ""
 "���%s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:985
+#: ../src/empathy-event-manager.c:862
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:1001
+#: ../src/empathy-event-manager.c:878
 #, c-format
 msgid "%s is now online."
 msgstr "%s ç?¾å?¨ä¸?ç·?ã??"
@@ -2781,19 +2837,23 @@ msgstr "��"
 msgid "%s account"
 msgstr "%s 帳è??"
 
-#: ../src/empathy-main-window.c:431
+#: ../src/empathy-main-window.c:430
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:438
+#: ../src/empathy-main-window.c:436
 msgid "Edit Account"
 msgstr "編輯帳è??"
 
-#: ../src/empathy-main-window.c:445
+#: ../src/empathy-main-window.c:442
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1331
+#: ../src/empathy-main-window.c:1025
+msgid "Contact"
+msgstr "�絡人"
+
+#: ../src/empathy-main-window.c:1363
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳è??"
 
@@ -2807,7 +2867,7 @@ msgstr "è?¯çµ¡äººå?°å??(_M)"
 
 #: ../src/empathy-main-window.ui.h:3
 msgid "Context"
-msgstr "è??絡"
+msgstr "é?¸é ?"
 
 #: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
@@ -2822,12 +2882,12 @@ msgid "N_ormal Size"
 msgstr "正常大�(_O)"
 
 #: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call..."
-msgstr "æ?°é??話...(_C)"
+msgid "New _Callâ?¦"
+msgstr "æ?°é??話(_C)..."
 
 #: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
-msgstr "正常大å°?å? å¤§é ­è²¼(_A)"
+msgstr "正常大å°?è??å¤§é ­è²¼(_A)"
 
 #: ../src/empathy-main-window.ui.h:9
 msgid "P_references"
@@ -2862,11 +2922,11 @@ msgid "_File Transfers"
 msgstr "���輸(_F)"
 
 #: ../src/empathy-main-window.ui.h:22
-msgid "_Join..."
+msgid "_Joinâ?¦"
 msgstr "å? å?¥(_J)..."
 
 #: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation..."
+msgid "_New Conversationâ?¦"
 msgstr "���話(_N)..."
 
 #: ../src/empathy-main-window.ui.h:24
@@ -2889,15 +2949,15 @@ msgstr "è??天室"
 msgid "Members"
 msgstr "æ??å?¡"
 
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
 #: ../src/empathy-new-chatroom-dialog.c:539
 #, c-format
-msgctxt ""
 msgid ""
 "<b>%s</b>\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no and a number."
 msgstr ""
 "<b>%s</b>\n"
 "é??è¦?é??è«?ï¼?%s\n"
@@ -3020,10 +3080,6 @@ msgstr "å??ç?¨æ?¼å­?檢æ?¥ç¨?å¼?èª?è¨?ï¼?"
 msgid "General"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:12
-msgid "Location"
-msgstr "ä½?ç½®"
-
 #: ../src/empathy-preferences.ui.h:13
 msgid "Location sources:"
 msgstr "�置���"
@@ -3094,8 +3150,8 @@ msgid "_GPS"
 msgstr "GPS(_G)"
 
 #: ../src/empathy-preferences.ui.h:29
-msgid "_Network (IP, Wifi)"
-msgstr "網絡�IP, Wifi�(_N)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "網絡�IP, Wi-Fi�(_N)"
 
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
@@ -3109,7 +3165,7 @@ msgstr "å°?æ??ç??è?¯çµ¡äººå?¬é??ä½?ç½®(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®æº?確度(_R)"
 
-#: ../src/empathy-status-icon.c:179
+#: ../src/empathy-status-icon.c:175
 msgid "Respond"
 msgstr "å??æ??"
 
@@ -3121,18 +3177,6 @@ msgstr "ç??æ??"
 msgid "_Quit"
 msgstr "çµ?æ??(_Q)"
 
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "ç?¡æ³?å??å??æ??å?? %s ç??æ??ç?¨ç¨?å¼?ï¼?%s"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr "æ??æ??å?ºæ??å?? %s ç??é??è«?ï¼?ä½?æ?¯ä½ æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨æ??ç?¨ç¨?å¼?ã??"
-
 #: ../src/empathy-map-view.ui.h:1
 msgid "Contact Map View"
 msgstr "è?¯çµ¡äººå?°å??檢è¦?"
@@ -3199,96 +3243,27 @@ msgid ""
 "extension."
 msgstr "é?¸å??ç??é?£ç·?管ç??ç¨?å¼?ä¸?æ?¯æ?´é? 端å?µé?¯æ?´å??å??è?½ã??"
 
-#~ msgid "Can't set an empty display name"
-#~ msgstr "ä¸?è?½è¨­å®?空ç?½ç??顯示å??稱"
-
-#~ msgid "Unsupported command"
-#~ msgstr "ä¸?æ?¯æ?´æ­¤æ??令"
-
-#~ msgid "_View Previous Conversations"
-#~ msgstr "檢è¦?å??ä¸?次è«?話(_V)"
-
-#~ msgid "C_all"
-#~ msgstr "é??話(_A)"
-
-#~ msgid ""
-#~ "The contact to display in the applet. Empty means no contact is displayed."
-#~ msgstr "è¦?å?¨é?¢æ?¿ç¨?å¼?中顯示ç??é?£çµ¡äººã??ç??空代表ä¸?顯示é?£çµ¡äººã??"
-
-#~ msgid "The contact's avatar token. Empty means contact has no avatar."
-#~ msgstr "æ­¤é?£çµ¡äººç??å¤§é ­è²¼è¨?è??ã??ç??空代表é?£çµ¡äººæ²?æ??å¤§é ­è²¼ã??"
-
-#~ msgid "Talk!"
-#~ msgstr "�話�"
-
-#~ msgid "_Information"
-#~ msgstr "��(_I)"
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "é??è«?å??è??"
 
-#~ msgid "_Preferences"
-#~ msgstr "å??好設å®?(_P)"
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "é?¸æ??æ?³è¦?é??è«?é?²å?¥è«?話ç??è?¯çµ¡äººï¼?"
 
-#~ msgid "Please configure a contact."
-#~ msgstr "è«?設å®?é?£çµ¡äººã??"
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "�誤���� <span style=\"italic\">%s</span>"
 
-#~ msgid "Select contact..."
-#~ msgstr "é?¸æ??é?£çµ¡äºº..."
+#~ msgid "Hidden"
+#~ msgstr "é?±è??"
 
-#~ msgid "Presence"
-#~ msgstr "ä¸?ç·?ç??æ??"
+#~ msgid "User requested disconnect"
+#~ msgstr "é?£æ?¥ä¸?ä¸?è¦?æ±?ç??使ç?¨è??"
 
-#~ msgid "Set your own presence"
-#~ msgstr "設å®?æ?¨è?ªå·±ç??ä¸?ç·?ç??æ??"
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>ä½?ç½®</b>"
 
-#~ msgid ""
-#~ "You are about to remove your %s account!\n"
-#~ "Are you sure you want to proceed?"
-#~ msgstr ""
-#~ "æ?¨å?³å°?移é?¤æ?¨ç?? %s 帳è??ï¼?\n"
-#~ "確��繼��"
-
-#~ msgid ""
-#~ "Any associated conversations and chat rooms will NOT be removed if you "
-#~ "decide to proceed.\n"
-#~ "\n"
-#~ "Should you decide to add the account back at a later time, they will "
-#~ "still be available."
-#~ msgstr ""
-#~ "å¦?æ??æ?¨æ±ºå®?è¦?ç¹¼çº?ï¼?ä»»ä½?ç?¸é??ç??è«?話å??è??天室並ä¸?æ??被移é?¤ã??\n"
-#~ "\n"
-#~ "ç?¶æ?¨å¾?å¾?決å®?è¦?å°?該帳è??é??æ?°å? å?¥æ??ï¼?ä¸?è¿°è³?æº?å°?ä»?ç?¶å?¯ä»¥å??ç?¨ã??"
-
-#~ msgid "Add new"
-#~ msgstr "å? å?¥æ?°ç??"
-
-#~ msgid "Cr_eate"
-#~ msgstr "建�(_E)"
-
-#~ msgid "_Reuse an existing account"
-#~ msgstr "é??è¤?使ç?¨æ?¢å­?ç??帳è??(_R)"
-
-#~ msgid "account"
-#~ msgstr "帳è??"
-
-#~ msgid "Conversations (%d)"
-#~ msgstr "�話 (%d)"
-
-#~ msgid "_Contact"
-#~ msgstr "�絡人(_C)"
-
-#~ msgid "No error specified"
-#~ msgstr "æ²?æ??æ??å®?ç??é?¯èª¤"
-
-#~ msgid "Unknown error"
-#~ msgstr "ä¸?æ??ç??é?¯èª¤"
-
-#~ msgid "Allow _GPS usage"
-#~ msgstr "å??許使ç?¨ _GPS"
-
-#~ msgid "Allow _cellphone usage"
-#~ msgstr "å??許使ç?¨è¡?å??é?»è©±(_C)"
-
-#~ msgid "Allow _network usage"
-#~ msgstr "å??許使ç?¨ç¶²è·¯(_N)"
-
-#~ msgid "Geoclue Settings"
-#~ msgstr "Geoclue 設��"
+#, fuzzy
+#~ msgid "_Addâ?¦"
+#~ msgstr "å? å?¥(_A)..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 80b437c..b5dbaf5 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.28.0\n"
+"Project-Id-Version: empathy 2.29.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-01 15:02+0800\n"
-"PO-Revision-Date: 2010-01-01 10:59+0800\n"
+"POT-Creation-Date: 2010-01-26 05:54+0800\n"
+"PO-Revision-Date: 2010-01-23 00:17+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n lists linux org tw>\n"
 "MIME-Version: 1.0\n"
@@ -49,9 +49,10 @@ msgid "Chat window theme"
 msgstr "è??天è¦?çª?ä½?æ?¯ä¸»é¡?"
 
 #: ../data/empathy.schemas.in.h:4
+#, fuzzy
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr "è¦?使ç?¨æ?¼å­?檢æ?¥ç??èª?è¨?æ¸?å?®ï¼?以é??è??å??é??ï¼?å¦? en,fr,nlï¼?ã??"
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "以é??è??å??é??è¦?使ç?¨æ?¼å­?檢æ?¥ç??èª?è¨?æ¸?å?®ï¼?å¦?ï¼?ã?? en,fr,nlã??ï¼?ã??"
 
 #: ../data/empathy.schemas.in.h:5
 msgid "Compact contact list"
@@ -150,12 +151,12 @@ msgid "Open new chats in separate windows"
 msgstr "å?¨å??å?¥è¦?çª?é??å??æ?°ç??è??天"
 
 #: ../data/empathy.schemas.in.h:29
-msgid "Path of the adium theme to use"
-msgstr "è¦?使ç?¨ç?? adium ä½?æ?¯ä¸»é¡?è·¯å¾?"
+msgid "Path of the Adium theme to use"
+msgstr "è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?"
 
 #: ../data/empathy.schemas.in.h:30
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "å¦?æ??è??天室使ç?¨ç??主é¡?æ?¯ adium æ??è¦?使ç?¨ç?? adium ä½?æ?¯ä¸»é¡?è·¯å¾?ã??"
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "å¦?æ??è??天室使ç?¨ç??主é¡?æ?¯ Adium æ??è¦?使ç?¨ç?? Adium ä½?æ?¯ä¸»é¡?è·¯å¾?ã??"
 
 #: ../data/empathy.schemas.in.h:31
 msgid "Play a sound for incoming messages"
@@ -186,15 +187,15 @@ msgid "Play a sound when we log out"
 msgstr "ç?¶æ??å??ç?»å?ºæ??æ?­æ?¾é?³æ??"
 
 #: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications if the chat isn't focused"
+msgid "Pop up notifications if the chat isn't focused"
 msgstr "å¦?æ??è??天è¦?çª?失å?»ç?¦é»?å??å½?å?ºé??ç?¥"
 
 #: ../data/empathy.schemas.in.h:39
-msgid "Popup notifications when a contact sign in"
+msgid "Pop up notifications when a contact logs in"
 msgstr "ç?¶é?£çµ¡äººç?»å?¥æ??å½?å?ºé??ç?¥"
 
 #: ../data/empathy.schemas.in.h:40
-msgid "Popup notifications when a contact sign out"
+msgid "Pop up notifications when a contact logs out"
 msgstr "ç?¶é?£çµ¡äººç?»å?ºæ??å½?å?ºé??ç?¥"
 
 #: ../data/empathy.schemas.in.h:41
@@ -250,194 +251,214 @@ msgid "Use theme for chat rooms"
 msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
 #: ../data/empathy.schemas.in.h:54
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr "æ?¯å?¦å??ç?¨ WebKit é??ç?¼è??å·¥å?·ï¼?ä¾?å¦? Web Inspectorã??"
+#, fuzzy
+msgid "Whether Empathy can publish the user's location to their contacts."
+msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??é?£çµ¡äººã??"
 
 #: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can publish the user's location to his contacts."
-msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??é?£çµ¡äººã??"
+#, fuzzy
+msgid "Whether Empathy can use the GPS to guess the location."
+msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:56
-msgid "Whether or not Empathy can use the GPS to guess the location."
-msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
+#, fuzzy
+msgid "Whether Empathy can use the cellular network to guess the location."
+msgstr "Empathy æ?¯å?¦ä½¿ç?¨è¡?å??é?»è©±ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:57
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
-msgstr "Empathy æ?¯å?¦ä½¿ç?¨è¡?å??é?»è©±ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
+#, fuzzy
+msgid "Whether Empathy can use the network to guess the location."
+msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:58
-msgid "Whether or not Empathy can use the network to guess the location."
-msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
+#, fuzzy
+msgid "Whether Empathy has asked about importing accounts from other programs."
+msgstr "Empathy æ?¯å?¦æ??è©¢å??æ?¨è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
 
 #: ../data/empathy.schemas.in.h:59
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "Empathy æ?¯å?¦æ??è©¢å??æ?¨è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
+#, fuzzy
+msgid "Whether Empathy should automatically log into your accounts on startup."
+msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥æ?¨ç??帳è??ã??"
 
 #: ../data/empathy.schemas.in.h:60
+#, fuzzy
 msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
-msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥æ?¨ç??帳è??ã??"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy æ?¯å?¦å?ºæ?¼é?±ç§?ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
 
 #: ../data/empathy.schemas.in.h:61
+#, fuzzy
 msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr "Empathy æ?¯å?¦å?ºæ?¼é?±ç§?æ¬?ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
+"Whether Empathy should use the avatar of the contact as the chat window icon."
+msgstr "Empathy æ?¯å?¦ä½¿ç?¨é?£çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
 
 #: ../data/empathy.schemas.in.h:62
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
-msgstr "Empathy æ?¯å?¦ä½¿ç?¨é?£çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "æ?¯å?¦å??ç?¨ WebKit é??ç?¼è??å·¥å?·ï¼?ä¾?å¦? Web Inspectorã??"
 
 #: ../data/empathy.schemas.in.h:63
+#, fuzzy
 msgid ""
-"Whether or not connectivity managers should be used to automatically "
-"disconnect/reconnect."
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
 msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?/é??æ?°é?£ç·?ã??"
 
 #: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
+#, fuzzy
+msgid "Whether the Salut account has been created on the first Empathy run."
 msgstr "æ?¯å?¦å?¨ Empathy 第ä¸?次å?·è¡?æ??建ç«? Salut 帳è??ã??"
 
 #: ../data/empathy.schemas.in.h:65
+#, fuzzy
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr "æ?¯å?¦ä»¥æ?¨è¨­å®?ç??èª?è¨?檢æ?¥è¼¸å?¥æ??ç?¡é?¯å­?ã??"
 
 #: ../data/empathy.schemas.in.h:66
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
+#, fuzzy
+msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "å?¨è«?話中æ?¯å?¦å°?表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
 
 #: ../data/empathy.schemas.in.h:67
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+#, fuzzy
+msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é?£çµ¡äººç?»å?¥ç¶²è·¯ã??"
 
 #: ../data/empathy.schemas.in.h:68
+#, fuzzy
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é?£çµ¡äººç?»å?ºç¶²è·¯ã??"
 
 #: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for events."
+#, fuzzy
+msgid "Whether to play a sound to notify of events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
 #: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯æ?µé??ã??"
+#, fuzzy
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??æ?¶å?°è¨?æ?¯ã??"
 
 #: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound to notify for new conversations."
+#, fuzzy
+msgid "Whether to play a sound to notify of new conversations."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥é??å??æ?°ç??è«?話ã??"
 
 #: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è¨?æ?¯é??å?ºã??"
+#, fuzzy
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é??å?ºè¨?æ?¯ã??"
 
 #: ../data/empathy.schemas.in.h:73
-msgid "Whether or not to play a sound when logging in a network."
-msgstr "ç?¶ç?»å?¥ç¶²è·¯æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
+#, fuzzy
+msgid "Whether to play a sound when logging into a network."
+msgstr "ç?¶ç?»å?¥æ??網路æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
 #: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "ç?¶ç?»å?ºç¶²è·¯æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
+#, fuzzy
+msgid "Whether to play a sound when logging out of a network."
+msgstr "ç?¶ç?»å?ºæ??網路æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
 #: ../data/empathy.schemas.in.h:75
-msgid "Whether or not to play sound notifications when away or busy."
+#, fuzzy
+msgid "Whether to play sound notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦æ?­æ?¾é?³æ??é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:76
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#, fuzzy
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ç?¶é?£çµ¡äººé?¢ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:77
-msgid "Whether or not to show a popup notification when a contact goes online."
+#, fuzzy
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ç?¶é?£çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:78
+#, fuzzy
 msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 msgstr "æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ï¼?å?³ä½¿å·²é??å??è??天è¦?çª?ï¼?ä½?æ²?æ??ç?²å¾?ç?¦é»?ï¼?ã??"
 
 #: ../data/empathy.schemas.in.h:79
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#, fuzzy
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ç?¶æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:80
+#, fuzzy
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "æ?¯å?¦å?¨é?£çµ¡äººæ¸?å?®è??è??天è¦?çª?顯示é?£çµ¡äººå¤§é ­è²¼ã??"
 
 #: ../data/empathy.schemas.in.h:81
-msgid "Whether or not to show contacts that are offline in the contact list."
+#, fuzzy
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦å?¨é?£çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??é?£çµ¡äººã??"
 
 #: ../data/empathy.schemas.in.h:82
-msgid "Whether or not to show popup notifications when away or busy."
+#, fuzzy
+msgid "Whether to show popup notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:83
-msgid "Whether or not to show protocols for contacts in the contact list."
+#, fuzzy
+msgid "Whether to show protocols for contacts in the contact list."
 msgstr "æ?¯å?¦è¦?顯示è?¯çµ¡äººæ¸?å?®å?§ç??è?¯çµ¡äººä½¿ç?¨å??å®?ã??"
 
 #: ../data/empathy.schemas.in.h:84
-msgid "Whether or not to show the contact list in chat rooms."
+#, fuzzy
+msgid "Whether to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室中顯示é?£çµ¡äººæ¸?å?®ã??"
 
 #: ../data/empathy.schemas.in.h:85
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
-msgstr "使ç?¨æ¨?é¡?å??ç??ã??xã??æ??é??é??é??主è¦?çª?æ??æ?¯å?¦é¡¯ç¤ºè¨?æ?¯ã??"
+#, fuzzy
+msgid "Whether to show the contact list in compact mode."
+msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示é?£çµ¡äººæ¸?å?®ã??"
 
 #: ../data/empathy.schemas.in.h:86
-msgid "Whether to show the contact list in compact mode or not."
-msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示é?£çµ¡äººæ¸?å?®ã??"
+#, fuzzy
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "æ?¯å?¦å?¨ä½¿ç?¨æ¨?é¡?å??ç??ã??xã??æ??é??é??é??主è¦?çª?æ??ï¼?顯示è¨?æ?¯å°?話çª?ã??"
 
 #: ../data/empathy.schemas.in.h:87
-msgid "Whether to use the theme for chat rooms or not."
+#, fuzzy
+msgid "Whether to use the theme for chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
 
 #: ../data/empathy.schemas.in.h:88
+#, fuzzy
 msgid ""
-"Which criterion to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"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 "
+"the contact list by state."
 msgstr ""
-"æ??åº?é?£çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æº?å??ã??é ?設å?¼æ?¯ä½¿ç?¨é?£çµ¡äººç??å??稱ã??nameã??æ?¸å?¼ä¾?æ??åº?ã??"
-"è??æ?¸å?¼ã??stateã??å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?é?£çµ¡äººæ¸?å?®ã??"
+"æ??åº?é?£çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æº?å??ã??é ?設å?¼æ?¯ä½¿ç?¨é?£çµ¡äººç??å??稱ã??nameã??å?¼ä¾?æ??åº?ã??è??"
+"ã??stateã??å?¼å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?é?£çµ¡äººæ¸?å?®ã??"
 
-#: ../libempathy/empathy-ft-handler.c:839
+#: ../libempathy/empathy-ft-handler.c:840
 msgid "The hash of the received file and the sent one do not match"
 msgstr "å·²æ?¥æ?¶æª?æ¡?ç??é??æ¹?å?¼è??é??å?ºç??ä¸?符"
 
-#: ../libempathy/empathy-ft-handler.c:1099
+#: ../libempathy/empathy-ft-handler.c:1100
 msgid "File transfer not supported by remote contact"
 msgstr "é? 端é?£çµ¡äººä¸?æ?¯æ?´æª?æ¡?å?³è¼¸"
 
-#: ../libempathy/empathy-ft-handler.c:1157
+#: ../libempathy/empathy-ft-handler.c:1158
 msgid "The selected file is not a regular file"
 msgstr "é?¸å??ç??æª?æ¡?ä¸?æ?¯æ­£è¦?ç??æª?æ¡?"
 
-#: ../libempathy/empathy-ft-handler.c:1166
+#: ../libempathy/empathy-ft-handler.c:1167
 msgid "The selected file is empty"
 msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 
-#: ../libempathy/empathy-tp-contact-list.c:834 ../src/empathy.c:293
+#: ../libempathy/empathy-tp-contact-list.c:834
+#: ../src/empathy-auto-salut-account-helper.c:96
 msgid "People nearby"
 msgstr "��人�"
 
@@ -486,7 +507,7 @@ msgid "Away"
 msgstr "é?¢é??"
 
 #: ../libempathy/empathy-utils.c:245
-msgid "Hidden"
+msgid "Invisible"
 msgstr "é?±è??"
 
 #: ../libempathy/empathy-utils.c:247
@@ -498,8 +519,8 @@ msgid "No reason specified"
 msgstr "æ²?æ??æ??å®?å??å? "
 
 #: ../libempathy/empathy-utils.c:288
-msgid "User requested disconnect"
-msgstr "é?£æ?¥ä¸?ä¸?è¦?æ±?ç??使ç?¨è??"
+msgid "Status is set to offline"
+msgstr "ç??æ??設ç?ºé?¢ç·?"
 
 #: ../libempathy/empathy-utils.c:290
 msgid "Network error"
@@ -611,11 +632,11 @@ msgstr "��"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1320
+#: ../libempathy-gtk/empathy-account-widget.c:1329
 msgid "L_og in"
 msgstr "��(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1387
+#: ../libempathy-gtk/empathy-account-widget.c:1396
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -623,15 +644,15 @@ msgstr "��(_O)"
 msgid "Account:"
 msgstr "帳è??ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1398
+#: ../libempathy-gtk/empathy-account-widget.c:1407
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1460
+#: ../libempathy-gtk/empathy-account-widget.c:1472
 msgid "This account already exists on the server"
 msgstr "此帳è??å·²ç¶?å­?å?¨é??å??伺æ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1463
+#: ../libempathy-gtk/empathy-account-widget.c:1475
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??伺æ??å?¨ä¸?建ç«?æ?°ç??帳è??"
 
@@ -640,25 +661,25 @@ msgstr "å?¨é??å??伺æ??å?¨ä¸?建ç«?æ?°ç??帳è??"
 #. * like: "MyUserName on chat.freenode.net".
 #. * You should reverse the order of these arguments if the
 #. * server should come before the login id in your locale.
-#: ../libempathy-gtk/empathy-account-widget.c:1846
+#: ../libempathy-gtk/empathy-account-widget.c:1858
 #, c-format
 msgid "%1$s on %2$s"
 msgstr "%2$s ç?? %1$s"
 
 #. To translators: The parameter is the protocol name. The resulting
 #. * string will be something like: "Jabber Account"
-#: ../libempathy-gtk/empathy-account-widget.c:1864
+#: ../libempathy-gtk/empathy-account-widget.c:1876
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1868
+#: ../libempathy-gtk/empathy-account-widget.c:1880
 msgid "New account"
 msgstr "æ?°å¢?帳è??"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> MyScreenName</span>"
-msgstr "<span size=\"small\"><b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??稱</span>"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??稱"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
@@ -667,7 +688,7 @@ msgstr "<span size=\"small\"><b>ç¯?ä¾?ï¼?</b> æ??ç??è?¢å¹?å??稱</span>"
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
 msgid "Advanced"
 msgstr "é?²é??"
@@ -677,7 +698,7 @@ msgstr "é?²é??"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "�碼(_W):"
@@ -715,8 +736,8 @@ msgstr "伺æ??å?¨(_S):"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> username</span>"
-msgstr "<span size=\"small\"><b>ç¯?ä¾?ï¼?</b> 使ç?¨è??å??稱</span>"
+msgid "<b>Example:</b> username"
+msgstr "<b>ç¯?ä¾?ï¼?</b> 使ç?¨è??å??稱"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
@@ -733,8 +754,8 @@ msgid "What is your GroupWise password?"
 msgstr "æ?¨ç?? GroupWise å¯?碼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> 123456789</span>"
-msgstr "<span size=\"small\"><b>���</b> 123456789</span>"
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>���</b> 123456789"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
 msgid "ICQ _UIN:"
@@ -750,8 +771,8 @@ msgstr "æ?¨ç?? ICQ å¯?碼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
-msgid "_Charset:"
-msgstr "編碼(_C):"
+msgid "_Character set:"
+msgstr "å­?é??(_C)ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.c:244
 msgid "New Network"
@@ -791,8 +812,8 @@ msgid "None"
 msgstr "ç?¡"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
-msgstr "編碼:"
+msgid "Character set:"
+msgstr "å­?é??ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
@@ -823,12 +844,12 @@ msgid "Servers"
 msgstr "伺æ??å?¨"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user gmail com</span>"
-msgstr "<span size=\"small\"><b>���</b> user gmail com</span>"
+msgid "<b>Example:</b> user gmail com"
+msgstr "<b>���</b> user gmail com"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-msgid "<span size=\"small\"><b>Example:</b> user jabber org</span>"
-msgstr "<span size=\"small\"><b>���</b> user jabber org</span>"
+msgid "<b>Example:</b> user jabber org"
+msgstr "<b>���</b> user jabber org"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Override server settings"
@@ -879,20 +900,20 @@ msgid "_Ignore SSL certificate errors"
 msgstr "忽ç?¥ SSL æ??è­?é?¯èª¤(_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-msgid "<span size=\"small\"><b>Example:</b> user hotmail com</span>"
-msgstr "<span size=\"small\"><b>���</b> user hotmail com</span>"
+msgid "<b>Example:</b> user hotmail com"
+msgstr "<b>���</b> user hotmail com"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
-msgid "What is your Windows Live password?"
-msgstr "æ?¨ç?? Windows Live å¯?碼æ?¯ï¼?"
+msgid "What is your Windows Live ID?"
+msgstr "æ?¨ç?? Windows Live ID æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
-msgid "What is your Windows Live user name?"
-msgstr "æ?¨ç?? Windows Live 使ç?¨è??å??稱æ?¯ï¼?"
+msgid "What is your Windows Live password?"
+msgstr "æ?¨ç?? Windows Live å¯?碼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
-msgid "_Email:"
-msgstr "���件(_E):"
+msgid "_E-mail address:"
+msgstr "é?»å­?é?µä»¶ä½?å??(_E):"
 
 #: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
 msgid "_First Name:"
@@ -915,70 +936,69 @@ msgid "_Published Name:"
 msgstr "ç?¼ä½?ç??å??稱(_P):"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#, fuzzy
-msgid "<b>Keep-Alive Options</b>"
-msgstr "顯示æ??é?? GNOME ç??é?¸é ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
-msgid "<b>Miscellaneous Options</b>"
-msgstr "<b>é??é ?</b>"
+msgid "<b>Example:</b> user my sip server"
+msgstr "<b>���</b> user my sip server"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-#, fuzzy
-msgid "<b>NAT Traversal Options</b>"
-msgstr "顯示æ??é?? GNOME ç??é?¸é ?"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
-msgid "<b>Proxy Options</b>"
-msgstr "<b>Proxy é?¸é ?</b>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "<span size=\"small\"><b>Example:</b> user my sip server</span>"
-msgstr "<span size=\"small\"><b>���</b> user my sip server</span>"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Authentication username:"
 msgstr "èª?è­?使ç?¨è??å??稱ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
 msgid "Discover Binding"
 msgstr "�索 Binding"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 msgid "Discover the STUN server automatically"
 msgstr "è?ªå??æ?¢ç´¢ STUN 伺æ??å?¨"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
 msgid "Hostname of the proxy for outbound requests."
 msgstr "è³?æ??å?³å?ºè¦?æ±?æ??使ç?¨ç?? proxy 主æ©?å??稱ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "é??é??ï¼?ç§?ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#, fuzzy
+msgid "Keep-Alive Options"
+msgstr "ä¿?æ??ä¸?æ?·ç·?é?¸é ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid ""
 "Look up the DNS SRV record at the service's domain for the host name of a "
 "STUN server."
 msgstr ""
 "æ?¥è©¢ä½?æ?¼ä¼ºæ??å?¨ domain ç?? DNS SRV ç´?é??以å??å¾?æ??å?? STUN 伺æ??å?¨ç??主æ©?å??稱ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Loose Routing"
 msgstr "寬�路�"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "Mechanism:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+msgid "Miscellaneous Options"
+msgstr "é??é ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "NAT Traversal Options"
+msgstr "NAT å?³è¼¸é?¸é ?"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "Port of the proxy for outbound requests."
 msgstr "è³?æ??å?³å?ºè¦?æ±?æ??使ç?¨ç?? proxy é?£æ?¥å? ã??"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Port:"
 msgstr "é?£æ?¥å? ï¼?"
 
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Proxy Options"
+msgstr "Proxy é?¸é ?"
+
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "STUN Server:"
 msgstr "STUN 伺æ??å?¨:"
@@ -1024,8 +1044,8 @@ msgid "_Username:"
 msgstr "使ç?¨è??å??稱(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Use _Yahoo Japan"
-msgstr "使� _Yahoo ��"
+msgid "Use _Yahoo! Japan"
+msgstr "使� Yahoo! ��(_Y)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
 msgid "What is your Yahoo! ID?"
@@ -1036,11 +1056,11 @@ msgid "What is your Yahoo! password?"
 msgstr "æ?¨ç?? Yahoo! å¯?碼æ?¯ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "Yahoo I_D:"
+msgid "Yahoo! I_D:"
 msgstr "Yahoo I_D:"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
-msgid "_Ignore conference and chatroom invitations"
+msgid "_Ignore conference and chat room invitations"
 msgstr "忽ç?¥æ??è­°è??è??天室é??è«?(_I)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
@@ -1053,8 +1073,8 @@ msgid "Couldn't convert image"
 msgstr "ç?¡æ³?è½?æ??å??ç??"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
-msgstr "æ?¨ç??系統ä¸?æ?¯æ?´é??äº?å??ç??æ ¼å¼?"
+msgid "None of the accepted image formats are supported on your system"
+msgstr "æ?¨ç??系統ä¸?æ²?æ??æ?¯æ?´å·²æ?¥å??ç??å??ç??æ ¼å¼?"
 
 #: ../libempathy-gtk/empathy-avatar-chooser.c:915
 msgid "Select Your Avatar Image"
@@ -1076,145 +1096,145 @@ msgstr "æ??æ??æª?æ¡?"
 msgid "Click to enlarge"
 msgstr "è«?æ??é??裡æ?¾å¤§"
 
-#: ../libempathy-gtk/empathy-chat.c:199
+#: ../libempathy-gtk/empathy-chat.c:201
 msgid "Failed to reconnect this chat"
 msgstr "ç?¡æ³?é??é?£é??å??è??天æ??è­°"
 
-#: ../libempathy-gtk/empathy-chat.c:621
-msgid "Failed to join chatroom"
+#: ../libempathy-gtk/empathy-chat.c:623
+msgid "Failed to join chat room"
 msgstr "å? å?¥è??天室失æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:639
+#: ../libempathy-gtk/empathy-chat.c:641
 msgid "Failed to open private chat"
 msgstr "é??å??ç§?人å°?話失æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:678
+#: ../libempathy-gtk/empathy-chat.c:680
 msgid "Topic not supported on this conversation"
-msgstr "æ­¤å°?話ç??主é¡?ä¸?被æ?¯æ?´"
+msgstr "æ­¤è«?話ç??主é¡?ä¸?被æ?¯æ?´"
 
-#: ../libempathy-gtk/empathy-chat.c:684
+#: ../libempathy-gtk/empathy-chat.c:686
 msgid "You are not allowed to change the topic"
 msgstr "æ?¨ä¸?被å??許è®?æ?´é??å??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:802
-msgid "/clear, clear all messages from the current conversation"
-msgstr "/clearï¼?æ¸?é?¤ç?®å??å°?話ç??æ??æ??è¨?æ?¯"
+#: ../libempathy-gtk/empathy-chat.c:815
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: æ¸?é?¤ç?®å??è«?話ç??æ??æ??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:805
-msgid "/topic <topic>, set the topic of the current conversation"
-msgstr "/topic <主é¡?>ï¼?設置ç?®å??å°?話ç??主é¡?"
+#: ../libempathy-gtk/empathy-chat.c:818
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <主é¡?>: 設置ç?®å??è«?話ç??主é¡?"
 
-#: ../libempathy-gtk/empathy-chat.c:808
-msgid "/join <chatroom id>, join a new chatroom"
-msgstr "/join <è??天室 id>ï¼?å? å?¥æ?°ç??è??天室"
+#: ../libempathy-gtk/empathy-chat.c:821
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <è??天室 ID>: å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:811
-msgid "/j <chatroom id>, join a new chatroom"
-msgstr "/j <è??天室 id>ï¼?å? å?¥æ?°ç??è??天室"
+#: ../libempathy-gtk/empathy-chat.c:824
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <è??天室 ID>: å? å?¥æ?°ç??è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:814
-msgid "/query <contact id> [<message>], open a private chat"
-msgstr "/query <è?¯çµ¡äºº id> [<è¨?æ?¯>]ï¼?é??å??ç§?人å°?話"
+#: ../libempathy-gtk/empathy-chat.c:827
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <è?¯çµ¡äºº ID> [<è¨?æ?¯>]: é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:817
-msgid "/msg <contact id> <message>, open a private chat"
-msgstr "/msg <è?¯çµ¡äºº id> <è¨?æ?¯>ï¼?é??å??ç§?人å°?話"
+#: ../libempathy-gtk/empathy-chat.c:830
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <è?¯çµ¡äºº ID> <è¨?æ?¯>: é??å??ç§?人å°?話"
 
-#: ../libempathy-gtk/empathy-chat.c:820
-msgid "/nick <nickname>, change your nickname on current server"
-msgstr "/nick <æ?±ç¨±>ï¼?è®?æ?´å?¨ç?®å??伺æ??å?¨ä¸?ç??æ?¨ç??æ?±ç¨±"
+#: ../libempathy-gtk/empathy-chat.c:833
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <æ?±ç¨±>: è®?æ?´å?¨ç?®å??伺æ??å?¨ä¸?ç??æ?¨ç??æ?±ç¨±"
 
-#: ../libempathy-gtk/empathy-chat.c:823
-msgid "/me <message>, send an ACTION message to the current conversation"
-msgstr "/me <è¨?æ?¯>ï¼?é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??å°?話中"
+#: ../libempathy-gtk/empathy-chat.c:836
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <è¨?æ?¯>: é??å?ºä¸?å?? ACTION è¨?æ?¯å?°ç?®å??ç??è«?話中"
 
-#: ../libempathy-gtk/empathy-chat.c:826
+#: ../libempathy-gtk/empathy-chat.c:839
 msgid ""
-"/say <message>, send <message> to the current conversation. This is used to "
+"/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
-"join a new chatroom\""
+"join a new chat room\""
 msgstr ""
-"/say <è¨?æ?¯>ï¼?é??å?º <è¨?æ?¯> å?°ç?®å??ç??å°?話中ã??é??ç?¨æ?¼å?³é??以ã??/ã??é??é ­ç??è¨?æ?¯ã??è??ä¾?ä¾?"
+"/say <è¨?æ?¯>: é??å?º <è¨?æ?¯> å?°ç?®å??ç??è«?話中ã??é??ç?¨æ?¼å?³é??以ã??/ã??é??é ­ç??è¨?æ?¯ã??è??ä¾?ä¾?"
 "說ï¼?ã??/say /join æ?¯ç?¨ä¾?å? å?¥æ?°ç??è??天室ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:831
+#: ../libempathy-gtk/empathy-chat.c:844
 msgid ""
-"/help [<command>], show all supported commands. If <command> is defined, "
+"/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
 msgstr ""
-"/help [<å?½ä»¤>]ï¼?顯示æ??æ??æ?¯æ?´ç??æ??令ã??å¦?æ??æ??å®?義é??å?? <å?½ä»¤> ç??話ï¼?便顯示å®?ç??ç?¨"
+"/help [<å?½ä»¤>]: 顯示æ??æ??æ?¯æ?´ç??æ??令ã??å¦?æ??æ??å®?義é??å?? <å?½ä»¤> ç??話ï¼?便顯示å®?ç??ç?¨"
 "æ³?ã??"
 
-#: ../libempathy-gtk/empathy-chat.c:841
+#: ../libempathy-gtk/empathy-chat.c:854
 #, c-format
 msgid "Usage: %s"
 msgstr "��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:870
+#: ../libempathy-gtk/empathy-chat.c:883
 msgid "Unknown command"
 msgstr "æ?ªç?¥ç??å?½ä»¤"
 
-#: ../libempathy-gtk/empathy-chat.c:991
-msgid "Unknown command, see /help for the available commands"
-msgstr "æ?ªç?¥ç??æ??令ï¼?è«?å??è¦? /help 以å??å¾?å?¯ç?¨ç??æ??令"
+#: ../libempathy-gtk/empathy-chat.c:1004
+msgid "Unknown command; see /help for the available commands"
+msgstr "æ?ªç?¥ç??æ??令ï¼?è«?å??è¦? /help 以å??å¾?å?¯ç?¨ç??æ??令"
 
-#: ../libempathy-gtk/empathy-chat.c:1130
+#: ../libempathy-gtk/empathy-chat.c:1143
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1133
+#: ../libempathy-gtk/empathy-chat.c:1146
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1136
+#: ../libempathy-gtk/empathy-chat.c:1149
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1139
+#: ../libempathy-gtk/empathy-chat.c:1152
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1142
+#: ../libempathy-gtk/empathy-chat.c:1155
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:1145
+#: ../libempathy-gtk/empathy-chat.c:1158
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1162
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1179
+#: ../libempathy-gtk/empathy-chat.c:1192
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1194
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:1554
+#: ../libempathy-gtk/empathy-chat.c:1593
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1608
+#: ../libempathy-gtk/empathy-chat.c:1647
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1626
-#: ../libempathy-gtk/empathy-ui-utils.c:1657
+#: ../libempathy-gtk/empathy-chat.c:1665
+#: ../libempathy-gtk/empathy-ui-utils.c:1658
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1660
+#: ../libempathy-gtk/empathy-chat.c:1699
 msgid "_Spelling Suggestions"
 msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1775
+#: ../libempathy-gtk/empathy-chat.c:1814
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已��"
@@ -1222,12 +1242,12 @@ msgstr "%s 已��"
 #. translators: reverse the order of these arguments
 #. * if the kicked should come before the kicker in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1782
+#: ../libempathy-gtk/empathy-chat.c:1821
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢��"
 
-#: ../libempathy-gtk/empathy-chat.c:1785
+#: ../libempathy-gtk/empathy-chat.c:1824
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢���"
@@ -1235,17 +1255,17 @@ msgstr "%s 被踢���"
 #. translators: reverse the order of these arguments
 #. * if the banned should come before the banner in your locale.
 #.
-#: ../libempathy-gtk/empathy-chat.c:1793
+#: ../libempathy-gtk/empathy-chat.c:1832
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1796
+#: ../libempathy-gtk/empathy-chat.c:1835
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:1839
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
@@ -1255,63 +1275,63 @@ msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1809
+#: ../libempathy-gtk/empathy-chat.c:1848
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1834
+#: ../libempathy-gtk/empathy-chat.c:1873
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1859
+#: ../libempathy-gtk/empathy-chat.c:1898
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��被稱� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1994 ../src/empathy-call-window.c:1537
+#: ../libempathy-gtk/empathy-chat.c:2033 ../src/empathy-call-window.c:1531
 msgid "Disconnected"
 msgstr "已��"
 
-#: ../libempathy-gtk/empathy-chat.c:2521
+#: ../libempathy-gtk/empathy-chat.c:2568
 msgid "Wrong password; please try again:"
 msgstr "å¯?碼é?¯èª¤ï¼?è«?å??試ä¸?次:"
 
-#: ../libempathy-gtk/empathy-chat.c:2522
+#: ../libempathy-gtk/empathy-chat.c:2569
 msgid "Retry"
 msgstr "é??試"
 
-#: ../libempathy-gtk/empathy-chat.c:2527
+#: ../libempathy-gtk/empathy-chat.c:2574
 msgid "This room is protected by a password:"
 msgstr "æ­¤è??天室已被å¯?碼ä¿?è­·:"
 
-#: ../libempathy-gtk/empathy-chat.c:2528
+#: ../libempathy-gtk/empathy-chat.c:2575
 msgid "Join"
 msgstr "å? å?¥"
 
-#: ../libempathy-gtk/empathy-chat.c:2668
+#: ../libempathy-gtk/empathy-chat.c:2715
 msgid "Connected"
 msgstr "æ??å??é?£ç·?"
 
-#: ../libempathy-gtk/empathy-chat.c:2721
-#: ../libempathy-gtk/empathy-log-window.c:546
+#: ../libempathy-gtk/empathy-chat.c:2768
+#: ../libempathy-gtk/empathy-log-window.c:548
 msgid "Conversation"
 msgstr "�話"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:679
+#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:681
 msgid "Topic:"
 msgstr "主�:"
 
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:317
-#: ../libempathy-gtk/empathy-theme-adium.c:817
+#: ../libempathy-gtk/empathy-theme-adium.c:823
 msgid "_Copy Link Address"
 msgstr "è¤?製é?£çµ?ä½?å??(_C)"
 
 #. Open Link menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:324
-#: ../libempathy-gtk/empathy-theme-adium.c:824
+#: ../libempathy-gtk/empathy-theme-adium.c:830
 msgid "_Open Link"
 msgstr "é??å??é?£çµ?(_O)"
 
@@ -1341,33 +1361,34 @@ msgstr "ç¨?å¾?å??決å®?"
 msgid "Subscription Request"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1557
+#: ../libempathy-gtk/empathy-contact-list-view.c:1512
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤ç¾¤çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1559
+#: ../libempathy-gtk/empathy-contact-list-view.c:1514
 msgid "Removing group"
 msgstr "正�移�群�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1606
-#: ../libempathy-gtk/empathy-contact-list-view.c:1683
+#: ../libempathy-gtk/empathy-contact-list-view.c:1561
+#: ../libempathy-gtk/empathy-contact-list-view.c:1638
+#: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1636
+#: ../libempathy-gtk/empathy-contact-list-view.c:1591
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤é?£çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1638
+#: ../libempathy-gtk/empathy-contact-list-view.c:1593
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:195
 #: ../src/empathy-main-window.ui.h:14
-msgid "_Add Contact..."
+msgid "_Add Contactâ?¦"
 msgstr "���絡人(_A)..."
 
 #: ../libempathy-gtk/empathy-contact-menu.c:222
@@ -1408,143 +1429,144 @@ msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:496
-#: ../src/empathy-chat-window.c:864
+#: ../src/empathy-chat-window.c:866
 msgid "Inviting you to this room"
 msgstr "é??è«?æ?¨å?°é??å??è??天室"
 
 #: ../libempathy-gtk/empathy-contact-menu.c:527
-msgid "_Invite to chatroom"
-msgstr "é??è«?å?°é??å??è??天室(_I)"
+msgid "_Invite to chat room"
+msgstr "é??è«?å?°è??天室(_I)"
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "é?¸æ??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "å?²å­?å¤§é ­è²¼"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
-
-#: ../libempathy-gtk/empathy-contact-widget.c:1001
+#: ../libempathy-gtk/empathy-contact-widget.c:235
 msgid "Select"
 msgstr "é?¸æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1010
-#: ../src/empathy-main-window.c:1038
+#: ../libempathy-gtk/empathy-contact-widget.c:244
+#: ../src/empathy-main-window.c:1042
 msgid "Group"
 msgstr "群�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1261
+#: ../libempathy-gtk/empathy-contact-widget.c:476
 msgid "Country ISO Code:"
 msgstr "å??家 ISO 碼ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1263
+#: ../libempathy-gtk/empathy-contact-widget.c:478
 msgid "Country:"
 msgstr "å??家ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1265
+#: ../libempathy-gtk/empathy-contact-widget.c:480
 msgid "State:"
 msgstr "å·?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1267
+#: ../libempathy-gtk/empathy-contact-widget.c:482
 msgid "City:"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1269
+#: ../libempathy-gtk/empathy-contact-widget.c:484
 msgid "Area:"
 msgstr "å??å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1271
+#: ../libempathy-gtk/empathy-contact-widget.c:486
 msgid "Postal Code:"
 msgstr "é?µé??å??è??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1273
+#: ../libempathy-gtk/empathy-contact-widget.c:488
 msgid "Street:"
 msgstr "è¡?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1275
+#: ../libempathy-gtk/empathy-contact-widget.c:490
 msgid "Building:"
 msgstr "建��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1277
+#: ../libempathy-gtk/empathy-contact-widget.c:492
 msgid "Floor:"
 msgstr "�層�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1279
+#: ../libempathy-gtk/empathy-contact-widget.c:494
 msgid "Room:"
 msgstr "室�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1281
+#: ../libempathy-gtk/empathy-contact-widget.c:496
 msgid "Text:"
 msgstr "æ??å­?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1283
+#: ../libempathy-gtk/empathy-contact-widget.c:498
 msgid "Description:"
 msgstr "æ??è¿°ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1285
+#: ../libempathy-gtk/empathy-contact-widget.c:500
 msgid "URI:"
 msgstr "URIï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1287
+#: ../libempathy-gtk/empathy-contact-widget.c:502
 msgid "Accuracy Level:"
 msgstr "�確度���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1289
+#: ../libempathy-gtk/empathy-contact-widget.c:504
 msgid "Error:"
 msgstr "�誤�"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1291
+#: ../libempathy-gtk/empathy-contact-widget.c:506
 msgid "Vertical Error (meters):"
 msgstr "å??ç?´èª¤å·®ï¼?å?¬å°ºï¼?ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1293
+#: ../libempathy-gtk/empathy-contact-widget.c:508
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差��尺��"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1295
+#: ../libempathy-gtk/empathy-contact-widget.c:510
 msgid "Speed:"
 msgstr "é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1297
+#: ../libempathy-gtk/empathy-contact-widget.c:512
 msgid "Bearing:"
 msgstr "���"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1299
+#: ../libempathy-gtk/empathy-contact-widget.c:514
 msgid "Climb Speed:"
 msgstr "ç?¬å??é??度ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1301
+#: ../libempathy-gtk/empathy-contact-widget.c:516
 msgid "Last Updated on:"
 msgstr "�次����"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1303
+#: ../libempathy-gtk/empathy-contact-widget.c:518
 msgid "Longitude:"
 msgstr "�度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1305
+#: ../libempathy-gtk/empathy-contact-widget.c:520
 msgid "Latitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1307
+#: ../libempathy-gtk/empathy-contact-widget.c:522
 msgid "Altitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1368
-msgid "<b>Location</b>"
-msgstr "<b>ä½?ç½®</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:584
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "ä½?ç½®"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1381
+#: ../libempathy-gtk/empathy-contact-widget.c:600
 msgid "<b>Location</b>, "
 msgstr "<b>ä½?ç½®<b>ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1431
+#: ../libempathy-gtk/empathy-contact-widget.c:650
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y æ?¼ %R UTC"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:721
+msgid "Save Avatar"
+msgstr "å?²å­?å¤§é ­è²¼"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:777
+msgid "Unable to save avatar"
+msgstr "ç?¡æ³?å?²å­?å¤§é ­è²¼"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>ä½?ç½®</b> æ?¼ (date)\t"
@@ -1566,55 +1588,50 @@ msgid "Client:"
 msgstr "客�端:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1021
-msgid "Contact"
-msgstr "�絡人"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
 msgid "Contact Details"
 msgstr "é?£çµ¡äººè©³ç´°è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "���件:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+msgid "E-mail address:"
+msgstr "é?»å­?ä¿¡ç®±ä½?å??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:9
+msgid "Full name:"
 msgstr "å?¨å??:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:10
 msgid "Groups"
 msgstr "群�"
 
 #. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:12
 msgid "Identifier:"
 msgstr "���:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "����..."
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
+msgid "Information requested&#x2026;"
+msgstr "����&#x2026;"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "OS:"
 msgstr "OS:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 "è«?é?¸æ??é??å??é?£çµ¡äººè¦?顯ç?¾å?¨å?ªå??群çµ?ã??注æ??æ?¨å?¯ä»¥é?¸æ??ä¸?å??以ä¸?ç??群çµ?æ??ä¸?é?¸æ??群çµ?ã??"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
 msgid "Version:"
 msgstr "ç??æ?¬:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
+msgid "Website:"
 msgstr "網�:"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
 msgid "_Add Group"
 msgstr "å? å?¥ç¾¤çµ?(_G)"
 
@@ -1634,12 +1651,12 @@ msgstr "é?£æ?¥å? "
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:539
+#: ../libempathy-gtk/empathy-log-window.c:541
 #: ../src/empathy-import-widget.c:310
 msgid "Account"
 msgstr "帳è??"
 
-#: ../libempathy-gtk/empathy-log-window.c:556
+#: ../libempathy-gtk/empathy-log-window.c:558
 msgid "Date"
 msgstr "æ?¥æ??"
 
@@ -1697,12 +1714,12 @@ msgstr "æ?°é??話"
 #. COL_TYPE
 #: ../libempathy-gtk/empathy-presence-chooser.c:167
 #: ../libempathy-gtk/empathy-presence-chooser.c:203
-msgid "Custom Message..."
+msgid "Custom Messageâ?¦"
 msgstr "����..."
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:220
 #: ../libempathy-gtk/empathy-presence-chooser.c:222
-msgid "Edit Custom Messages..."
+msgid "Edit Custom Messagesâ?¦"
 msgstr "編輯����..."
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:344
@@ -1723,9 +1740,21 @@ msgstr "設å®?æ?¨ç??ä¸?ç·?è??ç?®å??ç??ç??æ??"
 
 #. Custom messages
 #: ../libempathy-gtk/empathy-presence-chooser.c:1083
-msgid "Custom messages..."
+msgid "Custom messagesâ?¦"
 msgstr "����..."
 
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find:"
+msgstr "���"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Match case"
+msgstr ""
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Phrase not found"
+msgstr ""
+
 #: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
 msgstr "æ?¶å?°å?³æ??è¨?æ?¯"
@@ -1798,15 +1827,15 @@ msgstr "��"
 msgid "Blue"
 msgstr "è??è?²"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1519
+#: ../libempathy-gtk/empathy-ui-utils.c:1520
 msgid "Unable to open URI"
 msgstr "ç?¡æ³?é??å?? URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1649
+#: ../libempathy-gtk/empathy-ui-utils.c:1650
 msgid "Select a file"
 msgstr "é?¸æ??ä¸?å??æª?æ¡?"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1709
+#: ../libempathy-gtk/empathy-ui-utils.c:1710
 msgid "Select a destination"
 msgstr "é?¸å??ç?®ç??å?°"
 
@@ -1978,11 +2007,11 @@ msgid "Vietnamese"
 msgstr "è¶?å??æ??"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
-msgid "The contact selected cannot receive files."
+msgid "The selected contact cannot receive files."
 msgstr "æ??é?¸ç??è?¯çµ¡äººç?¡æ³?æ?¥æ?¶æª?æ¡?ã??"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
-msgid "The contact selected is offline."
+msgid "The selected contact is offline."
 msgstr "æ??é?¸ç??è?¯çµ¡äººå·²ç¶?é?¢ç·?ã??"
 
 #: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
@@ -1993,19 +2022,19 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:893
+#: ../src/empathy.c:762
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:897
+#: ../src/empathy.c:766
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?顯示é?£çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?話çª?"
 
-#: ../src/empathy.c:901
+#: ../src/empathy.c:770
 msgid "Show the accounts dialog"
 msgstr "顯示帳è??å°?話ç??"
 
-#: ../src/empathy.c:913
+#: ../src/empathy.c:782
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??客æ?¶ç«¯"
 
@@ -2055,28 +2084,28 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../src/empathy-account-assistant.c:118
-msgid "There has been an error while importing the accounts."
+#: ../src/empathy-account-assistant.c:165
+msgid "There was an error while importing the accounts."
 msgstr "å?¯å?¥å¸³è??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:121
-msgid "There has been an error while parsing the account details."
+#: ../src/empathy-account-assistant.c:168
+msgid "There was an error while parsing the account details."
 msgstr "解æ??帳è??詳細è³?æ??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:124
-msgid "There has been an error while creating the account."
+#: ../src/empathy-account-assistant.c:171
+msgid "There was an error while creating the account."
 msgstr "建ç«?帳è??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:126
-msgid "There has been an error."
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error."
 msgstr "æ??é?¯èª¤ç?¼ç??ã??"
 
-#: ../src/empathy-account-assistant.c:141
-#, c-format
-msgid "The error message was: <span style=\"italic\">%s</span>"
-msgstr "�誤���� <span style=\"italic\">%s</span>"
+#: ../src/empathy-account-assistant.c:177
+#, fuzzy, c-format
+msgid "The error message was: %s"
+msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 
-#: ../src/empathy-account-assistant.c:149
+#: ../src/empathy-account-assistant.c:181
 msgid ""
 "You can either go back and try to enter your accounts' details again or quit "
 "this assistant and add accounts later from the Edit menu."
@@ -2084,7 +2113,8 @@ msgstr ""
 "æ?¨å?¯ä»¥å??å?°å??é ?å??次輸å?¥å¸³è??ç??詳細è³?æ??æ??çµ?æ??æ­¤å?©ç??ï¼?ç¨?å¾?å??å¾?ã??編輯ã??é?¸å?®å? å?¥å¸³"
 "è??ã??"
 
-#: ../src/empathy-account-assistant.c:184
+#: ../src/empathy-account-assistant.c:218
+#: ../src/empathy-account-assistant.c:1241
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
@@ -2094,36 +2124,36 @@ msgstr "ç?¼ç??é?¯èª¤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:331 ../src/empathy-accounts-dialog.c:506
+#: ../src/empathy-account-assistant.c:395 ../src/empathy-accounts-dialog.c:552
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å¢? %s 帳è??"
 
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:472
 msgid "What kind of chat account do you have?"
 msgstr "æ?¨ç??è??天帳è??æ?¯å?ªä¸?種ï¼?"
 
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:478
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "æ?¨é??æ?³è¦?設å®?å?¶ä»?ç??è??天帳è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:415
+#: ../src/empathy-account-assistant.c:484
 msgid "Enter your account details"
 msgstr "è«?輸å?¥æ?¨ç??帳è??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:420
+#: ../src/empathy-account-assistant.c:489
 msgid "What kind of chat account do you want to create?"
 msgstr "æ?¨æ?³è¦?建ç«?ä½?種è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:426
+#: ../src/empathy-account-assistant.c:495
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?建ç«?å?¶ä»?è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:433
+#: ../src/empathy-account-assistant.c:502
 msgid "Enter the details for the new account"
 msgstr "è«?輸å?¥æ?°å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:617
 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 "
@@ -2134,54 +2164,90 @@ msgstr ""
 "Windows Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網路æ??å½±æ©?é??å?¯ä»¥é?²è¡?"
 "èª?é?³æ??è¦?è¨?é??話ã??"
 
-#: ../src/empathy-account-assistant.c:536
+#: ../src/empathy-account-assistant.c:634
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "æ?¨æ?¯å?¦æ??使ç?¨å?¶ä»?è??天ç¨?å¼?ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:559
+#: ../src/empathy-account-assistant.c:657
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??帳è??詳細è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:580
+#: ../src/empathy-account-assistant.c:678
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?輸å?¥å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:602
+#: ../src/empathy-account-assistant.c:700
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:612
+#: ../src/empathy-account-assistant.c:710
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:633
+#: ../src/empathy-account-assistant.c:731
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:720
+#: ../src/empathy-account-assistant.c:815
 #: ../src/empathy-new-chatroom-dialog.c:541
 #: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:727
+#: ../src/empathy-account-assistant.c:822
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??樣"
 
-#: ../src/empathy-account-assistant.c:920
+#: ../src/empathy-account-assistant.c:1064
+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 "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1070
+#: ../src/empathy-account-assistant.c:1126
+#, fuzzy
+msgid "Edit->Accounts"
+msgstr "編輯帳è??"
+
+#: ../src/empathy-account-assistant.c:1086
+#, fuzzy
+msgid "I don't want to enable this feature for now"
+msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
+
+#: ../src/empathy-account-assistant.c:1122
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed.\n"
+"If you want to enable this feature, please install the telepathy-salut "
+"package\n"
+"and create a People Nearby account from the Accounts dialog "
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1128
+msgid "telepathy-salut not installed"
+msgstr ""
+
+#: ../src/empathy-account-assistant.c:1205
 msgid "Welcome to Empathy"
 msgstr "歡�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:929
+#: ../src/empathy-account-assistant.c:1214
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??帳è??"
 
+#: ../src/empathy-account-assistant.c:1232
+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
 #, c-format
-msgid "There are unsaved modification regarding your %s account."
-msgstr "é??æ??è??æ?¨ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
+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
@@ -2189,33 +2255,33 @@ msgstr "é??æ??è??æ?¨ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å­?æ?¨ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:232 ../src/empathy-call-window.c:729
-msgid "Connecting..."
+#: ../src/empathy-accounts-dialog.c:259 ../src/empathy-call-window.c:729
+msgid "Connectingâ?¦"
 msgstr "��中..."
 
-#: ../src/empathy-accounts-dialog.c:259
+#: ../src/empathy-accounts-dialog.c:286
 #, c-format
-msgid "Disconnected - %s"
-msgstr "已�� - %s"
+msgid "Disconnected â?? %s"
+msgstr "å·²æ?·ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:264
+#: ../src/empathy-accounts-dialog.c:291
 #, c-format
-msgid "Offline - %s"
-msgstr "�� - %s"
+msgid "Offline â?? %s"
+msgstr "é?¢ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:277
-msgid "Offline - No Network Connection"
-msgstr "�� - �網路��"
+#: ../src/empathy-accounts-dialog.c:304
+msgid "Offline â?? No Network Connection"
+msgstr "é?¢ç·? â?? ç?¡ç¶²è·¯é?£ç·?"
 
-#: ../src/empathy-accounts-dialog.c:285
+#: ../src/empathy-accounts-dialog.c:312
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç??ç??æ??"
 
-#: ../src/empathy-accounts-dialog.c:296
-msgid "Offline - Account disabled"
-msgstr "é?¢ç·? - 帳è??å·²å??ç?¨"
+#: ../src/empathy-accounts-dialog.c:323
+msgid "Offline â?? Account Disabled"
+msgstr "é?¢ç·? â?? 帳è??å·²å??ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:645
+#: ../src/empathy-accounts-dialog.c:720
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2223,16 +2289,16 @@ msgstr ""
 "æ?¨å?³å°?建ç«?æ?°ç??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:934
+#: ../src/empathy-accounts-dialog.c:1054
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?æ?¨ç??é?»è?¦ä¸?移é?¤ç¾¤çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:938
+#: ../src/empathy-accounts-dialog.c:1058
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??移é?¤ä¼ºæ??å?¨ä¸?ç??æ?¨ç??帳è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1120
+#: ../src/empathy-accounts-dialog.c:1286
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2240,7 +2306,7 @@ msgstr ""
 "æ?¨å?³å°?建ç«?å?¦ä¸?å??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1537
+#: ../src/empathy-accounts-dialog.c:1829
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2248,31 +2314,34 @@ msgstr ""
 "æ?¨å?³å°?é??é??é??å??è¦?çª?ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.ui.h:1
+#. Tweak the dialog
+#: ../src/empathy-accounts-dialog.c:1956
 msgid "Accounts"
 msgstr "帳è??"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
+#: ../src/empathy-accounts-dialog.ui.h:1
 msgid "No protocol installed"
 msgstr "å°?æ?ªå®?è£?é??è¨?å??å®?"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
+#: ../src/empathy-accounts-dialog.ui.h:2
 msgid "Protocol:"
 msgstr "å??å®?ï¼?"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
+#: ../src/empathy-accounts-dialog.ui.h:3
 msgid ""
 "To add a new account, you first have to install a backend for each protocol "
 "you want to use."
 msgstr "è¦?å? å?¥æ?°ç??帳è??ï¼?æ?¨å¿?é ?å??å®?è£?æ¯?å??æ??ç?¨å?°ç??é??è¨?å??å®?å¾?端ç¨?å¼?ã??"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Add..."
-msgstr "å? å?¥(_A)..."
+#: ../src/empathy-accounts-dialog.ui.h:4
+#, fuzzy
+msgid "_Add&#x2026;"
+msgstr "å? å?¥(_A)&#x2026;"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "_Import..."
-msgstr "��...(_I)"
+#: ../src/empathy-accounts-dialog.ui.h:5
+#, fuzzy
+msgid "_Import&#x2026;"
+msgstr "��(_I)&#x2026;"
 
 #: ../src/empathy-call-window.c:453
 msgid "Contrast"
@@ -2320,69 +2389,69 @@ msgid "Call"
 msgstr "é??話"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1700
+#: ../src/empathy-call-window.c:1694
 #, c-format
 msgid "Connected â?? %d:%02dm"
 msgstr "å·²é?£ç·? â?? %d:%02dm"
 
-#: ../src/empathy-call-window.c:1761
+#: ../src/empathy-call-window.c:1755
 msgid "Technical Details"
 msgstr "æ??è¡?ç´°ç¯?"
 
-#: ../src/empathy-call-window.c:1799
+#: ../src/empathy-call-window.c:1793
 #, 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:1804
+#: ../src/empathy-call-window.c:1798
 #, 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:1810
+#: ../src/empathy-call-window.c:1804
 #, 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:1816
+#: ../src/empathy-call-window.c:1810
 msgid "There was a failure on the network"
 msgstr "é??å??網路ä¸?æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:1820
+#: ../src/empathy-call-window.c:1814
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??é?³è¨?æ ¼å¼?å°?æ?ªå?¨æ?¨ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:1823
+#: ../src/empathy-call-window.c:1817
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "æ­¤é??話æ??å¿?è¦?ç??è¦?è¨?æ ¼å¼?å°?æ?ªå?¨æ?¨ç??é?»è?¦ä¸?å®?è£?"
 
-#: ../src/empathy-call-window.c:1833
+#: ../src/empathy-call-window.c:1827
 #, c-format
 msgid ""
-"Something not expected happened in a Telepathy component. Please <a href=\"%s"
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
 "\">report this bug</a> and attach logs gathered from the 'Debug' window in "
 "the Help menu."
 msgstr ""
 "å?¨ Telepathy å??件中ç?¼ç??æ?ªé ?æ??ç??ç??æ³?ã??è«?<a href=\"%s\">å??å ±é??å??é?¯èª¤</a>並é??ä¸?"
-"å¾?æ±?å?©é?¸å?®ç??ã??é?¤é?¯ã??è¦?çª?中æ?¶é??ç??ç´?é??ã??"
+"å¾?æ±?å?©é?¸å?®å?§ç??ã??é?¤é?¯ã??è¦?çª?中æ??æ?¶é??ç??ç´?é??ã??"
 
-#: ../src/empathy-call-window.c:1841
+#: ../src/empathy-call-window.c:1835
 msgid "There was a failure in the call engine"
 msgstr "é??話å¼?æ??å?§æ??é?¯èª¤ç?¼ç??"
 
-#: ../src/empathy-call-window.c:1880
+#: ../src/empathy-call-window.c:1874
 msgid "Can't establish audio stream"
 msgstr "��建���串�"
 
-#: ../src/empathy-call-window.c:1890
+#: ../src/empathy-call-window.c:1884
 msgid "Can't establish video stream"
 msgstr "��建���串�"
 
@@ -2454,31 +2523,31 @@ msgstr "è¦?è¨?é ?覽"
 msgid "_View"
 msgstr "檢�(_V)"
 
-#: ../src/empathy-chat-window.c:435 ../src/empathy-chat-window.c:455
+#: ../src/empathy-chat-window.c:437 ../src/empathy-chat-window.c:457
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:447
+#: ../src/empathy-chat-window.c:449
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (è?? %u å?¶ä»?ç??)"
 
-#: ../src/empathy-chat-window.c:463
+#: ../src/empathy-chat-window.c:465
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (ä¾?è?ªå?¶ä»?人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:472
+#: ../src/empathy-chat-window.c:474
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (ä¾?è?ªæ??æ??人ç?? %d å??æ?ªè®?)"
 
-#: ../src/empathy-chat-window.c:683
+#: ../src/empathy-chat-window.c:685
 msgid "Typing a message."
 msgstr "æ­£å?¨è¼¸å?¥è¨?æ?¯ã??"
 
@@ -2499,8 +2568,8 @@ msgid "Insert _Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??(_S)"
 
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Invite _Participant..."
-msgstr "é??è«?å??è??...(_P)"
+msgid "Invite _Participantâ?¦"
+msgstr "é??è«?å??è??(_P)..."
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -2523,7 +2592,7 @@ msgid "_Detach Tab"
 msgstr "å??é?¢å??é ?(_D)"
 
 #: ../src/empathy-chat-window.ui.h:12
-msgid "_Favorite Chatroom"
+msgid "_Favorite Chat Room"
 msgstr "å??好ç??è??天室(_F)"
 
 #: ../src/empathy-chat-window.ui.h:13 ../src/empathy-main-window.ui.h:21
@@ -2562,89 +2631,76 @@ msgstr "è?ªå??é?£ç·?"
 msgid "Manage Favorite Rooms"
 msgstr "管ç??å??好ç??è??天室"
 
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:339
 msgid "Incoming video call"
 msgstr "å?³å?¥ç??è¦?è¨?é??話"
 
-#: ../src/empathy-event-manager.c:345
+#: ../src/empathy-event-manager.c:339
 msgid "Incoming call"
 msgstr "ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:349
+#: ../src/empathy-event-manager.c:343
 #, c-format
-msgid "%s is video calling you, do you want to answer?"
-msgstr "%s è¦?è??æ?¨é?²è¡?è¦?è¨?é??話ï¼?æ?¯å?¦è¦?æ?¥è?½ï¼?"
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s è¦?è??æ?¨é?²è¡?è¦?è¨?é??話ã??æ?¨æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:350
+#: ../src/empathy-event-manager.c:344
 #, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s è¦?è??æ?¨é??話ï¼?æ?¯å?¦è¦?æ?¥è?½ï¼?"
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s è¦?è??æ?¨é?²è¡?é??話ã??æ?¨æ?¯å?¦è¦?æ?¥è?½ï¼?"
 
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:366
 msgid "_Reject"
 msgstr "æ??çµ?(_R)"
 
-#: ../src/empathy-event-manager.c:378
+#: ../src/empathy-event-manager.c:372
 msgid "_Answer"
 msgstr "��(_A)"
 
-#: ../src/empathy-event-manager.c:495
+#: ../src/empathy-event-manager.c:489
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "ä¾?è?ª %s ç??è¦?è¨?é?»è©±"
 
-#: ../src/empathy-event-manager.c:495
+#: ../src/empathy-event-manager.c:489
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s ç??ä¾?é?»"
 
-#: ../src/empathy-event-manager.c:541
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s æ­£å?¨é??è«?æ?¨"
-
-#: ../src/empathy-event-manager.c:547
-msgid "An external application will be started to handle it."
-msgstr "å°?å??å??å¤?é?¨æ??ç?¨ç¨?å¼?ä¾?è??ç??å®?ã??"
-
-#: ../src/empathy-event-manager.c:552
-msgid "You don't have the needed external application to handle it."
-msgstr "æ?¨æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨æ??ç?¨ç¨?å¼?ã??"
-
-#: ../src/empathy-event-manager.c:680
+#: ../src/empathy-event-manager.c:579
 msgid "Room invitation"
 msgstr "è??天é??è«?"
 
-#: ../src/empathy-event-manager.c:683
+#: ../src/empathy-event-manager.c:582
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s æ­£å?¨é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:691
+#: ../src/empathy-event-manager.c:590
 msgid "_Decline"
 msgstr "æ??çµ?(_D)"
 
-#: ../src/empathy-event-manager.c:696
+#: ../src/empathy-event-manager.c:595
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "å? å?¥(_J)"
 
-#: ../src/empathy-event-manager.c:735
+#: ../src/empathy-event-manager.c:634
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s æ?¾é??è«?æ?¨å? å?¥ %s"
 
-#: ../src/empathy-event-manager.c:761
+#: ../src/empathy-event-manager.c:660
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "æ?¶å?°ä¾?è?ª %s ç??æª?æ¡?å?³è¼¸"
 
-#: ../src/empathy-event-manager.c:941
+#: ../src/empathy-event-manager.c:818
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "ä¾?è?ª %s ç??è¨?é?±è¦?æ±?"
 
-#: ../src/empathy-event-manager.c:945
+#: ../src/empathy-event-manager.c:822
 #, c-format
 msgid ""
 "\n"
@@ -2654,13 +2710,13 @@ msgstr ""
 "���%s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:985
+#: ../src/empathy-event-manager.c:862
 #, c-format
 msgid "%s is now offline."
 msgstr "%s ç?¾å?¨é?¢ç·?ã??"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:1001
+#: ../src/empathy-event-manager.c:878
 #, c-format
 msgid "%s is now online."
 msgstr "%s ç?¾å?¨ä¸?ç·?ã??"
@@ -2804,19 +2860,23 @@ msgstr "��"
 msgid "%s account"
 msgstr "%s 帳è??"
 
-#: ../src/empathy-main-window.c:431
+#: ../src/empathy-main-window.c:430
 msgid "Reconnect"
 msgstr "é??æ?°é?£æ?¥"
 
-#: ../src/empathy-main-window.c:438
+#: ../src/empathy-main-window.c:436
 msgid "Edit Account"
 msgstr "編輯帳è??"
 
-#: ../src/empathy-main-window.c:445
+#: ../src/empathy-main-window.c:442
 msgid "Close"
 msgstr "é??é??"
 
-#: ../src/empathy-main-window.c:1331
+#: ../src/empathy-main-window.c:1025
+msgid "Contact"
+msgstr "�絡人"
+
+#: ../src/empathy-main-window.c:1363
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳è??"
 
@@ -2830,7 +2890,7 @@ msgstr "é?£çµ¡äººå?°å??(_M)"
 
 #: ../src/empathy-main-window.ui.h:3
 msgid "Context"
-msgstr "è??絡"
+msgstr "é?¸é ?"
 
 #: ../src/empathy-main-window.ui.h:4
 msgid "Join _Favorites"
@@ -2845,12 +2905,12 @@ msgid "N_ormal Size"
 msgstr "正常大�(_O)"
 
 #: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
-msgid "New _Call..."
-msgstr "æ?°é??話...(_C)"
+msgid "New _Callâ?¦"
+msgstr "æ?°é??話(_C)..."
 
 #: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
-msgstr "正常大å°?å? å¤§é ­è²¼(_A)"
+msgstr "正常大å°?è??å¤§é ­è²¼(_A)"
 
 #: ../src/empathy-main-window.ui.h:9
 msgid "P_references"
@@ -2885,11 +2945,11 @@ msgid "_File Transfers"
 msgstr "���輸(_F)"
 
 #: ../src/empathy-main-window.ui.h:22
-msgid "_Join..."
+msgid "_Joinâ?¦"
 msgstr "å? å?¥(_J)..."
 
 #: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
-msgid "_New Conversation..."
+msgid "_New Conversationâ?¦"
 msgstr "���話(_N)..."
 
 #: ../src/empathy-main-window.ui.h:24
@@ -2912,11 +2972,10 @@ msgstr "è??天室"
 msgid "Members"
 msgstr "æ??å?¡"
 
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
 #: ../src/empathy-new-chatroom-dialog.c:539
 #, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
 msgid ""
 "<b>%s</b>\n"
 "Invite required: %s\n"
@@ -3045,10 +3104,6 @@ msgstr "å??ç?¨æ?¼å­?檢æ?¥ç¨?å¼?èª?è¨?ï¼?"
 msgid "General"
 msgstr "��"
 
-#: ../src/empathy-preferences.ui.h:12
-msgid "Location"
-msgstr "ä½?ç½®"
-
 #: ../src/empathy-preferences.ui.h:13
 msgid "Location sources:"
 msgstr "�置���"
@@ -3121,8 +3176,8 @@ msgid "_GPS"
 msgstr "GPS(_G)"
 
 #: ../src/empathy-preferences.ui.h:29
-msgid "_Network (IP, Wifi)"
-msgstr "網路�IP, Wifi�(_N)"
+msgid "_Network (IP, Wi-Fi)"
+msgstr "網路�IP, Wi-Fi�(_N)"
 
 #: ../src/empathy-preferences.ui.h:30
 msgid "_Open new chats in separate windows"
@@ -3136,7 +3191,7 @@ msgstr "å°?æ??ç??é?£çµ¡äººå?¬é??ä½?ç½®(_P)"
 msgid "_Reduce location accuracy"
 msgstr "é??ä½?ä½?ç½®æº?確度(_R)"
 
-#: ../src/empathy-status-icon.c:179
+#: ../src/empathy-status-icon.c:175
 msgid "Respond"
 msgstr "å??æ??"
 
@@ -3148,18 +3203,6 @@ msgstr "ç??æ??"
 msgid "_Quit"
 msgstr "çµ?æ??(_Q)"
 
-#: ../src/empathy-tube-dispatch.c:376
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "ç?¡æ³?å??å??æ??å?? %s ç??æ??ç?¨ç¨?å¼?ï¼?%s"
-
-#: ../src/empathy-tube-dispatch.c:447
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr "æ??æ??å?ºæ??å?? %s ç??é??è«?ï¼?ä½?æ?¯æ?¨æ²?æ??è??ç??å®?æ??é??ç??å¤?é?¨æ??ç?¨ç¨?å¼?ã??"
-
 #: ../src/empathy-map-view.ui.h:1
 msgid "Contact Map View"
 msgstr "é?£çµ¡äººå?°å??檢è¦?"
@@ -3226,96 +3269,27 @@ msgid ""
 "extension."
 msgstr "é?¸å??ç??é?£ç·?管ç??ç¨?å¼?ä¸?æ?¯æ?´é? 端å?µé?¯æ?´å??å??è?½ã??"
 
-#~ msgid "Can't set an empty display name"
-#~ msgstr "ä¸?è?½è¨­å®?空ç?½ç??顯示å??稱"
-
-#~ msgid "Unsupported command"
-#~ msgstr "ä¸?æ?¯æ?´æ­¤æ??令"
-
-#~ msgid "_View Previous Conversations"
-#~ msgstr "檢è¦?å??ä¸?次è«?話(_V)"
-
-#~ msgid "C_all"
-#~ msgstr "é??話(_A)"
-
-#~ msgid ""
-#~ "The contact to display in the applet. Empty means no contact is displayed."
-#~ msgstr "è¦?å?¨é?¢æ?¿ç¨?å¼?中顯示ç??é?£çµ¡äººã??ç??空代表ä¸?顯示é?£çµ¡äººã??"
-
-#~ msgid "The contact's avatar token. Empty means contact has no avatar."
-#~ msgstr "æ­¤é?£çµ¡äººç??å¤§é ­è²¼è¨?è??ã??ç??空代表é?£çµ¡äººæ²?æ??å¤§é ­è²¼ã??"
-
-#~ msgid "Talk!"
-#~ msgstr "�話�"
-
-#~ msgid "_Information"
-#~ msgstr "��(_I)"
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "é??è«?å??è??"
 
-#~ msgid "_Preferences"
-#~ msgstr "å??好設å®?(_P)"
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "é?¸æ??æ?³è¦?é??è«?é?²å?¥è«?話ç??è?¯çµ¡äººï¼?"
 
-#~ msgid "Please configure a contact."
-#~ msgstr "è«?設å®?é?£çµ¡äººã??"
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "�誤���� <span style=\"italic\">%s</span>"
 
-#~ msgid "Select contact..."
-#~ msgstr "é?¸æ??é?£çµ¡äºº..."
+#~ msgid "Hidden"
+#~ msgstr "é?±è??"
 
-#~ msgid "Presence"
-#~ msgstr "ä¸?ç·?ç??æ??"
+#~ msgid "User requested disconnect"
+#~ msgstr "é?£æ?¥ä¸?ä¸?è¦?æ±?ç??使ç?¨è??"
 
-#~ msgid "Set your own presence"
-#~ msgstr "設å®?æ?¨è?ªå·±ç??ä¸?ç·?ç??æ??"
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>ä½?ç½®</b>"
 
-#~ msgid ""
-#~ "You are about to remove your %s account!\n"
-#~ "Are you sure you want to proceed?"
-#~ msgstr ""
-#~ "æ?¨å?³å°?移é?¤æ?¨ç?? %s 帳è??ï¼?\n"
-#~ "確��繼��"
-
-#~ msgid ""
-#~ "Any associated conversations and chat rooms will NOT be removed if you "
-#~ "decide to proceed.\n"
-#~ "\n"
-#~ "Should you decide to add the account back at a later time, they will "
-#~ "still be available."
-#~ msgstr ""
-#~ "å¦?æ??æ?¨æ±ºå®?è¦?ç¹¼çº?ï¼?ä»»ä½?ç?¸é??ç??è«?話å??è??天室並ä¸?æ??被移é?¤ã??\n"
-#~ "\n"
-#~ "ç?¶æ?¨å¾?å¾?決å®?è¦?å°?該帳è??é??æ?°å? å?¥æ??ï¼?ä¸?è¿°è³?æº?å°?ä»?ç?¶å?¯ä»¥å??ç?¨ã??"
-
-#~ msgid "Add new"
-#~ msgstr "å? å?¥æ?°ç??"
-
-#~ msgid "Cr_eate"
-#~ msgstr "建�(_E)"
-
-#~ msgid "_Reuse an existing account"
-#~ msgstr "é??è¤?使ç?¨æ?¢å­?ç??帳è??(_R)"
-
-#~ msgid "account"
-#~ msgstr "帳è??"
-
-#~ msgid "Conversations (%d)"
-#~ msgstr "�話 (%d)"
-
-#~ msgid "_Contact"
-#~ msgstr "�絡人(_C)"
-
-#~ msgid "No error specified"
-#~ msgstr "æ²?æ??æ??å®?ç??é?¯èª¤"
-
-#~ msgid "Unknown error"
-#~ msgstr "ä¸?æ??ç??é?¯èª¤"
-
-#~ msgid "Allow _GPS usage"
-#~ msgstr "å??許使ç?¨ _GPS"
-
-#~ msgid "Allow _cellphone usage"
-#~ msgstr "å??許使ç?¨è¡?å??é?»è©±(_C)"
-
-#~ msgid "Allow _network usage"
-#~ msgstr "å??許使ç?¨ç¶²è·¯(_N)"
-
-#~ msgid "Geoclue Settings"
-#~ msgstr "Geoclue 設��"
+#, fuzzy
+#~ msgid "_Addâ?¦"
+#~ msgstr "å? å?¥(_A)..."