Updated Traditional Chinese translation(Hong Kong and Taiwan)

2 files changed, 216 insertions, 216 deletions

diff --git a/po/zh_HK.po b/po/zh_HK.po
index 95b52b1f7..9c89aef8f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.27.92\n"
+"Project-Id-Version: empathy 2.28.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-29 16:24+0800\n"
-"PO-Revision-Date: 2009-08-29 16:24+0800\n"
+"POT-Creation-Date: 2009-09-13 19:38+0800\n"
+"PO-Revision-Date: 2009-09-13 19:39+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -410,7 +410,7 @@ msgid ""
 "sort the contact list by state."
 msgstr "排序聯絡人清單時要使用哪個條件。預設值是使用聯絡人的名稱「name」數值來排序。而數值「state」則會使用其狀態來排序聯絡人清單。"
 
-#: ../libempathy/empathy-account.c:1144
+#: ../libempathy/empathy-account.c:1158
 msgid "Can't set an empty display name"
 msgstr "不能設定空白的顯示名稱"
 
@@ -486,15 +486,15 @@ msgstr "隱藏"
 msgid "Offline"
 msgstr "離線"
 
-#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
 msgstr "臨近人員"
 
-#: ../libempathy/empathy-utils.c:384
+#: ../libempathy/empathy-utils.c:385
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:386
 msgid "Facebook Chat"
 msgstr "Facebook 聊天"
 
@@ -542,13 +542,13 @@ msgstr "未來"
 msgid "All"
 msgstr "全部"
 
-#: ../libempathy-gtk/empathy-account-widget.c:440
-#: ../libempathy-gtk/empathy-account-widget.c:496
+#: ../libempathy-gtk/empathy-account-widget.c:430
+#: ../libempathy-gtk/empathy-account-widget.c:486
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1239
+#: ../libempathy-gtk/empathy-account-widget.c:1264
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -560,7 +560,7 @@ msgstr "<span size=\"small\"><b>範例：</b> 我的螢幕名稱</span>"
 #: ../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: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
@@ -571,7 +571,7 @@ msgstr "進階"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
@@ -593,7 +593,7 @@ msgstr "你的 AIM 螢幕名稱是？"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
@@ -602,7 +602,7 @@ msgstr "連接埠(_P):"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -615,7 +615,7 @@ msgid "<span size=\"small\"><b>Example:</b> username</span>"
 msgstr "<span size=\"small\"><b>範例：</b> 使用者名稱</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "登入 I_D:"
@@ -686,46 +686,58 @@ msgid "Servers"
 msgstr "伺服器"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
+msgstr "<span size=\"small\"><b>範例：</b> user@gmail.com</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
 msgstr "<span size=\"small\"><b>範例：</b> user@jabber.org</span>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Override server settings"
 msgstr "覆蓋伺服器設定值"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Pri_ority:"
 msgstr "優先權(_O):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "Reso_urce:"
 msgstr "資源(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "Use old SS_L"
 msgstr "使用舊的 SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google ID?"
+msgstr "你的 Google ID 是？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your Google password?"
+msgstr "你的 Google 密碼是？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "What is your Jabber ID?"
 msgstr "你的 Jabber ID 是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "What is your Jabber password?"
 msgstr "你的 Jabber 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid "What is your desired Jabber ID?"
 msgstr "你想要的 Jabber ID 是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "What is your desired Jabber password?"
 msgstr "你想要的 Jabber 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "_Encryption required (TLS/SSL)"
 msgstr "要求加密[TLS/SSL](_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "_Ignore SSL certificate errors"
 msgstr "忽略 SSL 證書錯誤(_I)"
 
@@ -903,7 +915,7 @@ msgstr "插入表情符號"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1484
+#: ../libempathy-gtk/empathy-ui-utils.c:1494
 msgid "_Send"
 msgstr "傳送(_S)"
 
@@ -1465,15 +1477,15 @@ msgstr "清除"
 msgid "Blue"
 msgstr "藍色"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1386
+#: ../libempathy-gtk/empathy-ui-utils.c:1396
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1476
+#: ../libempathy-gtk/empathy-ui-utils.c:1486
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1536
+#: ../libempathy-gtk/empathy-ui-utils.c:1546
 msgid "Select a destination"
 msgstr "選取目的地"
 
@@ -1696,19 +1708,19 @@ msgstr "上線狀態"
 msgid "Set your own presence"
 msgstr "設定你自己的上線狀態"
 
-#: ../src/empathy.c:588
+#: ../src/empathy.c:742
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
-#: ../src/empathy.c:592
+#: ../src/empathy.c:746
 msgid "Don't show the contact list on startup"
 msgstr "啟動時不顯示聯絡人清單"
 
-#: ../src/empathy.c:596
+#: ../src/empathy.c:750
 msgid "Show the accounts dialog"
 msgstr "顯示帳號對話盒"
 
-#: ../src/empathy.c:608
+#: ../src/empathy.c:762
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM 客戶端程式"
 
@@ -1787,37 +1799,37 @@ msgstr "發生錯誤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:320
-#: ../src/empathy-accounts-dialog.c:1172
+#: ../src/empathy-account-assistant.c:321
+#: ../src/empathy-accounts-dialog.c:1400
 #, c-format
 msgid "New %s account"
 msgstr "新增 %s 帳號"
 
-#: ../src/empathy-account-assistant.c:386
+#: ../src/empathy-account-assistant.c:393
 msgid "What kind of chat account do you have?"
 msgstr "你的聊天帳號是哪一種？"
 
-#: ../src/empathy-account-assistant.c:392
+#: ../src/empathy-account-assistant.c:399
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "你還想要設定其他的聊天帳號嗎？"
 
-#: ../src/empathy-account-assistant.c:398
+#: ../src/empathy-account-assistant.c:405
 msgid "Enter your account details"
 msgstr "請輸入你的帳號詳細資料"
 
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:410
 msgid "What kind of chat account do you want to create?"
 msgstr "你想要建立何種聊天帳號？"
 
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:416
 msgid "Do you want to create other chat accounts?"
 msgstr "是否想要建立其他聊天帳號？"
 
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:423
 msgid "Enter the details for the new account"
 msgstr "請輸入新帳號的詳細資料"
 
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:509
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -1825,65 +1837,85 @@ msgid ""
 "calls."
 msgstr "使用 Empathy 可以在網上跟鄰近的人員聊天，或是和使用 Google Talk、AIM、Windows Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網絡攝影機還可以進行語音或視像通話。"
 
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:526
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "你是否有使用其他聊天程式的帳號？"
 
-#: ../src/empathy-account-assistant.c:542
+#: ../src/empathy-account-assistant.c:549
 msgid "Yes, import my account details from "
 msgstr "是的，請匯入我的帳號詳細資料於"
 
-#: ../src/empathy-account-assistant.c:563
+#: ../src/empathy-account-assistant.c:570
 msgid "Yes, I'll enter my account details now"
 msgstr "是的，我現在要輸入帳號的詳細資料"
 
-#: ../src/empathy-account-assistant.c:585
+#: ../src/empathy-account-assistant.c:592
 msgid "No, I want a new account"
 msgstr "不，我想要新的帳號"
 
-#: ../src/empathy-account-assistant.c:595
+#: ../src/empathy-account-assistant.c:602
 msgid "No, I just want to see people online nearby for now"
 msgstr "不，我現在只想看看附近有誰上線"
 
-#: ../src/empathy-account-assistant.c:616
+#: ../src/empathy-account-assistant.c:623
 msgid "Select the accounts you want to import:"
 msgstr "選擇要匯入的帳號："
 
-#: ../src/empathy-account-assistant.c:703
+#: ../src/empathy-account-assistant.c:710
 #: ../src/empathy-new-chatroom-dialog.c:496
 #: ../src/empathy-new-chatroom-dialog.c:497
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-account-assistant.c:710
+#: ../src/empathy-account-assistant.c:717
 msgid "No, that's all for now"
 msgstr "不，目前就這樣"
 
-#: ../src/empathy-account-assistant.c:903
+#: ../src/empathy-account-assistant.c:910
 msgid "Welcome to Empathy"
 msgstr "歡迎使用 Empathy"
 
-#: ../src/empathy-account-assistant.c:912
+#: ../src/empathy-account-assistant.c:919
 msgid "Import your existing accounts"
 msgstr "匯入現有的帳號"
 
-#: ../src/empathy-accounts-dialog.c:206
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:63
 #, c-format
-msgid "%s on %s"
-msgstr "%s 於 %s"
+msgid "There are unsaved modification regarding your %s account."
+msgstr "還有與你的 %s 帳號相關的修改尚未儲存。"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../src/empathy-accounts-dialog.c:236
+#, 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"
-#: ../src/empathy-accounts-dialog.c:217
+#: ../src/empathy-accounts-dialog.c:248
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../src/empathy-accounts-dialog.c:221
+#: ../src/empathy-accounts-dialog.c:252
 msgid "New account"
 msgstr "新增帳號"
 
-#: ../src/empathy-accounts-dialog.c:649
+#: ../src/empathy-accounts-dialog.c:502
+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:787
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1892,7 +1924,7 @@ msgstr ""
 "你即將移除你的 %s 帳號！\n"
 "確定要繼續？"
 
-#: ../src/empathy-accounts-dialog.c:655
+#: ../src/empathy-accounts-dialog.c:792
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1904,6 +1936,22 @@ msgstr ""
 "\n"
 "當你往後決定要將該帳號重新加入時，上述資源將仍然可以取用。"
 
+#: ../src/empathy-accounts-dialog.c:980
+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:1475
+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 "Accounts"
 msgstr "帳號"
@@ -1991,7 +2039,7 @@ msgid "Call"
 msgstr "通話"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1390
+#: ../src/empathy-call-window.c:1437
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
@@ -2791,51 +2839,3 @@ msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
-
-#~ msgid "gtk-add"
-#~ msgstr "gtk-add"
-
-#~ msgid "gtk-remove"
-#~ msgstr "gtk-remove"
-
-#~ msgid "Add Account"
-#~ msgstr "加入帳號"
-
-#~ msgid "Gmail"
-#~ msgstr "Gmail"
-
-#~ msgid "Import Accounts..."
-#~ msgstr "匯入帳號..."
-
-#~ msgid "Settings"
-#~ msgstr "設定值"
-
-#~ msgid "Type:"
-#~ msgstr "類型:"
-
-#~ msgid "gtk-leave-fullscreen"
-#~ msgstr "gtk-leave-fullscreen"
-
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Empathy 即時通訊程式"
-
-#~ msgid "Send and receive instant messages"
-#~ msgstr "傳送與接收即時訊息"
-
-#~ msgid "- Empathy Instant Messenger"
-#~ msgstr "- Empathy 即時通訊程式"
-
-#~ msgid "Avatars are user chosen images shown in the contact list"
-#~ msgstr "在連線人清單中顯示使用者選擇的大頭貼"
-
-#~ msgid "Show _avatars"
-#~ msgstr "顯示大頭貼(_A)"
-
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "顯示精簡連絡人清單(_M)"
-
-#~ msgid "Sort by _name"
-#~ msgstr "依名稱排序(_N)"
-
-#~ msgid "Sort by s_tate"
-#~ msgstr "依狀態排序(_T)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8eed78508..f2523046d 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,10 +6,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: empathy 2.27.92\n"
+"Project-Id-Version: empathy 2.28.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-29 16:24+0800\n"
-"PO-Revision-Date: 2009-08-29 08:49+0800\n"
+"POT-Creation-Date: 2009-09-13 19:38+0800\n"
+"PO-Revision-Date: 2009-09-13 07:50+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"
 "MIME-Version: 1.0\n"
@@ -412,7 +412,7 @@ msgstr ""
 "排序連絡人清單時要使用哪個條件。預設值是使用連絡人的名稱「name」數值來排序。"
 "而數值「state」則會使用其狀態來排序連絡人清單。"
 
-#: ../libempathy/empathy-account.c:1144
+#: ../libempathy/empathy-account.c:1158
 msgid "Can't set an empty display name"
 msgstr "不能設定空白的顯示名稱"
 
@@ -488,15 +488,15 @@ msgstr "隱藏"
 msgid "Offline"
 msgstr "離線"
 
-#: ../libempathy/empathy-utils.c:379 ../src/empathy-import-mc4-accounts.c:104
+#: ../libempathy/empathy-utils.c:380 ../src/empathy-import-mc4-accounts.c:104
 msgid "People Nearby"
 msgstr "臨近人員"
 
-#: ../libempathy/empathy-utils.c:384
+#: ../libempathy/empathy-utils.c:385
 msgid "Yahoo! Japan"
 msgstr "Yahoo! 日本"
 
-#: ../libempathy/empathy-utils.c:385
+#: ../libempathy/empathy-utils.c:386
 msgid "Facebook Chat"
 msgstr "Facebook 聊天"
 
@@ -544,13 +544,13 @@ msgstr "未來"
 msgid "All"
 msgstr "全部"
 
-#: ../libempathy-gtk/empathy-account-widget.c:440
-#: ../libempathy-gtk/empathy-account-widget.c:496
+#: ../libempathy-gtk/empathy-account-widget.c:430
+#: ../libempathy-gtk/empathy-account-widget.c:486
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../libempathy-gtk/empathy-account-widget.c:1239
+#: ../libempathy-gtk/empathy-account-widget.c:1264
 msgid "Enabled"
 msgstr "已啟用"
 
@@ -562,7 +562,7 @@ msgstr "<span size=\"small\"><b>範例：</b> 我的螢幕名稱</span>"
 #: ../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: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
@@ -573,7 +573,7 @@ msgstr "進階"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:3
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:4
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-sip.ui.h:5
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:3
@@ -595,7 +595,7 @@ msgstr "您的 AIM 螢幕名稱是？"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:8
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:18
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:7
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:10
 msgid "_Port:"
@@ -604,7 +604,7 @@ msgstr "連接埠(_P):"
 #: ../libempathy-gtk/empathy-account-widget-aim.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-icq.ui.h:9
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:19
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:8
 #: ../libempathy-gtk/empathy-account-widget-yahoo.ui.h:12
 #: ../src/empathy-new-chatroom-dialog.ui.h:9
@@ -617,7 +617,7 @@ msgid "<span size=\"small\"><b>Example:</b> username</span>"
 msgstr "<span size=\"small\"><b>範例：</b> 使用者名稱</span>"
 
 #: ../libempathy-gtk/empathy-account-widget-groupwise.ui.h:3
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:3
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
 #: ../libempathy-gtk/empathy-account-widget-msn.ui.h:3
 msgid "Login I_D:"
 msgstr "登入 I_D:"
@@ -688,46 +688,58 @@ msgid "Servers"
 msgstr "伺服器"
 
 #: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:1
+msgid "<span size=\"small\"><b>Example:</b> user@gmail.com</span>"
+msgstr "<span size=\"small\"><b>範例：</b> user@gmail.com</span>"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:2
 msgid "<span size=\"small\"><b>Example:</b> user@jabber.org</span>"
 msgstr "<span size=\"small\"><b>範例：</b> user@jabber.org</span>"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:4
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:5
 msgid "Override server settings"
 msgstr "覆蓋伺服器設定值"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:6
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
 msgid "Pri_ority:"
 msgstr "優先權(_O):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:7
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
 msgid "Reso_urce:"
 msgstr "資源(_U):"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:8
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
 msgid "Use old SS_L"
 msgstr "使用舊的 SS_L"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:9
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+msgid "What is your Google ID?"
+msgstr "您的 Google ID 是？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+msgid "What is your Google password?"
+msgstr "您的 Google 密碼是？"
+
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
 msgid "What is your Jabber ID?"
 msgstr "您的 Jabber ID 是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:10
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
 msgid "What is your Jabber password?"
 msgstr "您的 Jabber 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:11
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
 msgid "What is your desired Jabber ID?"
 msgstr "您想要的 Jabber ID 是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:12
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:15
 msgid "What is your desired Jabber password?"
 msgstr "您想要的 Jabber 密碼是？"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:13
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:16
 msgid "_Encryption required (TLS/SSL)"
 msgstr "要求加密[TLS/SSL](_E)"
 
-#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:14
+#: ../libempathy-gtk/empathy-account-widget-jabber.ui.h:17
 msgid "_Ignore SSL certificate errors"
 msgstr "忽略 SSL 憑證錯誤(_I)"
 
@@ -905,7 +917,7 @@ msgstr "插入表情符號"
 
 #. send button
 #: ../libempathy-gtk/empathy-chat.c:1028
-#: ../libempathy-gtk/empathy-ui-utils.c:1484
+#: ../libempathy-gtk/empathy-ui-utils.c:1494
 msgid "_Send"
 msgstr "傳送(_S)"
 
@@ -1468,15 +1480,15 @@ msgstr "清除"
 msgid "Blue"
 msgstr "藍色"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1386
+#: ../libempathy-gtk/empathy-ui-utils.c:1396
 msgid "Unable to open URI"
 msgstr "無法開啓 URI"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1476
+#: ../libempathy-gtk/empathy-ui-utils.c:1486
 msgid "Select a file"
 msgstr "選擇一個檔案"
 
-#: ../libempathy-gtk/empathy-ui-utils.c:1536
+#: ../libempathy-gtk/empathy-ui-utils.c:1546
 msgid "Select a destination"
 msgstr "選取目的地"
 
@@ -1699,19 +1711,19 @@ msgstr "上線狀態"
 msgid "Set your own presence"
 msgstr "設定您自己的上線狀態"
 
-#: ../src/empathy.c:588
+#: ../src/empathy.c:742
 msgid "Don't connect on startup"
 msgstr "啟動時不要自動連線"
 
-#: ../src/empathy.c:592
+#: ../src/empathy.c:746
 msgid "Don't show the contact list on startup"
 msgstr "啟動時不顯示連絡人清單"
 
-#: ../src/empathy.c:596
+#: ../src/empathy.c:750
 msgid "Show the accounts dialog"
 msgstr "顯示帳號對話盒"
 
-#: ../src/empathy.c:608
+#: ../src/empathy.c:762
 msgid "- Empathy IM Client"
 msgstr "- Empathy IM 客戶端程式"
 
@@ -1800,37 +1812,37 @@ msgstr "發生錯誤"
 #. To translator: %s is the name of the protocol, such as "Google Talk" or
 #. * "Yahoo!"
 #.
-#: ../src/empathy-account-assistant.c:320
-#: ../src/empathy-accounts-dialog.c:1172
+#: ../src/empathy-account-assistant.c:321
+#: ../src/empathy-accounts-dialog.c:1400
 #, c-format
 msgid "New %s account"
 msgstr "新增 %s 帳號"
 
-#: ../src/empathy-account-assistant.c:386
+#: ../src/empathy-account-assistant.c:393
 msgid "What kind of chat account do you have?"
 msgstr "您的聊天帳號是哪一種？"
 
-#: ../src/empathy-account-assistant.c:392
+#: ../src/empathy-account-assistant.c:399
 msgid "Do you have any other chat accounts you want to set up?"
 msgstr "您還想要設定其他的聊天帳號嗎？"
 
-#: ../src/empathy-account-assistant.c:398
+#: ../src/empathy-account-assistant.c:405
 msgid "Enter your account details"
 msgstr "請輸入您的帳號詳細資料"
 
-#: ../src/empathy-account-assistant.c:403
+#: ../src/empathy-account-assistant.c:410
 msgid "What kind of chat account do you want to create?"
 msgstr "您想要建立何種聊天帳號？"
 
-#: ../src/empathy-account-assistant.c:409
+#: ../src/empathy-account-assistant.c:416
 msgid "Do you want to create other chat accounts?"
 msgstr "是否想要建立其他聊天帳號？"
 
-#: ../src/empathy-account-assistant.c:416
+#: ../src/empathy-account-assistant.c:423
 msgid "Enter the details for the new account"
 msgstr "請輸入新帳號的詳細資料"
 
-#: ../src/empathy-account-assistant.c:502
+#: ../src/empathy-account-assistant.c:509
 msgid ""
 "With Empathy you can chat with people online nearby and with friends and "
 "colleagues who use Google Talk, AIM, Windows Live and many other chat "
@@ -1841,65 +1853,85 @@ msgstr ""
 "Windows Live 等其他聊天程式的朋友和同事聊天。利用麥克風或網路攝影機還可以進行"
 "語音或視訊通話。"
 
-#: ../src/empathy-account-assistant.c:519
+#: ../src/empathy-account-assistant.c:526
 msgid "Do you have an account you've been using with another chat program?"
 msgstr "您是否有使用其他聊天程式的帳號？"
 
-#: ../src/empathy-account-assistant.c:542
+#: ../src/empathy-account-assistant.c:549
 msgid "Yes, import my account details from "
 msgstr "是的，請匯入我的帳號詳細資料於"
 
-#: ../src/empathy-account-assistant.c:563
+#: ../src/empathy-account-assistant.c:570
 msgid "Yes, I'll enter my account details now"
 msgstr "是的，我現在要輸入帳號的詳細資料"
 
-#: ../src/empathy-account-assistant.c:585
+#: ../src/empathy-account-assistant.c:592
 msgid "No, I want a new account"
 msgstr "不，我想要新的帳號"
 
-#: ../src/empathy-account-assistant.c:595
+#: ../src/empathy-account-assistant.c:602
 msgid "No, I just want to see people online nearby for now"
 msgstr "不，我現在只想看看附近有誰上線"
 
-#: ../src/empathy-account-assistant.c:616
+#: ../src/empathy-account-assistant.c:623
 msgid "Select the accounts you want to import:"
 msgstr "選擇要匯入的帳號："
 
-#: ../src/empathy-account-assistant.c:703
+#: ../src/empathy-account-assistant.c:710
 #: ../src/empathy-new-chatroom-dialog.c:496
 #: ../src/empathy-new-chatroom-dialog.c:497
 msgid "Yes"
 msgstr "是"
 
-#: ../src/empathy-account-assistant.c:710
+#: ../src/empathy-account-assistant.c:717
 msgid "No, that's all for now"
 msgstr "不，目前就這樣"
 
-#: ../src/empathy-account-assistant.c:903
+#: ../src/empathy-account-assistant.c:910
 msgid "Welcome to Empathy"
 msgstr "歡迎使用 Empathy"
 
-#: ../src/empathy-account-assistant.c:912
+#: ../src/empathy-account-assistant.c:919
 msgid "Import your existing accounts"
 msgstr "匯入現有的帳號"
 
-#: ../src/empathy-accounts-dialog.c:206
+#. The primary text of the dialog shown to the user when he is about to lose
+#. * unsaved changes
+#: ../src/empathy-accounts-dialog.c:63
 #, c-format
-msgid "%s on %s"
-msgstr "%s 於 %s"
+msgid "There are unsaved modification regarding your %s account."
+msgstr "還有與您的 %s 帳號相關的修改尚未儲存。"
+
+#. To translators: The first parameter is the login id and the
+#. * second one is the server. The resulting string will be something
+#. * like: "MyUserName on chat.freenode.net".
+#. * You should reverse the order of these arguments if the
+#. * server should come before the login id in your locale.
+#: ../src/empathy-accounts-dialog.c:236
+#, 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"
-#: ../src/empathy-accounts-dialog.c:217
+#: ../src/empathy-accounts-dialog.c:248
 #, c-format
 msgid "%s Account"
 msgstr "%s 帳號"
 
-#: ../src/empathy-accounts-dialog.c:221
+#: ../src/empathy-accounts-dialog.c:252
 msgid "New account"
 msgstr "新增帳號"
 
-#: ../src/empathy-accounts-dialog.c:649
+#: ../src/empathy-accounts-dialog.c:502
+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:787
 #, c-format
 msgid ""
 "You are about to remove your %s account!\n"
@@ -1908,7 +1940,7 @@ msgstr ""
 "您即將移除您的 %s 帳號！\n"
 "確定要繼續？"
 
-#: ../src/empathy-accounts-dialog.c:655
+#: ../src/empathy-accounts-dialog.c:792
 msgid ""
 "Any associated conversations and chat rooms will NOT be removed if you "
 "decide to proceed.\n"
@@ -1920,6 +1952,22 @@ msgstr ""
 "\n"
 "當您往後決定要將該帳號重新加入時，上述資源將仍然可以取用。"
 
+#: ../src/empathy-accounts-dialog.c:980
+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:1475
+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 "Accounts"
 msgstr "帳號"
@@ -2007,7 +2055,7 @@ msgid "Call"
 msgstr "通話"
 
 #. Translators: number of minutes:seconds the caller has been connected
-#: ../src/empathy-call-window.c:1390
+#: ../src/empathy-call-window.c:1437
 #, c-format
 msgid "Connected — %d:%02dm"
 msgstr "已連線 — %d:%02dm"
@@ -2811,51 +2859,3 @@ msgid ""
 "The selected connection manager does not support the remote debugging "
 "extension."
 msgstr "選取的連線管理程式不支援遠端偵錯擴充功能。"
-
-#~ msgid "gtk-add"
-#~ msgstr "gtk-add"
-
-#~ msgid "gtk-remove"
-#~ msgstr "gtk-remove"
-
-#~ msgid "Add Account"
-#~ msgstr "加入帳號"
-
-#~ msgid "Gmail"
-#~ msgstr "Gmail"
-
-#~ msgid "Import Accounts..."
-#~ msgstr "匯入帳號..."
-
-#~ msgid "Settings"
-#~ msgstr "設定值"
-
-#~ msgid "Type:"
-#~ msgstr "類型:"
-
-#~ msgid "gtk-leave-fullscreen"
-#~ msgstr "gtk-leave-fullscreen"
-
-#~ msgid "Empathy Instant Messenger"
-#~ msgstr "Empathy 即時通訊程式"
-
-#~ msgid "Send and receive instant messages"
-#~ msgstr "傳送與接收即時訊息"
-
-#~ msgid "- Empathy Instant Messenger"
-#~ msgstr "- Empathy 即時通訊程式"
-
-#~ msgid "Avatars are user chosen images shown in the contact list"
-#~ msgstr "在連線人清單中顯示使用者選擇的大頭貼"
-
-#~ msgid "Show _avatars"
-#~ msgstr "顯示大頭貼(_A)"
-
-#~ msgid "Show co_mpact contact list"
-#~ msgstr "顯示精簡連絡人清單(_M)"
-
-#~ msgid "Sort by _name"
-#~ msgstr "依名稱排序(_N)"
-
-#~ msgid "Sort by s_tate"
-#~ msgstr "依狀態排序(_T)"