update po files

author: Yann Leboulanger <asterix@lagaule.org> 2017-01-14 17:02:54 +0300
committer: Yann Leboulanger <asterix@lagaule.org> 2017-01-14 17:02:54 +0300
commit: b4678cec5bc7245543867ffd6a0668e777490ebb (patch)
tree: f2a090d61c9dba0bf8a4d5c596c0e7da5cf5dd61 /po/zh_TW.po
parent: bfd9c5a96bc431dff23d9ae76cc508eda39ee3ba (diff)
1 files changed, 4796 insertions, 3726 deletions
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9a60f2484..28520b19e 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.15a1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-08 08:26+0200\n"
+"POT-Creation-Date: 2017-01-10 03:06+0000\n"
 "PO-Revision-Date: 2011-09-07 23:11+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -20,301 +20,293 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
-msgid "Join _Group Chat..."
-msgstr "加入聊天室(_G)…"
+#: ../data/gui/account_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "狀態(_S)"
 
 #: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "個人事件"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
+msgid "_Start Chat..."
+msgstr "開始聊天(_S)…"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/chat_context_menu.ui.h:6
+#: ../data/gui/roster_window.ui.h:5 ../data/gui/systray_context_menu.ui.h:3
+msgid "Join _Group Chat"
+msgstr "加入聊天室(_G)"
+
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "加入聯絡人(_A)…"
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "探索服務(_D)"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "執行命令(_E)…"
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "修改帳號資訊(_M)"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "開啟 Gmail 收件匣(_O)"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "個人事件"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "開始聊天(_S)…"
-
 #: ../data/gui/account_context_menu.ui.h:9
 #: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "狀態(_S)"
+msgid "_Modify Account..."
+msgstr "修改帳號(_M)…"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:3
+#: ../src/config.py:1247 ../src/config.py:1262 ../src/config.py:1267
+#: ../src/config.py:1315 ../src/config.py:1425 ../src/config.py:1755
+#: ../src/config.py:1760 ../src/config.py:2369 ../src/config.py:2451
+#: ../src/config.py:2466 ../src/config.py:3758 ../src/config.py:3835
+#: ../src/dialogs.py:327 ../src/dialogs.py:329 ../src/dialogs.py:537
+#: ../src/dialogs.py:550 ../src/roster_window.py:3086
+#: ../src/roster_window.py:3092 ../src/roster_window.py:3097
+msgid "None"
+msgstr "無"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: 帳號建立精靈"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:3
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>正在連線伺服器</b>\n"
-"\n"
-"請等待…"
+"您必須擁有一個帳號以連線\n"
+"Jabber 網路"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I already have an account I want to _use"
+msgstr "我已經有想要使用的帳號了(_U)"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:6
+msgid "I want to _register for a new account"
+msgstr "我想註冊一個新帳號(_R)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>請選擇一個選項</b>:"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>請填寫您現有帳號的資訊</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>請選擇一個伺服器</b>"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"將這個證書加入到可信任證書清單。\n"
-"這個證書的 SHA1 指紋資訊: \n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "匿名認證(_Y)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "當我點擊\"結束\"時連線"
+#: ../data/gui/accounts_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "_Password:"
+msgstr "密碼(_P):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: 帳號建立精靈"
+#: ../data/gui/accounts_window.ui.h:16
+msgid "Save pass_word"
+msgstr "儲存密碼(_W)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "我已經有想要使用的帳號了(_U)"
+#: ../data/gui/accounts_window.ui.h:17
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "如果選取，Gajim 會記錄本帳號的密碼"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "我想註冊一個新帳號(_R)"
+msgid "<b>Please select a server</b>"
+msgstr "<b>請選擇一個伺服器</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-#: ../data/gui/accounts_window.ui.h:28
-msgid "If checked, Gajim will remember the password for this account"
-msgstr "如果選取，Gajim 會記錄本帳號的密碼"
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Server:"
+msgstr "伺服器(_S):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
-msgid "Manage..."
-msgstr "管理…"
+msgid "Prox_y:"
+msgstr "代理伺服器(_Y):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py:1289 ../src/config.py:1392 ../src/config.py:1703
-#: ../src/config.py:1708 ../src/config.py:2284 ../src/config.py:2363
-#: ../src/config.py:2376 ../src/config.py:3655 ../src/config.py:3730
-#: ../src/dialogs.py:311 ../src/dialogs.py:313 ../src/dialogs.py:519
-#: ../src/dialogs.py:532 ../src/roster_window.py:3092
-#: ../src/roster_window.py:3098 ../src/roster_window.py:3103
-msgid "None"
-msgstr "無"
+msgid "Manage..."
+msgstr "管理…"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "代理伺服器(_Y):"
+msgid "Use custom hostname/port"
+msgstr "使用自訂的主機名稱/連接埠"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "儲存密碼(_W)"
+msgid "_Hostname:"
+msgstr "主機名稱(_H):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "連線後設定我的側寫"
+msgid "_Port:"
+msgstr "連接埠(_P):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "使用自訂的主機名稱/連接埠"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "進階(_A)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"您必須擁有一個帳號以連線\n"
-"Jabber 網路"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:17
-msgid "_Advanced"
-msgstr "進階(_A)"
+"將這個證書加入到可信任證書清單。\n"
+"這個證書的 SHA1 指紋資訊: \n"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "完成(_F)"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "主機名稱(_H):"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:61
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>正在連線伺服器</b>\n"
+"\n"
+"請等待…"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:63
-#: ../data/gui/manage_bookmarks_window.ui.h:8
-msgid "_Password:"
-msgstr "密碼(_P):"
+msgid "Connect when I press Finish"
+msgstr "當我點擊\"結束\"時連線"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "連接埠(_P):"
+msgid "Set my profile when I connect"
+msgstr "連線後設定我的側寫"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-#: ../data/gui/manage_bookmarks_window.ui.h:9
-msgid "_Server:"
-msgstr "伺服器(_S):"
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>雜項</b>"
+msgid "_Finish"
+msgstr "完成(_F)"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "帳號"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>個人資訊</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3568
+#: ../src/dialogs.py:3614
+msgid "Add"
+msgstr "加入"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>代理伺服器</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3572
+#: ../src/dialogs.py:3669
+msgid "Delete"
+msgstr "刪除"
 
 #: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "依據狀態調整(_A)"
-
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "帳號"
-
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "帳號"
+msgid "Re_name"
+msgstr "重新命名(_N)"
 
-#: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "管理作業"
+#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4210
+#: ../src/plugins/gui.py:92
+msgid "Active"
+msgstr "活動"
 
 #: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "匿名認證"
+msgid "Resour_ce:"
+msgstr "資源(_C):"
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "連線中斷後自動重連"
+msgid "Priori_ty:"
+msgstr "優先等級(_T):"
 
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Browse..."
-msgstr "瀏覽…"
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"資源被傳送給伺服器以將用不同客戶端登入的同一帳號區分為兩個或更多部分(取\n"
+"決於登入的客戶端的數目)。比如，您可以利用\"家庭\"和\"工作\"兩個資源同時\n"
+"連線到伺服器。擁有最高優先等級的資源得到伺服器的事件回應。(請看下面)"
 
-#: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Gajim 啟動時連線(_O)"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:12 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1119
+#: ../src/common/helpers.py:1131 ../src/notify.py:327 ../src/notify.py:350
+#: ../src/notify.py:401 ../src/notify.py:417
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:13
-msgid "Certificate is e_ncrypted"
-msgstr "憑證已加密(_N)"
+msgid "A_djust to status"
+msgstr "依據狀態調整(_A)"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid "Chan_ge Password"
-msgstr "變更密碼(_G)"
+msgid "Priority will change automatically according to your status."
+msgstr "優先等級將根據您的狀態自動轉換。"
 
 #: ../data/gui/accounts_window.ui.h:15
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr "如果選取，Gajim 在透過不安全的網路連線傳送密碼前會詢問您"
-
-#: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "選擇密鑰(_K)…"
-
-#: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "點擊以變更該帳號的密碼"
+msgid "Anonymous authentication"
+msgstr "匿名認證"
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "點擊以請求另一個帳號所有聯絡人的認證"
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"優先等級是當多個客戶端使用同一帳號連線到伺服器時，伺服器決定事件回應對\n"
+"像的依據。優先等級最高的客戶端將得到事件回應"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Client certificate"
-msgstr "客戶端證書"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "同步聯絡人"
 
 #: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Gajim 啟動時連線(_O)"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "點擊以請求另一個帳號所有聯絡人的認證"
 
 #: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "連線"
+msgid "Chan_ge Password"
+msgstr "變更密碼(_G)"
 
 #: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
+msgid "Click to change account's password"
+msgstr "點擊以變更該帳號的密碼"
 
 #: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "名稱:"
+msgid "Administration operations"
+msgstr "管理作業"
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1148 ../src/common/helpers.py:1160
-#: ../src/notify.py:311 ../src/notify.py:334 ../src/notify.py:383
-#: ../src/notify.py:399
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr "客戶端證書檔案(_C)"
 
-#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround.
-#. Maybe we haven't been in any group (defaults to General)
-#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56
-#: ../src/common/contacts.py:132 ../src/dialogs.py:112 ../src/dialogs.py:124
-#: ../src/roster_window.py:3034 ../src/roster_window.py:5652
-msgid "General"
-msgstr "一般"
+#: ../data/gui/accounts_window.ui.h:25
+msgid "Browse..."
+msgstr "瀏覽…"
 
 #: ../data/gui/accounts_window.ui.h:26
-msgid ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working."
-msgstr ""
-"如果選取， Gajim 會廣播更多的 IP位址，這使得檔案傳輸成功的可能性得到提高。"
+msgid "Certificate is e_ncrypted"
+msgstr "憑證已加密(_N)"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "如果選取，Gajim 會從一個 GPG agent (比如 Seahorse)得到密碼"
+msgid "Client certificate"
+msgstr "客戶端證書"
+
+#: ../data/gui/accounts_window.ui.h:28 ../data/gui/join_groupchat_window.ui.h:2
+msgid "Account"
+msgstr "帳號"
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr "如果選取，Gajim 會傳送資料封包防止逾時造成的連線中斷"
+msgid "C_onnect on Gajim startup"
+msgstr "Gajim 啟動時連線(_O)"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -323,6 +315,23 @@ msgid ""
 msgstr "如果選取，Gajim 會在啟動時自動使用本帳號連線 jabber 伺服器"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "連線中斷後自動重連"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "儲存與所有聯絡人的聊天記錄(_L)"
+
+#: ../data/gui/accounts_window.ui.h:33
+#, fuzzy
+msgid "Synchronize logs with server"
+msgstr "同步聯絡人"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Synch_ronize account status with global status"
+msgstr "將帳號狀態與全域狀態同步(_R)"
+
+#: ../data/gui/accounts_window.ui.h:35
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -331,179 +340,229 @@ msgstr ""
 "如果選取，變更全域狀態(在聯絡人清單視窗下方核取方塊中調節)就會相應地變更目前"
 "帳號的狀態"
 
-#: ../data/gui/accounts_window.ui.h:32
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"如果用於接收訊息的預設連接埠不合適，您可以在這裡選擇另外一個。\n"
-"您可能需要變更防火牆設定。"
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-msgstr "伺服器中儲存的關於您的資訊"
-
-#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826
-#: ../src/dialogs.py:837
-msgid "Jabber ID:"
-msgstr "Jabber ID"
-
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "姓:"
+msgid "Receive conversations from other resources (If server supports it)"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "合併帳號(_G)"
+msgid "Use file transfer proxies"
+msgstr "使用檔案傳輸代理伺服器"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799
-#: ../src/config.py:2377
-msgid "No key selected"
-msgstr "沒有選擇密鑰"
+#: ../data/gui/accounts_window.ui.h:38
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"如果選取， Gajim 會廣播更多的 IP位址，這使得檔案傳輸成功的可能性得到提高。"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "個人資訊"
+#. nick choosen by contact
+#. FIXME: Ugly workaround.
+#. FIXME: Ugly workaround.
+#. Maybe we haven't been in any group (defaults to General)
+#. General group cannot be changed
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:42
+#: ../src/common/contacts.py:106 ../src/common/contacts.py:139
+#: ../src/dialogs.py:124 ../src/dialogs.py:136 ../src/roster_window.py:3028
+#: ../src/roster_window.py:4151 ../src/roster_window.py:5764
+msgid "General"
+msgstr "一般"
 
-#: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "優先等級(_T):"
+#: ../data/gui/accounts_window.ui.h:40
+msgid "_use HTTP__PROXY environment variable"
+msgstr "使用 HTTP__PROXY 環境變數(_U)"
+
+#: ../data/gui/accounts_window.ui.h:41 ../data/gui/preferences_window.ui.h:140
+msgid "_Manage..."
+msgstr "管理…"
 
 #: ../data/gui/accounts_window.ui.h:42
-msgid ""
-"Priority is used in Jabber to determine who gets the events from the jabber "
-"server when two or more clients are connected using the same account; The "
-"client with the highest priority gets the events"
-msgstr ""
-"優先等級是當多個客戶端使用同一帳號連線到伺服器時，伺服器決定事件回應對\n"
-"像的依據。優先等級最高的客戶端將得到事件回應"
+msgid "<b>Proxy</b>"
+msgstr "<b>代理伺服器</b>"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "優先等級將根據您的狀態自動轉換。"
+msgid "_Warn before using an insecure connection"
+msgstr "在使用不安全的連線之前警告(_W)"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5602
-msgid "Re_name"
-msgstr "重新命名(_N)"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr "如果選取，Gajim 在透過不安全的網路連線傳送密碼前會詢問您"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "資源(_C):"
+msgid "Send _keep-alive packets"
+msgstr "傳送資料封包以防止連線逾時"
 
 #: ../data/gui/accounts_window.ui.h:46
 msgid ""
-"Resource is sent to the Jabber server in order to separate the same JID in "
-"two or more parts depending on the number of the clients connected in the "
-"same server with the same account. So you might be connected in the same "
-"account with resource 'Home' and 'Work' at the same time. The resource which "
-"has the highest priority will get the events. (see below)"
-msgstr ""
-"資源被傳送給伺服器以將用不同客戶端登入的同一帳號區分為兩個或更多部分(取\n"
-"決於登入的客戶端的數目)。比如，您可以利用\"家庭\"和\"工作\"兩個資源同時\n"
-"連線到伺服器。擁有最高優先等級的資源得到伺服器的事件回應。(請看下面)"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr "如果選取，Gajim 會傳送資料封包防止逾時造成的連線中斷"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "儲存與所有聯絡人的聊天記錄(_L)"
+msgid "Use cust_om hostname/port"
+msgstr "使用自訂主機名稱/連接埠號碼"
+
+#: ../data/gui/accounts_window.ui.h:48
+msgid "_Hostname: "
+msgstr "主機名稱(_H): "
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "傳送資料封包以防止連線逾時"
+msgid "_Port: "
+msgstr "連接埠號碼(_P): "
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "將帳號狀態與全域狀態同步(_R)"
+#: ../data/gui/accounts_window.ui.h:50 ../data/gui/preferences_window.ui.h:143
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>雜項</b>"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "將帳號狀態與全域狀態同步(_Z)"
+msgid "Connection"
+msgstr "連線"
 
-#: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "同步聯絡人"
+#: ../data/gui/accounts_window.ui.h:52 ../src/config.py:1853
+#: ../src/config.py:2467
+msgid "No key selected"
+msgstr "沒有選擇密鑰"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "Use G_PG Agent"
-msgstr "使用 G_PG Agent"
+msgid "Choose _Key..."
+msgstr "選擇密鑰(_K)…"
 
 #: ../data/gui/accounts_window.ui.h:54
-msgid "Use cust_om hostname/port"
-msgstr "使用自訂主機名稱/連接埠號碼"
+msgid "Use G_PG Agent"
+msgstr "使用 G_PG Agent"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om port:"
-msgstr "使用自訂連接埠號碼:"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "如果選取，Gajim 會從一個 GPG agent (比如 Seahorse)得到密碼"
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use file transfer proxies"
-msgstr "使用檔案傳輸代理伺服器"
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "_Client Cert File:"
-msgstr "客戶端證書檔案(_C)"
-
-#: ../data/gui/accounts_window.ui.h:58
 msgid "_Edit Personal Information..."
 msgstr "編輯個人資訊…"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:59 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "啟用(_E)"
+#: ../data/gui/accounts_window.ui.h:58
+msgid "Information about you, as stored in the server"
+msgstr "伺服器中儲存的關於您的資訊"
 
-#: ../data/gui/accounts_window.ui.h:60
-msgid "_Hostname: "
-msgstr "主機名稱(_H): "
+#: ../data/gui/accounts_window.ui.h:59
+msgid "<b>Personal Information</b>"
+msgstr "<b>個人資訊</b>"
+
+#: ../data/gui/accounts_window.ui.h:60 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "個人資訊"
+
+#: ../data/gui/accounts_window.ui.h:61
+msgid "Co_nnect on Gajim startup"
+msgstr "Gajim 啟動時連線(_O)"
 
 #: ../data/gui/accounts_window.ui.h:62
-msgid "_Manage..."
-msgstr "管理…"
+msgid "Synchroni_ze account status with global status"
+msgstr "將帳號狀態與全域狀態同步(_Z)"
 
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Port: "
-msgstr "連接埠號碼(_P): "
+#: ../data/gui/accounts_window.ui.h:63
+msgid "Use cust_om port:"
+msgstr "使用自訂連接埠號碼:"
 
-#: ../data/gui/accounts_window.ui.h:65
-msgid "_Warn before using an insecure connection"
-msgstr "在使用不安全的連線之前警告(_W)"
+#: ../data/gui/accounts_window.ui.h:64
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"如果用於接收訊息的預設連接埠不合適，您可以在這裡選擇另外一個。\n"
+"您可能需要變更防火牆設定。"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_use HTTP__PROXY environment variable"
-msgstr "使用 HTTP__PROXY 環境變數(_U)"
+#: ../data/gui/zeroconf_information_window.ui.h:7
+msgid "First Name:"
+msgstr "名稱:"
 
-#: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "帳號(_C):"
+#: ../data/gui/accounts_window.ui.h:67
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "Last Name:"
+msgstr "姓:"
 
-#: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "允許此聯絡人看到我的狀態(_L)"
+#: ../data/gui/accounts_window.ui.h:68
+#: ../data/gui/archiving_313_preferences_item.ui.h:3
+#: ../data/gui/tooltip_gc_contact.ui.h:1
+#: ../data/gui/tooltip_roster_contact.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:9 ../src/config.py:1880
+#: ../src/dialogs.py:854
+msgid "Jabber ID:"
+msgstr "Jabber ID"
 
-#: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "加入聯絡人"
+#: ../data/gui/accounts_window.ui.h:69
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../data/gui/accounts_window.ui.h:70
+msgid "Mer_ge accounts"
+msgstr "合併帳號(_G)"
 
-#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339
+#: ../data/gui/add_new_contact_window.ui.h:1 ../src/common/helpers.py:1317
 msgid "I would like to add you to my contact list."
 msgstr "我想加入您到我的聯絡人清單"
 
+#: ../data/gui/add_new_contact_window.ui.h:2
+msgid "Add New Contact"
+msgstr "加入聯絡人"
+
+#: ../data/gui/add_new_contact_window.ui.h:3
+msgid "A_ccount:"
+msgstr "帳號(_C):"
+
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_Protocol:"
+msgstr "協定(_P):"
+
 #: ../data/gui/add_new_contact_window.ui.h:5
+msgid "_User ID:"
+msgstr "使用者 ID(_U):"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Nickname:"
+msgstr "暱稱(_N):"
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "_Group:"
+msgstr "群組(_G):"
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "Choose a group of type a new group"
+msgstr ""
+
+#: ../data/gui/add_new_contact_window.ui.h:9
+msgid "A_llow this contact to view my status"
+msgstr "允許此聯絡人看到我的狀態(_L)"
+
+#: ../data/gui/add_new_contact_window.ui.h:10
+msgid "_Save subscription message"
+msgstr "儲存認證訊息(_S)"
+
+#: ../data/gui/add_new_contact_window.ui.h:11
+#, fuzzy
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
-"protocol. Click on register button to\n"
+"protocol. Click on Register button to\n"
 "proceed."
 msgstr ""
 "您必須註冊才能\n"
 "加入此協定的聯絡人。\n"
 "點擊註冊按鈕處理。"
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:15
+msgid "_Register"
+msgstr "註冊(_G):"
+
+#: ../data/gui/add_new_contact_window.ui.h:16
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -511,509 +570,576 @@ msgstr ""
 "您必須連線才能\n"
 "增加此協定的聯絡人。"
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "群組(_G):"
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "_Nickname:"
-msgstr "暱稱(_N):"
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "協定(_P):"
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "註冊(_G):"
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "儲存認證訊息(_S)"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "使用者 ID(_U):"
-
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>發生了一個錯誤:</b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc 命令 - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>選擇要執行的命令</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "請稍等，正在獲取命令清單…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc 命令 - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>選擇要執行的命令</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "請再檢查一遍"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "錯誤描述…"
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "請稍等，正在傳送命令…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "F_inish"
-msgstr "完成(_F)"
+msgid "Please wait..."
+msgstr "請稍等…"
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "請稍等，正在獲取命令清單…"
+msgid "This jabber entity does not expose any commands."
+msgstr "這個 Jabber 節點沒有提供任何命令"
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "請稍等，正在傳送命令…"
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>發生了一個錯誤:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "請稍等…"
-
-#: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "這個 Jabber 節點沒有提供任何命令"
+msgid "F_inish"
+msgstr "完成(_F)"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>描述</b>"
+msgid "Advanced Configuration Editor"
+msgstr "進階設定編輯器"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>注意:</b>您必須重新啟動 gajim 以使某些設定生效"
+msgid "Filter:"
+msgstr "過濾器:"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "進階設定編輯器"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>描述</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "過濾器:"
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>注意:</b>您必須重新啟動 gajim 以使某些設定生效"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "恢復為預設顏色設定(_R)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "刪除 MOTD"
+msgid "Show _XML Console"
+msgstr "顯示 XML 主控臺(_X)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "刪除每日訊息"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit Archi_ving Preferences"
 msgstr "編輯存檔偏好設定(_V)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "編輯隱私策略清單(_P)…"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "管理員(_A)"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "向所有目前連線到這個伺服器的使用者傳送一條訊息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "設定 MOTD…"
+msgid "_Send Server Message..."
+msgstr "傳送伺服器訊息(_S)…"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "設定每日訊息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "顯示 XML 主控臺(_X)"
+msgid "Set MOTD..."
+msgstr "設定 MOTD…"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "更新 MOTD…"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "更新每日訊息"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "更新 MOTD…"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "管理員(_A)"
+msgid "Deletes Message of the Day"
+msgstr "刪除每日訊息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "傳送伺服器訊息(_S)…"
+msgid "Delete MOTD"
+msgstr "刪除 MOTD"
+
+#: ../data/gui/archiving_313_preferences_item.ui.h:1
+#: ../data/gui/archiving_313_preferences_window.ui.h:1
+#: ../data/gui/preferences_window.ui.h:8
+msgid "Always"
+msgstr "總是"
+
+#: ../data/gui/archiving_313_preferences_item.ui.h:2
+#: ../data/gui/archiving_313_preferences_window.ui.h:3
+#: ../data/gui/preferences_window.ui.h:6
+msgid "Never"
+msgstr "永遠不"
+
+#: ../data/gui/archiving_313_preferences_item.ui.h:4
+#, fuzzy
+msgid "Preference:"
+msgstr "參數"
+
+#: ../data/gui/archiving_313_preferences_window.ui.h:2
+#, fuzzy
+msgid "Roster"
+msgstr "顯示聯絡人清單(_R)"
+
+#. holds jid
+#: ../data/gui/archiving_313_preferences_window.ui.h:4 ../src/dialogs.py:3576
+#: ../src/history_manager.py:168
+msgid "Jabber ID"
+msgstr "Jabber ID"
+
+#: ../data/gui/archiving_313_preferences_window.ui.h:5
+#, fuzzy
+msgid "Preference"
+msgstr "參數"
+
+#: ../data/gui/archiving_313_preferences_window.ui.h:6
+#, fuzzy
+msgid "Default:"
+msgstr "預設"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr "<i>Method Auto</i>"
+msgid "No"
+msgstr "No"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
-msgstr "<i>Method Local</i>"
+msgid "Yes"
+msgstr "Yes"
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr "<i>Method Manual</i>"
+msgid "Prefer"
+msgstr "Prefer"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-msgid "Auto"
-msgstr "Auto"
-
-#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Concede"
 msgstr "Concede"
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
+#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
 msgstr "Forbid"
 
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Auto"
+msgstr "Auto"
+
 #: ../data/gui/archiving_preferences_window.ui.h:7
-msgid "No"
-msgstr "No"
+msgid "<i>Method Auto</i>"
+msgstr "<i>Method Auto</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-msgid "Prefer"
-msgstr "Prefer"
+msgid "<i>Method Local</i>"
+msgstr "<i>Method Local</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr "Yes"
+msgid "<i>Method Manual</i>"
+msgstr "<i>Method Manual</i>"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Entry:"
+msgid "New entry received"
+msgstr "New entry received"
+
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:129
+msgid "You have received new entry:"
+msgstr "You have received new entry:"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Feed name:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Entry:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Last modified:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "New entry received"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "被阻斷的聯絡人"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5621
-#: ../src/roster_window.py:5748 ../src/roster_window.py:5881
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:606
+#: ../src/roster_window.py:5742 ../src/roster_window.py:5857
 msgid "_Unblock"
 msgstr "解除阻斷(_U)"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>訊息:</b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "設定活動"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "設定活動"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>訊息:</b>"
 
-#: ../data/gui/change_mood_dialog.ui.h:2
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Mood:</b>"
 msgstr "<b>心情:</b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:2
+msgid "<b>Message:</b>"
+msgstr "<b>訊息:</b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "變更密碼"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "再次輸入以確認:"
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "輸入新的密碼"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "再次輸入以確認:"
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>輸入新的狀態訊息</b>"
+msgid "Save as Preset..."
+msgstr "另存為…"
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
+msgid "Preset messages:"
+msgstr "預設的訊息:"
+
+#: ../data/gui/change_status_message_dialog.ui.h:3
+#: ../data/gui/tooltip_roster_contact.ui.h:7
 msgid "Activity:"
 msgstr "活動:"
 
-#: ../data/gui/change_status_message_dialog.ui.h:3
+#: ../data/gui/change_status_message_dialog.ui.h:4
+#: ../data/gui/tooltip_roster_contact.ui.h:6
 msgid "Mood:"
 msgstr "心情:"
 
-#: ../data/gui/change_status_message_dialog.ui.h:4
-msgid "Preset messages:"
-msgstr "預設的訊息:"
-
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "另存為…"
+msgid "<b>Type your new status message</b>"
+msgstr "<b>輸入新的狀態訊息</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "加入聊天室(_G)"
+msgid "_Copy Link Location"
+msgstr "複製連結位置(_C)"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "加入至聯絡人清單(_A)…"
+msgid "_Open Link in Browser"
+msgstr "在瀏覽器中開啟連結(_O)"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "複製 JID/電子郵件位址(_C)"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "複製連結位置(_C)"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "開啟郵件編輯器(_O)"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "在瀏覽器中開啟連結(_O)"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
 msgid "_Start Chat"
 msgstr "開始聊天(_S)"
 
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "加入至聯絡人清單(_A)…"
+
 #: ../data/gui/chat_control.ui.h:1
-msgid "#"
-msgstr "#"
+#, fuzzy
+msgid "<b>1</b>"
+msgstr "<b>字型</b>"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+#, fuzzy
+msgid "<b>2</b> abc"
+msgstr "<b>字型</b>"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "<b>3</b> def"
+msgstr "<b>字型</b>"
 
 #: ../data/gui/chat_control.ui.h:4
-msgid "1"
-msgstr "1"
+#, fuzzy
+msgid "<b>4</b> ghi"
+msgstr "<b>字型</b>"
 
 #: ../data/gui/chat_control.ui.h:5
-msgid "2"
-msgstr "2"
+#, fuzzy
+msgid "<b>5</b> jkl"
+msgstr "<b>字型</b>"
 
 #: ../data/gui/chat_control.ui.h:6
-msgid "3"
-msgstr "3"
+#, fuzzy
+msgid "<b>6</b> mno"
+msgstr "<b>字型</b>"
 
 #: ../data/gui/chat_control.ui.h:7
-msgid "4"
-msgstr "4"
+msgid "<b>7</b> pqrs"
+msgstr ""
 
 #: ../data/gui/chat_control.ui.h:8
-msgid "5"
-msgstr "5"
+#, fuzzy
+msgid "<b>8</b> tuv"
+msgstr "<b>字型</b>"
 
 #: ../data/gui/chat_control.ui.h:9
-msgid "6"
-msgstr "6"
+msgid "<b>9</b> wxyz"
+msgstr ""
 
 #: ../data/gui/chat_control.ui.h:10
-msgid "7"
-msgstr "7"
+#, fuzzy
+msgid "<b>*</b>"
+msgstr "<b>字型</b>"
 
 #: ../data/gui/chat_control.ui.h:11
-msgid "8"
-msgstr "8"
+#, fuzzy
+msgid "<b>0</b>"
+msgstr "<b>字型</b>"
 
 #: ../data/gui/chat_control.ui.h:12
-msgid "9"
-msgstr "9"
+#, fuzzy
+msgid "<b>#</b>"
+msgstr "<b>字型</b>"
 
-#: ../data/gui/chat_control.ui.h:13
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "向聯絡人清單中加入聯絡人(Ctrl+D)"
+#: ../data/gui/chat_control.ui.h:13 ../data/gui/gajim_themes_window.ui.h:10
+msgid "Bold"
+msgstr "粗體"
 
-#: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "瀏覽聊天記錄(Ctrl+H)"
+#: ../data/gui/chat_control.ui.h:14 ../data/gui/gajim_themes_window.ui.h:11
+msgid "Italic"
+msgstr "斜體"
 
 #: ../data/gui/chat_control.ui.h:15
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "邀請聯絡人參與對話(Ctrl+G)"
+msgid "Underline"
+msgstr "底線"
+
+#: ../data/gui/chat_control.ui.h:16
+msgid "Strike"
+msgstr "劃去"
+
+#: ../data/gui/chat_control.ui.h:17 ../src/advanced_configuration_window.py:99
+msgid "Color"
+msgstr "Color"
 
-#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:18
+msgid "Font"
+msgstr "字型"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Clear formatting"
+msgstr "清楚格式"
+
+#: ../data/gui/chat_control.ui.h:20 ../data/gui/groupchat_control.ui.h:1
 msgid "Show a list of emoticons (Alt+M)"
 msgstr "顯示表情清單(Alt+M)"
 
-#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
-msgid "Show a list of formattings"
-msgstr "顯示格式清單(Alt+M)"
+#: ../data/gui/chat_control.ui.h:21
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "向聯絡人清單中加入聯絡人(Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "顯示進階功能選單(Alt+D)"
+#: ../data/gui/chat_control.ui.h:22
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "邀請聯絡人參與對話(Ctrl+G)"
 
-#: ../data/gui/chat_control.ui.h:19
+#: ../data/gui/chat_control.ui.h:23
+#, fuzzy
+msgid "Show the contact&apos;s profile (Ctrl+I)"
+msgstr "顯示聯絡人的側寫"
+
+#: ../data/gui/chat_control.ui.h:24
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "顯示聯絡人的側寫"
 
-#: ../data/gui/chat_control.ui.h:20
-msgid "Toggle audio session"
-msgstr "切換語音作業階段"
+#: ../data/gui/chat_control.ui.h:25 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "瀏覽聊天記錄(Ctrl+H)"
 
-#: ../data/gui/chat_control.ui.h:21
-msgid "Toggle video session"
-msgstr "切換視訊作業階段"
+#: ../data/gui/chat_control.ui.h:26 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "顯示進階功能選單(Alt+D)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
-#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:275
+#: ../data/gui/chat_control.ui.h:27
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:28 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:321
 msgid "_Send"
 msgstr "傳送(_S)"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr "標籤"
+#: ../data/gui/chat_control.ui.h:29 ../data/gui/groupchat_control.ui.h:9
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "傳送訊息"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "邀請(_V)"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "邀請朋友!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "多人聊天伺服器"
+#: ../data/gui/chat_to_muc_window.ui.h:2
+#, fuzzy
+msgid ""
+"You are now entering a groupchat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+"您將開始進行多人聊天。\n"
+"選擇您想要邀請的聯絡人"
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "請選擇一個多人聊天伺服器"
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
-"您將開始進行多人聊天。\n"
-"選擇您想要邀請的聯絡人"
+msgid "MUC server"
+msgstr "多人聊天伺服器"
+
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "邀請(_V)"
 
 #: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "要求檢視他/她的狀態(_S)"
+msgid "Start _Chat"
+msgstr "開始聊天(_C)"
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "加入特殊提示(_N)…"
+#. Send single message
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:4 ../src/gui_menu_builder.py:541
+msgid "Send Single _Message..."
+msgstr "傳送單條訊息(_M)…"
 
 #: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "指定 Open_PGP 密鑰…"
-
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "執行命令…"
-
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "編輯群組(_G)…"
+msgid "Send _File..."
+msgstr "傳送檔案(_F)…"
 
-#. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:1 ../src/roster_window.py:5557
-#: ../src/roster_window.py:5716
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5687
+#: ../src/roster_window.py:5832
 msgid "In_vite to"
 msgstr "邀請到(_V)"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "邀請聯絡人(_C)"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "移除(_R)"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "切換Open_PGP加密"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5567
-#: ../src/roster_window.py:5805
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "切換E2E加密"
+
+#: ../data/gui/contact_context_menu.ui.h:8 ../src/gui_menu_builder.py:554
+#: ../src/roster_window.py:5695
 msgid "Send Cus_tom Status"
 msgstr "傳送個性化狀態(_T)"
 
-#: ../data/gui/contact_context_menu.ui.h:10 ../data/gui/roster_window.ui.h:10
-msgid "Send Single _Message..."
-msgstr "傳送單條訊息(_M)…"
+#. Execute Command
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:574
+msgid "E_xecute Command..."
+msgstr "執行命令…"
 
-#: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "傳送檔案(_F)…"
+#: ../data/gui/contact_context_menu.ui.h:10
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "管理聯絡人"
 
-#: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "設定自訂頭像(_A)…"
+#. Rename
+#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:595
+#: ../src/roster_window.py:5725
+msgid "_Rename..."
+msgstr "重新命名(_R)…"
+
+#. Edit Groups
+#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5848
+msgid "Edit _Groups..."
+msgstr "編輯群組(_G)…"
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "開始聊天(_C)"
+msgid "Assign Open_PGP Key..."
+msgstr "指定 Open_PGP 密鑰…"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "切換E2E加密"
+msgid "Set Custom _Avatar..."
+msgstr "設定自訂頭像(_A)…"
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "切換Open_PGP加密"
+msgid "Add Special _Notification..."
+msgstr "加入特殊提示(_N)…"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "認證(_S)"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "允許他/她檢視我的狀態(_A)"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "允許此聯絡人看到我的狀態(_L)"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../src/roster_window.py:5629
-#: ../src/roster_window.py:5754 ../src/roster_window.py:5884
-msgid "_Block"
-msgstr "阻斷(_B)"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "要求檢視他/她的狀態(_S)"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "禁止他/她檢視我的狀態(_F)"
 
-#: ../data/gui/contact_context_menu.ui.h:20
-#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23
-#: ../src/roster_window.py:5955
-msgid "_History"
-msgstr "命令歷程(_H)"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "忽略(_I)"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:609
+#: ../src/roster_window.py:5747 ../src/roster_window.py:5861
+msgid "_Block"
+msgstr "阻斷(_B)"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "管理聯絡人"
+msgid "_Unignore"
+msgstr "取消忽略(_U)"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "重新命名(_R)…"
+msgid "_Ignore"
+msgstr "忽略(_I)"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "認證(_S)"
+#. Remove
+#. Remove group
+#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:617
+#: ../src/roster_window.py:5754
+msgid "Remo_ve"
+msgstr "移除(_R)"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "取消忽略(_U)"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:5927
+msgid "_History"
+msgstr "命令歷程(_H)"
 
 #: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
@@ -1028,60 +1154,59 @@ msgid "Edit Groups"
 msgstr "編輯群組"
 
 #: ../data/gui/esession_info_window.ui.h:1
-msgid "(<b>ESession</b> info)"
-msgstr "<b>ESession</b>資訊"
-
-#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "辨別(_V)"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "特性"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Gajim 支援的特性清單</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "特性"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "傳送中，傳輸完成和停止傳輸的檔案清單"
+#, fuzzy
+msgid "Con_tinue"
+msgstr "繼續(_C)"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "取消檔案傳輸"
+msgid "_Pause"
+msgstr "暫停(_P)"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "取消選取檔案的傳輸"
+#: ../data/gui/service_registration_window.ui.h:2
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "取消選取檔案傳輸並刪除未完成檔案"
+#: ../data/gui/filetransfers.ui.h:4 ../src/chat_control.py:2029
+#: ../src/filetransfers_window.py:214
+msgid "_Open Containing Folder"
+msgstr "開啟資料夾(_O)"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "清除(_U)"
-
-#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "檔案傳輸"
 
+#: ../data/gui/filetransfers.ui.h:6
+msgid "file transfers list"
+msgstr "檔案傳輸清單"
+
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "隱藏該視窗"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "傳送中，傳輸完成和停止傳輸的檔案清單"
 
 #: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "從清單中移除檔案傳輸。"
+msgid "Clean _up"
+msgstr "清除(_U)"
 
 #: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "從清單移除已完成，已取消和失敗的檔案傳輸"
 
 #: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "顯示您與他人進行的傳輸檔案清單"
+msgid "Remove file transfer from the list."
+msgstr "從清單中移除檔案傳輸。"
 
 #: ../data/gui/filetransfers.ui.h:11
 msgid ""
@@ -1092,78 +1217,87 @@ msgstr ""
 "被移除"
 
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "當檔案傳輸完成時彈出提示"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "取消選取檔案傳輸並刪除未完成檔案"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:798
-msgid "_Continue"
-msgstr "繼續(_C)"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "取消檔案傳輸"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "檔案傳輸完成時提醒我(_N)"
+msgid "Cancels the selected file transfer"
+msgstr "取消選取檔案的傳輸"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "開啟資料夾(_O)"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "隱藏該視窗"
 
 #: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "暫停(_P)"
+msgid "_Notify me when a file transfer is complete"
+msgstr "檔案傳輸完成時提醒我(_N)"
 
 #: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "檔案傳輸清單"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "當檔案傳輸完成時彈出提示"
 
-#: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>各聊天狀態下標籤顏色</b>"
+#: ../data/gui/filetransfers.ui.h:18
+msgid "Shows a list of file transfers between you and others"
+msgstr "顯示您與他人進行的傳輸檔案清單"
 
-#: ../data/gui/gajim_themes_window.ui.h:2
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "Account row"
 msgstr "帳號"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1030
-msgid "Bold"
-msgstr "粗體"
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "群組"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+msgid "Contact row"
+msgstr "聯絡人"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "聊天視窗上方橫幅"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "正在編輯"
+msgid "Gajim Themes Customization"
+msgstr "Gajim 主題自訂"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "聯絡人"
+msgid "Text _color:"
+msgstr "文字顏色(_C):"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "字型風格:"
+msgid "_Background:"
+msgstr "背景(_B)"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim 主題自訂"
+msgid "Text _font:"
+msgstr "文字字型(_F):"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "已離開"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "群組"
+msgid "Font style:"
+msgstr "字型風格:"
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "未活動的"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1031
-msgid "Italic"
-msgstr "斜體"
-
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "正在編輯"
+
+#: ../data/gui/gajim_themes_window.ui.h:14
+msgid "Paused"
+msgstr "暫停編輯"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "Gone"
+msgstr "已離開"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
 msgid ""
 "MUC\n"
 "Messages"
@@ -1171,7 +1305,7 @@ msgstr ""
 "多人聊天\n"
 "訊息"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1179,147 +1313,134 @@ msgstr ""
 "多人聊天指示性\n"
 "訊息"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "暫停編輯"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "文字顏色(_C):"
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "文字字型(_F):"
-
 #: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "背景(_B)"
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>各聊天狀態下標籤顏色</b>"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "變更暱稱(_N)…"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "管理聊天室(_M)"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "變更主題(_S)…"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "設定聊天室(_R)…"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "將本聊天室加入書籤(_B)"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "刪除聊天室(_D)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "管理聊天室(_M)"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "關閉時最小化視窗"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_control_popup_menu.ui.h:7
 msgid "_Request Voice"
 msgstr "要求語音(_R)"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1803
+msgid "_Bookmark"
+msgstr "將本聊天室加入書籤(_B)"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:10 ../src/roster_window.py:5919
+msgid "_Disconnect"
+msgstr "中斷連線(_D)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:1
+msgid "_Send Private Message"
+msgstr "傳送私人聊天訊息(_S)"
+
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Mo_derator"
-msgstr "仲裁人(_D)"
+msgid "Send _File"
+msgstr "傳送檔案(_F)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Occupant Actions"
 msgstr "室友動作"
 
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "Send _File"
-msgstr "傳送檔案(_F)"
+msgid "_Voice"
+msgstr "語音(_V)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
-msgid "_Add to Roster"
-msgstr "加入至聯絡人清單(_A)"
+msgid "Mo_derator"
+msgstr "仲裁人(_D)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "成員(_M)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "管理(_A)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:7
-msgid "_Ban"
-msgstr "封禁(_B)"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "所有人(_O)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "踢除(_K)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Member"
-msgstr "成員(_M)"
+#: ../data/gui/gc_occupants_menu.ui.h:10
+msgid "_Ban"
+msgstr "封禁(_B)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Owner"
-msgstr "所有人(_O)"
-
-#: ../data/gui/gc_occupants_menu.ui.h:13
-msgid "_Send Private Message"
-msgstr "傳送私人聊天訊息(_S)"
-
-#: ../data/gui/gc_occupants_menu.ui.h:15
-msgid "_Voice"
-msgstr "語音(_V)"
+msgid "_Add to Roster"
+msgstr "加入至聯絡人清單(_A)"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "將本聊天室加入書籤(Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:365
+msgid "Show a list of formattings"
+msgstr "顯示格式清單(Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "變更您的暱稱(Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr "變更本聊天室主題(Alt+T)"
 
-#: ../data/gui/groupchat_control.ui.h:4
-msgid "Change your nickname (Ctrl+N)"
-msgstr "變更您的暱稱(Ctrl+N)"
+#: ../data/gui/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "將本聊天室加入書籤(Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "建立新訊息"
 
 #: ../data/gui/groups_post_window.ui.h:2
-#: ../data/gui/single_message_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:1
 msgid "From:"
 msgstr "從:"
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Subject:"
 msgstr "主題:"
 
 #: ../data/gui/history_manager.ui.h:1
-msgid ""
-"<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. "
-"Generally avoid deletions with contacts you currently chat with."
-msgstr ""
-"<b>警告:</b>\n"
-"如果您要進行大量的刪除，請確認 Gajim 不再執行。\n"
-"一般而言，如果您正在與某個聯絡人聊天，請不要刪除與他的聊天記錄。"
+#, fuzzy
+msgid "_Export"
+msgstr "匯出"
+
+#: ../data/gui/history_manager.ui.h:2
+msgid "Gajim History Logs Manager"
+msgstr "Gajim 命令歷程記錄管理器"
 
 #: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>歡迎使用 Gajim 命令歷程記錄管理器</b></big>"
 
 #: ../data/gui/history_manager.ui.h:4
-msgid "Export"
-msgstr "匯出"
-
-#: ../data/gui/history_manager.ui.h:5
-msgid "Gajim History Logs Manager"
-msgstr "Gajim 命令歷程記錄管理器"
-
-#: ../data/gui/history_manager.ui.h:6
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1333,164 +1454,173 @@ msgstr ""
 "使用這個程式來刪除或匯出命令歷程記錄。您可以在左側進行選擇且/或在下方進行搜"
 "尋。"
 
+#: ../data/gui/history_manager.ui.h:7
+msgid ""
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
+msgstr ""
+"<b>警告:</b>\n"
+"如果您要進行大量的刪除，請確認 Gajim 不再執行。\n"
+"一般而言，如果您正在與某個聯絡人聊天，請不要刪除與他的聊天記錄。"
+
 #: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "搜尋資料庫(_S)"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "所有聊天命令歷程"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
+#: ../data/gui/history_window.ui.h:1 ../src/history_window.py:337
 msgid "Conversation History"
 msgstr "對話命令歷程"
 
+#: ../data/gui/history_window.ui.h:2
+msgid "Search:"
+msgstr "搜尋:"
+
 #: ../data/gui/history_window.ui.h:3
-msgid "Enter JID or Contact name"
-msgstr "輸入 JID 或是聯絡人名稱"
+msgid "_In date search"
+msgstr ""
 
 #: ../data/gui/history_window.ui.h:4
-msgid "Groupchat Histories"
-msgstr "多人聊天命令歷程"
+msgid "Searching only in the selected day "
+msgstr ""
 
 #: ../data/gui/history_window.ui.h:5
-msgid "Search:"
-msgstr "搜尋:"
-
-#: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "記錄聊天命令歷程(_L)"
 
-#: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
-msgstr "approve"
+#: ../data/gui/history_window.ui.h:6
+#, fuzzy
+msgid "_Show status changes"
+msgstr "記錄聯絡人狀態變化(_L)"
 
-#: ../data/gui/item_archiving_preferences_window.ui.h:2
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
 msgid "body"
 msgstr "body"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "false"
+msgstr "false"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr "concede"
+#: ../src/common/connection_handlers.py:1221
+msgid "message"
+msgstr "message"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr "expire"
+msgid "stream"
+msgstr "stream"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
-msgstr "false"
+msgid "approve"
+msgstr "approve"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
-msgstr "forbid"
+msgid "concede"
+msgstr "concede"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+msgid "forbid"
+msgstr "forbid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
-msgid "message"
-msgstr "message"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:9
 msgid "oppose"
 msgstr "oppose"
 
-#: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
-msgstr "otr"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:11
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
 msgid "prefer"
 msgstr "prefer"
 
-#: ../data/gui/item_archiving_preferences_window.ui.h:12
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
 msgid "require"
 msgstr "require"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+#: ../src/gajim-remote.py:231
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "expire"
+msgstr "expire"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
-msgstr "save"
+msgid "otr"
+msgstr "otr"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
-msgstr "stream"
-
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "Bro_wse Rooms"
+msgid "save"
+msgstr "save"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2328
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2461
 msgid "Join Group Chat"
 msgstr "加入多人聊天"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr "當我連線後自動加入此聊天室(_A)"
+#: ../data/gui/join_groupchat_window.ui.h:3
+msgid "Recently:"
+msgstr "最近:"
 
-#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:4
 msgid "Nickname:"
 msgstr "暱稱:"
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-msgid "Password:"
-msgstr "密碼:"
-
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "最近:"
-
-#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/join_groupchat_window.ui.h:5
 msgid "Room:"
 msgstr "聊天室:"
 
-#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1816
+#: ../data/gui/join_groupchat_window.ui.h:6 ../src/config.py:1870
 msgid "Server:"
 msgstr "伺服器:"
 
-#: ../data/gui/join_groupchat_window.ui.h:10
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Password:"
+msgstr "密碼:"
+
+#: ../data/gui/join_groupchat_window.ui.h:8
 msgid "_Bookmark this room"
 msgstr "將本聊天室加入書籤(_B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:9
+msgid "Join this room _automatically when I connect"
+msgstr "當我連線後自動加入此聊天室(_A)"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+msgid "Bro_wse Rooms"
+msgstr "Bro_wse Rooms"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:2060
+#: ../src/disco.py:1807
 msgid "_Join"
 msgstr "加入(_J)"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
+msgid "Manage Bookmarks"
+msgstr "書籤管理"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+msgid "_Title:"
+msgstr "標題(_T):"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:4
+msgid "Roo_m:"
+msgstr "聊天室(_M):"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "A_uto join"
 msgstr "自動聯結(_U)"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:2
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "如果選取，Gajim 會在啟動時加入此聊天室"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:3
-msgid "Manage Bookmarks"
-msgstr "書籤管理"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:9
 msgid "Minimi_ze on Auto Join"
 msgstr "自動聯結時縮到最小(_Z)"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Pr_int status:"
 msgstr "印出狀態(_I):"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Roo_m:"
-msgstr "聊天室(_M):"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "_Title:"
-msgstr "標題(_T):"
-
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "個人事件服務配置"
@@ -1500,123 +1630,120 @@ msgid "_Configure"
 msgstr "配置(_C)"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>屬性</b>"
+msgid "HTTP Connect"
+msgstr "HTTP 連線"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>設定</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "HTTP 連線"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "管理代理伺服器設定"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Name:"
+msgstr "名稱(_N):"
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "密碼(_W)"
+msgid "_Type:"
+msgstr "類型(_T):"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "代理伺服器位址(_H):"
+msgid "<b>Properties</b>"
+msgstr "<b>屬性</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "代理伺服器連接埠(_P):"
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "Proxy _Host:"
+msgstr "代理伺服器位址(_H):"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "使用 HTTP 代理(_Y)"
 
 #: ../data/gui/manage_proxies_window.ui.h:11
-msgid "Use proxy auth_entication"
-msgstr "代理伺服器需要認證"
+msgid "Proxy _Port:"
+msgstr "代理伺服器連接埠(_P):"
 
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Use proxy auth_entication"
+msgstr "代理伺服器需要認證"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "名稱(_N):"
+msgid "_Username:"
+msgstr "使用者名稱(_U):"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "類型(_T):"
+msgid "Pass_word:"
+msgstr "密碼(_W)"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "使用者名稱(_U):"
+msgid "<b>Settings</b>"
+msgstr "<b>設定</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "管理聯絡人(_M)"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "密文"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
-msgstr "&lt;empty&gt;"
+msgid "Plugins"
+msgstr "外掛程式"
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
-msgstr "<empty>"
+msgid "Install from zip"
+msgstr "從 zip 檔安裝"
 
 #: ../data/gui/plugins_window.ui.h:3
-msgid "Authors:"
-msgstr "作者:"
+msgid "&lt;empty&gt;"
+msgstr "&lt;empty&gt;"
 
 #: ../data/gui/plugins_window.ui.h:4
-msgid "Configure"
-msgstr "配置"
+msgid "Version:"
+msgstr "版本:"
 
 #: ../data/gui/plugins_window.ui.h:5
-msgid "Description:"
-msgstr "描述:"
+msgid "Authors:"
+msgstr "作者:"
 
 #: ../data/gui/plugins_window.ui.h:6
 msgid "Homepage:"
 msgstr "首頁:"
 
 #: ../data/gui/plugins_window.ui.h:7
-msgid "Install from zip"
-msgstr "從 zip 檔安裝"
+msgid "Description:"
+msgstr "描述:"
 
 #: ../data/gui/plugins_window.ui.h:8
+msgid "Uninstall"
+msgstr "卸載"
+
+#: ../data/gui/plugins_window.ui.h:9
+msgid "Configure"
+msgstr "配置"
+
+#: ../data/gui/plugins_window.ui.h:10
 msgid "Installed"
 msgstr "已安裝"
 
-#: ../data/gui/plugins_window.ui.h:9
+#: ../data/gui/plugins_window.ui.h:11
 msgid ""
 "Plug-in decription should be displayed here. This text will be erased during "
 "PluginsWindow initialization."
 msgstr "外掛程式的描述會被顯示在這裡。這些文字在外掛程式視窗初始化時將被去除"
 
-#: ../data/gui/plugins_window.ui.h:10
-msgid "Plugins"
-msgstr "外掛程式"
-
-#: ../data/gui/plugins_window.ui.h:11
-msgid "Uninstall"
-msgstr "卸載"
-
-#: ../data/gui/plugins_window.ui.h:12
-msgid "Version:"
-msgstr "版本:"
-
-#: ../data/gui/plugins_window.ui.h:13
-msgid "homepage url"
-msgstr "首頁連結"
-
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
 msgstr "事件類型"
@@ -1626,1038 +1753,1052 @@ msgid "Event desc"
 msgstr "事件"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>進階配置編輯器</b>"
+msgid "Use default applications"
+msgstr "使用預設的應用程式"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>應用程式</b>"
+msgid "Custom"
+msgstr "自訂"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>音訊</b>"
+msgid "All chat states"
+msgstr "所有聊天狀態"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>自動調整狀態</b>"
-
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>聊天視窗外觀</b>"
+msgid "Composing only"
+msgstr "僅正在編輯"
 
-#: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>聊天視窗中文字顏色</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:162
+#: ../src/config.py:654
+msgid "Disabled"
+msgstr "停用"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>聊天狀態提示</b>"
+msgid "Only when pending events"
+msgstr "僅當有未處理的事件時"
 
-#: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>連線</b>"
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "彈出提示"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:10
-msgid "<b>Custom</b>"
-msgstr "<b>自訂</b>"
+msgid "Notify me about it"
+msgstr "提醒我"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>字型</b>"
+msgid "Show only in roster"
+msgstr "只顯示在聯絡人清單中"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail 選項</b>"
+msgid "Detached roster with detached chats"
+msgstr "聊天視窗與聯絡人清單分離，且互相分離"
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr "單一聊天視窗，與聯絡人清單分離"
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>預設狀態訊息</b>"
+msgid "Single window for everything"
+msgstr "只使用單一視窗"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>隱私策略</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr "聊天視窗與聯絡人清單分離，依據帳號分組"
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>聯絡人清單外觀</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr "聊天視窗與聯絡人清單分離，依據類型分組"
 
 #: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>聲音</b>"
+msgid "Last state"
+msgstr "最後狀態"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>狀態訊息</b>"
+msgid "Preferences"
+msgstr "參數"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>主題</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "在聯絡人清單顯示中聯絡人的頭像(_V)"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>視訊</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"如果選取，Gajim 會在聯絡人清單和多人聊天視窗中顯示聯絡人清單中的聯絡人細節"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>可視化提示</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "在聯絡人清單中顯示聯絡人的狀態資訊(_M)"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(例如: stunserver.org)</i>"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name, in roster window and in group chats"
+msgstr ""
+"如果選取，Gajim 會在聯絡人清單和多人聊天視窗中聯絡人名稱下方顯示聯絡人狀態訊"
+"息"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "進階"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "在聯絡人清單中顯示聯絡人的位置資訊(_L)"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "All chat states"
-msgstr "所有聊天狀態"
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的心情。"
 
 #: ../data/gui/preferences_window.ui.h:25
-msgid "Allow _OS information to be sent"
-msgstr "允許傳送關於作業系統的資訊(_O)"
+msgid "Sort contacts by status"
+msgstr "將聯絡人按狀態排序"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow my _idle time to be sent"
-msgstr "允許傳送關於閒置時間的資訊(_I)"
+msgid "in _roster"
+msgstr "在聯絡人清單中(_R)"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "允許彈出提示，當我離開/無法使用/忙/隱身(_A)"
+msgid "in _group chats"
+msgstr "在多人聊天視窗中(_G)"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow sound when I'm _busy"
-msgstr "在我忙碌時允許播放聲音(_B)"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>聯絡人清單外觀</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Always"
-msgstr "總是"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr "如果不停用，Gajim 會用相對的動態或靜態的圖形代替字元表情，例如':)'"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Ask status message when I:"
-msgstr "詢問狀態訊息，當我:"
+msgid "_Emoticons:"
+msgstr "表情(_E):"
 
-#: ../data/gui/preferences_window.ui.h:31 ../src/features_window.py:106
-msgid "Audio / Video"
-msgstr "音訊/視訊"
+#: ../data/gui/preferences_window.ui.h:31
+msgid "_Window behavior:"
+msgstr "視窗行為(_W)"
 
 #: ../data/gui/preferences_window.ui.h:32
-msgid "Audio input device"
-msgstr "音訊輸入裝置"
+msgid "_Show roster on startup:"
+msgstr "啟動時顯示名冊(_S):"
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio output device"
-msgstr "音訊輸出裝置"
+msgid "Ma_ke message windows compact"
+msgstr "使訊息視窗精簡(_K)"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Chat message:"
-msgstr "聊天訊息:"
+msgid "Hide all buttons in chat windows"
+msgstr "在聊天視窗中隱藏所有按鈕"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "在啟動是偵測 Gajim 是否是預設的 Jabber 客戶端程式"
+msgid "_Ignore rich content in incoming messages"
+msgstr "忽略收到的訊息中的富文字內容(_I)"
 
 #: ../data/gui/preferences_window.ui.h:36
-msgid "Composing only"
-msgstr "僅正在編輯"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"一些訊息會包含豐富的內容(例如格式，顏色等)。如果選取，Gajim 將顯示原本的訊息"
+"內容。"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Configure color and font of the interface"
-msgstr "配置介面顏色與字型"
+msgid "_Highlight misspelled words"
+msgstr "拼寫檢查(_H)"
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Contact's message:"
-msgstr "聯絡人訊息:"
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+"如果選取，Gajim 會在聊天視窗中將編輯框中的拼寫錯誤高亮度顯示。如果沒有通\n"
+"過在編輯框點擊右鍵的方式明確設定語言，聯絡人或聊天室的預設語言將被\n"
+"使用。"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's nickname:"
-msgstr "聯絡人暱稱"
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "收到任意多人聊天訊息播放的聲音。"
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Custom"
-msgstr "自訂"
+msgid "Show avatar in chat tabs"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:41
-msgid "Detached roster with chat grouped by account"
-msgstr "聊天視窗與聯絡人清單分離，依據帳號分組"
-
-#: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by type"
-msgstr "聊天視窗與聯絡人清單分離，依據類型分組"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>聊天視窗外觀</b>"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with detached chats"
-msgstr "聊天視窗與聯絡人清單分離，且互相分離"
+msgid "When new event is received:"
+msgstr "當收到新的事件:"
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with single chat"
-msgstr "單一聊天視窗，與聯絡人清單分離"
+msgid "Notify me about contacts that sign _in"
+msgstr "提醒我聯絡人登入(_I)"
 
-#: ../data/gui/preferences_window.ui.h:45 ../src/config.py:170
-#: ../src/config.py:672
-msgid "Disabled"
-msgstr "停用"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Notify me about contacts that sign _out"
+msgstr "提醒我聯絡人登出(_O)"
 
 #: ../data/gui/preferences_window.ui.h:46
-msgid "Display _activity of contacts in roster"
-msgstr "在聯絡人清單中顯示聯絡人的活動(_A)"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr "Gajim 會透過螢幕右下方的彈出氣泡提示剛剛離開的聯絡人"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _extra email details"
-msgstr "顯示額外的郵件資訊(_E)"
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "允許彈出提示，當我離開/無法使用/忙/隱身(_A)"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _location of contacts in roster"
-msgstr "在聯絡人清單中顯示聯絡人的位置資訊(_L)"
+#, fuzzy
+msgid "Allow popup/notifications when a chat window is opened"
+msgstr "允許彈出提示，當我離開/無法使用/忙/隱身(_A)"
 
 #: ../data/gui/preferences_window.ui.h:49
-msgid "Display _tunes of contacts in roster"
-msgstr "在聯絡人清單中顯示聯絡人正在播放音樂的資訊(_T)"
+msgid "Notify on new _GMail email"
+msgstr "新 Gmail 郵件通知"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display a_vatars of contacts in roster"
-msgstr "在聯絡人清單顯示中聯絡人的頭像(_V)"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr "如果選取，Gajim 在 GMail 收到新的電子郵件是會顯示一個通知"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display m_ood of contacts in roster"
-msgstr "在聯絡人清單中顯示聯絡人的心情(_O)"
+msgid "Display _extra email details"
+msgstr "顯示額外的郵件資訊(_E)"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display status _messages of contacts in roster"
-msgstr "在聯絡人清單中顯示聯絡人的狀態資訊(_M)"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr "如果選取，Gajim 將同時包含新電子郵件傳送者的資訊"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"display in chat windows."
-msgstr ""
-"Gajim 可以收發您與聯絡人正在進行對話的相關資訊。此處您可以指定您想在聊天\n"
-"視窗中顯示的聊天狀態資訊。"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail 選項</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-msgid ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"send to the other party."
-msgstr ""
-"Gajim 可以收發您與聯絡人正在進行對話的相關資訊。此處您可以指定要發給第三方的"
-"聊天狀態資訊。"
+msgid "Show notification area icon:"
+msgstr "在通知區域顯示圖示:"
 
 #: ../data/gui/preferences_window.ui.h:55
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
-msgstr "Gajim 會透過螢幕右下方的彈出氣泡提示剛剛離開的聯絡人"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>可視化提示</b>"
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Play _sounds"
+msgstr "播放聲音(_S)"
 
 #: ../data/gui/preferences_window.ui.h:57
-msgid "Hide all buttons in chat windows"
-msgstr "在聊天視窗中隱藏所有按鈕"
+msgid "Ma_nage..."
+msgstr "管理(_N)…"
 
 #: ../data/gui/preferences_window.ui.h:58
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
+msgid "Allow sound when I'm _busy"
+msgstr "在我忙碌時允許播放聲音(_B)"
 
 #: ../data/gui/preferences_window.ui.h:59
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr "如果選取，Gajim 將同時包含新電子郵件傳送者的資訊"
+msgid "<b>Sounds</b>"
+msgstr "<b>聲音</b>"
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
-msgstr "如果選取，Gajim 在電腦閒置時會將您的狀態設定為離開。"
+msgid "Notifications"
+msgstr "通知"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr "如果選取，Gajim 會在電腦閒置更長時間後將您的狀態設定為離開很久了。"
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim 可以收發您與聯絡人正在進行對話的相關資訊。此處您可以指定您想在聊天\n"
+"視窗中顯示的聊天狀態資訊。"
 
 #: ../data/gui/preferences_window.ui.h:62
-msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
-msgstr ""
-"如果選取，Gajim 會在聯絡人清單和多人聊天視窗中顯示聯絡人清單中的聯絡人細節"
+msgid "_Display chat state notifications:"
+msgstr "顯示聊天狀態資訊(_D):"
 
 #: ../data/gui/preferences_window.ui.h:63
 msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
 msgstr ""
-"如果選取，Gajim 會在聯絡人清單和多人聊天視窗中聯絡人名稱下方顯示聯絡人狀態訊"
-"息"
+"Gajim 可以收發您與聯絡人正在進行對話的相關資訊。此處您可以指定要發給第三方的"
+"聊天狀態資訊。"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的活動。"
+msgid "_Send chat state notifications:"
+msgstr "傳送聊天狀態資訊(_S):"
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
-msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的位置。"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>聊天狀態提示</b>"
 
 #: ../data/gui/preferences_window.ui.h:66
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的心情。"
+msgid "Personal Events"
+msgstr "個人事件"
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人正在播放的音樂。"
+msgid "_Away after:"
+msgstr "在此時間後設定狀態為離開(_A):"
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will highlight spelling errors in input fields of chat "
-"windows. If no language is explicitly set via right click on the input "
-"field, the default language will be used for this contact or group chat."
-msgstr ""
-"如果選取，Gajim 會在聊天視窗中將編輯框中的拼寫錯誤高亮度顯示。如果沒有通\n"
-"過在編輯框點擊右鍵的方式明確設定語言，聯絡人或聊天室的預設語言將被\n"
-"使用。"
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr "如果選取，Gajim 在電腦閒置時會將您的狀態設定為離開。"
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid ""
-"If checked, Gajim will ignore incoming events from unauthorized contacts. "
-"Use with caution, because it blocks all messages from any contact that is "
-"not in the roster"
-msgstr ""
-"如果選取，Gajim 會忽略未認證的聯絡人引發的事件。請謹慎使用，因為這將阻斷所有"
-"不在聯絡人清單中的聯絡人發來的訊息。"
+msgid "_Not available after:"
+msgstr "在此時間後設定狀態為離開很久了(_N):"
 
 #: ../data/gui/preferences_window.ui.h:70
 msgid ""
-"If checked, Gajim will keep logs for encrypted messages. Please note that "
-"when using E2E encryption the remote party has to agree on logging, else the "
-"messages will not be logged."
-msgstr ""
-"如果選取，Gajim 會記錄加密的訊息。請注意，使用 E2E 加密時，必須對方同意\n"
-"記錄，否則 Gajim 不會記錄。"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr "如果選取，Gajim 會在電腦閒置更長時間後將您的狀態設定為離開很久了。"
 
 #: ../data/gui/preferences_window.ui.h:71
-msgid ""
-"If checked, Gajim will show a notification when a new e-mail is received via "
-"GMail"
-msgstr "如果選取，Gajim 在 GMail 收到新的電子郵件是會顯示一個通知"
+msgid "minutes"
+msgstr "分鐘"
 
 #: ../data/gui/preferences_window.ui.h:72
 msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
-"如果選取，Gajim 會以協定特定的方式顯示狀態圖示。(例如，MSN 聯絡人會以同\n"
-"MSN 相同的圖示顯示線上，離開，忙，等等狀態…)"
-
-#: ../data/gui/preferences_window.ui.h:73
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-msgstr "如果選取，Gajim 不會詢問狀態訊息，而使用特定的預設訊息。"
-
-#: ../data/gui/preferences_window.ui.h:74
-msgid ""
-"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
-"animated or static graphical emoticons"
-msgstr "如果不停用，Gajim 會用相對的動態或靜態的圖形代替字元表情，例如':)'"
+"離開狀態的自動訊息。如果為空，Gajim 不會變更目前的狀態訊息\n"
+"$S會被上個狀態訊息替換\n"
+"$T會被自動離開的逾時時間替換"
 
 #: ../data/gui/preferences_window.ui.h:75
-msgid "Last state"
-msgstr "最後狀態"
-
-#: ../data/gui/preferences_window.ui.h:76
-msgid "Log _encrypted chat session"
-msgstr "記錄加密的作業階段(_E)"
-
-#: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "使訊息視窗精簡(_K)"
+msgid ""
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
+msgstr ""
+"離開很久的自動訊息。如果為空，Gajim 不會變更目前的狀態訊息\n"
+"$S會被上個狀態訊息替換\n"
+"$T會被自動無法使用的逾時時間替換"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "管理(_N)…"
+#, fuzzy
+msgid "12"
+msgstr "1"
 
 #: ../data/gui/preferences_window.ui.h:79
-msgid "Never"
-msgstr "永遠不"
+#, fuzzy
+msgid "20"
+msgstr "2"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "通知"
+msgid "<b>Auto Status</b>"
+msgstr "<b>自動調整狀態</b>"
 
 #: ../data/gui/preferences_window.ui.h:81
-msgid "Notify me about contacts that sign _in"
-msgstr "提醒我聯絡人登入(_I)"
+msgid "Ask status message when I:"
+msgstr "詢問狀態訊息，當我:"
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "提醒我聯絡人登出(_O)"
+msgid "Sign _in"
+msgstr "登入(I)"
 
 #: ../data/gui/preferences_window.ui.h:83
-msgid "Notify me about it"
-msgstr "提醒我"
+msgid "Sign _out"
+msgstr "離開登入(_O)"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "新 Gmail 郵件通知"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr "如果選取，Gajim 不會詢問狀態訊息，而使用特定的預設訊息。"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr "僅當有未處理的事件時"
+msgid "Status"
+msgstr "狀態"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "個人事件"
+msgid "Default Message"
+msgstr "預設訊息"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "播放聲音(_S)"
+msgid "Enabled"
+msgstr "啟用"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
-msgstr "彈出提示"
+msgid "<b>Status Messages</b>"
+msgstr "<b>狀態訊息</b>"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "參數"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>預設狀態訊息</b>"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr "STUN 伺服器的主機名稱。如果沒有給出，Gajim 會嘗試從伺服器上發現一個。"
+msgid "Chat message:"
+msgstr "聊天訊息:"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "Use system _default"
+msgstr "使用系統預設(_D)"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "STUN server:"
-msgstr "STUN 伺服器:"
+msgid "<b>Font</b>"
+msgstr "<b>字型</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid "Show notification area icon:"
-msgstr "在通知區域顯示圖示:"
+msgid "T_heme:"
+msgstr "主題:(_H)"
 
 #: ../data/gui/preferences_window.ui.h:94
-msgid "Show only in roster"
-msgstr "只顯示在聯絡人清單中"
+msgid "Status _iconset:"
+msgstr "狀態圖示集(_I):"
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "登入(I)"
+msgid "Use _transports icons"
+msgstr "使用代理的圖示設定(_T)"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "離開登入(_O)"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from ICQ will have the equivalent ICQ icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"如果選取，Gajim 會以協定特定的方式顯示狀態圖示。(例如，MSN 聯絡人會以同\n"
+"MSN 相同的圖示顯示線上，離開，忙，等等狀態…)"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr "只使用單一視窗"
+msgid "Configure color and font of the interface"
+msgstr "配置介面顏色與字型"
 
 #: ../data/gui/preferences_window.ui.h:98
-msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
-msgstr ""
-"一些訊息會包含豐富的內容(例如格式，顏色等)。如果選取，Gajim 將顯示原本的訊息"
-"內容。"
+msgid "<b>Themes</b>"
+msgstr "<b>主題</b>"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "將聯絡人按狀態排序"
+msgid "Contact's nickname:"
+msgstr "聯絡人暱稱"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:400
-msgid "Status"
-msgstr "狀態"
+#: ../data/gui/preferences_window.ui.h:100
+msgid "Contact's message:"
+msgstr "聯絡人訊息:"
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "狀態圖示集(_I):"
+msgid "_Status message:"
+msgstr "狀態訊息:(_S)"
 
 #: ../data/gui/preferences_window.ui.h:102
-msgid "Style"
-msgstr "風格"
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "多人聊天訊息高亮度顯示"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "主題:(_H)"
+msgid "Your nickname:"
+msgstr "您的暱稱:"
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"The auto away status message. If empty, Gajim will not change the current "
-"status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-away timeout"
-msgstr ""
-"離開狀態的自動訊息。如果為空，Gajim 不會變更目前的狀態訊息\n"
-"$S會被上個狀態訊息替換\n"
-"$T會被自動離開的逾時時間替換"
+msgid "Your message:"
+msgstr "您的訊息:"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "_URL highlight:"
+msgstr "URL 高亮度顯示:"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "_Reset to Default Colors"
+msgstr "恢復為預設顏色設定(_R)"
 
 #: ../data/gui/preferences_window.ui.h:107
-msgid ""
-"The auto not available status message. If empty, Gajim will not change the "
-"current status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
-msgstr ""
-"離開很久的自動訊息。如果為空，Gajim 不會變更目前的狀態訊息\n"
-"$S會被上個狀態訊息替換\n"
-"$T會被自動無法使用的逾時時間替換"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>聊天視窗中文字顏色</b>"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Style"
+msgstr "風格"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Audio input device"
+msgstr "音訊輸入裝置"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "使用代理的圖示設定(_T)"
+msgid "Audio output device"
+msgstr "音訊輸出裝置"
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr "使用預設的應用程式"
+msgid "<b>Audio</b>"
+msgstr "<b>音訊</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "使用系統預設(_D)"
-
-#: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
-msgstr "視訊圖框速率"
-
-#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr "視訊輸入裝置"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video output device"
 msgstr "視訊輸出裝置"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:114
+msgid "Video framerate"
+msgstr "視訊圖框速率"
+
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video size"
 msgstr "視訊尺寸"
 
+#: ../data/gui/preferences_window.ui.h:116
+msgid "View own video source"
+msgstr ""
+
 #: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "當收到新的事件:"
+msgid "<b>Video</b>"
+msgstr "<b>視訊</b>"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Your message:"
-msgstr "您的訊息:"
+msgid "STUN server:"
+msgstr "STUN 伺服器:"
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your nickname:"
-msgstr "您的暱稱:"
-
-#: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "在此時間後設定狀態為離開(_A):"
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr "STUN 伺服器的主機名稱。如果沒有給出，Gajim 會嘗試從伺服器上發現一個。"
 
 #: ../data/gui/preferences_window.ui.h:121
-msgid "_Browser:"
-msgstr "瀏覽器(_B):"
+#, fuzzy
+msgid "<i>(example: stun.iptel.org)</i>"
+msgstr "<i>(例如: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "顯示聊天狀態資訊(_D):"
+msgid "<b>Connection</b>"
+msgstr "<b>連線</b>"
 
-#: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "表情(_E):"
+#: ../data/gui/preferences_window.ui.h:123 ../src/features_window.py:93
+msgid "Audio / Video"
+msgstr "音訊/視訊"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "檔案管理器:(_F)"
+msgid "_Mail client:"
+msgstr "郵件客戶端(_M):"
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "拼寫檢查(_H)"
+msgid "_Browser:"
+msgstr "瀏覽器(_B):"
 
 #: ../data/gui/preferences_window.ui.h:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "忽略聯絡人清單以外的聯絡人觸發的事件(_I)"
-
-#: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "忽略收到的訊息中的富文字內容(_I)"
+msgid "_File manager:"
+msgstr "檔案管理器:(_F)"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "記錄聯絡人狀態變化(_L)"
+msgid "<b>Custom</b>"
+msgstr "<b>自訂</b>"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "郵件客戶端(_M):"
+msgid "<b>Applications</b>"
+msgstr "<b>應用程式</b>"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "在此時間後設定狀態為離開很久了(_N):"
+msgid "_Ignore events from contacts not in the roster"
+msgstr "忽略聯絡人清單以外的聯絡人觸發的事件(_I)"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "開啟(_O)…"
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"如果選取，Gajim 會忽略未認證的聯絡人引發的事件。請謹慎使用，因為這將阻斷所有"
+"不在聯絡人清單中的聯絡人發來的訊息。"
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "恢復為預設顏色設定(_R)"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "允許傳送關於作業系統的資訊(_O)"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "傳送聊天狀態資訊(_S):"
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
 #: ../data/gui/preferences_window.ui.h:134
-msgid "_Show roster on startup:"
-msgstr "啟動時顯示名冊(_S):"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "允許傳送關於作業系統的資訊(_O)"
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_Status message:"
-msgstr "狀態訊息:(_S)"
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_URL highlight:"
-msgstr "URL 高亮度顯示:"
+msgid "Log _encrypted chat session"
+msgstr "記錄加密的作業階段(_E)"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "_Window behavior:"
-msgstr "視窗行為(_W)"
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+"如果選取，Gajim 會記錄加密的訊息。請注意，使用 E2E 加密時，必須對方同意\n"
+"記錄，否則 Gajim 不會記錄。"
 
 #: ../data/gui/preferences_window.ui.h:138
-msgid "in _group chats"
-msgstr "在多人聊天視窗中(_G)"
+msgid "Allow my _idle time to be sent"
+msgstr "允許傳送關於閒置時間的資訊(_I)"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "in _roster"
-msgstr "在聯絡人清單中(_R)"
+msgid "Global proxy:"
+msgstr ""
 
-#: ../data/gui/preferences_window.ui.h:140
-msgid "minutes"
-msgstr "分鐘"
+#: ../data/gui/preferences_window.ui.h:141
+msgid "<b>Privacy</b>"
+msgstr "<b>隱私策略</b>"
 
-#: ../data/gui/privacy_lists_window.ui.h:1
-msgid "Privacy Lists:"
-msgstr "隱私策略清單:"
+#: ../data/gui/preferences_window.ui.h:142
+msgid "_Log status changes of contacts"
+msgstr "記錄聯絡人狀態變化(_L)"
+
+#: ../data/gui/preferences_window.ui.h:144
+msgid "_Open..."
+msgstr "開啟(_O)…"
+
+#: ../data/gui/preferences_window.ui.h:145
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>進階配置編輯器</b>"
+
+#: ../data/gui/preferences_window.ui.h:146
+msgid "Advanced"
+msgstr "進階"
 
 #: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>加入/編輯規則</b>"
+msgid "none"
+msgstr "none"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>規則清單</b>"
+msgid "both"
+msgstr "both"
 
 #: ../data/gui/privacy_list_window.ui.h:3
+msgid "from"
+msgstr "from"
+
+#: ../data/gui/privacy_list_window.ui.h:4
+msgid "to"
+msgstr "to"
+
+#: ../data/gui/privacy_list_window.ui.h:5 ../src/dialogs.py:4325
+msgid "Privacy List"
+msgstr "隱私策略清單"
+
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "<i>Privacy List</i>"
 msgstr "<i>隱私策略清單</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "Active for this session"
 msgstr "為此作業階段啟用"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Active on each startup"
 msgstr "每次啟動時啟用"
 
-#: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "全部"
+#: ../data/gui/privacy_list_window.ui.h:9
+msgid "<b>List of rules</b>"
+msgstr "<b>規則清單</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "全部(包含認證)"
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>加入/編輯規則</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:8
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Allow"
 msgstr "允許"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:12
 msgid "Deny"
 msgstr "拒絕"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Order:"
-
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3966
-msgid "Privacy List"
-msgstr "隱私策略清單"
-
-#: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "所有(除了認證)"
-
 #: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "所有在群組中的"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "both"
+msgid "all by subscription"
+msgstr "所有(除了認證)"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "from"
+msgid "All"
+msgstr "全部"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "none"
-
-#: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "to"
-
-#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "向我傳送訊息"
 
-#: ../data/gui/privacy_list_window.ui.h:20
+#: ../data/gui/privacy_list_window.ui.h:18
 msgid "to send me queries"
 msgstr "向我傳送查詢"
 
-#: ../data/gui/privacy_list_window.ui.h:21
+#: ../data/gui/privacy_list_window.ui.h:19
+msgid "to view my status"
+msgstr "檢視我的狀態"
+
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me status"
 msgstr "向我傳送狀態"
 
+#: ../data/gui/privacy_list_window.ui.h:21
+msgid "All (including subscription)"
+msgstr "全部(包含認證)"
+
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "檢視我的狀態"
+msgid "Order:"
+msgstr "Order:"
 
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>位址</b>"
+#: ../data/gui/privacy_lists_window.ui.h:1
+msgid "Privacy Lists:"
+msgstr "隱私策略清單:"
 
 #: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>頭像:</b>"
+#: ../data/gui/vcard_information_window.ui.h:15
+msgid "<b>Name:</b>"
+msgstr "<b>名稱:</b>"
 
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>生日:</b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>城市:</b>"
+#: ../data/gui/vcard_information_window.ui.h:16
+msgid "<b>Nickname:</b>"
+msgstr "<b>暱稱:</b>"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>公司:</b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Country:</b>"
-msgstr "<b>國家:</b>"
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Family:</b>"
+msgstr "<b>姓:</b>"
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>Department:</b>"
-msgstr "<b>部門:</b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail:</b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Given:</b>"
+msgstr "<b>名稱:</b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:13
-msgid "<b>Extra Address:</b>"
-msgstr "<b>附加位址:</b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Middle:</b>"
+msgstr "<b>中間名稱:</b>"
 
-#. Family Name
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:15
-msgid "<b>Family:</b>"
-msgstr "<b>姓:</b>"
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Prefix:</b>"
+msgstr "<b>字首:</b>"
 
-#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:16
-msgid "<b>Full Name</b>"
-msgstr "<b>全名稱</b>"
+#. Suffix in Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "<b>Suffix:</b>"
+msgstr "<b>字尾:</b>"
 
-#. Given Name
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Given:</b>"
-msgstr "<b>名稱:</b>"
+#: ../data/gui/vcard_information_window.ui.h:39
+msgid "<b>Full Name</b>"
+msgstr "<b>全名稱</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:19
-msgid "<b>Homepage:</b>"
-msgstr "<b>首頁:</b>"
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Street:</b>"
+msgstr "<b>街道:</b>"
+
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:20
+msgid "<b>Extra Address:</b>"
+msgstr "<b>附加位址:</b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Middle:</b>"
-msgstr "<b>中間名稱:</b>"
+#: ../data/gui/vcard_information_window.ui.h:18
+msgid "<b>City:</b>"
+msgstr "<b>城市:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Name:</b>"
-msgstr "<b>名稱:</b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Postal Code:</b>"
+msgstr "<b>郵遞區號:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Nickname:</b>"
-msgstr "<b>暱稱:</b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>State:</b>"
+msgstr "<b>州:</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Phone No.:</b>"
-msgstr "<b>電話號碼:</b>"
+#: ../data/gui/vcard_information_window.ui.h:22
+msgid "<b>Country:</b>"
+msgstr "<b>國家:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Position:</b>"
-msgstr "<b>職位:</b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Address</b>"
+msgstr "<b>位址</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:27
-msgid "<b>Postal Code:</b>"
-msgstr "<b>郵遞區號:</b>"
+#: ../data/gui/vcard_information_window.ui.h:24
+msgid "<b>Homepage:</b>"
+msgstr "<b>首頁:</b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail:</b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:29
-msgid "<b>Prefix:</b>"
-msgstr "<b>字首:</b>"
+#: ../data/gui/vcard_information_window.ui.h:26
+msgid "<b>Phone No.:</b>"
+msgstr "<b>電話號碼:</b>"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>Role:</b>"
-msgstr "<b>角色:</b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>頭像:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:32
-msgid "<b>State:</b>"
-msgstr "<b>州:</b>"
+msgid "Click to set your avatar"
+msgstr "按一下以設定您的頭像"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:34
-msgid "<b>Street:</b>"
-msgstr "<b>街道:</b>"
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "Format: YYYY-MM-DD"
+msgstr "格式:  YYYY-MM-DD"
+
+#: ../data/gui/profile_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>Birthday:</b>"
+msgstr "<b>生日:</b>"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:38
-msgid "<b>Suffix:</b>"
-msgstr "<b>字尾:</b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "個人資訊"
 
-#. "About" is the text of a tab of vcard window
-#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/profile_window.ui.h:30
 #: ../data/gui/vcard_information_window.ui.h:42
-msgid "About"
-msgstr "關於"
+msgid "<b>Company:</b>"
+msgstr "<b>公司:</b>"
+
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Department:</b>"
+msgstr "<b>部門:</b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "按一下以設定您的頭像"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Position:</b>"
+msgstr "<b>職位:</b>"
 
 #: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:46
-msgid "Format: YYYY-MM-DD"
-msgstr "格式:  YYYY-MM-DD"
+#: ../data/gui/vcard_information_window.ui.h:45
+msgid "<b>Role:</b>"
+msgstr "<b>角色:</b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "Personal Info"
-msgstr "個人資訊"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "工作"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>您想要做什麼?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "關於"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "僅從 Gajim 移除帳號(_O)"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "同時從 Gajim 和伺服器移除帳號(_S)"
 
-#. Remove group
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>您想要做什麼?</b>"
+
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5639
-#: ../src/roster_window.py:5764 ../src/roster_window.py:5894
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5869
 msgid "_Remove"
 msgstr "移除(_R)"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
-msgid ""
-"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
-"your roster."
-msgstr ""
-"<b>someone@somewhere.com</b> 希望您向您的聯絡人清單 <b>加入</b> 一些聯絡人。"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr "訊息標準 <目前未被使用，因此會被自動隱藏>"
 
-#: ../data/gui/roster_item_exchange_window.ui.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Roster Item Exchange"
 msgstr "聯絡人清單項交換"
 
-#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "確定(_O)"
 
-#: ../data/gui/roster_window.ui.h:1
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/roster_window.ui.h:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "動作(_A)"
+
+#: ../data/gui/roster_window.ui.h:6
 msgid "Add _Contact..."
 msgstr "加入聯絡人(_C)…"
 
-#: ../data/gui/roster_window.ui.h:2
-msgid "Fea_tures"
-msgstr "特性(_T)"
-
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "檔案傳輸(_T)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1518
+msgid "_Edit"
+msgstr "編輯(_E)"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "被頻繁提問的問題 (線上)"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "帳號(_A)"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "線上求助"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "側寫，頭像(V)"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr "外掛程式(_L)"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "側寫，頭像(V)"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "檢視(_V)"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "顯示離線聯絡人"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "只顯示活動的聯絡人(_A)"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "顯示代理(_P)"
 
-#: ../data/gui/roster_window.ui.h:13
-msgid "Show _Offline Contacts"
-msgstr "顯示離線聯絡人"
-
-#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:352
 msgid "Show _Roster"
 msgstr "顯示聯絡人清單(_R)"
 
-#: ../data/gui/roster_window.ui.h:15
-msgid "_Accounts"
-msgstr "帳號(_A)"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "檔案傳輸(_T)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:16
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "動作(_A)"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "求助(_H)"
 
-#: ../data/gui/roster_window.ui.h:18
+#: ../data/gui/roster_window.ui.h:21
+msgid "Help online"
+msgstr "線上求助"
+
+#: ../data/gui/roster_window.ui.h:22
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "編輯(_E)"
+#: ../data/gui/roster_window.ui.h:23
+msgid "Frequently Asked Questions (online)"
+msgstr "被頻繁提問的問題 (線上)"
 
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:24
 msgid "_FAQ"
 msgstr "常見問題(_A)"
 
-#: ../data/gui/roster_window.ui.h:22
-msgid "_Help"
-msgstr "求助(_H)"
-
 #: ../data/gui/roster_window.ui.h:25
-msgid "_View"
-msgstr "檢視(_V)"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "請等待，正在搜尋…"
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "特性(_T)"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1 ../src/disco.py:1375
 msgid "Search"
 msgstr "搜尋"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "請等待，正在搜尋…"
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "加入聯絡人(_C)"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5906
+#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:627
 msgid "_Information"
 msgstr "資訊(_I)"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
+#: ../data/gui/search_window.ui.h:5
 msgid "_Search"
 msgstr "搜尋(_S)"
 
 #: ../data/gui/service_discovery_window.ui.h:1
-msgid "G_o"
-msgstr "前往(_O)"
-
-#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "位址(_A):"
 
+#: ../data/gui/service_discovery_window.ui.h:2
+msgid "G_o"
+msgstr "前往(_O)"
+
 #: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "註冊到"
 
-#: ../data/gui/service_registration_window.ui.h:2
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "回復本條訊息"
+#: ../data/gui/single_message_window.ui.h:2
+msgid "To:"
+msgstr "到:"
 
 #: ../data/gui/single_message_window.ui.h:4
-msgid "Sen_d"
-msgstr "傳送(_D)"
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "傳送訊息"
+msgid "Sen_d"
+msgstr "傳送(_D)"
 
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "傳送訊息並關閉視窗"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "回復(_R)"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "到:"
+msgid "Reply to this message"
+msgstr "回復本條訊息"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "回復(_R)"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "傳送並關閉(_S)"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "傳送訊息並關閉視窗"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "授權(_T)"
+msgid "Subscription Request"
+msgstr "認證請求"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "向聯絡人授權則他/她將知道您是否線上"
+msgid "_Deny"
+msgstr "拒絕(_D)"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2665,186 +2806,221 @@ msgid ""
 "connected"
 msgstr "拒絕向聯絡人授權則他/她將無法知道您是否線上"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "認證請求"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "授權(_T)"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "拒絕(_D)"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "向聯絡人授權則他/她將知道您是否線上"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "同步聯絡人"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "選擇您想要與之同步的帳號"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "選擇您想要同步的聯絡人"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "同步: 選擇聯絡人"
 
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "選擇您想要同步的聯絡人"
+
 #: ../data/gui/systray_context_menu.ui.h:1
+msgid "Sta_tus"
+msgstr "狀態(_T)"
+
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "顯示所有未處理事件(_E)"
+
+#: ../data/gui/systray_context_menu.ui.h:6
 msgid "Mute Sounds"
 msgstr "靜音"
 
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "傳送單條訊息(_M)"
+#: ../data/gui/tooltip_gc_contact.ui.h:2
+#: ../data/gui/tooltip_roster_contact.ui.h:2
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "Resource:"
+msgstr "資源:"
 
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "顯示所有未處理事件(_E)"
+#: ../data/gui/tooltip_roster_contact.ui.h:3
+#: ../data/gui/zeroconf_information_window.ui.h:4
+msgid "Status:"
+msgstr "狀態:"
 
-#: ../data/gui/systray_context_menu.ui.h:4
-msgid "Sta_tus"
-msgstr "狀態(_T)"
+#: ../data/gui/tooltip_roster_contact.ui.h:4
+#, fuzzy
+msgid "Idle since:"
+msgstr "閒置，自從 %s"
 
-#: ../data/gui/systray_context_menu.ui.h:5
-msgid "_Group Chat"
-msgstr "多人聊天(_G)"
+#: ../data/gui/tooltip_roster_contact.ui.h:5
+#, fuzzy
+msgid "Idle for:"
+msgstr "閒置了 %s"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>請求:</b>"
+#: ../data/gui/tooltip_roster_contact.ui.h:8
+#, fuzzy
+msgid "Tune:"
+msgstr "音樂: %s"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>客戶端:</b>"
+#: ../data/gui/tooltip_roster_contact.ui.h:9
+#, fuzzy
+msgid "Location:"
+msgstr "位置: %s"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Configured avatar:</b>"
-msgstr "<b>已設定頭像:</b>"
+#: ../data/gui/tooltip_roster_contact.ui.h:10
+#, fuzzy
+msgid "OpenPGP:"
+msgstr "OpenPGP: "
 
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Contact time:</b>"
-msgstr "<b>聯絡人時間:</b>"
+#: ../data/gui/tooltip_roster_contact.ui.h:11
+#, fuzzy
+msgid "Subscription:"
+msgstr "認證: "
 
-#: ../data/gui/vcard_information_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "聯絡人資訊"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>資源:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>狀態:</b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:36
-msgid "<b>Subscription:</b>"
-msgstr "<b>認證:</b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>客戶端:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:39
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>系統:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>聯絡人時間:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>User avatar:</b>"
 msgstr "<b>使用者頭像:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:43
-msgid "Comments"
-msgstr "註釋"
+#: ../data/gui/vcard_information_window.ui.h:9
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>已設定頭像:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-#: ../data/gui/zeroconf_information_window.ui.h:1
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Ask:</b>"
+msgstr "<b>請求:</b>"
+
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Subscription:</b>"
+msgstr "<b>認證:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Contact"
 msgstr "聯絡人"
 
-#: ../data/gui/vcard_information_window.ui.h:45
-msgid "Contact Information"
-msgstr "聯絡人資訊"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "button"
+msgstr ""
 
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "More"
-msgstr "更多"
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "註釋"
 
 #: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>過濾器</b>"
-
-#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber 通信</b>"
 
+#. XML Console enable checkbutton
 #: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML 輸入</b>"
+msgid "_Enable"
+msgstr "啟用(_E)"
 
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "隱藏 IN stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
-msgstr "隱藏 IQ stanzas"
+msgid "Hide OUT stanzas"
+msgstr "隱藏 OUT stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
-msgstr "隱藏 Message stanzas"
+msgid "Hide Presence stanzas"
+msgstr "隱藏 Presence stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
-msgstr "隱藏 OUT stanzas"
+msgid "Hide IQ stanzas"
+msgstr "隱藏 IQ stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
-msgstr "隱藏 Presence stanzas"
+msgid "Hide Message stanzas"
+msgstr "隱藏 Message stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "資訊/查詢"
+msgid "<b>Filter</b>"
+msgstr "<b>過濾器</b>"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/gui/xml_console_window.ui.h:13
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/gui/xml_console_window.ui.h:14
-msgid "_Message"
-msgstr "_Message"
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "資訊/查詢"
 
-#: ../data/gui/xml_console_window.ui.h:15
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_Presence"
 msgstr "_Presence"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
-msgid "_Modify Account..."
-msgstr "修改帳號(_M)…"
+#: ../data/gui/xml_console_window.ui.h:14
+msgid "_Message"
+msgstr "_Message"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML 輸入</b>"
+
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "本地 JID:"
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:11
 msgid "Personal"
 msgstr "個人"
 
-#: ../data/gui/zeroconf_information_window.ui.h:8
-msgid "Resource:"
-msgstr "資源:"
-
-#: ../data/gui/zeroconf_information_window.ui.h:9
-msgid "Status:"
-msgstr "狀態:"
+#: ../data/gajim-remote.desktop.in.in.h:1
+msgid "Open URI using Gajim"
+msgstr ""
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "一個 GTK+ 的 Jabber 客戶端"
+#: ../data/gajim-remote.desktop.in.in.h:2 ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+msgstr ""
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim 即時訊息軟體"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber 即時訊息客戶端"
 
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "一個 GTK+ 的 Jabber 客戶端"
+
 #: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "取消確認"
@@ -2862,7 +3038,7 @@ msgstr "不合法的格式"
 msgid "The form is not filled correctly."
 msgstr "表格沒有被正確地填寫。"
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:414
 msgid "Service sent malformed data"
 msgstr "服務傳送了異常的資料"
 
@@ -2870,312 +3046,256 @@ msgstr "服務傳送了異常的資料"
 msgid "Service changed the session identifier."
 msgstr "服務變更了作業階段識別碼"
 
+#: ../src/adhoc_commands.py:419
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc 命令 - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:514
 msgid "Service returned an error."
 msgstr "服務回傳了一個錯誤。"
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:94
 msgid "Activated"
 msgstr "啟用的"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:94
 msgid "Deactivated"
 msgstr "未啟用的"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:96
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:97
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:98
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1050
-msgid "Color"
-msgstr "Color"
-
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:110
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:117
 msgid "Value"
 msgstr "值"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:126
 msgid "Type"
 msgstr "類型"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:182
 msgid "(None)"
 msgstr "(無)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:312
 msgid "Hidden"
 msgstr "隱藏"
 
-#: ../src/atom_window.py:123
-#, python-format
-msgid "You have received new entries (and %d not displayed):"
-msgid_plural "You have received new entries (and %d not displayed):"
-msgstr[0] "您收到了新的事件 (還有 %d 個沒有顯示)"
-
-#. the next script, executed in the "po" directory,
-#. generates the following list.
-#. #!/bin/sh
-#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
-#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:84
-msgid "English"
-msgstr "英語"
-
-#: ../src/chat_control.py:84
-msgid "Belarusian"
-msgstr "白俄語"
-
-#: ../src/chat_control.py:84
-msgid "Bulgarian"
-msgstr "保加利亞語"
-
-#: ../src/chat_control.py:84
-msgid "Breton"
-msgstr "布列塔尼語"
-
-#: ../src/chat_control.py:84
-msgid "Czech"
-msgstr "捷克語"
-
-#: ../src/chat_control.py:84
-msgid "German"
-msgstr "德語"
-
-#: ../src/chat_control.py:84
-msgid "Greek"
-msgstr "希臘語"
-
-#: ../src/chat_control.py:84
-msgid "British"
-msgstr "英語(英國)"
-
-#: ../src/chat_control.py:84
-msgid "Esperanto"
-msgstr "世界語"
-
-#: ../src/chat_control.py:84
-msgid "Spanish"
-msgstr "西班牙語"
-
-#: ../src/chat_control.py:84
-msgid "Basque"
-msgstr "巴斯克語"
-
-#: ../src/chat_control.py:84
-msgid "French"
-msgstr "法語"
-
-#: ../src/chat_control.py:84
-msgid "Croatian"
-msgstr "克羅埃西亞語"
-
-#: ../src/chat_control.py:84
-msgid "Italian"
-msgstr "義大利語"
-
-#: ../src/chat_control.py:84
-msgid "Norwegian (b)"
-msgstr "挪威語 (b)"
-
-#: ../src/chat_control.py:84
-msgid "Dutch"
-msgstr "荷蘭語"
-
-#: ../src/chat_control.py:84
-msgid "Norwegian"
-msgstr "挪威語"
-
-#: ../src/chat_control.py:84
-msgid "Polish"
-msgstr "波蘭語"
+#: ../src/application.py:49
+#, fuzzy
+msgid "Show the application's version"
+msgstr "在通知區域顯示圖示:"
 
-#: ../src/chat_control.py:84
-msgid "Portuguese"
-msgstr "葡萄牙語"
+#: ../src/application.py:52
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "只顯示在聯絡人清單中"
 
-#: ../src/chat_control.py:84
-msgid "Brazilian Portuguese"
-msgstr "巴西葡萄牙語"
+#: ../src/application.py:55
+msgid "Separate profile files completely (even history db and plugins)"
+msgstr ""
 
-#: ../src/chat_control.py:84
-msgid "Russian"
-msgstr "俄語"
+#: ../src/application.py:59
+msgid "Print xml stanzas and other debug information"
+msgstr ""
 
-#: ../src/chat_control.py:84
-msgid "Serbian"
-msgstr "塞爾維亞語"
+#: ../src/application.py:63
+msgid "Print stdout/stderr to the console on Windows"
+msgstr ""
 
-#: ../src/chat_control.py:84
-msgid "Slovak"
-msgstr "斯洛伐克語"
+#: ../src/application.py:67
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "進階設定編輯器"
 
-#: ../src/chat_control.py:84
-msgid "Swedish"
-msgstr "瑞典語"
+#: ../src/application.py:71
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s 設定錯誤"
 
-#: ../src/chat_control.py:84
-msgid "Chinese (Ch)"
-msgstr "漢語"
+#: ../src/application.py:74
+#, fuzzy
+msgid "Configure logging system"
+msgstr "組配 %s"
 
-#: ../src/chat_control.py:227
-msgid "Ping?"
-msgstr "Ping?"
+#: ../src/application.py:119 ../src/chat_control.py:1671
+#: ../src/common/connection.py:550 ../src/common/connection_handlers.py:1079
+#: ../src/common/connection_handlers.py:1255
+#: ../src/common/connection_handlers_events.py:956 ../src/common/logger.py:1177
+#: ../src/session.py:110
+msgid "Database Error"
+msgstr "資料庫錯誤"
 
-#: ../src/chat_control.py:232
+#: ../src/application.py:121 ../src/common/connection.py:551
+#: ../src/common/connection_handlers.py:1080
+#: ../src/common/connection_handlers.py:1256
+#: ../src/common/connection_handlers_events.py:957 ../src/common/logger.py:1178
+#: ../src/session.py:111
 #, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/chat_control.py:237
-msgid "Error."
-msgstr "錯誤。"
-
-#: ../src/chat_control.py:562
-msgid "Spelling language"
-msgstr "拼寫語言"
-
-#. we are not connected
-#: ../src/chat_control.py:594 ../src/chat_control.py:810
-msgid "A connection is not available"
-msgstr "一個連線無法使用"
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"資料庫檔案 (%s) 不能被讀取。請嘗試修復它(參考 http://trac.gajim.org/wiki/"
+"DatabaseBackup)或移除它(所有命令歷程記錄將丟失)。"
 
-#: ../src/chat_control.py:595 ../src/chat_control.py:811
-msgid "Your message can not be sent until you are connected."
-msgstr "連線之後您的訊息才能傳送"
+#: ../src/atom_window.py:124
+#, python-format
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "您收到了新的事件 (還有 %d 個沒有顯示)"
 
-#: ../src/chat_control.py:1032
-msgid "Underline"
-msgstr "底線"
+#: ../src/chat_control.py:307 ../src/chat_control.py:911
+#, fuzzy
+msgid "OpenPGP encryption enabled"
+msgstr "GPG 加密已啟用"
 
-#: ../src/chat_control.py:1033
-msgid "Strike"
-msgstr "劃去"
+#: ../src/chat_control.py:369
+msgid "Formattings are not available when GPG is active"
+msgstr ""
 
-#: ../src/chat_control.py:1056
-msgid "Font"
-msgstr "字型"
+#: ../src/chat_control.py:372
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "這個聯絡人不支援檔案傳輸"
 
-#: ../src/chat_control.py:1065
-msgid "Clear formating"
-msgstr "清楚格式"
+#. Add to roster
+#: ../src/chat_control.py:377 ../src/common/contacts.py:156
+#: ../src/common/contacts.py:277 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:282 ../src/dialogs.py:1121 ../src/dialogs.py:2352
+#: ../src/dialogs.py:2381 ../src/dialogs.py:3595 ../src/gui_interface.py:493
+#: ../src/gui_menu_builder.py:292 ../src/gui_menu_builder.py:446
+#: ../src/roster_window.py:791 ../src/roster_window.py:1757
+#: ../src/roster_window.py:1759 ../src/roster_window.py:2093
+#: ../src/roster_window.py:3556 ../src/roster_window.py:3583
+msgid "Not in Roster"
+msgstr "不在聯絡人清單中"
 
-#: ../src/chat_control.py:1142
-msgid "Really send file?"
-msgstr "確定要傳送檔案?"
+#. change tooltip text for audio and video buttons if farstream is
+#. not installed
+#: ../src/chat_control.py:402
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "切換語音作業階段"
 
-#: ../src/chat_control.py:1143
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "如果您想 %s 傳送檔案，他/她會獲知您的真實 Jabber ID。"
+#: ../src/chat_control.py:403
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "切換視訊作業階段"
 
-#: ../src/chat_control.py:1623 ../src/chat_control.py:2135
-msgid "GPG encryption enabled"
-msgstr "GPG 加密已啟用"
+#: ../src/chat_control.py:405
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "特性在 Windows 下無法使用。"
 
-#: ../src/chat_control.py:1644 ../src/chat_control.py:1647
-msgid "Requires python-farsight."
-msgstr "需要 python-farsight。"
+#: ../src/chat_control.py:409
+msgid "Feature not supported by remote client"
+msgstr ""
 
-#. Add to roster
-#: ../src/chat_control.py:1673 ../src/common/contacts.py:149
-#: ../src/common/contacts.py:270 ../src/common/helpers.py:60
-#: ../src/common/helpers.py:254 ../src/dialogs.py:1099 ../src/dialogs.py:2222
-#: ../src/dialogs.py:2251 ../src/gui_interface.py:467
-#: ../src/gui_menu_builder.py:254 ../src/gui_menu_builder.py:404
-#: ../src/roster_window.py:1644 ../src/roster_window.py:1646
-#: ../src/roster_window.py:1979 ../src/roster_window.py:3507
-#: ../src/roster_window.py:3534
-msgid "Not in Roster"
-msgstr "不在聯絡人清單中"
+#: ../src/chat_control.py:422
+#, fuzzy
+msgid "Send files"
+msgstr "傳送檔案(_F)"
 
-#: ../src/chat_control.py:1704
+#: ../src/chat_control.py:428
 msgid "This contact does not support file transfer."
 msgstr "這個聯絡人不支援檔案傳輸"
 
-#: ../src/chat_control.py:1707
+#: ../src/chat_control.py:431
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "您需要知道這個聯絡人的真實 JID 才能向他/她傳送檔案。"
 
-#: ../src/chat_control.py:1814
+#: ../src/chat_control.py:549
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 狀態: %(state)s，原因: %(reason)s"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:649 ../src/profile_window.py:214 ../src/vcard.py:210
+#: ../src/vcard.py:576
+#, fuzzy
+msgid "Save _As"
+msgstr "儲存在: %s"
+
+#: ../src/chat_control.py:753
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "聊天室 %(room_name)s 的 %(nickname)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:2115 ../src/dialogs.py:5027
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:891 ../src/dialogs.py:5403
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "沒有指定 GPG 密鑰"
 
-#: ../src/chat_control.py:2116
+#: ../src/chat_control.py:892
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr "尚未為這個聯絡人指定 GPG 密鑰。因此您不能用 GPG 加密資訊。"
 
-#: ../src/chat_control.py:2125
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:901
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG 加密已停用"
 
-#: ../src/chat_control.py:2151
+#: ../src/chat_control.py:927
 msgid "Session WILL be logged"
 msgstr "作業階段將被記錄"
 
-#: ../src/chat_control.py:2153
+#: ../src/chat_control.py:929
 msgid "Session WILL NOT be logged"
 msgstr "作業階段將不會被記錄"
 
 #. encryption %s active
-#: ../src/chat_control.py:2170
+#: ../src/chat_control.py:946
 msgid "is"
 msgstr "是"
 
-#: ../src/chat_control.py:2170
+#: ../src/chat_control.py:946
 msgid "is NOT"
 msgstr "不是"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2172
+#: ../src/chat_control.py:948
 msgid "will"
 msgstr "會"
 
-#: ../src/chat_control.py:2172
+#: ../src/chat_control.py:948
 msgid "will NOT"
 msgstr "不會"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2176
+#: ../src/chat_control.py:952
 msgid "and authenticated"
 msgstr "且已被認證"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2180
+#: ../src/chat_control.py:956
 msgid "and NOT authenticated"
 msgstr "且未被認證"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:2187
+#: ../src/chat_control.py:963
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3184,69 +3304,66 @@ msgstr ""
 "%(type)s 加密 %(status)s 活動 %(authenticated)s。\n"
 "您的聊天作業階段 %(logged)s 將被記錄。"
 
-#: ../src/chat_control.py:2331
+#: ../src/chat_control.py:1102
 msgid "Session negotiation cancelled"
 msgstr "作業階段協商已取消"
 
-#: ../src/chat_control.py:2341
+#: ../src/chat_control.py:1112
 msgid "This session WILL be archived on server"
 msgstr "本次作業階段將在伺服器上被存檔"
 
-#: ../src/chat_control.py:2343
+#: ../src/chat_control.py:1114
 msgid "This session WILL NOT be archived on server"
 msgstr "本次作業階段將不會在伺服器上被存檔"
 
-#: ../src/chat_control.py:2352
+#: ../src/chat_control.py:1123
 msgid "This session is encrypted"
 msgstr "本次作業階段已被加密"
 
-#: ../src/chat_control.py:2355
+#: ../src/chat_control.py:1126
 msgid " and WILL be logged"
 msgstr "且會被記錄"
 
-#: ../src/chat_control.py:2357
+#: ../src/chat_control.py:1128
 msgid " and WILL NOT be logged"
 msgstr "且不會被記錄"
 
-#: ../src/chat_control.py:2362
+#: ../src/chat_control.py:1133
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "遠端聯絡人的身分未確認。點擊盾型按鈕檢視詳情。"
 
-#: ../src/chat_control.py:2364
+#: ../src/chat_control.py:1135
 msgid "E2E encryption disabled"
 msgstr "E2E 加密被停用"
 
-#: ../src/chat_control.py:2408 ../src/chat_control.py:2421
+#: ../src/chat_control.py:1184 ../src/chat_control.py:1198
 msgid "The following message was NOT encrypted"
 msgstr "下面的訊息沒有被加密"
 
-#: ../src/chat_control.py:2414
+#: ../src/chat_control.py:1190
 msgid "The following message was encrypted"
 msgstr "下面的訊息是加密的"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2685
+#: ../src/chat_control.py:1488
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "您剛剛收到一條來自 \"%s\" 的訊息"
 
-#: ../src/chat_control.py:2686
+#: ../src/chat_control.py:1490
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您關閉此標籤並且停用了命令歷程，此訊息會丟失。"
 
-#: ../src/chat_control.py:2853 ../src/common/connection_handlers_events.py:864
-#: ../src/common/connection_handlers.py:945
-#: ../src/common/connection_handlers.py:1055
-#: ../src/common/connection_handlers.py:1712 ../src/common/connection.py:451
-#: ../src/common/logger.py:1126 ../src/gajim.py:208 ../src/session.py:97
-msgid "Database Error"
-msgstr "資料庫錯誤"
+#: ../src/chat_control.py:1521 ../src/groupchat_control.py:1390
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:2854
+#: ../src/chat_control.py:1672
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3254,7 +3371,16 @@ msgid ""
 msgstr ""
 "資料庫檔案 (%s) 不能被讀取。請嘗試修復它或是移除它(所有命令歷程記錄會丟失)。"
 
-#: ../src/chat_control.py:3090 ../src/gui_interface.py:1032
+#: ../src/chat_control.py:1704
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"主題: %(subject)s\n"
+"%(message)s"
+
+#: ../src/chat_control.py:1883 ../src/gui_interface.py:1197
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -3263,12 +3389,302 @@ msgstr ""
 "無法解密來自 %s 的訊息\n"
 "它可能被篡改了。"
 
-#: ../src/chat_control.py:3123
+#: ../src/chat_control.py:1940
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s 的狀態是 %(status)s"
 
-#: ../src/common/check_paths.py:38
+#: ../src/chat_control.py:1999
+#, fuzzy
+msgid "File transfer"
+msgstr "檔案傳輸"
+
+#: ../src/chat_control.py:2002
+#, fuzzy
+msgid "Size"
+msgstr "大小:  %s"
+
+#: ../src/chat_control.py:2004
+#, fuzzy
+msgid "_Accept"
+msgstr "帳號(_A)"
+
+#: ../src/chat_control.py:2025 ../src/filetransfers_window.py:212
+msgid "File transfer completed"
+msgstr "檔案傳輸已完成"
+
+#: ../src/chat_control.py:2057 ../src/dialogs.py:2983 ../src/dialogs.py:4830
+#: ../src/gui_interface.py:665 ../src/notify.py:289
+msgid "Groupchat Invitation"
+msgstr "多人聊天邀請"
+
+#: ../src/chat_control.py:2079 ../src/gui_interface.py:1040
+#: ../src/roster_window.py:2016
+msgid "Remote contact stopped transfer"
+msgstr "遠端聯絡人停止了傳輸"
+
+#: ../src/chat_control.py:2081 ../src/gui_interface.py:1043
+#: ../src/roster_window.py:2018
+msgid "Error opening file"
+msgstr "開啟檔案錯誤"
+
+#: ../src/chat_control.py:2083 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "檔案傳輸已停止"
+
+#: ../src/chat_control.py:2086 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:234
+msgid "File transfer cancelled"
+msgstr "檔案傳輸已取消"
+
+#: ../src/chat_control.py:2087 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:235
+msgid "Connection with peer cannot be established."
+msgstr "無法與對方建立連線。"
+
+#. Example string. Do not translate
+#: ../src/command_system/implementation/custom.py:106
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:72
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+msgid "Hide the chat buttons"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "向聯絡人傳送檔案"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr " %s 找不到"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:270
+#: ../src/tooltips.py:913
+msgid "Away"
+msgstr "離開"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+#, fuzzy
+msgid "Available"
+msgstr "離開很久了"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "隱藏該視窗"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "切換Open_PGP加密"
+
+#: ../src/command_system/implementation/standard.py:195
+#: ../src/command_system/implementation/standard.py:415
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "向聯絡人傳送檔案"
+
+#: ../src/command_system/implementation/standard.py:198
+#: ../src/command_system/implementation/standard.py:418
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s 不是一個合法的日誌層級"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "一個連線無法使用"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "連線無法使用"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "變更您的暱稱(Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3439
+#: ../src/dialogs.py:2195
+msgid "Invalid nickname"
+msgstr "無效的暱稱"
+
+#: ../src/command_system/implementation/standard.py:284
+msgid "Open a private chat window with a specified occupant"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "要使用的暱稱"
+
+#: ../src/command_system/implementation/standard.py:293
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "關閉多人聊天標籤/視窗前詢問。"
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "傳送 %s 給 %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "您被邀請到一個聊天室"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "無效的伺服器"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "歸屬變更"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "%s 不是一個聊天室的名稱。"
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:164 ../src/command_system/mapping.py:174
+#: ../src/command_system/mapping.py:194
+#, fuzzy
+msgid "Missing arguments"
+msgstr "缺失的\"聯絡人 JID\"參數"
+
+#: ../src/command_system/mapping.py:261
+msgid "Excessive arguments"
+msgstr ""
+
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "建立日誌資料庫"
 
@@ -3276,220 +3692,274 @@ msgstr "建立日誌資料庫"
 msgid "creating cache database"
 msgstr "建立快取資料庫"
 
-#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
-#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
-#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
-#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:248
+#, fuzzy, python-format
+msgid "moving %s to %s"
+msgstr "傳送 %s 給 %s"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:316 ../src/common/check_paths.py:323
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 是一個檔案但它應該是一個目錄"
 
-#: ../src/common/check_paths.py:276 ../src/common/check_paths.py:283
-#: ../src/common/check_paths.py:290 ../src/common/check_paths.py:297
-#: ../src/common/check_paths.py:304 ../src/common/check_paths.py:311
-#: ../src/common/check_paths.py:318 ../src/common/check_paths.py:325
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
+#: ../src/common/check_paths.py:275 ../src/common/check_paths.py:282
+#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
+#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:336 ../src/common/check_paths.py:344
 msgid "Gajim will now exit"
 msgstr "Gajim 即將離開"
 
-#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一個目錄但它應該是一個檔案"
 
-#: ../src/common/check_paths.py:352
-#, python-format
-msgid "creating %s directory"
-msgstr "正在建立 %s 目錄"
-
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "變更狀態資訊"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "變更狀態"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "設定狀態類型與描述"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "和我聊天吧"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "線上"
 
-#: ../src/common/commands.py:106 ../src/common/helpers.py:242
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "離開"
-
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "離開很久了"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "請無打擾"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "離線 - 未連線"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "狀態描述:"
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:329
 msgid "The status has been changed."
 msgstr "狀態發生了變化。"
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "離開聊天室"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "聊天室 %(room_jid)s 的 %(nickname)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "您還沒有加入聊天室。"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "選擇您想要離開的聊天室"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212 ../src/common/contacts.py:128
-#: ../src/common/helpers.py:60 ../src/roster_window.py:817
-#: ../src/roster_window.py:1648 ../src/roster_window.py:1650
-#: ../src/roster_window.py:2512 ../src/roster_window.py:5524
+#: ../src/common/commands.py:216 ../src/common/contacts.py:135
+#: ../src/common/helpers.py:73 ../src/roster_window.py:844
+#: ../src/roster_window.py:1761 ../src/roster_window.py:1763
+#: ../src/roster_window.py:2629 ../src/roster_window.py:5655
 msgid "Groupchats"
 msgstr "多人聊天"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "您離開了下列聊天室:"
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "轉發未讀訊息"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "所有未讀訊息都已被轉發。"
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 msgid "Forward unread message then disconnect"
 msgstr " 轉發未讀訊息然後中斷連線"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:74
+msgid ""
+"Show desktop notification even when a chat window is opened for this contact "
+"and does not have focus"
+msgstr ""
+
+#: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr "在用於忙是播放聲音"
 
-#: ../src/common/config.py:77
+#: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "使用 D-Bus 和通知處理序顯示通知"
 
-#: ../src/common/config.py:79
+#: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
 msgstr "在聯絡人清單中只顯示線上和和我聊天吧的聯絡人。"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
 msgstr "時間，以分鐘為單位。在此時間後將狀態變更為離開。"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (離開，因為閒置超過了$T分鐘)"
 
-#: ../src/common/config.py:83
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#: ../src/common/config.py:82
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr "$S 會被目前的狀態訊息替換，$T 會被自動離開的時間替換。"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "時間，以分鐘為單位。在此時間後將狀態變更為離開很久了。"
 
-#: ../src/common/config.py:86
+#: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (離開很久了，因為閒置超過了$T分鐘)"
 
-#: ../src/common/config.py:86
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#: ../src/common/config.py:85
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr "$S 會被目前的狀態訊息替換，$T 會被自動無法使用的時間替換。"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:88
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr "何時在通知區域顯示圖示。可以是'永遠不'，'當有未處理的事件時'，'總是'。"
 
-#: ../src/common/config.py:90
+#: ../src/common/config.py:89
 msgid "Allow to hide the roster window even if the tray icon is not shown."
 msgstr "即使系統匣圖示未顯示，仍然允許隱藏名冊視窗。"
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:94
 msgid "Incoming nickname color."
 msgstr "收到訊息的暱稱顏色。"
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:95
 msgid "Outgoing nickname color."
 msgstr "發出訊息的暱稱顏色。"
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:96
 msgid "Incoming text color."
 msgstr "收到訊息的文字顏色。"
 
-#: ../src/common/config.py:98
+#: ../src/common/config.py:97
 msgid "Outgoing text color."
 msgstr "發出訊息的文字顏色。"
 
-#: ../src/common/config.py:99
+#: ../src/common/config.py:98
 msgid "Status message text color."
 msgstr "狀態訊息文字顏色"
 
+#: ../src/common/config.py:101
+msgid "Contact signed in notification color."
+msgstr ""
+
+#. limegreen
 #: ../src/common/config.py:102
+msgid "Contact signout notification color"
+msgstr ""
+
+#. red
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "在彈出提示中預覽訊息?"
+
+#. dodgerblue
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "檔案傳輸請求"
+
+#. khaki
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "檔案傳輸已取消"
+
+#. firebrick
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "當檔案傳輸完成時彈出提示"
+
+#. yellowgreen
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "多人聊天邀請"
+
+#. tan1
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Background color of status changed notification"
+msgstr "當聯絡人剛剛登入時的背景色。"
+
+#. thistle2
+#: ../src/common/config.py:109
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:110
 msgid "Incoming nickname font."
 msgstr "收到訊息的暱稱的字型。"
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:111
 msgid "Outgoing nickname font."
 msgstr "發出訊息的暱稱字型。"
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:112
 msgid "Incoming text font."
 msgstr "收到訊息的文字字型。"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:113
 msgid "Outgoing text font."
 msgstr "發出訊息的文字字型。"
 
-#: ../src/common/config.py:106
+#: ../src/common/config.py:114
 msgid "Status message text font."
 msgstr "狀態訊息文字字型。"
 
-#: ../src/common/config.py:107
+#: ../src/common/config.py:115
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "折疊的列(帳號和組)的清單(空格分隔)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:108 ../src/common/config.py:496
-#: ../src/common/optparser.py:296 ../src/common/optparser.py:492
-#: ../src/common/optparser.py:526 ../src/gui_interface.py:2634
+#: ../src/common/config.py:116 ../src/common/config.py:537
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:500
+#: ../src/common/optparser.py:534 ../src/gui_interface.py:2850
 msgid "default"
 msgstr "預設"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:122
 msgid "Language used by speller"
 msgstr "拼寫檢查的語言"
 
-#: ../src/common/config.py:115
+#: ../src/common/config.py:123
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3499,7 +3969,7 @@ msgstr ""
 "'有時' - 如 iChat 風格每隔幾分鐘顯示時間。\n"
 "'永遠不' - 永遠不顯示時間。"
 
-#: ../src/common/config.py:116
+#: ../src/common/config.py:124
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3508,16 +3978,16 @@ msgstr ""
 "使用模糊時鐘列印時間。模糊度的值從 1 到 4，或是 0 停用模糊時鐘。1 是最精確的"
 "時鐘，4 是最不精確的。只在'有時'顯示時間時使用。"
 
-#: ../src/common/config.py:119
+#: ../src/common/config.py:127
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "將成對出現的 * / _ 視為可能的格式控制字元。"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:128
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果為真，則不移除 */_。這樣 *abc* 將被加粗但 * * 不會被移除。"
 
-#: ../src/common/config.py:123
+#: ../src/common/config.py:131
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3527,25 +3997,30 @@ msgstr ""
 "考http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (如果\n"
 "您想使用此功能，請安裝 docutils)"
 
-#: ../src/common/config.py:132
+#: ../src/common/config.py:140
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "當在多人聊天中使用暱稱補全(Tab)時加到暱稱後的字元。"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
 msgstr "當請求的暱稱被聊天室中的其他人使用時加到請求的暱稱後的字元。"
 
-#: ../src/common/config.py:151
+#: ../src/common/config.py:159
+#, fuzzy
 msgid ""
-"If true, Gajim will save roster position when hiding roster, and restore it "
+"If True, Gajim will save roster position when hiding roster, and restore it "
 "when showing roster."
 msgstr "如果為真，當隱藏名冊時 Gajim 將會儲存名冊位置，並於顯示名冊時還原。"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:165
+msgid "Place the roster on the right in single window mode"
+msgstr ""
+
+#: ../src/common/config.py:172
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3555,67 +4030,70 @@ msgstr ""
 "\"[小時:分鐘]\"。請參考 Python doc 關於 strftime 的文件:\n"
 "http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "在對話中顯示在暱稱前的字元"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "在對話中顯示在暱稱後的字元"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr "指定新電子郵件到達時執行的命令，比如: /usr/bin/getmail -q"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "在聯絡人清單標題中加入 * 和 [n]?"
 
-#: ../src/common/config.py:170
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr "聊天標籤/視窗被重新開啟時顯示之前進行的對話的最後多少列。"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:181
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "上次談話的最後幾列保留多少分鐘。"
 
-#: ../src/common/config.py:172
+#: ../src/common/config.py:182
+#, fuzzy
 msgid ""
-"How many lines to request to server when entering a groupchat. -1 means no "
+"How many lines to request from server when entering a groupchat. -1 means no "
 "limit"
 msgstr "當加入多人聊天時，向伺服器請求聊天記錄的列數。-1 表示無限制"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:183
+#, fuzzy
 msgid ""
-"How many minutes back to request logs when a entering a groupchat. -1 means "
-"no limit"
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "當加入多人聊天時，向伺服器請求多少分鐘以內的聊天記錄。-1 表示無限制"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr "自動重新加入一個中斷的聊天室前等待多少秒。設為 0 以停用自動重新加入。"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:185
 msgid ""
 "Should autorejoin be activated when we are being kicked from a conference?"
 msgstr "當我們從會議中被踢出時，是否應該啟用自動重新加入？"
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "用 Ctrl+Enter 傳送訊息，Enter 開始新列(紫茉莉 ICQ 客戶端預設作業)。"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "為 Ctrl+KeyUP 儲存多少列。"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3623,11 +4101,11 @@ msgid ""
 msgstr ""
 "自訂位址，在其中應包含 %s，%s 是單字/片語; 或'WIKTIONARY'以使用 wiktionary。"
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果選取，Gajim 可以被 gajim-remote 遠端控制。"
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:195
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3638,48 +4116,51 @@ msgstr ""
 "態(如果它們沒有將 listen_to_network_manager 設定為假而且它們被設定為與\n"
 "全域狀態同步)。"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr "在聊天視窗中顯示聊天狀態通知。可以是全部，近正在編輯，停用中的一個。"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr "當不是每條訊息都顯示時間('有時'顯示時間)時，每多少分鐘顯示時間。"
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "關閉多人聊天標籤/視窗前詢問。"
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr "關閉這個空格分隔的清單中的聊天室的標籤/視窗前總是詢問。"
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr "關閉這個空格分隔的清單中的聊天室的標籤/視窗前永遠不詢問。"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "如果有可能丟失資料的控制項(不會被最小化的聊天，私人聊天，多人聊天)，在關\n"
 "閉有標籤的視窗前詢問。"
 
-#: ../src/common/config.py:196
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3687,27 +4168,33 @@ msgstr ""
 "逗號分割的清單。在有位址翻譯/連接埠轉發的情況下，除了本地介面，還將向其中\n"
 "的主機傳送檔案傳輸請求。"
 
-#: ../src/common/config.py:198
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 標準規定 1 KiB = 1024 bytes(位元組)，1 KB = 1000 bytes。"
 
-#: ../src/common/config.py:200
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr "在通知區域中提示事件"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "只有一個對話時顯示標籤?"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天視窗中顯示標籤組的邊框。"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "在標籤上顯示關閉按鈕?"
 
-#: ../src/common/config.py:209
+#: ../src/common/config.py:220
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3718,16 +4205,16 @@ msgstr ""
 "法的組有 1，2，5，14，15，16，17 和 18。更高的數字更安全，但在您開始會\n"
 "話時需要更長的時間計算"
 
-#: ../src/common/config.py:218
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "在彈出提示中預覽訊息?"
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "用分號隔開的在多人聊天中將高亮度顯示的單字清單。"
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:247
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if notification icon is used."
@@ -3735,12 +4222,7 @@ msgstr ""
 "如果為真，按一下視窗管理器的 X 按鈕會離開 Gajim。此一設定僅當啟用通知區域圖示"
 "時會生效。"
 
-#: ../src/common/config.py:225
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "如果為真， Gajim 會在每次啟動時偵測它是否是預設的 jabber 客戶端。"
-
-#: ../src/common/config.py:226
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3748,7 +4230,7 @@ msgstr ""
 "如果為真， Gajim 會在每個含有未讀訊息的標籤上顯示一個圖示。根據主題，該圖示可"
 "能是動態的。"
 
-#: ../src/common/config.py:227
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3756,11 +4238,11 @@ msgstr ""
 "如果為真， Gajim 將在聯絡人清單視窗中每一個聯絡人名稱的下方顯示狀態資訊(如果"
 "不為空)。"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:255
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "定義了在聯絡人清單中頭像的顯示位置。可以是左或右"
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:256
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3768,7 +4250,7 @@ msgstr ""
 "如過為真，Gajim 會向每一個快取的頭像太久或上次未能獲得其頭像的聯絡人請求頭"
 "像。"
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:257
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3776,9 +4258,10 @@ msgstr ""
 "如果為假，Gajim 將不會在聯絡人的狀態或狀態訊息變化時在聊天視窗中顯示一列提"
 "示。"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:258
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"Can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
@@ -3790,32 +4273,32 @@ msgstr ""
 "有的狀態訊息。如果是\"登入與登出\"，Gajim 將只提示聊天室中中登入與登出\n"
 "訊息。"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:260
 msgid "Log XHTML messages instead of plain text messages."
 msgstr "記錄 XHTML 訊息以代替純文字訊息。"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:261
 msgid "Background color of contacts when they just signed in."
 msgstr "當聯絡人剛剛登入時的背景色。"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed out."
 msgstr "當聯絡人剛剛登出時的背景色。"
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:264
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "如果為真，恢復顯示的訊息將用較小的字型顯示。"
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:265
 msgid "Don't show avatar for the transport itself."
 msgstr "不顯示代理本身的頭像。"
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:266
 msgid "Don't show roster in the system taskbar."
 msgstr "不要將聯絡人清單視窗顯示在系統的工作列中。"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:267
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3824,7 +4307,7 @@ msgstr ""
 "如果為真並且安裝的 GTK+ 和 PyGTK 的版本至少為 2.8，當有未處理事件時使窗\n"
 "口閃爍(大部分視窗管理器的預設回應)"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:269
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3834,7 +4317,8 @@ msgstr ""
 "\"以停止在多人聊天中傳送 SHA 資訊。"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:250
+#: ../src/common/config.py:272
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3842,7 +4326,7 @@ msgid ""
 "along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "控制新訊息被放置的視窗。\n"
@@ -3853,7 +4337,7 @@ msgstr ""
 "'peracct' - 每個帳號的訊息傳送到一個單獨的視窗。\n"
 "'pertype' - 每種類型的訊息 (例如，聊天 及 多人聊天) 傳送到一個單獨的視窗。"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:273
 msgid ""
 "Show roster on startup.\n"
 "'always' - Always show roster.\n"
@@ -3865,74 +4349,74 @@ msgstr ""
 "「永不」- 永不顯示名冊。\n"
 "「last_state」- 還原最後狀態名冊。"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:274
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "如果為假，您將不會在視窗中看到頭像。"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:275
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "如果為真，按 Escape 鍵將關閉標籤/視窗。"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:276
 msgid "Hides the buttons in chat windows."
 msgstr "在聊天視窗中隱藏按鈕。"
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:277
 msgid "Hides the banner in a group chat window"
 msgstr "在多人聊天視窗中隱藏標語"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:278
 msgid "Hides the banner in two persons chat window"
 msgstr "在雙人聊天視窗中隱藏標語"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:279
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "在多人聊天視窗中隱藏室友清單。"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:280
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 msgstr ""
 "在聊天中，只在目前一條訊息不是由同一個人發出的的時候才在一列前顯示暱稱。"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:281
 msgid "Indentation when using merge consecutive nickname."
 msgstr "當合併連續暱稱時縮排。"
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:282
 msgid "Smooth scroll message in conversation window"
 msgstr "平滑捲動聊天視窗中的訊息"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:283
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "在多人聊天中用於暱稱的顏色清單，以\":\"分隔。"
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:284
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "當所有分頁中沒有未讀訊息時按 Ctrl-Tab 轉到下一個正在編輯的標籤。"
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:285
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr "是否顯示確認元聯絡人建立對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr "是否顯示確認阻斷聯絡人對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr "是否顯示確認傳送自訂狀態對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:288
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
@@ -3941,74 +4425,47 @@ msgstr ""
 "如果為真，您將可以在修改帳號視窗中為您的帳號可以設定一個負的優先等級。注意!當"
 "您使用負的優先等級登入時您將不能從伺服器收到任何訊息。"
 
-#: ../src/common/config.py:267
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr "如果為真，Gajim 會使用 Gnome Keyring (如果可用) 儲存帳號的密碼。"
-
-#: ../src/common/config.py:268
-msgid ""
-"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
-"account passwords."
-msgstr ""
-"如果為真，Gajim 會使用 KDE Wallet (如果 kwalletcli 可用) 儲存帳號的密碼。"
-
-#: ../src/common/config.py:269
+#: ../src/common/config.py:289
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr "如果為真，Gajim 會在帳號和群組所在列顯示線上和總共聯絡人數目。"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:290
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 "可以是空字串，'chat'或'normal'。如果不為空，將把所有收到的訊息當作這個類型。"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 "如果為真，在聊天視窗沒有開啟時，Gajim 會捲動並選出最後給您傳送訊息的聯絡人。"
 
-#: ../src/common/config.py:272
-msgid ""
-"If True, Gajim will convert string between $$ and $$ to an image using dvips "
-"and convert before insterting it in chat window."
-msgstr ""
-"如果為真，Gajim 會將 $$ $$ 之間的字串用 dvips 轉換為圖片，在將它插入聊天視窗"
-"之前。"
-
-#: ../src/common/config.py:273
+#: ../src/common/config.py:292
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "時間，如果在此時間內沒有活動，將變更狀態視窗關閉。"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:293
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "在對話中最多顯示的列數。最舊的那些列會被清除。"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:294
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr "如果為真，由 notification-daemon 建立的提示視窗會依附於通知區域圖示。"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:295
 msgid "Choose interval between 2 checks of idleness."
 msgstr "兩次檢查閒置之間的時間間隔。"
 
-#: ../src/common/config.py:277
-msgid ""
-"Change the value to change the size of latex formulas displayed. The higher "
-"is larger."
-msgstr "變更這個值以變更顯示的 LaTeX 方程的大小。更高則更大。"
-
-#: ../src/common/config.py:278
+#: ../src/common/config.py:296
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4016,33 +4473,38 @@ msgstr ""
 "合法的 URI Scheme。只有這個清單中的 Scheme 會被接受為\"真正的\" URI。(mailto "
 "和 xmpp 被分開處理)"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:297
+#, fuzzy
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
-"accoutn is established. WARNING: This causes a lot of requests to be sent!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
 msgstr ""
 "請求所有離線聯絡人的離線狀態訊息，當一個帳號建立連線時。警告: 這會傳送大量的"
 "請求!"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:298
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr "如果為真，多人聊天中會像 shell 一樣自動補全"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:299
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr "何時顯示自己。可以是\"總是\"，\"當用其他資源連線時\"或\"永遠不\""
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:304
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr "可選地修正 jingle 視訊輸出的圖框速率。比如: 10/1 或 25/2"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:305
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "可選地縮放 jingle 視訊輸出尺寸。比如: 320x240"
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:306
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:309
 msgid ""
 "If True, Gajim will try to use a STUN server when using jingle. The one in "
 "\"stun_server\" option, or the one given by the jabber server."
@@ -4050,23 +4512,50 @@ msgstr ""
 "如果為真，Gajim 在使用 jingle 時會嘗試使用 STUN 伺服器。伺服器可以由"
 "\"stun_server\"選項給出，或由 jabber 伺服器給出。"
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:310
 msgid "STUN server to use when using jingle"
 msgstr "在使用 jingle 時使用的 STUN 伺服器"
 
-#: ../src/common/config.py:292
+#: ../src/common/config.py:311
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr "如果為真，Gajim 會在聊天室室友的狀態圖示上加上一個彩色方框以示歸屬"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:312
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:313
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:314
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:315
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr "如果選取，Gajim 不會詢問狀態訊息，而使用特定的預設訊息。"
+
+#: ../src/common/config.py:316
+msgid "Show a mini avatar in chat window tabs and in window icon"
+msgstr ""
+
+#: ../src/common/config.py:330
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr "優先等級將根據您的狀態自動變更。優先等級在 autopriority_* 選項中定義。"
 
-#: ../src/common/config.py:314
+#: ../src/common/config.py:338
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
@@ -4075,77 +4564,105 @@ msgstr ""
 "\"，\"請勿\n"
 "打擾\"，\"隱身\"。注意: 僅當 restore_last_status 被停用時這個選項其作用"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:339
 msgid "If enabled, restore the last status that was used."
 msgstr "如果啟用，則恢復上次使用的狀態。"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:341
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "如果為真，聯絡人的認證請求將被自動接受。"
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:342
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "如果為假，這個帳號將被停用且不會出現在聯絡人清單視窗中。"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:345
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr "如果停用，即使 GPG 被配置，也不使用 GPG 密鑰簽名 presences。"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:347
 msgid "Enable ESessions encryption for this account."
 msgstr "為這個帳號啟用 ESession 加密。"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:348
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Gajim 是否應該在可能時自動發起加密的作業階段?"
 
-#: ../src/common/config.py:325
+#: ../src/common/config.py:349
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr "應嘗試的連線類型的有序清單(用空格分隔)。可以包含 tls，ssl，或 plain"
 
-#: ../src/common/config.py:326
+#: ../src/common/config.py:352
+msgid ""
+"List (space separated) of authentication mechanisms to try. Can contain "
+"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
+"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+msgstr ""
+
+#: ../src/common/config.py:353
+#, fuzzy
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr "在使用明文連線傳送密碼前顯示一個警告對話方塊。"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:354
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "在使用標準 SSL 函式庫前顯示一個警告對話方塊。"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:355
 msgid ""
 "Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr "在透過明文連線傳送明文密碼前顯示警告對話框。"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:358
 msgid "Space separated list of ssl errors to ignore."
 msgstr "應忽略的 SSL 錯誤清單，以空格分隔"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:364
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:365
+msgid ""
+"Download logs stored on server on Gajim startup if server supports XEP-0136 "
+"or XEP-0313"
+msgstr ""
+
+#: ../src/common/config.py:366
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:369
 msgid "Whitespace sent after inactivity"
 msgstr "在不活動後傳送的空白"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:370
 msgid "XMPP ping sent after inactivity"
 msgstr "在不活動後傳送的 XMPP ping"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:374
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr "在重新連線前等待 ping alive packet 的回應多少秒"
 
 #. yes, no, ask
-#: ../src/common/config.py:348
+#: ../src/common/config.py:378
 msgid "Jabberd2 workaround"
 msgstr "為 Jabberd2 變通"
 
-#: ../src/common/config.py:351
+#: ../src/common/config.py:381
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4153,578 +4670,466 @@ msgstr ""
 "如果選取，Gajim 會使用您在 file_transfer_proxies 選項中定義的 IP 和代理進行檔"
 "案傳輸。"
 
-#: ../src/common/config.py:365
+#: ../src/common/config.py:382
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:396
 msgid "Answer to receipt requests"
 msgstr "對回執請求的回應"
 
-#: ../src/common/config.py:366
+#: ../src/common/config.py:397
 msgid "Sent receipt requests"
 msgstr "傳送回執請求"
 
-#: ../src/common/config.py:375
+#: ../src/common/config.py:406
 msgid ""
 "Allow Gajim to send information about the operating system you are running."
 msgstr "允許 Gajim 發送您正在執行的作業系統相關資訊。"
 
-#: ../src/common/config.py:376
+#: ../src/common/config.py:407
 msgid "Allow Gajim to send your local time."
 msgstr "允許 Gajim 發送您的本地時間。"
 
-#: ../src/common/config.py:377
+#: ../src/common/config.py:408
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr "在協商加密的作業階段時，Gajim 是否應該假設您想要您的訊息被記錄?"
 
-#: ../src/common/config.py:380
+#: ../src/common/config.py:411
 msgid "Message that is sent to contacts you want to add"
 msgstr "向您希望加入的聯絡人傳送的訊息"
 
-#: ../src/common/config.py:381
+#: ../src/common/config.py:412
 msgid "Last time we syncronized with logs from server."
 msgstr "上次從伺服器同步命令歷程記錄"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:413
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:414
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:415
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "匿名認證"
+
+#: ../src/common/config.py:416
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "匿名認證(_Y)"
+
+#: ../src/common/config.py:417
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:418
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:419
+#, fuzzy
+msgid "Last MAM id we are syncronized with"
+msgstr "上次從伺服器同步命令歷程記錄"
+
+#: ../src/common/config.py:481
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否為此聯絡人使用 OpenPGP?"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:482
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr "對於此聯絡人，Gajim 是否應該自動發起加密作業階段，當可能時?"
 
-#: ../src/common/config.py:445 ../src/common/config.py:448
+#: ../src/common/config.py:483 ../src/common/config.py:486
 msgid "Language for which we want to check misspelled words"
 msgstr "想要進行拼寫檢查的語言"
 
-#: ../src/common/config.py:451
+#: ../src/common/config.py:487
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "當加入多人聊天時，向伺服器請求聊天記錄的列數。-1 表示無限制"
+
+#: ../src/common/config.py:488
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "當加入多人聊天時，向伺服器請求多少分鐘以內的聊天記錄。-1 表示無限制"
+
+#: ../src/common/config.py:491
+#, fuzzy
+msgid ""
+"State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
 "表述在離開時是否啟用外掛程式(在 Gajim 離開時這會被儲存)。這個選項不應該用於啟"
 "用或停用外掛程式。使用圖形介面代替。"
 
-#: ../src/common/config.py:456 ../src/common/pep.py:157
+#: ../src/common/config.py:496 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "正在睡覺"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:497
 msgid "Back soon"
 msgstr "馬上回來"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:497
 msgid "Back in some minutes."
 msgstr "幾分鐘就回來。"
 
-#: ../src/common/config.py:458 ../src/common/pep.py:127
+#: ../src/common/config.py:498 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "吃東西"
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:498
 msgid "I'm eating, so leave me a message."
 msgstr "我在吃東西，請留言"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:499
 msgid "Movie"
 msgstr "電影"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:499
 msgid "I'm watching a movie."
 msgstr "我正在看電影。"
 
-#: ../src/common/config.py:460 ../src/common/pep.py:186
+#: ../src/common/config.py:500 ../src/common/pep.py:186
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:500
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:501
 msgid "Phone"
 msgstr "打電話"
 
-#: ../src/common/config.py:461
+#: ../src/common/config.py:501
 msgid "I'm on the phone."
 msgstr "我正在打電話"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:502
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:502
 msgid "I'm out enjoying life."
 msgstr "我正在享受戶外生活。"
 
-#: ../src/common/config.py:473
+#: ../src/common/config.py:513
 msgid "I'm available."
 msgstr "我現在線上。"
 
-#: ../src/common/config.py:474
+#: ../src/common/config.py:514
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: ../src/common/config.py:475 ../src/config.py:1609
+#: ../src/common/config.py:515 ../src/config.py:1656
 msgid "Be right back."
 msgstr "很快回來。"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:516
 msgid "I'm not available."
 msgstr "我已經很久不在了。"
 
-#: ../src/common/config.py:477
+#: ../src/common/config.py:517
 msgid "Do not disturb."
 msgstr "請勿打擾。"
 
-#: ../src/common/config.py:478 ../src/common/config.py:479
+#: ../src/common/config.py:518 ../src/common/config.py:519
 msgid "Bye!"
 msgstr "再見!"
 
-#: ../src/common/config.py:489
+#: ../src/common/config.py:530
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
 msgstr ""
 "當收到的多人聊天訊息包含 \"muc_highlight_words\" 或您的暱稱時播放的聲音。"
 
-#: ../src/common/config.py:490
+#: ../src/common/config.py:531
 msgid "Sound to play when any MUC message arrives."
 msgstr "收到任意多人聊天訊息播放的聲音。"
 
-#: ../src/common/config.py:499 ../src/common/optparser.py:310
+#: ../src/common/config.py:540 ../src/common/optparser.py:318
 msgid "green"
 msgstr "綠色"
 
-#: ../src/common/config.py:503 ../src/common/optparser.py:296
+#: ../src/common/config.py:544 ../src/common/optparser.py:304
 msgid "grocery"
 msgstr "雜貨店"
 
-#: ../src/common/config.py:507
+#: ../src/common/config.py:548
 msgid "human"
 msgstr "人類別"
 
-#: ../src/common/config.py:511
+#: ../src/common/config.py:552
 msgid "marine"
 msgstr "海洋"
 
-#: ../src/common/connection_handlers_events.py:345
-#, python-format
-msgid ""
-"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
-"management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr ""
-"JID %s 不符合 RFC 標準。它沒有被加入聯絡人清單。請使用諸如 http://jru."
-"jabberstudio.org/ 的聯絡人清單管理工具移除它"
-
-#: ../src/common/connection_handlers_events.py:776
-#, python-format
-msgid "unsubscribe request from %s"
-msgstr "來自 %s 的解除認證請求"
-
-#: ../src/common/connection_handlers_events.py:861
-#: ../src/common/connection_handlers.py:339
-#: ../src/common/connection_handlers.py:943
-#: ../src/common/connection_handlers.py:1053
-#: ../src/common/connection_handlers.py:1710 ../src/common/connection.py:448
-#: ../src/common/logger.py:1124 ../src/gajim.py:390
-msgid "Disk Write Error"
-msgstr "磁碟寫入錯誤"
-
-#: ../src/common/connection_handlers_events.py:865
-#: ../src/common/connection_handlers.py:946
-#: ../src/common/connection_handlers.py:1056
-#: ../src/common/connection_handlers.py:1713 ../src/common/connection.py:452
-#: ../src/common/logger.py:1127 ../src/gajim.py:209 ../src/session.py:98
-#, python-format
-msgid ""
-"The database file (%s) cannot be read. Try to repair it (see http://trac."
-"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
-msgstr ""
-"資料庫檔案 (%s) 不能被讀取。請嘗試修復它(參考 http://trac.gajim.org/wiki/"
-"DatabaseBackup)或移除它(所有命令歷程記錄將丟失)。"
-
-#. Room has been destroyed. see
-#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers_events.py:886
-msgid "Room has been destroyed"
-msgstr "聊天室已經被銷毀了"
-
-#: ../src/common/connection_handlers_events.py:894
-#, python-format
-msgid "You can join this room instead: %s"
-msgstr "做為替代，您可以加入這個聊天室: %s"
-
-#: ../src/common/connection_handlers_events.py:967
-#: ../src/common/connection.py:259 ../src/config.py:2106 ../src/config.py:2115
-#: ../src/config.py:2183 ../src/config.py:3619 ../src/dataforms_widget.py:623
-#: ../src/dialogs.py:3079
-msgid "Invalid Jabber ID"
-msgstr "無效的 Jabber ID"
-
-#: ../src/common/connection_handlers_events.py:968
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "收到了一個從一個無效的 JID 傳送的訊息，它已經被忽略了。"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/common/connection_handlers_events.py:1005
-#: ../src/gui_interface.py:415 ../src/gui_interface.py:429
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "傳送 %(message)s 時出現錯誤( %(error)s )"
-
-#: ../src/common/connection_handlers_events.py:1422
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "不明的 SSL 錯誤: %d"
-
-#: ../src/common/connection_handlers_events.py:1950 ../src/dialogs.py:2771
-#: ../src/notify.py:260
-msgid "New Single Message"
-msgstr "新單條訊息"
-
-#: ../src/common/connection_handlers_events.py:1952
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr " %(nickname)s 發來的新訊息"
-
-#: ../src/common/connection_handlers_events.py:1956 ../src/dialogs.py:2772
-#: ../src/notify.py:261
-msgid "New Private Message"
-msgstr "新個人訊息"
-
-#: ../src/common/connection_handlers_events.py:1958
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "來自聊天室 %s 的私人訊息"
-
-#: ../src/common/connection_handlers_events.py:1961
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s:  %(message)s"
-
-#: ../src/common/connection_handlers_events.py:1964
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "來自 %(nickname)s 的訊息"
-
-#: ../src/common/connection_handlers_events.py:1968 ../src/dialogs.py:2771
-#: ../src/notify.py:260
-msgid "New Message"
-msgstr "新訊息"
-
-#: ../src/common/connection_handlers_events.py:1970
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "來自 %(nickname)s 的新訊息"
-
-#: ../src/common/connection_handlers_events.py:2099
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s 變更了狀態"
-
-#: ../src/common/connection_handlers_events.py:2101
-#: ../src/groupchat_control.py:202 ../src/groupchat_control.py:1755
-#: ../src/history_window.py:447
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s 的狀態是 %(status)s"
-
-#: ../src/common/connection_handlers_events.py:2106 ../src/dialogs.py:2783
-#: ../src/notify.py:274
-msgid "Contact Changed Status"
-msgstr "聯絡人狀態變更"
-
-#: ../src/common/connection_handlers_events.py:2108
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s 上線了"
-
-#. default value
-#: ../src/common/connection_handlers_events.py:2113 ../src/dialogs.py:2767
-#: ../src/notify.py:256
-msgid "Contact Signed In"
-msgstr "聯絡人登入"
-
-#: ../src/common/connection_handlers_events.py:2115
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s 離開了"
-
-#: ../src/common/connection_handlers_events.py:2120 ../src/dialogs.py:2769
-#: ../src/notify.py:258
-msgid "Contact Signed Out"
-msgstr "聯絡人離開登入"
-
-#: ../src/common/connection_handlers.py:95
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:54
-msgid "Unable to load idle module"
-msgstr "無法載入閒置模組"
-
-#: ../src/common/connection_handlers.py:128
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "代理 %s 的註冊資訊未按時抵達"
-
-#: ../src/common/connection_handlers.py:135
-msgid "Registration succeeded"
-msgstr "註冊成功"
-
-#: ../src/common/connection_handlers.py:136
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr "註冊成功，agent %s"
-
-#: ../src/common/connection_handlers.py:144
-msgid "Registration failed"
-msgstr "註冊失敗"
-
-#: ../src/common/connection_handlers.py:144
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr "註冊失敗，agent %(agent)s，錯誤 %(error)s: %(error_msg)s"
-
-#: ../src/common/connection_handlers.py:573 ../src/common/connection.py:1546
-msgid "Invisibility not supported"
-msgstr "不支援隱身"
-
-#: ../src/common/connection_handlers.py:574 ../src/common/connection.py:1547
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "帳號 %s 不支援隱身"
-
-#: ../src/common/connection_handlers.py:1755
-msgid "I would like to add you to my roster."
-msgstr "我想將您加入到我的聯絡人清單。"
+#: ../src/common/config.py:559
+#, fuzzy
+msgid "Tor"
+msgstr "To"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:74
 msgid "Unable to get issuer certificate"
 msgstr "無法獲得發行者的證書"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:75
 msgid "Unable to get certificate CRL"
 msgstr "無法獲得證書吊銷清單"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:76
 msgid "Unable to decrypt certificate's signature"
 msgstr "無法解密證書籤名稱"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:77
 msgid "Unable to decrypt CRL's signature"
 msgstr "無法解密證書吊銷清單的簽名"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:78
 msgid "Unable to decode issuer public key"
 msgstr "無法解碼發行者的公鑰"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:79
 msgid "Certificate signature failure"
 msgstr "證書籤名稱失敗"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:80
 msgid "CRL signature failure"
 msgstr "吊銷證書清單簽名失敗"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:81
 msgid "Certificate is not yet valid"
 msgstr "證書還未生效"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:82
 msgid "Certificate has expired"
 msgstr "證書已過期"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:83
 msgid "CRL is not yet valid"
 msgstr "證書吊銷清單還未生效"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:84
 msgid "CRL has expired"
 msgstr "證書吊銷清單已過期"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:85
 msgid "Format error in certificate's notBefore field"
 msgstr "格式錯誤，在證書的'不早於'欄位"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:86
 msgid "Format error in certificate's notAfter field"
 msgstr "格式錯誤，在證書的'不遲於'欄位"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:87
 msgid "Format error in CRL's lastUpdate field"
 msgstr "格式錯誤，在證書吊銷清單的'最後更新'欄位"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:88
 msgid "Format error in CRL's nextUpdate field"
 msgstr "格式錯誤，在證書吊銷清單的'下次更新'欄位"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:89
 msgid "Out of memory"
 msgstr "記憶體耗盡"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:90
 msgid "Self signed certificate"
 msgstr "自簽名的證書"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:91
 msgid "Self signed certificate in certificate chain"
 msgstr "自簽名的證書，在證書鏈中"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:92
 msgid "Unable to get local issuer certificate"
 msgstr "無法獲得本地發行者證書"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:93
 msgid "Unable to verify the first certificate"
 msgstr "無法驗證第一個證書"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:94
 msgid "Certificate chain too long"
 msgstr "證書鏈太長"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:95
 msgid "Certificate revoked"
 msgstr "證書已被吊銷"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:96
 msgid "Invalid CA certificate"
 msgstr "無效的 CA 證書"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:97
 msgid "Path length constraint exceeded"
 msgstr "超過了路徑長度限制"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:98
 msgid "Unsupported certificate purpose"
 msgstr "不支援的證書用途"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:99
 msgid "Certificate not trusted"
 msgstr "不被信任的證書"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:100
 msgid "Certificate rejected"
 msgstr "證書被拒絕"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:101
 msgid "Subject issuer mismatch"
 msgstr "Subject 與 發行者 不匹配"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:102
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority 與 subject key identifier 不匹配"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:103
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority 與 發行者序號 不匹配"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:104
 msgid "Key usage does not include certificate signing"
 msgstr "密鑰用途中不包含證書籤名稱"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:105
 msgid "Application verification failure"
 msgstr "應用程式驗證失敗"
 
-#: ../src/common/connection.py:260 ../src/dialogs.py:3080
+#: ../src/common/connection.py:279 ../src/common/connection.py:289
+#: ../src/common/connection_handlers_events.py:1156
+#: ../src/common/connection_handlers_events.py:1202 ../src/config.py:2176
+#: ../src/config.py:2185 ../src/config.py:2253 ../src/config.py:3722
+#: ../src/dataforms_widget.py:642 ../src/dialogs.py:3302
+msgid "Invalid Jabber ID"
+msgstr "無效的 Jabber ID"
+
+#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/dialogs.py:3303
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "不能向 %s 傳送訊息，無效的 JID。"
 
-#: ../src/common/connection.py:282
+#: ../src/common/connection.py:313
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "遠端 presence 未簽名，也未指定密鑰。"
 
-#: ../src/common/connection.py:285
+#: ../src/common/connection.py:316
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "聯絡人的密鑰(%s)與 Gajim 中指定的密鑰不匹配"
 
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:337
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:374
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[本條訊息已 *加密* (見: XEP:`27`]"
 
-#: ../src/common/connection.py:435
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"主題: %(subject)s\n"
-"%(message)s"
+#: ../src/common/connection.py:547 ../src/common/connection_handlers.py:340
+#: ../src/common/connection_handlers.py:1077
+#: ../src/common/connection_handlers.py:1253
+#: ../src/common/connection_handlers_events.py:953 ../src/common/logger.py:1175
+#: ../src/session.py:107
+msgid "Disk Write Error"
+msgstr "磁碟寫入錯誤"
 
-#: ../src/common/connection.py:845
+#: ../src/common/connection.py:978
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帳號\"%s\"的連線丟失"
 
-#: ../src/common/connection.py:846
+#: ../src/common/connection.py:979
 msgid "Reconnect manually."
 msgstr "手動重連。"
 
 #. it's a new account
 #. wrong answer
-#: ../src/common/connection.py:857
+#: ../src/common/connection.py:990
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "伺服器 %(name)s 對註冊請求的回應有誤: %(error)s"
 
 #. requested config has changed since first connection
-#: ../src/common/connection.py:899
+#: ../src/common/connection.py:1032
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "伺服器 %s 提供了一個不同的註冊表單"
 
-#. wrong answer
-#: ../src/common/connection.py:915
+#: ../src/common/connection.py:1049
 msgid "Invalid answer"
 msgstr "答案錯誤"
 
-#: ../src/common/connection.py:916
+#: ../src/common/connection.py:1050
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服務代理 %(name)s 對註冊請求的回應有誤: %(error)s"
 
-#: ../src/common/connection.py:1224 ../src/common/connection.py:1358
-#: ../src/common/connection.py:1972
-#: ../src/common/zeroconf/connection_zeroconf.py:204
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1177
+#, fuzzy
+msgid "Wrong Custom Hostname"
+msgstr "使用自訂的主機名稱/連接埠"
+
+#: ../src/common/connection.py:1359
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
+msgstr "沒有能夠連線到\"%s\""
+
+#: ../src/common/connection.py:1362
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
 msgstr "沒有能夠連線到\"%s\""
 
-#: ../src/common/connection.py:1225 ../src/gui_interface.py:524
+#: ../src/common/connection.py:1364 ../src/common/connection.py:1557
+#: ../src/gui_interface.py:551
 msgid "Check your connection or try again later."
 msgstr "檢查連線或稍後重試。"
 
-#: ../src/common/connection.py:1230
+#: ../src/common/connection.py:1369
 #, python-format
 msgid "Server replied: %s"
 msgstr "伺服器回應: %s"
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1384
 msgid "Connection to proxy failed"
 msgstr "連線代理伺服器失敗"
 
-#: ../src/common/connection.py:1275 ../src/common/connection.py:1337
+#: ../src/common/connection.py:1422 ../src/common/connection.py:1532
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "沒有能夠連線到帳號 %s"
 
-#: ../src/common/connection.py:1276 ../src/common/connection.py:1338
+#: ../src/common/connection.py:1423 ../src/common/connection.py:1533
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帳號 %s 的連線丟失。重新嘗試連線。"
 
-#: ../src/common/connection.py:1301
-#, python-format
-msgid "The authenticity of the %s certificate could be invalid."
+#: ../src/common/connection.py:1457
+#, fuzzy, python-format
+msgid "The authenticity of the %s certificate could be invalid"
 msgstr "%s 證書的認證可能是無效的"
 
-#: ../src/common/connection.py:1304
+#: ../src/common/connection.py:1460
 #, python-format
 msgid ""
 "\n"
@@ -4733,7 +5138,7 @@ msgstr ""
 "\n"
 "SSL 錯誤: <b>%s</b>"
 
-#: ../src/common/connection.py:1306
+#: ../src/common/connection.py:1462
 #, python-format
 msgid ""
 "\n"
@@ -4742,24 +5147,33 @@ msgstr ""
 "\n"
 "不明 SSL 錯誤: %d"
 
-#: ../src/common/connection.py:1359
-msgid "Check your connection or try again later"
-msgstr "檢查連線或稍後重試"
+#: ../src/common/connection.py:1508
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "%s 證書的認證可能是無效的"
 
-#: ../src/common/connection.py:1393
+#: ../src/common/connection.py:1556 ../src/common/connection.py:2351
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "沒有能夠連線到\"%s\""
+
+#: ../src/common/connection.py:1592
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\"登入驗證失敗"
 
-#: ../src/common/connection.py:1395
+#: ../src/common/connection.py:1593
 msgid "Please check your login and password for correctness."
 msgstr "請檢查登入資訊和密碼的正確性"
 
-#: ../src/common/connection.py:1468
+#: ../src/common/connection.py:1669
 msgid "Error while removing privacy list"
 msgstr "移除隱私策略清單時發生錯誤"
 
-#: ../src/common/connection.py:1469
+#: ../src/common/connection.py:1670
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4768,65 +5182,232 @@ msgstr ""
 "隱私策略清單 %s 還沒有被移除。它可能在您的某個連線的資源中是活動的。停用它然"
 "後重試。"
 
-#: ../src/common/connection.py:1839
+#: ../src/common/connection.py:1863 ../src/common/connection.py:1977
+msgid "Invisibility not supported"
+msgstr "不支援隱身"
+
+#: ../src/common/connection.py:1864 ../src/common/connection.py:1978
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr "帳號 %s 不支援隱身"
+
+#: ../src/common/connection.py:2215
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "已傳送聯絡人: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1842
+#: ../src/common/connection.py:2218
 msgid "Sent contacts:"
 msgstr "已傳送聯絡人:"
 
-#: ../src/common/connection.py:1989 ../src/common/connection.py:2012
+#: ../src/common/connection.py:2368 ../src/common/connection.py:2390
 msgid "Not fetched because of invisible status"
 msgstr "由於隱身狀態，未獲取"
 
-#: ../src/common/connection.py:2542
+#: ../src/common/connection.py:3001
 msgid "Unregister failed"
 msgstr "移除註冊失敗"
 
-#: ../src/common/connection.py:2543
+#: ../src/common/connection.py:3002
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "在伺服器上 %(server)s 移除註冊失敗: %(error)s"
 
-#: ../src/common/contacts.py:126 ../src/common/helpers.py:60
-#: ../src/gui_interface.py:467
+#: ../src/common/connection_handlers.py:89
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "無法載入閒置模組"
+
+#: ../src/common/connection_handlers.py:124
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "代理 %s 的註冊資訊未按時抵達"
+
+#: ../src/common/connection_handlers.py:132
+msgid "Registration succeeded"
+msgstr "註冊成功"
+
+#: ../src/common/connection_handlers.py:133
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr "註冊成功，agent %s"
+
+#: ../src/common/connection_handlers.py:142
+msgid "Registration failed"
+msgstr "註冊失敗"
+
+#: ../src/common/connection_handlers.py:143
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr "註冊失敗，agent %(agent)s，錯誤 %(error)s: %(error_msg)s"
+
+#: ../src/common/connection_handlers.py:1948
+msgid "I would like to add you to my roster."
+msgstr "我想將您加入到我的聯絡人清單。"
+
+#: ../src/common/connection_handlers_events.py:393
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s 不符合 RFC 標準。它沒有被加入聯絡人清單。請使用諸如 http://jru."
+"jabberstudio.org/ 的聯絡人清單管理工具移除它"
+
+#: ../src/common/connection_handlers_events.py:871
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "來自 %s 的解除認證請求"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:978
+msgid "Room has been destroyed"
+msgstr "聊天室已經被銷毀了"
+
+#: ../src/common/connection_handlers_events.py:986
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "做為替代，您可以加入這個聊天室: %s"
+
+#: ../src/common/connection_handlers_events.py:1157
+#: ../src/common/connection_handlers_events.py:1203
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "收到了一個從一個無效的 JID 傳送的訊息，它已經被忽略了。"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1246 ../src/gui_interface.py:441
+#: ../src/gui_interface.py:455
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "傳送 %(message)s 時出現錯誤( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1485
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1851
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "不明的 SSL 錯誤: %d"
+
+#: ../src/common/connection_handlers_events.py:2483 ../src/dialogs.py:2973
+#: ../src/notify.py:277
+msgid "New Single Message"
+msgstr "新單條訊息"
+
+#: ../src/common/connection_handlers_events.py:2485
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr " %(nickname)s 發來的新訊息"
+
+#: ../src/common/connection_handlers_events.py:2489 ../src/dialogs.py:2974
+#: ../src/notify.py:278
+msgid "New Private Message"
+msgstr "新個人訊息"
+
+#: ../src/common/connection_handlers_events.py:2491
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "來自聊天室 %s 的私人訊息"
+
+#: ../src/common/connection_handlers_events.py:2494
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s:  %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2497
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "來自 %(nickname)s 的訊息"
+
+#: ../src/common/connection_handlers_events.py:2501 ../src/dialogs.py:2973
+#: ../src/notify.py:277
+msgid "New Message"
+msgstr "新訊息"
+
+#: ../src/common/connection_handlers_events.py:2503
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "來自 %(nickname)s 的新訊息"
+
+#: ../src/common/connection_handlers_events.py:2669
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s 變更了狀態"
+
+#: ../src/common/connection_handlers_events.py:2671
+#: ../src/groupchat_control.py:215 ../src/groupchat_control.py:1909
+#: ../src/history_window.py:472
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s 的狀態是 %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2675 ../src/dialogs.py:2985
+#: ../src/notify.py:291
+msgid "Contact Changed Status"
+msgstr "聯絡人狀態變更"
+
+#: ../src/common/connection_handlers_events.py:2677
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s 上線了"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2681 ../src/dialogs.py:2969
+#: ../src/notify.py:273
+msgid "Contact Signed In"
+msgstr "聯絡人登入"
+
+#: ../src/common/connection_handlers_events.py:2683
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s 離開了"
+
+#: ../src/common/connection_handlers_events.py:2687 ../src/dialogs.py:2971
+#: ../src/notify.py:275
+msgid "Contact Signed Out"
+msgstr "聯絡人離開登入"
+
+#: ../src/common/contacts.py:133 ../src/common/helpers.py:73
+#: ../src/gui_interface.py:493
 msgid "Observers"
 msgstr "旁觀者"
 
-#: ../src/common/contacts.py:130 ../src/common/contacts.py:358
-#: ../src/common/helpers.py:60 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:856
-#: ../src/roster_window.py:1552 ../src/roster_window.py:1640
-#: ../src/roster_window.py:1642 ../src/roster_window.py:1804
-#: ../src/roster_window.py:2480
+#. Invite to
+#: ../src/common/contacts.py:137 ../src/common/contacts.py:365
+#: ../src/common/helpers.py:73 ../src/disco.py:129 ../src/disco.py:130
+#: ../src/disco.py:1514 ../src/roster_window.py:883
+#: ../src/roster_window.py:1643 ../src/roster_window.py:1753
+#: ../src/roster_window.py:1755 ../src/roster_window.py:1918
+#: ../src/roster_window.py:2597 ../src/roster_window.py:5685
 msgid "Transports"
 msgstr "服務代理"
 
-#: ../src/common/contacts.py:366
+#: ../src/common/contacts.py:373
 msgid "Not in roster"
 msgstr "不在聯絡人清單中"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "這臺電腦缺少 D-Bus 的 python 繫結"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim 的 D-Bus 相容性無法使用"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus 在這臺電腦上沒有正常執行"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus 在這臺電腦上沒有正常執行: 未發現系統匯流排"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus 在這臺電腦上沒有正常執行: 未發現作業階段匯流排"
 
@@ -4838,7 +5419,7 @@ msgstr "不能讀取資料庫。"
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr "服務無法使用: Gajim 不在執行，或是 remote_control 為假"
 
-#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:57
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "在這臺電腦上沒有 D-Bus 或是 Python 模組缺失"
 
@@ -4860,434 +5441,453 @@ msgstr ""
 "系統匯流排無法使用。\n"
 "請參考 %(url)s"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "twelve"
 msgstr "十二"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "one"
 msgstr "一"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "two"
 msgstr "二"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "three"
 msgstr "三"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "four"
 msgstr "四"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "five"
 msgstr "五"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "six"
 msgstr "六"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "seven"
 msgstr "七"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "eight"
 msgstr "八"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "nine"
 msgstr "九"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "ten"
 msgstr "十"
 
-#: ../src/common/fuzzyclock.py:40
+#: ../src/common/fuzzyclock.py:39
 msgid "eleven"
 msgstr "十一"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
 #. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s點"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s點5分"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s點10分"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s點15分"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s點20分"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s點25分"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s點半"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty five to %(1)s"
 msgstr "差25分%(1)s點"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty to %(1)s"
 msgstr "差20分%(1)s點"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "quarter to %(1)s"
 msgstr "差15分%(1)s點"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "ten to %(1)s"
 msgstr "差10分%(1)s點"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "five to %(1)s"
 msgstr "差5分%(1)s點"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s點"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:50
 msgid "Night"
 msgstr "夜晚"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:48
 msgid "Early morning"
 msgstr "清晨"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:48
 msgid "Morning"
 msgstr "上午"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Almost noon"
 msgstr "將近中午"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Noon"
 msgstr "中午"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Afternoon"
 msgstr "下午"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Evening"
 msgstr "傍晚"
 
-#: ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:50
 msgid "Late evening"
 msgstr "晚上"
 
-#: ../src/common/fuzzyclock.py:53
+#: ../src/common/fuzzyclock.py:52
 msgid "Start of week"
 msgstr "一周開始"
 
-#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:53
 msgid "Middle of week"
 msgstr "一周中"
 
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
 msgid "End of week"
 msgstr "一週末"
 
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
 msgid "Weekend!"
 msgstr "週末"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:179
 msgid "Username must be between 1 and 1023 chars"
 msgstr "使用者名稱必須在 1 到 1023 個字元之間"
 
-#: ../src/common/helpers.py:156
+#: ../src/common/helpers.py:184
 msgid "Invalid character in username."
 msgstr "在使用者名稱中有無效的字元。"
 
-#: ../src/common/helpers.py:162
+#: ../src/common/helpers.py:190
 msgid "Server must be between 1 and 1023 chars"
 msgstr "伺服器名稱必須在 1 到 1023 個字元之間"
 
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:195
 msgid "Invalid character in hostname."
 msgstr "主機名稱中有無效的字元。"
 
-#: ../src/common/helpers.py:169
+#: ../src/common/helpers.py:197
 msgid "Server address required."
 msgstr "伺服器的位址是必須的。"
 
-#: ../src/common/helpers.py:173
+#: ../src/common/helpers.py:201
 msgid "Resource must be between 1 and 1023 chars"
 msgstr "資源必須在 1 到 1023 個字元之間"
 
-#: ../src/common/helpers.py:178
+#: ../src/common/helpers.py:206
 msgid "Invalid character in resource."
 msgstr "資源中含有無效字元。"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:246
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:220 ../src/tooltips.py:195
+#: ../src/common/helpers.py:248 ../src/tooltips.py:915
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:251
 msgid "_Not Available"
 msgstr "離開很久了(_N)"
 
-#: ../src/common/helpers.py:225 ../src/tooltips.py:197
+#: ../src/common/helpers.py:253 ../src/tooltips.py:917
 msgid "Not Available"
 msgstr "離開很久了"
 
-#: ../src/common/helpers.py:228
+#: ../src/common/helpers.py:256
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: ../src/common/helpers.py:230 ../src/tooltips.py:191
+#: ../src/common/helpers.py:258 ../src/tooltips.py:911
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:261
 msgid "?user status:_Available"
 msgstr "線上(_A)"
 
-#: ../src/common/helpers.py:235 ../src/tooltips.py:189
+#: ../src/common/helpers.py:263 ../src/tooltips.py:909
 msgid "?user status:Available"
 msgstr "線上"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:265
 msgid "Connecting"
 msgstr "正在連線"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:268
 msgid "A_way"
 msgstr "離開(_A)"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:273
 msgid "_Offline"
 msgstr "離線(_O)"
 
-#: ../src/common/helpers.py:247 ../src/tooltips.py:199
+#: ../src/common/helpers.py:275 ../src/tooltips.py:919
 msgid "Offline"
 msgstr "離線"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:278
 msgid "_Invisible"
 msgstr "隱身(_I)"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:280
 msgid "Invisible"
 msgstr "隱身"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:284
 msgid "?contact has status:Unknown"
 msgstr "不明"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:286
 msgid "?contact has status:Has errors"
 msgstr "有錯誤"
 
-#: ../src/common/helpers.py:263
+#: ../src/common/helpers.py:291
 msgid "?Subscription we already have:None"
 msgstr "無"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:293
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:295
 msgid "From"
 msgstr "From"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:297
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:305
 msgid "?Ask (for Subscription):None"
 msgstr "無"
 
-#: ../src/common/helpers.py:279
+#: ../src/common/helpers.py:307
 msgid "Subscribe"
 msgstr "認證"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:316
 msgid "?Group Chat Contact Role:None"
 msgstr "無"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:319
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:321
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:296
+#: ../src/common/helpers.py:324
 msgid "Participants"
 msgstr "參與者"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:326
 msgid "Participant"
 msgstr "參與者"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:329
 msgid "Visitors"
 msgstr "訪客"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:331
 msgid "Visitor"
 msgstr "訪客"
 
-#: ../src/common/helpers.py:309 ../src/tooltips.py:210
+#: ../src/common/helpers.py:337 ../src/tooltips.py:403
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "無"
 
-#: ../src/common/helpers.py:311 ../src/tooltips.py:216
+#: ../src/common/helpers.py:339 ../src/tooltips.py:409
 msgid "Owner"
 msgstr "所有者"
 
-#: ../src/common/helpers.py:313 ../src/tooltips.py:214
+#: ../src/common/helpers.py:341 ../src/tooltips.py:407
 msgid "Administrator"
 msgstr "管理員"
 
-#: ../src/common/helpers.py:315 ../src/tooltips.py:212
+#: ../src/common/helpers.py:343 ../src/tooltips.py:405
 msgid "Member"
 msgstr "成員"
 
-#: ../src/common/helpers.py:354
+#: ../src/common/helpers.py:382
 msgid "is paying attention to the conversation"
 msgstr "注意著與您的對話"
 
-#: ../src/common/helpers.py:356
+#: ../src/common/helpers.py:384
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:386
 msgid "is composing a message..."
 msgstr "正在輸入訊息…"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:361
+#: ../src/common/helpers.py:389
 msgid "paused composing a message"
 msgstr "暫停輸入訊息"
 
-#: ../src/common/helpers.py:363
+#: ../src/common/helpers.py:391
 msgid "has closed the chat window or tab"
 msgstr "關閉了聊天視窗或標籤"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:597
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:631
+#: ../src/common/helpers.py:600
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:604
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:638
+#: ../src/common/helpers.py:607
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:611
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:614
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:648
+#: ../src/common/helpers.py:617
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1099 ../src/common/helpers.py:1106
+#: ../src/common/helpers.py:1069 ../src/common/helpers.py:1076
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 條訊息未處理"
 
-#: ../src/common/helpers.py:1112
-#, python-format
-msgid " from room %s"
+#: ../src/common/helpers.py:1083
+#, fuzzy, python-format
+msgid "from room %s"
 msgstr " 來自聊天室 %s"
 
-#: ../src/common/helpers.py:1115 ../src/common/helpers.py:1132
-#, python-format
-msgid " from user %s"
+#: ../src/common/helpers.py:1086 ../src/common/helpers.py:1103
+#, fuzzy, python-format
+msgid "from user %s"
 msgstr " 來自使用者 %s"
 
-#: ../src/common/helpers.py:1117
-#, python-format
-msgid " from %s"
+#: ../src/common/helpers.py:1088
+#, fuzzy, python-format
+msgid "from %s"
 msgstr " 來自 %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1130
+#: ../src/common/helpers.py:1095 ../src/common/helpers.py:1101
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 個未處理事件"
 
-#: ../src/common/helpers.py:1162
+#: ../src/common/helpers.py:1133
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1319
 msgid "Hello, I am $name."
 msgstr "您好，我是$name"
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1433 ../src/common/helpers.py:1442
+#: ../src/common/helpers.py:1501
+msgid "Timeout loading image"
+msgstr "讀取檔案逾時"
+
+#: ../src/common/helpers.py:1452 ../src/common/helpers.py:1499
+msgid "Image is too big"
+msgstr "圖片太大"
+
+#: ../src/common/helpers.py:1463
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "證書吊銷清單還未生效"
+
+#: ../src/common/helpers.py:1503
+#, fuzzy
+msgid "Error loading image"
+msgstr "讀取檔案逾時"
+
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid "%s configuration error"
 msgstr "%s 設定錯誤"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:116
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5306,11 +5906,11 @@ msgstr ""
 "錯誤: \n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:221
 msgid "GStreamer error"
 msgstr "GStreamer 錯誤"
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:221
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -5319,110 +5919,119 @@ msgstr ""
 "錯誤: %s\n"
 "除錯資訊: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:355
 msgid "audio input"
 msgstr "音訊輸入"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:358
 msgid "audio output"
 msgstr "音訊輸出"
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:415
 msgid "video input"
 msgstr "視訊輸入"
 
-#: ../src/common/jingle_rtp.py:390
+#: ../src/common/jingle_rtp.py:422
 msgid "video output"
 msgstr "視訊輸出"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "在執行命令\"%(command)s\"時發生錯誤: %(error)s"
-
-#: ../src/common/logging_helpers.py:33
+#: ../src/common/logging_helpers.py:32
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s 不是一個合法的日誌層級"
 
-#: ../src/common/multimedia_helpers.py:39
-msgid " Default device"
+#: ../src/common/multimedia_helpers.py:40
+#, fuzzy
+msgid "Default device"
 msgstr "預設裝置"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:60
+#: ../src/common/multimedia_helpers.py:59
 msgid "Audio test"
 msgstr "音訊測試"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:63
-#: ../src/common/multimedia_helpers.py:79
-#: ../src/common/multimedia_helpers.py:93
-#: ../src/common/multimedia_helpers.py:111
+#: ../src/common/multimedia_helpers.py:62
+#: ../src/common/multimedia_helpers.py:78
+#: ../src/common/multimedia_helpers.py:92
+#: ../src/common/multimedia_helpers.py:110
 msgid "Autodetect"
 msgstr "自動偵測"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:66
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:80
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
 #. Pulseaudio src
 #. Pulseaudio sink
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:83
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:82
 #, python-format
 msgid "Pulse: %s"
 msgstr "Pulse: %s"
 
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:77
-#: ../src/common/multimedia_helpers.py:105
+#: ../src/common/multimedia_helpers.py:76
 msgid "Fake audio output"
 msgstr "偽裝音訊輸出"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:90
+#: ../src/common/multimedia_helpers.py:89
 msgid "Video test"
 msgstr "視訊測試"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:94
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#: ../src/common/multimedia_helpers.py:108
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:97
+#, fuzzy
+msgid "Screen"
+msgstr "綠色"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:104
+#, fuzzy
+msgid "Fake video output"
+msgstr "視訊輸出"
+
+#: ../src/common/multimedia_helpers.py:107
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X 視窗系統 (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:110
+#: ../src/common/multimedia_helpers.py:109
 msgid "X Window System (without Xv)"
 msgstr "X 視窗系統 (沒有Xv)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:55 ../src/gtkgui_helpers.py:215
+#: ../src/gtkgui_helpers.py:231
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "錯誤: 無法讀取檔案 %s"
+msgid "Error: cannot open %s for reading"
+msgstr "錯誤: 無法按讀開啟檔案 %s"
 
-#: ../src/common/optparser.py:305 ../src/common/optparser.py:306
+#: ../src/common/optparser.py:313 ../src/common/optparser.py:314
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:385
+#: ../src/common/optparser.py:393
 msgid "migrating logs database to indices"
 msgstr "遷移記錄資料庫到索引"
 
-#: ../src/common/passwords.py:123
+#: ../src/common/passwords.py:100
 #, python-format
 msgid "XMPP account %s@%s"
 msgstr "XMPP 帳號 %s@%s"
@@ -6055,19 +6664,116 @@ msgstr "學習"
 msgid "Writing"
 msgstr "寫作"
 
-#: ../src/common/pep.py:339
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "預設"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "海洋"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "藏起來"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "帳號"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "帳號"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "描述"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "錯誤"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "一"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "聊天室"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+#, fuzzy
+msgid "street"
+msgstr "stream"
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:341
 msgid "Unknown Artist"
 msgstr "不明演出者"
 
-#: ../src/common/pep.py:342
+#: ../src/common/pep.py:344
 msgid "Unknown Title"
 msgstr "不明標題"
 
-#: ../src/common/pep.py:345
+#: ../src/common/pep.py:347
 msgid "Unknown Source"
 msgstr "不明來源"
 
-#: ../src/common/pep.py:348
+#: ../src/common/pep.py:350
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6076,20 +6782,8 @@ msgstr ""
 "<b>\"%(title)s\"</b> 作者 <i>%(artist)s</i>\n"
 "出自 <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "無法繫結連接埠%s。"
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr "或許您有另一個正在執行的 Gajim 實體。檔案傳輸將被取消。"
-
 #. we're not english
-#: ../src/common/stanza_session.py:424
+#: ../src/common/stanza_session.py:425
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6097,7 +6791,7 @@ msgstr ""
 "[這是加密作業階段的一部分。如果您看到了這條訊息，一定是有什麼地方發生錯誤"
 "了。]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 msgid "Avahi error"
 msgstr "Avahi 錯誤"
 
@@ -6110,73 +6804,63 @@ msgstr ""
 "%s\n"
 "Link-local 訊息可能無法正常工作。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:205
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "請檢查 Avahi 或是 Bonjour 是否已經安裝。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:215
-#: ../src/common/zeroconf/connection_zeroconf.py:219
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "無法啟動本地服務"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "無法繫結連接埠 %d。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:220
-#: ../src/common/zeroconf/connection_zeroconf.py:304
-#: ../src/common/zeroconf/connection_zeroconf.py:317
-#: ../src/common/zeroconf/connection_zeroconf.py:333
+#: ../src/common/zeroconf/connection_zeroconf.py:221
+#: ../src/common/zeroconf/connection_zeroconf.py:306
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:335
 msgid "Please check if avahi-daemon is running."
 msgstr "請檢查 avahi-daemon 是否正在執行。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:303
-#: ../src/common/zeroconf/connection_zeroconf.py:316
-#: ../src/common/zeroconf/connection_zeroconf.py:332
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "無法變更帳號\"%s\"的狀態"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:351
-#: ../src/common/zeroconf/connection_zeroconf.py:390
+#: ../src/common/zeroconf/connection_zeroconf.py:357
 msgid "Your message could not be sent."
 msgstr "您的訊息未能被傳送。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:365
-#: ../src/common/zeroconf/connection_zeroconf.py:404
+#: ../src/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "聯絡人離線。您的訊息未能被傳送。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:431
+#: ../src/common/zeroconf/connection_zeroconf.py:396
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "無法建立到主機的連線: 傳送資料逾時。"
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:193
-#: ../src/common/zeroconf/zeroconf_bonjour.py:191
+#: ../src/common/zeroconf/zeroconf_avahi.py:221
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "加入服務錯誤。 %s"
 
-#: ../src/config.py:406
-msgid "Default Message"
-msgstr "預設訊息"
-
-#: ../src/config.py:415
-msgid "Enabled"
-msgstr "啟用"
-
-#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3115
+#: ../src/config.py:449 ../src/config.py:453 ../src/config.py:3218
 msgid "Default"
 msgstr "預設"
 
-#: ../src/config.py:746 ../src/dialogs.py:1493
+#: ../src/config.py:724 ../src/dialogs.py:1530
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "語言 %s 的詞典無法使用"
 
-#: ../src/config.py:747
+#: ../src/config.py:725
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6184,209 +6868,210 @@ msgid ""
 msgstr ""
 "您需安裝 %s 詞典以使用拼寫檢查，或是設定拼寫檢查選項以選擇另外一種語言。(_L)"
 
-#: ../src/config.py:1223
+#: ../src/config.py:1213
 msgid "status message title"
 msgstr "狀態訊息標題"
 
-#: ../src/config.py:1223
+#: ../src/config.py:1214
 msgid "status message text"
 msgstr "狀態訊息文字"
 
 #. Name column
-#: ../src/config.py:1523 ../src/dialogs.py:2528 ../src/dialogs.py:2595
-#: ../src/dialogs.py:3382 ../src/disco.py:886 ../src/disco.py:1744
-#: ../src/disco.py:2046 ../src/history_window.py:90
+#: ../src/config.py:1559 ../src/dialogs.py:2725 ../src/dialogs.py:2792
+#: ../src/dialogs.py:3579 ../src/disco.py:912 ../src/disco.py:1747
+#: ../src/disco.py:2035 ../src/history_window.py:94
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/config.py:1618
+#: ../src/config.py:1666
 msgid "Relogin now?"
 msgstr "現在重新登入?"
 
-#: ../src/config.py:1619
+#: ../src/config.py:1667
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有調整立即生效，您必須重新登入。"
 
-#: ../src/config.py:1773 ../src/config.py:1906
+#: ../src/config.py:1827 ../src/config.py:1962
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP 在這臺電腦上無法使用"
 
-#: ../src/config.py:1946 ../src/config.py:1993
+#: ../src/config.py:2007 ../src/config.py:2057
 msgid "Unread events"
 msgstr "未讀取的事件"
 
-#: ../src/config.py:1947
+#: ../src/config.py:2008
 msgid "Read all pending events before removing this account."
 msgstr "移除帳號前請檢視所有未處理事件。"
 
-#: ../src/config.py:1976
+#: ../src/config.py:2038
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在帳號 %s 開啟聊天"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2039
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和多人聊天視窗將會關閉。您想繼續嗎?"
 
-#: ../src/config.py:1989 ../src/config.py:2531 ../src/config.py:2567
+#: ../src/config.py:2052 ../src/config.py:2628 ../src/config.py:2666
 msgid "You are currently connected to the server"
 msgstr "正在連線到伺服器"
 
-#: ../src/config.py:1990
+#: ../src/config.py:2053
 msgid "To change the account name, you must be disconnected."
 msgstr "如要變更帳號名稱，需中斷連線。"
 
-#: ../src/config.py:1994
+#: ../src/config.py:2058
 msgid "To change the account name, you must read all pending events."
 msgstr "如要變更帳號名稱，需先處理所有未處理事件"
 
-#: ../src/config.py:2000
+#: ../src/config.py:2064
 msgid "Account Name Already Used"
 msgstr "帳號名稱已經被佔用"
 
-#: ../src/config.py:2001
+#: ../src/config.py:2065
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "該名稱已被您的另一個帳號使用。請選擇其他名稱"
 
-#: ../src/config.py:2005 ../src/config.py:2009
+#: ../src/config.py:2069 ../src/config.py:2074
 msgid "Invalid account name"
 msgstr "無效的帳號名稱"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2070
 msgid "Account name cannot be empty."
 msgstr "帳號名稱不能為空。"
 
-#: ../src/config.py:2010
+#: ../src/config.py:2075
 msgid "Account name cannot contain spaces."
 msgstr "帳號名稱不能包含空格。"
 
-#: ../src/config.py:2087
+#: ../src/config.py:2156
 msgid "Rename Account"
 msgstr "重新命名帳號"
 
-#: ../src/config.py:2088
+#: ../src/config.py:2157
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "為帳號 %s 輸入新的名稱"
 
-#: ../src/config.py:2116
+#: ../src/config.py:2187
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式為 \"使用者@伺服器名稱\"。"
 
-#: ../src/config.py:2339 ../src/config.py:3665
+#: ../src/config.py:2425 ../src/config.py:3768
 msgid "Invalid entry"
 msgstr "無效輸入"
 
-#: ../src/config.py:2340 ../src/config.py:3666
+#: ../src/config.py:2426 ../src/config.py:3769
 msgid "Custom port must be a port number."
 msgstr "自訂連接埠必須為連接埠號碼。"
 
-#: ../src/config.py:2361
+#: ../src/config.py:2448
 msgid "Failed to get secret keys"
 msgstr "獲取密鑰失敗"
 
-#: ../src/config.py:2362
+#: ../src/config.py:2449
 msgid "There is no OpenPGP secret key available."
 msgstr "沒有可用的 OpenPGP 私鑰"
 
-#: ../src/config.py:2396
+#: ../src/config.py:2487
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密鑰選擇"
 
-#: ../src/config.py:2397
+#: ../src/config.py:2488
 msgid "Choose your OpenPGP key"
 msgstr "選擇您的 OpenPGP 密鑰"
 
-#: ../src/config.py:2404
+#: ../src/config.py:2496
 msgid "No such account available"
 msgstr "不明的帳號可用"
 
-#: ../src/config.py:2405
+#: ../src/config.py:2497
 msgid "You must create your account before editing your personal information."
 msgstr "您必須在編輯個人資訊前建立帳號。"
 
-#: ../src/config.py:2412 ../src/dialogs.py:2281 ../src/dialogs.py:2517
-#: ../src/dialogs.py:2705 ../src/disco.py:515 ../src/profile_window.py:361
+#: ../src/config.py:2504 ../src/dialogs.py:2412 ../src/dialogs.py:2713
+#: ../src/dialogs.py:2903 ../src/disco.py:529 ../src/profile_window.py:375
 msgid "You are not connected to the server"
 msgstr "尚未連線到伺服器"
 
-#: ../src/config.py:2413
+#: ../src/config.py:2505
 msgid "Without a connection, you can not edit your personal information."
 msgstr "無法離線編輯個人資訊。"
 
-#: ../src/config.py:2417
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2510
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "您的伺服器不支援 Vcard"
 
-#: ../src/config.py:2418
+#: ../src/config.py:2511
 msgid "Your server can't save your personal information."
 msgstr "您的伺服器無法儲存您的個人資訊。"
 
-#: ../src/config.py:2532 ../src/config.py:2568
+#: ../src/config.py:2629 ../src/config.py:2667
 msgid "To disable the account, you must be disconnected."
 msgstr "要停用帳號，您必須中斷連線。"
 
-#: ../src/config.py:2537
+#: ../src/config.py:2636
 msgid "Account Local already exists."
 msgstr "帳號本地已存在。"
 
-#: ../src/config.py:2538
+#: ../src/config.py:2637
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "請在使用本地訊息前重新命名或移除它。"
 
-#: ../src/config.py:2695
+#: ../src/config.py:2798
 #, python-format
 msgid "Edit %s"
 msgstr "編輯 %s"
 
-#: ../src/config.py:2697
+#: ../src/config.py:2800
 #, python-format
 msgid "Register to %s"
 msgstr "註冊到 %s"
 
 #. list at the beginning
-#: ../src/config.py:2733
+#: ../src/config.py:2836
 msgid "Ban List"
 msgstr "封禁名單"
 
-#: ../src/config.py:2734
+#: ../src/config.py:2837
 msgid "Member List"
 msgstr "成員清單"
 
-#: ../src/config.py:2734
+#: ../src/config.py:2837
 msgid "Owner List"
 msgstr "室長清單"
 
-#: ../src/config.py:2735
+#: ../src/config.py:2838
 msgid "Administrator List"
 msgstr "管理員清單"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2799 ../src/disco.py:893 ../src/history_manager.py:207
+#: ../src/config.py:2902 ../src/disco.py:919 ../src/history_manager.py:219
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2809
+#: ../src/config.py:2912
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2816
+#: ../src/config.py:2919
 msgid "Nick"
 msgstr "暱稱"
 
-#: ../src/config.py:2822
+#: ../src/config.py:2925
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2849
+#: ../src/config.py:2952
 msgid "Banning..."
 msgstr "封禁…"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2851
+#: ../src/config.py:2954
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6394,11 +7079,11 @@ msgstr ""
 "<b>想做封禁誰?</b>\n"
 "\n"
 
-#: ../src/config.py:2853
+#: ../src/config.py:2956
 msgid "Adding Member..."
 msgstr "正在加入成員…"
 
-#: ../src/config.py:2854
+#: ../src/config.py:2957
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6406,11 +7091,11 @@ msgstr ""
 "<b>想要將誰加為成員?</b>\n"
 "\n"
 
-#: ../src/config.py:2856
+#: ../src/config.py:2959
 msgid "Adding Owner..."
 msgstr "加入室長…"
 
-#: ../src/config.py:2857
+#: ../src/config.py:2960
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6418,11 +7103,11 @@ msgstr ""
 "<b>您想要讓誰成為室長?</b>\n"
 "\n"
 
-#: ../src/config.py:2859
+#: ../src/config.py:2962
 msgid "Adding Administrator..."
 msgstr "加入管理員…"
 
-#: ../src/config.py:2860
+#: ../src/config.py:2963
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6430,7 +7115,7 @@ msgstr ""
 "<b>您想要讓誰成為管理員?</b>\n"
 "\n"
 
-#: ../src/config.py:2861
+#: ../src/config.py:2964
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6446,108 +7131,102 @@ msgstr ""
 "4。domain (欄位名稱本身匹配，任何 user@domain，\n"
 "domain/resource，或是包含一個子欄位名稱的位址也匹配)。"
 
-#: ../src/config.py:2962
+#: ../src/config.py:3064
 #, python-format
 msgid "Removing %s account"
 msgstr "移除帳號 %s"
 
-#: ../src/config.py:2977
+#: ../src/config.py:3079
 msgid "Account is disabled"
 msgstr "帳號被停用"
 
-#: ../src/config.py:2978
+#: ../src/config.py:3080
 msgid "To unregister from a server, account must be enabled."
 msgstr "要從伺服器移除註冊，帳號必須被啟用。"
 
-#: ../src/config.py:2991 ../src/gui_interface.py:278
-#: ../src/gui_interface.py:696
+#: ../src/config.py:3093 ../src/gui_interface.py:290
+#: ../src/gui_interface.py:748
 msgid "Password Required"
 msgstr "需要密碼"
 
-#: ../src/config.py:2992 ../src/gui_interface.py:676
+#: ../src/config.py:3094 ../src/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "輸入帳號 %s 的密碼"
 
-#: ../src/config.py:2993 ../src/gui_interface.py:696
+#: ../src/config.py:3095 ../src/gui_interface.py:748
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../src/config.py:3003
+#: ../src/config.py:3105
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "帳號 \"%s\" 已連線到伺服器"
 
-#: ../src/config.py:3004
+#: ../src/config.py:3106
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，將會丟失連線"
 
-#: ../src/config.py:3018
+#: ../src/config.py:3120
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "連線伺服器 %s 失敗"
 
-#: ../src/config.py:3019
+#: ../src/config.py:3121
 msgid "What would you like to do?"
 msgstr "您想做什麼?"
 
-#: ../src/config.py:3020
+#: ../src/config.py:3122
 msgid "Remove only from Gajim"
 msgstr "僅從 Gajim 移除帳號"
 
-#: ../src/config.py:3021
+#: ../src/config.py:3123
 msgid "Don't remove anything. I'll try again later"
 msgstr "不要移除任何東西。我過一會兒會重試一下"
 
-#: ../src/config.py:3115
+#: ../src/config.py:3218
 msgid "?print_status:All"
 msgstr "全部"
 
-#: ../src/config.py:3116
+#: ../src/config.py:3219
 msgid "Enter and leave only"
 msgstr "只是進入和離開"
 
-#: ../src/config.py:3117
+#: ../src/config.py:3220
 msgid "?print_status:None"
 msgstr "無"
 
-#: ../src/config.py:3189
+#: ../src/config.py:3280
 msgid "New Group Chat"
 msgstr "新聊天室"
 
-#: ../src/config.py:3222
+#: ../src/config.py:3316
 msgid "This bookmark has invalid data"
 msgstr "此書籤含無效資料"
 
-#: ../src/config.py:3223
+#: ../src/config.py:3317
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "請確認填寫伺服器與聊天室欄位或移除此書籤。"
 
-#. invalid char
-#: ../src/config.py:3348 ../src/dialogs.py:2070
-msgid "Invalid nickname"
-msgstr "無效的暱稱"
-
-#: ../src/config.py:3349 ../src/config.py:3360 ../src/config.py:3369
-#: ../src/config.py:3380 ../src/config.py:3388
+#: ../src/config.py:3440 ../src/config.py:3456 ../src/config.py:3467
+#: ../src/config.py:3495
 msgid "Character not allowed"
 msgstr "不允許的字元"
 
-#: ../src/config.py:3360 ../src/config.py:3368 ../src/config.py:3380
-#: ../src/config.py:3641
+#: ../src/config.py:3455 ../src/config.py:3466 ../src/config.py:3744
 msgid "Invalid server"
 msgstr "無效的伺服器"
 
-#: ../src/config.py:3387
+#: ../src/config.py:3494
 msgid "Invalid room"
 msgstr "無效聊天室"
 
-#: ../src/config.py:3557
+#: ../src/config.py:3658
 msgid "Account has been added successfully"
 msgstr "帳號已成功加入"
 
-#: ../src/config.py:3558 ../src/config.py:3564
+#: ../src/config.py:3659 ../src/config.py:3665
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
@@ -6556,32 +7235,32 @@ msgstr ""
 "您可以點擊\"進階\"按鈕以設定進階帳號選項，或稍後選擇主視窗\"編輯\"選單下\"帳"
 "號\"選單項。"
 
-#: ../src/config.py:3563
+#: ../src/config.py:3664
 msgid "Your new account has been created successfully"
 msgstr "註冊新帳號成功"
 
-#: ../src/config.py:3602
+#: ../src/config.py:3702
 msgid "Invalid username"
 msgstr "無效使用者名稱"
 
-#: ../src/config.py:3604
+#: ../src/config.py:3704
 msgid "You must provide a username to configure this account."
 msgstr "必須提供使用者名稱來配置此帳號。"
 
-#: ../src/config.py:3642
+#: ../src/config.py:3745
 msgid "Please provide a server on which you want to register."
 msgstr "請指定一個伺服器。您將註冊到這個伺服器。"
 
-#: ../src/config.py:3698 ../src/gui_interface.py:1174
+#: ../src/config.py:3801 ../src/gui_interface.py:1351
 msgid "Certificate Already in File"
 msgstr "證書已經在檔案中"
 
-#: ../src/config.py:3699 ../src/gui_interface.py:1175
+#: ../src/config.py:3802 ../src/gui_interface.py:1352
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "證書已經在檔案 %s 中，所以它沒有被再次加入。"
 
-#: ../src/config.py:3788
+#: ../src/config.py:3895
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6596,88 +7275,97 @@ msgstr ""
 "SSL 錯誤: %(error)s\n"
 "您仍然想要連線到這個伺服器嗎?"
 
-#: ../src/config.py:3794 ../src/gui_interface.py:1203
-#, python-format
+#: ../src/config.py:3901 ../src/gui_interface.py:1382
+#, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
+"%s\n"
+"SHA256 fingerprint of the certificate:\n"
 "%s"
 msgstr ""
 "將這個證書加入到可信任證書清單。\n"
 "這個證書的 SHA1 指紋資訊: \n"
 "%s"
 
-#: ../src/config.py:3826 ../src/config.py:3860
+#: ../src/config.py:3934 ../src/config.py:3968
 msgid "An error occurred during account creation"
 msgstr "建立帳號期間發生錯誤"
 
-#: ../src/config.py:3925
+#: ../src/config.py:4033
 msgid "Account name is in use"
 msgstr "帳號名稱已經被使用"
 
-#: ../src/config.py:3926
+#: ../src/config.py:4034
 msgid "You already have an account using this name."
 msgstr "您已經有帳號使用這個名稱了。"
 
-#: ../src/config.py:4056
+#: ../src/config.py:4164
 msgid "PEP node was not removed"
 msgstr "PEP節點沒有被移除"
 
-#: ../src/config.py:4057
+#: ../src/config.py:4165
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP 節點 %(node)s 沒有被移除: %(message)s"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4193
 #, python-format
 msgid "Configure %s"
 msgstr "組配 %s"
 
-#: ../src/config.py:4101 ../src/plugins/gui.py:73
-msgid "Active"
-msgstr "活動"
-
-#: ../src/config.py:4109
+#: ../src/config.py:4218
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:4144
+#: ../src/config.py:4252
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "最初收到的訊息"
+
+#: ../src/config.py:4253
 msgid "First Message Received"
 msgstr "最初收到的訊息"
 
-#: ../src/config.py:4145
+#: ../src/config.py:4254
 msgid "Next Message Received Focused"
 msgstr "已聚焦收到的下一筆訊息"
 
-#: ../src/config.py:4147
+#: ../src/config.py:4256
 msgid "Next Message Received Unfocused"
 msgstr "解除聚焦收到的下一筆訊息"
 
-#: ../src/config.py:4148
+#: ../src/config.py:4257
 msgid "Contact Connected"
 msgstr "已連線的聯絡人"
 
-#: ../src/config.py:4149
+#: ../src/config.py:4258
 msgid "Contact Disconnected"
 msgstr "聯絡人已中斷連線"
 
-#: ../src/config.py:4150
+#: ../src/config.py:4259
 msgid "Message Sent"
 msgstr "訊息已傳送"
 
-#: ../src/config.py:4151
+#: ../src/config.py:4260
 msgid "Group Chat Message Highlight"
 msgstr "多人聊天訊息高亮度顯示"
 
-#: ../src/config.py:4152
+#: ../src/config.py:4261
 msgid "Group Chat Message Received"
 msgstr "收到的多人聊天訊息"
 
-#: ../src/config.py:4153
+#: ../src/config.py:4262
 msgid "GMail Email Received"
 msgstr "收到 GMail 郵件"
 
-#: ../src/conversation_textview.py:603
+#: ../src/conversation_textview.py:351
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
+msgstr "以下文字是您上次注意這個聊天室以來的聊天內容"
+
+#: ../src/conversation_textview.py:657
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6686,235 +7374,245 @@ msgstr ""
 "這個圖示是說這條訊息還沒有被遠端收到。如果這個圖示已經存在很久了，很可能這條"
 "訊息丟失了。"
 
-#: ../src/conversation_textview.py:622
-msgid ""
-"Text below this line is what has been said since the\n"
-"last time you paid attention to this group chat"
-msgstr "以下文字是您上次注意這個聊天室以來的聊天內容"
+#. show clear
+#: ../src/conversation_textview.py:761 ../src/profile_window.py:220
+msgid "_Clear"
+msgstr ""
 
-#: ../src/conversation_textview.py:742
+#: ../src/conversation_textview.py:772
 msgid "_Quote"
 msgstr "參照(_Q)"
 
-#: ../src/conversation_textview.py:749
+#: ../src/conversation_textview.py:780
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\"的動作(_A)"
 
-#: ../src/conversation_textview.py:762
+#: ../src/conversation_textview.py:794
 msgid "Read _Wikipedia Article"
 msgstr "檢視 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:767
+#: ../src/conversation_textview.py:799
 msgid "Look it up in _Dictionary"
 msgstr "從字典中搜尋(_D)"
 
-#: ../src/conversation_textview.py:784
+#: ../src/conversation_textview.py:816
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "字典位址中缺少 \"%s\" 並且它不是 \"WIKTIONARY\""
 
-#. we must have %s in the url
-#: ../src/conversation_textview.py:797
+#: ../src/conversation_textview.py:830
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "網路搜尋位址缺少 \"%s\""
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:833
 msgid "Web _Search for it"
 msgstr "在網際網路上搜尋(_S)"
 
-#: ../src/conversation_textview.py:806
+#: ../src/conversation_textview.py:839
 msgid "Open as _Link"
 msgstr "做為連結開啟(_L)"
 
+#: ../src/conversation_textview.py:1221
+#, fuzzy
+msgid "Invalid URL"
+msgstr "無效的 JID"
+
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1310
+#: ../src/conversation_textview.py:1444
 #, python-format
 msgid "Yesterday"
 msgid_plural "%(nb_days)i days ago"
 msgstr[0] "%(nb_days)i天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1359 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1532 ../src/history_window.py:507
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主題: %s\n"
 
-#: ../src/dataforms_widget.py:565
+#: ../src/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "無法載入圖像"
 
-#: ../src/dataforms_widget.py:567
+#: ../src/dataforms_widget.py:587
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "不支援的媒體類型: %s"
 
-#: ../src/dataforms_widget.py:582
+#: ../src/dataforms_widget.py:602
 msgid "This field is required"
 msgstr "此一項是必須的"
 
-#: ../src/dataforms_widget.py:627
+#: ../src/dataforms_widget.py:646
 msgid "Jabber ID already in list"
 msgstr "Jabber ID 已經在清單中了"
 
-#: ../src/dataforms_widget.py:628
+#: ../src/dataforms_widget.py:647
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "您輸入的 Jabber ID 已經在清單中了。請選擇另外一個。"
 
 #. Default jid
-#: ../src/dataforms_widget.py:639
+#: ../src/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
+#: ../src/dataforms_widget.py:661 ../src/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:81
+#: ../src/dialogs.py:93
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "聯絡人名稱: <i>%s</i>"
 
-#: ../src/dialogs.py:83
+#: ../src/dialogs.py:95
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:197
+#: ../src/dialogs.py:209
 msgid "Group"
 msgstr "群組"
 
-#: ../src/dialogs.py:204
+#: ../src/dialogs.py:216
 msgid "In the group"
 msgstr "群組內"
 
-#: ../src/dialogs.py:295
+#: ../src/dialogs.py:309
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:300
+#: ../src/dialogs.py:314
 msgid "Contact name"
 msgstr "聯絡人名稱"
 
-#: ../src/dialogs.py:475
+#: ../src/dialogs.py:492
 msgid "Set Mood"
 msgstr "設定 Mood"
 
-#: ../src/dialogs.py:595
+#: ../src/dialogs.py:613
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 狀態訊息"
 
-#: ../src/dialogs.py:609
+#: ../src/dialogs.py:627
 msgid "Status Message"
 msgstr "狀態訊息"
 
-#: ../src/dialogs.py:800
+#: ../src/dialogs.py:817
 msgid "Overwrite Status Message?"
 msgstr "覆寫狀態訊息?"
 
-#: ../src/dialogs.py:801
+#: ../src/dialogs.py:818
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "這個名稱已被使用。您想要覆寫這個狀態訊息嗎?"
 
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:826
 msgid "Save as Preset Status Message"
 msgstr "另存為預設狀態訊息"
 
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:827
 msgid "Please type a name for this status message"
 msgstr "請為這個狀態訊息輸入一個名稱"
 
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:855
 msgid "AIM Address:"
 msgstr "AIM 位址:"
 
-#: ../src/dialogs.py:839
+#: ../src/dialogs.py:856
 msgid "GG Number:"
 msgstr "GG 號碼:"
 
-#: ../src/dialogs.py:840
+#: ../src/dialogs.py:857
 msgid "ICQ Number:"
 msgstr "ICQ 號碼:"
 
-#: ../src/dialogs.py:841
+#: ../src/dialogs.py:858
 msgid "MSN Address:"
 msgstr "MSN 位址:"
 
-#: ../src/dialogs.py:842
+#: ../src/dialogs.py:859
 msgid "Yahoo! Address:"
 msgstr "Yahoo! 位址:"
 
-#: ../src/dialogs.py:879
-#, python-format
-msgid "Please fill in the data of the contact you want to add in account %s"
+#: ../src/dialogs.py:896
+#, fuzzy, python-format
+msgid ""
+"Please fill in the data of the contact you want\n"
+"to add to your account <b>%s</b>"
 msgstr "請填入您想加入到帳號 %s 的聯絡人的資訊"
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:899
 msgid "Please fill in the data of the contact you want to add"
 msgstr "請填入您想加入的聯絡人的資訊"
 
-#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
-#: ../src/dialogs.py:3615
+#: ../src/dialogs.py:1096 ../src/dialogs.py:1102 ../src/dialogs.py:1107
+#: ../src/dialogs.py:3814
 msgid "Invalid User ID"
 msgstr "無效的使用者ID"
 
-#: ../src/dialogs.py:1081
+#: ../src/dialogs.py:1103
 msgid "The user ID must not contain a resource."
 msgstr "使用者ID不應包含資源。"
 
-#: ../src/dialogs.py:1086
+#: ../src/dialogs.py:1108
 msgid "You cannot add yourself to your roster."
 msgstr "您不能將您自己加入到您的聯絡人清單中。"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1122
 msgid "Contact already in roster"
 msgstr "聯絡人已經在聯絡人清單中"
 
-#: ../src/dialogs.py:1101
+#: ../src/dialogs.py:1123
 msgid "This contact is already listed in your roster."
 msgstr "此聯絡人已經在您的聯絡人清單中了"
 
-#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
+#: ../src/dialogs.py:1176 ../src/dialogs.py:1210
 msgid "User ID:"
 msgstr "使用者 ID:"
 
-#: ../src/dialogs.py:1273
+#: ../src/dialogs.py:1308
 #, fuzzy
 msgid "A GTK+ Jabber/XMPP client"
 msgstr "一個 GTK+ 的 Jabber 客戶端"
 
-#: ../src/dialogs.py:1274
+#: ../src/dialogs.py:1309
 msgid "GTK+ Version:"
 msgstr "GTK+ 版本:"
 
-#: ../src/dialogs.py:1275
-msgid "PyGTK Version:"
+#: ../src/dialogs.py:1309
+#, fuzzy
+msgid "PyGobject Version:"
 msgstr "PyGTK 版本:"
 
-#: ../src/dialogs.py:1285
+#: ../src/dialogs.py:1310
+msgid "python-nbxmpp Version:"
+msgstr ""
+
+#: ../src/dialogs.py:1321
 msgid "Current Developers:"
 msgstr "目前的開發者:"
 
-#: ../src/dialogs.py:1287
+#: ../src/dialogs.py:1323
 msgid "Past Developers:"
 msgstr "既往開發者:"
 
-#: ../src/dialogs.py:1293
+#: ../src/dialogs.py:1329
 msgid "THANKS:"
 msgstr "感謝:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1335
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "最後但不是最不重要的，我們要感謝所有的套件維護者。"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1311
+#: ../src/dialogs.py:1347
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
@@ -6923,7 +7621,7 @@ msgstr ""
 "Guanhao Yin <yinguanhao@gmail.com>\n"
 "趙惟倫 <chaoweilun@gmail.com>"
 
-#: ../src/dialogs.py:1494
+#: ../src/dialogs.py:1531
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6935,244 +7633,295 @@ msgstr ""
 "言。\n"
 "高亮度拼寫錯誤的特性不會被啟用。"
 
-#: ../src/dialogs.py:1872
+#: ../src/dialogs.py:1876 ../src/dialogs.py:1892 ../src/gui_interface.py:1502
+#: ../src/gui_interface.py:1544
+msgid "Insecure connection"
+msgstr "不安全的連線"
+
+#: ../src/dialogs.py:1877
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"您即將透過不安全的連線與帳號 %(account)s (%(server)s) 連接。這意味著您的所有"
+"對話都會不經加密地被交換。您確定要這樣做嗎？"
+
+#: ../src/dialogs.py:1883 ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1547
+msgid "Yes, I really want to connect insecurely"
+msgstr "是的，我確實想要不安全地連線"
+
+#: ../src/dialogs.py:1884
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1885 ../src/groupchat_control.py:2187
+#: ../src/gui_interface.py:725 ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1548 ../src/message_window.py:240
+#: ../src/roster_window.py:2986 ../src/roster_window.py:3666
+#: ../src/roster_window.py:4495
+msgid "_Do not ask me again"
+msgstr "不要再問我了(_D)"
+
+#: ../src/dialogs.py:1984
 msgid "_Resume"
 msgstr "再續(_R)"
 
-#: ../src/dialogs.py:1880
+#: ../src/dialogs.py:1992
 msgid "Re_place"
 msgstr "置換(_P)"
 
-#: ../src/dialogs.py:2071 ../src/dialogs.py:2470
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:2196 ../src/dialogs.py:2661
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "暱稱包含不合法字元。"
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2319
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "%(jid)s 對帳號 %(account)s 的認證請求"
 
-#: ../src/dialogs.py:2192
+#: ../src/dialogs.py:2322
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s 的認證請求"
 
-#: ../src/dialogs.py:2276 ../src/gui_interface.py:1925
+#: ../src/dialogs.py:2407 ../src/gui_interface.py:2143
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已經在聊天室 %s"
 
-#: ../src/dialogs.py:2282
+#: ../src/dialogs.py:2413
 msgid "You can not join a group chat unless you are connected."
 msgstr "您必須連線才能加入聊天室。"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2459
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用帳號 %s 加入聊天室"
 
-#: ../src/dialogs.py:2457
+#: ../src/dialogs.py:2597 ../src/dialogs.py:2608
+#, fuzzy
+msgid "Wrong server"
+msgstr "錯誤的 uri"
+
+#: ../src/dialogs.py:2597 ../src/dialogs.py:2608
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "這不是一個聊天室"
+
+#: ../src/dialogs.py:2648
 msgid "Invalid Account"
 msgstr "無效的帳號"
 
-#: ../src/dialogs.py:2458
+#: ../src/dialogs.py:2649
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "您需要選擇一個帳號，用它來加入聊天室。"
 
-#: ../src/dialogs.py:2469
+#: ../src/dialogs.py:2660
 msgid "Invalid Nickname"
 msgstr "不合法的暱稱"
 
-#: ../src/dialogs.py:2474 ../src/dialogs.py:2480
-#: ../src/groupchat_control.py:2079
+#: ../src/dialogs.py:2665 ../src/dialogs.py:2671
+#: ../src/groupchat_control.py:2260
 msgid "Invalid group chat Jabber ID"
 msgstr "無效的聊天室 Jabber ID"
 
-#: ../src/dialogs.py:2475
+#: ../src/dialogs.py:2666
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "請輸入聊天室的 Jabber ID，以 room@server 的形式。"
 
-#: ../src/dialogs.py:2481 ../src/groupchat_control.py:2080
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2672
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "聊天室 Jabber ID 包含不合法字元。"
 
-#: ../src/dialogs.py:2485 ../src/gui_interface.py:1907
+#: ../src/dialogs.py:2677 ../src/gui_interface.py:2123
 msgid "This is not a group chat"
 msgstr "這不是一個聊天室"
 
-#: ../src/dialogs.py:2486 ../src/gui_interface.py:1908
+#: ../src/dialogs.py:2678 ../src/gui_interface.py:2124
 #, python-format
-msgid "%s is not the name of a group chat."
-msgstr "%s 不是一個聊天室的名稱。"
+msgid ""
+"%s is already in your roster. Please check if %s is a correct group chat "
+"name. If it is, delete it from your roster and try joining the group chat "
+"again."
+msgstr ""
 
-#: ../src/dialogs.py:2518
+#: ../src/dialogs.py:2714
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未連線時，您不能同步您的聯絡人。"
 
-#: ../src/dialogs.py:2531
+#: ../src/dialogs.py:2728
 msgid "Server"
 msgstr "伺服器"
 
-#: ../src/dialogs.py:2567
+#: ../src/dialogs.py:2764
 msgid "This account is not connected to the server"
 msgstr "這個帳號已經連線到伺服器"
 
-#: ../src/dialogs.py:2568
+#: ../src/dialogs.py:2765
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "這個帳號連線後您才可以與之同步"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2790
 msgid "Synchronise"
 msgstr "同步"
 
-#: ../src/dialogs.py:2654
+#: ../src/dialogs.py:2851
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用帳號 %s 開始聊天"
 
-#: ../src/dialogs.py:2656
+#: ../src/dialogs.py:2853
 msgid "Start Chat"
 msgstr "開始聊天"
 
-#: ../src/dialogs.py:2657
+#: ../src/dialogs.py:2854
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "填寫一個暱稱或是 Jabber ID，您將要給其傳送聊天訊息:"
 
+#: ../src/dialogs.py:2856
+#, fuzzy
+msgid "Nickname / Jabber ID"
+msgstr "無效的 Jabber ID"
+
 #. if offline or connecting
-#: ../src/dialogs.py:2684 ../src/dialogs.py:3065 ../src/dialogs.py:3295
+#: ../src/dialogs.py:2882 ../src/dialogs.py:3271 ../src/dialogs.py:3493
 msgid "Connection not available"
 msgstr "連線無法使用"
 
-#: ../src/dialogs.py:2685 ../src/dialogs.py:3066 ../src/dialogs.py:3296
+#: ../src/dialogs.py:2883 ../src/dialogs.py:3272 ../src/dialogs.py:3494
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "請確認您已經連線到 \"%s\"。"
 
-#: ../src/dialogs.py:2694 ../src/dialogs.py:2697
+#: ../src/dialogs.py:2892 ../src/dialogs.py:2895
 msgid "Invalid JID"
 msgstr "無效的 JID"
 
-#: ../src/dialogs.py:2697
+#: ../src/dialogs.py:2895
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "無法解析 \"%s\"。"
 
-#: ../src/dialogs.py:2706
+#: ../src/dialogs.py:2904
 msgid "Without a connection, you can not change your password."
 msgstr "連線後才可變更密碼。"
 
-#: ../src/dialogs.py:2725
+#: ../src/dialogs.py:2924
 msgid "Invalid password"
 msgstr "無效密碼"
 
-#: ../src/dialogs.py:2725
+#: ../src/dialogs.py:2924
 msgid "You must enter a password."
 msgstr "您必須輸入密碼"
 
-#: ../src/dialogs.py:2729
+#: ../src/dialogs.py:2928
 msgid "Passwords do not match"
 msgstr "密碼不符"
 
-#: ../src/dialogs.py:2730
+#: ../src/dialogs.py:2929
 msgid "The passwords typed in both fields must be identical."
 msgstr "在兩個輸入框中輸入的密碼必須一致。"
 
-#: ../src/dialogs.py:2772 ../src/gui_interface.py:813 ../src/notify.py:270
+#: ../src/dialogs.py:2974 ../src/gui_interface.py:898 ../src/notify.py:287
 msgid "New E-mail"
 msgstr "新電子郵件"
 
-#: ../src/dialogs.py:2774 ../src/gui_interface.py:868 ../src/notify.py:263
+#: ../src/dialogs.py:2976 ../src/gui_interface.py:962 ../src/notify.py:280
 msgid "File Transfer Request"
 msgstr "檔案傳輸請求"
 
-#: ../src/dialogs.py:2776 ../src/gui_interface.py:775
-#: ../src/gui_interface.py:839 ../src/notify.py:265
+#: ../src/dialogs.py:2978 ../src/gui_interface.py:860
+#: ../src/gui_interface.py:927 ../src/notify.py:282
 msgid "File Transfer Error"
 msgstr "檔案傳輸錯誤"
 
-#: ../src/dialogs.py:2778 ../src/gui_interface.py:914
-#: ../src/gui_interface.py:937 ../src/gui_interface.py:954
-#: ../src/notify.py:267
+#: ../src/dialogs.py:2980 ../src/gui_interface.py:1057
+#: ../src/gui_interface.py:1086 ../src/gui_interface.py:1107
+#: ../src/notify.py:284
 msgid "File Transfer Completed"
 msgstr "檔案傳輸完成"
 
-#: ../src/dialogs.py:2779 ../src/gui_interface.py:917 ../src/notify.py:268
+#: ../src/dialogs.py:2981 ../src/gui_interface.py:1061
+#: ../src/gui_interface.py:1090 ../src/gui_interface.py:1111
+#: ../src/notify.py:285
 msgid "File Transfer Stopped"
 msgstr "檔案傳輸已停止"
 
-#: ../src/dialogs.py:2781 ../src/gui_interface.py:609 ../src/notify.py:272
-msgid "Groupchat Invitation"
-msgstr "多人聊天邀請"
-
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3190
 #, python-format
 msgid "Single Message using account %s"
 msgstr "單條訊息，使用帳號 %s"
 
-#: ../src/dialogs.py:2986
+#: ../src/dialogs.py:3192
 #, python-format
 msgid "Single Message in account %s"
 msgstr "單條訊息，在帳號 %s"
 
-#: ../src/dialogs.py:2988
+#: ../src/dialogs.py:3194
 msgid "Single Message"
 msgstr "單條訊息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2991
+#: ../src/dialogs.py:3197
 #, python-format
 msgid "Send %s"
 msgstr "傳送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3014
+#: ../src/dialogs.py:3220
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:3037
+#: ../src/dialogs.py:3243
 #, python-format
 msgid "Form %s"
 msgstr "來自 %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:3116
+#: ../src/dialogs.py:3326
 #, python-format
 msgid "RE: %s"
 msgstr "回復: %s"
 
-#: ../src/dialogs.py:3117
+#: ../src/dialogs.py:3327
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 寫道: \n"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3387
 #, python-format
 msgid "XML Console for %s"
 msgstr "帳號 %s 的 XML 主控臺"
 
-#: ../src/dialogs.py:3178
+#: ../src/dialogs.py:3389
 msgid "XML Console"
 msgstr " XML 主控臺"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3325
+#: ../src/dialogs.py:3522
 msgid "add"
 msgstr "加入"
 
-#: ../src/dialogs.py:3325
+#: ../src/dialogs.py:3522
 msgid "modify"
 msgstr "修改"
 
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3523
 msgid "remove"
 msgstr "移除"
 
-#: ../src/dialogs.py:3355
+#: ../src/dialogs.py:3552
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7180,181 +7929,201 @@ msgid ""
 msgstr "<b>%(jid)s</b> 希望您 <b>%(action)s</b> 您的一些聯絡人。"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3371 ../src/dialogs.py:3417
-msgid "Add"
-msgstr "加入"
-
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3373 ../src/dialogs.py:3448
+#: ../src/dialogs.py:3570 ../src/dialogs.py:3645
 msgid "Modify"
 msgstr "修改"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3375 ../src/dialogs.py:3472
-msgid "Delete"
-msgstr "刪除"
-
-#: ../src/dialogs.py:3379
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
-#: ../src/dialogs.py:3385
+#: ../src/dialogs.py:3582
 msgid "Groups"
 msgstr "群組"
 
 #. it is selected
-#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3493
+#. remote_jid = model[iter_][1]
+#: ../src/dialogs.py:3690
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s 建議我將您加入到我的聯絡人清單。"
 
-#: ../src/dialogs.py:3507
-#, python-format
-msgid "Added  %s contacts"
-msgstr "加入了 %s 聯絡人"
+#: ../src/dialogs.py:3704
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "加入了 %s 聯絡人"
 
-#: ../src/dialogs.py:3544
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "移除了 %s 聯絡人"
+#: ../src/dialogs.py:3742
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "移除了 %s 聯絡人"
 
-#: ../src/dialogs.py:3584 ../src/dialogs.py:3761
+#: ../src/dialogs.py:3783 ../src/dialogs.py:3960 ../src/dialogs.py:4131
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s 的存檔偏好設定"
 
-#: ../src/dialogs.py:3624
+#: ../src/dialogs.py:3823
 msgid "Invalid expire value"
 msgstr "無效的過期值"
 
-#: ../src/dialogs.py:3625
+#: ../src/dialogs.py:3824
 msgid "Expire must be a valid positive integer."
 msgstr "過期值必須是一個有效的正整數。"
 
-#: ../src/dialogs.py:3672
+#: ../src/dialogs.py:3871
 msgid "There is an error with the form"
 msgstr "在表格中有一處錯誤"
 
-#: ../src/dialogs.py:3892
+#: ../src/dialogs.py:4091
 msgid "There is an error"
 msgstr "有一處錯誤"
 
-#: ../src/dialogs.py:3960
+#: ../src/dialogs.py:4165
+msgid "Success!"
+msgstr ""
+
+#: ../src/dialogs.py:4165
+#, fuzzy
+msgid "Your Archiving Preferences have been saved!"
+msgstr "%s 的存檔偏好設定"
+
+#: ../src/dialogs.py:4181
+msgid "We got no response from the Server"
+msgstr ""
+
+#: ../src/dialogs.py:4183
+#, fuzzy
+msgid "We received an error: {}"
+msgstr "有一處錯誤"
+
+#: ../src/dialogs.py:4187
+#, fuzzy
+msgid "Error!"
+msgstr "錯誤"
+
+#: ../src/dialogs.py:4246
+#, fuzzy
+msgid "Add Jabber ID"
+msgstr "Jabber ID"
+
+#: ../src/dialogs.py:4319
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "隱私策略清單 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3964
+#: ../src/dialogs.py:4323
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的隱私策略清單"
 
-#: ../src/dialogs.py:4031
+#: ../src/dialogs.py:4392
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "順序: %(order)s，動作: %(action)s，類型: %(type)s，值: %(value)s"
 
-#: ../src/dialogs.py:4036
+#: ../src/dialogs.py:4397
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "順序: %(order)s，動作: %(action)s"
 
-#: ../src/dialogs.py:4087
+#: ../src/dialogs.py:4451
 msgid "<b>Edit a rule</b>"
 msgstr "<b>編輯規則</b>"
 
-#: ../src/dialogs.py:4198
+#: ../src/dialogs.py:4563
 msgid "<b>Add a rule</b>"
 msgstr "<b>加入規則</b>"
 
-#: ../src/dialogs.py:4297
+#: ../src/dialogs.py:4664
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的隱私策略清單"
 
-#: ../src/dialogs.py:4299
+#: ../src/dialogs.py:4666
 msgid "Privacy Lists"
 msgstr "隱私策略清單"
 
-#: ../src/dialogs.py:4388
+#: ../src/dialogs.py:4756
 msgid "Invalid List Name"
 msgstr "不合法的清單名稱"
 
-#: ../src/dialogs.py:4389
+#: ../src/dialogs.py:4757
 msgid "You must enter a name to create a privacy list."
 msgstr "您必須輸入一個名稱以建立一個隱私策略清單。"
 
-#: ../src/dialogs.py:4421
+#: ../src/dialogs.py:4793
 msgid "You are invited to a groupchat"
 msgstr "您被邀請到一個聊天室"
 
-#: ../src/dialogs.py:4424
+#: ../src/dialogs.py:4796
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact 邀請您加入一個聊天室"
 
-#: ../src/dialogs.py:4426
+#: ../src/dialogs.py:4798
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact 邀請您參加聊天室 %(room_jid)s"
 
-#: ../src/dialogs.py:4434
+#: ../src/dialogs.py:4807
 #, python-format
 msgid "Comment: %s"
 msgstr "註釋: %s"
 
-#: ../src/dialogs.py:4436
+#: ../src/dialogs.py:4809
 msgid "Do you want to accept the invitation?"
 msgstr "您是否接受邀請?"
 
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4828
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4877
 msgid "Choose Client Cert #PCKS12"
 msgstr "選擇客戶端證書 #PCKS12"
 
-#: ../src/dialogs.py:4508 ../src/dialogs.py:4550 ../src/dialogs.py:4606
-#: ../src/dialogs.py:4694
+#: ../src/dialogs.py:4888 ../src/dialogs.py:4930 ../src/dialogs.py:4978
+#: ../src/dialogs.py:5067
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../src/dialogs.py:4513
+#: ../src/dialogs.py:4893
 msgid "PKCS12 Files"
 msgstr "PKCS12 檔案"
 
-#: ../src/dialogs.py:4540
+#: ../src/dialogs.py:4919
 msgid "Choose Sound"
 msgstr "選擇聲音"
 
-#: ../src/dialogs.py:4555
+#: ../src/dialogs.py:4935
 msgid "Wav Sounds"
 msgstr "Wav聲音"
 
-#: ../src/dialogs.py:4593
+#: ../src/dialogs.py:4965
 msgid "Choose Image"
 msgstr "選擇圖像"
 
-#: ../src/dialogs.py:4611
+#: ../src/dialogs.py:4983
 msgid "Images"
 msgstr "圖像"
 
-#: ../src/dialogs.py:4681
+#: ../src/dialogs.py:5053
 msgid "Choose Archive"
 msgstr "選擇歸檔檔案"
 
-#: ../src/dialogs.py:4699
+#: ../src/dialogs.py:5072
 msgid "Zip files"
 msgstr "Zip 檔案"
 
-#: ../src/dialogs.py:4725
+#: ../src/dialogs.py:5098
 #, python-format
 msgid "When %s becomes:"
 msgstr "當 %s 變為:"
 
-#: ../src/dialogs.py:4727
+#: ../src/dialogs.py:5100
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在為 %s 加入特殊提示"
 
-#: ../src/dialogs.py:4947
+#: ../src/dialogs.py:5322
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7365,19 +8134,19 @@ msgstr ""
 "\n"
 "作業階段的短認證字串是 <b>%(sas)s</b>。"
 
-#: ../src/dialogs.py:4950
+#: ../src/dialogs.py:5325
 msgid "You have already verified this contact's identity."
 msgstr "您已經確認了這個聯絡人的身分。"
 
-#: ../src/dialogs.py:4956 ../src/dialogs.py:5040
+#: ../src/dialogs.py:5331 ../src/dialogs.py:5416
 msgid "Contact's identity verified"
 msgstr "聯絡人身分已確認"
 
-#: ../src/dialogs.py:4962
+#: ../src/dialogs.py:5337
 msgid "Verify again..."
 msgstr "重新驗證…"
 
-#: ../src/dialogs.py:4967
+#: ../src/dialogs.py:5342
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
@@ -7386,19 +8155,19 @@ msgstr ""
 "為了確保<b>只有</b>您期望的人可以看到您傳送的訊息或給您傳送訊息，您需要驗證他"
 "們的身分資訊。請點擊下面的按鈕。"
 
-#: ../src/dialogs.py:4970 ../src/dialogs.py:5021 ../src/dialogs.py:5034
+#: ../src/dialogs.py:5345 ../src/dialogs.py:5397 ../src/dialogs.py:5410
 msgid "Contact's identity NOT verified"
 msgstr "聯絡人身分未確認"
 
-#: ../src/dialogs.py:4975
+#: ../src/dialogs.py:5350
 msgid "Verify..."
 msgstr "確認…"
 
-#: ../src/dialogs.py:4986
+#: ../src/dialogs.py:5361
 msgid "Have you verified the contact's identity?"
 msgstr "您確認了聯絡人的身分嗎?"
 
-#: ../src/dialogs.py:4987
+#: ../src/dialogs.py:5362
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7412,59 +8181,64 @@ msgstr ""
 "\n"
 "這次作業階段的短認證字串是 <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4988
+#: ../src/dialogs.py:5363
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "您與遠端聯絡人通話並驗證了 SAS 嗎?"
 
-#: ../src/dialogs.py:5022
+#: ../src/dialogs.py:5398
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "聯絡人的密鑰(%s)與在 Gajim 中指定的密鑰<b>不匹配</b>。"
 
-#: ../src/dialogs.py:5028
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5404
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr "沒有為這個聯絡人指定密鑰。因此您無法加密訊息。"
 
-#: ../src/dialogs.py:5035
+#: ../src/dialogs.py:5411
+#, fuzzy
 msgid ""
-"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
-"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
 msgstr ""
 "盡管為這個聯絡人指定了密鑰，但您<b>不信任</b>他的密鑰，因此訊息<b>無法</b>被"
 "加密。使用您的 GPG 客戶端以信任他的密鑰。"
 
-#: ../src/dialogs.py:5041
+#: ../src/dialogs.py:5417
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr "聯絡人被指定了 GPG 密鑰，且您信任他的密鑰，所以訊息會被加密。"
 
-#: ../src/dialogs.py:5106
+#: ../src/dialogs.py:5483
 msgid "an audio and video"
 msgstr "一個音訊和視訊"
 
-#: ../src/dialogs.py:5108
+#: ../src/dialogs.py:5485
 msgid "an audio"
 msgstr "一個音訊"
 
-#: ../src/dialogs.py:5110
+#: ../src/dialogs.py:5487
 msgid "a video"
 msgstr "一個視訊"
 
-#: ../src/dialogs.py:5114
+#: ../src/dialogs.py:5491
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s 想要與您發起一個 %(type)s 作業階段。您要回應嗎?"
 
-#: ../src/dialogs.py:5182
+#: ../src/dialogs.py:5596 ../src/dialogs.py:5632
 #, python-format
 msgid "Certificate for account %s"
 msgstr "帳號憑證 %s"
 
-#: ../src/dialogs.py:5182
-#, python-format
+#: ../src/dialogs.py:5596
+#, fuzzy, python-format
 msgid ""
 "<b>Issued to:</b>\n"
 "Common Name (CN): %(scn)s\n"
@@ -7482,7 +8256,9 @@ msgid ""
 "Expires on: %(eo)s\n"
 "\n"
 "<b>Fingerprint</b>\n"
-"SHA1 Fingerprint: %(sha1)s"
+"SHA1 Fingerprint: %(sha1)s\n"
+"\n"
+"SHA256 Fingerprint: %(sha256)s\n"
 msgstr ""
 "<b>發行對象:</b>\n"
 "一般名稱 (CN):%(scn)s\n"
@@ -7502,332 +8278,314 @@ msgstr ""
 "<b>指紋</b>\n"
 "SHA1 指紋:%(sha1)s"
 
-#: ../src/dialogs.py:5216 ../src/dialogs.py:5233
+#: ../src/dialogs.py:5643 ../src/gui_interface.py:1396
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL 憑證驗證"
+
+#: ../src/dialogs.py:5644 ../src/dialogs.py:5661
 msgid "View cert..."
 msgstr "檢視憑證…"
 
-#: ../src/disco.py:119
+#: ../src/disco.py:68
+msgid "This service has not yet responded with detailed information"
+msgstr "服務還沒有詳細的資訊應答"
+
+#: ../src/disco.py:69
+msgid ""
+"This service could not respond with detailed information.\n"
+"It is most likely legacy or broken"
+msgstr ""
+"這個服務無法應答詳細的資訊。\n"
+"這很可能是伺服器的遺留問題，或是伺服器被損壞了"
+
+#: ../src/disco.py:128
 msgid "Others"
 msgstr "其他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:132
 msgid "Conference"
 msgstr "會議"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:530
 msgid "Without a connection, you can not browse available services"
 msgstr "連線後才可瀏覽可用服務"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:616
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帳號 %s 來發掘服務"
 
-#: ../src/disco.py:604
+#: ../src/disco.py:618
 msgid "Service Discovery"
 msgstr "搜尋服務"
 
-#: ../src/disco.py:760
+#: ../src/disco.py:779
 msgid "The service could not be found"
 msgstr "找不到該服務"
 
-#: ../src/disco.py:761
+#: ../src/disco.py:780
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr "此位址沒有服務或無應答。請檢查位址後重試。"
 
-#: ../src/disco.py:765 ../src/disco.py:1102
+#: ../src/disco.py:786 ../src/disco.py:1138
 msgid "The service is not browsable"
 msgstr "該服務無法瀏覽"
 
-#: ../src/disco.py:766
+#: ../src/disco.py:787
 msgid "This type of service does not contain any items to browse."
 msgstr "此服務沒有項目可瀏覽。"
 
-#: ../src/disco.py:806 ../src/disco.py:816
+#: ../src/disco.py:828 ../src/disco.py:838
 msgid "Invalid Server Name"
 msgstr "無效的伺服器名稱"
 
-#: ../src/disco.py:870
+#: ../src/disco.py:896
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "用帳號 %(account)s 瀏覽位址 %(address)s"
 
-#: ../src/disco.py:914
-msgid "_Browse"
+#: ../src/disco.py:943
+#, fuzzy
+msgid "Browse"
 msgstr "瀏覽(_B)"
 
-#: ../src/disco.py:1103
+#: ../src/disco.py:1139
 msgid "This service does not contain any items to browse."
 msgstr "此服務不包含任何項目可瀏覽。"
 
-#: ../src/disco.py:1343
-msgid "_Execute Command"
+#: ../src/disco.py:1351
+#, fuzzy
+msgid "Execute Command"
 msgstr "執行命令(_E)…"
 
-#: ../src/disco.py:1353 ../src/disco.py:1522
+#: ../src/disco.py:1355 ../src/disco.py:1520
 msgid "Re_gister"
 msgstr "註冊(_G)"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1366
+#, fuzzy
+msgid "Join"
+msgstr "加入(_J)"
+
+#: ../src/disco.py:1561
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "已掃描 %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1757
 msgid "Users"
 msgstr "使用者"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1765
 msgid "Description"
 msgstr "描述"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1773
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2443
+#: ../src/disco.py:1837 ../src/gui_interface.py:2629
 msgid "Bookmark already set"
 msgstr "書籤已設定"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2444
+#: ../src/disco.py:1838 ../src/gui_interface.py:2630
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "聊天室\"%s\"已在您的書籤中。"
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:2458
+#: ../src/disco.py:1848 ../src/gui_interface.py:2644
 msgid "Bookmark has been added successfully"
 msgstr "書籤加入成功"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:2459
+#: ../src/disco.py:1849 ../src/gui_interface.py:2645
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以透過\"動作\"選單管理您的書籤。"
 
-#: ../src/disco.py:2055
+#: ../src/disco.py:2044
 msgid "Subscribed"
 msgstr "訂閱"
 
-#: ../src/disco.py:2063
+#: ../src/disco.py:2053
 msgid "Node"
 msgstr "節點"
 
-#: ../src/disco.py:2127
+#: ../src/disco.py:2120
 msgid "New post"
 msgstr "新發表"
 
-#: ../src/disco.py:2133
+#: ../src/disco.py:2126
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
-#: ../src/disco.py:2139
+#: ../src/disco.py:2132
 msgid "_Unsubscribe"
 msgstr "退訂(_S)"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:49
 msgid "SSL certificate validation"
 msgstr "SSL 憑證驗證"
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:50
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr "一個用於驗證伺服器的證書以保證連線安全的函式庫。"
 
-#: ../src/features_window.py:52 ../src/features_window.py:53
-msgid "Requires python-pyopenssl."
+#: ../src/features_window.py:51 ../src/features_window.py:52
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "需要 python-pyopenssl。"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:53
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:54
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "無需伺服器自動偵測本地網路中其他客戶端進行聊天"
 
-#: ../src/features_window.py:56
+#: ../src/features_window.py:55
 msgid "Requires python-avahi."
 msgstr "需要 python-avahi。"
 
-#: ../src/features_window.py:57
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "需要 pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)。"
+#: ../src/features_window.py:56
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:57
 msgid "Command line"
 msgstr "命令列"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:58
 msgid "A script to control Gajim via commandline."
 msgstr "一個在命令列下控制 Gajim 的命令稿。"
 
-#: ../src/features_window.py:60
+#: ../src/features_window.py:59
 msgid "Requires python-dbus."
 msgstr "需要 python-dbus。"
 
-#: ../src/features_window.py:61 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:77
-#: ../src/features_window.py:85 ../src/features_window.py:89
-#: ../src/features_window.py:109 ../src/features_window.py:113
-#: ../src/features_window.py:117
+#: ../src/features_window.py:60 ../src/features_window.py:68
+#: ../src/features_window.py:72 ../src/features_window.py:80
+#: ../src/features_window.py:96 ../src/features_window.py:100
+#: ../src/features_window.py:104
 msgid "Feature not available under Windows."
 msgstr "特性在 Windows 下無法使用。"
 
-#: ../src/features_window.py:62
-msgid "OpenGPG message encryption"
+#: ../src/features_window.py:61
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP 訊息加密"
 
-#: ../src/features_window.py:63
-msgid "Encrypting chat messages with gpg keys."
+#: ../src/features_window.py:62
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "用 gpg 密鑰加密聊天訊息。"
 
-#: ../src/features_window.py:64
+#: ../src/features_window.py:63
 msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
 msgstr "需要 gpg 和 python-gnupg (http://code.google.com/p/python-gnupg/)。"
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:64
 msgid "Requires gpg.exe in PATH."
 msgstr "PATH 中要有 gpg.exe。"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:65
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:66
 msgid "Autodetection of network status."
 msgstr "自動偵測網路狀態。"
 
-#: ../src/features_window.py:68
+#: ../src/features_window.py:67
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "需要 gnome-network-manager 和 python-dbus。"
 
-#: ../src/features_window.py:70
-msgid "Session Management"
-msgstr "作業階段管理"
-
-#: ../src/features_window.py:71
-msgid "Gajim session is stored on logout and restored on login."
-msgstr "Gajim 作業階段在離開時會被儲存而後登入時恢復。"
-
-#: ../src/features_window.py:72
-msgid "Requires python-gnome2."
-msgstr "需要 python-gnome2。"
-
-#: ../src/features_window.py:74
+#: ../src/features_window.py:69
 msgid "Password encryption"
 msgstr "密碼加密"
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:70
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "密碼可以被安全地儲存，而不只是以純文字方式。"
 
-#: ../src/features_window.py:76
-msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "需要 gnome-keyring 和 python-gnome2-desktop，或 kwalletcli。"
-
-#: ../src/features_window.py:78
-msgid "SRV"
-msgstr "SRV"
-
-#: ../src/features_window.py:79
-msgid "Ability to connect to servers which are using SRV records."
-msgstr "連線到有 SRV 記錄的伺服器的能力。"
-
-#: ../src/features_window.py:80
-msgid "Requires dnsutils."
-msgstr "需要 dnsutils。"
-
-#: ../src/features_window.py:81
-msgid "Requires nslookup to use SRV records."
-msgstr "需要 nslookup 以使用 SRV 記錄。"
+#: ../src/features_window.py:71
+msgid ""
+"Requires libsecret and a provider (such as GNOME Keyring and KSecretService)."
+msgstr ""
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:73
 msgid "Spell Checker"
 msgstr "拼寫檢查工具"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:74
 msgid "Spellchecking of composed messages."
 msgstr "對正在編輯的訊息進行拼寫檢查。"
 
-#: ../src/features_window.py:84
+#: ../src/features_window.py:75
 msgid "Requires libgtkspell."
 msgstr "需要 libgtkspell。"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:76
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "需要 libgtkspell。"
+
+#: ../src/features_window.py:77
 msgid "Notification"
 msgstr "通知"
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:78
 msgid "Passive popups notifying for new events."
 msgstr "有新的時間時，主動彈出提示。"
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:79
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr "需要 python-notify 或 python-dbus 和 notification-daemon的組合。"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:81
 msgid "Automatic status"
 msgstr "自動調整狀態"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:82
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "測算閒置時間以自動調整狀態的能力。"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:83
 msgid "Requires libxss library."
 msgstr "需要 libxss 函式庫。"
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:84
 msgid "Requires python2.5."
 msgstr "需要 python2.5。"
 
-#: ../src/features_window.py:94
-msgid "LaTeX"
-msgstr "LaTeX"
-
-#: ../src/features_window.py:95
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "轉換 $$ $$ 之間的 LaTeX 運算式。"
-
-#: ../src/features_window.py:96
-msgid ""
-"Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
-"'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-"需要 texlive-latex-base 和 (dvipng 或 ImageMagick)。您需要在進階設定編輯器中"
-"將 'use_latex' 設定為真。"
-
-#: ../src/features_window.py:97
-msgid ""
-"Requires texlive-latex-base and (dvipng or ImageMagick) (All is in MikTeX). "
-"You have to set 'use_latex' to True in the Advanced Configuration Editor."
-msgstr ""
-"需要 texlive-latex-base 和 (dvipng 或 ImageMagick) (全部在 MikTeX 中)。您需要"
-"在進階設定編輯器中將 'use_latex' 設定為真。"
-
-#: ../src/features_window.py:98
+#: ../src/features_window.py:85
 msgid "End to End message encryption"
 msgstr "End to End 訊息加密"
 
-#: ../src/features_window.py:99
+#: ../src/features_window.py:86
 msgid "Encrypting chat messages."
 msgstr "加密聊天訊息。"
 
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:87 ../src/features_window.py:88
 msgid "Requires python-crypto."
 msgstr "需要 python-crypto。"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:89
 msgid "RST Generator"
 msgstr "RST 產生器"
 
-#: ../src/features_window.py:103
+#: ../src/features_window.py:90
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7835,195 +8593,200 @@ msgstr ""
 "從 RST 程式碼產生 XHTML 輸出 (參考 http://docutils.sourceforge.net/docs/ref/"
 "rst/restructuredtext.html)。"
 
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:91 ../src/features_window.py:92
 msgid "Requires python-docutils."
 msgstr "需要 python-docutils。"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:94
 msgid "Ability to start audio and video chat."
 msgstr "開始進行語音視訊通話的能力。"
 
-#: ../src/features_window.py:108
-msgid "Requires python-farsight and gstreamer-plugins-bad."
-msgstr "需要 python-farsight 和 gstreamer-plugins-bad。"
+#: ../src/features_window.py:95
+msgid ""
+"Requires gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and "
+"gstreamer1.0-plugins-ugly."
+msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:97
 msgid "UPnP-IGD"
 msgstr "UPnP-IGD"
 
-#: ../src/features_window.py:111
+#: ../src/features_window.py:98
 msgid "Ability to request your router to forward port for file transfer."
 msgstr "要求您的路由器於檔案傳送時轉用通訊埠的能力。"
 
-#: ../src/features_window.py:112
+#: ../src/features_window.py:99
 msgid "Requires python-gupnp-igd."
 msgstr "需要 python-gupnp-igd。"
 
-#: ../src/features_window.py:114
+#: ../src/features_window.py:101
 msgid "UPower"
 msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:102
 msgid "Ability to disconnect properly just before suspending the machine."
 msgstr ""
 
-#: ../src/features_window.py:116
+#: ../src/features_window.py:103
 #, fuzzy
 msgid "Requires upower and python-dbus."
 msgstr "需要 python-dbus。"
 
-#: ../src/features_window.py:124
+#: ../src/features_window.py:111
 msgid "?features:Available"
 msgstr "可用"
 
-#: ../src/features_window.py:131
+#: ../src/features_window.py:118
 msgid "Feature"
 msgstr "特性"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:85
 msgid "File"
 msgstr "檔案"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:100
 msgid "Time"
 msgstr "時間"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:112
 msgid "Progress"
 msgstr "處理序"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:243
 #, python-format
 msgid "Filename: %s"
 msgstr "檔案名稱:  %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:333
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:450
 #, python-format
 msgid "Size: %s"
 msgstr "大小:  %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:541
+#: ../src/filetransfers_window.py:197 ../src/filetransfers_window.py:207
+#: ../src/history_manager.py:550
 msgid "You"
 msgstr "您"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:198
 #, python-format
 msgid "Sender: %s"
 msgstr "傳送者:  %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:627
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:199 ../src/filetransfers_window.py:731
+#: ../src/tooltips.py:845
 msgid "Recipient: "
 msgstr "接收者: "
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:210
 #, python-format
 msgid "Saved in: %s"
 msgstr "儲存在: %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "檔案傳輸已完成"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "檔案傳輸已取消"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "無法與對方建立連線。"
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者:  %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "錯誤訊息: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "檔案傳輸已停止"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:266
+#: ../src/filetransfers_window.py:311
 msgid "Choose File to Send..."
 msgstr "選擇要傳送的檔案…"
 
-#: ../src/filetransfers_window.py:282 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:328 ../src/tooltips.py:880
 msgid "Description: "
 msgstr "描述: "
 
-#: ../src/filetransfers_window.py:295
+#: ../src/filetransfers_window.py:341
 msgid "Gajim cannot access this file"
 msgstr "Gajim 無法存取此檔案"
 
-#: ../src/filetransfers_window.py:296
+#: ../src/filetransfers_window.py:342
 msgid "This file is being used by another process."
 msgstr "此檔案正在被其他程式使用。"
 
-#: ../src/filetransfers_window.py:330
-#, python-format
-msgid "File: %s"
-msgstr "檔案:  %s"
-
-#: ../src/filetransfers_window.py:336
-#, python-format
-msgid "Type: %s"
-msgstr "類型: %s"
-
-#: ../src/filetransfers_window.py:338
-#, python-format
-msgid "Description: %s"
-msgstr "描述:  %s"
-
-#: ../src/filetransfers_window.py:339
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s 想傳送給您一個檔案:"
-
-#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:850
+#: ../src/filetransfers_window.py:386 ../src/gtkgui_helpers.py:784
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "無法覆寫現有檔案\"%s\""
 
-#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:851
+#: ../src/filetransfers_window.py:387 ../src/gtkgui_helpers.py:785
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "檔案名稱已經存在且您沒有權限覆寫它。"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:404 ../src/gtkgui_helpers.py:789
 msgid "This file already exists"
 msgstr "檔案已經存在"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
+#: ../src/filetransfers_window.py:404 ../src/gtkgui_helpers.py:789
 msgid "What do you want to do?"
 msgstr "想做什麼?"
 
-#. read-only bit is used to mark special folder under windows,
-#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:862
+#. read-only bit is used to mark special folder under
+#. windows, not to mark that a folder is read-only.
+#. See ticket #3587
+#: ../src/filetransfers_window.py:415 ../src/gtkgui_helpers.py:796
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目錄 \"%s\" 不可寫"
 
-#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:863
+#: ../src/filetransfers_window.py:416 ../src/gtkgui_helpers.py:797
 msgid "You do not have permission to create files in this directory."
 msgstr "您沒有權限在這個目錄裡建立檔案。"
 
-#: ../src/filetransfers_window.py:389
+#: ../src/filetransfers_window.py:427
 msgid "Save File as..."
 msgstr "另存為…"
 
+#: ../src/filetransfers_window.py:447
+#, python-format
+msgid "File: %s"
+msgstr "檔案:  %s"
+
+#: ../src/filetransfers_window.py:453
+#, python-format
+msgid "Type: %s"
+msgstr "類型: %s"
+
+#: ../src/filetransfers_window.py:455
+#, python-format
+msgid "Description: %s"
+msgstr "描述:  %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s 想傳送給您一個檔案:"
+
+#: ../src/filetransfers_window.py:497
+#, fuzzy
+msgid "Checking file..."
+msgstr "傳送側寫…"
+
+#: ../src/filetransfers_window.py:511
+#, fuzzy
+msgid "File error"
+msgstr "檔案傳輸錯誤"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:459
+#: ../src/filetransfers_window.py:548
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8031,140 +8794,97 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 #. This should make the string Kb/s,
 #. where 'Kb' part is taken from %s.
 #. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:552
+#: ../src/filetransfers_window.py:641
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:595 ../src/filetransfers_window.py:598
+#: ../src/filetransfers_window.py:697 ../src/filetransfers_window.py:700
 msgid "Invalid File"
 msgstr "無效檔案"
 
-#: ../src/filetransfers_window.py:595
+#: ../src/filetransfers_window.py:697
 msgid "File: "
 msgstr "檔案: "
 
-#: ../src/filetransfers_window.py:599
+#: ../src/filetransfers_window.py:701
 msgid "It is not possible to send empty files"
 msgstr "無法傳送空檔案"
 
-#: ../src/filetransfers_window.py:623 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:727 ../src/tooltips.py:836
 msgid "Name: "
 msgstr "名稱: "
 
-#: ../src/filetransfers_window.py:625 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:729 ../src/tooltips.py:839
 msgid "Sender: "
 msgstr "傳送者: "
 
-#: ../src/filetransfers_window.py:787
+#: ../src/filetransfers_window.py:896
 msgid "Pause"
 msgstr "暫停"
 
-#: ../src/gajim.py:191
-msgid "Gajim needs X server to run. Quiting..."
-msgstr "Gajim 需要 X 伺服器才能執行。離開…"
-
-#: ../src/gajim.py:193
-#, python-format
-msgid "importing PyGTK failed: %s"
-msgstr "匯入 PyGTK 失敗: %s"
-
-#: ../src/gajim.py:235
-msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "Gajim 需要 PyGTK 2.16 或更高版本"
-
-#: ../src/gajim.py:236
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "Gajim 需要 PyGTK 2.16 或更高版本才能執行。離開…"
-
-#: ../src/gajim.py:238
-msgid "Gajim needs GTK 2.16 or above"
-msgstr "Gajim 需要 GTK 2.16 或更高版本"
-
-#: ../src/gajim.py:239
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "Gajim 需要 GTK 2.16 或更高版本才能執行。離開…"
-
-#: ../src/gajim.py:248
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim 需要 pywin32 才能執行"
-
-#: ../src/gajim.py:249
-#, python-format
-msgid ""
-"Please make sure that Pywin32 is installed on your system. You can get it at "
-"%s"
-msgstr "請確認 Pywin32 已經安裝在您的系統中。您可以從 %s 獲得得它"
-
-#. set the icon to all newly opened wind
-#: ../src/gajim.py:365
-msgid "Gajim is already running"
-msgstr "Gajim 已經在執行"
-
-#: ../src/gajim.py:366
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Gajim 另一個實體似乎正在執行\n"
-"不管怎樣，仍然執行?"
+#: ../src/filetransfers_window.py:907
+msgid "_Continue"
+msgstr "繼續(_C)"
 
-#: ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "為特定命令顯示求助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "為命令顯示求助"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "顯示/隱藏聯絡人清單視窗"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:91
 msgid "Pops up a window with the next pending event"
 msgstr "為下一筆未處理事件彈出視窗"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:95
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr "列印聯絡人清單中所有聯絡人。每個聯絡人一列。"
 
-#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
-#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
-#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
-#: ../src/gajim-remote.py:291
-msgid "account"
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:172 ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:223 ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:239 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:257 ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:293
+#, fuzzy
+msgid "?CLI:account"
 msgstr "帳號"
 
-#: ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "只顯示指定帳號的聯絡人"
 
-#: ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "列印註冊的帳號"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "變更一個或多個帳號狀態"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:111
+#, fuzzy
+msgid "?CLI:status"
 msgstr "狀態"
 
-#: ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:111
 msgid ""
 "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
 "account's previous status"
@@ -8172,29 +8892,37 @@ msgstr ""
 "下列之一: offline，online，chat，away，xa，dnd，invisible。如果沒有設定，使用"
 "帳號先前的狀態"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:284
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
+
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "狀態訊息"
 
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr "變更帳號的狀態。如果不指明，將變更設定\"與全域同步\"選項的帳號"
 
-#: ../src/gajim-remote.py:117
+#: ../src/gajim-remote.py:119
 msgid "Changes the priority of account or accounts"
 msgstr "變更一個或多個帳號的優先等級"
 
-#: ../src/gajim-remote.py:119
-msgid "priority"
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid "?CLI:priority"
 msgstr "優先等級"
 
-#: ../src/gajim-remote.py:119
+#: ../src/gajim-remote.py:121
 msgid "priority you want to give to the account"
 msgstr "您想要給予這個帳號的優先等級"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:123
 msgid ""
 "change the priority of the given account. If not specified, change status of "
 "all accounts that have \"sync with global status\" option set"
@@ -8202,23 +8930,23 @@ msgstr ""
 "變更指定帳號的優先等級。如果不指明，將變更所有設定了\"與全域狀態同步\"選項的"
 "帳號"
 
-#: ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:129
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "顯示對話方塊用於給聯絡人傳送訊息"
 
-#: ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:131
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:223
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，將從此帳號清單下移出聯絡人"
 
-#: ../src/gajim-remote.py:134
+#: ../src/gajim-remote.py:136
 msgid "message content. The account must be specified or \"\""
 msgstr "訊息內容。帳號必須被指定或為\"\""
 
-#: ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:141
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8227,29 +8955,29 @@ msgstr ""
 "傳送新聊天訊息至聯絡人清單中的聯絡人。 OpenPGP 密鑰與帳號均可選。如果只選擇"
 "\"帳號\"而不需要\" OpenPGP 密鑰\"，只需將\" OpenPGP 密鑰\"置為空。"
 
-#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
 msgid "JID of the contact that will receive the message"
 msgstr "聯絡人的JID將收到訊息"
 
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:171
 msgid "message contents"
 msgstr "訊息內容"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 msgid "pgp key"
 msgstr "PGP 密鑰"
 
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，該訊息將使用本公共密鑰加密"
 
-#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:172
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，訊息將被用此帳號傳送"
 
-#: ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:154
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8258,213 +8986,217 @@ msgstr ""
 "傳送新單條訊息至聯絡人清單中的聯絡人。 OpenPGP 密鑰與帳號均可選。如果只選擇"
 "\"帳號\"而不需要\" OpenPGP 密鑰\"，只需將\" OpenPGP 密鑰\"置為空。"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "subject"
 msgstr "主題"
 
-#: ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "message subject"
 msgstr "訊息主題"
 
-#: ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:168
 msgid "Sends new message to a groupchat you've joined."
 msgstr "向一個您加入的聊天室傳送新訊息。"
 
-#: ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:170
 msgid "JID of the room that will receive the message"
 msgstr "要收到這條訊息的聊天室的 JID"
 
-#: ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:177
 msgid "Gets detailed info on a contact"
 msgstr "獲得聯絡人的詳細資訊"
 
-#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:179 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
 msgid "JID of the contact"
 msgstr "聯絡人的 JID "
 
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:183
 msgid "Gets detailed info on a account"
 msgstr "獲得帳號的詳細資訊"
 
-#: ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:185
 msgid "Name of the account"
 msgstr "帳號名稱"
 
-#: ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:189
 msgid "Sends file to a contact"
 msgstr "向聯絡人傳送檔案"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "file"
 msgstr "檔案"
 
-#: ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "File path"
 msgstr "檔案路徑"
 
-#: ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，檔案將被用此帳號傳送"
 
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:198
 msgid "Lists all preferences and their values"
 msgstr "列出所有的參數及它們的值"
 
-#: ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:202
 msgid "Sets value of 'key' to 'value'."
 msgstr "將\"密鑰\"的值設為\"值\""
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "key=value"
 msgstr "鍵=值"
 
-#: ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "\"密鑰\"是參數名稱，而\"值\"是賦予參數的數值"
 
-#: ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Deletes a preference item"
 msgstr "刪除一個參數項"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:211
 msgid "key"
 msgstr "鍵"
 
-#: ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:211
 msgid "name of the preference to be deleted"
 msgstr "需要刪除的參數名稱"
 
-#: ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:215
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "將目前Gajim的國家設定寫入 .config 檔案"
 
-#: ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "Removes contact from roster"
 msgstr "從聯絡人清單移除聯絡人"
 
-#: ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:229
 msgid "Adds contact to roster"
 msgstr "向聯絡人清單加入聯絡人"
 
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:232
 msgid "Adds new contact to this account"
 msgstr "為此帳號加入新聯絡人"
 
-#: ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:237
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "回傳目前狀態(如不指定帳號將回傳全域設定)"
 
-#: ../src/gajim-remote.py:242
+#: ../src/gajim-remote.py:244
 msgid ""
 "Returns current status message (the global one unless account is specified)"
 msgstr "回傳目前狀態資訊(如不指定帳號將回傳全域設定)"
 
-#: ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:251
 msgid "Returns number of unread messages"
 msgstr "回傳未讀訊息數"
 
-#: ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:255
 msgid "Opens 'Start Chat' dialog"
 msgstr "開啟 '開始聊天' 對話方塊"
 
-#: ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:257
 msgid "Starts chat, using this account"
 msgstr "開始聊天，使用這個帳號"
 
-#: ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "Sends custom XML"
 msgstr "傳送自訂 XML"
 
-#: ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:263
 msgid "XML to send"
 msgstr "傳送 XML"
 
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:264
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr "XML 將被傳送的帳號; 如果不指定，XML 將被傳送至所有帳號"
 
-#: ../src/gajim-remote.py:268
+#: ../src/gajim-remote.py:270
 msgid "Change the avatar"
 msgstr "變更頭像"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:272
 msgid "Picture to use"
 msgstr "要使用的圖片"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:273
 msgid ""
 "Account in which the avatar will be set; if not specified, the avatar will "
 "be set for all accounts"
 msgstr "要設定為這個頭像的帳號; 如果不指定，所有帳號都將被設定為這個頭像。"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:279
+#, fuzzy
 msgid "Handle a xmpp:/ uri"
 msgstr "處理一個 xmpp:/ uri"
 
-#: ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:281
+msgid "?CLI:uri"
+msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:281
 msgid "URI to handle"
 msgstr "要處理的 URI"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:282
 msgid "Account in which you want to handle it"
 msgstr "您想要用其處理它的帳號"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:284
 msgid "Message content"
 msgstr "訊息內容"
 
-#: ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:288
 msgid "Join a MUC room"
 msgstr "加入聊天室"
 
-#: ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:room"
 msgstr "聊天室"
 
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:290
 msgid "Room JID"
 msgstr "聊天室 JID"
 
-#: ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "暱稱"
 
-#: ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:291
 msgid "Nickname to use"
 msgstr "要使用的暱稱"
 
-#: ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:password"
 msgstr "密碼"
 
-#: ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:292
 msgid "Password to enter the room"
 msgstr "進入聊天室的密碼"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:293
 msgid "Account from which you want to enter the room"
 msgstr "您想要用其加入聊天室的帳號"
 
-#: ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:298
 msgid "Check if Gajim is running"
 msgstr "請檢查 Gajim 是否正在執行"
 
-#: ../src/gajim-remote.py:300
+#: ../src/gajim-remote.py:302
 msgid "Shows or hides the ipython window"
 msgstr "顯示/隱藏 ipython 視窗"
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:330
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"聯絡人 JID\"參數"
 
-#: ../src/gajim-remote.py:349
+#: ../src/gajim-remote.py:352
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8473,15 +9205,15 @@ msgstr ""
 "\"%s\" 不在您的聯絡人清單中。\n"
 "請為傳送此訊息指定帳號。"
 
-#: ../src/gajim-remote.py:352
+#: ../src/gajim-remote.py:355
 msgid "You have no active account"
 msgstr "沒有活動的帳號"
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:402
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "似乎 Gajim 不在執行。因此您無法使用 gajim-remote。"
 
-#: ../src/gajim-remote.py:432
+#: ../src/gajim-remote.py:429
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8490,25 +9222,27 @@ msgstr ""
 "用法: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:433
 msgid "Arguments:"
 msgstr "參數:"
 
-#: ../src/gajim-remote.py:440
+#: ../src/gajim-remote.py:437
 #, python-format
 msgid "%s not found"
 msgstr " %s 找不到"
 
-#: ../src/gajim-remote.py:446
-#, python-format
+#: ../src/gajim-remote.py:443
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "用法: %s 命令 [參數] \n"
 "命令是下列之一: \n"
 
-#: ../src/gajim-remote.py:515
+#: ../src/gajim-remote.py:513
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8517,7 +9251,7 @@ msgstr ""
 "參數太多。\n"
 "輸入 \"%(basename)s help %(command)s\" 獲取更多資訊"
 
-#: ../src/gajim-remote.py:520
+#: ../src/gajim-remote.py:518
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8526,239 +9260,244 @@ msgstr ""
 "參數 \"%(arg)s\" 未指定。\n"
 "輸入 \"%(basename)s help %(command)s\" 獲取更多資訊"
 
-#: ../src/gajim-remote.py:539
+#: ../src/gajim-remote.py:537
 msgid "No uri given"
 msgstr "沒有給出 URI"
 
-#: ../src/gajim-remote.py:541
+#: ../src/gajim-remote.py:539
 msgid "Wrong uri"
 msgstr "錯誤的 uri"
 
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "主題"
 
-#: ../src/gajim_themes_window.py:97
+#: ../src/gajim_themes_window.py:98
 msgid "You cannot make changes to the default theme"
 msgstr "您不能對預設主題進行變更"
 
-#: ../src/gajim_themes_window.py:98
+#: ../src/gajim_themes_window.py:99
 msgid "Please create a clean new theme with your desired name."
 msgstr "請用您想要的名稱新增一個主題。"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:169
+#: ../src/gajim_themes_window.py:170
 msgid "theme name"
 msgstr "主題名稱"
 
-#: ../src/gajim_themes_window.py:186
+#: ../src/gajim_themes_window.py:187
 msgid "You cannot delete your current theme"
 msgstr "無法刪除目前主題"
 
-#: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#: ../src/gajim_themes_window.py:188
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "請先選擇其他主題做為目前主題"
 
-#: ../src/groupchat_control.py:176 ../src/groupchat_control.py:1557
+#: ../src/groupchat_control.py:189 ../src/groupchat_control.py:1699
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s 現在成了 %(new_nick)s"
 
-#: ../src/groupchat_control.py:230
+#: ../src/groupchat_control.py:244
 msgid "Sending private message failed"
 msgstr "傳送私有訊息失敗"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:232
+#: ../src/groupchat_control.py:246
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在聊天室\"%(room)s\"中或\"%(nick)s\"已離開。"
 
-#: ../src/groupchat_control.py:560
+#: ../src/groupchat_control.py:637
 msgid "Insert Nickname"
 msgstr "插入暱稱"
 
-#: ../src/groupchat_control.py:743
+#: ../src/groupchat_control.py:827
 msgid "Conversation with "
 msgstr "對話，與"
 
-#: ../src/groupchat_control.py:745
+#: ../src/groupchat_control.py:829
 msgid "Continued conversation"
 msgstr "繼續對話"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1311
 #, python-format
 msgid "%(nick)s has set the subject to %(subject)s"
 msgstr "%(nick)s 將主題設定為 %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1240 ../src/groupchat_control.py:1499
+#: ../src/groupchat_control.py:1329 ../src/groupchat_control.py:1641
 msgid "Any occupant is allowed to see your full JID"
 msgstr "所有室友可以看到您的全部 JID"
 
-#: ../src/groupchat_control.py:1243
-msgid "Room now shows unavailable member"
+#: ../src/groupchat_control.py:1332
+#, fuzzy
+msgid "Room now shows unavailable members"
 msgstr "聊天室現在顯示了無法使用的成員"
 
-#: ../src/groupchat_control.py:1245
-msgid "room now does not show unavailable members"
+#: ../src/groupchat_control.py:1334
+#, fuzzy
+msgid "Room now does not show unavailable members"
 msgstr "聊天室現在不顯示無法使用的成員"
 
-#: ../src/groupchat_control.py:1247
+#: ../src/groupchat_control.py:1336
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "一個無關隱私的聊天室設定發生了變化"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1251
+#: ../src/groupchat_control.py:1340
 msgid "Room logging is now enabled"
 msgstr "聊天室訊息記錄已啟用"
 
-#: ../src/groupchat_control.py:1253
+#: ../src/groupchat_control.py:1342
 msgid "Room logging is now disabled"
 msgstr "聊天室訊息記錄已停用"
 
-#: ../src/groupchat_control.py:1255
+#: ../src/groupchat_control.py:1344
 msgid "Room is now non-anonymous"
 msgstr "聊天室現在是非匿名的"
 
-#: ../src/groupchat_control.py:1258
+#: ../src/groupchat_control.py:1347
 msgid "Room is now semi-anonymous"
 msgstr "聊天室現在是半匿名的"
 
-#: ../src/groupchat_control.py:1261
+#: ../src/groupchat_control.py:1350
 msgid "Room is now fully-anonymous"
 msgstr "聊天室現在是完全匿名的"
 
+#: ../src/groupchat_control.py:1634 ../src/groupchat_control.py:2303
+#: ../src/gui_interface.py:623 ../src/roster_window.py:3262
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1504
+#: ../src/groupchat_control.py:1646
 msgid "Room logging is enabled"
 msgstr "聊天室記錄被啟用"
 
-#: ../src/groupchat_control.py:1506
+#: ../src/groupchat_control.py:1648
 msgid "A new room has been created"
 msgstr "一個新的聊天室被建立"
 
-#: ../src/groupchat_control.py:1509
+#: ../src/groupchat_control.py:1651
 msgid "The server has assigned or modified your roomnick"
 msgstr "伺服器指定或修改了您的聊天室暱稱"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1515
+#: ../src/groupchat_control.py:1657
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出: %(reason)s"
 
-#: ../src/groupchat_control.py:1518
+#: ../src/groupchat_control.py:1660
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 踢出: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1527
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁: %(reason)s"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1672
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁: %(reason)s"
 
-#: ../src/groupchat_control.py:1541 ../src/groupchat_control.py:1645
+#: ../src/groupchat_control.py:1683 ../src/groupchat_control.py:1799
 #, python-format
 msgid "You are now known as %s"
 msgstr "您現在成了 %s "
 
-#: ../src/groupchat_control.py:1599 ../src/groupchat_control.py:1604
-#: ../src/groupchat_control.py:1610
+#: ../src/groupchat_control.py:1753 ../src/groupchat_control.py:1758
+#: ../src/groupchat_control.py:1764
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
 
-#: ../src/groupchat_control.py:1601
+#: ../src/groupchat_control.py:1755
 msgid "affiliation changed"
 msgstr "歸屬變更"
 
-#: ../src/groupchat_control.py:1606
+#: ../src/groupchat_control.py:1760
 msgid "room configuration changed to members-only"
 msgstr "聊天室配置變為\"僅成員\""
 
-#: ../src/groupchat_control.py:1612
+#: ../src/groupchat_control.py:1766
 msgid "system shutdown"
 msgstr "系統關閉"
 
-#: ../src/groupchat_control.py:1695
+#: ../src/groupchat_control.py:1849
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(nick)s 的歸屬被 %(actor)s 設定為 %(affiliation)s"
 
-#: ../src/groupchat_control.py:1699
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s 的歸屬被設定為 %(affiliation)s"
 
-#: ../src/groupchat_control.py:1714
+#: ../src/groupchat_control.py:1868
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(nick)s 的角色被 %(actor)s 設定為 %(role)s"
 
-#: ../src/groupchat_control.py:1718
+#: ../src/groupchat_control.py:1872
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s 的角色被設定為 %(role)s"
 
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1902
 #, python-format
 msgid "%s has left"
 msgstr "%s 離開了"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1907
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入聊天室"
 
-#: ../src/groupchat_control.py:2006
+#: ../src/groupchat_control.py:2181
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "您確定要離開聊天室\"%s\"嗎?"
 
-#: ../src/groupchat_control.py:2008
+#: ../src/groupchat_control.py:2183
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果關閉此視窗，您將中斷此聊天室的連線。"
 
-#: ../src/groupchat_control.py:2012 ../src/gui_interface.py:668
-#: ../src/gui_interface.py:1277 ../src/gui_interface.py:1317
-#: ../src/gui_interface.py:1358 ../src/message_window.py:224
-#: ../src/roster_window.py:2942 ../src/roster_window.py:3617
-#: ../src/roster_window.py:4386
-msgid "_Do not ask me again"
-msgstr "不要再問我了(_D)"
-
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2222
 msgid "Changing Subject"
 msgstr "正在更換話題"
 
-#: ../src/groupchat_control.py:2047
+#: ../src/groupchat_control.py:2223
 msgid "Please specify the new subject:"
 msgstr "請指定新話題:"
 
-#: ../src/groupchat_control.py:2054
+#: ../src/groupchat_control.py:2235
 msgid "Changing Nickname"
 msgstr "正在更換暱稱"
 
-#: ../src/groupchat_control.py:2055
+#: ../src/groupchat_control.py:2236
 msgid "Please specify the new nickname you want to use:"
 msgstr "請指定您想使用的新暱稱:"
 
+#: ../src/groupchat_control.py:2261
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "聊天室 Jabber ID 包含不合法字元。"
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:2086
+#: ../src/groupchat_control.py:2267
 #, python-format
 msgid "Destroying %s"
 msgstr "正在銷毀 %s"
 
-#: ../src/groupchat_control.py:2087
+#: ../src/groupchat_control.py:2268
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8766,190 +9505,154 @@ msgstr ""
 "您正要徹底銷毀這個聊天室。\n"
 "您可以在下面指定一個原因:"
 
-#: ../src/groupchat_control.py:2089
+#: ../src/groupchat_control.py:2270
 msgid "You may also enter an alternate venue:"
 msgstr "您也可以輸入一個可選的替代地點:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2284
+#: ../src/groupchat_control.py:2452
 #, python-format
 msgid "Kicking %s"
 msgstr "將踢走 %s"
 
-#: ../src/groupchat_control.py:2285 ../src/groupchat_control.py:2617
+#: ../src/groupchat_control.py:2453 ../src/groupchat_control.py:2734
 msgid "You may specify a reason below:"
 msgstr "您可以指定一個原因:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2616
+#: ../src/groupchat_control.py:2733
 #, python-format
 msgid "Banning %s"
 msgstr "將封禁 %s"
 
-#: ../src/gtkexcepthook.py:46
-msgid "A programming error has been detected"
-msgstr "一個程式錯誤被偵測到"
-
-#: ../src/gtkexcepthook.py:47
-msgid ""
-"It probably is not fatal, but should be reported to the developers "
-"nonetheless."
-msgstr "它可能不是嚴重的，但仍應該被報告給開發者們。"
-
-#: ../src/gtkexcepthook.py:54
-msgid "_Report Bug"
-msgstr "報告錯誤(_R)"
-
-#: ../src/gtkexcepthook.py:76
-msgid "Details"
-msgstr "細節"
-
-#. we talk about file
-#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
-#, python-format
-msgid "Error: cannot open %s for reading"
-msgstr "錯誤: 無法按讀開啟檔案 %s"
-
-#: ../src/gtkgui_helpers.py:348
+#: ../src/gtkgui_helpers.py:392
 msgid "Error reading file:"
 msgstr "讀檔案錯誤:"
 
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:395
 msgid "Error parsing file:"
 msgstr "分析檔案錯誤:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:392
+#: ../src/gtkgui_helpers.py:436
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "不能寫入到 %s 。作業階段管理支援功能未啟用"
 
-#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:766
-msgid "Gajim is not the default Jabber client"
-msgstr "Gajim 不是預設的 Jabber 客戶端"
-
-#: ../src/gtkgui_helpers.py:767
-msgid "Would you like to make Gajim the default Jabber client?"
-msgstr "您想要使 Gajim 成為預設的 Jabber 客戶端嗎?"
-
-#: ../src/gtkgui_helpers.py:768
-msgid "Always check to see if Gajim is the default Jabber client on startup"
-msgstr "總是在啟動時偵測 Gajim 是否是預設的 Jabber 客戶端"
-
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:770
 msgid "Extension not supported"
 msgstr "不支援擴充"
 
-#: ../src/gtkgui_helpers.py:836
+#: ../src/gtkgui_helpers.py:771
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "圖片不能被另存為 %(type)s 格式。另存為 %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:872
+#: ../src/gtkgui_helpers.py:806
 msgid "Save Image as..."
 msgstr "圖片另存為…"
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:126 ../src/gui_interface.py:290
-#: ../src/gui_interface.py:299 ../src/gui_interface.py:305
-#: ../src/gui_interface.py:308 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:316
+#: ../src/gui_interface.py:137 ../src/gui_interface.py:305
+#: ../src/gui_interface.py:314 ../src/gui_interface.py:320
+#: ../src/gui_interface.py:323 ../src/gui_interface.py:326
+#: ../src/gui_interface.py:331
 msgid "Unable to join group chat"
 msgstr "無法加入聊天室"
 
-#: ../src/gui_interface.py:127
-#, python-format
+#: ../src/gui_interface.py:138
+#, fuzzy, python-format
 msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
+"Your desired nickname in group chat\n"
+"<b>%s</b>\n"
+"is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 "您在聊天室 %s 中希望使用的暱稱已經被使用或被其他人註冊了。\n"
 "在下面指定另一個暱稱:"
 
-#: ../src/gui_interface.py:130
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "在發生衝突時總是使用這個暱稱"
 
-#: ../src/gui_interface.py:147
+#: ../src/gui_interface.py:159
 msgid "Do you accept this request?"
 msgstr "是否接受這個請求?"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:161
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受這個對帳號 %s 的請求?"
 
-#: ../src/gui_interface.py:152
+#: ../src/gui_interface.py:164
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "%(url)s (id: %(id)s) 的 HTTP (%(method)s) 認證"
 
-#: ../src/gui_interface.py:195 ../src/notify.py:276
+#: ../src/gui_interface.py:207 ../src/notify.py:293
 msgid "Connection Failed"
 msgstr "連線失敗"
 
-#: ../src/gui_interface.py:279
+#: ../src/gui_interface.py:291
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "需要密碼才能加入聊天室 %s。請輸入一個密碼。"
 
-#: ../src/gui_interface.py:291
+#: ../src/gui_interface.py:306
 #, python-format
 msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "已經達到了 <b>%s</b> 的最大使用者數目"
 
-#: ../src/gui_interface.py:300
+#: ../src/gui_interface.py:315
 #, python-format
 msgid "You are banned from group chat <b>%s</b>."
 msgstr "您被多人聊天 <b>%s</b> 封禁。"
 
-#: ../src/gui_interface.py:306
+#: ../src/gui_interface.py:321
 #, python-format
 msgid "Group chat <b>%s</b> does not exist."
 msgstr "多人聊天 <b>%s</b> 不存在。"
 
-#: ../src/gui_interface.py:309
+#: ../src/gui_interface.py:324
 msgid "Group chat creation is restricted."
 msgstr "聊天室建立是受限的。"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:327
 #, python-format
 msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "您已註冊的暱稱必須在多人聊天 <b>%s</b> 中使用。"
 
-#: ../src/gui_interface.py:317
+#: ../src/gui_interface.py:332
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "您不在聊天室 %s 的成員清單中。"
 
-#: ../src/gui_interface.py:400 ../src/gui_interface.py:404
+#: ../src/gui_interface.py:426 ../src/gui_interface.py:430
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "錯誤 %(code)s: %(msg)s"
 
-#: ../src/gui_interface.py:456 ../src/notify.py:278
+#: ../src/gui_interface.py:482 ../src/notify.py:295
 msgid "Subscription request"
 msgstr "認證請求"
 
-#: ../src/gui_interface.py:481
+#: ../src/gui_interface.py:507
 msgid "Authorization accepted"
 msgstr "授權被接受"
 
-#: ../src/gui_interface.py:482
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "聯絡人\"%s\"已授權您檢視他/她的狀態。"
 
-#: ../src/gui_interface.py:490
+#: ../src/gui_interface.py:516
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "聯絡人\"%s\"移除了對您的認證"
 
-#: ../src/gui_interface.py:491
+#: ../src/gui_interface.py:517
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8957,72 +9660,90 @@ msgstr ""
 "您將一直看到他/她處於離線狀態。\n"
 "要將他/她從您的聯絡人清單中移除嗎?"
 
-#: ../src/gui_interface.py:512 ../src/notify.py:280
+#: ../src/gui_interface.py:539 ../src/notify.py:297
 msgid "Unsubscribed"
 msgstr "已取消認證的"
 
-#: ../src/gui_interface.py:523
+#: ../src/gui_interface.py:550
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "無法與\"%s\"建立連線"
 
-#: ../src/gui_interface.py:621
+#: ../src/gui_interface.py:643
+#, python-format
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
+
+#: ../src/gui_interface.py:647
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
+
+#: ../src/gui_interface.py:677
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
 msgstr ""
 "您配置了 Gajim 使用 GPG agent，但並沒有正在執行的 GPG agent 或是它回傳了一個"
 "錯誤的密碼。\n"
 
-#: ../src/gui_interface.py:623 ../src/gui_interface.py:631
+#: ../src/gui_interface.py:680 ../src/gui_interface.py:688
 msgid "You are currently connected without your OpenPGP key."
 msgstr "您已經連線，但沒有使用您的 OpenPGP 密鑰。"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:682
 msgid "Your passphrase is incorrect"
 msgstr "您的密碼不正確"
 
-#: ../src/gui_interface.py:630
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:687
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenPGP 密碼不正確"
 
-#: ../src/gui_interface.py:643
+#: ../src/gui_interface.py:700
 msgid "Certificate Passphrase Required"
 msgstr "要求憑證密語"
 
-#: ../src/gui_interface.py:644
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Enter the passphrase for the certificate for account %s"
 msgstr "輸入密語用於帳號憑證 %s"
 
-#: ../src/gui_interface.py:666
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:723
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG 密鑰不被信任"
 
-#: ../src/gui_interface.py:666
+#: ../src/gui_interface.py:723
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr "用於加密這次對話的 GPG 密鑰未被信任。您確實想要加密這條訊息嗎?"
 
-#: ../src/gui_interface.py:679
+#: ../src/gui_interface.py:769
 msgid ""
-"Gnome Keyring is installed but not correctly started (environment variable "
-"probably not correctly set)"
-msgstr "Gnome Keyring 雖然已安裝但未正確啟動 (環境變數可能沒有正確設定)"
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
 
-#: ../src/gui_interface.py:786
+#: ../src/gui_interface.py:772
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:871
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "%(gmail_mail_address)s 上的新郵件"
 
-#: ../src/gui_interface.py:788
+#: ../src/gui_interface.py:873
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "您有 %d 條新郵件作業階段"
 
-#: ../src/gui_interface.py:801
+#: ../src/gui_interface.py:886
 #, python-format
 msgid ""
 "\n"
@@ -9037,78 +9758,89 @@ msgstr ""
 "主題: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:866
+#: ../src/gui_interface.py:960
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想傳送給您一個檔案。"
 
-#: ../src/gui_interface.py:903 ../src/roster_window.py:1891
-msgid "Remote contact stopped transfer"
-msgstr "遠端聯絡人停止了傳輸"
+#: ../src/gui_interface.py:1048 ../src/gui_interface.py:1424
+msgid "SSL certificate error"
+msgstr "SSL證書錯誤"
 
-#: ../src/gui_interface.py:906 ../src/roster_window.py:1893
-msgid "Error opening file"
-msgstr "開啟檔案錯誤"
+#: ../src/gui_interface.py:1065
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "檔案傳輸完成"
 
-#: ../src/gui_interface.py:938
+#: ../src/gui_interface.py:1087
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的從 %(name)s 收到檔案  %(filename)s。"
 
-#. ft stopped
-#: ../src/gui_interface.py:942
+#: ../src/gui_interface.py:1091
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:955
+#. ft hash error
+#: ../src/gui_interface.py:1095
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
+
+#: ../src/gui_interface.py:1108
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的給 %(name)s 傳送了檔案 %(filename)s。"
 
-#. ft stopped
-#: ../src/gui_interface.py:959
+#: ../src/gui_interface.py:1112
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1034
+#. ft hash error
+#: ../src/gui_interface.py:1116
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
+
+#: ../src/gui_interface.py:1199
 msgid "Unable to decrypt message"
 msgstr "無法解密訊息"
 
-#: ../src/gui_interface.py:1046
+#: ../src/gui_interface.py:1211
 msgid "Username Conflict"
 msgstr "使用者名稱衝突"
 
-#: ../src/gui_interface.py:1047
+#: ../src/gui_interface.py:1212
 msgid "Please type a new username for your local account"
 msgstr "<b>請在您本地帳號填寫新的使用者名稱</b>"
 
-#: ../src/gui_interface.py:1062
+#: ../src/gui_interface.py:1227
 msgid "Resource Conflict"
 msgstr "資源衝突"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1228
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "您已經用同一個資源連線到這個帳號了。請輸入一個新的資源"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1108
+#: ../src/gui_interface.py:1285
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要發起語音聊天。"
 
-#: ../src/gui_interface.py:1111
+#: ../src/gui_interface.py:1288
 msgid "Voice Chat Request"
 msgstr "語音聊天請求"
 
-#: ../src/gui_interface.py:1198
+#: ../src/gui_interface.py:1377
 msgid "Error verifying SSL certificate"
 msgstr "驗證 SSL 證書發生錯誤"
 
-#: ../src/gui_interface.py:1199
+#: ../src/gui_interface.py:1378
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9119,21 +9851,25 @@ msgstr ""
 "%(error)s\n"
 "您仍然想要連線這個伺服器嗎?"
 
-#: ../src/gui_interface.py:1208
+#: ../src/gui_interface.py:1388
 msgid "Ignore this error for this certificate."
 msgstr "忽略這個證書的這個錯誤。"
 
-#: ../src/gui_interface.py:1233
-msgid "SSL certificate error"
-msgstr "SSL證書錯誤"
+#: ../src/gui_interface.py:1401
+msgid "Non Anonymous Server"
+msgstr ""
 
-#: ../src/gui_interface.py:1234
-#, python-format
+#: ../src/gui_interface.py:1425
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate of account %(account)s has changed or your "
-"connection is being hacked.\n"
-"Old fingerprint: %(old)s\n"
-"New fingerprint: %(new)s\n"
+"It seems the SSL certificate of account %(account)s has changed and is not "
+"valid or your connection is being hacked.\n"
+"\n"
+"Old SHA-1 fingerprint: %(old_sha1)s\n"
+"Old SHA-256 fingerprint: %(old_sha256)s\n"
+"\n"
+"New SHA-1 fingerprint: %(new_sha1)s\n"
+"New SHA-256 fingerprint: %(new_sha256)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
@@ -9143,27 +9879,7 @@ msgstr ""
 "\n"
 "您仍想連線並更新證書的指紋資訊嗎?"
 
-#: ../src/gui_interface.py:1270 ../src/gui_interface.py:1312
-#: ../src/gui_interface.py:1354
-msgid "Insecure connection"
-msgstr "不安全的連線"
-
-#: ../src/gui_interface.py:1271
-#, python-format
-msgid ""
-"You are about to connect to the account %(account)s (%(server)s) with an "
-"insecure connection. This means all your conversations will be exchanged "
-"unencrypted. Are you sure you want to do that?"
-msgstr ""
-"您即將透過不安全的連線與帳號 %(account)s (%(server)s) 連接。這意味著您的所有"
-"對話都會不經加密地被交換。您確定要這樣做嗎？"
-
-#: ../src/gui_interface.py:1276 ../src/gui_interface.py:1316
-#: ../src/gui_interface.py:1357
-msgid "Yes, I really want to connect insecurely"
-msgstr "是的，我確實想要不安全地連線"
-
-#: ../src/gui_interface.py:1313
+#: ../src/gui_interface.py:1503
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -9171,24 +9887,25 @@ msgstr ""
 "您將透過不安全的連線傳送密碼。您應該安裝 PyOpenSSL 以阻止這樣的事情。您確定要"
 "這樣做嗎?"
 
-#: ../src/gui_interface.py:1355
+#: ../src/gui_interface.py:1545
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "您將透過不安全的連線傳送未經加密的密碼。您確定要這樣做嗎?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:1864 ../src/gui_interface.py:1887
+#: ../src/gui_interface.py:2070 ../src/gui_interface.py:2077
+#: ../src/gui_interface.py:2101
 msgid "Emoticons disabled"
 msgstr "表情圖示被停用"
 
-#: ../src/gui_interface.py:1865
+#: ../src/gui_interface.py:2071
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "您配置的表情圖示主題找不到，所以表情圖示被停用。"
 
-#: ../src/gui_interface.py:1888
+#: ../src/gui_interface.py:2078 ../src/gui_interface.py:2102
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
@@ -9197,89 +9914,116 @@ msgstr ""
 "您配置的表情圖示主題無法載入。您可能需要升級 emoticons.py 檔案的格式。請參考 "
 "http://trac.gajim.org/wiki/Emoticons"
 
-#: ../src/gui_interface.py:1932 ../src/roster_window.py:3784
+#: ../src/gui_interface.py:2150 ../src/roster_window.py:3832
 msgid "You cannot join a group chat while you are invisible"
 msgstr "隱身時無法加入聊天室"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2319
+#: ../src/gui_interface.py:2506
 msgid "Could not save your settings and preferences"
 msgstr "無法儲存您的設定。"
 
-#: ../src/gui_interface.py:2869
+#: ../src/gui_interface.py:3105
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/gui_interface.py:2870
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3106
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "輸入 GPG 密鑰 %(keyid)s (帳號 %(account)s) 的密碼。"
 
-#: ../src/gui_interface.py:2884
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3120
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG 密鑰過期"
 
-#: ../src/gui_interface.py:2885
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3121
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "您的 GPG 密鑰已過期，您將在沒有 OpenPGP 情況下連線到 %s。"
 
 #. ask again
-#: ../src/gui_interface.py:2894
+#: ../src/gui_interface.py:3130
 msgid "Wrong Passphrase"
 msgstr "錯誤欄位"
 
-#: ../src/gui_interface.py:2895
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3131
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "請重新輸入您的 GPG 欄位或點\"取消\""
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:96
 msgid "_New Group Chat"
 msgstr "新聊天室(_N)"
 
-#: ../src/gui_menu_builder.py:419
+#: ../src/gui_menu_builder.py:461
 msgid "I would like to add you to my roster"
 msgstr "我希望將您加入到我的聯絡人清單"
 
-#: ../src/history_manager.py:116
+#. Manage Transport submenu
+#: ../src/gui_menu_builder.py:582
+msgid "_Manage Transport"
+msgstr "管理代理(_M)"
+
+#. Modify Transport
+#: ../src/gui_menu_builder.py:588
+msgid "_Modify Transport"
+msgstr "修改代理(_M)"
+
+#: ../src/history_manager.py:76
+#, fuzzy
+msgid "Usage:"
+msgstr "message"
+
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Options:"
+msgstr "表情(_E):"
+
+#: ../src/history_manager.py:80
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/history_manager.py:81
+#, fuzzy
+msgid "Set logs directory"
+msgstr "正在建立 %s 目錄"
+
+#: ../src/history_manager.py:128
 msgid "Cannot find history logs database"
 msgstr "無法找到命令歷程記錄資料庫"
 
-#. holds jid
-#: ../src/history_manager.py:156
-msgid "Contacts"
-msgstr "聯絡人"
-
 #. holds time
-#: ../src/history_manager.py:169 ../src/history_manager.py:213
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:181 ../src/history_manager.py:225
+#: ../src/history_window.py:102
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:176 ../src/history_manager.py:232
+#: ../src/history_manager.py:188 ../src/history_manager.py:244
 msgid "Nickname"
 msgstr "暱稱"
 
 #. holds message
-#: ../src/history_manager.py:185 ../src/history_manager.py:220
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:197 ../src/history_manager.py:232
+#: ../src/history_window.py:110
 msgid "Message"
 msgstr "訊息"
 
 #. holds subject
-#: ../src/history_manager.py:193 ../src/history_manager.py:226
+#: ../src/history_manager.py:205 ../src/history_manager.py:238
 msgid "Subject"
 msgstr "主題"
 
-#: ../src/history_manager.py:252
+#: ../src/history_manager.py:264
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "您確定要清除資料庫?(強烈建議 GAJIM 執行時不要進行此作業)"
 
-#: ../src/history_manager.py:254
+#: ../src/history_manager.py:266
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9292,107 +10036,103 @@ msgstr ""
 "\n"
 "如果您點擊\"是\"，請等待…"
 
-#: ../src/history_manager.py:259
+#: ../src/history_manager.py:271
 msgid "Database Cleanup"
 msgstr "資料庫清理"
 
-#: ../src/history_manager.py:477
+#: ../src/history_manager.py:486
 msgid "Exporting History Logs..."
 msgstr "輸出命令歷程記錄…"
 
-#: ../src/history_manager.py:554
+#: ../src/history_manager.py:562
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 時說:  %(message)s\n"
 
-#: ../src/history_manager.py:592
+#: ../src/history_manager.py:600
 #, python-format
 msgid "Do you really want to delete the logs of %(jid)s?"
 msgstr "您真的要刪除 %(jid)s 的記錄檔嗎？"
 
-#: ../src/history_manager.py:596
+#: ../src/history_manager.py:604
 msgid "Do you really want to delete logs of the selected contacts?"
 msgstr "您真的要刪除已選聯絡人的記錄檔嗎？"
 
-#: ../src/history_manager.py:598 ../src/history_manager.py:637
+#: ../src/history_manager.py:606 ../src/history_manager.py:645
 msgid "This is an irreversible operation."
 msgstr "該作業是不可撤消的。"
 
-#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
 msgid "Deletion Confirmation"
 msgstr "刪除確認"
 
-#: ../src/history_manager.py:634
+#: ../src/history_manager.py:642
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您確定要刪除所選取的訊息?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:319
 #, python-format
 msgid "Conversation History with %s"
 msgstr "與 %s 的聊天命令歷程"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:369
 msgid "Disk Error"
 msgstr "磁碟錯誤"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:468
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的狀態是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:479
 #, python-format
 msgid "Error: %s"
 msgstr "錯誤: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:481
 msgid "Error"
 msgstr "錯誤"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:483
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "現在狀態: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:486
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "現在狀態:  %(status)s "
 
-#: ../src/htmltextview.py:523 ../src/htmltextview.py:533
-msgid "Timeout loading image"
-msgstr "讀取檔案逾時"
-
-#: ../src/htmltextview.py:543
-msgid "Image is too big"
-msgstr "圖片太大"
-
-#: ../src/htmltextview.py:576
+#: ../src/htmltextview.py:559
 msgid "Loading"
 msgstr "載入"
 
-#: ../src/message_window.py:222
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
+
+#: ../src/message_window.py:238
 msgid "You are going to close several tabs"
 msgstr "您將要關閉多個標籤"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:239
 msgid "Do you really want to close them all?"
 msgstr "您確定要關閉所有這些嗎"
 
-#: ../src/message_window.py:497
+#: ../src/message_window.py:529
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/message_window.py:499
+#: ../src/message_window.py:531
 msgid "Group Chats"
 msgstr "多人聊天"
 
-#: ../src/message_window.py:501
+#: ../src/message_window.py:533
 msgid "Private Chats"
 msgstr "私人聊天"
 
-#: ../src/message_window.py:507
+#: ../src/message_window.py:539
 msgid "Messages"
 msgstr "訊息"
 
@@ -9404,185 +10144,192 @@ msgstr "- 訊息將會被記錄"
 msgid "- messages will not be logged"
 msgstr "- 訊息將不會被記錄"
 
-#: ../src/notify.py:319
+#: ../src/notify.py:335
 msgid "Ignore"
 msgstr "忽略"
 
-#: ../src/plugins/gui.py:67
+#: ../src/plugins/gui.py:81
 msgid "Plugin"
 msgstr "外掛程式"
 
-#: ../src/plugins/gui.py:161
+#: ../src/plugins/gui.py:150
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "將封禁 %s"
+
+#: ../src/plugins/gui.py:207
 msgid "Plugin failed"
 msgstr "外掛程式失敗"
 
-#: ../src/plugins/gui.py:205
+#: ../src/plugins/gui.py:252
 msgid "Unable to properly remove the plugin"
 msgstr "無法適當地移除外掛程式"
 
 #. members not safe
-#: ../src/plugins/gui.py:213 ../src/plugins/pluginmanager.py:497
-#: ../src/plugins/pluginmanager.py:505
+#: ../src/plugins/gui.py:260 ../src/plugins/pluginmanager.py:566
+#: ../src/plugins/pluginmanager.py:574
 msgid "Archive is malformed"
 msgstr "存檔異常"
 
-#: ../src/plugins/gui.py:236 ../src/plugins/gui.py:244
-#: ../src/plugins/pluginmanager.py:513
+#: ../src/plugins/gui.py:284 ../src/plugins/gui.py:292
+#: ../src/plugins/pluginmanager.py:582
 msgid "Plugin already exists"
 msgstr "外掛程式已經存在"
 
-#: ../src/plugins/gui.py:236
+#: ../src/plugins/gui.py:284
 msgid "Overwrite?"
 msgstr "覆寫？"
 
-#: ../src/plugins/gui.py:265
+#: ../src/plugins/gui.py:316
 msgid "Configuration"
 msgstr "組態"
 
 #. it is not zip file
 #. CRC error
-#: ../src/plugins/pluginmanager.py:483 ../src/plugins/pluginmanager.py:489
+#: ../src/plugins/pluginmanager.py:552 ../src/plugins/pluginmanager.py:558
 msgid "Archive corrupted"
 msgstr "存檔已損壞"
 
-#: ../src/plugins/pluginmanager.py:485
+#: ../src/plugins/pluginmanager.py:554
 msgid "Archive empty"
 msgstr "存檔為空"
 
-#: ../src/profile_window.py:60
+#: ../src/profile_window.py:63
 msgid "Retrieving profile..."
 msgstr "正在獲取側寫…"
 
-#: ../src/profile_window.py:125 ../src/roster_window.py:3137
+#: ../src/profile_window.py:132 ../src/roster_window.py:3131
 msgid "File is empty"
 msgstr "檔案為空"
 
-#: ../src/profile_window.py:128 ../src/roster_window.py:3140
+#: ../src/profile_window.py:135 ../src/roster_window.py:3134
 msgid "File does not exist"
 msgstr "檔案不存在"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:142 ../src/profile_window.py:158
-#: ../src/roster_window.py:3142 ../src/roster_window.py:3153
+#: ../src/profile_window.py:149 ../src/profile_window.py:166
+#: ../src/roster_window.py:3136 ../src/roster_window.py:3147
 msgid "Could not load image"
 msgstr "無法讀取圖片"
 
-#: ../src/profile_window.py:229
+#: ../src/profile_window.py:239
 msgid "Wrong date format"
 msgstr "錯誤的資料格式"
 
-#: ../src/profile_window.py:230
+#: ../src/profile_window.py:240
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "日期的格式必須是 YYYY-MM-DD"
 
-#: ../src/profile_window.py:284
+#: ../src/profile_window.py:298
 msgid "Information received"
 msgstr "資訊已收到"
 
-#: ../src/profile_window.py:362
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:376
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "沒有連線的情況下您無法發布您的聯絡人資訊。"
 
-#: ../src/profile_window.py:375
+#: ../src/profile_window.py:389
 msgid "Sending profile..."
 msgstr "傳送側寫…"
 
-#: ../src/profile_window.py:394
+#: ../src/profile_window.py:408
 msgid "Information NOT published"
 msgstr "資訊沒有發布"
 
-#: ../src/profile_window.py:401
+#: ../src/profile_window.py:415
 msgid "vCard publication failed"
 msgstr "vCard 發布失敗"
 
-#: ../src/profile_window.py:402
+#: ../src/profile_window.py:416
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr "發布您的個人資訊時發生錯誤，請稍後重試。"
 
-#: ../src/roster_window.py:240 ../src/roster_window.py:1028
+#: ../src/roster_window.py:258 ../src/roster_window.py:1059
 msgid "Merged accounts"
 msgstr "已合併的帳號"
 
-#: ../src/roster_window.py:1956
+#: ../src/roster_window.py:2070
 msgid "Authorization has been sent"
 msgstr "授權傳送成功"
 
-#: ../src/roster_window.py:1957
+#: ../src/roster_window.py:2071
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "現在\"%s\"將知道您的狀態。"
 
-#: ../src/roster_window.py:1980
+#: ../src/roster_window.py:2094
 msgid "Subscription request has been sent"
 msgstr "認證請求已發出"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2095
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果\"%s\"接受此請求，您將知道他/她的狀態。"
 
-#: ../src/roster_window.py:1995
+#: ../src/roster_window.py:2109
 msgid "Authorization has been removed"
 msgstr "授權被移除"
 
-#: ../src/roster_window.py:1996
+#: ../src/roster_window.py:2110
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 將一直看到您的狀態為離線。"
 
-#: ../src/roster_window.py:2023
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2137
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG 無法使用"
 
-#: ../src/roster_window.py:2024
+#: ../src/roster_window.py:2138
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "您將在無 OpenPGP 情況下連線到 %s。"
 
-#: ../src/roster_window.py:2231 ../src/roster_window.py:3714
+#: ../src/roster_window.py:2345 ../src/roster_window.py:3762
 msgid "You are participating in one or more group chats"
 msgstr "您正在參與一個或多個多人聊天"
 
-#: ../src/roster_window.py:2232 ../src/roster_window.py:3715
+#: ../src/roster_window.py:2346 ../src/roster_window.py:3763
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr "隱身將使您從這些聊天室插斷開。確定要隱身?"
 
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2373
 msgid "desync'ed"
 msgstr "未同步"
 
-#: ../src/roster_window.py:2324
+#: ../src/roster_window.py:2438
 msgid "Really quit Gajim?"
 msgstr "真得要離開 Gajim?"
 
-#: ../src/roster_window.py:2325
+#: ../src/roster_window.py:2439
 msgid "Are you sure you want to quit Gajim?"
 msgstr "您確定您要離開 Gajim 嗎?"
 
-#: ../src/roster_window.py:2326
+#: ../src/roster_window.py:2440
 msgid "Always close Gajim"
 msgstr "總是關閉 Gajim"
 
-#: ../src/roster_window.py:2410
+#: ../src/roster_window.py:2527
 msgid "You have running file transfers"
 msgstr "您有傳送中的檔案"
 
-#: ../src/roster_window.py:2411
+#: ../src/roster_window.py:2528
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "如果現在離開，傳送中的檔案會停止傳輸。您仍然要離開嗎?"
 
-#: ../src/roster_window.py:2442 ../src/roster_window.py:2856
+#: ../src/roster_window.py:2559 ../src/roster_window.py:2917
 msgid "You have unread messages"
 msgstr "您有未讀訊息"
 
-#: ../src/roster_window.py:2443
+#: ../src/roster_window.py:2560
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9590,119 +10337,119 @@ msgstr ""
 "除非您啟用了命令歷程記錄而且向您傳送訊息的聯絡人在您的聯絡人清單中，您才能\n"
 "在以後讀到這些訊息。"
 
-#: ../src/roster_window.py:2857
+#: ../src/roster_window.py:2918
 msgid "You must read them before removing this transport."
 msgstr "在移除代理之前您必須檢視它們。"
 
-#: ../src/roster_window.py:2860
+#: ../src/roster_window.py:2921
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理\"%s\"將被移除"
 
-#: ../src/roster_window.py:2861
+#: ../src/roster_window.py:2922
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您將無法再和使用這個代理的聯絡人收發訊息。"
 
-#: ../src/roster_window.py:2864
+#: ../src/roster_window.py:2925
 msgid "Transports will be removed"
 msgstr "代理將被移除"
 
-#: ../src/roster_window.py:2869
+#: ../src/roster_window.py:2930
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "您無法再和來自這些代理的聯絡人收發訊息: %s"
 
-#: ../src/roster_window.py:2937
+#: ../src/roster_window.py:2981
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "您將要阻斷一個聯絡人。您確定要繼續嗎?"
 
-#: ../src/roster_window.py:2939
+#: ../src/roster_window.py:2983
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr "這個聯絡人將看到您離線並且您不會在收到他傳送給您的訊息。"
 
 #. it's jid
-#: ../src/roster_window.py:3029
+#: ../src/roster_window.py:3023
 msgid "Rename Contact"
 msgstr "重新命名聯絡人"
 
-#: ../src/roster_window.py:3030
+#: ../src/roster_window.py:3024
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "為聯絡人 %s 輸入新的暱稱"
 
-#: ../src/roster_window.py:3037
+#: ../src/roster_window.py:3031
 msgid "Rename Group"
 msgstr "重新命名群組"
 
-#: ../src/roster_window.py:3038
+#: ../src/roster_window.py:3032
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "為群組 %s 輸入新的名稱"
 
-#: ../src/roster_window.py:3083
+#: ../src/roster_window.py:3077
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../src/roster_window.py:3084
+#: ../src/roster_window.py:3078
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想從聯絡人清單中刪除組 %s ?"
 
-#: ../src/roster_window.py:3085
+#: ../src/roster_window.py:3079
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同時從聯絡人清單移除這個群組的所有聯絡人"
 
-#: ../src/roster_window.py:3124
+#: ../src/roster_window.py:3118
 msgid "Assign OpenPGP Key"
 msgstr "指定 OpenPGP 密鑰"
 
-#: ../src/roster_window.py:3125
+#: ../src/roster_window.py:3119
 msgid "Select a key to apply to the contact"
 msgstr "選擇一個對應於該聯絡人的密鑰。"
 
-#: ../src/roster_window.py:3524
+#: ../src/roster_window.py:3573
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "聯絡人\"%s\"將從您的聯絡人清單中被移除"
 
-#: ../src/roster_window.py:3526
+#: ../src/roster_window.py:3575
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "您將從您的聯絡人清單中將 \"%(name)s\" (%(jid)s) 移除。\n"
 
-#: ../src/roster_window.py:3531
+#: ../src/roster_window.py:3580
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr "移除此聯絡人的同時將移除認證，導致他/她將一直看到您為離線。"
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3537
+#: ../src/roster_window.py:3586
 msgid "Do you want to continue?"
 msgstr "您要繼續嗎?"
 
-#: ../src/roster_window.py:3541
+#: ../src/roster_window.py:3590
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr "移除此聯絡人的同時將預設移除認證，導致他/她將一直看到您為離線。"
 
-#: ../src/roster_window.py:3544
+#: ../src/roster_window.py:3593
 msgid "I want this contact to know my status after removal"
 msgstr "我想讓此聯絡人在被移除之後仍然知道我的狀態"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3548
+#: ../src/roster_window.py:3597
 msgid "Contacts will be removed from your roster"
 msgstr "聯絡人將從您的聯絡人清單中被移除"
 
-#: ../src/roster_window.py:3553
+#: ../src/roster_window.py:3602
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9711,12 +10458,13 @@ msgstr ""
 "移除這些聯絡人: %s 的同時\n"
 "將移除認證導致他們將一直看到您為離線。"
 
-#: ../src/roster_window.py:3611
+#: ../src/roster_window.py:3660
+#, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr "您將傳送一個自訂的狀態。您確定要繼續嗎?"
 
-#: ../src/roster_window.py:3613
+#: ../src/roster_window.py:3662
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9725,31 +10473,32 @@ msgstr ""
 "這個聯絡人會暫時看到您的狀態為 %(status)s，直到您下次變更您的狀態。之後\n"
 "他/她會看到您的全域狀態。"
 
-#: ../src/roster_window.py:3632
+#: ../src/roster_window.py:3681
 msgid "No account available"
 msgstr "沒有有效帳號"
 
-#: ../src/roster_window.py:3633
+#: ../src/roster_window.py:3682
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必須在與他人聊天前新增帳號。"
 
-#: ../src/roster_window.py:4286
+#: ../src/roster_window.py:4391
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的伺服器不支援儲存元聯絡人資訊"
 
-#: ../src/roster_window.py:4288
+#: ../src/roster_window.py:4393
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "您的伺服器不支援儲存元聯絡人資訊。所以這些資訊在下次重新連線時不會被儲存。"
 
-#: ../src/roster_window.py:4380
+#: ../src/roster_window.py:4489
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在建立一個元聯絡人。確定繼續?"
 
-#: ../src/roster_window.py:4382
+#: ../src/roster_window.py:4491
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9758,188 +10507,141 @@ msgstr ""
 "元聯絡人是將幾個聯絡人組合起來顯示在同一列。一般在某個人有幾個 Jabber\n"
 "帳號或代理帳號時用到。"
 
-#: ../src/roster_window.py:4503
+#: ../src/roster_window.py:4613
 msgid "Invalid file URI:"
 msgstr "無效的檔案位址:"
 
-#: ../src/roster_window.py:4515
+#: ../src/roster_window.py:4625
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "您想要將檔案傳送給 %s 嗎:"
 
-#: ../src/roster_window.py:4650
+#: ../src/roster_window.py:4764
 #, python-format
 msgid "Send %s to %s"
 msgstr "傳送 %s 給 %s"
 
-#: ../src/roster_window.py:4661
+#: ../src/roster_window.py:4777
 #, python-format
 msgid "Make %s first contact"
 msgstr "將 %s 設為第一聯絡人"
 
-#: ../src/roster_window.py:4664
+#: ../src/roster_window.py:4782
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "將 %s 與 %s 設為中繼聯絡人"
 
-#. new chat
-#. single message
-#. for chat_with
-#. for single message
-#. join gc
-#: ../src/roster_window.py:5104 ../src/roster_window.py:5158
-#: ../src/roster_window.py:5167 ../src/statusicon.py:264
-#: ../src/statusicon.py:311 ../src/statusicon.py:317
+#: ../src/roster_window.py:5246 ../src/roster_window.py:5301
+#: ../src/roster_window.py:5311 ../src/statusicon.py:270
+#: ../src/statusicon.py:318 ../src/statusicon.py:325
 #, python-format
 msgid "using account %s"
 msgstr "使用帳號 %s"
 
-#. add
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5320
 #, python-format
 msgid "to %s account"
 msgstr "至帳號 %s"
 
-#. disco
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5327
 #, python-format
 msgid "using %s account"
 msgstr "使用 %s 帳號"
 
-#: ../src/roster_window.py:5218 ../src/statusicon.py:327
+#: ../src/roster_window.py:5366 ../src/statusicon.py:335
 msgid "_Manage Bookmarks..."
 msgstr "管理書籤(_M)…"
 
-#. profile, avatar
-#: ../src/roster_window.py:5238
+#: ../src/roster_window.py:5384
 #, python-format
 msgid "of account %s"
 msgstr "帳號 %s 的"
 
-#: ../src/roster_window.py:5279
+#: ../src/roster_window.py:5426
 #, python-format
 msgid "for account %s"
 msgstr "帳號 %s"
 
-#: ../src/roster_window.py:5339 ../src/roster_window.py:5447
+#: ../src/roster_window.py:5480 ../src/roster_window.py:5581
 msgid "_Change Status Message"
 msgstr "變更狀態訊息(_C)"
 
-#: ../src/roster_window.py:5372
+#: ../src/roster_window.py:5510
 msgid "Publish Tune"
 msgstr "發布音樂"
 
-#: ../src/roster_window.py:5374
+#: ../src/roster_window.py:5512
 msgid "Publish Location"
 msgstr "發布位置資訊"
 
-#: ../src/roster_window.py:5377
+#: ../src/roster_window.py:5516
 msgid "Configure Services..."
 msgstr "配置服務…"
 
-#: ../src/roster_window.py:5525
+#: ../src/roster_window.py:5657
 msgid "_Maximize All"
 msgstr "放到最大全部(_M)"
 
-#: ../src/roster_window.py:5535 ../src/roster_window.py:5708
+#: ../src/roster_window.py:5664 ../src/roster_window.py:5826
 msgid "Send Group M_essage"
 msgstr "傳送群組訊息(_E)"
 
-#: ../src/roster_window.py:5543
+#: ../src/roster_window.py:5671
 msgid "To all users"
 msgstr "向所有的使用者"
 
-#: ../src/roster_window.py:5547
+#: ../src/roster_window.py:5675
 msgid "To all online users"
 msgstr "向所有線上使用者"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:5842
 msgid "_Manage Contacts"
 msgstr "管理聯絡人(_M)"
 
-#. Edit Groups
-#: ../src/roster_window.py:5737
-msgid "Edit _Groups"
-msgstr "編輯群組(_G)"
-
-#. Send single message
-#: ../src/roster_window.py:5792
-msgid "Send Single Message"
-msgstr "傳送單條訊息(_S)"
-
-#. Execute Command
-#: ../src/roster_window.py:5839
-msgid "Execute Command..."
-msgstr "執行命令…"
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:5849
-msgid "_Manage Transport"
-msgstr "管理代理(_M)"
-
-#. Modify Transport
-#: ../src/roster_window.py:5858
-msgid "_Modify Transport"
-msgstr "修改代理(_M)"
-
-#. Rename
-#: ../src/roster_window.py:5868
-msgid "_Rename"
-msgstr "重新命名(_R)"
-
-#: ../src/roster_window.py:5928
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "放到最大(_M)"
 
-#: ../src/roster_window.py:5937
+#: ../src/roster_window.py:5914
 msgid "_Reconnect"
 msgstr "重新連線(_R)"
 
-#: ../src/roster_window.py:5944
-msgid "_Disconnect"
-msgstr "中斷連線(_D)"
-
 #. History manager
-#: ../src/roster_window.py:6033
+#: ../src/roster_window.py:6004
 msgid "History Manager"
 msgstr "命令歷程記錄管理器"
 
-#: ../src/roster_window.py:6044
+#: ../src/roster_window.py:6012
 msgid "_Join New Group Chat"
 msgstr "加入新的聊天室(_J)"
 
-#: ../src/roster_window.py:6263
+#: ../src/roster_window.py:6299
 msgid "Change Status Message..."
 msgstr "變更狀態訊息…"
 
-#: ../src/search_window.py:105
+#: ../src/search_window.py:108
 msgid "Waiting for results"
 msgstr "等待結果"
 
-#: ../src/search_window.py:143 ../src/search_window.py:220
+#: ../src/search_window.py:146 ../src/search_window.py:224
 msgid "Error in received dataform"
 msgstr "在收到的資料表中有錯誤"
 
 #. No result
-#: ../src/search_window.py:177 ../src/search_window.py:212
+#: ../src/search_window.py:181 ../src/search_window.py:216
 msgid "No result"
 msgstr "無結果"
 
-#: ../src/session.py:95
-msgid "Disk WriteError"
-msgstr "磁碟寫入錯誤"
-
-#: ../src/session.py:406 ../src/session.py:450
+#: ../src/session.py:429 ../src/session.py:489
 msgid "Confirm these session options"
 msgstr "確定這些作業階段屬性"
 
-#: ../src/session.py:407
-#, python-format
+#: ../src/session.py:431
+#, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9952,7 +10654,7 @@ msgstr ""
 "\n"
 "是否接受?"
 
-#: ../src/session.py:451
+#: ../src/session.py:491
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9967,212 +10669,580 @@ msgstr ""
 "\n"
 "繼續進行作業階段?"
 
-#: ../src/statusicon.py:228
+#: ../src/session.py:494
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "是否為此聯絡人使用 OpenPGP?"
+
+#: ../src/statusicon.py:235
 msgid "_Change Status Message..."
 msgstr "變更狀態訊息_(C)…"
 
-#: ../src/statusicon.py:342
+#: ../src/statusicon.py:348
 msgid "Hide _Roster"
 msgstr "隱藏聯絡人清單(_R)"
 
-#: ../src/statusicon.py:353
+#: ../src/statusicon.py:360
 msgid "Hide this menu"
 msgstr "隱藏本選單"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
-msgid "Jabber ID: "
-msgstr "Jabber ID: "
-
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
-msgid "Resource: "
-msgstr "資源: "
-
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:376
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此聊天室的 %(owner_or_admin_or_member)s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:565
 msgid " [blocked]"
 msgstr "[已阻斷]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:569
 msgid " [minimized]"
 msgstr "[最小化的]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
-msgid "Status: "
-msgstr "狀態: "
-
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:768
 #, python-format
 msgid "Last status: %s"
 msgstr "最後狀態: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:770
 #, python-format
 msgid " since %s"
 msgstr "自從 %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:787
 msgid "Connected"
 msgstr "已連線"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:789
 msgid "Disconnected"
 msgstr "已中斷連線"
 
-#. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
-msgid "Subscription: "
-msgstr "認證: "
-
-#: ../src/tooltips.py:625
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:646
-#, python-format
-msgid "Idle since %s"
-msgstr "閒置，自從 %s"
-
-#: ../src/tooltips.py:647
-#, python-format
-msgid "Idle for %s"
-msgstr "閒置了 %s"
-
-#: ../src/tooltips.py:698
-#, python-format
-msgid "Mood: %s"
-msgstr "心情: %s"
-
-#: ../src/tooltips.py:702
-#, python-format
-msgid "Activity: %s"
-msgstr "活動: %s"
-
-#: ../src/tooltips.py:706
-#, python-format
-msgid "Tune: %s"
-msgstr "音樂: %s"
-
-#: ../src/tooltips.py:710
-#, python-format
-msgid "Location: %s"
-msgstr "位置: %s"
-
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:838
 msgid "Download"
 msgstr "下載"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:844
 msgid "Upload"
 msgstr "上傳"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:851
 msgid "Type: "
 msgstr "類型: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:857
 msgid "Transferred: "
 msgstr "已傳輸: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:860 ../src/tooltips.py:877
 msgid "Not started"
 msgstr "未開始"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:862
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:864 ../src/tooltips.py:867
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:870
 msgid "?transfer status:Paused"
 msgstr "?transfer status:暫停"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:873
 msgid "Stalled"
 msgstr "已凍結"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:875
 msgid "Transferring"
 msgstr "傳輸中"
 
-#: ../src/tooltips.py:812
-msgid "This service has not yet responded with detailed information"
-msgstr "服務還沒有詳細的資訊應答"
-
-#: ../src/tooltips.py:815
-msgid ""
-"This service could not respond with detailed information.\n"
-"It is most likely legacy or broken"
-msgstr ""
-"這個服務無法應答詳細的資訊。\n"
-"這很可能是伺服器的遺留問題，或是伺服器被損壞了"
+#: ../src/tooltips.py:878
+msgid "Status: "
+msgstr "狀態: "
 
-#: ../src/vcard.py:285
+#: ../src/vcard.py:328 ../src/vcard.py:335
 msgid "?Client:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:287
+#: ../src/vcard.py:332 ../src/vcard.py:337
 msgid "?OS:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:310
+#: ../src/vcard.py:366 ../src/vcard.py:369
 msgid "?Time:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
+#: ../src/vcard.py:397 ../src/vcard.py:406 ../src/vcard.py:614
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:367
+#: ../src/vcard.py:429
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>角色</b>"
 
-#: ../src/vcard.py:371
+#: ../src/vcard.py:433
 msgid "<b>Affiliation:</b>"
 msgstr "<b>歸屬:</b>"
 
-#: ../src/vcard.py:379
+#: ../src/vcard.py:441
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此聯絡人對您的狀態資訊感興趣，但您不關心他/她的狀態"
 
-#: ../src/vcard.py:381
+#: ../src/vcard.py:443
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您對此聯絡人的狀態資訊感興趣，但他/她不關心您的狀態"
 
-#: ../src/vcard.py:383
+#: ../src/vcard.py:445
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您與此聯絡人同時對對方的狀態資訊感興趣"
 
 #. None
-#: ../src/vcard.py:385
+#: ../src/vcard.py:447
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您與他/她互不關心對方的狀態資訊"
 
-#: ../src/vcard.py:392
+#: ../src/vcard.py:454
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待聯絡人回應您的認證請求"
 
-#: ../src/vcard.py:394
+#: ../src/vcard.py:456
 msgid "There is no pending subscription request."
 msgstr "沒有未處理的認證請求"
 
-#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
+#: ../src/vcard.py:461 ../src/vcard.py:515 ../src/vcard.py:637
 msgid " resource with priority "
 msgstr "帶有優先等級的資源"
 
+#~ msgid "Error description..."
+#~ msgstr "錯誤描述…"
+
+#, fuzzy
+#~ msgid "View contact information (Ctrl+I)"
+#~ msgstr "邀請聯絡人參與對話(Ctrl+G)"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "(<b>ESession</b> info)"
+#~ msgstr "<b>ESession</b>資訊"
+
+#~ msgid "Enter JID or Contact name"
+#~ msgstr "輸入 JID 或是聯絡人名稱"
+
+#~ msgid "Groupchat Histories"
+#~ msgstr "多人聊天命令歷程"
+
+#~ msgid "All Chat Histories"
+#~ msgstr "所有聊天命令歷程"
+
+#~ msgid "<empty>"
+#~ msgstr "<empty>"
+
+#~ msgid "homepage url"
+#~ msgstr "首頁連結"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>someone@somewhere.com</b> 希望您向您的聯絡人清單 <b>加入</b> 一些聯絡"
+#~ "人。"
+
+#~ msgid "More"
+#~ msgstr "更多"
+
+#~ msgid "Ping?"
+#~ msgstr "Ping?"
+
+#~ msgid "Error."
+#~ msgstr "錯誤。"
+
+#~ msgid "A connection is not available"
+#~ msgstr "一個連線無法使用"
+
+#~ msgid "Your message can not be sent until you are connected."
+#~ msgstr "連線之後您的訊息才能傳送"
+
+#~ msgid "Really send file?"
+#~ msgstr "確定要傳送檔案?"
+
+#~ msgid "If you send a file to %s, he/she will know your real Jabber ID."
+#~ msgstr "如果您想 %s 傳送檔案，他/她會獲知您的真實 Jabber ID。"
+
+#~ msgid "creating %s directory"
+#~ msgstr "正在建立 %s 目錄"
+
+#~ msgid ""
+#~ "If True, Gajim will use Gnome Keyring (if available) to store account "
+#~ "passwords."
+#~ msgstr "如果為真，Gajim 會使用 Gnome Keyring (如果可用) 儲存帳號的密碼。"
+
+#~ msgid ""
+#~ "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+#~ "account passwords."
+#~ msgstr ""
+#~ "如果為真，Gajim 會使用 KDE Wallet (如果 kwalletcli 可用) 儲存帳號的密碼。"
+
+#, fuzzy
+#~ msgid "Please check if avahi/bonjour-daemon is running."
+#~ msgstr "請檢查 avahi-daemon 是否正在執行。"
+
+#~ msgid "%s is not the name of a group chat."
+#~ msgstr "%s 不是一個聊天室的名稱。"
+
+#~ msgid "Session Management"
+#~ msgstr "作業階段管理"
+
+#~ msgid "Gajim session is stored on logout and restored on login."
+#~ msgstr "Gajim 作業階段在離開時會被儲存而後登入時恢復。"
+
+#~ msgid "Requires python-gnome2."
+#~ msgstr "需要 python-gnome2。"
+
+#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
+#~ msgstr "需要 gnome-keyring 和 python-gnome2-desktop，或 kwalletcli。"
+
+#~ msgid "SRV"
+#~ msgstr "SRV"
+
+#~ msgid "Ability to connect to servers which are using SRV records."
+#~ msgstr "連線到有 SRV 記錄的伺服器的能力。"
+
+#~ msgid "Requires dnsutils."
+#~ msgstr "需要 dnsutils。"
+
+#~ msgid "Requires nslookup to use SRV records."
+#~ msgstr "需要 nslookup 以使用 SRV 記錄。"
+
+#, fuzzy
+#~ msgid "Requires python-farstream and gstreamer-plugins-bad."
+#~ msgstr "需要 python-farsight 和 gstreamer-plugins-bad。"
+
+#~ msgid "Gajim needs X server to run. Quiting..."
+#~ msgstr "Gajim 需要 X 伺服器才能執行。離開…"
+
+#~ msgid "importing PyGTK failed: %s"
+#~ msgstr "匯入 PyGTK 失敗: %s"
+
+#, fuzzy
+#~ msgid "Gajim needs PyGTK 2.22 or above"
+#~ msgstr "Gajim 需要 PyGTK 2.16 或更高版本"
+
+#, fuzzy
+#~ msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
+#~ msgstr "Gajim 需要 PyGTK 2.16 或更高版本才能執行。離開…"
+
+#, fuzzy
+#~ msgid "Gajim needs GTK 2.22 or above"
+#~ msgstr "Gajim 需要 GTK 2.16 或更高版本"
+
+#, fuzzy
+#~ msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
+#~ msgstr "Gajim 需要 GTK 2.16 或更高版本才能執行。離開…"
+
+#~ msgid "Gajim needs pywin32 to run"
+#~ msgstr "Gajim 需要 pywin32 才能執行"
+
+#~ msgid ""
+#~ "Please make sure that Pywin32 is installed on your system. You can get it "
+#~ "at %s"
+#~ msgstr "請確認 Pywin32 已經安裝在您的系統中。您可以從 %s 獲得得它"
+
+#~ msgid "Gajim is already running"
+#~ msgstr "Gajim 已經在執行"
+
+#~ msgid ""
+#~ "Another instance of Gajim seems to be running\n"
+#~ "Run anyway?"
+#~ msgstr ""
+#~ "Gajim 另一個實體似乎正在執行\n"
+#~ "不管怎樣，仍然執行?"
+
+#~ msgid "A programming error has been detected"
+#~ msgstr "一個程式錯誤被偵測到"
+
+#~ msgid ""
+#~ "It probably is not fatal, but should be reported to the developers "
+#~ "nonetheless."
+#~ msgstr "它可能不是嚴重的，但仍應該被報告給開發者們。"
+
+#~ msgid "_Report Bug"
+#~ msgstr "報告錯誤(_R)"
+
+#~ msgid "Details"
+#~ msgstr "細節"
+
+#~ msgid ""
+#~ "Gnome Keyring is installed but not correctly started (environment "
+#~ "variable probably not correctly set)"
+#~ msgstr "Gnome Keyring 雖然已安裝但未正確啟動 (環境變數可能沒有正確設定)"
+
+#~ msgid "Jabber ID: "
+#~ msgstr "Jabber ID: "
+
+#~ msgid "Resource: "
+#~ msgstr "資源: "
+
+#, fuzzy
+#~ msgid "Mood: "
+#~ msgstr "心情:"
+
+#, fuzzy
+#~ msgid "Activity: "
+#~ msgstr "活動:"
+
+#~ msgid "Join _Group Chat..."
+#~ msgstr "加入聊天室(_G)…"
+
+#~ msgid "_Modify Account"
+#~ msgstr "修改帳號資訊(_M)"
+
+#~ msgid "Check on startup if Gajim is the _default Jabber client"
+#~ msgstr "在啟動是偵測 Gajim 是否是預設的 Jabber 客戶端程式"
+
+#~ msgid "_Group Chat"
+#~ msgstr "多人聊天(_G)"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "傳送單條訊息(_M)"
+
+#~ msgid ""
+#~ "If True, Gajim will check if it's the default jabber client on each "
+#~ "startup."
+#~ msgstr "如果為真， Gajim 會在每次啟動時偵測它是否是預設的 jabber 客戶端。"
+
+#, fuzzy
+#~ msgid "Certificate"
+#~ msgstr "客戶端證書"
+
+#~ msgid "Gajim is not the default Jabber client"
+#~ msgstr "Gajim 不是預設的 Jabber 客戶端"
+
+#~ msgid "Would you like to make Gajim the default Jabber client?"
+#~ msgstr "您想要使 Gajim 成為預設的 Jabber 客戶端嗎?"
+
+#~ msgid "Always check to see if Gajim is the default Jabber client on startup"
+#~ msgstr "總是在啟動時偵測 Gajim 是否是預設的 Jabber 客戶端"
+
+#~ msgid "Edit _Groups"
+#~ msgstr "編輯群組(_G)"
+
+#~ msgid "Send Single Message"
+#~ msgstr "傳送單條訊息(_S)"
+
+#~ msgid "Execute Command..."
+#~ msgstr "執行命令…"
+
+#~ msgid "_Rename"
+#~ msgstr "重新命名(_R)"
+
+#~ msgid "label"
+#~ msgstr "標籤"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "允許他/她檢視我的狀態(_A)"
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "在聯絡人清單中顯示聯絡人的活動(_A)"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "在聯絡人清單中顯示聯絡人正在播放音樂的資訊(_T)"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "在聯絡人清單中顯示聯絡人的心情(_O)"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的活動。"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的位置。"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人正在播放的音樂。"
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim 即時訊息軟體"
+
+#~ msgid "English"
+#~ msgstr "英語"
+
+#~ msgid "Belarusian"
+#~ msgstr "白俄語"
+
+#~ msgid "Bulgarian"
+#~ msgstr "保加利亞語"
+
+#~ msgid "Breton"
+#~ msgstr "布列塔尼語"
+
+#~ msgid "Czech"
+#~ msgstr "捷克語"
+
+#~ msgid "German"
+#~ msgstr "德語"
+
+#~ msgid "Greek"
+#~ msgstr "希臘語"
+
+#~ msgid "British"
+#~ msgstr "英語(英國)"
+
+#~ msgid "Esperanto"
+#~ msgstr "世界語"
+
+#~ msgid "Spanish"
+#~ msgstr "西班牙語"
+
+#~ msgid "Basque"
+#~ msgstr "巴斯克語"
+
+#~ msgid "French"
+#~ msgstr "法語"
+
+#~ msgid "Croatian"
+#~ msgstr "克羅埃西亞語"
+
+#~ msgid "Italian"
+#~ msgstr "義大利語"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "挪威語 (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "荷蘭語"
+
+#~ msgid "Norwegian"
+#~ msgstr "挪威語"
+
+#~ msgid "Polish"
+#~ msgstr "波蘭語"
+
+#~ msgid "Portuguese"
+#~ msgstr "葡萄牙語"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "巴西葡萄牙語"
+
+#~ msgid "Russian"
+#~ msgstr "俄語"
+
+#~ msgid "Serbian"
+#~ msgstr "塞爾維亞語"
+
+#~ msgid "Slovak"
+#~ msgstr "斯洛伐克語"
+
+#~ msgid "Swedish"
+#~ msgstr "瑞典語"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "漢語"
+
+#~ msgid "Spelling language"
+#~ msgstr "拼寫語言"
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "需要 python-farsight。"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "如果為真，Gajim 會將 $$ $$ 之間的字串用 dvips 轉換為圖片，在將它插入聊天視"
+#~ "窗之前。"
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr "變更這個值以變更顯示的 LaTeX 方程的大小。更高則更大。"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "檢查連線或稍後重試"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "在執行命令\"%(command)s\"時發生錯誤: %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "錯誤: 無法讀取檔案 %s"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "無法繫結連接埠%s。"
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr "或許您有另一個正在執行的 Gajim 實體。檔案傳輸將被取消。"
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "需要 pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)。"
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "轉換 $$ $$ 之間的 LaTeX 運算式。"
+
+#~ msgid ""
+#~ "Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+#~ "'use_latex' to True in the Advanced Configuration Editor."
+#~ msgstr ""
+#~ "需要 texlive-latex-base 和 (dvipng 或 ImageMagick)。您需要在進階設定編輯器"
+#~ "中將 'use_latex' 設定為真。"
+
+#~ msgid ""
+#~ "Requires texlive-latex-base and (dvipng or ImageMagick) (All is in "
+#~ "MikTeX). You have to set 'use_latex' to True in the Advanced "
+#~ "Configuration Editor."
+#~ msgstr ""
+#~ "需要 texlive-latex-base 和 (dvipng 或 ImageMagick) (全部在 MikTeX 中)。您"
+#~ "需要在進階設定編輯器中將 'use_latex' 設定為真。"
+
+#~ msgid "Contacts"
+#~ msgstr "聯絡人"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "磁碟寫入錯誤"
+
+#~ msgid "Mood: %s"
+#~ msgstr "心情: %s"
+
+#~ msgid "Activity: %s"
+#~ msgstr "活動: %s"
+
 #~ msgid "A GTK+ jabber client"
 #~ msgstr "一個 GTK+ Jabber 客戶端"
author	Yann Leboulanger <asterix@lagaule.org>	2017-01-14 17:02:54 +0300
committer	Yann Leboulanger <asterix@lagaule.org>	2017-01-14 17:02:54 +0300
commit	b4678cec5bc7245543867ffd6a0668e777490ebb (patch)
tree	f2a090d61c9dba0bf8a4d5c596c0e7da5cf5dd61 /po/zh_TW.po
parent	bfd9c5a96bc431dff23d9ae76cc508eda39ee3ba (diff)