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

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

commit 1abde726f2920d166728b79cc6e2cdc5e72ea1df
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Fri Feb 12 06:08:41 2010 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  368 ++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po |  375 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 361 insertions(+), 382 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index c21efde..c8edfbb 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.29.7\n"
+"Project-Id-Version: empathy 2.29.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-26 05:54+0800\n"
-"PO-Revision-Date: 2010-01-26 05:59+0800\n"
+"POT-Creation-Date: 2010-02-12 06:03+0800\n"
+"PO-Revision-Date: 2010-02-12 06:08+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,7 +49,6 @@ 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ã??ï¼?ã??"
@@ -88,7 +87,7 @@ msgstr "Empathy �以�� GPS ��測�置"
 
 #: ../data/empathy.schemas.in.h:13
 msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy å?¯ä»¥å?©ç?¨æ??æ©?網絡å?ºå?°å?°ä¾?æ?¨æ¸¬ä½?ç½®"
+msgstr "Empathy å?¯ä»¥å?©ç?¨æµ?å??é?»è©±ç¶²çµ¡å?ºå?°å?°ä¾?æ?¨æ¸¬ä½?ç½®"
 
 #: ../data/empathy.schemas.in.h:14
 msgid "Empathy can use the network to guess the location"
@@ -251,43 +250,35 @@ msgid "Use theme for chat rooms"
 msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
 #: ../data/empathy.schemas.in.h:54
-#, fuzzy
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??è?¯çµ¡äººã??"
 
 #: ../data/empathy.schemas.in.h:55
-#, fuzzy
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:56
-#, fuzzy
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨æµ?å??é?»è©±ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:57
-#, fuzzy
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²çµ¡ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:58
-#, fuzzy
 msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr "Empathy æ?¯å?¦æ??è©¢å??ä½ è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
 
 #: ../data/empathy.schemas.in.h:59
-#, fuzzy
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥ä½ ç??帳è??ã??"
 
 #: ../data/empathy.schemas.in.h:60
-#, fuzzy
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy æ?¯å?¦å?ºæ?¼ç§?é?±ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
 
 #: ../data/empathy.schemas.in.h:61
-#, fuzzy
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨è?¯çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
@@ -298,146 +289,120 @@ msgid ""
 msgstr "æ?¯å?¦å??ç?¨ WebKit é??ç?¼è??å·¥å?·ï¼?ä¾?å¦? Web Inspectorã??"
 
 #: ../data/empathy.schemas.in.h:63
-#, fuzzy
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?/é??æ?°é?£ç·?ã??"
 
 #: ../data/empathy.schemas.in.h:64
-#, 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 to check words typed against the languages you want to check with."
 msgstr "æ?¯å?¦ä»¥ä½ 設å®?ç??èª?è¨?檢æ?¥è¼¸å?¥æ??ç?¡é?¯å­?ã??"
 
 #: ../data/empathy.schemas.in.h:66
-#, fuzzy
 msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "å?¨è«?話中æ?¯å?¦å°?表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
+msgstr "æ?¯å?¦å°?è«?話中ç??表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
 
 #: ../data/empathy.schemas.in.h:67
-#, 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 to play a sound to notify of contacts logging out of the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??è?¯çµ¡äººç?»å?ºç¶²çµ¡ã??"
 
 #: ../data/empathy.schemas.in.h:69
-#, fuzzy
 msgid "Whether to play a sound to notify of events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
 #: ../data/empathy.schemas.in.h:70
-#, fuzzy
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??æ?¶å?°è¨?æ?¯ã??"
 
 #: ../data/empathy.schemas.in.h:71
-#, fuzzy
 msgid "Whether to play a sound to notify of new conversations."
-msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥é??å??æ?°ç??è«?話ã??"
+msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ?°ç??è«?話ã??"
 
 #: ../data/empathy.schemas.in.h:72
-#, fuzzy
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é??å?ºè¨?æ?¯ã??"
 
 #: ../data/empathy.schemas.in.h:73
-#, fuzzy
 msgid "Whether to play a sound when logging into a network."
 msgstr "ç?¶ç?»å?¥æ??網絡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
 #: ../data/empathy.schemas.in.h:74
-#, fuzzy
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ç?¶ç?»å?ºæ??網絡æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
 #: ../data/empathy.schemas.in.h:75
-#, fuzzy
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦æ?­æ?¾é?³æ??é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:76
-#, fuzzy
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ç?¶è?¯çµ¡äººé?¢ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:77
-#, fuzzy
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ç?¶è?¯çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:78
-#, fuzzy
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ï¼?å?³ä½¿å·²é??å??è??天è¦?çª?ï¼?ä½?æ²?æ??ç?²å¾?ç?¦é»?ï¼?ã??"
 
 #: ../data/empathy.schemas.in.h:79
-#, fuzzy
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ç?¶æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:80
-#, fuzzy
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "æ?¯å?¦å?¨è?¯çµ¡äººæ¸?å?®è??è??天è¦?çª?顯示è?¯çµ¡äººå¤§é ­è²¼ã??"
 
 #: ../data/empathy.schemas.in.h:81
-#, fuzzy
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦å?¨è?¯çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??è?¯çµ¡äººã??"
 
 #: ../data/empathy.schemas.in.h:82
-#, fuzzy
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:83
-#, fuzzy
 msgid "Whether to show protocols for contacts in the contact list."
-msgstr "æ?¯å?¦è¦?顯示è?¯çµ¡äººæ¸?å?®å?§ç??è?¯çµ¡äººä½¿ç?¨å??å®?ã??"
+msgstr "æ?¯å?¦è¦?å?¨è?¯çµ¡äººæ¸?å?®å?§é¡¯ç¤ºè?¯çµ¡äººä½¿ç?¨å??å®?ã??"
 
 #: ../data/empathy.schemas.in.h:84
-#, fuzzy
 msgid "Whether to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室中顯示è?¯çµ¡äººæ¸?å?®ã??"
 
 #: ../data/empathy.schemas.in.h:85
-#, fuzzy
 msgid "Whether to show the contact list in compact mode."
 msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示è?¯çµ¡äººæ¸?å?®ã??"
 
 #: ../data/empathy.schemas.in.h:86
-#, 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
-#, fuzzy
 msgid "Whether to use the theme for chat rooms."
-msgstr "æ?¯å?¦å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
+msgstr "æ?¯å?¦ç?ºè??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
 
 #: ../data/empathy.schemas.in.h:88
-#, fuzzy
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
 "the contact list by state."
-msgstr "æ??åº?è?¯çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æº?å??ã??é ?設å?¼æ?¯ä½¿ç?¨è?¯çµ¡äººç??å??稱ã??nameã??å?¼ä¾?æ??åº?ã??è??ã??stateã??å?¼å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?è?¯çµ¡äººæ¸?å?®ã??"
+msgstr "æ??åº?è?¯çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æº?å??ã??é ?設å?¼æ?¯ä½¿ç?¨è?¯çµ¡äººç??å??稱ã??nameã??(å??稱) å?¼ä¾?æ??åº?ã??è??ã??stateã??(ç??æ??) å?¼å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?è?¯çµ¡äººæ¸?å?®ã??"
 
 #: ../libempathy/empathy-ft-handler.c:840
 msgid "The hash of the received file and the sent one do not match"
@@ -458,7 +423,7 @@ msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 #: ../libempathy/empathy-tp-contact-list.c:834
 #: ../src/empathy-auto-salut-account-helper.c:96
 msgid "People nearby"
-msgstr "��人�"
+msgstr "é??è¿?ç??人"
 
 #: ../libempathy/empathy-tp-file.c:280
 msgid "Socket type not supported"
@@ -568,15 +533,15 @@ msgstr "è­?æ?¸ç?ºè?ªæ??簽署"
 msgid "Certificate error"
 msgstr "���誤"
 
-#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
-msgstr "��人�"
+msgstr "é??è¿?ç??人"
 
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:434
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ��"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:435
 msgid "Facebook Chat"
 msgstr "Facebook è??天"
 
@@ -630,11 +595,15 @@ msgstr "��"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1329
+#: ../libempathy-gtk/empathy-account-widget.c:1117"
+msgid "Username:"
+msgstr "使ç?¨è??å??稱ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1445
 msgid "L_og in"
 msgstr "��(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -642,15 +611,15 @@ msgstr "��(_O)"
 msgid "Account:"
 msgstr "帳è??ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1407
+#: ../libempathy-gtk/empathy-account-widget.c:1523
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1472
+#: ../libempathy-gtk/empathy-account-widget.c:1588
 msgid "This account already exists on the server"
 msgstr "此帳è??å·²ç¶?å­?å?¨é??å??伺æ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1475
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??伺æ??å?¨ä¸?建ç«?æ?°ç??帳è??"
 
@@ -659,19 +628,19 @@ 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:1858
+#: ../libempathy-gtk/empathy-account-widget.c:1974
 #, 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:1876
+#: ../libempathy-gtk/empathy-account-widget.c:2000
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:2004
 msgid "New account"
 msgstr "æ?°å¢?帳è??"
 
@@ -716,7 +685,7 @@ msgstr "ä½ ç?? AIM è?¢å¹?å??稱æ?¯ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
@@ -725,7 +694,7 @@ msgstr "é?£æ?¥å? (_P):"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -862,38 +831,54 @@ msgid "Reso_urce:"
 msgstr "��(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Use old SS_L"
 msgstr "使ç?¨è??ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+msgid "What is your Facebook password?"
+msgstr "ä½ ç?? Facebook å¯?碼æ?¯ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your Facebook username?"
+msgstr "ä½ ç?? Facebook 使ç?¨è??å??稱æ?¯ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "What is your Google ID?"
 msgstr "ä½ ç?? Google ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "What is your Google password?"
 msgstr "ä½ ç?? Google å¯?碼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "What is your Jabber ID?"
 msgstr "ä½ ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Jabber password?"
 msgstr "ä½ ç?? Jabber å¯?碼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your desired Jabber ID?"
 msgstr "ä½ æ?³è¦?ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your desired Jabber password?"
 msgstr "ä½ æ?³è¦?ç?? Jabber å¯?碼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "_Encryption required (TLS/SSL)"
 msgstr "è¦?æ±?å? å¯?[TLS/SSL](_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "_Ignore SSL certificate errors"
 msgstr "忽� SSL ���誤(_I)"
 
@@ -958,7 +943,6 @@ msgid "Interval (seconds)"
 msgstr "é??é??ï¼?ç§?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-#, fuzzy
 msgid "Keep-Alive Options"
 msgstr "ä¿?æ??ä¸?æ?·ç·?é?¸é ?"
 
@@ -1017,10 +1001,11 @@ msgid "Transport:"
 msgstr "å?³é??é??è¨?å? :"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#, fuzzy
 msgid ""
 "Update the registration binding if the external address for the client is "
 "discovered to be different from the local binding."
-msgstr ""
+msgstr "å¦?æ??客æ?¶ç«¯ç??å¤?é?¨ä½?å??被æ?¢ç´¢å?ºè??æ?¬å?°ç«¯ç¶?å®?ä¸?å??æ??ï¼?é?²è¡?註å??ç¶?å®?æ?´æ?°"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid ""
@@ -1171,63 +1156,63 @@ msgstr "æ?ªç?¥ç??å?½ä»¤"
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??令ï¼?è«?å??è¦? /help 以å??å¾?å?¯ç?¨ç??æ??令"
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1144
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1146
+#: ../libempathy-gtk/empathy-chat.c:1147
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??è?¯çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1150
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1153
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1156
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1163
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1193
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1194
+#: ../libempathy-gtk/empathy-chat.c:1195
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:1593
+#: ../libempathy-gtk/empathy-chat.c:1594
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1647
+#: ../libempathy-gtk/empathy-chat.c:1648
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1665
+#: ../libempathy-gtk/empathy-chat.c:1666
 #: ../libempathy-gtk/empathy-ui-utils.c:1658
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1699
+#: ../libempathy-gtk/empathy-chat.c:1700
 msgid "_Spelling Suggestions"
 msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1814
+#: ../libempathy-gtk/empathy-chat.c:1815
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已��"
@@ -1235,12 +1220,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:1821
+#: ../libempathy-gtk/empathy-chat.c:1822
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢��"
 
-#: ../libempathy-gtk/empathy-chat.c:1824
+#: ../libempathy-gtk/empathy-chat.c:1825
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢���"
@@ -1248,17 +1233,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:1832
+#: ../libempathy-gtk/empathy-chat.c:1833
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1835
+#: ../libempathy-gtk/empathy-chat.c:1836
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1839
+#: ../libempathy-gtk/empathy-chat.c:1840
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
@@ -1268,22 +1253,22 @@ msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:1849
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1873
+#: ../libempathy-gtk/empathy-chat.c:1874
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1898
+#: ../libempathy-gtk/empathy-chat.c:1899
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��被稱� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2033 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2034 ../src/empathy-call-window.c:1531
 msgid "Disconnected"
 msgstr "已��"
 
@@ -1334,15 +1319,15 @@ msgstr "é??å??é?£çµ?(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
 msgid "Edit Contact Information"
 msgstr "編輯�絡人��"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
 msgid "Personal Information"
 msgstr "å??人è³?æ??"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 msgid "New Contact"
 msgstr "���絡人"
 
@@ -1354,28 +1339,28 @@ msgstr "ç¨?å¾?å??決å®?"
 msgid "Subscription Request"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1512
+#: ../libempathy-gtk/empathy-contact-list-view.c:1516
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤ç¾£çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1514
+#: ../libempathy-gtk/empathy-contact-list-view.c:1518
 msgid "Removing group"
 msgstr "正�移�羣�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1561
-#: ../libempathy-gtk/empathy-contact-list-view.c:1638
+#: ../libempathy-gtk/empathy-contact-list-view.c:1565
+#: ../libempathy-gtk/empathy-contact-list-view.c:1642
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1591
+#: ../libempathy-gtk/empathy-contact-list-view.c:1595
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤è?¯çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1593
+#: ../libempathy-gtk/empathy-contact-list-view.c:1597
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
@@ -1416,17 +1401,17 @@ msgstr "å??享æ??ç??æ¡?é?¢"
 msgid "Infor_mation"
 msgstr "��(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:496
+#: ../libempathy-gtk/empathy-contact-menu.c:497
 #: ../src/empathy-chat-window.c:866
 msgid "Inviting you to this room"
 msgstr "é??è«?ä½ å?°é??å??è??天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:527
+#: ../libempathy-gtk/empathy-contact-menu.c:528
 msgid "_Invite to chat room"
 msgstr "é??è«?å?°è??天室(_I)"
 
@@ -1741,11 +1726,12 @@ msgstr "���"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
 msgid "Match case"
-msgstr ""
+msgstr "符å??æ¢?件"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#, fuzzy
 msgid "Phrase not found"
-msgstr ""
+msgstr "�����"
 
 #: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
@@ -2014,23 +2000,23 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:762
+#: ../src/empathy.c:764
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:766
+#: ../src/empathy.c:768
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?顯示è?¯çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?話çª?"
 
-#: ../src/empathy.c:770
+#: ../src/empathy.c:772
 msgid "Show the accounts dialog"
 msgstr "顯示帳è??å°?話ç??"
 
-#: ../src/empathy.c:782
+#: ../src/empathy.c:784
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??客æ?¶ç«¯"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -2038,7 +2024,7 @@ msgid ""
 "version."
 msgstr "Empathy æ?¯è?ªç?±è»?件ï¼?ä½ å?¯ä»¥é?µç?§è?ªç?±è»?件å?ºé??æ?? (Free Software Foundation) å?ºç??ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2046,18 +2032,18 @@ msgid ""
 "details."
 msgstr "ç?¼ä½? Empathy ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:93
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
 "Street, Fifth Floor, Boston, MA 02110-130159 USA"
 msgstr "ä½ æ??該已ç¶?å?? Empathy ä¸?èµ·æ?¶å?°ä¸?份 GNU é??ç?¨å?¬å?±è¨±å?¯è­?ç??å?¯æ?¬ï¼?å¦?æ??é??æ²?æ??ï¼?寫信給ï¼? Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:121
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME ç??å?³æ??è¨?æ?¯å®¢æ?¶ç«¯ç¨?å¼?"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:127
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -2068,135 +2054,132 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../src/empathy-account-assistant.c:165
+#: ../src/empathy-account-assistant.c:166
 msgid "There was an error while importing the accounts."
 msgstr "å?¯å?¥å¸³è??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:168
+#: ../src/empathy-account-assistant.c:169
 msgid "There was an error while parsing the account details."
 msgstr "解æ??帳è??詳細è³?æ??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:171
+#: ../src/empathy-account-assistant.c:172
 msgid "There was an error while creating the account."
 msgstr "建ç«?帳è??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:173
+#: ../src/empathy-account-assistant.c:174
 msgid "There was an error."
 msgstr "æ??é?¯èª¤ç?¼ç??ã??"
 
-#: ../src/empathy-account-assistant.c:177
-#, fuzzy, c-format
+#: ../src/empathy-account-assistant.c:178
+#, c-format
 msgid "The error message was: %s"
-msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
+msgstr "�誤����%s"
 
-#: ../src/empathy-account-assistant.c:181
+#: ../src/empathy-account-assistant.c:182
 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:218
-#: ../src/empathy-account-assistant.c:1241
+#: ../src/empathy-account-assistant.c:219
+#: ../src/empathy-account-assistant.c:1275
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
-#. Create account
 #. To translator: %s is the protocol name
 #. Create account
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:395 ../src/empathy-accounts-dialog.c:552
+#: ../src/empathy-account-assistant.c:414 ../src/empathy-accounts-dialog.c:559
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å¢? %s 帳è??"
 
-#: ../src/empathy-account-assistant.c:472
+#: ../src/empathy-account-assistant.c:495
 msgid "What kind of chat account do you have?"
 msgstr "ä½ ç??è??天帳è??æ?¯å?ªä¸?種ï¼?"
 
-#: ../src/empathy-account-assistant.c:478
+#: ../src/empathy-account-assistant.c:501
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "ä½ é??æ?³è¦?設å®?å?¶ä»?ç??è??天帳è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:507
 msgid "Enter your account details"
 msgstr "è«?輸å?¥ä½ ç??帳è??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:489
+#: ../src/empathy-account-assistant.c:512
 msgid "What kind of chat account do you want to create?"
 msgstr "ä½ æ?³è¦?建ç«?ä½?種è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:495
+#: ../src/empathy-account-assistant.c:518
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?建ç«?å?¶ä»?è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:525
 msgid "Enter the details for the new account"
 msgstr "è«?輸å?¥æ?°å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:617
+#: ../src/empathy-account-assistant.c:640
 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 "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
-msgstr "使ç?¨ Empathy å?¯ä»¥å?¨ç¶²ä¸?è·?é?°è¿?ç??人å?¡è??天ï¼?æ??æ?¯å??使ç?¨ Google Talkã??AIMã??Windows Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網絡æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?å??é??話ã??"
+msgstr "使ç?¨ Empathy å?¯ä»¥å?¨ç¶²ä¸?è·?é??è¿?ç??人è??天ï¼?æ??æ?¯å??使ç?¨ Google Talkã??AIMã??Windows Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網絡æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?å??é??話ã??"
 
-#: ../src/empathy-account-assistant.c:634
+#: ../src/empathy-account-assistant.c:657
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "ä½ æ?¯å?¦æ??使ç?¨å?¶ä»?è??天ç¨?å¼?ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:657
+#: ../src/empathy-account-assistant.c:680
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??帳è??詳細è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:678
+#: ../src/empathy-account-assistant.c:701
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?輸å?¥å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:723
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:710
+#: ../src/empathy-account-assistant.c:733
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:731
+#: ../src/empathy-account-assistant.c:754
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:815
+#: ../src/empathy-account-assistant.c:838
 #: ../src/empathy-new-chatroom-dialog.c:541
 #: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:822
+#: ../src/empathy-account-assistant.c:845
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??樣"
 
-#: ../src/empathy-account-assistant.c:1064
+#: ../src/empathy-account-assistant.c:1098
 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 ""
+msgstr "Empathy å?¯ä»¥è?ªå??æ?¢ç´¢ä¸¦å??è??ä½ é?£ç·?å?°ç?¸å??網絡ä¸?ç??人å??è??天ã??å¦?æ??ä½ æ?³è¦?使ç?¨æ­¤å??è?½ï¼?è«?檢æ?¥ä¸?å??詳細è³?æ??æ?¯å?¦æ­£ç¢ºã??ä½ ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°æ?´æ?¹é??äº?ç´°ç¯?ï¼?æ??æ?¯æ?¯ç?¨ã??帳è??ã??å°?話çª?ä¾?å??ç?¨æ­¤å??è?½"
 
-#: ../src/empathy-account-assistant.c:1070
-#: ../src/empathy-account-assistant.c:1126
-#, fuzzy
+#: ../src/empathy-account-assistant.c:1104
+#: ../src/empathy-account-assistant.c:1160
 msgid "Edit->Accounts"
-msgstr "編輯帳è??"
+msgstr "編輯 -> 帳è??"
 
-#: ../src/empathy-account-assistant.c:1086
-#, fuzzy
+#: ../src/empathy-account-assistant.c:1120
 msgid "I don't want to enable this feature for now"
-msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
+msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
 
-#: ../src/empathy-account-assistant.c:1122
+#: ../src/empathy-account-assistant.c:1156
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed.\n"
@@ -2204,22 +2187,25 @@ msgid ""
 "package\n"
 "and create a People Nearby account from the Accounts dialog "
 msgstr ""
+"ä½ ç?¡æ³?è??é?£ç·?å?°ä½ æ?¬æ©?網絡ç??人å??è??天ï¼?å? ç?º telepathy-salut å°?æ?ªå®?è£?ã??\n"
+"å¦?æ??ä½ æ?³è¦?å??ç?¨æ­¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?件\n"
+"並å¾?ã??帳è??ã??å°?話çª?建ç«?ã??é??è¿?ç??人ã??帳è??"
 
-#: ../src/empathy-account-assistant.c:1128
+#: ../src/empathy-account-assistant.c:1162
 msgid "telepathy-salut not installed"
-msgstr ""
+msgstr "telepathy-salut ����"
 
-#: ../src/empathy-account-assistant.c:1205
+#: ../src/empathy-account-assistant.c:1239
 msgid "Welcome to Empathy"
 msgstr "歡�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:1214
+#: ../src/empathy-account-assistant.c:1248
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:1232
+#: ../src/empathy-account-assistant.c:1266
 msgid "Please enter personal details"
-msgstr ""
+msgstr "è«?輸å?¥å??人詳細è³?æ??"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
@@ -2234,33 +2220,33 @@ msgstr "æ??è??ä½ ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å­?ä½ ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:259 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:260 ../src/empathy-call-window.c:729
 msgid "Connectingâ?¦"
 msgstr "��中..."
 
-#: ../src/empathy-accounts-dialog.c:286
+#: ../src/empathy-accounts-dialog.c:287
 #, c-format
 msgid "Disconnected â?? %s"
 msgstr "å·²æ?·ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:291
+#: ../src/empathy-accounts-dialog.c:292
 #, c-format
 msgid "Offline â?? %s"
 msgstr "é?¢ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:304
+#: ../src/empathy-accounts-dialog.c:305
 msgid "Offline â?? No Network Connection"
 msgstr "é?¢ç·? â?? ç?¡ç¶²çµ¡é?£ç·?"
 
-#: ../src/empathy-accounts-dialog.c:312
+#: ../src/empathy-accounts-dialog.c:313
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç??ç??æ??"
 
-#: ../src/empathy-accounts-dialog.c:323
+#: ../src/empathy-accounts-dialog.c:324
 msgid "Offline â?? Account Disabled"
 msgstr "é?¢ç·? â?? 帳è??å·²å??ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:720
+#: ../src/empathy-accounts-dialog.c:730
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2268,16 +2254,16 @@ msgstr ""
 "ä½ å?³å°?建ç«?æ?°ç??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1054
+#: ../src/empathy-accounts-dialog.c:1067
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?ä½ ç??é?»è?¦ä¸?移é?¤ç¾£çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1058
+#: ../src/empathy-accounts-dialog.c:1071
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??移é?¤ä¼ºæ??å?¨ä¸?ç??ä½ ç??帳è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1286
+#: ../src/empathy-accounts-dialog.c:1301
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2285,7 +2271,7 @@ msgstr ""
 "ä½ å?³å°?建ç«?å?¦ä¸?å??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1829
+#: ../src/empathy-accounts-dialog.c:1848
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2294,7 +2280,7 @@ msgstr ""
 "ä½ æ??å??ç??æ?´æ?¹ã??確å®?è¦?ç¹¼çº?ï¼?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1956
+#: ../src/empathy-accounts-dialog.c:1979
 msgid "Accounts"
 msgstr "帳è??"
 
@@ -2313,12 +2299,10 @@ msgid ""
 msgstr "è¦?å? å?¥æ?°ç??帳è??ï¼?ä½ å¿?é ?å??å®?è£?æ¯?å??æ??ç?¨å?°ç??é??è¨?å??å®?å¾?端ç¨?å¼?ã??"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-#, fuzzy
 msgid "_Add&#x2026;"
 msgstr "å? å?¥(_A)&#x2026;"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
-#, fuzzy
 msgid "_Import&#x2026;"
 msgstr "��(_I)&#x2026;"
 
@@ -2482,7 +2466,7 @@ msgstr "å??æ??é?³è¨?å?³æ?­"
 
 #: ../src/empathy-call-window.ui.h:13
 msgid "V_ideo"
-msgstr "å½±å??(_I)"
+msgstr "è¦?å??(_I)"
 
 #: ../src/empathy-call-window.ui.h:14
 msgid "Video Off"
@@ -2568,6 +2552,10 @@ msgstr "�話(_C)"
 msgid "_Detach Tab"
 msgstr "å??é?¢å??é ?(_D)"
 
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "編輯(_E)"
+
 #: ../src/empathy-chat-window.ui.h:12
 msgid "_Favorite Chat Room"
 msgstr "å??好ç??è??天室(_F)"
@@ -3181,63 +3169,63 @@ msgstr "çµ?æ??(_Q)"
 msgid "Contact Map View"
 msgstr "è?¯çµ¡äººå?°å??檢è¦?"
 
-#: ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1065
 msgid "Save"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1185
+#: ../src/empathy-debug-window.c:1187
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-window.c:1265
+#: ../src/empathy-debug-window.c:1267
 msgid "Pause"
 msgstr "æ?«å??"
 
-#: ../src/empathy-debug-window.c:1277
+#: ../src/empathy-debug-window.c:1279
 msgid "Level "
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1297
+#: ../src/empathy-debug-window.c:1299
 msgid "Debug"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1303
+#: ../src/empathy-debug-window.c:1305
 msgid "Info"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
+#: ../src/empathy-debug-window.c:1311 ../src/empathy-debug-window.c:1360
 msgid "Message"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1315
+#: ../src/empathy-debug-window.c:1317
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../src/empathy-debug-window.c:1321
+#: ../src/empathy-debug-window.c:1323
 msgid "Critical"
 msgstr "å?´é??"
 
-#: ../src/empathy-debug-window.c:1327
+#: ../src/empathy-debug-window.c:1329
 msgid "Error"
 msgstr "�誤"
 
-#: ../src/empathy-debug-window.c:1346
+#: ../src/empathy-debug-window.c:1348
 msgid "Time"
 msgstr "æ??å?»"
 
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1351
 msgid "Domain"
 msgstr "網å??"
 
-#: ../src/empathy-debug-window.c:1351
+#: ../src/empathy-debug-window.c:1353
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../src/empathy-debug-window.c:1353
+#: ../src/empathy-debug-window.c:1355
 msgid "Level"
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1387
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b5dbaf5..3296c77 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,10 +7,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.29.7\n"
+"Project-Id-Version: empathy 2.29.90\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-26 05:54+0800\n"
-"PO-Revision-Date: 2010-01-23 00:17+0800\n"
+"POT-Creation-Date: 2010-02-12 06:03+0800\n"
+"PO-Revision-Date: 2010-02-10 22:55+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,7 +49,6 @@ 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ã??ï¼?ã??"
@@ -88,7 +87,7 @@ msgstr "Empathy �以�� GPS ��測�置"
 
 #: ../data/empathy.schemas.in.h:13
 msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy å?¯ä»¥å?©ç?¨æ??æ©?網路å?ºå?°å?°ä¾?æ?¨æ¸¬ä½?ç½®"
+msgstr "Empathy å?¯ä»¥å?©ç?¨è¡?å??é?»è©±ç¶²è·¯å?ºå?°å?°ä¾?æ?¨æ¸¬ä½?ç½®"
 
 #: ../data/empathy.schemas.in.h:14
 msgid "Empathy can use the network to guess the location"
@@ -251,43 +250,35 @@ msgid "Use theme for chat rooms"
 msgstr "å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?"
 
 #: ../data/empathy.schemas.in.h:54
-#, fuzzy
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy æ?¯å?¦è¦?å°?使ç?¨è??ç??ä½?ç½®ç?¼ä½?給ä»?ç??é?£çµ¡äººã??"
 
 #: ../data/empathy.schemas.in.h:55
-#, fuzzy
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ GPS ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:56
-#, fuzzy
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨è¡?å??é?»è©±ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:57
-#, fuzzy
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨ç¶²è·¯ä¾?æ?¨æ¸¬ä½?ç½®ã??"
 
 #: ../data/empathy.schemas.in.h:58
-#, fuzzy
 msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr "Empathy æ?¯å?¦æ??è©¢å??æ?¨è¦?ä¸?è¦?å¾?å?¶ä»?ç¨?å¼?å?¯å?¥å¸³è??ã??"
 
 #: ../data/empathy.schemas.in.h:59
-#, fuzzy
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy æ?¯å?¦æ??å?¨å??å??æ??è?ªå??ç?»å?¥æ?¨ç??帳è??ã??"
 
 #: ../data/empathy.schemas.in.h:60
-#, fuzzy
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy æ?¯å?¦å?ºæ?¼é?±ç§?ç??ç??ç?±æ¸?ä½?ä½?ç½®ç??æº?確度ã??"
 
 #: ../data/empathy.schemas.in.h:61
-#, fuzzy
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy æ?¯å?¦ä½¿ç?¨é?£çµ¡äººå¤§é ­è²¼å??ç?ºè??天è¦?çª?å??示ã??"
@@ -298,148 +289,122 @@ msgid ""
 msgstr "æ?¯å?¦å??ç?¨ WebKit é??ç?¼è??å·¥å?·ï¼?ä¾?å¦? Web Inspectorã??"
 
 #: ../data/empathy.schemas.in.h:63
-#, fuzzy
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "æ?¯å?¦ä½¿ç?¨é?£ç·?管ç??ç¨?å¼?è?ªå??æ?·ç·?/é??æ?°é?£ç·?ã??"
 
 #: ../data/empathy.schemas.in.h:64
-#, 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 to check words typed against the languages you want to check with."
 msgstr "æ?¯å?¦ä»¥æ?¨è¨­å®?ç??èª?è¨?檢æ?¥è¼¸å?¥æ??ç?¡é?¯å­?ã??"
 
 #: ../data/empathy.schemas.in.h:66
-#, fuzzy
 msgid "Whether to convert smileys into graphical images in conversations."
-msgstr "å?¨è«?話中æ?¯å?¦å°?表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
+msgstr "æ?¯å?¦å°?è«?話中ç??表æ??符è??è½?æ??ç?ºå??ç??å½¢å¼?ã??"
 
 #: ../data/empathy.schemas.in.h:67
-#, 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 to play a sound to notify of contacts logging out of the network."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é?£çµ¡äººç?»å?ºç¶²è·¯ã??"
 
 #: ../data/empathy.schemas.in.h:69
-#, fuzzy
 msgid "Whether to play a sound to notify of events."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??äº?件ç?¼ç??ã??"
 
 #: ../data/empathy.schemas.in.h:70
-#, fuzzy
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??æ?¶å?°è¨?æ?¯ã??"
 
 #: ../data/empathy.schemas.in.h:71
-#, fuzzy
 msgid "Whether to play a sound to notify of new conversations."
-msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥é??å??æ?°ç??è«?話ã??"
+msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ?°ç??è«?話ã??"
 
 #: ../data/empathy.schemas.in.h:72
-#, fuzzy
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "æ?¯å?¦æ?­æ?¾é?³æ??ä¾?é??ç?¥æ??é??å?ºè¨?æ?¯ã??"
 
 #: ../data/empathy.schemas.in.h:73
-#, fuzzy
 msgid "Whether to play a sound when logging into a network."
 msgstr "ç?¶ç?»å?¥æ??網路æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
 #: ../data/empathy.schemas.in.h:74
-#, fuzzy
 msgid "Whether to play a sound when logging out of a network."
 msgstr "ç?¶ç?»å?ºæ??網路æ??æ?¯å?¦æ?­æ?¾é?³æ??ã??"
 
 #: ../data/empathy.schemas.in.h:75
-#, fuzzy
 msgid "Whether to play sound notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦æ?­æ?¾é?³æ??é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:76
-#, fuzzy
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "ç?¶é?£çµ¡äººé?¢ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:77
-#, fuzzy
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "ç?¶é?£çµ¡äººä¸?ç·?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:78
-#, fuzzy
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ï¼?å?³ä½¿å·²é??å??è??天è¦?çª?ï¼?ä½?æ²?æ??ç?²å¾?ç?¦é»?ï¼?ã??"
 
 #: ../data/empathy.schemas.in.h:79
-#, fuzzy
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "ç?¶æ?¶å?°æ?°è¨?æ?¯æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:80
-#, fuzzy
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "æ?¯å?¦å?¨é?£çµ¡äººæ¸?å?®è??è??天è¦?çª?顯示é?£çµ¡äººå¤§é ­è²¼ã??"
 
 #: ../data/empathy.schemas.in.h:81
-#, fuzzy
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "æ?¯å?¦å?¨é?£çµ¡äººæ¸?å?®ä¸­é¡¯ç¤ºé?¢ç·?ç??é?£çµ¡äººã??"
 
 #: ../data/empathy.schemas.in.h:82
-#, fuzzy
 msgid "Whether to show popup notifications when away or busy."
 msgstr "ç?¶ç??æ??ç?ºé?¢é??æ??å¿?ç¢?æ??æ?¯å?¦é¡¯ç¤ºå½?å?ºå¼?é??ç?¥ã??"
 
 #: ../data/empathy.schemas.in.h:83
-#, fuzzy
 msgid "Whether to show protocols for contacts in the contact list."
-msgstr "æ?¯å?¦è¦?顯示è?¯çµ¡äººæ¸?å?®å?§ç??è?¯çµ¡äººä½¿ç?¨å??å®?ã??"
+msgstr "æ?¯å?¦è¦?å?¨è?¯çµ¡äººæ¸?å?®å?§é¡¯ç¤ºè?¯çµ¡äººä½¿ç?¨å??å®?ã??"
 
 #: ../data/empathy.schemas.in.h:84
-#, fuzzy
 msgid "Whether to show the contact list in chat rooms."
 msgstr "æ?¯å?¦å?¨è??天室中顯示é?£çµ¡äººæ¸?å?®ã??"
 
 #: ../data/empathy.schemas.in.h:85
-#, fuzzy
 msgid "Whether to show the contact list in compact mode."
 msgstr "æ?¯å?¦ä»¥ç²¾ç°¡æ¨¡å¼?顯示é?£çµ¡äººæ¸?å?®ã??"
 
 #: ../data/empathy.schemas.in.h:86
-#, 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
-#, fuzzy
 msgid "Whether to use the theme for chat rooms."
-msgstr "æ?¯å?¦å?¨è??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
+msgstr "æ?¯å?¦ç?ºè??天室使ç?¨ä½?æ?¯ä¸»é¡?ã??"
 
 #: ../data/empathy.schemas.in.h:88
-#, fuzzy
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
 "the contact list by state."
 msgstr ""
-"æ??åº?é?£çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æº?å??ã??é ?設å?¼æ?¯ä½¿ç?¨é?£çµ¡äººç??å??稱ã??nameã??å?¼ä¾?æ??åº?ã??è??"
-"ã??stateã??å?¼å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?é?£çµ¡äººæ¸?å?®ã??"
+"æ??åº?é?£çµ¡äººæ¸?å?®æ??è¦?使ç?¨å?ªå??æº?å??ã??é ?設å?¼æ?¯ä½¿ç?¨é?£çµ¡äººç??å??稱ã??nameã??(å??稱) å?¼ä¾?æ??"
+"åº?ã??è??ã??stateã??(ç??æ??) å?¼å??æ??使ç?¨å?¶ç??æ??ä¾?æ??åº?é?£çµ¡äººæ¸?å?®ã??"
 
 #: ../libempathy/empathy-ft-handler.c:840
 msgid "The hash of the received file and the sent one do not match"
@@ -460,7 +425,7 @@ msgstr "é?¸å??ç??æª?æ¡?æ?¯ç©ºç?½ç??"
 #: ../libempathy/empathy-tp-contact-list.c:834
 #: ../src/empathy-auto-salut-account-helper.c:96
 msgid "People nearby"
-msgstr "��人�"
+msgstr "é??è¿?ç??人"
 
 #: ../libempathy/empathy-tp-file.c:280
 msgid "Socket type not supported"
@@ -570,15 +535,15 @@ msgstr "æ??è­?ç?ºè?ªæ??簽署"
 msgid "Certificate error"
 msgstr "æ??è­?é?¯èª¤"
 
-#: ../libempathy/empathy-utils.c:424 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
-msgstr "��人�"
+msgstr "é??è¿?ç??人"
 
-#: ../libempathy/empathy-utils.c:429
+#: ../libempathy/empathy-utils.c:434
 msgid "Yahoo! Japan"
 msgstr "Yahoo! ��"
 
-#: ../libempathy/empathy-utils.c:430
+#: ../libempathy/empathy-utils.c:435
 msgid "Facebook Chat"
 msgstr "Facebook è??天"
 
@@ -632,11 +597,15 @@ msgstr "��"
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1329
+#: ../libempathy-gtk/empathy-account-widget.c:1117"
+msgid "Username:"
+msgstr "使ç?¨è??å??稱ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1445
 msgid "L_og in"
 msgstr "��(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1396
+#: ../libempathy-gtk/empathy-account-widget.c:1512
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -644,15 +613,15 @@ msgstr "��(_O)"
 msgid "Account:"
 msgstr "帳è??ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1407
+#: ../libempathy-gtk/empathy-account-widget.c:1523
 msgid "Enabled"
 msgstr "å·²å??ç?¨"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1472
+#: ../libempathy-gtk/empathy-account-widget.c:1588
 msgid "This account already exists on the server"
 msgstr "此帳è??å·²ç¶?å­?å?¨é??å??伺æ??å?¨ä¸?"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1475
+#: ../libempathy-gtk/empathy-account-widget.c:1591
 msgid "Create a new account on the server"
 msgstr "å?¨é??å??伺æ??å?¨ä¸?建ç«?æ?°ç??帳è??"
 
@@ -661,19 +630,19 @@ 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:1858
+#: ../libempathy-gtk/empathy-account-widget.c:1974
 #, 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:1876
+#: ../libempathy-gtk/empathy-account-widget.c:2000
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳è??"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1880
+#: ../libempathy-gtk/empathy-account-widget.c:2004
 msgid "New account"
 msgstr "æ?°å¢?帳è??"
 
@@ -718,7 +687,7 @@ msgstr "æ?¨ç?? AIM è?¢å¹?å??稱æ?¯ï¼?"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
@@ -727,7 +696,7 @@ msgstr "é?£æ?¥å? (_P):"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -864,38 +833,54 @@ msgid "Reso_urce:"
 msgstr "��(_U):"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid ""
+"This is your username, not your normal Facebook login.\n"
+"If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
+"Use <a href=\"http://www.facebook.com/username/\";>this page</a> to choose a "
+"Facebook username if you don't have one."
+msgstr ""
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "Use old SS_L"
 msgstr "使ç?¨è??ç?? SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+msgid "What is your Facebook password?"
+msgstr "æ?¨ç?? Facebook å¯?碼æ?¯ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+msgid "What is your Facebook username?"
+msgstr "æ?¨ç?? Facebook 使ç?¨è??å??稱æ?¯ï¼?"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "What is your Google ID?"
 msgstr "æ?¨ç?? Google ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "What is your Google password?"
 msgstr "æ?¨ç?? Google å¯?碼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "What is your Jabber ID?"
 msgstr "æ?¨ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Jabber password?"
 msgstr "æ?¨ç?? Jabber å¯?碼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your desired Jabber ID?"
 msgstr "æ?¨æ?³è¦?ç?? Jabber ID æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your desired Jabber password?"
 msgstr "æ?¨æ?³è¦?ç?? Jabber å¯?碼æ?¯ï¼?"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "_Encryption required (TLS/SSL)"
 msgstr "è¦?æ±?å? å¯?[TLS/SSL](_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "_Ignore SSL certificate errors"
 msgstr "忽ç?¥ SSL æ??è­?é?¯èª¤(_I)"
 
@@ -960,7 +945,6 @@ msgid "Interval (seconds)"
 msgstr "é??é??ï¼?ç§?ï¼?"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
-#, fuzzy
 msgid "Keep-Alive Options"
 msgstr "ä¿?æ??ä¸?æ?·ç·?é?¸é ?"
 
@@ -1020,10 +1004,11 @@ msgid "Transport:"
 msgstr "å?³é??é??è¨?å? :"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
+#, fuzzy
 msgid ""
 "Update the registration binding if the external address for the client is "
 "discovered to be different from the local binding."
-msgstr ""
+msgstr "å¦?æ??客æ?¶ç«¯ç??å¤?é?¨ä½?å??被æ?¢ç´¢å?ºè??æ?¬å?°ç«¯ç¶?å®?ä¸?å??æ??ï¼?é?²è¡?註å??ç¶?å®?æ?´æ?°"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
 msgid ""
@@ -1178,63 +1163,63 @@ msgstr "æ?ªç?¥ç??å?½ä»¤"
 msgid "Unknown command; see /help for the available commands"
 msgstr "æ?ªç?¥ç??æ??令ï¼?è«?å??è¦? /help 以å??å¾?å?¯ç?¨ç??æ??令"
 
-#: ../libempathy-gtk/empathy-chat.c:1143
+#: ../libempathy-gtk/empathy-chat.c:1144
 msgid "offline"
 msgstr "��"
 
-#: ../libempathy-gtk/empathy-chat.c:1146
+#: ../libempathy-gtk/empathy-chat.c:1147
 msgid "invalid contact"
 msgstr "ç?¡æ??ç??é?£çµ¡äºº"
 
-#: ../libempathy-gtk/empathy-chat.c:1149
+#: ../libempathy-gtk/empathy-chat.c:1150
 msgid "permission denied"
 msgstr "æ¬?é??被æ??çµ?"
 
-#: ../libempathy-gtk/empathy-chat.c:1152
+#: ../libempathy-gtk/empathy-chat.c:1153
 msgid "too long message"
 msgstr "太é?·ç??è¨?æ?¯"
 
-#: ../libempathy-gtk/empathy-chat.c:1155
+#: ../libempathy-gtk/empathy-chat.c:1156
 msgid "not implemented"
 msgstr "�實�"
 
-#: ../libempathy-gtk/empathy-chat.c:1158
+#: ../libempathy-gtk/empathy-chat.c:1159
 msgid "unknown"
 msgstr "ä¸?æ??"
 
-#: ../libempathy-gtk/empathy-chat.c:1162
+#: ../libempathy-gtk/empathy-chat.c:1163
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "å?³é??è¨?æ?¯ã??%sã??æ??ç?¼ç??é?¯èª¤ï¼?%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1192
+#: ../libempathy-gtk/empathy-chat.c:1193
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主�設��: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1194
+#: ../libempathy-gtk/empathy-chat.c:1195
 msgid "No topic defined"
 msgstr "���義主�"
 
-#: ../libempathy-gtk/empathy-chat.c:1593
+#: ../libempathy-gtk/empathy-chat.c:1594
 msgid "(No Suggestions)"
 msgstr "(æ²?æ??建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1647
+#: ../libempathy-gtk/empathy-chat.c:1648
 msgid "Insert Smiley"
 msgstr "æ??å?¥è¡¨æ??符è??"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1665
+#: ../libempathy-gtk/empathy-chat.c:1666
 #: ../libempathy-gtk/empathy-ui-utils.c:1658
 msgid "_Send"
 msgstr "å?³é??(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1699
+#: ../libempathy-gtk/empathy-chat.c:1700
 msgid "_Spelling Suggestions"
 msgstr "��建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1814
+#: ../libempathy-gtk/empathy-chat.c:1815
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已��"
@@ -1242,12 +1227,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:1821
+#: ../libempathy-gtk/empathy-chat.c:1822
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢��"
 
-#: ../libempathy-gtk/empathy-chat.c:1824
+#: ../libempathy-gtk/empathy-chat.c:1825
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢���"
@@ -1255,17 +1240,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:1832
+#: ../libempathy-gtk/empathy-chat.c:1833
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1835
+#: ../libempathy-gtk/empathy-chat.c:1836
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設ç?ºé»?å??å?®"
 
-#: ../libempathy-gtk/empathy-chat.c:1839
+#: ../libempathy-gtk/empathy-chat.c:1840
 #, c-format
 msgid "%s has left the room"
 msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
@@ -1275,22 +1260,22 @@ msgstr "%s å·²ç¶?é?¢é??æ­¤è??天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1848
+#: ../libempathy-gtk/empathy-chat.c:1849
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1873
+#: ../libempathy-gtk/empathy-chat.c:1874
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s å·²ç¶?å? å?¥æ­¤è??天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1898
+#: ../libempathy-gtk/empathy-chat.c:1899
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s ��被稱� %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2033 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2034 ../src/empathy-call-window.c:1531
 msgid "Disconnected"
 msgstr "已��"
 
@@ -1341,15 +1326,15 @@ msgstr "é??å??é?£çµ?(_O)"
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:249
 msgid "Edit Contact Information"
 msgstr "編輯�絡人��"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:300
 msgid "Personal Information"
 msgstr "å??人è³?è¨?"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:405
 msgid "New Contact"
 msgstr "���絡人"
 
@@ -1361,28 +1346,28 @@ msgstr "ç¨?å¾?å??決å®?"
 msgid "Subscription Request"
 msgstr "����"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1512
+#: ../libempathy-gtk/empathy-contact-list-view.c:1516
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤ç¾¤çµ?ã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1514
+#: ../libempathy-gtk/empathy-contact-list-view.c:1518
 msgid "Removing group"
 msgstr "正�移�群�"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1561
-#: ../libempathy-gtk/empathy-contact-list-view.c:1638
+#: ../libempathy-gtk/empathy-contact-list-view.c:1565
+#: ../libempathy-gtk/empathy-contact-list-view.c:1642
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "移�(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1591
+#: ../libempathy-gtk/empathy-contact-list-view.c:1595
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "æ?¯å?¦æ?³è¦?移é?¤é?£çµ¡äººã??%sã??ï¼?"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1593
+#: ../libempathy-gtk/empathy-contact-list-view.c:1597
 msgid "Removing contact"
 msgstr "正�移��絡人"
 
@@ -1423,17 +1408,17 @@ msgstr "å??享æ??ç??æ¡?é?¢"
 msgid "Infor_mation"
 msgstr "��(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:496
+#: ../libempathy-gtk/empathy-contact-menu.c:497
 #: ../src/empathy-chat-window.c:866
 msgid "Inviting you to this room"
 msgstr "é??è«?æ?¨å?°é??å??è??天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:527
+#: ../libempathy-gtk/empathy-contact-menu.c:528
 msgid "_Invite to chat room"
 msgstr "é??è«?å?°è??天室(_I)"
 
@@ -1749,11 +1734,12 @@ msgstr "���"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:2
 msgid "Match case"
-msgstr ""
+msgstr "符å??æ¢?件"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:3
+#, fuzzy
 msgid "Phrase not found"
-msgstr ""
+msgstr "�����"
 
 #: ../libempathy-gtk/empathy-sound.c:51
 msgid "Received an instant message"
@@ -2022,23 +2008,23 @@ msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
 msgid "Instant Message (Empathy)"
 msgstr "å?³æ??é??è¨? (Empathy)"
 
-#: ../src/empathy.c:762
+#: ../src/empathy.c:764
 msgid "Don't connect on startup"
 msgstr "å??å??æ??ä¸?è¦?è?ªå??é?£ç·?"
 
-#: ../src/empathy.c:766
+#: ../src/empathy.c:768
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "å??å??æ??ä¸?顯示é?£çµ¡äººæ¸?å?®æ??ä»»ä½?å?¶ä»?å°?話çª?"
 
-#: ../src/empathy.c:770
+#: ../src/empathy.c:772
 msgid "Show the accounts dialog"
 msgstr "顯示帳è??å°?話ç??"
 
-#: ../src/empathy.c:782
+#: ../src/empathy.c:784
 msgid "- Empathy IM Client"
 msgstr "- Empathy å?³æ??é??客æ?¶ç«¯"
 
-#: ../src/empathy-about-dialog.c:84
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -2049,7 +2035,7 @@ msgstr ""
 "ç?? GNU é??ç?¨å?¬å?±è¨±å?¯è­?æ¢?款 (GNU General Public License) 第äº?ç??ä¾?ä¿®æ?¹å??é??æ?°ç?¼ä½?"
 "é??ä¸?ç¨?å¼?ï¼?æ??è??è?ªç?±é?¸æ??使ç?¨ä»»ä½?æ?´æ?°ç??ç??æ?¬ã??"
 
-#: ../src/empathy-about-dialog.c:88
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -2059,7 +2045,7 @@ msgstr ""
 "ç?¼ä½? Empathy ç??ç?®ç??æ?¯å¸?æ??å®?æ??ç?¨ï¼?ä½?æ²?æ??ä»»ä½?æ??ä¿?ã??ç??è?³æ²?æ??é?©å??ç?¹å®?ç?®ç??è??é?±å?«ç??"
 "æ??ä¿?ã??æ?´è©³ç´°ç??æ??æ³?è«?å??é?± GNU é??ç?¨å?¬å?±è¨±å?¯è­?ã??"
 
-#: ../src/empathy-about-dialog.c:92
+#: ../src/empathy-about-dialog.c:93
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -2069,11 +2055,11 @@ msgstr ""
 "給� Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:120
+#: ../src/empathy-about-dialog.c:121
 msgid "An Instant Messaging client for GNOME"
 msgstr "GNOME ç??å?³æ??è¨?æ?¯å®¢æ?¶ç«¯ç¨?å¼?"
 
-#: ../src/empathy-about-dialog.c:126
+#: ../src/empathy-about-dialog.c:127
 msgid "translator-credits"
 msgstr ""
 "å¦?å°?翻譯æ??ä»»ä½?æ??è¦?ï¼?è«?é??ä¸?å°?é?»å­?é?µä»¶çµ¦\n"
@@ -2084,28 +2070,28 @@ msgstr ""
 "Craig Jeffares <cjeffares novell com>, 2004\n"
 "Joe Man <trmetal yahoo com hk>, 2001"
 
-#: ../src/empathy-account-assistant.c:165
+#: ../src/empathy-account-assistant.c:166
 msgid "There was an error while importing the accounts."
 msgstr "å?¯å?¥å¸³è??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:168
+#: ../src/empathy-account-assistant.c:169
 msgid "There was an error while parsing the account details."
 msgstr "解æ??帳è??詳細è³?æ??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:171
+#: ../src/empathy-account-assistant.c:172
 msgid "There was an error while creating the account."
 msgstr "建ç«?帳è??æ??ç?¼ç??é?¯èª¤ã??"
 
-#: ../src/empathy-account-assistant.c:173
+#: ../src/empathy-account-assistant.c:174
 msgid "There was an error."
 msgstr "æ??é?¯èª¤ç?¼ç??ã??"
 
-#: ../src/empathy-account-assistant.c:177
-#, fuzzy, c-format
+#: ../src/empathy-account-assistant.c:178
+#, c-format
 msgid "The error message was: %s"
-msgstr "æ²?æ??é?¯èª¤è¨?æ?¯"
+msgstr "�誤����%s"
 
-#: ../src/empathy-account-assistant.c:181
+#: ../src/empathy-account-assistant.c:182
 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."
@@ -2113,111 +2099,111 @@ msgstr ""
 "æ?¨å?¯ä»¥å??å?°å??é ?å??次輸å?¥å¸³è??ç??詳細è³?æ??æ??çµ?æ??æ­¤å?©ç??ï¼?ç¨?å¾?å??å¾?ã??編輯ã??é?¸å?®å? å?¥å¸³"
 "è??ã??"
 
-#: ../src/empathy-account-assistant.c:218
-#: ../src/empathy-account-assistant.c:1241
+#: ../src/empathy-account-assistant.c:219
+#: ../src/empathy-account-assistant.c:1275
 msgid "An error occurred"
 msgstr "ç?¼ç??é?¯èª¤"
 
-#. Create account
 #. To translator: %s is the protocol name
 #. Create account
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:395 ../src/empathy-accounts-dialog.c:552
+#: ../src/empathy-account-assistant.c:414 ../src/empathy-accounts-dialog.c:559
 #, c-format
 msgid "New %s account"
 msgstr "æ?°å¢? %s 帳è??"
 
-#: ../src/empathy-account-assistant.c:472
+#: ../src/empathy-account-assistant.c:495
 msgid "What kind of chat account do you have?"
 msgstr "æ?¨ç??è??天帳è??æ?¯å?ªä¸?種ï¼?"
 
-#: ../src/empathy-account-assistant.c:478
+#: ../src/empathy-account-assistant.c:501
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "æ?¨é??æ?³è¦?設å®?å?¶ä»?ç??è??天帳è??å??ï¼?"
 
-#: ../src/empathy-account-assistant.c:484
+#: ../src/empathy-account-assistant.c:507
 msgid "Enter your account details"
 msgstr "è«?輸å?¥æ?¨ç??帳è??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:489
+#: ../src/empathy-account-assistant.c:512
 msgid "What kind of chat account do you want to create?"
 msgstr "æ?¨æ?³è¦?建ç«?ä½?種è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:495
+#: ../src/empathy-account-assistant.c:518
 msgid "Do you want to create other chat accounts?"
 msgstr "æ?¯å?¦æ?³è¦?建ç«?å?¶ä»?è??天帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:525
 msgid "Enter the details for the new account"
 msgstr "è«?輸å?¥æ?°å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:617
+#: ../src/empathy-account-assistant.c:640
 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 "
 "programs. With a microphone or a webcam you can also have audio or video "
 "calls."
 msgstr ""
-"使ç?¨ Empathy å?¯ä»¥å?¨ç·?ä¸?è·?é?°è¿?ç??人å?¡è??天ï¼?æ??æ?¯å??使ç?¨ Google Talkã??AIMã??"
-"Windows Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網路æ??å½±æ©?é??å?¯ä»¥é?²è¡?"
-"èª?é?³æ??è¦?è¨?é??話ã??"
+"使ç?¨ Empathy å?¯ä»¥å?¨ç·?ä¸?è·?é??è¿?ç??人è??天ï¼?æ??æ?¯å??使ç?¨ Google Talkã??AIMã??Windows "
+"Live ç­?å?¶ä»?è??天ç¨?å¼?ç??æ??å??å??å??äº?è??天ã??å?©ç?¨éº¥å??風æ??網路æ??å½±æ©?é??å?¯ä»¥é?²è¡?èª?é?³æ??è¦?"
+"è¨?é??話ã??"
 
-#: ../src/empathy-account-assistant.c:634
+#: ../src/empathy-account-assistant.c:657
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "æ?¨æ?¯å?¦æ??使ç?¨å?¶ä»?è??天ç¨?å¼?ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:657
+#: ../src/empathy-account-assistant.c:680
 msgid "Yes, import my account details from "
 msgstr "æ?¯ç??ï¼?è«?å?¯å?¥æ??ç??帳è??詳細è³?æ??æ?¼"
 
-#: ../src/empathy-account-assistant.c:678
+#: ../src/empathy-account-assistant.c:701
 msgid "Yes, I'll enter my account details now"
 msgstr "æ?¯ç??ï¼?æ??ç?¾å?¨è¦?輸å?¥å¸³è??ç??詳細è³?æ??"
 
-#: ../src/empathy-account-assistant.c:700
+#: ../src/empathy-account-assistant.c:723
 msgid "No, I want a new account"
 msgstr "ä¸?ï¼?æ??æ?³è¦?æ?°ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:710
+#: ../src/empathy-account-assistant.c:733
 msgid "No, I just want to see people online nearby for now"
 msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
 
-#: ../src/empathy-account-assistant.c:731
+#: ../src/empathy-account-assistant.c:754
 msgid "Select the accounts you want to import:"
 msgstr "é?¸æ??è¦?å?¯å?¥ç??帳è??ï¼?"
 
-#: ../src/empathy-account-assistant.c:815
+#: ../src/empathy-account-assistant.c:838
 #: ../src/empathy-new-chatroom-dialog.c:541
 #: ../src/empathy-new-chatroom-dialog.c:542
 msgid "Yes"
 msgstr "æ?¯"
 
-#: ../src/empathy-account-assistant.c:822
+#: ../src/empathy-account-assistant.c:845
 msgid "No, that's all for now"
 msgstr "ä¸?ï¼?ç?®å??å°±é??樣"
 
-#: ../src/empathy-account-assistant.c:1064
+#: ../src/empathy-account-assistant.c:1098
 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 ""
+"Empathy å?¯ä»¥è?ªå??æ?¢ç´¢ä¸¦å??è??æ?¨é?£ç·?å?°ç?¸å??網路ä¸?ç??人å??è??天ã??å¦?æ??æ?¨æ?³è¦?使ç?¨æ­¤å??"
+"è?½ï¼?è«?檢æ?¥ä¸?å??詳細è³?æ??æ?¯å?¦æ­£ç¢ºã??æ?¨ä¹?å?¯ä»¥å?¨ä»¥å¾?ç°¡å?®å?°è®?æ?´é??äº?ç´°ç¯?ï¼?æ??æ?¯æ?¯ç?¨"
+"ã??帳è??ã??å°?話çª?ä¾?å??ç?¨æ­¤å??è?½"
 
-#: ../src/empathy-account-assistant.c:1070
-#: ../src/empathy-account-assistant.c:1126
-#, fuzzy
+#: ../src/empathy-account-assistant.c:1104
+#: ../src/empathy-account-assistant.c:1160
 msgid "Edit->Accounts"
-msgstr "編輯帳è??"
+msgstr "編輯 -> 帳è??"
 
-#: ../src/empathy-account-assistant.c:1086
-#, fuzzy
+#: ../src/empathy-account-assistant.c:1120
 msgid "I don't want to enable this feature for now"
-msgstr "ä¸?ï¼?æ??ç?¾å?¨å?ªæ?³ç??ç??é??è¿?æ??誰ä¸?ç·?"
+msgstr "æ??ç?¾å?¨ä¸?æ?³è¦?å??ç?¨é??é ?å??è?½"
 
-#: ../src/empathy-account-assistant.c:1122
+#: ../src/empathy-account-assistant.c:1156
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed.\n"
@@ -2225,22 +2211,25 @@ msgid ""
 "package\n"
 "and create a People Nearby account from the Accounts dialog "
 msgstr ""
+"æ?¨ç?¡æ³?è??é?£ç·?å?°æ?¨æ?¬æ©?網路ç??人å??è??天ï¼?å? ç?º telepathy-salut å°?æ?ªå®?è£?ã??\n"
+"å¦?æ??æ?¨æ?³è¦?å??ç?¨æ­¤å??è?½ï¼?è«?å®?è£? telepathy-salut å¥?件\n"
+"並å¾?ã??帳è??ã??å°?話çª?建ç«?ã??é??è¿?ç??人ã??帳è??"
 
-#: ../src/empathy-account-assistant.c:1128
+#: ../src/empathy-account-assistant.c:1162
 msgid "telepathy-salut not installed"
-msgstr ""
+msgstr "telepathy-salut ����"
 
-#: ../src/empathy-account-assistant.c:1205
+#: ../src/empathy-account-assistant.c:1239
 msgid "Welcome to Empathy"
 msgstr "歡�使� Empathy"
 
-#: ../src/empathy-account-assistant.c:1214
+#: ../src/empathy-account-assistant.c:1248
 msgid "Import your existing accounts"
 msgstr "å?¯å?¥ç?¾æ??ç??帳è??"
 
-#: ../src/empathy-account-assistant.c:1232
+#: ../src/empathy-account-assistant.c:1266
 msgid "Please enter personal details"
-msgstr ""
+msgstr "è«?輸å?¥å??人詳細è³?æ??"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
@@ -2255,33 +2244,33 @@ msgstr "æ??è??æ?¨ç?? %s 帳è??ç?¸é??ç??ä¿®æ?¹å°?æ?ªå?²å­?ã??"
 msgid "Your new account has not been saved yet."
 msgstr "å°?æ?ªå?²å­?æ?¨ç??æ?°å¸³è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:259 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:260 ../src/empathy-call-window.c:729
 msgid "Connectingâ?¦"
 msgstr "��中..."
 
-#: ../src/empathy-accounts-dialog.c:286
+#: ../src/empathy-accounts-dialog.c:287
 #, c-format
 msgid "Disconnected â?? %s"
 msgstr "å·²æ?·ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:291
+#: ../src/empathy-accounts-dialog.c:292
 #, c-format
 msgid "Offline â?? %s"
 msgstr "é?¢ç·? â?? %s"
 
-#: ../src/empathy-accounts-dialog.c:304
+#: ../src/empathy-accounts-dialog.c:305
 msgid "Offline â?? No Network Connection"
 msgstr "é?¢ç·? â?? ç?¡ç¶²è·¯é?£ç·?"
 
-#: ../src/empathy-accounts-dialog.c:312
+#: ../src/empathy-accounts-dialog.c:313
 msgid "Unknown Status"
 msgstr "æ?ªç?¥ç??ç??æ??"
 
-#: ../src/empathy-accounts-dialog.c:323
+#: ../src/empathy-accounts-dialog.c:324
 msgid "Offline â?? Account Disabled"
 msgstr "é?¢ç·? â?? 帳è??å·²å??ç?¨"
 
-#: ../src/empathy-accounts-dialog.c:720
+#: ../src/empathy-accounts-dialog.c:730
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2289,16 +2278,16 @@ msgstr ""
 "æ?¨å?³å°?建ç«?æ?°ç??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1054
+#: ../src/empathy-accounts-dialog.c:1067
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "æ?¯å?¦æ?³è¦?å¾?æ?¨ç??é?»è?¦ä¸?移é?¤ç¾¤çµ? %sï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1058
+#: ../src/empathy-accounts-dialog.c:1071
 msgid "This will not remove your account on the server."
 msgstr "é??ä¸?æ??移é?¤ä¼ºæ??å?¨ä¸?ç??æ?¨ç??帳è??ã??"
 
-#: ../src/empathy-accounts-dialog.c:1286
+#: ../src/empathy-accounts-dialog.c:1301
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2306,7 +2295,7 @@ msgstr ""
 "æ?¨å?³å°?建ç«?å?¦ä¸?å??帳è??ï¼?é??樣æ??æ?¾æ£?\n"
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
-#: ../src/empathy-accounts-dialog.c:1829
+#: ../src/empathy-accounts-dialog.c:1848
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2315,7 +2304,7 @@ msgstr ""
 "æ?¨æ??å??ç??è®?æ?´ã??確å®?è¦?ç¹¼çº?ï¼?"
 
 #. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:1956
+#: ../src/empathy-accounts-dialog.c:1979
 msgid "Accounts"
 msgstr "帳è??"
 
@@ -2334,12 +2323,10 @@ msgid ""
 msgstr "è¦?å? å?¥æ?°ç??帳è??ï¼?æ?¨å¿?é ?å??å®?è£?æ¯?å??æ??ç?¨å?°ç??é??è¨?å??å®?å¾?端ç¨?å¼?ã??"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-#, fuzzy
 msgid "_Add&#x2026;"
 msgstr "å? å?¥(_A)&#x2026;"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
-#, fuzzy
 msgid "_Import&#x2026;"
 msgstr "��(_I)&#x2026;"
 
@@ -2505,7 +2492,7 @@ msgstr "å??æ??é?³è¨?å?³æ?­"
 
 #: ../src/empathy-call-window.ui.h:13
 msgid "V_ideo"
-msgstr "å½±å??(_I)"
+msgstr "��(_I)"
 
 #: ../src/empathy-call-window.ui.h:14
 msgid "Video Off"
@@ -2591,6 +2578,10 @@ msgstr "�話(_C)"
 msgid "_Detach Tab"
 msgstr "å??é?¢å??é ?(_D)"
 
+#: ../src/empathy-chat-window.ui.h:11 ../src/empathy-main-window.ui.h:19
+msgid "_Edit"
+msgstr "編輯(_E)"
+
 #: ../src/empathy-chat-window.ui.h:12
 msgid "_Favorite Chat Room"
 msgstr "å??好ç??è??天室(_F)"
@@ -3207,63 +3198,63 @@ msgstr "çµ?æ??(_Q)"
 msgid "Contact Map View"
 msgstr "é?£çµ¡äººå?°å??檢è¦?"
 
-#: ../src/empathy-debug-window.c:1063
+#: ../src/empathy-debug-window.c:1065
 msgid "Save"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1185
+#: ../src/empathy-debug-window.c:1187
 msgid "Debug Window"
 msgstr "����"
 
-#: ../src/empathy-debug-window.c:1265
+#: ../src/empathy-debug-window.c:1267
 msgid "Pause"
 msgstr "æ?«å??"
 
-#: ../src/empathy-debug-window.c:1277
+#: ../src/empathy-debug-window.c:1279
 msgid "Level "
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1297
+#: ../src/empathy-debug-window.c:1299
 msgid "Debug"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1303
+#: ../src/empathy-debug-window.c:1305
 msgid "Info"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1309 ../src/empathy-debug-window.c:1358
+#: ../src/empathy-debug-window.c:1311 ../src/empathy-debug-window.c:1360
 msgid "Message"
 msgstr "��"
 
-#: ../src/empathy-debug-window.c:1315
+#: ../src/empathy-debug-window.c:1317
 msgid "Warning"
 msgstr "è­¦å??"
 
-#: ../src/empathy-debug-window.c:1321
+#: ../src/empathy-debug-window.c:1323
 msgid "Critical"
 msgstr "å?´é??"
 
-#: ../src/empathy-debug-window.c:1327
+#: ../src/empathy-debug-window.c:1329
 msgid "Error"
 msgstr "�誤"
 
-#: ../src/empathy-debug-window.c:1346
+#: ../src/empathy-debug-window.c:1348
 msgid "Time"
 msgstr "æ??å?»"
 
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1351
 msgid "Domain"
 msgstr "網å??"
 
-#: ../src/empathy-debug-window.c:1351
+#: ../src/empathy-debug-window.c:1353
 msgid "Category"
 msgstr "å??é¡?"
 
-#: ../src/empathy-debug-window.c:1353
+#: ../src/empathy-debug-window.c:1355
 msgid "Level"
 msgstr "ç­?ç´?"
 
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1387
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."