Merge branch 'sasl'

[empathy.git] / po / zh_TW.po

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 5dabbf59a29788733868c85f5d089cd11f890936..41a79de3411839c16f50354b95b28f06e5826287 100644 (file)
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,473 +3,630 @@
 # Abel Cheung <abel@oaka.org>, 2003, 2004.
 # Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>, 2005.
 # Tryneeds translation team, 2009.
+# Cheng-Chia Tseng <pswo10680@gmail.com>, 2010.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.27.90\n"
+"Project-Id-Version: empathy 2.91.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 16:10+0800\n"
-"PO-Revision-Date: 2009-06-19 08:17+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
-"Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n"
+"POT-Creation-Date: 2010-10-13 15:39+0800\n"
+"PO-Revision-Date: 2010-09-23 20:50+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680@gmail.com>\n"
+"Language-Team: Chinese (traditional) <chinese-l10n@googlegroups.com>\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../data/empathy.desktop.in.in.h:1
-msgid "Empathy IM Client"
-msgstr ""
+msgid "Chat on Google Talk, Facebook, MSN and many other chat services"
+msgstr "使用 Google Talk、Facebook、MSN 與其他聊天服務和他人對話"
 
 #: ../data/empathy.desktop.in.in.h:2
-#, fuzzy
-#| msgid "Send and receive instant messages"
-msgid "Send and receive messages"
-msgstr "傳送與接收即時訊息"
+msgid "Empathy"
+msgstr "Empathy"
+
+#: ../data/empathy.desktop.in.in.h:3
+msgid "Empathy Internet Messaging"
+msgstr "Empathy 網際網路通訊程式"
+
+#: ../data/empathy.desktop.in.in.h:4
+msgid "IM Client"
+msgstr "即時通用戶端"
 
-#: ../data/empathy.schemas.in.h:1
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:1
 msgid "Always open a separate chat window for new chats."
 msgstr "永遠為每個新的聊天開啟新的聊天視窗。"
 
-#: ../data/empathy.schemas.in.h:2
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:2
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "在群組聊天中使用暱稱補齊 (tab) 時要加到暱稱之後的字元。"
 
-#: ../data/empathy.schemas.in.h:3
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:3
 msgid "Chat window theme"
 msgstr "聊天視窗佈景主題"
 
-#: ../data/empathy.schemas.in.h:4
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:4
 msgid ""
-"Comma separated list of spell checker languages to use (e.g. en, fr, nl)."
-msgstr "要使用拼字檢查的語言清單（以逗號分隔，如 en,fr,nl）。"
+"Comma-separated list of spell checker languages to use (e.g. \"en, fr, nl\")."
+msgstr "以逗號分隔要使用拼字檢查的語言清單 (如：「 en, fr, nl」)。"
 
-#: ../data/empathy.schemas.in.h:5
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:5
 msgid "Compact contact list"
 msgstr "精簡連絡人清單"
 
-#: ../data/empathy.schemas.in.h:6
-msgid "Contact list sort criterium"
-msgstr "連絡人清單排序條件"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:6
+msgid "Connection managers should be used"
+msgstr "使用連線管理程式"
 
-#: ../data/empathy.schemas.in.h:7
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:7
+msgid "Contact list sort criterion"
+msgstr "連絡人清單排序準則"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:8
 msgid "Default directory to select an avatar image from"
 msgstr "用來選擇大頭貼圖片的預設目錄"
 
-#: ../data/empathy.schemas.in.h:8
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:9
 msgid "Disable popup notifications when away"
 msgstr "當狀態為離開時停用彈出式通知"
 
-#: ../data/empathy.schemas.in.h:9
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:10
 msgid "Disable sounds when away"
 msgstr "當狀態為離開時停用音效"
 
-#: ../data/empathy.schemas.in.h:10
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:11
+msgid "Display incoming events in the status area"
+msgstr "在狀態區域顯示收到事件"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:12
+msgid ""
+"Display incoming events in the status area. If false, present them to the "
+"user immediately."
+msgstr "在狀態區域顯示收到事件。如果不啟用的話，收到事件會直接呈現給使用者。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:13
 msgid "Empathy can publish the user's location"
 msgstr "Empathy 可以發佈使用者的位置"
 
-#: ../data/empathy.schemas.in.h:11
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:14
 msgid "Empathy can use the GPS to guess the location"
 msgstr "Empathy 可以利用 GPS 來推測位置"
 
-#: ../data/empathy.schemas.in.h:12
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:15
 msgid "Empathy can use the cellular network to guess the location"
-msgstr "Empathy 可以利用手機網路基地台來推測位置"
+msgstr "Empathy 可以利用行動電話網路基地台來推測位置"
 
-#: ../data/empathy.schemas.in.h:13
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:16
 msgid "Empathy can use the network to guess the location"
 msgstr "Empathy 可以利用網路來推測位置"
 
-#: ../data/empathy.schemas.in.h:14
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:17
 msgid "Empathy default download folder"
 msgstr "Empathy 預設下載資料夾"
 
-#: ../data/empathy.schemas.in.h:15
-msgid "Empathy has asked about importing accounts"
-msgstr "Empathy 已詢å\95\8få\8c¯å\85¥å¸³è\99\9f"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:18
+msgid "Empathy has migrated butterfly logs"
+msgstr "Empathy å·²è½\89移 butterfly æ\97¥èª\8c"
 
-#: ../data/empathy.schemas.in.h:16
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:19
+msgid "Empathy should auto-away when idle"
+msgstr "Empathy 當閒置時應該自動設為離開"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:20
 msgid "Empathy should auto-connect on startup"
 msgstr "Empathy 啟動時自動連線"
 
-#: ../data/empathy.schemas.in.h:17
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:21
 msgid "Empathy should reduce the location's accuracy"
 msgstr "Empathy 應降低位置的準確度"
 
-#: ../data/empathy.schemas.in.h:18
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:22
 msgid "Empathy should use the avatar of the contact as the chat window icon"
 msgstr "Empathy 要使用連絡人的大頭貼做為聊天視窗圖示"
 
-#: ../data/empathy.schemas.in.h:19
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:23
 msgid "Enable WebKit Developer Tools"
-msgstr ""
+msgstr "啟用 WebKit 開發者工具"
 
-#: ../data/empathy.schemas.in.h:20
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:24
 msgid "Enable popup notifications for new messages"
 msgstr "啟用新訊息的彈出式通知"
 
-#: ../data/empathy.schemas.in.h:21
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:25
 msgid "Enable spell checker"
 msgstr "啟用拼字檢查程式"
 
-#: ../data/empathy.schemas.in.h:22
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:26
 msgid "Hide main window"
 msgstr "隱藏主視窗"
 
-#: ../data/empathy.schemas.in.h:23
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:27
 msgid "Hide the main window."
 msgstr "隱藏主視窗。"
 
-#: ../data/empathy.schemas.in.h:24
-msgid "NetworkManager should be used"
-msgstr "應該使用 NetworkManager"
-
-#: ../data/empathy.schemas.in.h:25
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:28
 msgid "Nick completed character"
 msgstr "暱稱補齊字元"
 
-#: ../data/empathy.schemas.in.h:26
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:29
 msgid "Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天"
 
-#: ../data/empathy.schemas.in.h:27
-msgid "Path of the adium theme to use"
-msgstr "要使用的 adium 佈景主題路徑"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:30
+msgid "Path of the Adium theme to use"
+msgstr "要使用的 Adium 佈景主題路徑"
 
-#: ../data/empathy.schemas.in.h:28
-msgid "Path of the adium theme to use if the theme used for chat is adium."
-msgstr "如果聊天室使用的主題是 adium 時要使用的 adium 佈景主題路徑。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:31
+msgid "Path of the Adium theme to use if the theme used for chat is Adium."
+msgstr "如果聊天室使用的主題是 Adium 時要使用的 Adium 佈景主題路徑。"
 
-#: ../data/empathy.schemas.in.h:29
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:32
 msgid "Play a sound for incoming messages"
 msgstr "收到訊息時播放音效"
 
-#: ../data/empathy.schemas.in.h:30
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:33
 msgid "Play a sound for new conversations"
 msgstr "當開啟新的談話時播放音效"
 
-#: ../data/empathy.schemas.in.h:31
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:34
 msgid "Play a sound for outgoing messages"
 msgstr "送出訊息時播放音效"
 
-#: ../data/empathy.schemas.in.h:32
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:35
 msgid "Play a sound when a contact logs in"
 msgstr "當連絡人登入時播放音效"
 
-#: ../data/empathy.schemas.in.h:33
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:36
 msgid "Play a sound when a contact logs out"
 msgstr "當有連絡人登出時播放音效"
 
-#: ../data/empathy.schemas.in.h:34
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:37
 msgid "Play a sound when we log in"
 msgstr "當我們登入時播放音效"
 
-#: ../data/empathy.schemas.in.h:35
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:38
 msgid "Play a sound when we log out"
 msgstr "當我們登出時播放音效"
 
-#: ../data/empathy.schemas.in.h:36
-msgid "Popup notifications if the chat isn't focused"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:39
+msgid "Pop up notifications if the chat isn't focused"
 msgstr "如果聊天視窗失去焦點則彈出通知"
 
-#: ../data/empathy.schemas.in.h:37
-msgid "Popup notifications when a contact sign in"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:40
+msgid "Pop up notifications when a contact logs in"
 msgstr "當連絡人登入時彈出通知"
 
-#: ../data/empathy.schemas.in.h:38
-msgid "Popup notifications when a contact sign out"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:41
+msgid "Pop up notifications when a contact logs out"
 msgstr "當連絡人登出時彈出通知"
 
-#: ../data/empathy.schemas.in.h:39
-msgid "Salut account is created"
-msgstr "已建立 Salut 帳號"
-
-#: ../data/empathy.schemas.in.h:40
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:42
 msgid "Show avatars"
 msgstr "顯示大頭貼"
 
-#: ../data/empathy.schemas.in.h:41
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:43
 msgid "Show contact list in rooms"
 msgstr "在聊天室顯示連絡人清單"
 
-#: ../data/empathy.schemas.in.h:42
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:44
 msgid "Show hint about closing the main window"
 msgstr "關閉主視窗時顯示提示"
 
-#: ../data/empathy.schemas.in.h:43
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:45
 msgid "Show offline contacts"
 msgstr "顯示離線連絡人"
 
-#: ../data/empathy.schemas.in.h:44
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:46
+msgid "Show protocols"
+msgstr "顯示協定"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:47
 msgid "Spell checking languages"
-msgstr "拼字檢查語言"
+msgstr "拼字檢查的語言"
 
-#: ../data/empathy.schemas.in.h:45
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:48
 msgid "The default folder to save file transfers in."
 msgstr "用來儲存檔案傳輸接收檔案的預設資料夾。"
 
-#: ../data/empathy.schemas.in.h:46
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:49
 msgid "The last directory that an avatar image was chosen from."
 msgstr "上次選擇大頭貼圖片的目錄。"
 
-#: ../data/empathy.schemas.in.h:47
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:50
+msgid "The position for the chat window side pane"
+msgstr "聊天視窗側窗格的位置"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:51
+msgid "The stored position (in pixels) of the chat window side pane."
+msgstr "聊天視窗側窗格的儲存位置 (單位為像素)。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:52
 msgid "The theme that is used to display the conversation in chat windows."
 msgstr "用來顯示在聊天視窗的談話中的佈景主題。"
 
-#: ../data/empathy.schemas.in.h:48
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:53
 msgid "Use graphical smileys"
 msgstr "使用圖片式表情符號"
 
-#: ../data/empathy.schemas.in.h:49
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:54
 msgid "Use notification sounds"
 msgstr "使用通知音效"
 
-#: ../data/empathy.schemas.in.h:50
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:55
 msgid "Use theme for chat rooms"
 msgstr "在聊天室使用佈景主題"
 
-#: ../data/empathy.schemas.in.h:51
-msgid ""
-"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
-msgstr ""
-
-#: ../data/empathy.schemas.in.h:52
-msgid "Whether or not Empathy can publish the user's location to his contacts."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:56
+msgid "Whether Empathy can publish the user's location to their contacts."
 msgstr "Empathy 是否要將使用者的位置發佈給他的連絡人。"
 
-#: ../data/empathy.schemas.in.h:53
-msgid "Whether or not Empathy can use the GPS to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:57
+msgid "Whether Empathy can use the GPS to guess the location."
 msgstr "Empathy 是否使用 GPS 來推測位置。"
 
-#: ../data/empathy.schemas.in.h:54
-msgid ""
-"Whether or not Empathy can use the cellular network to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:58
+msgid "Whether Empathy can use the cellular network to guess the location."
 msgstr "Empathy 是否使用行動電話網路來推測位置。"
 
-#: ../data/empathy.schemas.in.h:55
-msgid "Whether or not Empathy can use the network to guess the location."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:59
+msgid "Whether Empathy can use the network to guess the location."
 msgstr "Empathy 是否使用網路來推測位置。"
 
-#: ../data/empathy.schemas.in.h:56
-msgid ""
-"Whether or not Empathy has asked about importing accounts from other "
-"programs."
-msgstr "Empathy 是否應詢問您要不要從其他程式匯入帳號。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:60
+msgid "Whether Empathy has migrated butterfly logs."
+msgstr "Empathy 是否應轉移 butterfly 日誌。"
 
-#: ../data/empathy.schemas.in.h:57
-msgid ""
-"Whether or not Empathy should automatically log in to your accounts on "
-"startup."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:61
+msgid "Whether Empathy should automatically log into your accounts on startup."
 msgstr "Empathy 是否應在啟動時自動登入您的帳號。"
 
-#: ../data/empathy.schemas.in.h:58
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:62
+msgid ""
+"Whether Empathy should go into away mode automatically if the user is idle."
+msgstr "Empathy 是否應在使用者閒置時自動切換為離開模式。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:63
 msgid ""
-"Whether or not Empathy should reduce the location's accuracy for privacy "
-"reasons."
-msgstr "Empathy 是否基於隱私權的理由減低位置的準確度。"
+"Whether Empathy should reduce the location's accuracy for privacy reasons."
+msgstr "Empathy 是否基於隱私的理由減低位置的準確度。"
 
-#: ../data/empathy.schemas.in.h:59
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:64
 msgid ""
-"Whether or not Empathy should use the avatar of the contact as the chat "
-"window icon."
+"Whether Empathy should use the avatar of the contact as the chat window icon."
 msgstr "Empathy 是否使用連絡人大頭貼做為聊天視窗圖示。"
 
-#: ../data/empathy.schemas.in.h:60
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:65
 msgid ""
-"Whether or not the Salut account has been created on the first Empathy run."
-msgstr "æ\98¯å\90¦å\9c¨ Empathy 第ä¸\80次å\9f·è¡\8cæ\99\82建ç«\8b Salut 帳è\99\9f。"
+"Whether WebKit developer tools, such as the Web Inspector, should be enabled."
+msgstr "æ\98¯å\90¦å\95\9fç\94¨ WebKit é\96\8bç\99¼è\80\85å·¥å\85·ï¼\8cä¾\8bå¦\82 Web Inspector。"
 
-#: ../data/empathy.schemas.in.h:61
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:66
 msgid ""
-"Whether or not the network manager should be used to automatically "
-"disconnect/reconnect."
-msgstr "在斷線/重新連線時是否自動使用網路管理程式。"
+"Whether connectivity managers should be used to automatically disconnect/"
+"reconnect."
+msgstr "是否使用連線管理程式自動斷線或重新連線。"
 
-#: ../data/empathy.schemas.in.h:62
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:67
 msgid ""
-"Whether or not to check words typed against the languages you want to check "
-"with."
+"Whether to check words typed against the languages you want to check with."
 msgstr "是否以您設定的語言檢查輸入有無錯字。"
 
-#: ../data/empathy.schemas.in.h:63
-msgid ""
-"Whether or not to convert smileys into graphical images in conversations."
-msgstr "在談話中是否將表情符號轉換為圖片形式。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:68
+msgid "Whether to convert smileys into graphical images in conversations."
+msgstr "是否將談話中的表情符號轉換為圖片形式。"
 
-#: ../data/empathy.schemas.in.h:64
-msgid ""
-"Whether or not to play a sound to notify for contacts logging in the network."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:69
+msgid "Whether to play a sound to notify of contacts logging into the network."
 msgstr "是否播放音效來通知有連絡人登入網路。"
 
-#: ../data/empathy.schemas.in.h:65
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:70
 msgid ""
-"Whether or not to play a sound to notify for contacts logging off the "
-"network."
+"Whether to play a sound to notify of contacts logging out of the network."
 msgstr "是否播放音效來通知有連絡人登出網路。"
 
-#: ../data/empathy.schemas.in.h:66
-msgid "Whether or not to play a sound to notify for events."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:71
+msgid "Whether to play a sound to notify of events."
 msgstr "是否播放音效來通知有事件發生。"
 
-#: ../data/empathy.schemas.in.h:67
-msgid "Whether or not to play a sound to notify for incoming messages."
-msgstr "是否播放音效來通知有訊息抵達。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:72
+msgid "Whether to play a sound to notify of incoming messages."
+msgstr "是否播放音效來通知有收到訊息。"
 
-#: ../data/empathy.schemas.in.h:68
-msgid "Whether or not to play a sound to notify for new conversations."
-msgstr "是否播放音效來通知開啟新的談話。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:73
+msgid "Whether to play a sound to notify of new conversations."
+msgstr "是否播放音效來通知新的談話。"
 
-#: ../data/empathy.schemas.in.h:69
-msgid "Whether or not to play a sound to notify for outgoing messages."
-msgstr "是否播放音效來通知有訊息送出。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:74
+msgid "Whether to play a sound to notify of outgoing messages."
+msgstr "是否播放音效來通知有送出訊息。"
 
-#: ../data/empathy.schemas.in.h:70
-msgid "Whether or not to play a sound when logging in a network."
-msgstr "當登入網路時是否播放音效。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:75
+msgid "Whether to play a sound when logging into a network."
+msgstr "當登入某網路時是否播放音效。"
 
-#: ../data/empathy.schemas.in.h:71
-msgid "Whether or not to play a sound when logging off a network."
-msgstr "當登出網路時是否播放音效。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:76
+msgid "Whether to play a sound when logging out of a network."
+msgstr "當登出某網路時是否播放音效。"
 
-#: ../data/empathy.schemas.in.h:72
-msgid "Whether or not to play sound notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:77
+msgid "Whether to play sound notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否播放音效通知。"
 
-#: ../data/empathy.schemas.in.h:73
-msgid ""
-"Whether or not to show a popup notification when a contact goes offline."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:78
+msgid "Whether to show a popup notification when a contact goes offline."
 msgstr "當連絡人離線時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:74
-msgid "Whether or not to show a popup notification when a contact goes online."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:79
+msgid "Whether to show a popup notification when a contact goes online."
 msgstr "當連絡人上線時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:75
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:80
 msgid ""
-"Whether or not to show a popup notification when receiving a new message "
-"even if the chat is already opened, but not focused."
+"Whether to show a popup notification when receiving a new message even if "
+"the chat is already opened, but not focused."
 msgstr "收到新訊息時是否顯示彈出式通知（即使已開啟聊天視窗，但沒有獲得焦點）。"
 
-#: ../data/empathy.schemas.in.h:76
-msgid ""
-"Whether or not to show a popup notification when receiving a new message."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:81
+msgid "Whether to show a popup notification when receiving a new message."
 msgstr "當收到新訊息時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:77
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:82
 msgid ""
-"Whether or not to show avatars for contacts in the contact list and chat "
-"windows."
+"Whether to show avatars for contacts in the contact list and chat windows."
 msgstr "是否在連絡人清單與聊天視窗顯示連絡人大頭貼。"
 
-#: ../data/empathy.schemas.in.h:78
-msgid "Whether or not to show contacts that are offline in the contact list."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:83
+msgid "Whether to show contacts that are offline in the contact list."
 msgstr "是否在連絡人清單中顯示離線的連絡人。"
 
-#: ../data/empathy.schemas.in.h:79
-msgid "Whether or not to show popup notifications when away or busy."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:84
+msgid "Whether to show popup notifications when away or busy."
 msgstr "當狀態為離開或忙碌時是否顯示彈出式通知。"
 
-#: ../data/empathy.schemas.in.h:80
-msgid "Whether or not to show the contact list in chat rooms."
-msgstr "是否在聊天室中顯示連絡人清單。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:85
+msgid "Whether to show protocols for contacts in the contact list."
+msgstr "是否要在聯絡人清單內顯示聯絡人使用協定。"
 
-#: ../data/empathy.schemas.in.h:81
-msgid ""
-"Whether or not to show the message dialog about closing the main window with "
-"the 'x' button in the title bar."
-msgstr "使用標題列的「x」按鈕關閉主視窗時是否顯示訊息。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:86
+msgid "Whether to show the contact list in chat rooms."
+msgstr "是否在聊天室中顯示連絡人清單。"
 
-#: ../data/empathy.schemas.in.h:82
-msgid "Whether to show the contact list in compact mode or not."
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:87
+msgid "Whether to show the contact list in compact mode."
 msgstr "是否以精簡模式顯示連絡人清單。"
 
-#: ../data/empathy.schemas.in.h:83
-msgid "Whether to use the theme for chat rooms or not."
-msgstr "是否在聊天室使用佈景主題。"
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:88
+msgid ""
+"Whether to show the message dialog about closing the main window with the "
+"'x' button in the title bar."
+msgstr "是否在使用標題列的「x」按鈕關閉主視窗時，顯示訊息對話窗。"
+
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:89
+msgid "Whether to use the theme for chat rooms."
+msgstr "是否為聊天室使用佈景主題。"
 
-#: ../data/empathy.schemas.in.h:84
+#: ../data/org.gnome.Empathy.gschema.xml.in.h:90
 msgid ""
-"Which criterium to use when sorting the contact list. Default is to use sort "
-"by the contact's name with the value \"name\". A value of \"state\" will "
-"sort the contact list by state."
+"Which criterion to use when sorting the contact list. Default is to sort by "
+"the contact's name with the value \"name\". A value of \"state\" will sort "
+"the contact list by state."
 msgstr ""
-"排序連絡人清單時要使用哪個條件。預設值是使用連絡人的名稱「name」數值來排序。"
-"而數值「state」則會使用其狀態來排序連絡人清單。"
+"排序連絡人清單時要使用哪個準則。預設值是使用連絡人的名稱「name」(名稱) 值來排"
+"序。而「state」(狀態) 值則會使用其狀態來排序連絡人清單。"
+
+#: ../data/empathy-accounts.desktop.in.in.h:1
+msgid "Manage Messaging and VoIP accounts"
+msgstr "管理訊息與 VoIP 帳號"
+
+#. Tweak the dialog
+#: ../data/empathy-accounts.desktop.in.in.h:2
+#: ../src/empathy-accounts-dialog.c:2105
+msgid "Messaging and VoIP Accounts"
+msgstr "訊息與 VoIP 帳號"
 
-#: ../libempathy/empathy-ft-handler.c:838
+#: ../libempathy/empathy-ft-handler.c:851
 msgid "The hash of the received file and the sent one do not match"
 msgstr "已接收檔案的雜湊值與送出的不符"
 
-#: ../libempathy/empathy-ft-handler.c:1098
+#: ../libempathy/empathy-ft-handler.c:1111
 msgid "File transfer not supported by remote contact"
 msgstr "遠端連絡人不支援檔案傳輸"
 
-#: ../libempathy/empathy-ft-handler.c:1156
+#: ../libempathy/empathy-ft-handler.c:1169
 msgid "The selected file is not a regular file"
 msgstr "選取的檔案不是正規的檔案"
 
-#: ../libempathy/empathy-ft-handler.c:1165
+#: ../libempathy/empathy-ft-handler.c:1178
 msgid "The selected file is empty"
 msgstr "選取的檔案是空白的"
 
-#: ../libempathy/empathy-tp-contact-list.c:843 ../src/empathy.c:289
-msgid "People nearby"
-msgstr "臨近人員"
-
-#: ../libempathy/empathy-tp-file.c:279
+#: ../libempathy/empathy-tp-file.c:283
 msgid "Socket type not supported"
 msgstr "Socket 類型不支援"
 
-#: ../libempathy/empathy-tp-file.c:398
+#: ../libempathy/empathy-tp-file.c:402
 msgid "No reason was specified"
 msgstr "沒有指定原因"
 
-#: ../libempathy/empathy-tp-file.c:401
+#: ../libempathy/empathy-tp-file.c:405
 msgid "The change in state was requested"
 msgstr "已要求變更狀態"
 
-#: ../libempathy/empathy-tp-file.c:404
+#: ../libempathy/empathy-tp-file.c:408
 msgid "You canceled the file transfer"
 msgstr "您已取消檔案傳輸"
 
-#: ../libempathy/empathy-tp-file.c:407
+#: ../libempathy/empathy-tp-file.c:411
 msgid "The other participant canceled the file transfer"
 msgstr "其他的參與者取消了檔案傳輸"
 
-#: ../libempathy/empathy-tp-file.c:410
+#: ../libempathy/empathy-tp-file.c:414
 msgid "Error while trying to transfer the file"
 msgstr "嘗試傳輸檔案時發生錯誤"
 
-#: ../libempathy/empathy-tp-file.c:413
+#: ../libempathy/empathy-tp-file.c:417
 msgid "The other participant is unable to transfer the file"
 msgstr "其他的參與者無法傳輸該檔案"
 
-#: ../libempathy/empathy-tp-file.c:416
+#: ../libempathy/empathy-tp-file.c:420 ../libempathy/empathy-utils.c:324
 msgid "Unknown reason"
-msgstr "不明的原因"
+msgstr "不明原因"
 
-#: ../libempathy/empathy-utils.c:265
+#: ../libempathy/empathy-utils.c:246
 msgid "Available"
 msgstr "有空"
 
-#: ../libempathy/empathy-utils.c:267
+#: ../libempathy/empathy-utils.c:248
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../libempathy/empathy-utils.c:270
+#: ../libempathy/empathy-utils.c:251
 msgid "Away"
 msgstr "離開"
 
-#: ../libempathy/empathy-utils.c:272
-msgid "Hidden"
+#: ../libempathy/empathy-utils.c:253
+msgid "Invisible"
 msgstr "隱藏"
 
-#: ../libempathy/empathy-utils.c:274
+#: ../libempathy/empathy-utils.c:255
 msgid "Offline"
 msgstr "離線"
 
+#: ../libempathy/empathy-utils.c:257 ../src/empathy-call-window.c:1894
+#: ../src/empathy-call-window.c:1895 ../src/empathy-call-window.c:1896
+#: ../src/empathy-call-window.c:1897 ../src/empathy-call-window.ui.h:18
+msgid "Unknown"
+msgstr "不明"
+
+#: ../libempathy/empathy-utils.c:296
+msgid "No reason specified"
+msgstr "沒有指定原因"
+
+#: ../libempathy/empathy-utils.c:298 ../libempathy/empathy-utils.c:354
+msgid "Status is set to offline"
+msgstr "狀態設為離線"
+
+#: ../libempathy/empathy-utils.c:300 ../libempathy/empathy-utils.c:334
+msgid "Network error"
+msgstr "網路錯誤"
+
+#: ../libempathy/empathy-utils.c:302 ../libempathy/empathy-utils.c:336
+msgid "Authentication failed"
+msgstr "驗證失敗"
+
+#: ../libempathy/empathy-utils.c:304 ../libempathy/empathy-utils.c:338
+msgid "Encryption error"
+msgstr "加密發生錯誤"
+
+#: ../libempathy/empathy-utils.c:306
+msgid "Name in use"
+msgstr "使用中的名稱"
+
+#: ../libempathy/empathy-utils.c:308 ../libempathy/empathy-utils.c:340
+msgid "Certificate not provided"
+msgstr "沒有提供憑證"
+
+#: ../libempathy/empathy-utils.c:310 ../libempathy/empathy-utils.c:342
+msgid "Certificate untrusted"
+msgstr "憑證不被信任"
+
+#: ../libempathy/empathy-utils.c:312 ../libempathy/empathy-utils.c:344
+msgid "Certificate expired"
+msgstr "憑證已逾期"
+
+#: ../libempathy/empathy-utils.c:314 ../libempathy/empathy-utils.c:346
+msgid "Certificate not activated"
+msgstr "憑證尚未使用"
+
+#: ../libempathy/empathy-utils.c:316 ../libempathy/empathy-utils.c:348
+msgid "Certificate hostname mismatch"
+msgstr "憑證主機名稱不符"
+
+#: ../libempathy/empathy-utils.c:318 ../libempathy/empathy-utils.c:350
+msgid "Certificate fingerprint mismatch"
+msgstr "憑證指紋檔不符"
+
+#: ../libempathy/empathy-utils.c:320 ../libempathy/empathy-utils.c:352
+msgid "Certificate self-signed"
+msgstr "憑證為自我簽署"
+
+#: ../libempathy/empathy-utils.c:322
+msgid "Certificate error"
+msgstr "憑證錯誤"
+
+#: ../libempathy/empathy-utils.c:356
+msgid "Encryption is not available"
+msgstr "加密無法使用"
+
+#: ../libempathy/empathy-utils.c:358
+msgid "Certificate is invalid"
+msgstr "憑證無效"
+
+#: ../libempathy/empathy-utils.c:360
+msgid "Connection has been refused"
+msgstr "連線遭拒"
+
+#: ../libempathy/empathy-utils.c:362
+msgid "Connection can't be established"
+msgstr "無法建立連線"
+
+#: ../libempathy/empathy-utils.c:364
+msgid "Connection has been lost"
+msgstr "已失去連線"
+
+#: ../libempathy/empathy-utils.c:366
+msgid "This resource is already connected to the server"
+msgstr "此資源已連接至該伺服器"
+
+#: ../libempathy/empathy-utils.c:368
+msgid ""
+"Connection has been replaced by a new connection using the same resource"
+msgstr "連線已被使用相同資源的新連線取代"
+
+#: ../libempathy/empathy-utils.c:371
+msgid "The account already exists on the server"
+msgstr "該帳號已經存在於伺服器上"
+
+#: ../libempathy/empathy-utils.c:373
+msgid "Server is currently too busy to handle the connection"
+msgstr "伺服器目前過於忙碌以致於無法處理該連線"
+
+#: ../libempathy/empathy-utils.c:375
+msgid "Certificate has been revoked"
+msgstr "已撤銷憑證"
+
+#: ../libempathy/empathy-utils.c:377
+msgid ""
+"Certificate uses an insecure cipher algorithm or is cryptographically weak"
+msgstr "憑證使用不安全的密碼演算法，或是密碼處理上較弱"
+
+#: ../libempathy/empathy-utils.c:380
+msgid ""
+"The length of the server certificate, or the depth of the server certificate "
+"chain, exceed the limits imposed by the cryptography library"
+msgstr "伺服器憑證的長度，或是伺服器憑證鏈的深度超過密碼函式庫所能處理的範圍"
+
+#: ../libempathy/empathy-utils.c:543
+#: ../libempathy-gtk/empathy-contact-list-store.h:73
+msgid "People Nearby"
+msgstr "附近的人"
+
+#: ../libempathy/empathy-utils.c:548
+msgid "Yahoo! Japan"
+msgstr "Yahoo! 日本"
+
+#: ../libempathy/empathy-utils.c:577
+msgid "Google Talk"
+msgstr ""
+
+#: ../libempathy/empathy-utils.c:578
+msgid "Facebook Chat"
+msgstr "Facebook 聊天"
+
 #: ../libempathy/empathy-time.c:137
 #, c-format
 msgid "%d second ago"
@@ -510,83 +667,228 @@ msgstr[0] "%d 個月以前"
 msgid "in the future"
 msgstr "未來"
 
-#: ../libempathy-gtk/empathy-account-chooser.c:426
+#: ../libempathy-gtk/empathy-account-chooser.c:463
 msgid "All"
 msgstr "全部"
 
-#: ../libempathy-gtk/empathy-account-widget.c:302
-#: ../libempathy-gtk/empathy-account-widget.c:354
+#: ../libempathy-gtk/empathy-account-widget.c:514
+#: ../libempathy-gtk/empathy-log-window.c:646
+#: ../src/empathy-import-widget.c:321
+msgid "Account"
+msgstr "帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:515
+msgid "Password"
+msgstr "密碼"
+
+#: ../libempathy-gtk/empathy-account-widget.c:516
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:507
+msgid "Server"
+msgstr "伺服器"
+
+#: ../libempathy-gtk/empathy-account-widget.c:517
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:522
+msgid "Port"
+msgstr "連接埠"
+
+#: ../libempathy-gtk/empathy-account-widget.c:589
+#: ../libempathy-gtk/empathy-account-widget.c:646
 #, c-format
 msgid "%s:"
-msgstr "%s:"
+msgstr "%s："
+
+#: ../libempathy-gtk/empathy-account-widget.c:1192
+msgid "Username:"
+msgstr "使用者名稱："
+
+#: ../libempathy-gtk/empathy-account-widget.c:1521
+msgid "A_pply"
+msgstr "套用(_A)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1551
+msgid "L_og in"
+msgstr "登入(_O)"
+
+#. Account and Identifier
+#: ../libempathy-gtk/empathy-account-widget.c:1617
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
+#: ../libempathy-gtk/empathy-individual-widget.c:1399
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:1
+#: ../src/empathy-chatrooms-window.ui.h:1
+#: ../src/empathy-new-chatroom-dialog.ui.h:1
+msgid "Account:"
+msgstr "帳號："
+
+#: ../libempathy-gtk/empathy-account-widget.c:1628
+msgid "_Enabled"
+msgstr "已啟用(_E)"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1693
+msgid "This account already exists on the server"
+msgstr "此帳號已經存在這個伺服器上"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1696
+msgid "Create a new account on the server"
+msgstr "在這個伺服器上建立新的帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:1789
+msgid "Ca_ncel"
+msgstr "取消(_N)"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the network. The resulting string will be something
+#. * like: "MyUserName on freenode".
+#. * 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:2077
+#, 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:2103
+#, c-format
+msgid "%s Account"
+msgstr "%s 帳號"
+
+#: ../libempathy-gtk/empathy-account-widget.c:2107
+msgid "New account"
+msgstr "新增帳號"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
-msgid "Advanced"
-msgstr "進階"
+msgid "<b>Example:</b> MyScreenName"
+msgstr "<b>範例：</b> 我的螢幕名稱"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-generic.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:2
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:2
-msgid "Pass_word:"
-msgstr "密碼(_W):"
+msgid "Advanced"
+msgstr "進階"
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
-msgid "Screen _Name:"
-msgstr "螢幕名稱(_N):"
-
-#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
-msgid "_Port:"
-msgstr "連接埠(_P):"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
+msgid "Pass_word:"
+msgstr "密碼(_W)："
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:4
+msgid "Screen _Name:"
+msgstr "螢幕名稱(_N)："
 
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your AIM password?"
+msgstr "您的 AIM 密碼是？"
+
+#: ../libempathy-gtk/empathy-account-widget-aim.ui.h:6
+msgid "What is your AIM screen name?"
+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:24
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:9
+msgid "_Port:"
+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:25
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:11
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
 msgid "_Server:"
-msgstr "伺服器(_S):"
+msgstr "伺服器(_S)："
 
-#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
-#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:2
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:1
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:1
+msgid "<b>Example:</b> username"
+msgstr "<b>範例：</b> 使用者名稱"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
-msgstr "登入 I_D:"
+msgstr "登入 I_D："
 
-#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:2
-msgid "ICQ _UIN:"
-msgstr "ICQ _UIN:"
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:5
+msgid "What is your GroupWise User ID?"
+msgstr "您的 GroupWise 使用者 ID 是？"
+
+#: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:6
+msgid "What is your GroupWise password?"
+msgstr "您的 GroupWise 密碼是？"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:1
+msgid "<b>Example:</b> 123456789"
+msgstr "<b>範例：</b> 123456789"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
+msgid "Ch_aracter set:"
+msgstr "字集(_A)："
 
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:5
-msgid "_Charset:"
-msgstr "編碼(_C):"
+msgid "ICQ _UIN:"
+msgstr "ICQ _UIN："
 
-#: ../libempathy-gtk/empathy-account-widget-irc.c:240
-msgid "New Network"
-msgstr "新網路"
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:6
+msgid "What is your ICQ UIN?"
+msgstr "您的 ICQ UIN 是？"
+
+#: ../libempathy-gtk/empathy-account-widget-icq.ui.h:7
+msgid "What is your ICQ password?"
+msgstr "您的 ICQ 密碼是？"
+
+#: ../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:186
+msgid "UDP"
+msgstr "UDP"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:189
+msgid "TCP"
+msgstr "TCP"
+
+#: ../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: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:226
+msgid "Options"
+msgstr "選項"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.c:229
+msgid "None"
+msgstr "無"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:1
-msgid "Charset:"
-msgstr "編碼:"
+msgid "Character set:"
+msgstr "字集："
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:2
 msgid "Network"
@@ -594,228 +896,440 @@ msgstr "網路"
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:3
 msgid "Network:"
-msgstr "網路:"
+msgstr "網路："
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:4
 msgid "Nickname:"
-msgstr "稱呼："
+msgstr "暱稱："
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:5
 msgid "Password:"
-msgstr "密碼:"
+msgstr "密碼："
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:6
 msgid "Quit message:"
-msgstr "離開訊息:"
+msgstr "離開訊息："
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:7
 msgid "Real name:"
-msgstr "真實姓名:"
+msgstr "真實姓名："
 
 #: ../libempathy-gtk/empathy-account-widget-irc.ui.h:8
 msgid "Servers"
 msgstr "伺服器"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:9
+msgid "What is your IRC nickname?"
+msgstr "您的 IRC 暱稱是？"
+
+#: ../libempathy-gtk/empathy-account-widget-irc.ui.h:10
+msgid "Which IRC network?"
+msgstr "哪個 IRC 網路？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<b>Example:</b> user@gmail.com"
+msgstr "<b>範例：</b> user@gmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
+msgid "<b>Example:</b> user@jabber.org"
+msgstr "<b>範例：</b> user@jabber.org"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+msgid "Encr_yption required (TLS/SSL)"
+msgstr "要求加密 (TLS/SSL)(_Y)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+msgid "I_gnore SSL certificate errors"
+msgstr "忽略 SSL 憑證錯誤(_G)"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Override server settings"
 msgstr "覆蓋伺服器設定值"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
-msgid "Pri_ority:"
-msgstr "優先權(_O):"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+msgid "Priori_ty:"
+msgstr "優先權(_T)："
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
 msgid "Reso_urce:"
-msgstr "資源(_U):"
+msgstr "資源(_U)："
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#. 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:12
+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 ""
+"這是您的使用者名稱，而不是您一般的 Facebook 登入。\n"
+"如果您是 facebook.com/<b>badger</b> 的話，請輸入 <b>badger</b>。\n"
+"如果您還沒有 Facebook 使用者名稱，請使用 <a href=\"http://www.facebook.com/"
+"username/\">此網頁</a> 來選用一個。"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "Use old SS_L"
-msgstr "使ç\94¨è\88\8aç\9a\84 SS_L"
+msgstr "使ç\94¨è\88\8aç\89\88 SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
-msgid "_Encryption required (TLS/SSL)"
-msgstr "要求加密[TLS/SSL](_E)"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+msgid "What is your Facebook password?"
+msgstr "您的 Facebook 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
-msgid "_Ignore SSL certificate errors"
-msgstr "忽略 SSL 憑證錯誤(_I)"
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
+msgid "What is your Facebook username?"
+msgstr "您的 Facebook 使用者名稱是？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
+msgid "What is your Google ID?"
+msgstr "您的 Google ID 是？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
+msgid "What is your Google password?"
+msgstr "您的 Google 密碼是？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:20
+msgid "What is your Jabber ID?"
+msgstr "您的 Jabber ID 是？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:21
+msgid "What is your Jabber password?"
+msgstr "您的 Jabber 密碼是？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:22
+msgid "What is your desired Jabber ID?"
+msgstr "您想要的 Jabber ID 是？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:23
+msgid "What is your desired Jabber password?"
+msgstr "您想要的 Jabber 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:2
-msgid "_Email:"
-msgstr "電子郵件(_E):"
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:1
+msgid "<b>Example:</b> user@hotmail.com"
+msgstr "<b>範例：</b> user@hotmail.com"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:5
+msgid "What is your Windows Live ID?"
+msgstr "您的 Windows Live ID 是？"
+
+#: ../libempathy-gtk/empathy-account-widget-msn.ui.h:6
+msgid "What is your Windows Live password?"
+msgstr "您的 Windows Live 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:2
+msgid "E-_mail address:"
+msgstr "電子信箱位址(_M)："
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:3
+msgid "Nic_kname:"
+msgstr "暱稱(_K)："
+
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:4
 msgid "_First Name:"
-msgstr "名字(_F):"
+msgstr "名(_F)："
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:5
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:6
 msgid "_Last Name:"
-msgstr "姓氏(_L):"
+msgstr "姓(_L)："
 
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:6
-msgid "_Nickname:"
-msgstr "暱稱(_N):"
-
-#: ../libempathy-gtk/empathy-account-widget-salut.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-local-xmpp.ui.h:7
 msgid "_Published Name:"
-msgstr "發佈的名稱(_P):"
+msgstr "發佈的名稱(_P)："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:1
+msgid "<b>Example:</b> user@my.sip.server"
+msgstr "<b>範例：</b> user@my.sip.server"
 
-#. look up the DNS SRV record at the service's domain for the host name of a STUN server.
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:3
-msgid "Discover STUN"
-msgstr "探索 STUN"
+msgid "Authentication username:"
+msgstr "認證使用者名稱："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:4
+msgid "Discover Binding"
+msgstr "探索綁定"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
-msgid "STUN Server:"
-msgstr "STUN 伺服器:"
+msgid "Discover the STUN server automatically"
+msgstr "自動探索 STUN 伺服器"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:6
-msgid "STUN port:"
-msgstr "STUN 通訊埠:"
+msgid "Interval (seconds)"
+msgstr "間隔 (秒)"
 
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:7
-msgid "_Username:"
-msgstr "使ç\94¨è\80\85å\90\8d稱(_U):"
+msgid "Keep-Alive Options"
+msgstr "ä¿\9dæ\8c\81ä¸\8dæ\96·ç·\9aé\81¸é \85"
 
-#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
-msgid "Use _Yahoo Japan"
-msgstr "使用 _Yahoo 日本"
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:8
+msgid "Loose Routing"
+msgstr "寬鬆路由"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:9
+msgid "Mechanism:"
+msgstr "機制："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:10
+msgid "Miscellaneous Options"
+msgstr "雜項"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:11
+msgid "NAT Traversal Options"
+msgstr "NAT 傳輸選項"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:13
+msgid "Port:"
+msgstr "連接埠："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:14
+msgid "Proxy Options"
+msgstr "Proxy 選項"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:15
+msgid "STUN Server:"
+msgstr "STUN 伺服器："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:16
+msgid "Server:"
+msgstr "伺服器："
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:17
+msgid "Transport:"
+msgstr "傳送通訊埠："
+
+#: ../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:19
+msgid "What is your SIP login ID?"
+msgstr "您想要的 SIP 登入 ID 是？"
+
+#: ../libempathy-gtk/empathy-account-widget-sip.ui.h:20
+msgid "_Username:"
+msgstr "使用者名稱(_U)："
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:4
-msgid "Yahoo I_D:"
-msgstr "Yahoo I_D:"
+msgid "I_gnore conference and chat room invitations"
+msgstr "忽略會議與聊天室邀請(_G)"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:6
-msgid "_Ignore conference and chatroom invitations"
-msgstr "忽略會議與聊天室邀請(_I)"
+msgid "What is your Yahoo! ID?"
+msgstr "您的 Yahoo! ID 是？"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:7
+msgid "What is your Yahoo! password?"
+msgstr "您的 Yahoo! 密碼是？"
 
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:8
+msgid "Yahoo! I_D:"
+msgstr "Yahoo I_D:"
+
+#: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Room List locale:"
-msgstr "聊天室清單地區(_R):"
+msgstr "聊天室清單地區(_R)："
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:449
-#: ../libempathy-gtk/empathy-avatar-chooser.c:525
+#: ../libempathy-gtk/empathy-avatar-chooser.c:443
+#: ../libempathy-gtk/empathy-avatar-chooser.c:519
 msgid "Couldn't convert image"
 msgstr "無法轉換圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:450
-msgid "None of the accepted image formats is supported on your system"
-msgstr "æ\82¨ç\9a\84系統ä¸\8dæ\94¯æ\8f´é\80\99äº\9b圖片格式"
+#: ../libempathy-gtk/empathy-avatar-chooser.c:444
+msgid "None of the accepted image formats are supported on your system"
+msgstr "æ\82¨ç\9a\84系統ä¸\8aæ²\92æ\9c\89æ\94¯æ\8f´å·²æ\8e¥å\8f\97ç\9a\84圖片格式"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:933
+#: ../libempathy-gtk/empathy-avatar-chooser.c:935
 msgid "Select Your Avatar Image"
 msgstr "選擇您的大頭貼圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:936
+#: ../libempathy-gtk/empathy-avatar-chooser.c:938
 msgid "No Image"
 msgstr "沒有圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:998
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1000
 msgid "Images"
 msgstr "圖片"
 
-#: ../libempathy-gtk/empathy-avatar-chooser.c:1002
+#: ../libempathy-gtk/empathy-avatar-chooser.c:1004
 msgid "All Files"
 msgstr "所有檔案"
 
-#: ../libempathy-gtk/empathy-avatar-image.c:324
+#: ../libempathy-gtk/empathy-avatar-image.c:323
 msgid "Click to enlarge"
 msgstr "請按這裡放大"
 
-#: ../libempathy-gtk/empathy-chat.c:186
-msgid "Failed to reconnect this chat"
-msgstr "無法重連這個聊天會議"
+#: ../libempathy-gtk/empathy-chat.c:642
+msgid "Failed to open private chat"
+msgstr "開啟私人對話失敗"
 
-#: ../libempathy-gtk/empathy-chat.c:404
-msgid "Unsupported command"
-msgstr "不支援此指令"
+#: ../libempathy-gtk/empathy-chat.c:682
+msgid "Topic not supported on this conversation"
+msgstr "此談話的主題不被支援"
 
-#: ../libempathy-gtk/empathy-chat.c:539
-msgid "offline"
-msgstr "離線"
+#: ../libempathy-gtk/empathy-chat.c:688
+msgid "You are not allowed to change the topic"
+msgstr "您不被允許變更這個主題"
 
-#: ../libempathy-gtk/empathy-chat.c:542
-msgid "invalid contact"
-msgstr "無效的連絡人"
+#: ../libempathy-gtk/empathy-chat.c:822
+msgid "/clear: clear all messages from the current conversation"
+msgstr "/clear: 清除目前談話的所有訊息"
 
-#: ../libempathy-gtk/empathy-chat.c:545
-msgid "permission denied"
-msgstr "權限被拒絕"
+#: ../libempathy-gtk/empathy-chat.c:825
+msgid "/topic <topic>: set the topic of the current conversation"
+msgstr "/topic <主題>：設置目前談話的主題"
 
-#: ../libempathy-gtk/empathy-chat.c:548
-msgid "too long message"
-msgstr "太長的訊息"
+#: ../libempathy-gtk/empathy-chat.c:828
+msgid "/join <chat room ID>: join a new chat room"
+msgstr "/join <聊天室 ID>：加入新的聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:551
+#: ../libempathy-gtk/empathy-chat.c:831
+msgid "/j <chat room ID>: join a new chat room"
+msgstr "/j <聊天室 ID>：加入新的聊天室"
+
+#: ../libempathy-gtk/empathy-chat.c:836
+msgid "/query <contact ID> [<message>]: open a private chat"
+msgstr "/query <聯絡人 ID> [<訊息>]：開啟私人對話"
+
+#: ../libempathy-gtk/empathy-chat.c:839
+msgid "/msg <contact ID> <message>: open a private chat"
+msgstr "/msg <聯絡人 ID> <訊息>：開啟私人對話"
+
+#: ../libempathy-gtk/empathy-chat.c:843
+msgid "/nick <nickname>: change your nickname on the current server"
+msgstr "/nick <暱稱>：變更在目前伺服器上的您的暱稱"
+
+#: ../libempathy-gtk/empathy-chat.c:846
+msgid "/me <message>: send an ACTION message to the current conversation"
+msgstr "/me <訊息>：送出一個 ACTION 訊息到目前的談話中"
+
+#: ../libempathy-gtk/empathy-chat.c:849
+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 "
+"join a new chat room\""
+msgstr ""
+"/say <訊息>：送出 <訊息> 到目前的談話中。這用於傳送以「/」開頭的訊息。舉例來"
+"說：「/say /join 是用來加入新的聊天室」"
+
+#: ../libempathy-gtk/empathy-chat.c:854
+msgid ""
+"/help [<command>]: show all supported commands. If <command> is defined, "
+"show its usage."
+msgstr ""
+"/help [<命令>]：顯示所有支援的指令。如果有定義這個 <命令> 的話，便顯示它的用"
+"法。"
+
+#: ../libempathy-gtk/empathy-chat.c:864
+#, c-format
+msgid "Usage: %s"
+msgstr "用法：%s"
+
+#: ../libempathy-gtk/empathy-chat.c:893
+msgid "Unknown command"
+msgstr "未知的命令"
+
+#: ../libempathy-gtk/empathy-chat.c:1014
+msgid "Unknown command; see /help for the available commands"
+msgstr "未知的指令；請參見 /help 以取得可用的指令"
+
+#: ../libempathy-gtk/empathy-chat.c:1152
+msgid "offline"
+msgstr "離線"
+
+#: ../libempathy-gtk/empathy-chat.c:1155
+msgid "invalid contact"
+msgstr "無效的連絡人"
+
+#: ../libempathy-gtk/empathy-chat.c:1158
+msgid "permission denied"
+msgstr "權限被拒絕"
+
+#: ../libempathy-gtk/empathy-chat.c:1161
+msgid "too long message"
+msgstr "太長的訊息"
+
+#: ../libempathy-gtk/empathy-chat.c:1164
 msgid "not implemented"
 msgstr "未實作"
 
-#: ../libempathy-gtk/empathy-chat.c:554
+#: ../libempathy-gtk/empathy-chat.c:1168
 msgid "unknown"
 msgstr "不明"
 
-#: ../libempathy-gtk/empathy-chat.c:558
+#: ../libempathy-gtk/empathy-chat.c:1172
 #, c-format
 msgid "Error sending message '%s': %s"
 msgstr "傳送訊息「%s」時發生錯誤；%s"
 
-#: ../libempathy-gtk/empathy-chat.c:588
+#: ../libempathy-gtk/empathy-chat.c:1282 ../src/empathy-chat-window.c:705
+msgid "Topic:"
+msgstr "主題："
+
+#: ../libempathy-gtk/empathy-chat.c:1294
 #, c-format
 msgid "Topic set to: %s"
-msgstr "主題設定為：%s"
+msgstr "主題設定為: %s"
 
-#: ../libempathy-gtk/empathy-chat.c:590
+#: ../libempathy-gtk/empathy-chat.c:1296
 msgid "No topic defined"
 msgstr "尚未定義主題"
 
-#: ../libempathy-gtk/empathy-chat.c:960
+#: ../libempathy-gtk/empathy-chat.c:1775
 msgid "(No Suggestions)"
 msgstr "(沒有建議)"
 
-#: ../libempathy-gtk/empathy-chat.c:1014
+#: ../libempathy-gtk/empathy-chat.c:1829
 msgid "Insert Smiley"
 msgstr "插入表情符號"
 
 #. send button
-#: ../libempathy-gtk/empathy-chat.c:1032
-#: ../libempathy-gtk/empathy-ui-utils.c:1480
+#: ../libempathy-gtk/empathy-chat.c:1847
+#: ../libempathy-gtk/empathy-ui-utils.c:1805
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1066
+#: ../libempathy-gtk/empathy-chat.c:1881
 msgid "_Spelling Suggestions"
 msgstr "拼字建議(_S)"
 
-#: ../libempathy-gtk/empathy-chat.c:1181
+#: ../libempathy-gtk/empathy-chat.c:1958
+msgid "Failed to retrieve recent logs"
+msgstr "無法取得最近的日誌"
+
+#: ../libempathy-gtk/empathy-chat.c:2064
 #, c-format
 msgid "%s has disconnected"
 msgstr "%s 已斷線"
 
-#: ../libempathy-gtk/empathy-chat.c:1185
+#. translators: reverse the order of these arguments
+#. * if the kicked should come before the kicker in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2071
 #, c-format
-msgid "%s was kicked by %s"
-msgstr "%s 被 %s 踢出去了"
+msgid "%1$s was kicked by %2$s"
+msgstr "%1$s 被 %2$s 踢出去"
 
-#: ../libempathy-gtk/empathy-chat.c:1188
+#: ../libempathy-gtk/empathy-chat.c:2074
 #, c-format
 msgid "%s was kicked"
-msgstr "%s 被踢出去了"
+msgstr "%s 被踢出"
 
-#: ../libempathy-gtk/empathy-chat.c:1193
+#. translators: reverse the order of these arguments
+#. * if the banned should come before the banner in your locale.
+#.
+#: ../libempathy-gtk/empathy-chat.c:2082
 #, c-format
-msgid "%s was banned by %s"
-msgstr "%s 被 %s設為黑名單"
+msgid "%1$s was banned by %2$s"
+msgstr "%1$s 被 %2$s 設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:1196
+#: ../libempathy-gtk/empathy-chat.c:2085
 #, c-format
 msgid "%s was banned"
 msgstr "%s 被設為黑名單"
 
-#: ../libempathy-gtk/empathy-chat.c:1200
+#: ../libempathy-gtk/empathy-chat.c:2089
 #, c-format
 msgid "%s has left the room"
 msgstr "%s 已經離開此聊天室"
@@ -825,61 +1339,79 @@ msgstr "%s 已經離開此聊天室"
 #. * given by the user living the room. If this poses a problem,
 #. * please let us know. :-)
 #.
-#: ../libempathy-gtk/empathy-chat.c:1209
+#: ../libempathy-gtk/empathy-chat.c:2098
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
-#: ../libempathy-gtk/empathy-chat.c:1232
+#: ../libempathy-gtk/empathy-chat.c:2123
 #, c-format
 msgid "%s has joined the room"
 msgstr "%s 已經加入此聊天室"
 
-#: ../libempathy-gtk/empathy-chat.c:1365 ../src/empathy-call-window.c:1225
+#: ../libempathy-gtk/empathy-chat.c:2148
+#, c-format
+msgid "%s is now known as %s"
+msgstr "%s 現在被稱為 %s"
+
+#: ../libempathy-gtk/empathy-chat.c:2287 ../src/empathy-call-window.c:1938
 msgid "Disconnected"
 msgstr "已斷線"
 
-#: ../libempathy-gtk/empathy-chat.c:1800
+#: ../libempathy-gtk/empathy-chat.c:2910
+msgid "Wrong password; please try again:"
+msgstr "密碼錯誤；請再試一次："
+
+#: ../libempathy-gtk/empathy-chat.c:2911
+msgid "Retry"
+msgstr "重試"
+
+#: ../libempathy-gtk/empathy-chat.c:2916
+msgid "This room is protected by a password:"
+msgstr "此聊天室已被密碼保護："
+
+#: ../libempathy-gtk/empathy-chat.c:2917
+msgid "Join"
+msgstr "加入"
+
+#: ../libempathy-gtk/empathy-chat.c:3057
 msgid "Connected"
 msgstr "成功連線"
 
-#: ../libempathy-gtk/empathy-chat.c:1850
-#: ../libempathy-gtk/empathy-log-window.c:502
+#: ../libempathy-gtk/empathy-chat.c:3110
+#: ../libempathy-gtk/empathy-log-window.c:653
 msgid "Conversation"
 msgstr "談話"
 
-#: ../libempathy-gtk/empathy-chat.ui.h:1 ../src/empathy-chat-window.c:472
-msgid "Topic:"
-msgstr "主題:"
-
 #. Copy Link Address menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:316
-#: ../libempathy-gtk/empathy-theme-adium.c:267
+#: ../libempathy-gtk/empathy-chat-text-view.c:324
+#: ../libempathy-gtk/empathy-theme-adium.c:791
 msgid "_Copy Link Address"
 msgstr "複製連結位址(_C)"
 
 #. Open Link menu item
-#: ../libempathy-gtk/empathy-chat-text-view.c:323
-#: ../libempathy-gtk/empathy-theme-adium.c:275
+#: ../libempathy-gtk/empathy-chat-text-view.c:331
+#: ../libempathy-gtk/empathy-theme-adium.c:798
 msgid "_Open Link"
 msgstr "開啟連結(_O)"
 
 #. Translators: timestamp displayed between conversations in
 #. * chat windows (strftime format string)
-#: ../libempathy-gtk/empathy-chat-text-view.c:421
+#: ../libempathy-gtk/empathy-chat-text-view.c:424
 msgid "%A %B %d %Y"
 msgstr "%Y %B %d %A"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:179
-#: ../libempathy-gtk/empathy-contact-dialogs.c:238
+#: ../libempathy-gtk/empathy-contact-dialogs.c:241
+#: ../libempathy-gtk/empathy-individual-edit-dialog.c:247
 msgid "Edit Contact Information"
 msgstr "編輯連絡人資訊"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:289
+#: ../libempathy-gtk/empathy-contact-dialogs.c:292
 msgid "Personal Information"
 msgstr "個人資訊"
 
-#: ../libempathy-gtk/empathy-contact-dialogs.c:394
+#: ../libempathy-gtk/empathy-contact-dialogs.c:397
+#: ../libempathy-gtk/empathy-individual-dialogs.c:111
 msgid "New Contact"
 msgstr "新增連絡人"
 
@@ -891,428 +1423,637 @@ msgstr "稍後再決定"
 msgid "Subscription Request"
 msgstr "訂閱要求"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1404
+#: ../libempathy-gtk/empathy-contact-list-store.h:71
+msgid "Ungrouped"
+msgstr "未群組"
+
+#: ../libempathy-gtk/empathy-contact-list-store.h:72
+msgid "Favorite People"
+msgstr "喜好的人"
+
+#: ../libempathy-gtk/empathy-contact-list-view.c:2004
+#: ../libempathy-gtk/empathy-individual-view.c:2232
 #, c-format
 msgid "Do you really want to remove the group '%s'?"
 msgstr "是否想要移除群組「%s」？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1406
+#: ../libempathy-gtk/empathy-contact-list-view.c:2006
+#: ../libempathy-gtk/empathy-individual-view.c:2235
 msgid "Removing group"
 msgstr "正在移除群組"
 
 #. Remove
-#: ../libempathy-gtk/empathy-contact-list-view.c:1453
-#: ../libempathy-gtk/empathy-contact-list-view.c:1530
+#: ../libempathy-gtk/empathy-contact-list-view.c:2055
+#: ../libempathy-gtk/empathy-contact-list-view.c:2132
+#: ../libempathy-gtk/empathy-individual-view.c:2289
+#: ../libempathy-gtk/empathy-individual-view.c:2387
+#: ../src/empathy-accounts-dialog.ui.h:7
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1483
+#: ../libempathy-gtk/empathy-contact-list-view.c:2085
+#: ../libempathy-gtk/empathy-individual-view.c:2320
 #, c-format
 msgid "Do you really want to remove the contact '%s'?"
 msgstr "是否想要移除連絡人「%s」？"
 
-#: ../libempathy-gtk/empathy-contact-list-view.c:1485
+#: ../libempathy-gtk/empathy-contact-list-view.c:2087
+#: ../libempathy-gtk/empathy-individual-view.c:2322
 msgid "Removing contact"
 msgstr "正在移除連絡人"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:195
-#: ../src/empathy-main-window.ui.h:11
-msgid "_Add Contact..."
-msgstr "新增聯絡人(_A)..."
+#: ../libempathy-gtk/empathy-contact-menu.c:203
+#: ../src/empathy-main-window.ui.h:13
+msgid "_Add Contact…"
+msgstr "新增聯絡人(_A)…"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:222
-#: ../src/empathy-main-window.ui.h:12
+#: ../libempathy-gtk/empathy-contact-menu.c:230
+#: ../libempathy-gtk/empathy-individual-menu.c:516
+#: ../src/empathy-main-window.ui.h:14
 msgid "_Chat"
 msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:253
+#: ../libempathy-gtk/empathy-contact-menu.c:260
+#: ../libempathy-gtk/empathy-individual-menu.c:559
 msgctxt "menu item"
 msgid "_Audio Call"
 msgstr "語音通話(_A)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:285
+#: ../libempathy-gtk/empathy-contact-menu.c:290
+#: ../libempathy-gtk/empathy-individual-menu.c:601
 msgctxt "menu item"
 msgid "_Video Call"
 msgstr "視訊通話(_V)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:324
-msgid "_View Previous Conversations"
-msgstr "檢視前一次談話(_V)"
+#: ../libempathy-gtk/empathy-contact-menu.c:330
+#: ../libempathy-gtk/empathy-individual-menu.c:644
+#: ../src/empathy-main-window.ui.h:25
+msgid "_Previous Conversations"
+msgstr "上一次談話(_P)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:346
-msgid "Send file"
+#: ../libempathy-gtk/empathy-contact-menu.c:352
+#: ../libempathy-gtk/empathy-individual-menu.c:685
+msgid "Send File"
 msgstr "傳送檔案"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:369
-msgid "Share my desktop"
-msgstr ""
+#: ../libempathy-gtk/empathy-contact-menu.c:374
+#: ../libempathy-gtk/empathy-individual-menu.c:727
+msgid "Share My Desktop"
+msgstr "分享我的桌面"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:397
+#: ../libempathy-gtk/empathy-contact-menu.c:414
+#: ../libempathy-gtk/empathy-contact-widget.c:1568
+#: ../libempathy-gtk/empathy-individual-menu.c:761
+#: ../libempathy-gtk/empathy-individual-widget.c:1290
+msgid "Favorite"
+msgstr "喜好"
+
+#: ../libempathy-gtk/empathy-contact-menu.c:443
+#: ../libempathy-gtk/empathy-individual-menu.c:788
 msgid "Infor_mation"
 msgstr "資訊(_M)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:441
-#: ../src/empathy-chat-window.ui.h:10 ../src/empathy-main-window.ui.h:16
+#: ../libempathy-gtk/empathy-contact-menu.c:489
+msgctxt "Edit contact (contextual menu)"
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:501
-msgid "Inviting to this room"
-msgstr "邀請到這個聊天室"
+#: ../libempathy-gtk/empathy-contact-menu.c:543
+#: ../libempathy-gtk/empathy-individual-menu.c:972
+#: ../src/empathy-chat-window.c:917
+msgid "Inviting you to this room"
+msgstr "邀請您到這個聊天室"
 
-#: ../libempathy-gtk/empathy-contact-menu.c:532
-msgid "_Invite to chatroom"
-msgstr "邀請到這個聊天室(_I)"
+#: ../libempathy-gtk/empathy-contact-menu.c:574
+#: ../libempathy-gtk/empathy-individual-menu.c:1019
+msgid "_Invite to Chat Room"
+msgstr "邀請到聊天室(_I)"
 
 #: ../libempathy-gtk/empathy-contact-selector.c:129
 msgid "Select a contact"
 msgstr "選擇連絡人"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:447
-msgid "Save Avatar"
-msgstr "儲存大頭貼"
+#: ../libempathy-gtk/empathy-contact-widget.c:225
+#: ../libempathy-gtk/empathy-individual-widget.c:147
+msgid "Full name:"
+msgstr "全名："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:503
-msgid "Unable to save avatar"
-msgstr "無法儲存大頭貼"
+#: ../libempathy-gtk/empathy-contact-widget.c:226
+#: ../libempathy-gtk/empathy-individual-widget.c:148
+msgid "Phone number:"
+msgstr "電話號碼："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:996
-msgid "Select"
-msgstr "選擇"
+#: ../libempathy-gtk/empathy-contact-widget.c:227
+#: ../libempathy-gtk/empathy-individual-widget.c:149
+msgid "E-mail address:"
+msgstr "電子信箱位址："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1005
-#: ../src/empathy-main-window.c:1023
-msgid "Group"
-msgstr "群組"
+#: ../libempathy-gtk/empathy-contact-widget.c:228
+#: ../libempathy-gtk/empathy-individual-widget.c:150
+msgid "Website:"
+msgstr "網站："
+
+#: ../libempathy-gtk/empathy-contact-widget.c:229
+#: ../libempathy-gtk/empathy-individual-widget.c:151
+msgid "Birthday:"
+msgstr "生日："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1256
+#: ../libempathy-gtk/empathy-contact-widget.c:608
+#: ../libempathy-gtk/empathy-individual-widget.c:453
 msgid "Country ISO Code:"
 msgstr "國家 ISO 碼："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1258
+#: ../libempathy-gtk/empathy-contact-widget.c:610
+#: ../libempathy-gtk/empathy-individual-widget.c:455
 msgid "Country:"
 msgstr "國家："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1260
+#: ../libempathy-gtk/empathy-contact-widget.c:612
+#: ../libempathy-gtk/empathy-individual-widget.c:457
 msgid "State:"
 msgstr "州："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1262
+#: ../libempathy-gtk/empathy-contact-widget.c:614
+#: ../libempathy-gtk/empathy-individual-widget.c:459
 msgid "City:"
 msgstr "市："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1264
+#: ../libempathy-gtk/empathy-contact-widget.c:616
+#: ../libempathy-gtk/empathy-individual-widget.c:461
 msgid "Area:"
 msgstr "區域："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1266
+#: ../libempathy-gtk/empathy-contact-widget.c:618
+#: ../libempathy-gtk/empathy-individual-widget.c:463
 msgid "Postal Code:"
 msgstr "郵遞區號："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1268
+#: ../libempathy-gtk/empathy-contact-widget.c:620
+#: ../libempathy-gtk/empathy-individual-widget.c:465
 msgid "Street:"
 msgstr "街："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1270
+#: ../libempathy-gtk/empathy-contact-widget.c:622
+#: ../libempathy-gtk/empathy-individual-widget.c:467
 msgid "Building:"
 msgstr "建築："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1272
+#: ../libempathy-gtk/empathy-contact-widget.c:624
+#: ../libempathy-gtk/empathy-individual-widget.c:469
 msgid "Floor:"
 msgstr "樓層："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1274
+#: ../libempathy-gtk/empathy-contact-widget.c:626
+#: ../libempathy-gtk/empathy-individual-widget.c:471
 msgid "Room:"
 msgstr "室："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1276
+#: ../libempathy-gtk/empathy-contact-widget.c:628
+#: ../libempathy-gtk/empathy-individual-widget.c:473
 msgid "Text:"
 msgstr "文字："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1278
+#: ../libempathy-gtk/empathy-contact-widget.c:630
+#: ../libempathy-gtk/empathy-individual-widget.c:475
 msgid "Description:"
 msgstr "描述："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1280
+#: ../libempathy-gtk/empathy-contact-widget.c:632
+#: ../libempathy-gtk/empathy-individual-widget.c:477
 msgid "URI:"
 msgstr "URI："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1282
+#: ../libempathy-gtk/empathy-contact-widget.c:634
+#: ../libempathy-gtk/empathy-individual-widget.c:479
 msgid "Accuracy Level:"
 msgstr "準確度等級："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1284
+#: ../libempathy-gtk/empathy-contact-widget.c:636
+#: ../libempathy-gtk/empathy-individual-widget.c:481
 msgid "Error:"
 msgstr "錯誤："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1286
+#: ../libempathy-gtk/empathy-contact-widget.c:638
+#: ../libempathy-gtk/empathy-individual-widget.c:483
 msgid "Vertical Error (meters):"
-msgstr "垂直誤差（公尺）："
+msgstr "垂直誤差 (公尺)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1288
+#: ../libempathy-gtk/empathy-contact-widget.c:640
+#: ../libempathy-gtk/empathy-individual-widget.c:485
 msgid "Horizontal Error (meters):"
-msgstr "水平誤差（公尺）："
+msgstr "水平誤差 (公尺)："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1290
+#: ../libempathy-gtk/empathy-contact-widget.c:642
+#: ../libempathy-gtk/empathy-individual-widget.c:487
 msgid "Speed:"
 msgstr "速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1292
-#, fuzzy
+#: ../libempathy-gtk/empathy-contact-widget.c:644
+#: ../libempathy-gtk/empathy-individual-widget.c:489
 msgid "Bearing:"
-msgstr "版本:"
+msgstr "方位："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1294
+#: ../libempathy-gtk/empathy-contact-widget.c:646
+#: ../libempathy-gtk/empathy-individual-widget.c:491
 msgid "Climb Speed:"
 msgstr "爬升速度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1296
+#: ../libempathy-gtk/empathy-contact-widget.c:648
+#: ../libempathy-gtk/empathy-individual-widget.c:493
 msgid "Last Updated on:"
 msgstr "上次更新於："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1298
+#: ../libempathy-gtk/empathy-contact-widget.c:650
+#: ../libempathy-gtk/empathy-individual-widget.c:495
 msgid "Longitude:"
-msgstr "經度:"
+msgstr "經度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1300
+#: ../libempathy-gtk/empathy-contact-widget.c:652
+#: ../libempathy-gtk/empathy-individual-widget.c:497
 msgid "Latitude:"
-msgstr "緯度:"
+msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1302
+#: ../libempathy-gtk/empathy-contact-widget.c:654
+#: ../libempathy-gtk/empathy-individual-widget.c:499
 msgid "Altitude:"
-msgstr "緯度:"
+msgstr "緯度："
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1349
-msgid "<b>Location</b>"
-msgstr "<b>位置</b>"
+#: ../libempathy-gtk/empathy-contact-widget.c:717
+#: ../libempathy-gtk/empathy-contact-widget.c:734
+#: ../libempathy-gtk/empathy-individual-widget.c:581
+#: ../libempathy-gtk/empathy-individual-widget.c:598
+#: ../src/empathy-preferences.ui.h:12
+msgid "Location"
+msgstr "位置"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1362
-msgid "<b>Location</b>, "
-msgstr "<b>位置<b>，"
+#. translators: format is "Location, $date"
+#: ../libempathy-gtk/empathy-contact-widget.c:736
+#: ../libempathy-gtk/empathy-individual-widget.c:600
+#, c-format
+msgid "%s, %s"
+msgstr "%s、%s"
 
-#: ../libempathy-gtk/empathy-contact-widget.c:1412
+#: ../libempathy-gtk/empathy-contact-widget.c:788
+#: ../libempathy-gtk/empathy-individual-widget.c:649
 msgid "%B %e, %Y at %R UTC"
 msgstr "%B %e, %Y 於 %R UTC"
 
+#: ../libempathy-gtk/empathy-contact-widget.c:871
+#: ../libempathy-gtk/empathy-individual-widget.c:840
+msgid "Save Avatar"
+msgstr "儲存大頭貼"
+
+#: ../libempathy-gtk/empathy-contact-widget.c:927
+#: ../libempathy-gtk/empathy-individual-widget.c:898
+msgid "Unable to save avatar"
+msgstr "無法儲存大頭貼"
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:1
 msgid "<b>Location</b> at (date)\t"
 msgstr "<b>位置</b> 於 (date)\t"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:2
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:1
-#: ../src/empathy-chatrooms-window.ui.h:1
-#: ../src/empathy-new-chatroom-dialog.ui.h:1
-msgid "Account:"
-msgstr "帳號："
-
+#. Alias
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:3
+#: ../libempathy-gtk/empathy-individual-widget.c:1226
 msgid "Alias:"
-msgstr "別名:"
+msgstr "別名："
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:4
-msgid "Birthday:"
-msgstr "生日:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client Information"
-msgstr "客戶端資訊"
+msgstr "用戶端資訊"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:5
 msgid "Client:"
-msgstr "客戶端:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:7
-#: ../src/empathy-main-window.c:1006
-msgid "Contact"
-msgstr "連絡人"
+msgstr "用戶端："
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:6
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:2
 msgid "Contact Details"
 msgstr "連絡人詳細資料"
 
+#. Identifier to connect to Instant Messaging network
+#. Translators: Identifier to connect to Instant Messaging network
+#: ../libempathy-gtk/empathy-contact-widget.ui.h:8
+#: ../libempathy-gtk/empathy-individual-widget.c:1429
+msgid "Identifier:"
+msgstr "識別身分："
+
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:9
-msgid "Email:"
-msgstr "電子郵件:"
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:3
+msgid "Information requested…"
+msgstr "資訊已請求…"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:10
-msgid "Fullname:"
-msgstr "全名:"
+msgid "OS:"
+msgstr "OS:"
 
 #: ../libempathy-gtk/empathy-contact-widget.ui.h:11
+msgid "Version:"
+msgstr "版本："
+
+#: ../libempathy-gtk/empathy-groups-widget.c:332
 msgid "Groups"
 msgstr "群組"
 
-#. Identifier to connect to Instant Messaging network
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:13
-msgid "Identifier:"
-msgstr "識別器:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:14
-msgid "Information requested..."
-msgstr "要求資訊..."
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:15
-msgid "OS:"
-msgstr "OS:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:16
+#: ../libempathy-gtk/empathy-groups-widget.c:344
 msgid ""
 "Select the groups you want this contact to appear in.  Note that you can "
 "select more than one group or no groups."
 msgstr ""
 "請選擇這個連絡人要顯現在哪個群組。注意您可以選擇一個以上的群組或不選擇群組。"
 
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:17
-msgid "Version:"
-msgstr "版本:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:18
-msgid "Web site:"
-msgstr "網站:"
-
-#: ../libempathy-gtk/empathy-contact-widget.ui.h:19
+#: ../libempathy-gtk/empathy-groups-widget.c:363
 msgid "_Add Group"
 msgstr "加入群組(_G)"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:283
-msgid "new server"
-msgstr "新增伺服器"
+#: ../libempathy-gtk/empathy-groups-widget.c:398
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb in a column header displaying group names"
+msgid "Select"
+msgstr "選擇"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:510
-msgid "Server"
-msgstr "伺服器"
+#: ../libempathy-gtk/empathy-groups-widget.c:408
+#: ../src/empathy-main-window.c:1250
+msgid "Group"
+msgstr "群組"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:525
-msgid "Port"
-msgstr "連接埠"
+#. Translators: the heading at the top of the Information dialogue
+#: ../libempathy-gtk/empathy-individual-information-dialog.c:281
+msgid "Linked Contacts"
+msgstr "已連結的聯絡人"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:354
+msgid "Select contacts to link"
+msgstr "選取要連結的連絡人"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:428
+msgid "New contact preview"
+msgstr "新增連絡人預覽"
+
+#: ../libempathy-gtk/empathy-individual-linker.c:472
+msgid "Contacts selected in the list on the left will be linked together."
+msgstr "在所方清單所選的聯絡人將連結在一起。"
+
+#. Translators: this is used in the context menu for a contact. The first
+#. * parameter is a contact ID (e.g. foo@jabber.org) and the second is one
+#. * of the user's account IDs (e.g. me@hotmail.com).
+#: ../libempathy-gtk/empathy-individual-menu.c:132
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../libempathy-gtk/empathy-individual-menu.c:839
+msgctxt "Edit individual (contextual menu)"
+msgid "_Edit"
+msgstr "編輯(_E)"
+
+#. Translators: this is a verb meaning "to connect two contacts together
+#. * to form a meta-contact".
+#: ../libempathy-gtk/empathy-individual-menu.c:865
+msgctxt "Link individual (contextual menu)"
+msgid "_Link Contacts…"
+msgstr "連結聯絡人(_L)…"
 
-#: ../libempathy-gtk/empathy-irc-network-dialog.c:538
+#: ../libempathy-gtk/empathy-individual-widget.c:1567
+#, c-format
+msgid "Meta-contact containing %u contact"
+msgid_plural "Meta-contact containing %u contacts"
+msgstr[0] "後設聯絡人包含 %u 位聯絡人"
+
+#: ../libempathy-gtk/empathy-individual-widget.ui.h:1
+msgid "<b>Location</b> at (date)"
+msgstr "<b>位置</b> 於 (日期)"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:328
+msgid "New Network"
+msgstr "新增網路"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:495
+msgid "Choose an IRC network"
+msgstr "選擇 IRC 網路"
+
+#: ../libempathy-gtk/empathy-irc-network-chooser-dialog.c:555
+#, fuzzy
+#| msgid "Select"
+msgctxt "verb displayed on a button to select an IRC network"
+msgid "Select"
+msgstr "選擇"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:280
+msgid "new server"
+msgstr "新增伺服器"
+
+#: ../libempathy-gtk/empathy-irc-network-dialog.c:535
 msgid "SSL"
 msgstr "SSL"
 
-#: ../libempathy-gtk/empathy-log-window.c:495
-#: ../src/empathy-import-dialog.c:285
-msgid "Account"
-msgstr "帳號"
+#. Translators: this is the title of the linking dialogue (reached by
+#. * right-clicking on a contact and selecting "Link…"). "Link" in this title
+#. * is a verb.
+#: ../libempathy-gtk/empathy-linking-dialog.c:115
+msgid "Link Contacts"
+msgstr "連結聯絡人"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:120
+msgctxt "Unlink individual (button)"
+msgid "_Unlink…"
+msgstr "取消連結(_U)…"
 
-#: ../libempathy-gtk/empathy-log-window.c:512
+#: ../libempathy-gtk/empathy-linking-dialog.c:121
+msgid ""
+"Completely split the displayed meta-contact into the contacts it contains."
+msgstr "將顯示的後設聯絡人其包含的聯絡人完全分開。"
+
+#. Add button
+#. Translators: this is an action button in the linking dialogue. "Link" is
+#. * used here as a verb meaning "to connect two contacts to form a
+#. * meta-contact".
+#: ../libempathy-gtk/empathy-linking-dialog.c:136
+msgid "_Link"
+msgstr "連結(_L)"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:182
+#, c-format
+msgid "Unlink meta-contact '%s'?"
+msgstr "要取消後設聯絡人「%s」的連接嗎？"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:185
+msgid ""
+"Are you sure you want to unlink this meta-contact? This will completely "
+"split the meta-contact into the contacts it contains."
+msgstr "您確定要取消此後設聯絡人的連結？後設聯絡人所包含的聯絡人將會完全分開。"
+
+#: ../libempathy-gtk/empathy-linking-dialog.c:190
+msgctxt "Unlink individual (button)"
+msgid "_Unlink"
+msgstr "取消連結(_U)"
+
+#: ../libempathy-gtk/empathy-log-window.c:663
 msgid "Date"
 msgstr "日期"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:1
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:2
 msgid "Conversations"
 msgstr "談話"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:2
+#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#: ../libempathy-gtk/empathy-search-bar.ui.h:1
+msgid "Find Next"
+msgstr "尋找下一個"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#: ../libempathy-gtk/empathy-search-bar.ui.h:2
+msgid "Find Previous"
+msgstr "尋找上一個"
+
+#: ../libempathy-gtk/empathy-log-window.ui.h:5
 msgid "Previous Conversations"
 msgstr "上一次談話"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:3
+#. Tab Label
+#: ../libempathy-gtk/empathy-log-window.ui.h:7
 msgid "Search"
 msgstr "搜尋"
 
-#: ../libempathy-gtk/empathy-log-window.ui.h:4
+#. Searching *for* something
+#: ../libempathy-gtk/empathy-log-window.ui.h:9
 msgid "_For:"
-msgstr "搜尋(_F):"
+msgstr "何者(_F)："
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:2
-msgid "C_all"
-msgstr "é\80\9a話(_A)"
+#: ../libempathy-gtk/empathy-contact-selector-dialog.ui.h:2
+msgid "Contact ID:"
+msgstr "é\80£çµ¡äºº IDï¼\9a"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:3
+#. add chat button
+#: ../libempathy-gtk/empathy-new-message-dialog.c:145
 msgid "C_hat"
 msgstr "聊天(_C)"
 
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:4
-msgid "Contact ID:"
-msgstr "連絡人 ID:"
-
-#: ../libempathy-gtk/empathy-new-message-dialog.ui.h:5
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-message-dialog.c:155
 msgid "New Conversation"
 msgstr "新增談話"
 
+#. add video toggle
+#: ../libempathy-gtk/empathy-new-call-dialog.c:205
+msgid "Send _Video"
+msgstr "傳送視訊(_V)"
+
+#. add chat button
+#: ../libempathy-gtk/empathy-new-call-dialog.c:213
+msgid "C_all"
+msgstr "通話(_A)"
+
+#. Tweak the dialog
+#: ../libempathy-gtk/empathy-new-call-dialog.c:223
+msgid "New Call"
+msgstr "新增通話"
+
 #. COL_STATUS_TEXT
 #. COL_STATE_ICON_NAME
 #. COL_STATE
 #. COL_DISPLAY_MARKUP
 #. COL_STATUS_CUSTOMISABLE
 #. COL_TYPE
-#: ../libempathy-gtk/empathy-presence-chooser.c:172
-#: ../libempathy-gtk/empathy-presence-chooser.c:208
-msgid "Custom Message..."
-msgstr "自訂訊息..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:168
+#: ../libempathy-gtk/empathy-presence-chooser.c:204
+msgid "Custom Message…"
+msgstr "自訂訊息…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:225
-#: ../libempathy-gtk/empathy-presence-chooser.c:227
-msgid "Edit Custom Messages..."
-msgstr "編輯自訂訊息..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:221
+#: ../libempathy-gtk/empathy-presence-chooser.c:223
+msgid "Edit Custom Messages…"
+msgstr "編輯自訂訊息…"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:326
+#: ../libempathy-gtk/empathy-presence-chooser.c:346
 msgid "Click to remove this status as a favorite"
 msgstr "按這裡將這個狀態從喜好中移除"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:335
+#: ../libempathy-gtk/empathy-presence-chooser.c:355
 msgid "Click to make this status a favorite"
 msgstr "按這裡將這個狀態設為喜好"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:369
+#: ../libempathy-gtk/empathy-presence-chooser.c:389
 msgid "Set status"
 msgstr "設定狀態"
 
-#: ../libempathy-gtk/empathy-presence-chooser.c:782
+#: ../libempathy-gtk/empathy-presence-chooser.c:939
 msgid "Set your presence and current status"
 msgstr "設定您的上線與目前的狀態"
 
 #. Custom messages
-#: ../libempathy-gtk/empathy-presence-chooser.c:1017
-msgid "Custom messages..."
-msgstr "自訂訊息..."
+#: ../libempathy-gtk/empathy-presence-chooser.c:1124
+msgid "Custom messages…"
+msgstr "自訂訊息…"
+
+#. Create account
+#. To translator: %s is the name of the protocol, such as "Google Talk" or
+#. * "Yahoo!"
+#.
+#: ../libempathy-gtk/empathy-protocol-chooser.c:584
+#, c-format
+msgid "New %s account"
+msgstr "新增 %s 帳號"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:3
+msgid "Find:"
+msgstr "尋找："
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:4
+msgid "Match case"
+msgstr "符合條件"
+
+#: ../libempathy-gtk/empathy-search-bar.ui.h:5
+msgid "Phrase not found"
+msgstr "找不到詞彙"
 
-#: ../libempathy-gtk/empathy-sound.c:51
+#: ../libempathy-gtk/empathy-sound.c:50
 msgid "Received an instant message"
 msgstr "收到即時訊息"
 
-#: ../libempathy-gtk/empathy-sound.c:53
+#: ../libempathy-gtk/empathy-sound.c:52
 msgid "Sent an instant message"
 msgstr "傳送即時訊息"
 
-#: ../libempathy-gtk/empathy-sound.c:55
+#: ../libempathy-gtk/empathy-sound.c:54
 msgid "Incoming chat request"
 msgstr "收到聊天要求"
 
-#: ../libempathy-gtk/empathy-sound.c:57
+#: ../libempathy-gtk/empathy-sound.c:56
 msgid "Contact connected"
 msgstr "連絡人已連線"
 
-#: ../libempathy-gtk/empathy-sound.c:59
+#: ../libempathy-gtk/empathy-sound.c:58
 msgid "Contact disconnected"
 msgstr "連絡人已斷線"
 
-#: ../libempathy-gtk/empathy-sound.c:61
+#: ../libempathy-gtk/empathy-sound.c:60
 msgid "Connected to server"
 msgstr "連接到伺服器"
 
-#: ../libempathy-gtk/empathy-sound.c:63
+#: ../libempathy-gtk/empathy-sound.c:62
 msgid "Disconnected from server"
 msgstr "與伺服器斷線"
 
-#: ../libempathy-gtk/empathy-sound.c:65
+#: ../libempathy-gtk/empathy-sound.c:64
 msgid "Incoming voice call"
 msgstr "收到語音通話"
 
-#: ../libempathy-gtk/empathy-sound.c:67
+#: ../libempathy-gtk/empathy-sound.c:66
 msgid "Outgoing voice call"
 msgstr "播出語音通話"
 
-#: ../libempathy-gtk/empathy-sound.c:69
+#: ../libempathy-gtk/empathy-sound.c:68
 msgid "Voice call ended"
 msgstr "語音通話結束"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:362
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:364
 msgid "Enter Custom Message"
 msgstr "輸入自訂訊息"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.c:521
+#: ../libempathy-gtk/empathy-status-preset-dialog.c:523
 msgid "Edit Custom Messages"
 msgstr "編輯自訂訊息"
 
@@ -1324,14 +2065,6 @@ msgstr "加入新的預先設定(_N)"
 msgid "Saved Presets"
 msgstr "已儲存的預先設定"
 
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:3
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../libempathy-gtk/empathy-status-preset-dialog.ui.h:4
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
 #: ../libempathy-gtk/empathy-theme-manager.c:67
 msgid "Classic"
 msgstr "古典"
@@ -1342,23 +2075,119 @@ 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:1382
+#: ../libempathy-gtk/empathy-tls-dialog.c:150
+#, fuzzy
+#| msgid "The identity provided by the chat server cannot be verified.\n"
+msgid "The identity provided by the chat server cannot be verified."
+msgstr "對話伺服器所提供的識別身分無法通過驗證。\n"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:157
+#, fuzzy
+#| msgid "The certificate is not signed by a Certification Authority"
+msgid "The certificate is not signed by a Certification Authority."
+msgstr "該憑證並非由憑證授權中心所簽署"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:161
+#, fuzzy
+#| msgid "The certificate has expired"
+msgid "The certificate has expired."
+msgstr "憑證已逾期"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:164
+#, fuzzy
+#| msgid "The certificate hasn't yet been activated"
+msgid "The certificate hasn't yet been activated."
+msgstr "憑證尚未啟用"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:167
+#, fuzzy
+#| msgid "The certificate does not have the expected fingerprint"
+msgid "The certificate does not have the expected fingerprint."
+msgstr "憑證並未擁有預期的指紋"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:170
+#, fuzzy
+#| msgid ""
+#| "The hostname verified by the certificate doesn't match the server name"
+msgid "The hostname verified by the certificate doesn't match the server name."
+msgstr "憑證所驗證的主機名稱與伺服器名稱不符"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:174
+#, fuzzy
+#| msgid "The certificate is self-signed"
+msgid "The certificate is self-signed."
+msgstr "憑證為自我簽署"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:177
+#, fuzzy
+#| msgid ""
+#| "The certificate has been revoked by the issuing Certification Authority"
+msgid ""
+"The certificate has been revoked by the issuing Certification Authority."
+msgstr "憑證已被原本發出的憑證授權機構撤銷"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:181
+#, fuzzy
+#| msgid "The certificate is cryptographically weak"
+msgid "The certificate is cryptographically weak."
+msgstr "憑證於密碼防護上較弱"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:184
+#, fuzzy
+#| msgid "The certificate length exceeds verifiable limits"
+msgid "The certificate length exceeds verifiable limits."
+msgstr "憑證長度超出可驗證的範圍"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:188
+#, fuzzy
+#| msgid "The certificate is malformed"
+msgid "The certificate is malformed."
+msgstr "憑證格式不良"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:206
+#, c-format
+msgid "Expected hostname: %s"
+msgstr "預期的憑證主機名稱：%s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:209
+#, c-format
+msgid "Certificate hostname: %s"
+msgstr "憑證主機名稱：%s"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:271
+msgid "Continue"
+msgstr "繼續"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:277
+msgid "This connection is untrusted. Would you like to continue anyway?"
+msgstr "此連線未受信任。您無論如何都要繼續嗎？"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:294
+msgid "Remember this choice for future connections"
+msgstr "請記住此選擇以供未來連線使用"
+
+#: ../libempathy-gtk/empathy-tls-dialog.c:302
+msgid "Certificate Details"
+msgstr "憑證詳細資料"
+
+#: ../libempathy-gtk/empathy-ui-utils.c:1702
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1472
+#: ../libempathy-gtk/empathy-ui-utils.c:1797
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1530
-msgid "Select a destination"
-msgstr "選取目的地"
+#: ../libempathy-gtk/empathy-ui-utils.c:1866
+#, c-format
+msgid "Incoming file from %s"
+msgstr "收到來自 %s 的檔案"
 
 #: ../libempathy-gtk/totem-subtitle-encoding.c:158
 msgid "Current Locale"
@@ -1527,77 +2356,35 @@ msgstr "西歐語系"
 msgid "Vietnamese"
 msgstr "越南文"
 
-#.
-#. * vim: sw=2 ts=8 cindent noai bs=2
-#.
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:1
-msgid ""
-"The contact to display in the applet. Empty means no contact is displayed."
-msgstr "要在面板程式中顯示的連絡人。留空代表不顯示連絡人。"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.schemas.in.h:2
-msgid "The contact's avatar token. Empty means contact has no avatar."
-msgstr "此連絡人的大頭貼記號。留空代表連絡人沒有大頭貼。"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:108
+msgid "The selected contact cannot receive files."
+msgstr "所選的聯絡人無法接收檔案。"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:1
-msgid "Megaphone"
-msgstr "話筒"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:114
+msgid "The selected contact is offline."
+msgstr "所選的聯絡人已經離線。"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.server.in.in.h:2
-#: ../megaphone/src/megaphone-applet.c:519
-msgid "Talk!"
-msgstr "講話！"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:169
+msgid "No error message"
+msgstr "沒有錯誤訊息"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:1
-#: ../nothere/data/GNOME_NotHere_Applet.xml.h:1
-msgid "_About"
-msgstr "關於(_A)"
+#: ../nautilus-sendto-plugin/empathy-nautilus-sendto.c:242
+msgid "Instant Message (Empathy)"
+msgstr "即時通訊 (Empathy)"
 
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:2
-msgid "_Information"
-msgstr "資訊(_I)"
-
-#: ../megaphone/data/GNOME_Megaphone_Applet.xml.h:3
-#: ../src/empathy-main-window.ui.h:23
-msgid "_Preferences"
-msgstr "偏好設定(_P)"
-
-#: ../megaphone/src/megaphone-applet.c:168
-msgid "Please configure a contact."
-msgstr "請設定連絡人。"
-
-#: ../megaphone/src/megaphone-applet.c:258
-msgid "Select contact..."
-msgstr "選擇連絡人..."
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:1
-msgid "Presence"
-msgstr "上線狀態"
-
-#: ../nothere/data/GNOME_NotHere_Applet.server.in.in.h:2
-#: ../nothere/src/nothere-applet.c:106
-msgid "Set your own presence"
-msgstr "設定您自己的上線狀態"
-
-#: ../src/empathy.c:567
+#: ../src/empathy.c:414
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
-#: ../src/empathy.c:571
-msgid "Don't show the contact list on startup"
-msgstr "啟動時不顯示連絡人清單"
-
-#: ../src/empathy.c:575
-msgid "Show the accounts dialog"
-msgstr "顯示帳號對話盒"
+#: ../src/empathy.c:418
+msgid "Don't display the contact list or any other dialogs on startup"
+msgstr "啟動時不顯示連絡人清單或任何其他對話窗"
 
-#: ../src/empathy.c:587
-#, fuzzy
-#| msgid "- Empathy Instant Messenger"
+#: ../src/empathy.c:435
 msgid "- Empathy IM Client"
-msgstr "- Empathy 即時通訊程式"
+msgstr "- Empathy 即時通用戶端"
 
-#: ../src/empathy-about-dialog.c:83
+#: ../src/empathy-about-dialog.c:81
 msgid ""
 "Empathy is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
@@ -1608,7 +2395,7 @@ msgstr ""
 "的 GNU 通用公共許可證條款 (GNU General Public License) 第二版來修改和重新發佈"
 "這一程式，或者自由選擇使用任何更新的版本。"
 
-#: ../src/empathy-about-dialog.c:87
+#: ../src/empathy-about-dialog.c:85
 msgid ""
 "Empathy is distributed in the hope that it will be useful, but WITHOUT ANY "
 "WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
@@ -1618,7 +2405,7 @@ msgstr ""
 "發佈 Empathy 的目的是希望它有用，但沒有任何擔保。甚至沒有適合特定目的而隱含的"
 "擔保。更詳細的情況請參閱 GNU 通用公共許可證。"
 
-#: ../src/empathy-about-dialog.c:91
+#: ../src/empathy-about-dialog.c:89
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "Empathy; if not, write to the Free Software Foundation, Inc., 51 Franklin "
@@ -1628,273 +2415,643 @@ msgstr ""
 "給： Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-130159 USA"
 
-#: ../src/empathy-about-dialog.c:119
+#: ../src/empathy-about-dialog.c:107
 msgid "An Instant Messaging client for GNOME"
-msgstr "GNOME 的即時訊息客戶端程式"
+msgstr "GNOME 的即時訊息用戶端程式"
 
-#: ../src/empathy-about-dialog.c:125
+#: ../src/empathy-about-dialog.c:113
 msgid "translator-credits"
 msgstr ""
 "如對翻譯有任何意見，請送一封電子郵件給\n"
 "以下地址，GNOME 翻譯團隊會盡快回覆您：\n"
-"zh-l10n@lists.linux.org.tw\n"
+"chinese-l10n@googlegroups.com\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"
 
-#: ../src/empathy-accounts-dialog.c:392
-msgid "Enabled"
-msgstr "å·²å\95\9fç\94¨"
+#: ../src/empathy-account-assistant.c:167
+msgid "There was an error while importing the accounts."
+msgstr "å\8c¯å\85¥å¸³è\99\9fæ\99\82ç\99¼ç\94\9fé\8c¯èª¤ã\80\82"
 
-#: ../src/empathy-accounts-dialog.c:402 ../src/empathy-accounts-dialog.ui.h:1
-msgid "Accounts"
-msgstr "帳號"
+#: ../src/empathy-account-assistant.c:170
+msgid "There was an error while parsing the account details."
+msgstr "解析帳號詳細資料時發生錯誤。"
 
-#. To translator: %s is the protocol name
-#: ../src/empathy-accounts-dialog.c:837
-#, c-format
-msgid "New %s account"
-msgstr "新增 %s 帳號"
+#: ../src/empathy-account-assistant.c:173
+msgid "There was an error while creating the account."
+msgstr "建立帳號時發生錯誤。"
+
+#: ../src/empathy-account-assistant.c:175
+msgid "There was an error."
+msgstr "有錯誤發生。"
 
-#: ../src/empathy-accounts-dialog.c:950
+#: ../src/empathy-account-assistant.c:179
 #, c-format
-msgid ""
-"You are about to remove your %s account!\n"
-"Are you sure you want to proceed?"
-msgstr ""
-"您即將移除您的 %s 帳號！\n"
-"確定要繼續？"
+msgid "The error message was: %s"
+msgstr "錯誤訊息為：%s"
 
-#: ../src/empathy-accounts-dialog.c:956
+#: ../src/empathy-account-assistant.c:183
 msgid ""
-"Any associated conversations and chat rooms will NOT be removed if you "
-"decide to proceed.\n"
-"\n"
-"Should you decide to add the account back at a later time, they will still "
-"be available."
+"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 ""
-"如果您決定要繼續，任何相關的談話和聊天室並不會被移除。\n"
-"\n"
-"當您往後決定要將該帳號重新加入時，上述資源將仍然可以取用。"
+"您可以回到前頁再次輸入帳號的詳細資料或結束此助理，稍後再從「編輯」選單加入帳"
+"號。"
 
-#: ../src/empathy-accounts-dialog.ui.h:2
-msgid "Add Account"
-msgstr "加入帳號"
+#: ../src/empathy-account-assistant.c:220
+#: ../src/empathy-account-assistant.c:1268
+msgid "An error occurred"
+msgstr "發生錯誤"
 
-#: ../src/empathy-accounts-dialog.ui.h:3
-msgid "Cr_eate"
-msgstr "建立(_E)"
+#: ../src/empathy-account-assistant.c:467
+msgid "What kind of chat account do you have?"
+msgstr "您的聊天帳號是哪一種？"
 
-#: ../src/empathy-accounts-dialog.ui.h:4
-msgid "Gmail"
-msgstr "Gmail"
+#: ../src/empathy-account-assistant.c:473
+msgid "Do you have any other chat accounts you want to set up?"
+msgstr "您還想要設定其他的聊天帳號嗎？"
 
-#: ../src/empathy-accounts-dialog.ui.h:5
-msgid "Import Accounts..."
-msgstr "匯入帳號..."
+#: ../src/empathy-account-assistant.c:479
+msgid "Enter your account details"
+msgstr "請輸入您的帳號詳細資料"
 
-#: ../src/empathy-accounts-dialog.ui.h:6
-msgid "No protocol installed"
-msgstr "尚未安裝通訊協定"
+#: ../src/empathy-account-assistant.c:484
+msgid "What kind of chat account do you want to create?"
+msgstr "您想要建立何種聊天帳號？"
 
-#: ../src/empathy-accounts-dialog.ui.h:7
-msgid "Settings"
-msgstr "設定值"
+#: ../src/empathy-account-assistant.c:490
+msgid "Do you want to create other chat accounts?"
+msgstr "是否想要建立其他聊天帳號？"
 
-#: ../src/empathy-accounts-dialog.ui.h:8
+#: ../src/empathy-account-assistant.c:497
+msgid "Enter the details for the new account"
+msgstr "請輸入新帳號的詳細資料"
+
+#: ../src/empathy-account-assistant.c:612
 msgid ""
-"To add a new account, you first have to install a backend for each protocol "
-"you want to use."
-msgstr "要加入新的帳號，您必須先安裝每個會用到的通訊協定後端程式。"
+"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 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以進行語音或視"
+"訊通話。"
 
-#: ../src/empathy-accounts-dialog.ui.h:9
-msgid "Type:"
-msgstr "類型:"
+#: ../src/empathy-account-assistant.c:629
+msgid "Do you have an account you've been using with another chat program?"
+msgstr "您是否有使用其他聊天程式的帳號？"
 
-#: ../src/empathy-accounts-dialog.ui.h:10
-msgid "_Add..."
-msgstr "加入(_A)..."
+#: ../src/empathy-account-assistant.c:652
+msgid "Yes, import my account details from "
+msgstr "是的，請匯入我的帳號詳細資料於"
 
-#: ../src/empathy-accounts-dialog.ui.h:11
-msgid "_Create a new account"
-msgstr "建立新的使用者帳號(_C)"
+#: ../src/empathy-account-assistant.c:673
+msgid "Yes, I'll enter my account details now"
+msgstr "是的，我現在要輸入帳號的詳細資料"
 
-#: ../src/empathy-accounts-dialog.ui.h:12
-msgid "_Reuse an existing account"
-msgstr "重複使用既存的帳號(_R)"
+#: ../src/empathy-account-assistant.c:695
+msgid "No, I want a new account"
+msgstr "不，我想要新的帳號"
 
-#: ../src/empathy-call-window.c:420
-msgid "Contrast"
-msgstr "對比"
+#: ../src/empathy-account-assistant.c:705
+msgid "No, I just want to see people online nearby for now"
+msgstr "不，我現在只想看看附近有誰上線"
 
-#: ../src/empathy-call-window.c:423
-msgid "Brightness"
-msgstr "亮度"
+#: ../src/empathy-account-assistant.c:726
+msgid "Select the accounts you want to import:"
+msgstr "選擇要匯入的帳號："
 
-#: ../src/empathy-call-window.c:426
-msgid "Gamma"
-msgstr "Gamma"
+#: ../src/empathy-account-assistant.c:810
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
+msgid "Yes"
+msgstr "是"
 
-#: ../src/empathy-call-window.c:531
-msgid "Volume"
-msgstr "音量"
+#: ../src/empathy-account-assistant.c:817
+msgid "No, that's all for now"
+msgstr "不，目前就這樣"
 
-#: ../src/empathy-call-window.c:662
-msgid "Connecting..."
-msgstr "連線中..."
+#: ../src/empathy-account-assistant.c:1082
+msgid ""
+"Empathy can automatically discover and chat with the people connected on the "
+"same network as you. If you want to use this feature, please check that the "
+"details below are correct. You can easily change these details later or "
+"disable this feature by using the 'Accounts' dialog"
+msgstr ""
+"Empathy 可以自動探索與您連線到相同網路上的人們，並且和他們聊天。如果您想要使"
+"用此功能，請檢查下列詳細資料是否正確。您也可以在以後簡單地變更這些細節，或是"
+"用「帳號」對話窗來停用此功能"
 
-#: ../src/empathy-call-window.c:746
-msgid "_Sidebar"
-msgstr "側邊列(_S)"
+#: ../src/empathy-account-assistant.c:1088
+#: ../src/empathy-account-assistant.c:1144
+msgid "Edit->Accounts"
+msgstr "編輯 -> 帳號"
 
-#: ../src/empathy-call-window.c:765
-msgid "Dialpad"
-msgstr "播號盤"
+#: ../src/empathy-account-assistant.c:1104
+msgid "I don't want to enable this feature for now"
+msgstr "我現在不想要啟用這項功能"
+
+#: ../src/empathy-account-assistant.c:1140
+msgid ""
+"You won't be able to chat with people connected to your local network, as "
+"telepathy-salut is not installed. If you want to enable this feature, please "
+"install the telepathy-salut package and create a People Nearby account from "
+"the Accounts dialog"
+msgstr ""
+"您無法與連線到您本機網路的人們聊天，因為 telepathy-salut 尚未安裝。如果您想要"
+"啟用此功能，請安裝 telepathy-salut 套件，並從「帳號」對話窗建立「附近的人」帳"
+"號"
+
+#: ../src/empathy-account-assistant.c:1146
+msgid "telepathy-salut not installed"
+msgstr "telepathy-salut 尚未安裝"
+
+#: ../src/empathy-account-assistant.c:1192
+msgid "Messaging and VoIP Accounts Assistant"
+msgstr "訊息與 VoIP 帳號助理"
+
+#: ../src/empathy-account-assistant.c:1226
+msgid "Welcome to Empathy"
+msgstr "歡迎使用 Empathy"
+
+#: ../src/empathy-account-assistant.c:1235
+msgid "Import your existing accounts"
+msgstr "匯入現有的帳號"
+
+#: ../src/empathy-account-assistant.c:1253
+msgid "Please enter personal details"
+msgstr "請輸入個人詳細資料"
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:64
+#, c-format
+msgid "There are unsaved modifications to your %s account."
+msgstr "有與您的 %s 帳號相關的修改尚未儲存。"
+
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * an unsaved new account
+#: ../src/empathy-accounts-dialog.c:68
+msgid "Your new account has not been saved yet."
+msgstr "尚未儲存您的新帳號。"
+
+#: ../src/empathy-accounts-dialog.c:280 ../src/empathy-call-window.c:809
+msgid "Connecting…"
+msgstr "連線中…"
+
+#: ../src/empathy-accounts-dialog.c:321
+#, c-format
+msgid "Offline — %s"
+msgstr "離線 — %s"
+
+#: ../src/empathy-accounts-dialog.c:333
+#, c-format
+msgid "Disconnected — %s"
+msgstr "已斷線 — %s"
+
+#: ../src/empathy-accounts-dialog.c:344
+msgid "Offline — No Network Connection"
+msgstr "離線 — 無網路連線"
+
+#: ../src/empathy-accounts-dialog.c:351
+msgid "Unknown Status"
+msgstr "未知的狀態"
+
+#: ../src/empathy-accounts-dialog.c:363
+msgid "Offline — Account Disabled"
+msgstr "離線 — 帳號已停用"
+
+#: ../src/empathy-accounts-dialog.c:759
+msgid ""
+"You are about to create a new account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"您即將建立新的帳號，這樣會放棄\n"
+"您所做的變更。確定要繼續？"
+
+#: ../src/empathy-accounts-dialog.c:1106
+#, c-format
+msgid "Do you want to remove %s from your computer?"
+msgstr "是否想要從您的電腦上移除群組 %s？"
+
+#: ../src/empathy-accounts-dialog.c:1110
+msgid "This will not remove your account on the server."
+msgstr "這不會移除伺服器上的您的帳號。"
+
+#: ../src/empathy-accounts-dialog.c:1348
+msgid ""
+"You are about to select another account, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"您即將建立另一個帳號，這樣會放棄\n"
+"您所做的變更。確定要繼續？"
+
+#: ../src/empathy-accounts-dialog.c:1951
+msgid ""
+"You are about to close the window, which will discard\n"
+"your changes. Are you sure you want to proceed?"
+msgstr ""
+"您即將關閉這個視窗，這樣會放棄\n"
+"您所做的變更。確定要繼續？"
+
+#: ../src/empathy-accounts-dialog.ui.h:1
+msgid "Loading account information"
+msgstr "正在載入帳號資訊"
+
+#: ../src/empathy-accounts-dialog.ui.h:2
+msgid "No protocol installed"
+msgstr "尚未安裝通訊協定"
+
+#: ../src/empathy-accounts-dialog.ui.h:3
+msgid "Protocol:"
+msgstr "協定："
+
+#: ../src/empathy-accounts-dialog.ui.h:4
+msgid ""
+"To add a new account, you first have to install a backend for each protocol "
+"you want to use."
+msgstr "要加入新的帳號，您必須先安裝每個會用到的通訊協定後端程式。"
+
+#: ../src/empathy-accounts-dialog.ui.h:5
+msgid "_Add…"
+msgstr "加入(_A)…"
+
+#: ../src/empathy-accounts-dialog.ui.h:6
+msgid "_Import…"
+msgstr "匯入(_I)…"
+
+#: ../src/empathy-auth-client.c:217
+msgid " - Empathy authentication client"
+msgstr "- Empathy 認證用戶端"
+
+#: ../src/empathy-auth-client.c:233
+msgid "Empathy authentication client"
+msgstr "Empathy 認證用戶端"
+
+#: ../src/empathy-auto-salut-account-helper.c:83
+msgid "People nearby"
+msgstr "附近的人"
 
-#: ../src/empathy-call-window.c:771
+#: ../src/empathy-av.c:133
+msgid "- Empathy Audio/Video Client"
+msgstr "- Empathy 音訊視訊用戶端"
+
+#: ../src/empathy-av.c:149
+msgid "Empathy Audio/Video Client"
+msgstr "Empathy 音訊視訊用戶端"
+
+#: ../src/empathy-call-window.c:479
+msgid "Contrast"
+msgstr "對比"
+
+#: ../src/empathy-call-window.c:482
+msgid "Brightness"
+msgstr "亮度"
+
+#: ../src/empathy-call-window.c:485
+msgid "Gamma"
+msgstr "Gamma"
+
+#: ../src/empathy-call-window.c:590
+msgid "Volume"
+msgstr "音量"
+
+#: ../src/empathy-call-window.c:1166
+msgid "_Sidebar"
+msgstr "側邊欄(_S)"
+
+#: ../src/empathy-call-window.c:1186
 msgid "Audio input"
 msgstr "音效輸入"
 
-#: ../src/empathy-call-window.c:775
+#: ../src/empathy-call-window.c:1190
 msgid "Video input"
 msgstr "視訊輸入"
 
-#: ../src/empathy-call-window.c:835
+#: ../src/empathy-call-window.c:1194
+msgid "Dialpad"
+msgstr "播號盤"
+
+#: ../src/empathy-call-window.c:1199
+msgid "Details"
+msgstr "詳細資料"
+
+#. translators: Call is a noun and %s is the contact name. This string
+#. * is used in the window title
+#: ../src/empathy-call-window.c:1266
 #, c-format
 msgid "Call with %s"
 msgstr "與 %s 通話中"
 
-#: ../src/empathy-call-window.c:904
+#. translators: Call is a noun. This string is used in the window
+#. * title
+#: ../src/empathy-call-window.c:1345
 msgid "Call"
 msgstr "通話"
 
+#: ../src/empathy-call-window.c:1499
+msgid "The IP address as seen by the machine"
+msgstr "機器看見的 IP 位址"
+
+#: ../src/empathy-call-window.c:1501
+msgid "The IP address as seen by a server on the Internet"
+msgstr "網際網路上的伺服器看見的 IP 位址"
+
+#: ../src/empathy-call-window.c:1503
+msgid "The IP address of the peer as seen by the other side"
+msgstr "其他端看見的點的 IP 位址"
+
+#: ../src/empathy-call-window.c:1505
+msgid "The IP address of a relay server"
+msgstr "中繼伺服器的 IP 位址"
+
+#: ../src/empathy-call-window.c:1507
+msgid "The IP address of the multicast group"
+msgstr "多點廣播群組的 IP 位址"
+
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1335
+#: ../src/empathy-call-window.c:2254
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
 
+#: ../src/empathy-call-window.c:2315
+msgid "Technical Details"
+msgstr "技術細節"
+
+#: ../src/empathy-call-window.c:2353
+#, c-format
+msgid ""
+"%s's software does not understand any of the audio formats supported by your "
+"computer"
+msgstr "%s 的軟體不瞭解任何您電腦上所支援的音訊格式"
+
+#: ../src/empathy-call-window.c:2358
+#, c-format
+msgid ""
+"%s's software does not understand any of the video formats supported by your "
+"computer"
+msgstr "%s 的軟體不瞭解任何您電腦上所支援的視訊格式"
+
+#: ../src/empathy-call-window.c:2364
+#, c-format
+msgid ""
+"Can't establish a connection to %s. One of you might be on a network that "
+"does not allow direct connections."
+msgstr "無法和 %s 建立連線。您們其中之一可能在一個不允許直接連線的網路之上。"
+
+#: ../src/empathy-call-window.c:2370
+msgid "There was a failure on the network"
+msgstr "這個網路上有錯誤發生"
+
+#: ../src/empathy-call-window.c:2374
+msgid ""
+"The audio formats necessary for this call are not installed on your computer"
+msgstr "此通話所必要的音訊格式尚未在您的電腦上安裝"
+
+#: ../src/empathy-call-window.c:2377
+msgid ""
+"The video formats necessary for this call are not installed on your computer"
+msgstr "此通話所必要的視訊格式尚未在您的電腦上安裝"
+
+#: ../src/empathy-call-window.c:2387
+#, c-format
+msgid ""
+"Something unexpected happened in a Telepathy component. Please <a href=\"%s"
+"\">report this bug</a> and attach logs gathered from the 'Debug' window in "
+"the Help menu."
+msgstr ""
+"在 Telepathy 元件中發生未預期的狀況。請<a href=\"%s\">回報這個錯誤</a>並附上"
+"從求助選單內的「除錯」視窗中所收集的紀錄。"
+
+#: ../src/empathy-call-window.c:2395
+msgid "There was a failure in the call engine"
+msgstr "通話引擎內有錯誤發生"
+
+#: ../src/empathy-call-window.c:2398
+msgid "The end of the stream was reached"
+msgstr "已達串流末端"
+
+#: ../src/empathy-call-window.c:2438
+msgid "Can't establish audio stream"
+msgstr "無法建立音訊串流"
+
+#: ../src/empathy-call-window.c:2448
+msgid "Can't establish video stream"
+msgstr "無法建立視訊串流"
+
 #: ../src/empathy-call-window.ui.h:1
+msgid "Audio"
+msgstr "音訊"
+
+#: ../src/empathy-call-window.ui.h:2
+msgid "Call the contact again"
+msgstr "再播打聯絡人一次"
+
+#: ../src/empathy-call-window.ui.h:3
+msgid "Camera Off"
+msgstr "相機關閉"
+
+#: ../src/empathy-call-window.ui.h:4
+msgid "Camera On"
+msgstr "相機開啟"
+
+#: ../src/empathy-call-window.ui.h:5
+msgid "Decoding Codec:"
+msgstr "解碼用編解碼器："
+
+#: ../src/empathy-call-window.ui.h:6
+msgid "Disable camera and stop sending video"
+msgstr "停用相機並中止傳送視訊"
+
+#: ../src/empathy-call-window.ui.h:7
+msgid "Enable camera and send video"
+msgstr "啟用相機並送出視訊"
+
+#: ../src/empathy-call-window.ui.h:8
+msgid "Enable camera but don't send video"
+msgstr "啟用相機但不要送出視訊"
+
+#: ../src/empathy-call-window.ui.h:9
+msgid "Encoding Codec:"
+msgstr "編碼用編解碼器："
+
+#: ../src/empathy-call-window.ui.h:10
 msgid "Hang up"
 msgstr "掛斷"
 
-#: ../src/empathy-call-window.ui.h:2
+#: ../src/empathy-call-window.ui.h:11
+msgid "Hang up current call"
+msgstr "掛斷目前通話"
+
+#: ../src/empathy-call-window.ui.h:12
+msgid "Local Candidate:"
+msgstr "本機候選："
+
+#: ../src/empathy-call-window.ui.h:13
+msgid "Preview"
+msgstr "預覽"
+
+#: ../src/empathy-call-window.ui.h:14
 msgid "Redial"
 msgstr "重撥"
 
-#: ../src/empathy-call-window.ui.h:3
+#: ../src/empathy-call-window.ui.h:15
+msgid "Remote Candidate:"
+msgstr "遠端候選："
+
+#: ../src/empathy-call-window.ui.h:16
 msgid "Send Audio"
 msgstr "傳送音訊"
 
-#: ../src/empathy-call-window.ui.h:4
-msgid "Send video"
-msgstr "å\82³é\80\81è¦\96è¨\8a"
+#: ../src/empathy-call-window.ui.h:17
+msgid "Toggle audio transmission"
+msgstr "å\88\87æ\8f\9bé\9f³è¨\8aå\82³æ\92­"
 
-#: ../src/empathy-call-window.ui.h:5
-msgid "Video preview"
+#: ../src/empathy-call-window.ui.h:19
+msgid "V_ideo"
+msgstr "視訊(_I)"
+
+#: ../src/empathy-call-window.ui.h:20
+msgid "Video"
+msgstr "視訊"
+
+#: ../src/empathy-call-window.ui.h:21
+msgid "Video Off"
+msgstr "視訊關閉"
+
+#: ../src/empathy-call-window.ui.h:22
+msgid "Video On"
+msgstr "視訊開啟"
+
+#: ../src/empathy-call-window.ui.h:23
+msgid "Video Preview"
 msgstr "視訊預覽"
 
-#: ../src/empathy-call-window.ui.h:6
+#: ../src/empathy-call-window.ui.h:24
 msgid "_Call"
 msgstr "通話(_C)"
 
-#: ../src/empathy-call-window.ui.h:7 ../src/empathy-main-window.ui.h:26
+#: ../src/empathy-call-window.ui.h:25 ../src/empathy-main-window.ui.h:27
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: ../src/empathy-chat-window.c:344
+#: ../src/empathy-chat-window.c:466 ../src/empathy-chat-window.c:486
+#, c-format
+msgid "%s (%d unread)"
+msgid_plural "%s (%d unread)"
+msgstr[0] "%s (%d 個未讀)"
+
+#: ../src/empathy-chat-window.c:478
+#, c-format
+msgid "%s (and %u other)"
+msgid_plural "%s (and %u others)"
+msgstr[0] "%s (與 %u 其他的)"
+
+#: ../src/empathy-chat-window.c:494
+#, c-format
+msgid "%s (%d unread from others)"
+msgid_plural "%s (%d unread from others)"
+msgstr[0] "%s (來自其他人的 %d 個未讀)"
+
+#: ../src/empathy-chat-window.c:503
 #, c-format
-msgid "Conversations (%d)"
-msgstr "談話 (%d)"
+msgid "%s (%d unread from all)"
+msgid_plural "%s (%d unread from all)"
+msgstr[0] "%s (來自所有人的 %d 個未讀)"
 
-#: ../src/empathy-chat-window.c:476
+#: ../src/empathy-chat-window.c:709
 msgid "Typing a message."
 msgstr "正在輸入訊息。"
 
 #: ../src/empathy-chat-window.ui.h:1
-#, fuzzy
-#| msgid "Clean"
 msgid "C_lear"
-msgstr "清除"
+msgstr "清除(_L)"
 
 #: ../src/empathy-chat-window.ui.h:2
-#, fuzzy
-#| msgid "_Chat"
-msgid "Chat"
-msgstr "聊天(_C)"
+msgid "C_ontact"
+msgstr "連絡人(_O)"
 
 #: ../src/empathy-chat-window.ui.h:3
-#, fuzzy
-#| msgid "Insert Smiley"
-msgid "Insert _Smiley"
-msgstr "插入表情符號"
+msgid "Chat"
+msgstr "聊天"
 
 #: ../src/empathy-chat-window.ui.h:4
-msgid "Move Tab _Left"
-msgstr ""
+msgid "Insert _Smiley"
+msgstr "插入表情符號(_S)"
 
 #: ../src/empathy-chat-window.ui.h:5
-msgid "Move Tab _Right"
-msgstr ""
+msgid "Invite _Participant…"
+msgstr "邀請參與(_P)…"
 
 #: ../src/empathy-chat-window.ui.h:6
-#, fuzzy
-#| msgid "Contact"
-msgid "_Contact"
-msgstr "連絡人"
+msgid "Move Tab _Left"
+msgstr "將分頁左移(_L)"
+
+#: ../src/empathy-chat-window.ui.h:7
+msgid "Move Tab _Right"
+msgstr "將分頁右移(_R)"
 
-#: ../src/empathy-chat-window.ui.h:7 ../src/empathy-main-window.ui.h:14
+#: ../src/empathy-chat-window.ui.h:8
+msgid "Notify for All Messages"
+msgstr "所有訊息都通知"
+
+#: ../src/empathy-chat-window.ui.h:9 ../src/empathy-main-window.ui.h:16
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../src/empathy-chat-window.ui.h:8
-#, fuzzy
-#| msgid "Conversation"
+#: ../src/empathy-chat-window.ui.h:10
 msgid "_Conversation"
-msgstr "談話"
-
-#: ../src/empathy-chat-window.ui.h:9
-msgid "_Detach Tab"
-msgstr ""
+msgstr "談話(_C)"
 
 #: ../src/empathy-chat-window.ui.h:11
-#, fuzzy
-#| msgid "_Invite to chatroom"
-msgid "_Favorite Chatroom"
-msgstr "邀請到這個聊天室(_I)"
+msgid "_Detach Tab"
+msgstr "分離分頁(_D)"
 
 #: ../src/empathy-chat-window.ui.h:12 ../src/empathy-main-window.ui.h:18
+msgid "_Edit"
+msgstr "編輯(_E)"
+
+#: ../src/empathy-chat-window.ui.h:13
+msgid "_Favorite Chat Room"
+msgstr "喜好的聊天室(_F)"
+
+#: ../src/empathy-chat-window.ui.h:14 ../src/empathy-main-window.ui.h:20
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../src/empathy-chat-window.ui.h:13
+#: ../src/empathy-chat-window.ui.h:15
 msgid "_Next Tab"
-msgstr ""
+msgstr "下個分頁(_N)"
 
-#: ../src/empathy-chat-window.ui.h:14
-#, fuzzy
-#| msgid "_Previous Conversations"
+#: ../src/empathy-chat-window.ui.h:16
 msgid "_Previous Tab"
-msgstr "上一次談話(_P)"
+msgstr "上個分頁(_P)"
 
-#: ../src/empathy-chat-window.ui.h:15 ../src/empathy-status-icon.ui.h:4
+#: ../src/empathy-chat-window.ui.h:17 ../src/empathy-status-icon.ui.h:5
 msgid "_Show Contact List"
 msgstr "顯示連絡人清單(_S)"
 
-#: ../src/empathy-chat-window.ui.h:16
+#: ../src/empathy-chat-window.ui.h:18
 msgid "_Tabs"
-msgstr ""
+msgstr "分頁(_T)"
+
+#: ../src/empathy-chat-window.ui.h:19
+msgid "_Undo Close Tab"
+msgstr "復原關閉的分頁(_U)"
 
-#: ../src/empathy-chatrooms-window.c:258
+#: ../src/empathy-chatrooms-window.c:241
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/empathy-chatrooms-window.c:276
+#: ../src/empathy-chatrooms-window.c:259
 msgid "Room"
 msgstr "聊天室"
 
-#: ../src/empathy-chatrooms-window.c:285
+#: ../src/empathy-chatrooms-window.c:267
 msgid "Auto-Connect"
 msgstr "自動連線"
 
@@ -1902,75 +3059,86 @@ msgstr "自動連線"
 msgid "Manage Favorite Rooms"
 msgstr "管理喜好的聊天室"
 
-#: ../src/empathy-event-manager.c:321
+#: ../src/empathy-event-manager.c:468
+msgid "Incoming video call"
+msgstr "傳入的視訊通話"
+
+#: ../src/empathy-event-manager.c:468
 msgid "Incoming call"
 msgstr "來電"
 
-#: ../src/empathy-event-manager.c:324
+#: ../src/empathy-event-manager.c:472
 #, c-format
-msgid "%s is calling you, do you want to answer?"
-msgstr "%s è¦\81è\88\87æ\82¨é\80\9a話ï¼\8c是否要接聽？"
+msgid "%s is video calling you. Do you want to answer?"
+msgstr "%s è¦\81è\88\87æ\82¨é\80²è¡\8cè¦\96è¨\8aé\80\9a話ã\80\82æ\82¨是否要接聽？"
 
-#: ../src/empathy-event-manager.c:331
-msgid "_Reject"
-msgstr "拒絕(_R)"
-
-#: ../src/empathy-event-manager.c:337
-msgid "_Answer"
-msgstr "接聽(_A)"
+#: ../src/empathy-event-manager.c:473
+#, c-format
+msgid "%s is calling you. Do you want to answer?"
+msgstr "%s 要與您進行通話。您是否要接聽？"
 
-#: ../src/empathy-event-manager.c:452
+#: ../src/empathy-event-manager.c:476 ../src/empathy-event-manager.c:618
 #, c-format
 msgid "Incoming call from %s"
 msgstr "%s 的來電"
 
-#: ../src/empathy-event-manager.c:496
-#, c-format
-msgid "%s is offering you an invitation"
-msgstr "%s 正在邀請您"
-
-#: ../src/empathy-event-manager.c:502
-msgid "An external application will be started to handle it."
-msgstr "將啟動外部應用程式來處理它。"
+#: ../src/empathy-event-manager.c:501
+msgid "_Reject"
+msgstr "拒絕(_R)"
 
 #: ../src/empathy-event-manager.c:507
-msgid "You don't have the needed external application to handle it."
-msgstr "æ\82¨æ²\92æ\9c\89è\99\95ç\90\86å®\83æ\89\80é\9c\80ç\9a\84å¤\96é\83¨æ\87\89ç\94¨ç¨\8bå¼\8fã\80\82"
+msgid "_Answer"
+msgstr "æ\8e¥è\81½(_A)"
 
-#: ../src/empathy-event-manager.c:634
+#: ../src/empathy-event-manager.c:618
+#, c-format
+msgid "Incoming video call from %s"
+msgstr "來自 %s 的視訊電話"
+
+#: ../src/empathy-event-manager.c:695
 msgid "Room invitation"
 msgstr "聊天邀請"
 
-#: ../src/empathy-event-manager.c:637
+#: ../src/empathy-event-manager.c:697
+#, c-format
+msgid "Invitation to join %s"
+msgstr "邀請加入 %s"
+
+#: ../src/empathy-event-manager.c:704
 #, c-format
 msgid "%s is inviting you to join %s"
 msgstr "%s 正在邀請您加入 %s"
 
-#: ../src/empathy-event-manager.c:645
+#: ../src/empathy-event-manager.c:712
 msgid "_Decline"
 msgstr "拒絕(_D)"
 
-#: ../src/empathy-event-manager.c:650
+#: ../src/empathy-event-manager.c:717
 #: ../src/empathy-new-chatroom-dialog.ui.h:7
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/empathy-event-manager.c:689
+#: ../src/empathy-event-manager.c:743
 #, c-format
 msgid "%s invited you to join %s"
 msgstr "%s 曾邀請您加入 %s"
 
-#: ../src/empathy-event-manager.c:715
+#: ../src/empathy-event-manager.c:749
+#, c-format
+msgid "You have been invited to join %s"
+msgstr "您被邀請加入 %s"
+
+#: ../src/empathy-event-manager.c:797
 #, c-format
 msgid "Incoming file transfer from %s"
 msgstr "收到來自 %s 的檔案傳輸"
 
-#: ../src/empathy-event-manager.c:895
+#: ../src/empathy-event-manager.c:1005
 #, c-format
 msgid "Subscription requested by %s"
 msgstr "來自 %s 的訂閱要求"
 
-#: ../src/empathy-event-manager.c:899
+#: ../src/empathy-event-manager.c:1009
 #, c-format
 msgid ""
 "\n"
@@ -1979,118 +3147,116 @@ msgstr ""
 "\n"
 "訊息：%s"
 
-#. someone is logging off
-#: ../src/empathy-event-manager.c:935
+#: ../src/empathy-event-manager.c:1052
 #, c-format
 msgid "%s is now offline."
 msgstr "%s 現在離線。"
 
-#. someone is logging in
-#: ../src/empathy-event-manager.c:951
+#: ../src/empathy-event-manager.c:1072
 #, c-format
 msgid "%s is now online."
 msgstr "%s 現在上線。"
 
 #. Translators: time left, when it is more than one hour
-#: ../src/empathy-ft-manager.c:101
+#: ../src/empathy-ft-manager.c:99
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
 #. Translators: time left, when is is less than one hour
-#: ../src/empathy-ft-manager.c:104
+#: ../src/empathy-ft-manager.c:102
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: ../src/empathy-ft-manager.c:180
+#: ../src/empathy-ft-manager.c:178
 msgctxt "file transfer percent"
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/empathy-ft-manager.c:275
+#: ../src/empathy-ft-manager.c:273
 #, c-format
 msgid "%s of %s at %s/s"
 msgstr "%s / %s 於 %s/s"
 
-#: ../src/empathy-ft-manager.c:276
+#: ../src/empathy-ft-manager.c:274
 #, c-format
 msgid "%s of %s"
 msgstr "%s / %s"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:307
+#: ../src/empathy-ft-manager.c:305
 #, c-format
 msgid "Receiving \"%s\" from %s"
 msgstr "正在接收 %2$s 送出的「%1$s」"
 
 #. translators: first %s is filename, second %s is the contact name
-#: ../src/empathy-ft-manager.c:310
+#: ../src/empathy-ft-manager.c:308
 #, c-format
 msgid "Sending \"%s\" to %s"
 msgstr "正在傳送「%s」給 %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:340
+#: ../src/empathy-ft-manager.c:338
 #, c-format
 msgid "Error receiving \"%s\" from %s"
 msgstr "從 %2$s 接收「%1$s」時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:343
+#: ../src/empathy-ft-manager.c:341
 msgid "Error receiving a file"
 msgstr "接收檔案時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:348
+#: ../src/empathy-ft-manager.c:346
 #, c-format
 msgid "Error sending \"%s\" to %s"
 msgstr "傳送「%s」給 %s 時發生錯誤"
 
-#: ../src/empathy-ft-manager.c:351
+#: ../src/empathy-ft-manager.c:349
 msgid "Error sending a file"
 msgstr "傳送檔案時發生錯誤"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:490
+#: ../src/empathy-ft-manager.c:488
 #, c-format
 msgid "\"%s\" received from %s"
 msgstr "「%s」接收自 %s"
 
 #. translators: first %s is filename, second %s
 #. * is the contact name
-#: ../src/empathy-ft-manager.c:495
+#: ../src/empathy-ft-manager.c:493
 #, c-format
 msgid "\"%s\" sent to %s"
 msgstr "「%s」傳送給 %s"
 
-#: ../src/empathy-ft-manager.c:498
+#: ../src/empathy-ft-manager.c:496
 msgid "File transfer completed"
 msgstr "檔案傳輸完畢"
 
-#: ../src/empathy-ft-manager.c:617 ../src/empathy-ft-manager.c:784
+#: ../src/empathy-ft-manager.c:615 ../src/empathy-ft-manager.c:782
 msgid "Waiting for the other participant's response"
 msgstr "正在等待其他參與者的回應"
 
-#: ../src/empathy-ft-manager.c:643 ../src/empathy-ft-manager.c:681
+#: ../src/empathy-ft-manager.c:641 ../src/empathy-ft-manager.c:679
 #, c-format
 msgid "Checking integrity of \"%s\""
 msgstr "正在檢查檔案「%s」的完整性"
 
-#: ../src/empathy-ft-manager.c:646 ../src/empathy-ft-manager.c:684
+#: ../src/empathy-ft-manager.c:644 ../src/empathy-ft-manager.c:682
 #, c-format
 msgid "Hashing \"%s\""
 msgstr "正在計算「%s」雜湊值"
 
-#: ../src/empathy-ft-manager.c:1024
+#: ../src/empathy-ft-manager.c:996
 msgid "%"
 msgstr "%"
 
-#: ../src/empathy-ft-manager.c:1036
+#: ../src/empathy-ft-manager.c:1008
 msgid "File"
 msgstr "檔案"
 
-#: ../src/empathy-ft-manager.c:1058
+#: ../src/empathy-ft-manager.c:1030
 msgid "Remaining"
 msgstr "剩餘"
 
@@ -2102,212 +3268,170 @@ msgstr "檔案傳輸"
 msgid "Remove completed, canceled and failed file transfers from the list"
 msgstr "從清單中移除已完成、已取消和失敗的檔案傳輸"
 
-#. Translators: this is the header of a treeview column
-#: ../src/empathy-import-dialog.c:263
-msgid "Import"
-msgstr "匯入"
-
-#: ../src/empathy-import-dialog.c:272
-msgid "Protocol"
-msgstr "通訊協定"
-
-#: ../src/empathy-import-dialog.c:298
-msgid "Source"
-msgstr "來源"
-
-#: ../src/empathy-import-dialog.c:392
+#: ../src/empathy-import-dialog.c:84
 msgid ""
 "No accounts to import could be found. Empathy currently only supports "
 "importing accounts from Pidgin."
 msgstr "找不到可匯入的帳號。Empathy 目前只支援從 Pidgin 匯入帳號。"
 
-#: ../src/empathy-import-dialog.ui.h:1
+#: ../src/empathy-import-dialog.c:199
 msgid "Import Accounts"
 msgstr "匯入帳號"
 
-#: ../src/empathy-main-window.c:402
-msgid "_Edit account"
-msgstr "編輯帳號(_E)"
-
-#: ../src/empathy-main-window.c:505
-msgid "No error specified"
-msgstr "沒有指定的錯誤"
-
-#: ../src/empathy-main-window.c:508
-msgid "Network error"
-msgstr "網路錯誤"
-
-#: ../src/empathy-main-window.c:511
-msgid "Authentication failed"
-msgstr "驗證失敗"
-
-#: ../src/empathy-main-window.c:514
-msgid "Encryption error"
-msgstr "加密發生錯誤"
-
-#: ../src/empathy-main-window.c:517
-msgid "Name in use"
-msgstr "使用中的名稱"
-
-#: ../src/empathy-main-window.c:520
-msgid "Certificate not provided"
-msgstr "沒有提供憑證"
+#. Translators: this is the header of a treeview column
+#: ../src/empathy-import-widget.c:301
+msgid "Import"
+msgstr "匯入"
 
-#: ../src/empathy-main-window.c:523
-msgid "Certificate untrusted"
-msgstr "憑證不被信任"
+#: ../src/empathy-import-widget.c:310
+msgid "Protocol"
+msgstr "通訊協定"
 
-#: ../src/empathy-main-window.c:526
-msgid "Certificate expired"
-msgstr "憑證已逾期"
+#: ../src/empathy-import-widget.c:334
+msgid "Source"
+msgstr "來源"
 
-#: ../src/empathy-main-window.c:529
-msgid "Certificate not activated"
-msgstr "æ\86\91è­\89å°\9aæ\9cªä½¿ç\94¨"
+#: ../src/empathy-main-window.c:383
+msgid "No match found"
+msgstr "æ\89¾ä¸\8då\88°ç¬¦å\90\88é \85ç\9b®"
 
-#: ../src/empathy-main-window.c:532
-msgid "Certificate hostname mismatch"
-msgstr "憑證主機名稱不符"
+#: ../src/empathy-main-window.c:538
+msgid "Reconnect"
+msgstr "重新連接"
 
-#: ../src/empathy-main-window.c:535
-msgid "Certificate fingerprint mismatch"
-msgstr "憑證指紋檔不符"
+#: ../src/empathy-main-window.c:544
+msgid "Edit Account"
+msgstr "編輯帳號"
 
-#: ../src/empathy-main-window.c:538
-msgid "Certificate self-signed"
-msgstr "憑證為自我簽署"
+#: ../src/empathy-main-window.c:550
+msgid "Close"
+msgstr "關閉"
 
-#: ../src/empathy-main-window.c:541
-msgid "Certificate error"
-msgstr "憑證錯誤"
+#: ../src/empathy-main-window.c:1232
+msgid "Contact"
+msgstr "連絡人"
 
-#: ../src/empathy-main-window.c:544
-msgid "Unknown error"
-msgstr "不明的錯誤"
+#: ../src/empathy-main-window.c:1557
+msgid "Contact List"
+msgstr "連絡人清單"
 
-#: ../src/empathy-main-window.c:1293
+#: ../src/empathy-main-window.c:1666
 msgid "Show and edit accounts"
 msgstr "顯示並編輯帳號"
 
 #: ../src/empathy-main-window.ui.h:1
-msgid "Contact List"
-msgstr "連絡人清單"
-
-#: ../src/empathy-main-window.ui.h:2
 msgid "Contacts on a _Map"
 msgstr "連絡人地圖(_M)"
 
-#: ../src/empathy-main-window.ui.h:3
+#: ../src/empathy-main-window.ui.h:2
 msgid "Context"
-msgstr "脈絡"
+msgstr "選項"
 
-#: ../src/empathy-main-window.ui.h:4
+#: ../src/empathy-main-window.ui.h:3
 msgid "Join _Favorites"
 msgstr "加入喜好(_F)"
 
-#: ../src/empathy-main-window.ui.h:5
+#: ../src/empathy-main-window.ui.h:4
 msgid "Manage Favorites"
 msgstr "管理喜好"
 
-#: ../src/empathy-main-window.ui.h:6
+#: ../src/empathy-main-window.ui.h:5
 msgid "N_ormal Size"
-msgstr ""
+msgstr "正常大小(_O)"
+
+#: ../src/empathy-main-window.ui.h:6 ../src/empathy-status-icon.ui.h:1
+msgid "New _Call…"
+msgstr "新增通話(_C)…"
 
 #: ../src/empathy-main-window.ui.h:7
 msgid "Normal Size With _Avatars"
-msgstr ""
+msgstr "正常大小與大頭貼(_A)"
 
 #: ../src/empathy-main-window.ui.h:8
-#, fuzzy
-#| msgid "Sort by _name"
+msgid "P_references"
+msgstr "偏好設定(_R)"
+
+#: ../src/empathy-main-window.ui.h:9
+msgid "Show P_rotocols"
+msgstr "顯示協定(_R)"
+
+#: ../src/empathy-main-window.ui.h:10
 msgid "Sort by _Name"
 msgstr "依名稱排序(_N)"
 
-#: ../src/empathy-main-window.ui.h:9
-#, fuzzy
-#| msgid "Sort by s_tate"
+#: ../src/empathy-main-window.ui.h:11
 msgid "Sort by _Status"
-msgstr "依狀態排序(_T)"
+msgstr "依狀態排序(_S)"
 
-#: ../src/empathy-main-window.ui.h:10
+#: ../src/empathy-main-window.ui.h:12
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
-#: ../src/empathy-main-window.ui.h:13
+#: ../src/empathy-main-window.ui.h:15
 msgid "_Compact Size"
-msgstr ""
+msgstr "精簡大小(_C)"
 
-#: ../src/empathy-main-window.ui.h:15
+#: ../src/empathy-main-window.ui.h:17
 msgid "_Debug"
 msgstr "偵錯(_D)"
 
-#: ../src/empathy-main-window.ui.h:17
+#: ../src/empathy-main-window.ui.h:19
 msgid "_File Transfers"
 msgstr "檔案傳輸(_F)"
 
-#: ../src/empathy-main-window.ui.h:19
-msgid "_Join..."
-msgstr "加入(_J)..."
+#: ../src/empathy-main-window.ui.h:21
+msgid "_Join…"
+msgstr "加入(_J)…"
 
-#: ../src/empathy-main-window.ui.h:20 ../src/empathy-status-icon.ui.h:2
-msgid "_New Conversation..."
-msgstr "新增談話(_N)..."
+#: ../src/empathy-main-window.ui.h:22 ../src/empathy-status-icon.ui.h:3
+msgid "_New Conversation…"
+msgstr "新增談話(_N)…"
 
-#: ../src/empathy-main-window.ui.h:21
+#: ../src/empathy-main-window.ui.h:23
 msgid "_Offline Contacts"
 msgstr "離線連絡人(_O)"
 
-#: ../src/empathy-main-window.ui.h:22
+#: ../src/empathy-main-window.ui.h:24
 msgid "_Personal Information"
 msgstr "個人資訊(_P)"
 
-#: ../src/empathy-main-window.ui.h:24
-msgid "_Previous Conversations"
-msgstr "上一次談話(_P)"
-
-#: ../src/empathy-main-window.ui.h:25
+#: ../src/empathy-main-window.ui.h:26
 msgid "_Room"
 msgstr "聊天室(_R)"
 
-#: ../src/empathy-new-chatroom-dialog.c:331
+#: ../src/empathy-new-chatroom-dialog.c:379
 msgid "Chat Room"
 msgstr "聊天室"
 
-#: ../src/empathy-new-chatroom-dialog.c:347
+#: ../src/empathy-new-chatroom-dialog.c:395
 msgid "Members"
 msgstr "成員"
 
-#: ../src/empathy-new-chatroom-dialog.c:496
+#. Translators: Room/Join's roomlist tooltip. Parameters are a channel name,
+#. yes/no, yes/no and a number.
+#: ../src/empathy-new-chatroom-dialog.c:607
 #, c-format
-msgctxt ""
-"Room/Join's roomlist tooltip. Parametersare a channel name, yes/no, yes/no "
-"and a number."
 msgid ""
-"<b>%s</b>\n"
+"%s\n"
 "Invite required: %s\n"
 "Password required: %s\n"
 "Members: %s"
 msgstr ""
-"<b>%s</b>\n"
+"%s\n"
 "需要邀請：%s\n"
 "需要密碼：%s\n"
 "成員：%s"
 
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
-msgid "Yes"
-msgstr "是"
-
-#: ../src/empathy-new-chatroom-dialog.c:498
-#: ../src/empathy-new-chatroom-dialog.c:499
+#: ../src/empathy-new-chatroom-dialog.c:609
+#: ../src/empathy-new-chatroom-dialog.c:610
 msgid "No"
 msgstr "否"
 
-#: ../src/empathy-new-chatroom-dialog.c:526
+#: ../src/empathy-new-chatroom-dialog.c:638
 msgid "Could not start room listing"
 msgstr "無法開始列出聊天室清單"
 
-#: ../src/empathy-new-chatroom-dialog.c:536
+#: ../src/empathy-new-chatroom-dialog.c:648
 msgid "Could not stop room listing"
 msgstr "無法停止列出聊天室清單"
 
@@ -2337,274 +3461,430 @@ msgstr "聊天室清單"
 
 #: ../src/empathy-new-chatroom-dialog.ui.h:8
 msgid "_Room:"
-msgstr "聊天室(_R):"
+msgstr "聊天室(_R)："
 
-#: ../src/empathy-preferences.c:147
+#: ../src/empathy-preferences.c:138
 msgid "Message received"
 msgstr "訊息已收到"
 
-#: ../src/empathy-preferences.c:148
+#: ../src/empathy-preferences.c:139
 msgid "Message sent"
 msgstr "訊息已送出"
 
-#: ../src/empathy-preferences.c:149
+#: ../src/empathy-preferences.c:140
 msgid "New conversation"
 msgstr "新增談話"
 
-#: ../src/empathy-preferences.c:150
+#: ../src/empathy-preferences.c:141
 msgid "Contact goes online"
 msgstr "連絡人上線"
 
-#: ../src/empathy-preferences.c:151
+#: ../src/empathy-preferences.c:142
 msgid "Contact goes offline"
 msgstr "連絡人離線"
 
-#: ../src/empathy-preferences.c:152
+#: ../src/empathy-preferences.c:143
 msgid "Account connected"
 msgstr "帳號已連線"
 
-#: ../src/empathy-preferences.c:153
+#: ../src/empathy-preferences.c:144
 msgid "Account disconnected"
 msgstr "帳號已斷線"
 
-#: ../src/empathy-preferences.c:393
+#: ../src/empathy-preferences.c:445
 msgid "Language"
 msgstr "語言"
 
-#: ../src/empathy-preferences.ui.h:1
-msgid "Allow _GPS usage"
-msgstr "允許使用 _GPS"
-
-#: ../src/empathy-preferences.ui.h:2
-msgid "Allow _cellphone usage"
-msgstr "允許使用行動電話(_C)"
-
-#: ../src/empathy-preferences.ui.h:3
-msgid "Allow _network usage"
-msgstr "允許使用網路(_N)"
+#: ../src/empathy-preferences.c:882
+msgid "Preferences"
+msgstr "偏好設定"
 
-#: ../src/empathy-preferences.ui.h:4
+#: ../src/empathy-preferences.ui.h:1
 msgid "Appearance"
 msgstr "外觀"
 
-#: ../src/empathy-preferences.ui.h:5
-msgid "Automatically _connect on startup "
-msgstr "啟動時自動連線(_C)"
-
-#: ../src/empathy-preferences.ui.h:6
+#: ../src/empathy-preferences.ui.h:2
 msgid "Behavior"
 msgstr "行為"
 
-#: ../src/empathy-preferences.ui.h:7
+#: ../src/empathy-preferences.ui.h:3
 msgid "Chat Th_eme:"
 msgstr "聊天佈景主題(_E):"
 
-#: ../src/empathy-preferences.ui.h:8
+#: ../src/empathy-preferences.ui.h:4
 msgid "Disable notifications when _away or busy"
 msgstr "當狀態為離開或忙碌時停用通知(_D)"
 
-#: ../src/empathy-preferences.ui.h:9
+#: ../src/empathy-preferences.ui.h:5
 msgid "Disable sounds when _away or busy"
 msgstr "當狀態為離開或忙碌時停用音效(_A)"
 
-#: ../src/empathy-preferences.ui.h:10
+#: ../src/empathy-preferences.ui.h:6
+msgid "Display incoming events in the notification area"
+msgstr "在通知區域顯示收到事件"
+
+#: ../src/empathy-preferences.ui.h:7
 msgid "Enable notifications when a contact comes online"
 msgstr "當連絡人上線時啟用通知"
 
-#: ../src/empathy-preferences.ui.h:11
+#: ../src/empathy-preferences.ui.h:8
 msgid "Enable notifications when a contact goes offline"
 msgstr "當連絡人離線時啟用通知"
 
-#: ../src/empathy-preferences.ui.h:12
+#: ../src/empathy-preferences.ui.h:9
 msgid "Enable notifications when the _chat is not focused"
 msgstr "當聊天視窗失去焦點時啟用通知(_C)"
 
-#: ../src/empathy-preferences.ui.h:13
+#: ../src/empathy-preferences.ui.h:10
 msgid "Enable spell checking for languages:"
-msgstr "啟用拼字檢查程式語言："
+msgstr "為語言啟用拼字檢查："
 
-#: ../src/empathy-preferences.ui.h:14
+#: ../src/empathy-preferences.ui.h:11
 msgid "General"
 msgstr "一般"
 
-#: ../src/empathy-preferences.ui.h:15
-msgid "Geoclue Settings"
-msgstr "Geoclue 設定值"
+#: ../src/empathy-preferences.ui.h:13
+msgid "Location sources:"
+msgstr "位置來源："
 
-#: ../src/empathy-preferences.ui.h:16
-msgid "Location"
-msgstr "位置"
+#: ../src/empathy-preferences.ui.h:14
+msgid "Log conversations"
+msgstr "紀錄談話"
 
-#: ../src/empathy-preferences.ui.h:17
+#: ../src/empathy-preferences.ui.h:15
 msgid "Notifications"
 msgstr "通知"
 
-#: ../src/empathy-preferences.ui.h:18
+#: ../src/empathy-preferences.ui.h:16
 msgid "Play sound for events"
 msgstr "播放事件音效"
 
-#: ../src/empathy-preferences.ui.h:19
-msgid "Preferences"
-msgstr "偏好設定"
-
-#: ../src/empathy-preferences.ui.h:20
+#: ../src/empathy-preferences.ui.h:17
 msgid "Privacy"
 msgstr "隱私"
 
-#: ../src/empathy-preferences.ui.h:21
+#: ../src/empathy-preferences.ui.h:18
 msgid ""
 "Reduced location accuracy means that nothing more precise than your city, "
-"state and country will be published.  GPS coordinates will have a random "
-"value added (&#xB1;0.25&#xB0;)."
+"state and country will be published.  GPS coordinates will be accurate to 1 "
+"decimal place."
 msgstr ""
 "降低位置準確度意指除了你所在的城市、洲和國家會被公開之外，不會提供其他訊息。"
-"全球定位系統的座標將會隨機加入數值(&#xB1;0.25&#xB0;)。"
+"GPS 的座標準確度將會降為個位數。"
 
-#: ../src/empathy-preferences.ui.h:22
+#: ../src/empathy-preferences.ui.h:19
 msgid "Show _smileys as images"
 msgstr "將表情符號以圖片顯示(_S)"
 
-#: ../src/empathy-preferences.ui.h:23
+#: ../src/empathy-preferences.ui.h:20
 msgid "Show contact _list in rooms"
 msgstr "在聊天室顯示連絡人清單(_L)"
 
-#: ../src/empathy-preferences.ui.h:24
+#: ../src/empathy-preferences.ui.h:21
 msgid "Sounds"
 msgstr "音效"
 
-#: ../src/empathy-preferences.ui.h:25
+#: ../src/empathy-preferences.ui.h:22
 msgid "Spell Checking"
-msgstr "拼字檢查程式"
+msgstr "拼字檢查"
 
-#: ../src/empathy-preferences.ui.h:26
+#: ../src/empathy-preferences.ui.h:23
 msgid ""
 "The list of languages reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "這裡的語言清單只反映出您已經安裝字典的語言。"
 
-#: ../src/empathy-preferences.ui.h:27
+#: ../src/empathy-preferences.ui.h:24
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../src/empathy-preferences.ui.h:28
+#: ../src/empathy-preferences.ui.h:25
+msgid "_Automatically connect on startup"
+msgstr "啟動時自動連線(_A)"
+
+#: ../src/empathy-preferences.ui.h:26
+msgid "_Cellphone"
+msgstr "手機(_C)"
+
+#: ../src/empathy-preferences.ui.h:27
 msgid "_Enable bubble notifications"
 msgstr "啟用氣泡式通知(_E)"
 
-#: ../src/empathy-preferences.ui.h:29
+#: ../src/empathy-preferences.ui.h:28
 msgid "_Enable sound notifications"
 msgstr "啟用音效通知(_E)"
 
+#: ../src/empathy-preferences.ui.h:29
+msgid "_GPS"
+msgstr "_GPS"
+
 #: ../src/empathy-preferences.ui.h:30
+msgid "_Network (IP, Wi-Fi)"
+msgstr "網路 (IP, Wi-Fi)(_N)"
+
+#: ../src/empathy-preferences.ui.h:31
 msgid "_Open new chats in separate windows"
 msgstr "在個別視窗開啟新的聊天(_O)"
 
-#: ../src/empathy-preferences.ui.h:31
+#: ../src/empathy-preferences.ui.h:32
 msgid "_Publish location to my contacts"
 msgstr "對我的連絡人公開位置(_P)"
 
-#: ../src/empathy-preferences.ui.h:32
+#. To translators: The longitude and latitude are rounded to closest 0,1 degrees, so for example 146,2345° is rounded to round(146,2345*10)/10 = 146,2 degrees.
+#: ../src/empathy-preferences.ui.h:34
 msgid "_Reduce location accuracy"
 msgstr "降低位置準確度(_R)"
 
-#: ../src/empathy-status-icon.ui.h:1
+#: ../src/empathy-status-icon.c:141
+msgid "Respond"
+msgstr "回應"
+
+#: ../src/empathy-status-icon.c:147
+msgid "Reject"
+msgstr "拒絕"
+
+#: ../src/empathy-status-icon.c:151
+msgid "Answer"
+msgstr "接聽"
+
+#: ../src/empathy-status-icon.c:158
+msgid "Decline"
+msgstr "拒絕"
+
+#: ../src/empathy-status-icon.c:162
+msgid "Accept"
+msgstr "接受"
+
+#: ../src/empathy-status-icon.ui.h:2
 msgid "Status"
 msgstr "狀態"
 
-#: ../src/empathy-status-icon.ui.h:3
+#: ../src/empathy-status-icon.ui.h:4
 msgid "_Quit"
 msgstr "結束(_Q)"
 
-#: ../src/empathy-tube-dispatch.c:375
-#, c-format
-msgid "Unable to start application for service %s: %s"
-msgstr "無法啟動服務 %s 的應用程式：%s"
-
-#: ../src/empathy-tube-dispatch.c:446
-#, c-format
-msgid ""
-"An invitation was offered for service %s, but you don't have the needed "
-"application to handle it"
-msgstr "有提出服務 %s 的邀請，但是您沒有處理它所需的外部應用程式。"
-
-#: ../src/empathy-call-window-fullscreen.ui.h:1
-msgid "gtk-leave-fullscreen"
-msgstr "gtk-leave-fullscreen"
-
-#: ../src/empathy-map-view.ui.h:1
+#: ../src/empathy-map-view.c:452
 msgid "Contact Map View"
 msgstr "連絡人地圖檢視"
 
-#: ../src/empathy-debug-dialog.c:111 ../src/empathy-debug-dialog.c:1083
-msgid "Error"
-msgstr "錯誤"
-
-#: ../src/empathy-debug-dialog.c:114 ../src/empathy-debug-dialog.c:1077
-msgid "Critical"
-msgstr "嚴重"
-
-#: ../src/empathy-debug-dialog.c:117 ../src/empathy-debug-dialog.c:1071
-msgid "Warning"
-msgstr "警告"
-
-#: ../src/empathy-debug-dialog.c:120 ../src/empathy-debug-dialog.c:1065
-#: ../src/empathy-debug-dialog.c:1113
-msgid "Message"
-msgstr "訊息"
-
-#: ../src/empathy-debug-dialog.c:123 ../src/empathy-debug-dialog.c:1059
-msgid "Info"
-msgstr "資訊"
-
-#: ../src/empathy-debug-dialog.c:126 ../src/empathy-debug-dialog.c:1053
-msgid "Debug"
-msgstr "偵錯"
-
-#: ../src/empathy-debug-dialog.c:845
+#: ../src/empathy-debug-window.c:1219
 msgid "Save"
 msgstr "儲存"
 
-#: ../src/empathy-debug-dialog.c:948
+#: ../src/empathy-debug-window.c:1395
 msgid "Debug Window"
 msgstr "偵錯視窗"
 
-#: ../src/empathy-debug-dialog.c:1021
+#: ../src/empathy-debug-window.c:1475
 msgid "Pause"
 msgstr "暫停"
 
-#: ../src/empathy-debug-dialog.c:1033
+#: ../src/empathy-debug-window.c:1487
 msgid "Level "
 msgstr "等級"
 
-#: ../src/empathy-debug-dialog.c:1102
+#: ../src/empathy-debug-window.c:1507
+msgid "Debug"
+msgstr "偵錯"
+
+#: ../src/empathy-debug-window.c:1513
+msgid "Info"
+msgstr "資訊"
+
+#: ../src/empathy-debug-window.c:1519 ../src/empathy-debug-window.c:1568
+msgid "Message"
+msgstr "訊息"
+
+#: ../src/empathy-debug-window.c:1525
+msgid "Warning"
+msgstr "警告"
+
+#: ../src/empathy-debug-window.c:1531
+msgid "Critical"
+msgstr "嚴重"
+
+#: ../src/empathy-debug-window.c:1537
+msgid "Error"
+msgstr "錯誤"
+
+#: ../src/empathy-debug-window.c:1556
 msgid "Time"
 msgstr "時刻"
 
-#: ../src/empathy-debug-dialog.c:1104
+#: ../src/empathy-debug-window.c:1559
 msgid "Domain"
 msgstr "網域"
 
-#: ../src/empathy-debug-dialog.c:1106
+#: ../src/empathy-debug-window.c:1561
 msgid "Category"
 msgstr "分類"
 
-#: ../src/empathy-debug-dialog.c:1108
+#: ../src/empathy-debug-window.c:1563
 msgid "Level"
 msgstr "等級"
 
-#: ../src/empathy-debug-dialog.c:1140
+#: ../src/empathy-debug-window.c:1600
 msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
 
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Empathy 即時通訊程式"
+#: ../src/empathy-invite-participant-dialog.c:34
+#: ../src/empathy-invite-participant-dialog.c:48
+msgid "Invite Participant"
+msgstr "邀請參與"
+
+#: ../src/empathy-invite-participant-dialog.c:35
+msgid "Choose a contact to invite into the conversation:"
+msgstr "選擇想要邀請進入談話的聯絡人："
+
+#: ../src/empathy-invite-participant-dialog.c:45
+msgid "Invite"
+msgstr "邀請"
+
+#: ../src/empathy-accounts.c:182
+msgid "Don't display any dialogs; do any work (eg, importing) and exit"
+msgstr "不要顯示任何對話窗；執行任何作業（例：匯入）並離開"
+
+#: ../src/empathy-accounts.c:186
+msgid "Don't display any dialogs if there are any non-Salut accounts"
+msgstr "如果有任何非 Salut 的帳號，就不要顯示任何對話窗"
+
+#: ../src/empathy-accounts.c:190
+msgid "Initially select given account (eg, gabble/jabber/foo_40example_2eorg0)"
+msgstr "初始選取所給予的帳號 (例：gabble/jabber/foo_40example_2eorg0)"
+
+#: ../src/empathy-accounts.c:192
+msgid "<account-id>"
+msgstr "<account-id>"
+
+#: ../src/empathy-accounts.c:200
+msgid "- Empathy Accounts"
+msgstr "- Empathy 帳號"
+
+#: ../src/empathy-accounts.c:216
+msgid "Empathy Accounts"
+msgstr "Empathy 帳號"
+
+#: ../src/empathy-debugger.c:40
+msgid "Empathy Debugger"
+msgstr "Empathy 除錯程式"
+
+#~ msgid "Empathy has asked about importing accounts"
+#~ msgstr "Empathy 已詢問匯入帳號"
+
+#~ msgid ""
+#~ "Whether Empathy has asked about importing accounts from other programs."
+#~ msgstr "Empathy 是否應詢問您要不要從其他程式匯入帳號。"
+
+#~ msgid "Use _Yahoo! Japan"
+#~ msgstr "使用 Yahoo! 日本(_Y)"
+
+#~ msgctxt "Link individual (contextual menu)"
+#~ msgid "_Link…"
+#~ msgstr "連結(_L)…"
+
+#~ msgid "_Character set:"
+#~ msgstr "字集(_C)："
+
+#~ msgid "_E-mail address:"
+#~ msgstr "電子郵件位址(_E)："
+
+#~ msgid "_Nickname:"
+#~ msgstr "暱稱(_N)："
+
+#~ msgid "<b>Location</b>, "
+#~ msgstr "<b>位置<b>，"
+
+#~ msgid "Send and receive messages"
+#~ msgstr "傳送與接收訊息"
+
+#~ msgid "Failed to reconnect this chat"
+#~ msgstr "無法重連這個聊天會議"
+
+#~ msgid "Failed to join chat room"
+#~ msgstr "加入聊天室失敗"
+
+#~ msgid "Select a destination"
+#~ msgstr "選取目的地"
+
+#~ msgid "Important Room"
+#~ msgstr "重要聊天室"
+
+#~ msgid "MC 4 accounts have been imported"
+#~ msgstr "MC 4 帳號已經匯入"
+
+#~ msgid "MC 4 accounts have been imported."
+#~ msgstr "MC 4 帳號已經匯入。"
+
+#~ msgid "%s account"
+#~ msgstr "%s 帳號"
+
+#~ 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 帳號"
+
+#~ msgid "Whether the Salut account has been created on the first Empathy run."
+#~ msgstr "是否在 Empathy 第一次執行時建立 Salut 帳號。"
+
+#~ msgid ""
+#~ "Try to import any recognized accounts and display an assistant if that "
+#~ "fails"
+#~ msgstr "嘗試匯入任何認識的帳號，若失敗時則顯示協助"
+
+#~ msgid "Show the accounts dialog"
+#~ msgstr "顯示帳號對話盒"
+
+#~ msgid "The error message was: <span style=\"italic\">%s</span>"
+#~ msgstr "錯誤訊息為： <span style=\"italic\">%s</span>"
 
-#~ msgid "Avatars are user chosen images shown in the contact list"
-#~ msgstr "在連線人清單中顯示使用者選擇的大頭貼"
+#~ msgid "Hidden"
+#~ msgstr "隱藏"
 
-#~ msgid "Show _avatars"
-#~ msgstr "é¡¯ç¤ºå¤§é ­è²¼(_A)"
+#~ msgid "User requested disconnect"
+#~ msgstr "é\80£æ\8e¥ä¸\8dä¸\8aè¦\81æ±\82ç\9a\84使ç\94¨è\80\85"
 
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "顯示精簡連絡人清單(_M)"
+#~ msgid "<b>Location</b>"
+#~ msgstr "<b>位置</b>"