Updated Traditional Chinese translation(Hong Kong and Taiwan)

2 files changed, 361 insertions, 382 deletions

diff --git a/po/zh_HK.po b/po/zh_HK.po
index c21efde11..c8edfbb24 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 b5dbaf5fc..3296c7709 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."