Updated Galician translations

[empathy.git] / po / zh_TW.po

diff --git a/po/zh_TW.po b/po/zh_TW.po
index b7c61c2ed79c62ac6220301e22dd939502903b63..acdba56f63676394855989527edcca2b3cedc2bc 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,12 +7,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.29.91\n"
+"Project-Id-Version: empathy 2.31.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 19:21+0800\n"
-"PO-Revision-Date: 2010-03-02 21:43+0800\n"
+"POT-Creation-Date: 2010-05-08 19:00+0800\n"
+"PO-Revision-Date: 2010-04-26 18:04+0800\n"
 "Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
+"Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -102,294 +102,310 @@ msgid "Empathy has asked about importing accounts"
 msgstr "Empathy 已詢問匯入帳號"
 
 #: ../data/empathy.schemas.in.h:17
+msgid "Empathy has migrated butterfly logs"
+msgstr "Empathy 已轉移 butterfly 日誌"
+
+#: ../data/empathy.schemas.in.h:18
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy 當閒置時應該自動設為離開"
+
+#: ../data/empathy.schemas.in.h:19
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 啟動時自動連線"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/empathy.schemas.in.h:20
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy 應降低位置的準確度"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/empathy.schemas.in.h:21
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 要使用連絡人的大頭貼做為聊天視窗圖示"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/empathy.schemas.in.h:22
 msgid "Enable WebKit Developer Tools"
 msgstr "啟用 WebKit 開發者工具"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/empathy.schemas.in.h:23
 msgid "Enable popup notifications for new messages"
 msgstr "啟用新訊息的彈出式通知"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/empathy.schemas.in.h:24
 msgid "Enable spell checker"
 msgstr "啟用拼字檢查程式"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/empathy.schemas.in.h:25
 msgid "Hide main window"
 msgstr "隱藏主視窗"
 
-#: ../data/empathy.schemas.in.h:24
+#: ../data/empathy.schemas.in.h:26
 msgid "Hide the main window."
 msgstr "隱藏主視窗。"
 
-#: ../data/empathy.schemas.in.h:25
+#: ../data/empathy.schemas.in.h:27
 msgid "MC 4 accounts have been imported"
 msgstr "MC 4 帳號已經匯入"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/empathy.schemas.in.h:28
 msgid "MC 4 accounts have been imported."
 msgstr "MC 4 帳號已經匯入。"
 
-#: ../data/empathy.schemas.in.h:27
+#: ../data/empathy.schemas.in.h:29
 msgid "Nick completed character"
 msgstr "暱稱補齊字元"
 
-#: ../data/empathy.schemas.in.h:28
+#: ../data/empathy.schemas.in.h:30
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/empathy.schemas.in.h:31
 msgid "Path of the Adium theme to use"
 msgstr "要使用的 Adium 佈景主題路徑"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/empathy.schemas.in.h:32
 msgid "Path of the Adium theme to use if the theme used for chat is Adium."
 msgstr "如果聊天室使用的主題是 Adium 時要使用的 Adium 佈景主題路徑。"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/empathy.schemas.in.h:33
 msgid "Play a sound for incoming messages"
 msgstr "收到訊息時播放音效"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/empathy.schemas.in.h:34
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/empathy.schemas.in.h:35
 msgid "Play a sound for outgoing messages"
 msgstr "送出訊息時播放音效"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/empathy.schemas.in.h:36
 msgid "Play a sound when a contact logs in"
 msgstr "當連絡人登入時播放音效"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/empathy.schemas.in.h:37
 msgid "Play a sound when a contact logs out"
 msgstr "當有連絡人登出時播放音效"
 
-#: ../data/empathy.schemas.in.h:36
+#: ../data/empathy.schemas.in.h:38
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/empathy.schemas.in.h:37
+#: ../data/empathy.schemas.in.h:39
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/empathy.schemas.in.h:38
+#: ../data/empathy.schemas.in.h:40
 msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果聊天視窗失去焦點則彈出通知"
 
-#: ../data/empathy.schemas.in.h:39
+#: ../data/empathy.schemas.in.h:41
 msgid "Pop up notifications when a contact logs in"
 msgstr "當連絡人登入時彈出通知"
 
-#: ../data/empathy.schemas.in.h:40
+#: ../data/empathy.schemas.in.h:42
 msgid "Pop up notifications when a contact logs out"
 msgstr "當連絡人登出時彈出通知"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/empathy.schemas.in.h:43
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/empathy.schemas.in.h:44
 msgid "Show contact list in rooms"
 msgstr "在聊天室顯示連絡人清單"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/empathy.schemas.in.h:45
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示提示"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/empathy.schemas.in.h:46
 msgid "Show offline contacts"
 msgstr "顯示離線連絡人"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/empathy.schemas.in.h:47
 msgid "Show protocols"
 msgstr "顯示協定"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/empathy.schemas.in.h:48
 msgid "Spell checking languages"
 msgstr "拼字檢查的語言"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/empathy.schemas.in.h:49
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/empathy.schemas.in.h:50
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次選擇大頭貼圖片的目錄。"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/empathy.schemas.in.h:51
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在聊天視窗的談話中的佈景主題。"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/empathy.schemas.in.h:52
 msgid "Use graphical smileys"
 msgstr "使用圖片式表情符號"
 
-#: ../data/empathy.schemas.in.h:51
+#: ../data/empathy.schemas.in.h:53
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/empathy.schemas.in.h:52
+#: ../data/empathy.schemas.in.h:54
 msgid "Use theme for chat rooms"
 msgstr "在聊天室使用佈景主題"
 
-#: ../data/empathy.schemas.in.h:53
+#: ../data/empathy.schemas.in.h:55
 msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是否要將使用者的位置發佈給他的連絡人。"
 
-#: ../data/empathy.schemas.in.h:54
+#: ../data/empathy.schemas.in.h:56
 msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy 是否使用 GPS 來推測位置。"
 
-#: ../data/empathy.schemas.in.h:55
+#: ../data/empathy.schemas.in.h:57
 msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy 是否使用行動電話網路來推測位置。"
 
-#: ../data/empathy.schemas.in.h:56
+#: ../data/empathy.schemas.in.h:58
 msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy 是否使用網路來推測位置。"
 
-#: ../data/empathy.schemas.in.h:57
+#: ../data/empathy.schemas.in.h:59
 msgid "Whether Empathy has asked about importing accounts from other programs."
 msgstr "Empathy 是否應詢問您要不要從其他程式匯入帳號。"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/empathy.schemas.in.h:60
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr "Empathy 是否應轉移 butterfly 日誌。"
+
+#: ../data/empathy.schemas.in.h:61
 msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是否應在啟動時自動登入您的帳號。"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/empathy.schemas.in.h:62
+msgid "Whether Empathy should go into away mode automatically if user is idle."
+msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。"
+
+#: ../data/empathy.schemas.in.h:63
 msgid ""
 "Whether Empathy should reduce the location's accuracy for privacy reasons."
 msgstr "Empathy 是否基於隱私的理由減低位置的準確度。"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/empathy.schemas.in.h:64
 msgid ""
 "Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy 是否使用連絡人大頭貼做為聊天視窗圖示。"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/empathy.schemas.in.h:65
 msgid ""
 "Whether WebKit developer tools, such as the Web Inspector, should be enabled."
 msgstr "是否啟用 WebKit 開發者工具，例如 Web Inspector。"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/empathy.schemas.in.h:66
 msgid ""
 "Whether connectivity managers should be used to automatically disconnect/"
 "reconnect."
 msgstr "是否使用連線管理程式自動斷線/重新連線。"
 
-#: ../data/empathy.schemas.in.h:63
+#: ../data/empathy.schemas.in.h:67
 msgid ""
 "Whether to check words typed against the languages you want to check with."
 msgstr "是否以您設定的語言檢查輸入有無錯字。"
 
-#: ../data/empathy.schemas.in.h:64
+#: ../data/empathy.schemas.in.h:68
 msgid "Whether to convert smileys into graphical images in conversations."
 msgstr "是否將談話中的表情符號轉換為圖片形式。"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/empathy.schemas.in.h:69
 msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是否播放音效來通知有連絡人登入網路。"
 
-#: ../data/empathy.schemas.in.h:66
+#: ../data/empathy.schemas.in.h:70
 msgid ""
 "Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是否播放音效來通知有連絡人登出網路。"
 
-#: ../data/empathy.schemas.in.h:67
+#: ../data/empathy.schemas.in.h:71
 msgid "Whether to play a sound to notify of events."
 msgstr "是否播放音效來通知有事件發生。"
 
-#: ../data/empathy.schemas.in.h:68
+#: ../data/empathy.schemas.in.h:72
 msgid "Whether to play a sound to notify of incoming messages."
 msgstr "是否播放音效來通知有收到訊息。"
 
-#: ../data/empathy.schemas.in.h:69
+#: ../data/empathy.schemas.in.h:73
 msgid "Whether to play a sound to notify of new conversations."
 msgstr "是否播放音效來通知新的談話。"
 
-#: ../data/empathy.schemas.in.h:70
+#: ../data/empathy.schemas.in.h:74
 msgid "Whether to play a sound to notify of outgoing messages."
 msgstr "是否播放音效來通知有送出訊息。"
 
-#: ../data/empathy.schemas.in.h:71
+#: ../data/empathy.schemas.in.h:75
 msgid "Whether to play a sound when logging into a network."
 msgstr "當登入某網路時是否播放音效。"
 
-#: ../data/empathy.schemas.in.h:72
+#: ../data/empathy.schemas.in.h:76
 msgid "Whether to play a sound when logging out of a network."
 msgstr "當登出某網路時是否播放音效。"
 
-#: ../data/empathy.schemas.in.h:73
+#: ../data/empathy.schemas.in.h:77
 msgid "Whether to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否播放音效通知。"
 
-#: ../data/empathy.schemas.in.h:74
+#: ../data/empathy.schemas.in.h:78
 msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "當連絡人離線時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/empathy.schemas.in.h:79
 msgid "Whether to show a popup notification when a contact goes online."
 msgstr "當連絡人上線時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:76
+#: ../data/empathy.schemas.in.h:80
 msgid ""
 "Whether to show a popup notification when receiving a new message even if "
 "the chat is already opened, but not focused."
 msgstr "收到新訊息時是否顯示彈出式通知（即使已開啟聊天視窗，但沒有獲得焦點）。"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/empathy.schemas.in.h:81
 msgid "Whether to show a popup notification when receiving a new message."
 msgstr "當收到新訊息時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:78
+#: ../data/empathy.schemas.in.h:82
 msgid ""
 "Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是否在連絡人清單與聊天視窗顯示連絡人大頭貼。"
 
-#: ../data/empathy.schemas.in.h:79
+#: ../data/empathy.schemas.in.h:83
 msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是否在連絡人清單中顯示離線的連絡人。"
 
-#: ../data/empathy.schemas.in.h:80
+#: ../data/empathy.schemas.in.h:84
 msgid "Whether to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:81
+#: ../data/empathy.schemas.in.h:85
 msgid "Whether to show protocols for contacts in the contact list."
 msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
 
-#: ../data/empathy.schemas.in.h:82
+#: ../data/empathy.schemas.in.h:86
 msgid "Whether to show the contact list in chat rooms."
 msgstr "是否在聊天室中顯示連絡人清單。"
 
-#: ../data/empathy.schemas.in.h:83
+#: ../data/empathy.schemas.in.h:87
 msgid "Whether to show the contact list in compact mode."
 msgstr "是否以精簡模式顯示連絡人清單。"
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/empathy.schemas.in.h:88
 msgid ""
 "Whether to show the message dialog about closing the main window with the "
 "'x' button in the title bar."
 msgstr "是否在使用標題列的「x」按鈕關閉主視窗時，顯示訊息對話窗。"
 
-#: ../data/empathy.schemas.in.h:85
+#: ../data/empathy.schemas.in.h:89
 msgid "Whether to use the theme for chat rooms."
 msgstr "是否為聊天室使用佈景主題。"
 
-#: ../data/empathy.schemas.in.h:86
+#: ../data/empathy.schemas.in.h:90
 msgid ""
 "Which criterion to use when sorting the contact list. Default is to sort by "
 "the contact's name with the value \"name\". A value of \"state\" will sort "
@@ -402,61 +418,58 @@ msgstr ""
 msgid "Manage Messaging and VoIP accounts"
 msgstr "管理訊息與 VoIP 帳號"
 
+#. Tweak the dialog
 #: ../data/empathy-accounts.desktop.in.in.h:2
-#: ../src/cc-empathy-accounts-page.c:229 ../src/cc-empathy-accounts-panel.c:70
+#: ../src/empathy-accounts-dialog.c:2064 ../src/cc-empathy-accounts-page.c:244
+#: ../src/cc-empathy-accounts-panel.c:91
 msgid "Messaging and VoIP Accounts"
 msgstr "訊息與 VoIP 帳號"
 
-#: ../libempathy/empathy-ft-handler.c:842
+#: ../libempathy/empathy-ft-handler.c:843
 msgid "The hash of the received file and the sent one do not match"
 msgstr "已接收檔案的雜湊值與送出的不符"
 
-#: ../libempathy/empathy-ft-handler.c:1102
+#: ../libempathy/empathy-ft-handler.c:1103
 msgid "File transfer not supported by remote contact"
 msgstr "遠端連絡人不支援檔案傳輸"
 
-#: ../libempathy/empathy-ft-handler.c:1160
+#: ../libempathy/empathy-ft-handler.c:1161
 msgid "The selected file is not a regular file"
 msgstr "選取的檔案不是正規的檔案"
 
-#: ../libempathy/empathy-ft-handler.c:1169
+#: ../libempathy/empathy-ft-handler.c:1170
 msgid "The selected file is empty"
 msgstr "選取的檔案是空白的"
 
-#: ../libempathy/empathy-tp-contact-list.c:834
-#: ../src/empathy-auto-salut-account-helper.c:77
-msgid "People nearby"
-msgstr "附近的人"
-
-#: ../libempathy/empathy-tp-file.c:280
+#: ../libempathy/empathy-tp-file.c:281
 msgid "Socket type not supported"
 msgstr "Socket 類型不支援"
 
-#: ../libempathy/empathy-tp-file.c:399
+#: ../libempathy/empathy-tp-file.c:400
 msgid "No reason was specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-tp-file.c:402
+#: ../libempathy/empathy-tp-file.c:403
 msgid "The change in state was requested"
 msgstr "已要求變更狀態"
 
-#: ../libempathy/empathy-tp-file.c:405
+#: ../libempathy/empathy-tp-file.c:406
 msgid "You canceled the file transfer"
 msgstr "您已取消檔案傳輸"
 
-#: ../libempathy/empathy-tp-file.c:408
+#: ../libempathy/empathy-tp-file.c:409
 msgid "The other participant canceled the file transfer"
 msgstr "其他的參與者取消了檔案傳輸"
 
-#: ../libempathy/empathy-tp-file.c:411
+#: ../libempathy/empathy-tp-file.c:412
 msgid "Error while trying to transfer the file"
 msgstr "嘗試傳輸檔案時發生錯誤"
 
-#: ../libempathy/empathy-tp-file.c:414
+#: ../libempathy/empathy-tp-file.c:415
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的參與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-tp-file.c:417 ../libempathy/empathy-utils.c:314
+#: ../libempathy/empathy-tp-file.c:418 ../libempathy/empathy-utils.c:315
 msgid "Unknown reason"
 msgstr "不明的原因"
 
@@ -480,71 +493,75 @@ msgstr "隱藏"
 msgid "Offline"
 msgstr "離線"
 
-#: ../libempathy/empathy-utils.c:286
+#: ../libempathy/empathy-utils.c:249
+msgid "Unknown"
+msgstr "不明"
+
+#: ../libempathy/empathy-utils.c:287
 msgid "No reason specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-utils.c:288
+#: ../libempathy/empathy-utils.c:289
 msgid "Status is set to offline"
 msgstr "狀態設為離線"
 
-#: ../libempathy/empathy-utils.c:290
+#: ../libempathy/empathy-utils.c:291
 msgid "Network error"
 msgstr "網路錯誤"
 
-#: ../libempathy/empathy-utils.c:292
+#: ../libempathy/empathy-utils.c:293
 msgid "Authentication failed"
 msgstr "驗證失敗"
 
-#: ../libempathy/empathy-utils.c:294
+#: ../libempathy/empathy-utils.c:295
 msgid "Encryption error"
 msgstr "加密發生錯誤"
 
-#: ../libempathy/empathy-utils.c:296
+#: ../libempathy/empathy-utils.c:297
 msgid "Name in use"
 msgstr "使用中的名稱"
 
-#: ../libempathy/empathy-utils.c:298
+#: ../libempathy/empathy-utils.c:299
 msgid "Certificate not provided"
 msgstr "沒有提供憑證"
 
-#: ../libempathy/empathy-utils.c:300
+#: ../libempathy/empathy-utils.c:301
 msgid "Certificate untrusted"
 msgstr "憑證不被信任"
 
-#: ../libempathy/empathy-utils.c:302
+#: ../libempathy/empathy-utils.c:303
 msgid "Certificate expired"
 msgstr "憑證已逾期"
 
-#: ../libempathy/empathy-utils.c:304
+#: ../libempathy/empathy-utils.c:305
 msgid "Certificate not activated"
 msgstr "憑證尚未使用"
 
-#: ../libempathy/empathy-utils.c:306
+#: ../libempathy/empathy-utils.c:307
 msgid "Certificate hostname mismatch"
 msgstr "憑證主機名稱不符"
 
-#: ../libempathy/empathy-utils.c:308
+#: ../libempathy/empathy-utils.c:309
 msgid "Certificate fingerprint mismatch"
 msgstr "憑證指紋檔不符"
 
-#: ../libempathy/empathy-utils.c:310
+#: ../libempathy/empathy-utils.c:311
 msgid "Certificate self-signed"
 msgstr "憑證為自我簽署"
 
-#: ../libempathy/empathy-utils.c:312
+#: ../libempathy/empathy-utils.c:313
 msgid "Certificate error"
 msgstr "憑證錯誤"
 
-#: ../libempathy/empathy-utils.c:429 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:430 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
 msgstr "附近的人"
 
-#: ../libempathy/empathy-utils.c:434
+#: ../libempathy/empathy-utils.c:435
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:435
+#: ../libempathy/empathy-utils.c:436
 msgid "Facebook Chat"
 msgstr "Facebook 聊天"
 
@@ -588,25 +605,25 @@ msgstr[0] "%d 個月以前"
 msgid "in the future"
 msgstr "未來"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:462
+#: ../libempathy-gtk/empathy-account-chooser.c:463
 msgid "All"
 msgstr "全部"
 
-#: ../libempathy-gtk/empathy-account-widget.c:538
-#: ../libempathy-gtk/empathy-account-widget.c:594
+#: ../libempathy-gtk/empathy-account-widget.c:549
+#: ../libempathy-gtk/empathy-account-widget.c:605
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1126
+#: ../libempathy-gtk/empathy-account-widget.c:1136
 msgid "Username:"
 msgstr "使用者名稱："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1474
+#: ../libempathy-gtk/empathy-account-widget.c:1479
 msgid "L_og in"
 msgstr "登入(_O)"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1542
+#: ../libempathy-gtk/empathy-account-widget.c:1547
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:2
 #: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
 #: ../src/empathy-chatrooms-window.ui.h:1
@@ -614,15 +631,15 @@ msgstr "登入(_O)"
 msgid "Account:"
 msgstr "帳號："
 
-#: ../libempathy-gtk/empathy-account-widget.c:1553
+#: ../libempathy-gtk/empathy-account-widget.c:1558
 msgid "Enabled"
 msgstr "已啟用"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1618
+#: ../libempathy-gtk/empathy-account-widget.c:1623
 msgid "This account already exists on the server"
 msgstr "此帳號已經存在這個伺服器上"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1621
+#: ../libempathy-gtk/empathy-account-widget.c:1626
 msgid "Create a new account on the server"
 msgstr "在這個伺服器上建立新的帳號"
 
@@ -631,19 +648,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:2013
+#: ../libempathy-gtk/empathy-account-widget.c:1995
 #, 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:2039
+#: ../libempathy-gtk/empathy-account-widget.c:2021
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../libempathy-gtk/empathy-account-widget.c:2043
+#: ../libempathy-gtk/empathy-account-widget.c:2025
 msgid "New account"
 msgstr "新增帳號"
 
@@ -668,7 +685,7 @@ msgstr "進階"
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
 msgid "Pass_word:"
 msgstr "密碼(_W):"
@@ -688,7 +705,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:23
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:24
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
@@ -697,7 +714,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:24
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:25
 #: ../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
@@ -746,38 +763,38 @@ msgstr "字集(_C)："
 
 #: ../libempathy-gtk/empathy-account-widget-irc.c:244
 msgid "New Network"
-msgstr "新網路"
+msgstr "新增網路"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:184
-#: ../libempathy-gtk/empathy-account-widget-sip.c:217
+#: ../libempathy-gtk/empathy-account-widget-sip.c:183
+#: ../libempathy-gtk/empathy-account-widget-sip.c:216
 msgid "Auto"
 msgstr "自動"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:187
+#: ../libempathy-gtk/empathy-account-widget-sip.c:186
 msgid "UDP"
 msgstr "UDP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:190
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
 msgid "TCP"
 msgstr "TCP"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:193
+#: ../libempathy-gtk/empathy-account-widget-sip.c:192
 msgid "TLS"
 msgstr "TLS"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:222
+#: ../libempathy-gtk/empathy-account-widget-sip.c:221
 msgid "Register"
 msgstr "註冊"
 
 #. translators: this string is very specific to SIP's internal; maybe
 #. * best to keep the English version.
-#: ../libempathy-gtk/empathy-account-widget-sip.c:227
+#: ../libempathy-gtk/empathy-account-widget-sip.c:226
 msgid "Options"
 msgstr "選項"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.c:230
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
 msgid "None"
 msgstr "無"
 
@@ -833,7 +850,8 @@ msgstr "優先權(_O):"
 msgid "Reso_urce:"
 msgstr "資源(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#. This string is not wrapped in the dialog so you may have to add some '\n' to make it look nice.
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid ""
 "This is your username, not your normal Facebook login.\n"
 "If you are facebook.com/<b>badger</b>, enter <b>badger</b>.\n"
@@ -845,47 +863,47 @@ msgstr ""
 "如果您還沒有 Facebook 使用者名稱，請使用 <a href=\"http://www.facebook.com/"
 "username/\">此網頁</a> 來選用一個。"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "Use old SS_L"
 msgstr "使用舊的 SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid "What is your Facebook password?"
 msgstr "您的 Facebook 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "What is your Facebook username?"
 msgstr "您的 Facebook 使用者名稱是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "What is your Google ID?"
 msgstr "您的 Google ID 是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "What is your Google password?"
 msgstr "您的 Google 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 msgid "What is your Jabber ID?"
 msgstr "您的 Jabber ID 是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 msgid "What is your Jabber password?"
 msgstr "您的 Jabber 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
 msgid "What is your desired Jabber ID?"
 msgstr "您想要的 Jabber ID 是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
 msgid "What is your desired Jabber password?"
 msgstr "您想要的 Jabber 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
 msgid "_Encryption required (TLS/SSL)"
 msgstr "要求加密[TLS/SSL](_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
 msgid "_Ignore SSL certificate errors"
 msgstr "忽略 SSL 憑證錯誤(_I)"
 
@@ -942,95 +960,58 @@ msgid "Discover the STUN server automatically"
 msgstr "自動探索 STUN 伺服器"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "Hostname of the proxy for outbound requests."
-msgstr "資料傳出要求所使用的 proxy 主機名稱。"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Interval (seconds)"
 msgstr "間隔（秒）"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
 msgid "Keep-Alive Options"
 msgstr "保持不斷線選項"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
-msgid ""
-"Look up the DNS SRV record at the service's domain for the host name of a "
-"STUN server."
-msgstr ""
-"查詢位於伺服器 domain 的 DNS SRV 紀錄以取得某個 STUN 伺服器的主機名稱。"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
 msgid "Loose Routing"
 msgstr "寬鬆路由"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
 msgid "Mechanism:"
 msgstr "機制："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
 msgid "Miscellaneous Options"
 msgstr "雜項"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
 msgid "NAT Traversal Options"
 msgstr "NAT 傳輸選項"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
-msgid "Port of the proxy for outbound requests."
-msgstr "資料傳出要求所使用的 proxy 連接埠。"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
 msgid "Port:"
 msgstr "連接埠："
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
 msgid "Proxy Options"
 msgstr "Proxy 選項"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
 msgid "STUN Server:"
 msgstr "STUN 伺服器:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
 msgid "Server:"
 msgstr "伺服器:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
-msgid ""
-"The username for SIP authentication, if different from the SIP URI\n"
-"username."
-msgstr ""
-"SIP 驗證用的使用者名稱，如果和 SIP URI 不同時使用\n"
-"使用。"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:22
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
 msgid "Transport:"
 msgstr "傳送通訊埠:"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:23
-msgid ""
-"Update the registration binding if the external address for the client is "
-"discovered to be different from the local binding."
-msgstr ""
-"如果客戶端的外部位址被探索出與本機綁定 (local binding) 不同時，更新註冊綁定 "
-"(registration binding)。"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:24
-msgid ""
-"Use the loose routing behavior and the Route header as recommended in RFC "
-"3261."
-msgstr "使用寬鬆路由行為以及使用 RFC 3261 內所建議的 Route 標頭。"
-
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:25
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:18
 msgid "What is your SIP account password?"
 msgstr "您的 SIP 帳號密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:26
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:19
 msgid "What is your SIP login ID?"
 msgstr "您想要的 SIP 登入 ID 是？"
 
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:27
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
 msgid "_Username:"
 msgstr "使用者名稱(_U):"
 
@@ -1083,63 +1064,63 @@ msgstr "圖片"
 msgid "All Files"
 msgstr "所有檔案"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:327
+#: ../libempathy-gtk/empathy-avatar-image.c:325
 msgid "Click to enlarge"
 msgstr "請按這裡放大"
 
-#: ../libempathy-gtk/empathy-chat.c:233
+#: ../libempathy-gtk/empathy-chat.c:235
 msgid "Failed to reconnect this chat"
 msgstr "無法重連這個聊天會議"
 
-#: ../libempathy-gtk/empathy-chat.c:655
+#: ../libempathy-gtk/empathy-chat.c:657
 msgid "Failed to join chat room"
 msgstr "加入聊天室失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:673
+#: ../libempathy-gtk/empathy-chat.c:675
 msgid "Failed to open private chat"
 msgstr "開啟私人對話失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:712
+#: ../libempathy-gtk/empathy-chat.c:714
 msgid "Topic not supported on this conversation"
 msgstr "此談話的主題不被支援"
 
-#: ../libempathy-gtk/empathy-chat.c:718
+#: ../libempathy-gtk/empathy-chat.c:720
 msgid "You are not allowed to change the topic"
 msgstr "您不被允許變更這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:847
+#: ../libempathy-gtk/empathy-chat.c:851
 msgid "/clear: clear all messages from the current conversation"
 msgstr "/clear: 清除目前談話的所有訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:850
+#: ../libempathy-gtk/empathy-chat.c:854
 msgid "/topic <topic>: set the topic of the current conversation"
 msgstr "/topic <主題>: 設置目前談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:853
+#: ../libempathy-gtk/empathy-chat.c:857
 msgid "/join <chat room ID>: join a new chat room"
 msgstr "/join <聊天室 ID>: 加入新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:856
+#: ../libempathy-gtk/empathy-chat.c:860
 msgid "/j <chat room ID>: join a new chat room"
 msgstr "/j <聊天室 ID>: 加入新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:859
+#: ../libempathy-gtk/empathy-chat.c:863
 msgid "/query <contact ID> [<message>]: open a private chat"
 msgstr "/query <聯絡人 ID> [<訊息>]: 開啟私人對話"
 
-#: ../libempathy-gtk/empathy-chat.c:862
+#: ../libempathy-gtk/empathy-chat.c:866
 msgid "/msg <contact ID> <message>: open a private chat"
 msgstr "/msg <聯絡人 ID> <訊息>: 開啟私人對話"
 
-#: ../libempathy-gtk/empathy-chat.c:865
+#: ../libempathy-gtk/empathy-chat.c:869
 msgid "/nick <nickname>: change your nickname on the current server"
 msgstr "/nick <暱稱>: 變更在目前伺服器上的您的暱稱"
 
-#: ../libempathy-gtk/empathy-chat.c:868
+#: ../libempathy-gtk/empathy-chat.c:872
 msgid "/me <message>: send an ACTION message to the current conversation"
 msgstr "/me <訊息>: 送出一個 ACTION 訊息到目前的談話中"
 
-#: ../libempathy-gtk/empathy-chat.c:871
+#: ../libempathy-gtk/empathy-chat.c:875
 msgid ""
 "/say <message>: send <message> to the current conversation. This is used to "
 "send a message starting with a '/'. For example: \"/say /join is used to "
@@ -1148,7 +1129,7 @@ msgstr ""
 "/say <訊息>: 送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來"
 "說：「/say /join 是用來加入新的聊天室」"
 
-#: ../libempathy-gtk/empathy-chat.c:876
+#: ../libempathy-gtk/empathy-chat.c:880
 msgid ""
 "/help [<command>]: show all supported commands. If <command> is defined, "
 "show its usage."
@@ -1156,80 +1137,84 @@ msgstr ""
 "/help [<命令>]: 顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用"
 "法。"
 
-#: ../libempathy-gtk/empathy-chat.c:886
+#: ../libempathy-gtk/empathy-chat.c:890
 #, c-format
 msgid "Usage: %s"
 msgstr "用法: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:915
+#: ../libempathy-gtk/empathy-chat.c:919
 msgid "Unknown command"
 msgstr "未知的命令"
 
-#: ../libempathy-gtk/empathy-chat.c:1036
+#: ../libempathy-gtk/empathy-chat.c:1040
 msgid "Unknown command; see /help for the available commands"
 msgstr "未知的指令；請參見 /help 以取得可用的指令"
 
-#: ../libempathy-gtk/empathy-chat.c:1174
+#: ../libempathy-gtk/empathy-chat.c:1178
 msgid "offline"
 msgstr "離線"
 
-#: ../libempathy-gtk/empathy-chat.c:1177
+#: ../libempathy-gtk/empathy-chat.c:1181
 msgid "invalid contact"
 msgstr "無效的連絡人"
 
-#: ../libempathy-gtk/empathy-chat.c:1180
+#: ../libempathy-gtk/empathy-chat.c:1184
 msgid "permission denied"
 msgstr "權限被拒絕"
 
-#: ../libempathy-gtk/empathy-chat.c:1183
+#: ../libempathy-gtk/empathy-chat.c:1187
 msgid "too long message"
 msgstr "太長的訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:1186
+#: ../libempathy-gtk/empathy-chat.c:1190
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:1189
+#: ../libempathy-gtk/empathy-chat.c:1193
 msgid "unknown"
 msgstr "不明"
 
-#: ../libempathy-gtk/empathy-chat.c:1193
+#: ../libempathy-gtk/empathy-chat.c:1197
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳送訊息「%s」時發生錯誤；%s"
 
-#: ../libempathy-gtk/empathy-chat.c:1228
+#: ../libempathy-gtk/empathy-chat.c:1307 ../src/empathy-chat-window.c:687
+msgid "Topic:"
+msgstr "主題:"
+
+#: ../libempathy-gtk/empathy-chat.c:1319
 #, c-format
 msgid "Topic set to: %s"
 msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:1230
+#: ../libempathy-gtk/empathy-chat.c:1321
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:1629
+#: ../libempathy-gtk/empathy-chat.c:1717
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1683
+#: ../libempathy-gtk/empathy-chat.c:1771
 msgid "Insert Smiley"
 msgstr "插入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1701
-#: ../libempathy-gtk/empathy-ui-utils.c:1621
+#: ../libempathy-gtk/empathy-chat.c:1789
+#: ../libempathy-gtk/empathy-ui-utils.c:1634
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1735
+#: ../libempathy-gtk/empathy-chat.c:1823
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1829
+#: ../libempathy-gtk/empathy-chat.c:1917
 msgid "Failed to retrieve recent logs"
 msgstr "無法取得最近的日誌"
 
-#: ../libempathy-gtk/empathy-chat.c:1960
+#: ../libempathy-gtk/empathy-chat.c:2048
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
@@ -1237,12 +1222,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:1967
+#: ../libempathy-gtk/empathy-chat.c:2055
 #, c-format
 msgid "%1$s was kicked by %2$s"
 msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:1970
+#: ../libempathy-gtk/empathy-chat.c:2058
 #, c-format
 msgid "%s was kicked"
 msgstr "%s 被踢出去了"
@@ -1250,17 +1235,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:1978
+#: ../libempathy-gtk/empathy-chat.c:2066
 #, c-format
 msgid "%1$s was banned by %2$s"
 msgstr "%1$s 被 %2$s 設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:1981
+#: ../libempathy-gtk/empathy-chat.c:2069
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:1985
+#: ../libempathy-gtk/empathy-chat.c:2073
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此聊天室"
@@ -1270,54 +1255,50 @@ msgstr "%s 已經離開此聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1994
+#: ../libempathy-gtk/empathy-chat.c:2082
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:2019
+#: ../libempathy-gtk/empathy-chat.c:2107
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經加入此聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:2044
+#: ../libempathy-gtk/empathy-chat.c:2132
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 現在被稱為 %s"
 
-#: ../libempathy-gtk/empathy-chat.c:2179 ../src/empathy-call-window.c:1531
+#: ../libempathy-gtk/empathy-chat.c:2271 ../src/empathy-call-window.c:1643
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../libempathy-gtk/empathy-chat.c:2701
+#: ../libempathy-gtk/empathy-chat.c:2801
 msgid "Wrong password; please try again:"
 msgstr "密碼錯誤；請再試一次:"
 
-#: ../libempathy-gtk/empathy-chat.c:2702
+#: ../libempathy-gtk/empathy-chat.c:2802
 msgid "Retry"
 msgstr "重試"
 
-#: ../libempathy-gtk/empathy-chat.c:2707
+#: ../libempathy-gtk/empathy-chat.c:2807
 msgid "This room is protected by a password:"
 msgstr "此聊天室已被密碼保護:"
 
-#: ../libempathy-gtk/empathy-chat.c:2708
+#: ../libempathy-gtk/empathy-chat.c:2808
 msgid "Join"
 msgstr "加入"
 
-#: ../libempathy-gtk/empathy-chat.c:2848
+#: ../libempathy-gtk/empathy-chat.c:2948
 msgid "Connected"
 msgstr "成功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:2901
+#: ../libempathy-gtk/empathy-chat.c:3001
 #: ../libempathy-gtk/empathy-log-window.c:707
 msgid "Conversation"
 msgstr "談話"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:680
-msgid "Topic:"
-msgstr "主題:"
-
 #. Copy Link Address menu item
 #: ../libempathy-gtk/empathy-chat-text-view.c:318
 #: ../libempathy-gtk/empathy-theme-adium.c:786
@@ -1340,11 +1321,11 @@ msgstr "%Y %B %d %A"
 msgid "Edit Contact Information"
 msgstr "編輯連絡人資訊"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:300
+#: ../libempathy-gtk/empathy-contact-dialogs.c:301
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:405
+#: ../libempathy-gtk/empathy-contact-dialogs.c:406
 msgid "New Contact"
 msgstr "新增連絡人"
 
@@ -1356,79 +1337,84 @@ msgstr "稍後再決定"
 msgid "Subscription Request"
 msgstr "訂閱要求"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1516
+#: ../libempathy-gtk/empathy-contact-list-view.c:1633
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是否想要移除群組「%s」？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1518
+#: ../libempathy-gtk/empathy-contact-list-view.c:1635
 msgid "Removing group"
 msgstr "正在移除群組"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1565
-#: ../libempathy-gtk/empathy-contact-list-view.c:1642
+#: ../libempathy-gtk/empathy-contact-list-view.c:1684
+#: ../libempathy-gtk/empathy-contact-list-view.c:1761
 #: ../src/empathy-accounts-dialog.ui.h:6
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1595
+#: ../libempathy-gtk/empathy-contact-list-view.c:1714
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是否想要移除連絡人「%s」？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1597
+#: ../libempathy-gtk/empathy-contact-list-view.c:1716
 msgid "Removing contact"
 msgstr "正在移除連絡人"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:199
+#: ../libempathy-gtk/empathy-contact-menu.c:209
 #: ../src/empathy-main-window.ui.h:14
 msgid "_Add Contact…"
-msgstr "新增聯絡人(_A)..."
+msgstr "新增聯絡人(_A)…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:226
+#: ../libempathy-gtk/empathy-contact-menu.c:237
 #: ../src/empathy-main-window.ui.h:15
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:257
+#: ../libempathy-gtk/empathy-contact-menu.c:268
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:289
+#: ../libempathy-gtk/empathy-contact-menu.c:300
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "視訊通話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:340
+#: ../libempathy-gtk/empathy-contact-menu.c:351
 #: ../src/empathy-main-window.ui.h:26
 msgid "_Previous Conversations"
 msgstr "上一次談話(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:362
+#: ../libempathy-gtk/empathy-contact-menu.c:373
 msgid "Send file"
 msgstr "傳送檔案"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:385
+#: ../libempathy-gtk/empathy-contact-menu.c:396
 msgid "Share my desktop"
 msgstr "分享我的桌面"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:413
+#: ../libempathy-gtk/empathy-contact-menu.c:436
+#: ../libempathy-gtk/empathy-contact-widget.c:1444
+msgid "Favorite"
+msgstr "喜好"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:466
 msgid "Infor_mation"
 msgstr "資訊(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:459
+#: ../libempathy-gtk/empathy-contact-menu.c:512
 msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:513
-#: ../src/empathy-chat-window.c:865
+#: ../libempathy-gtk/empathy-contact-menu.c:566
+#: ../src/empathy-chat-window.c:872
 msgid "Inviting you to this room"
 msgstr "邀請您到這個聊天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:544
+#: ../libempathy-gtk/empathy-contact-menu.c:597
 msgid "_Invite to chat room"
 msgstr "邀請到聊天室(_I)"
 
@@ -1436,129 +1422,129 @@ msgstr "邀請到聊天室(_I)"
 msgid "Select a contact"
 msgstr "選擇連絡人"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:236
+#: ../libempathy-gtk/empathy-contact-widget.c:238
 msgid "Select"
 msgstr "選擇"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:245
-#: ../src/empathy-main-window.c:1045
+#: ../libempathy-gtk/empathy-contact-widget.c:247
+#: ../src/empathy-main-window.c:1073
 msgid "Group"
 msgstr "群組"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:477
+#: ../libempathy-gtk/empathy-contact-widget.c:478
 msgid "Country ISO Code:"
 msgstr "國家 ISO 碼："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:479
+#: ../libempathy-gtk/empathy-contact-widget.c:480
 msgid "Country:"
 msgstr "國家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:481
+#: ../libempathy-gtk/empathy-contact-widget.c:482
 msgid "State:"
 msgstr "州："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:483
+#: ../libempathy-gtk/empathy-contact-widget.c:484
 msgid "City:"
 msgstr "市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:485
+#: ../libempathy-gtk/empathy-contact-widget.c:486
 msgid "Area:"
 msgstr "區域："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:487
+#: ../libempathy-gtk/empathy-contact-widget.c:488
 msgid "Postal Code:"
 msgstr "郵遞區號："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:489
+#: ../libempathy-gtk/empathy-contact-widget.c:490
 msgid "Street:"
 msgstr "街："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:491
+#: ../libempathy-gtk/empathy-contact-widget.c:492
 msgid "Building:"
 msgstr "建築："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:493
+#: ../libempathy-gtk/empathy-contact-widget.c:494
 msgid "Floor:"
 msgstr "樓層："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:495
+#: ../libempathy-gtk/empathy-contact-widget.c:496
 msgid "Room:"
 msgstr "室："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:497
+#: ../libempathy-gtk/empathy-contact-widget.c:498
 msgid "Text:"
 msgstr "文字："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:499
+#: ../libempathy-gtk/empathy-contact-widget.c:500
 msgid "Description:"
 msgstr "描述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:501
+#: ../libempathy-gtk/empathy-contact-widget.c:502
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:503
+#: ../libempathy-gtk/empathy-contact-widget.c:504
 msgid "Accuracy Level:"
 msgstr "準確度等級："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:505
+#: ../libempathy-gtk/empathy-contact-widget.c:506
 msgid "Error:"
 msgstr "錯誤："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:507
+#: ../libempathy-gtk/empathy-contact-widget.c:508
 msgid "Vertical Error (meters):"
 msgstr "垂直誤差（公尺）："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:509
+#: ../libempathy-gtk/empathy-contact-widget.c:510
 msgid "Horizontal Error (meters):"
 msgstr "水平誤差（公尺）："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:511
+#: ../libempathy-gtk/empathy-contact-widget.c:512
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:513
+#: ../libempathy-gtk/empathy-contact-widget.c:514
 msgid "Bearing:"
 msgstr "方位："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:515
+#: ../libempathy-gtk/empathy-contact-widget.c:516
 msgid "Climb Speed:"
 msgstr "爬升速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:517
+#: ../libempathy-gtk/empathy-contact-widget.c:518
 msgid "Last Updated on:"
 msgstr "上次更新於："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:519
+#: ../libempathy-gtk/empathy-contact-widget.c:520
 msgid "Longitude:"
 msgstr "經度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:521
+#: ../libempathy-gtk/empathy-contact-widget.c:522
 msgid "Latitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:523
+#: ../libempathy-gtk/empathy-contact-widget.c:524
 msgid "Altitude:"
 msgstr "緯度:"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:586
+#: ../libempathy-gtk/empathy-contact-widget.c:587
 #: ../src/empathy-preferences.ui.h:12
 msgid "Location"
 msgstr "位置"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:602
+#: ../libempathy-gtk/empathy-contact-widget.c:603
 msgid "<b>Location</b>, "
 msgstr "<b>位置<b>，"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-contact-widget.c:653
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y 於 %R UTC"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:735
+#: ../libempathy-gtk/empathy-contact-widget.c:736
 msgid "Save Avatar"
 msgstr "儲存大頭貼"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:791
+#: ../libempathy-gtk/empathy-contact-widget.c:792
 msgid "Unable to save avatar"
 msgstr "無法儲存大頭貼"
 
@@ -1604,8 +1590,8 @@ msgid "Identifier:"
 msgstr "識別器:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:13
-msgid "Information requested&#x2026;"
-msgstr "è¦\81æ±\82è³\87è¨\8a&#x2026;"
+msgid "Information requested…"
+msgstr "è³\87è¨\8aå·²è«\8bæ±\82â\80¦"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:14
 msgid "OS:"
@@ -1676,12 +1662,12 @@ msgid "Contact ID:"
 msgstr "連絡人 ID:"
 
 #. add chat button
-#: ../libempathy-gtk/empathy-new-message-dialog.c:144
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
 msgid "C_hat"
 msgstr "聊天(_C)"
 
 #. Tweak the dialog
-#: ../libempathy-gtk/empathy-new-message-dialog.c:154
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
 msgid "New Conversation"
 msgstr "新增談話"
 
@@ -1699,7 +1685,7 @@ msgstr "通話(_C)"
 #. Tweak the dialog
 #: ../libempathy-gtk/empathy-new-call-dialog.c:206
 msgid "New Call"
-msgstr "新通話"
+msgstr "新增通話"
 
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
@@ -1710,12 +1696,12 @@ msgstr "新通話"
 #: ../libempathy-gtk/empathy-presence-chooser.c:168
 #: ../libempathy-gtk/empathy-presence-chooser.c:204
 msgid "Custom Message…"
-msgstr "自訂訊息..."
+msgstr "自訂訊息…"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:221
 #: ../libempathy-gtk/empathy-presence-chooser.c:223
 msgid "Edit Custom Messages…"
-msgstr "編輯自訂訊息..."
+msgstr "編輯自訂訊息…"
 
 #: ../libempathy-gtk/empathy-presence-chooser.c:346
 msgid "Click to remove this status as a favorite"
@@ -1736,7 +1722,7 @@ msgstr "設定您的上線與目前的狀態"
 #. Custom messages
 #: ../libempathy-gtk/empathy-presence-chooser.c:1128
 msgid "Custom messages…"
-msgstr "自訂訊息..."
+msgstr "自訂訊息…"
 
 #: ../libempathy-gtk/empathy-search-bar.ui.h:1
 msgid "Find:"
@@ -1816,21 +1802,21 @@ msgstr "簡易"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:69
 msgid "Clean"
-msgstr "清除"
+msgstr "清爽"
 
 #: ../libempathy-gtk/empathy-theme-manager.c:70
 msgid "Blue"
 msgstr "藍色"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1496
+#: ../libempathy-gtk/empathy-ui-utils.c:1509
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1613
+#: ../libempathy-gtk/empathy-ui-utils.c:1626
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1673
+#: ../libempathy-gtk/empathy-ui-utils.c:1690
 msgid "Select a destination"
 msgstr "選取目的地"
 
@@ -2017,15 +2003,15 @@ msgstr "沒有錯誤訊息"
 msgid "Instant Message (Empathy)"
 msgstr "即時通訊 (Empathy)"
 
-#: ../src/empathy.c:596
+#: ../src/empathy.c:601
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
-#: ../src/empathy.c:600
+#: ../src/empathy.c:605
 msgid "Don't display the contact list or any other dialogs on startup"
 msgstr "啟動時不顯示連絡人清單或任何其他對話窗"
 
-#: ../src/empathy.c:612
+#: ../src/empathy.c:617
 msgid "- Empathy IM Client"
 msgstr "- Empathy 即時通客戶端"
 
@@ -2071,6 +2057,7 @@ msgstr ""
 "以下地址，GNOME 翻譯團隊會盡快回覆您：\n"
 "zh-l10n@lists.linux.org.tw\n"
 "\n"
+"Cheng-Chia Tseng <pswo10680@gmail.com>, 2009, 10\n"
 "Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2003, 05\n"
 "Craig Jeffares <cjeffares@novell.com>, 2004\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
@@ -2105,7 +2092,7 @@ msgstr ""
 "號。"
 
 #: ../src/empathy-account-assistant.c:220
-#: ../src/empathy-account-assistant.c:1300
+#: ../src/empathy-account-assistant.c:1308
 msgid "An error occurred"
 msgstr "發生錯誤"
 
@@ -2114,36 +2101,36 @@ msgstr "發生錯誤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:413 ../src/empathy-accounts-dialog.c:580
+#: ../src/empathy-account-assistant.c:412 ../src/empathy-accounts-dialog.c:579
 #, c-format
 msgid "New %s account"
 msgstr "新增 %s 帳號"
 
-#: ../src/empathy-account-assistant.c:508
+#: ../src/empathy-account-assistant.c:507
 msgid "What kind of chat account do you have?"
 msgstr "您的聊天帳號是哪一種？"
 
-#: ../src/empathy-account-assistant.c:514
+#: ../src/empathy-account-assistant.c:513
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "您還想要設定其他的聊天帳號嗎？"
 
-#: ../src/empathy-account-assistant.c:520
+#: ../src/empathy-account-assistant.c:519
 msgid "Enter your account details"
 msgstr "請輸入您的帳號詳細資料"
 
-#: ../src/empathy-account-assistant.c:525
+#: ../src/empathy-account-assistant.c:524
 msgid "What kind of chat account do you want to create?"
 msgstr "您想要建立何種聊天帳號？"
 
-#: ../src/empathy-account-assistant.c:531
+#: ../src/empathy-account-assistant.c:530
 msgid "Do you want to create other chat accounts?"
 msgstr "是否想要建立其他聊天帳號？"
 
-#: ../src/empathy-account-assistant.c:538
+#: ../src/empathy-account-assistant.c:537
 msgid "Enter the details for the new account"
 msgstr "請輸入新帳號的詳細資料"
 
-#: ../src/empathy-account-assistant.c:653
+#: ../src/empathy-account-assistant.c:652
 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 "
@@ -2154,61 +2141,61 @@ msgstr ""
 "Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以進行語音或視"
 "訊通話。"
 
-#: ../src/empathy-account-assistant.c:670
+#: ../src/empathy-account-assistant.c:669
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "您是否有使用其他聊天程式的帳號？"
 
-#: ../src/empathy-account-assistant.c:693
+#: ../src/empathy-account-assistant.c:692
 msgid "Yes, import my account details from "
 msgstr "是的，請匯入我的帳號詳細資料於"
 
-#: ../src/empathy-account-assistant.c:714
+#: ../src/empathy-account-assistant.c:713
 msgid "Yes, I'll enter my account details now"
 msgstr "是的，我現在要輸入帳號的詳細資料"
 
-#: ../src/empathy-account-assistant.c:736
+#: ../src/empathy-account-assistant.c:735
 msgid "No, I want a new account"
 msgstr "不，我想要新的帳號"
 
-#: ../src/empathy-account-assistant.c:746
+#: ../src/empathy-account-assistant.c:745
 msgid "No, I just want to see people online nearby for now"
 msgstr "不，我現在只想看看附近有誰上線"
 
-#: ../src/empathy-account-assistant.c:767
+#: ../src/empathy-account-assistant.c:766
 msgid "Select the accounts you want to import:"
 msgstr "選擇要匯入的帳號："
 
-#: ../src/empathy-account-assistant.c:851
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-account-assistant.c:850
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-account-assistant.c:858
+#: ../src/empathy-account-assistant.c:857
 msgid "No, that's all for now"
 msgstr "不，目前就這樣"
 
-#: ../src/empathy-account-assistant.c:1117
+#: ../src/empathy-account-assistant.c:1122
 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 可以自動探索並和與您連線到相同網路上的人們聊天。如果您想要使用此功"
-"能，請檢查下列詳細資料是否正確。您也可以在以後簡單地變更這些細節，或是是用"
-"「帳號」對話窗來停用此功能"
+"Empathy 可以自動探索與您連線到相同網路上的人們，並且和他們聊天。如果您想要使"
+"用此功能，請檢查下列詳細資料是否正確。您也可以在以後簡單地變更這些細節，或是"
+"用「帳號」對話窗來停用此功能"
 
-#: ../src/empathy-account-assistant.c:1123
-#: ../src/empathy-account-assistant.c:1179
+#: ../src/empathy-account-assistant.c:1128
+#: ../src/empathy-account-assistant.c:1184
 msgid "Edit->Accounts"
 msgstr "編輯 -> 帳號"
 
-#: ../src/empathy-account-assistant.c:1139
+#: ../src/empathy-account-assistant.c:1144
 msgid "I don't want to enable this feature for now"
 msgstr "我現在不想要啟用這項功能"
 
-#: ../src/empathy-account-assistant.c:1175
+#: ../src/empathy-account-assistant.c:1180
 msgid ""
 "You won't be able to chat with people connected to your local network, as "
 "telepathy-salut is not installed. If you want to enable this feature, please "
@@ -2219,62 +2206,66 @@ msgstr ""
 "啟用此功能，請安裝 telepathy-salut 套件，並從「帳號」對話窗建立「附近的人」帳"
 "號"
 
-#: ../src/empathy-account-assistant.c:1181
+#: ../src/empathy-account-assistant.c:1186
 msgid "telepathy-salut not installed"
 msgstr "telepathy-salut 尚未安裝"
 
-#: ../src/empathy-account-assistant.c:1258
+#: ../src/empathy-account-assistant.c:1232
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "訊息與 VoIP 帳號助理"
+
+#: ../src/empathy-account-assistant.c:1266
 msgid "Welcome to Empathy"
 msgstr "歡迎使用 Empathy"
 
-#: ../src/empathy-account-assistant.c:1267
+#: ../src/empathy-account-assistant.c:1275
 msgid "Import your existing accounts"
 msgstr "匯入現有的帳號"
 
-#: ../src/empathy-account-assistant.c:1285
+#: ../src/empathy-account-assistant.c:1293
 msgid "Please enter personal details"
 msgstr "請輸入個人詳細資料"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * unsaved changes
-#: ../src/empathy-accounts-dialog.c:66
+#: ../src/empathy-accounts-dialog.c:65
 #, c-format
 msgid "There are unsaved modifications to your %s account."
 msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
 
 #. The primary text of the dialog shown to the user when he is about to lose
 #. * an unsaved new account
-#: ../src/empathy-accounts-dialog.c:70
+#: ../src/empathy-accounts-dialog.c:69
 msgid "Your new account has not been saved yet."
 msgstr "尚未儲存您的新帳號。"
 
-#: ../src/empathy-accounts-dialog.c:263 ../src/empathy-call-window.c:729
+#: ../src/empathy-accounts-dialog.c:262 ../src/empathy-call-window.c:789
 msgid "Connecting…"
-msgstr "連線中..."
+msgstr "連線中…"
 
-#: ../src/empathy-accounts-dialog.c:290
+#: ../src/empathy-accounts-dialog.c:289
 #, c-format
 msgid "Disconnected — %s"
 msgstr "已斷線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:295
+#: ../src/empathy-accounts-dialog.c:294
 #, c-format
 msgid "Offline — %s"
 msgstr "離線 — %s"
 
-#: ../src/empathy-accounts-dialog.c:308
+#: ../src/empathy-accounts-dialog.c:307
 msgid "Offline — No Network Connection"
 msgstr "離線 — 無網路連線"
 
-#: ../src/empathy-accounts-dialog.c:316
+#: ../src/empathy-accounts-dialog.c:315
 msgid "Unknown Status"
 msgstr "未知的狀態"
 
-#: ../src/empathy-accounts-dialog.c:327
+#: ../src/empathy-accounts-dialog.c:326
 msgid "Offline — Account Disabled"
 msgstr "離線 — 帳號已停用"
 
-#: ../src/empathy-accounts-dialog.c:768
+#: ../src/empathy-accounts-dialog.c:767
 msgid ""
 "You are about to create a new account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2282,16 +2273,16 @@ msgstr ""
 "您即將建立新的帳號，這樣會放棄\n"
 "您所做的變更。確定要繼續？"
 
-#: ../src/empathy-accounts-dialog.c:1115
+#: ../src/empathy-accounts-dialog.c:1114
 #, c-format
 msgid "Do you want to remove %s from your computer?"
 msgstr "是否想要從您的電腦上移除群組 %s？"
 
-#: ../src/empathy-accounts-dialog.c:1119
+#: ../src/empathy-accounts-dialog.c:1118
 msgid "This will not remove your account on the server."
 msgstr "這不會移除伺服器上的您的帳號。"
 
-#: ../src/empathy-accounts-dialog.c:1356
+#: ../src/empathy-accounts-dialog.c:1355
 msgid ""
 "You are about to select another account, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2299,7 +2290,7 @@ msgstr ""
 "您即將建立另一個帳號，這樣會放棄\n"
 "您所做的變更。確定要繼續？"
 
-#: ../src/empathy-accounts-dialog.c:1933
+#: ../src/empathy-accounts-dialog.c:1932
 msgid ""
 "You are about to close the window, which will discard\n"
 "your changes. Are you sure you want to proceed?"
@@ -2307,11 +2298,6 @@ msgstr ""
 "您即將關閉這個視窗，這樣會放棄\n"
 "您所做的變更。確定要繼續？"
 
-#. Tweak the dialog
-#: ../src/empathy-accounts-dialog.c:2066
-msgid "Accounts"
-msgstr "帳號"
-
 #: ../src/empathy-accounts-dialog.ui.h:1
 msgid "No protocol installed"
 msgstr "尚未安裝通訊協定"
@@ -2327,104 +2313,108 @@ msgid ""
 msgstr "要加入新的帳號，您必須先安裝每個會用到的通訊協定後端程式。"
 
 #: ../src/empathy-accounts-dialog.ui.h:4
-msgid "_Add&#x2026;"
-msgstr "加入(_A)&#x2026;"
+msgid "_Add…"
+msgstr "加入(_A)…"
 
 #: ../src/empathy-accounts-dialog.ui.h:5
-msgid "_Import&#x2026;"
-msgstr "匯入(_I)&#x2026;"
+msgid "_Import…"
+msgstr "匯入(_I)…"
 
-#: ../src/empathy-call-window.c:453
+#: ../src/empathy-auto-salut-account-helper.c:77
+msgid "People nearby"
+msgstr "附近的人"
+
+#: ../src/empathy-call-window.c:462
 msgid "Contrast"
 msgstr "對比"
 
-#: ../src/empathy-call-window.c:456
+#: ../src/empathy-call-window.c:465
 msgid "Brightness"
 msgstr "亮度"
 
-#: ../src/empathy-call-window.c:459
+#: ../src/empathy-call-window.c:468
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../src/empathy-call-window.c:567
+#: ../src/empathy-call-window.c:573
 msgid "Volume"
 msgstr "音量"
 
-#: ../src/empathy-call-window.c:1022
+#: ../src/empathy-call-window.c:1120
 msgid "_Sidebar"
 msgstr "側邊列(_S)"
 
-#: ../src/empathy-call-window.c:1041
-msgid "Dialpad"
-msgstr "播號盤"
-
-#: ../src/empathy-call-window.c:1047
+#: ../src/empathy-call-window.c:1139
 msgid "Audio input"
 msgstr "音效輸入"
 
-#: ../src/empathy-call-window.c:1051
+#: ../src/empathy-call-window.c:1143
 msgid "Video input"
 msgstr "視訊輸入"
 
+#: ../src/empathy-call-window.c:1147
+msgid "Dialpad"
+msgstr "播號盤"
+
 #. translators: Call is a noun and %s is the contact name. This string
 #. * is used in the window title
-#: ../src/empathy-call-window.c:1116
+#: ../src/empathy-call-window.c:1218
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
 #. translators: Call is a noun. This string is used in the window
 #. * title
-#: ../src/empathy-call-window.c:1197
+#: ../src/empathy-call-window.c:1299
 msgid "Call"
 msgstr "通話"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1694
+#: ../src/empathy-call-window.c:1956
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
-#: ../src/empathy-call-window.c:1755
+#: ../src/empathy-call-window.c:2017
 msgid "Technical Details"
 msgstr "技術細節"
 
-#: ../src/empathy-call-window.c:1793
+#: ../src/empathy-call-window.c:2055
 #, c-format
 msgid ""
 "%s's software does not understand any of the audio formats supported by your "
 "computer"
 msgstr "%s 的軟體不瞭解任何您電腦上所支援的音訊格式"
 
-#: ../src/empathy-call-window.c:1798
+#: ../src/empathy-call-window.c:2060
 #, c-format
 msgid ""
 "%s's software does not understand any of the video formats supported by your "
 "computer"
 msgstr "%s 的軟體不瞭解任何您電腦上所支援的視訊格式"
 
-#: ../src/empathy-call-window.c:1804
+#: ../src/empathy-call-window.c:2066
 #, c-format
 msgid ""
 "Can't establish a connection to %s. One of you might be on a network that "
 "does not allow direct connections."
 msgstr "無法和 %s 建立連線。您們其中之一可能在一個不允許直接連線的網路之上。"
 
-#: ../src/empathy-call-window.c:1810
+#: ../src/empathy-call-window.c:2072
 msgid "There was a failure on the network"
 msgstr "這個網路上有錯誤發生"
 
-#: ../src/empathy-call-window.c:1814
+#: ../src/empathy-call-window.c:2076
 msgid ""
 "The audio formats necessary for this call are not installed on your computer"
 msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝"
 
-#: ../src/empathy-call-window.c:1817
+#: ../src/empathy-call-window.c:2079
 msgid ""
 "The video formats necessary for this call are not installed on your computer"
 msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝"
 
-#: ../src/empathy-call-window.c:1827
+#: ../src/empathy-call-window.c:2089
 #, c-format
 msgid ""
 "Something unexpected happened in a Telepathy component. Please <a href=\"%s"
@@ -2434,15 +2424,15 @@ msgstr ""
 "在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">回報這個錯誤</a>並附上"
 "從求助選單內的「除錯」視窗中所收集的紀錄。"
 
-#: ../src/empathy-call-window.c:1835
+#: ../src/empathy-call-window.c:2097
 msgid "There was a failure in the call engine"
 msgstr "通話引擎內有錯誤發生"
 
-#: ../src/empathy-call-window.c:1874
+#: ../src/empathy-call-window.c:2136
 msgid "Can't establish audio stream"
 msgstr "無法建立音訊串流"
 
-#: ../src/empathy-call-window.c:1884
+#: ../src/empathy-call-window.c:2146
 msgid "Can't establish video stream"
 msgstr "無法建立視訊串流"
 
@@ -2514,31 +2504,31 @@ msgstr "視訊預覽"
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-chat-window.c:436 ../src/empathy-chat-window.c:456
+#: ../src/empathy-chat-window.c:451 ../src/empathy-chat-window.c:471
 #, c-format
 msgid "%s (%d unread)"
 msgid_plural "%s (%d unread)"
 msgstr[0] "%s (%d 個未讀)"
 
-#: ../src/empathy-chat-window.c:448
+#: ../src/empathy-chat-window.c:463
 #, c-format
 msgid "%s (and %u other)"
 msgid_plural "%s (and %u others)"
 msgstr[0] "%s (與 %u 其他的)"
 
-#: ../src/empathy-chat-window.c:464
+#: ../src/empathy-chat-window.c:479
 #, c-format
 msgid "%s (%d unread from others)"
 msgid_plural "%s (%d unread from others)"
 msgstr[0] "%s (來自其他人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:473
+#: ../src/empathy-chat-window.c:488
 #, c-format
 msgid "%s (%d unread from all)"
 msgid_plural "%s (%d unread from all)"
 msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:684
+#: ../src/empathy-chat-window.c:691
 msgid "Typing a message."
 msgstr "正在輸入訊息。"
 
@@ -2560,7 +2550,7 @@ msgstr "插入表情符號(_S)"
 
 #: ../src/empathy-chat-window.ui.h:5
 msgid "Invite _Participant…"
-msgstr "邀請參與(_P)..."
+msgstr "邀請參與(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:6
 msgid "Move Tab _Left"
@@ -2610,6 +2600,10 @@ msgstr "顯示連絡人清單(_S)"
 msgid "_Tabs"
 msgstr "分頁(_T)"
 
+#: ../src/empathy-chat-window.ui.h:18
+msgid "_Undo Close Tab"
+msgstr "復原關閉的分頁(_U)"
+
 #: ../src/empathy-chatrooms-window.c:256
 msgid "Name"
 msgstr "名稱"
@@ -2626,76 +2620,76 @@ msgstr "自動連線"
 msgid "Manage Favorite Rooms"
 msgstr "管理喜好的聊天室"
 
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:351
 msgid "Incoming video call"
 msgstr "傳入的視訊通話"
 
-#: ../src/empathy-event-manager.c:339
+#: ../src/empathy-event-manager.c:351
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-event-manager.c:343
+#: ../src/empathy-event-manager.c:355
 #, c-format
 msgid "%s is video calling you. Do you want to answer?"
 msgstr "%s 要與您進行視訊通話。您是否要接聽？"
 
-#: ../src/empathy-event-manager.c:344
+#: ../src/empathy-event-manager.c:356
 #, c-format
 msgid "%s is calling you. Do you want to answer?"
 msgstr "%s 要與您進行通話。您是否要接聽？"
 
-#: ../src/empathy-event-manager.c:366
+#: ../src/empathy-event-manager.c:378
 msgid "_Reject"
 msgstr "拒絕(_R)"
 
-#: ../src/empathy-event-manager.c:372
+#: ../src/empathy-event-manager.c:384
 msgid "_Answer"
 msgstr "接聽(_A)"
 
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:501
 #, c-format
 msgid "Incoming video call from %s"
 msgstr "來自 %s 的視訊電話"
 
-#: ../src/empathy-event-manager.c:489
+#: ../src/empathy-event-manager.c:501
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
-#: ../src/empathy-event-manager.c:579
+#: ../src/empathy-event-manager.c:598
 msgid "Room invitation"
 msgstr "聊天邀請"
 
-#: ../src/empathy-event-manager.c:582
+#: ../src/empathy-event-manager.c:601
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請您加入 %s"
 
-#: ../src/empathy-event-manager.c:590
+#: ../src/empathy-event-manager.c:609
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/empathy-event-manager.c:595
+#: ../src/empathy-event-manager.c:614
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:653
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請您加入 %s"
 
-#: ../src/empathy-event-manager.c:660
+#: ../src/empathy-event-manager.c:679
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:818
+#: ../src/empathy-event-manager.c:837
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "來自 %s 的訂閱要求"
 
-#: ../src/empathy-event-manager.c:822
+#: ../src/empathy-event-manager.c:841
 #, c-format
 msgid ""
 "\n"
@@ -2705,13 +2699,13 @@ msgstr ""
 "訊息：%s"
 
 #. someone is logging off
-#: ../src/empathy-event-manager.c:862
+#: ../src/empathy-event-manager.c:881
 #, c-format
 msgid "%s is now offline."
 msgstr "%s 現在離線。"
 
 #. someone is logging in
-#: ../src/empathy-event-manager.c:878
+#: ../src/empathy-event-manager.c:897
 #, c-format
 msgid "%s is now online."
 msgstr "%s 現在上線。"
@@ -2855,23 +2849,23 @@ msgstr "來源"
 msgid "%s account"
 msgstr "%s 帳號"
 
-#: ../src/empathy-main-window.c:433
+#: ../src/empathy-main-window.c:440
 msgid "Reconnect"
 msgstr "重新連接"
 
-#: ../src/empathy-main-window.c:439
+#: ../src/empathy-main-window.c:446
 msgid "Edit Account"
 msgstr "編輯帳號"
 
-#: ../src/empathy-main-window.c:445
+#: ../src/empathy-main-window.c:452
 msgid "Close"
 msgstr "關閉"
 
-#: ../src/empathy-main-window.c:1028
+#: ../src/empathy-main-window.c:1056
 msgid "Contact"
 msgstr "連絡人"
 
-#: ../src/empathy-main-window.c:1369
+#: ../src/empathy-main-window.c:1437
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳號"
 
@@ -2901,7 +2895,7 @@ msgstr "正常大小(_O)"
 
 #: ../src/empathy-main-window.ui.h:7 ../src/empathy-status-icon.ui.h:1
 msgid "New _Call…"
-msgstr "新通話(_C)..."
+msgstr "新增通話(_C)…"
 
 #: ../src/empathy-main-window.ui.h:8
 msgid "Normal Size With _Avatars"
@@ -2941,11 +2935,11 @@ msgstr "檔案傳輸(_F)"
 
 #: ../src/empathy-main-window.ui.h:22
 msgid "_Join…"
-msgstr "加入(_J)..."
+msgstr "加入(_J)…"
 
 #: ../src/empathy-main-window.ui.h:23 ../src/empathy-status-icon.ui.h:3
 msgid "_New Conversation…"
-msgstr "新增談話(_N)..."
+msgstr "新增談話(_N)…"
 
 #: ../src/empathy-main-window.ui.h:24
 msgid "_Offline Contacts"
@@ -2959,17 +2953,17 @@ msgstr "個人資訊(_P)"
 msgid "_Room"
 msgstr "聊天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:338
+#: ../src/empathy-new-chatroom-dialog.c:379
 msgid "Chat Room"
 msgstr "聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:354
+#: ../src/empathy-new-chatroom-dialog.c:395
 msgid "Members"
 msgstr "成員"
 
 #. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
 #. yes/no, yes/no and a number.
-#: ../src/empathy-new-chatroom-dialog.c:539
+#: ../src/empathy-new-chatroom-dialog.c:605
 #, c-format
 msgid ""
 "<b>%s</b>\n"
@@ -2982,16 +2976,16 @@ msgstr ""
 "需要密碼：%s\n"
 "成員：%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:541
-#: ../src/empathy-new-chatroom-dialog.c:542
+#: ../src/empathy-new-chatroom-dialog.c:607
+#: ../src/empathy-new-chatroom-dialog.c:608
 msgid "No"
 msgstr "否"
 
-#: ../src/empathy-new-chatroom-dialog.c:569
+#: ../src/empathy-new-chatroom-dialog.c:635
 msgid "Could not start room listing"
 msgstr "無法開始列出聊天室清單"
 
-#: ../src/empathy-new-chatroom-dialog.c:579
+#: ../src/empathy-new-chatroom-dialog.c:645
 msgid "Could not stop room listing"
 msgstr "無法停止列出聊天室清單"
 
@@ -3168,7 +3162,7 @@ msgstr "啟用音效通知(_E)"
 
 #: ../src/empathy-preferences.ui.h:28
 msgid "_GPS"
-msgstr "GPS(_G)"
+msgstr "_GPS"
 
 #: ../src/empathy-preferences.ui.h:29
 msgid "_Network (IP, Wi-Fi)"
@@ -3186,7 +3180,7 @@ msgstr "對我的連絡人公開位置(_P)"
 msgid "_Reduce location accuracy"
 msgstr "降低位置準確度(_R)"
 
-#: ../src/empathy-status-icon.c:176
+#: ../src/empathy-status-icon.c:178
 msgid "Respond"
 msgstr "回應"
 
@@ -3202,63 +3196,63 @@ msgstr "結束(_Q)"
 msgid "Contact Map View"
 msgstr "連絡人地圖檢視"
 
-#: ../src/empathy-debug-window.c:1066
+#: ../src/empathy-debug-window.c:1078
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/empathy-debug-window.c:1219
+#: ../src/empathy-debug-window.c:1251
 msgid "Debug Window"
 msgstr "偵錯視窗"
 
-#: ../src/empathy-debug-window.c:1299
+#: ../src/empathy-debug-window.c:1331
 msgid "Pause"
 msgstr "暫停"
 
-#: ../src/empathy-debug-window.c:1311
+#: ../src/empathy-debug-window.c:1343
 msgid "Level "
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1331
+#: ../src/empathy-debug-window.c:1363
 msgid "Debug"
 msgstr "偵錯"
 
-#: ../src/empathy-debug-window.c:1337
+#: ../src/empathy-debug-window.c:1369
 msgid "Info"
 msgstr "資訊"
 
-#: ../src/empathy-debug-window.c:1343 ../src/empathy-debug-window.c:1392
+#: ../src/empathy-debug-window.c:1375 ../src/empathy-debug-window.c:1424
 msgid "Message"
 msgstr "訊息"
 
-#: ../src/empathy-debug-window.c:1349
+#: ../src/empathy-debug-window.c:1381
 msgid "Warning"
 msgstr "警告"
 
-#: ../src/empathy-debug-window.c:1355
+#: ../src/empathy-debug-window.c:1387
 msgid "Critical"
 msgstr "嚴重"
 
-#: ../src/empathy-debug-window.c:1361
+#: ../src/empathy-debug-window.c:1393
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/empathy-debug-window.c:1380
+#: ../src/empathy-debug-window.c:1412
 msgid "Time"
 msgstr "時刻"
 
-#: ../src/empathy-debug-window.c:1383
+#: ../src/empathy-debug-window.c:1415
 msgid "Domain"
 msgstr "網域"
 
-#: ../src/empathy-debug-window.c:1385
+#: ../src/empathy-debug-window.c:1417
 msgid "Category"
 msgstr "分類"
 
-#: ../src/empathy-debug-window.c:1387
+#: ../src/empathy-debug-window.c:1419
 msgid "Level"
 msgstr "等級"
 
-#: ../src/empathy-debug-window.c:1424
+#: ../src/empathy-debug-window.c:1456
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
@@ -3284,7 +3278,7 @@ msgstr "如果有任何非 salut 的帳號，就不要顯示任何對話窗"
 #: ../src/empathy-accounts.c:221
 #, fuzzy
 msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
-msgstr "初始化選取給予的帳號（例：gabble/jabber/foo_40example_2eorg0）"
+msgstr "初始化選取所給予的帳號（例：gabble/jabber/foo_40example_2eorg0）"
 
 #: ../src/empathy-accounts.c:223
 msgid "<account-id>"
@@ -3295,8 +3289,55 @@ msgid "- Empathy Accounts"
 msgstr "- Empathy 帳號"
 
 #: ../src/empathy-accounts.c:247
-msgid " Accounts"
-msgstr "帳號"
+msgid "Empathy Accounts"
+msgstr "Empathy 帳號"
+
+#: ../src/empathy-debugger.c:40
+msgid "Empathy Debugger"
+msgstr "Empathy 除錯程式"
+
+#~ msgid "Hostname of the proxy for outbound requests."
+#~ msgstr "資料傳出要求所使用的 proxy 主機名稱。"
+
+#~ msgid ""
+#~ "Look up the DNS SRV record at the service's domain for the host name of a "
+#~ "STUN server."
+#~ msgstr ""
+#~ "查詢位於伺服器 domain 的 DNS SRV 紀錄以取得某個 STUN 伺服器的主機名稱。"
+
+#~ msgid "Port of the proxy for outbound requests."
+#~ msgstr "資料傳出要求所使用的 proxy 連接埠。"
+
+#~ msgid ""
+#~ "The username for SIP authentication, if different from the SIP URI\n"
+#~ "username."
+#~ msgstr ""
+#~ "SIP 驗證用的使用者名稱，如果和 SIP URI 不同時使用\n"
+#~ "使用。"
+
+#~ msgid ""
+#~ "Update the registration binding if the external address for the client is "
+#~ "discovered to be different from the local binding."
+#~ msgstr ""
+#~ "如果客戶端的外部位址被探索出與本機綁定 (local binding) 不同時，更新註冊綁"
+#~ "定 (registration binding)。"
+
+#~ msgid ""
+#~ "Use the loose routing behavior and the Route header as recommended in RFC "
+#~ "3261."
+#~ msgstr "使用寬鬆路由行為以及使用 RFC 3261 內所建議的 Route 標頭。"
+
+#~ msgid "_Add&#x2026;"
+#~ msgstr "加入(_A)&#x2026;"
+
+#~ msgid "_Import&#x2026;"
+#~ msgstr "匯入(_I)&#x2026;"
+
+#~ msgid "Accounts"
+#~ msgstr "帳號"
+
+#~ msgid " Accounts"
+#~ msgstr "帳號"
 
 #~ msgid "Salut account is created"
 #~ msgstr "已建立 Salut 帳號"
@@ -3323,7 +3364,3 @@ msgstr "帳號"
 
 #~ msgid "<b>Location</b>"
 #~ msgstr "<b>位置</b>"
-
-#, fuzzy
-#~ msgid "_Add…"
-#~ msgstr "加入(_A)..."