diff --git a/po/ja.po b/po/ja.po
index eaa9efa7e1202af2a606bd9f19ab189f1ce7b8cb..1c8438d5b3851a9708f7d88af649f328ceeea546 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,19 +2,15 @@
 # Copyright (C) 2009 THE Gajim - A Jabber Instant Messager'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the Gajim - A Jabber Instant Messager package.
 #
-#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
 msgid ""
 msgstr ""
-"Project-Id-Version: Gajim 0.13.3\n"
+"Project-Id-Version: Gajim 0.15 ja\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-01 20:39+0200\n"
-"PO-Revision-Date: 2010-03-10 17:59+0900\n"
-"Last-Translator: Mako N. <mako@pasero.net>\n"
+"POT-Creation-Date: 2011-09-08 19:14+0200\n"
+"PO-Revision-Date: 2011-09-02 19:09+0900\n"
+"Last-Translator: Mako N <mako@pasero.net>\n"
 "Language-Team: Japanese\n"
-"Language: \n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -25,11 +21,10 @@ msgid "Join _Group Chat..."
 msgstr "グループチャットに参加する (_G)..."
 
 #: ../data/gui/account_context_menu.ui.h:2
-#, fuzzy
 msgid "_Add Contact..."
-msgstr "相手先リストに追加する (_C)..."
+msgstr "相手先リストに追加する (_A)..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
 msgid "_Discover Services"
 msgstr "サービスを探索する (_D)"
 
@@ -119,12 +114,12 @@ msgstr "管理..."
 
 #: ../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:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3613 ../src/config.py:3688
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:514
-#: ../src/dialogs.py:527 ../src/roster_window.py:2956
-#: ../src/roster_window.py:2962 ../src/roster_window.py:2967
+#: ../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 "なし"
 
@@ -152,7 +147,7 @@ msgid ""
 msgstr "Jabber ネットワークに接続するには、アカウントが必要です。"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Advanced"
 msgstr "æ‹¡å¼µ (_A)"
 
@@ -165,12 +160,13 @@ msgid "_Hostname:"
 msgstr "ホスト名 (_H):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Jabber ID:"
 msgstr "Jabber ID (_J):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "_Password:"
 msgstr "パスワード (_P):"
 
@@ -179,6 +175,7 @@ msgid "_Port:"
 msgstr "ポート番号 (_P):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/manage_bookmarks_window.ui.h:9
 msgid "_Server:"
 msgstr "サーバー (_S):"
 
@@ -223,19 +220,23 @@ msgid "Auto-reconnect when connection is lost"
 msgstr "切断したら自動で再接続する"
 
 #: ../data/gui/accounts_window.ui.h:11
-#, fuzzy
 msgid "Browse..."
-msgstr "一覧 (_B)"
+msgstr "参照..."
 
 #: ../data/gui/accounts_window.ui.h:12
 msgid "C_onnect on Gajim startup"
 msgstr "Gajim 起動時に接続する (_o)"
 
 #: ../data/gui/accounts_window.ui.h:13
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "証明書は暗号化される (_e)"
+
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Chan_ge Password"
 msgstr "パスワードを変更する (_g)"
 
-#: ../data/gui/accounts_window.ui.h:14
+#: ../data/gui/accounts_window.ui.h:15
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -243,11 +244,6 @@ msgstr ""
 "チェックをつけると、安全でない接続の前にパスワードを聞いてくるようになりま"
 "す。"
 
-#: ../data/gui/accounts_window.ui.h:15
-#, fuzzy
-msgid "Choose Client Cert"
-msgstr "転送するファイルを選択..."
-
 #: ../data/gui/accounts_window.ui.h:16
 msgid "Choose _Key..."
 msgstr "鍵の選択 (_K)..."
@@ -261,9 +257,8 @@ msgid "Click to request authorization to all contacts of another account"
 msgstr "別アカウントのすべての相手先に承認を求めるにはクリック"
 
 #: ../data/gui/accounts_window.ui.h:19
-#, fuzzy
 msgid "Client certificate"
-msgstr "自己署名証明書"
+msgstr "クライアントの証明書"
 
 #: ../data/gui/accounts_window.ui.h:20
 msgid "Co_nnect on Gajim startup"
@@ -285,18 +280,19 @@ msgstr "名:"
 
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
+#: ../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"
 
 #. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
+#. 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:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2898 ../src/roster_window.py:5451
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124
+#: ../src/roster_window.py:3034 ../src/roster_window.py:5652
 msgid "General"
 msgstr "全般"
 
@@ -355,8 +351,8 @@ 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:1817
-#: ../src/dialogs.py:831
+#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1826
+#: ../src/dialogs.py:837
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
@@ -369,8 +365,8 @@ msgstr "姓:"
 msgid "Mer_ge accounts"
 msgstr "アカウントの統合 (_g)"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
+#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799
+#: ../src/config.py:2377
 msgid "No key selected"
 msgstr "鍵が選択されていません"
 
@@ -397,7 +393,7 @@ msgid "Priority will change automatically according to your status."
 msgstr "優先順位は、在席状況に応じて自動的に変わります。"
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5401
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5602
 msgid "Re_name"
 msgstr "名前の変更 (_n)"
 
@@ -437,58 +433,54 @@ msgstr "アカウントの在席状況を全体の在席状況に合わせる (_
 #: ../data/gui/accounts_window.ui.h:52
 #: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Synchronise contacts"
-msgstr "相手先の同期"
+msgstr "相手先を合わせる"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr ""
-
-#: ../data/gui/accounts_window.ui.h:54
 msgid "Use G_PG Agent"
 msgstr "GPG エージェントを使う (_P)"
 
-#: ../data/gui/accounts_window.ui.h:55
+#: ../data/gui/accounts_window.ui.h:54
 msgid "Use cust_om hostname/port"
 msgstr "別のホスト名/ポート番号を使う (_o)"
 
-#: ../data/gui/accounts_window.ui.h:56
+#: ../data/gui/accounts_window.ui.h:55
 msgid "Use cust_om port:"
 msgstr "別のポート番号を使う (_o):"
 
-#: ../data/gui/accounts_window.ui.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "Use file transfer proxies"
 msgstr "ファイル転送のプロキシを使う"
 
-#: ../data/gui/accounts_window.ui.h:58
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Client Cert File:"
-msgstr ""
+msgstr "クライアントの証明書ファイル (_C):"
 
-#: ../data/gui/accounts_window.ui.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Edit Personal Information..."
 msgstr "個人情報を編集する (_E)..."
 
 #. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
+#: ../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:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Hostname: "
 msgstr "ホスト名 (_H):"
 
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_Manage..."
 msgstr "管理 (_M)..."
 
-#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/accounts_window.ui.h:64
 msgid "_Port: "
 msgstr "ポート番号 (_P):"
 
-#: ../data/gui/accounts_window.ui.h:66
+#: ../data/gui/accounts_window.ui.h:65
 msgid "_Warn before using an insecure connection"
 msgstr "安全でない接続の前には警告する (_W)"
 
-#: ../data/gui/accounts_window.ui.h:67
+#: ../data/gui/accounts_window.ui.h:66
 msgid "_use HTTP__PROXY environment variable"
 msgstr "環境変数 HTTP__PROXY を使う (_u)"
 
@@ -532,6 +524,7 @@ 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):"
 
@@ -544,9 +537,8 @@ msgid "_Register"
 msgstr "登録 (_R)"
 
 #: ../data/gui/add_new_contact_window.ui.h:15
-#, fuzzy
 msgid "_Save subscription message"
-msgstr "在席通知の申し込み (_S)"
+msgstr "在席通知申込のメッセージを保存 (_S)"
 
 #: ../data/gui/add_new_contact_window.ui.h:16
 msgid "_User ID:"
@@ -573,9 +565,8 @@ msgid "Error description..."
 msgstr "エラーの説明..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-#, fuzzy
 msgid "F_inish"
-msgstr "完了 (_F)"
+msgstr "完了 (_i)"
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while retrieving command list..."
@@ -620,9 +611,8 @@ msgid "Deletes Message of the Day"
 msgstr "今日のメッセージを削除します"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:3
-#, fuzzy
 msgid "Edit Archi_ving Preferences"
-msgstr "設定 (_P)"
+msgstr "書庫の設定を編集 (_v)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Edit _Privacy Lists..."
@@ -660,202 +650,6 @@ msgstr "管理人 (_A)"
 msgid "_Send Server Message..."
 msgstr "サーバーメッセージを送信 (_S)..."
 
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "ウィンドウ/タブで開く "
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>操作</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-#, fuzzy
-msgid "<b>Conditions</b>"
-msgstr "<b>状況</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>耳への通知</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "詳細な操作"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "通知の制御の詳細"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-#, fuzzy
-msgid "All statuses"
-msgstr "すべての状況"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "離席中です"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "取り込み中です"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-#, fuzzy
-msgid "Contact Change Status "
-msgstr "相手先が在席状況を変更"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-#, fuzzy
-msgid "Contact Disconnected "
-msgstr "相手先が切断した"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-#, fuzzy
-msgid "Don't have "
-msgstr "持っていません "
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-#, fuzzy
-msgid "File Transfer Finished"
-msgstr "ファイルの転送"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-#, fuzzy
-msgid "File Transfer Request "
-msgstr "ファイル転送の要求"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-#, fuzzy
-msgid "File Transfer Started "
-msgstr "ファイルの転送の中断"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-#, fuzzy
-msgid "Group Chat Message Highlight "
-msgstr "グループチャットのメッセージの強調"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-#, fuzzy
-msgid "Group Chat Message Received "
-msgstr "グループチャットのメッセージを受信した"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-#, fuzzy
-msgid "Have "
-msgstr "持っています "
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "隠れています"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-#, fuzzy
-msgid "Launch a command"
-msgstr "コマンドを実行する"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "不在です"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-#, fuzzy
-msgid "One or more special statuses..."
-msgstr "特別な状況..."
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "オンライン / チャットできます"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "サウンドを演奏する"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-#, fuzzy
-msgid "Receive a Message"
-msgstr "新着の私信"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "次の場合: "
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-#, fuzzy
-msgid ""
-"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr ""
-"タスクバーのフラッシュでチャットウィンドウを作るために、ウィンドウマネージャ"
-"の UrgencyHint を有効にする (_A)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "自動でチャットウィンドウが開くのを禁止する (_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "既存のポップアップウィンドウを禁止する (_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "このイベントのサウンドを禁止する (_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-#, fuzzy
-msgid "_Disable showing event in notification area"
-msgstr "名簿へのイベントの表示をやめる (_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "名簿へのイベントの表示をやめる (_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "ポップアップウィンドウで知らせる (_I)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "ユーザーのチャットウィンドウを開く (_O)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-#, fuzzy
-msgid "_Show event in notification area"
-msgstr "イベントを名簿に表示する (_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "イベントを名簿に表示する (_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "と私 "
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-#, fuzzy
-msgid "contact(s)"
-msgstr "相手先"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr ""
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-#, fuzzy
-msgid "for "
-msgstr "4"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-#, fuzzy
-msgid "group(s)"
-msgstr "グループ"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr ""
-
 #: ../data/gui/archiving_preferences_window.ui.h:1
 msgid "<i>Method Auto</i>"
 msgstr ""
@@ -871,29 +665,30 @@ msgstr ""
 #: ../data/gui/archiving_preferences_window.ui.h:4
 #, fuzzy
 msgid "Auto"
-msgstr "自動参加"
+msgstr "自動化"
 
 #: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Concede"
-msgstr ""
+msgstr "認める"
 
 #: ../data/gui/archiving_preferences_window.ui.h:6
 msgid "Forbid"
-msgstr ""
+msgstr "禁止する"
 
+# Auto の選択肢
 #: ../data/gui/archiving_preferences_window.ui.h:7
-#, fuzzy
 msgid "No"
-msgstr "なし"
+msgstr "しない"
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
 #, fuzzy
 msgid "Prefer"
-msgstr "設定"
+msgstr "その都度選ぶ"
 
+# Auto の選択肢
 #: ../data/gui/archiving_preferences_window.ui.h:9
 msgid "Yes"
-msgstr ""
+msgstr "する"
 
 #: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
@@ -917,14 +712,14 @@ msgstr "新しいエントリーを受け取りました:"
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
-msgstr "拒否されている相手先"
+msgstr "遮断している相手先"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5420
-#: ../src/roster_window.py:5548 ../src/roster_window.py:5681
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5621
+#: ../src/roster_window.py:5748 ../src/roster_window.py:5881
 msgid "_Unblock"
-msgstr "拒否の解除 (_U)"
+msgstr "遮断の解除 (_U)"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
@@ -985,7 +780,7 @@ msgstr "グループチャットに参加する (_G)"
 #: ../data/gui/chat_context_menu.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:16
 msgid "_Add to Roster..."
-msgstr "名簿に追加する (_A)..."
+msgstr "名簿に追加 (_A)..."
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
@@ -1009,14 +804,13 @@ msgstr "リンク先をブラウザで開く (_O)"
 msgid "_Start Chat"
 msgstr "チャットの開始 (_S)"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4596
+#: ../data/gui/chat_control.ui.h:1
 msgid "#"
 msgstr "#"
 
 #: ../data/gui/chat_control.ui.h:2
 msgid "*"
-msgstr ""
+msgstr "*"
 
 #: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
 msgid "0"
@@ -1024,43 +818,43 @@ msgstr "0"
 
 #: ../data/gui/chat_control.ui.h:4
 msgid "1"
-msgstr ""
+msgstr "1"
 
 #: ../data/gui/chat_control.ui.h:5
 msgid "2"
-msgstr ""
+msgstr "2"
 
 #: ../data/gui/chat_control.ui.h:6
 msgid "3"
-msgstr ""
+msgstr "3"
 
 #: ../data/gui/chat_control.ui.h:7
 msgid "4"
-msgstr ""
+msgstr "4"
 
 #: ../data/gui/chat_control.ui.h:8
 msgid "5"
-msgstr ""
+msgstr "5"
 
 #: ../data/gui/chat_control.ui.h:9
 msgid "6"
-msgstr ""
+msgstr "6"
 
 #: ../data/gui/chat_control.ui.h:10
 msgid "7"
-msgstr ""
+msgstr "7"
 
 #: ../data/gui/chat_control.ui.h:11
 msgid "8"
-msgstr ""
+msgstr "8"
 
 #: ../data/gui/chat_control.ui.h:12
 msgid "9"
-msgstr ""
+msgstr "9"
 
 #: ../data/gui/chat_control.ui.h:13
 msgid "Add this contact to roster (Ctrl+D)"
-msgstr "この相手先を名簿に追加する (Ctrl+D)"
+msgstr "相手先を名簿に追加する (Ctrl+D)"
 
 #: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
 msgid "Browse the chat history (Ctrl+H)"
@@ -1068,42 +862,41 @@ msgstr "チャットの履歴を見る (Ctrl+H)"
 
 #: ../data/gui/chat_control.ui.h:15
 msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "相手先を招待 (Ctrl+G)"
+msgstr "相手先を会話に招待する (Ctrl+G)"
 
 #: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
 msgid "Show a list of emoticons (Alt+M)"
-msgstr "顔文字の一覧の表示 (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 "書式の一覧の表示"
+msgstr "書式の一覧を表示する"
 
 #: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
-#, fuzzy
 msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "拡張機能の一覧を表示 (Alt+A)"
+msgstr "拡張機能のメニューを表示する (Alt+D)"
 
 #: ../data/gui/chat_control.ui.h:19
 msgid "Show the contact's profile (Ctrl+I)"
-msgstr "相手先のプロフィールの表示 (Ctrl+I)"
+msgstr "相手先のプロフィールを表示する (Ctrl+I)"
 
 #: ../data/gui/chat_control.ui.h:20
 msgid "Toggle audio session"
-msgstr ""
+msgstr "音声セッションにする/しない"
 
 #: ../data/gui/chat_control.ui.h:21
 msgid "Toggle video session"
-msgstr ""
+msgstr "ビデオセッションにする/しない"
 
 #. 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:266
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:275
 msgid "_Send"
 msgstr "送信 (_S)"
 
 #: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
 msgid "label"
-msgstr ""
+msgstr "ラベル"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
@@ -1151,8 +944,9 @@ msgstr "グループの変更 (_G)..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5356
-#: ../src/roster_window.py:5516
+#: ../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
 msgid "In_vite to"
 msgstr "招待 (_v)"
 
@@ -1161,16 +955,15 @@ msgid "Invite _Contacts"
 msgstr "相手先を招待 (_C)"
 
 #: ../data/gui/contact_context_menu.ui.h:8
-#, fuzzy
 msgid "Remo_ve"
-msgstr "削除 (_R)"
+msgstr "削除 (_v)"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5366
-#: ../src/roster_window.py:5605
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5567
+#: ../src/roster_window.py:5805
 msgid "Send Cus_tom Status"
 msgstr "個別の在席状況の送信 (_t)"
 
-#: ../data/gui/contact_context_menu.ui.h:10
+#: ../data/gui/contact_context_menu.ui.h:10 ../data/gui/roster_window.ui.h:10
 msgid "Send Single _Message..."
 msgstr "単発メッセージの送信 (_M)..."
 
@@ -1199,10 +992,10 @@ msgid "_Allow him/her to see my status"
 msgstr "自分の在席状況を見られることを許可する (_A)"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5428
-#: ../src/roster_window.py:5554 ../src/roster_window.py:5684
+#: ../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)"
+msgstr "遮断 (_B)"
 
 #: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
@@ -1210,8 +1003,8 @@ 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:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5755
+#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23
+#: ../src/roster_window.py:5955
 msgid "_History"
 msgstr "履歴 (_H)"
 
@@ -1239,20 +1032,17 @@ msgstr "無視しない (_U)"
 msgid "Fill in the form."
 msgstr "次の欄を埋めてください。"
 
-# (Mako)Personal Eventing via Pubsub
 #: ../data/gui/data_form_window.ui.h:2
-#, fuzzy
 msgid "Room Configuration"
-msgstr "PEP サービスの調整"
+msgstr "談話室の構成"
 
 #: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "グループの編集"
 
 #: ../data/gui/esession_info_window.ui.h:1
-#, fuzzy
 msgid "(<b>ESession</b> info)"
-msgstr "<b>説明</b>"
+msgstr "(<b>暗号化セッション</b> 情報)"
 
 #: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
@@ -1271,9 +1061,8 @@ msgid "A list of active, completed and stopped file transfers"
 msgstr "ファイル転送の転送中、完了、中止の一覧"
 
 #: ../data/gui/filetransfers.ui.h:2
-#, fuzzy
 msgid "Cancel file transfer"
-msgstr "選択されたファイルの転送を中止します"
+msgstr "ファイルの転送を中止する"
 
 #: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
@@ -1320,7 +1109,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "ファイル転送が完了したら、ポップアップで知らせる"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
+#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:798
 msgid "_Continue"
 msgstr "続ける (_C)"
 
@@ -1330,7 +1119,6 @@ msgstr "ファイル転送が完了したら知らせる (_N)"
 
 # #(Mako)Containing をどうする
 #: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-#, fuzzy
 msgid "_Open Containing Folder"
 msgstr "フォルダを開く (_O)"
 
@@ -1347,26 +1135,24 @@ msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>チャット状態のタブの色</b>"
 
 #: ../data/gui/gajim_themes_window.ui.h:2
-#, fuzzy
 msgid "Account row"
-msgstr "アカウント"
+msgstr "アカウントの行"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:942
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1029
 msgid "Bold"
 msgstr "太字にする"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
-msgstr ""
+msgstr "チャットのバナー"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "入力中"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-#, fuzzy
 msgid "Contact row"
-msgstr "相手先"
+msgstr "相手先の行"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
@@ -1378,18 +1164,17 @@ msgstr "Gajim テーマのカスタマイズ"
 
 #: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
-msgstr "不在"
+msgstr "終了"
 
 #: ../data/gui/gajim_themes_window.ui.h:10
-#, fuzzy
 msgid "Group row"
-msgstr "グループ"
+msgstr "グループの行"
 
 #: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
-msgstr "活動停止中"
+msgstr "停止中"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:943
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1030
 msgid "Italic"
 msgstr "イタリック"
 
@@ -1411,7 +1196,7 @@ msgstr ""
 
 #: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
-msgstr "一時停止中"
+msgstr "休止中"
 
 #: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
@@ -1453,67 +1238,70 @@ msgstr "談話室の管理 (_M)"
 msgid "_Minimize on close"
 msgstr "閉じるボタンで最小化 (_M)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:1
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+msgid "_Request Voice"
+msgstr "発言権を要求 (_R)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Mo_derator"
 msgstr "司会者 (_d)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Occupant Actions"
 msgstr "在室者の操作"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "Send _File"
 msgstr "ファイルの送信 (_F)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Add to Roster"
 msgstr "名簿に追加 (A)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Admin"
 msgstr "管理人 (_A)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Ban"
 msgstr "締め出し (_B)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:10
 msgid "_Kick"
 msgstr "蹴り出し (_K)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:11
 msgid "_Member"
 msgstr "メンバー (_M)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:12
 msgid "_Owner"
 msgstr "主宰者 (_O)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:12
+#: ../data/gui/gc_occupants_menu.ui.h:13
 msgid "_Send Private Message"
 msgstr "私信を送る (_S)"
 
 # (Mako)moderated room での発言する権利
-#: ../data/gui/gc_occupants_menu.ui.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:15
 msgid "_Voice"
 msgstr "発言権 (_V)"
 
 #: ../data/gui/groupchat_control.ui.h:1
 msgid "Bookmark this room (Ctrl+B)"
-msgstr "この談話室をブックマーク (Ctrl+B)"
+msgstr "この談話室をブックマークする (Ctrl+B)"
 
 #: ../data/gui/groupchat_control.ui.h:3
 msgid "Change the room's subject (Alt+T)"
-msgstr "談話室の題の変更 (Alt+T)"
+msgstr "談話室の題を変更する (Alt+T)"
 
 #: ../data/gui/groupchat_control.ui.h:4
 msgid "Change your nickname (Ctrl+N)"
-msgstr "ニックネームの変更 (Ctrl+N)"
+msgstr "ニックネームを変更する (Ctrl+N)"
 
 #: ../data/gui/groups_post_window.ui.h:1
-#, fuzzy
 msgid "Create new post"
-msgstr "新しいポストの作成"
+msgstr "新しい投稿を作成"
 
 #: ../data/gui/groups_post_window.ui.h:2
 #: ../data/gui/single_message_window.ui.h:2
@@ -1539,21 +1327,15 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Gajim 履歴記録マネージャ</b></big>"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3224
-#: ../src/dialogs.py:3321
-msgid "Delete"
-msgstr "削除"
-
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "書き出し"
 
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim 履歴記録マネージャ"
 
-#: ../data/gui/history_manager.ui.h:7
+#: ../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"
@@ -1567,28 +1349,25 @@ msgstr ""
 "このプログラムは記録の削除や書き出しのためにお使いください。左の一覧から記録"
 "を選択し、また下の欄でデータベースを検索することができます。"
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "データベースの検索 (_S)"
 
 #: ../data/gui/history_window.ui.h:1
-#, fuzzy
 msgid "All Chat Histories"
-msgstr "すべての状況"
+msgstr "すべてのチャットの履歴"
 
 #: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "会話の履歴"
 
 #: ../data/gui/history_window.ui.h:3
-#, fuzzy
 msgid "Enter JID or Contact name"
-msgstr "名前"
+msgstr "JID または相手先の名前を入力してください"
 
 #: ../data/gui/history_window.ui.h:4
-#, fuzzy
 msgid "Groupchat Histories"
-msgstr "グループチャット"
+msgstr "グループチャットの履歴"
 
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
@@ -1624,13 +1403,11 @@ msgid "forbid"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
 #: ../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
@@ -1642,9 +1419,8 @@ msgid "oppose"
 msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:10
-#, fuzzy
 msgid "otr"
-msgstr "æš‘"
+msgstr ""
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:11
 msgid "prefer"
@@ -1663,26 +1439,22 @@ msgid "stream"
 msgstr ""
 
 #: ../data/gui/join_groupchat_window.ui.h:2
-#, fuzzy
 msgid "Bro_wse Rooms"
-msgstr "一覧 (_B)"
+msgstr "談話室を一覧 (_w)"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2196
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2328
 msgid "Join Group Chat"
 msgstr "グループチャットに参加"
 
 #: ../data/gui/join_groupchat_window.ui.h:4
-#, fuzzy
 msgid "Join this room _automatically when I connect"
-msgstr "接続時に自動的にこの談話室に参加する"
+msgstr "接続時に自動的にこの談話室に参加する (_a)"
 
 #: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "ニックネーム:"
 
 #: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "パスワード:"
 
@@ -1691,28 +1463,25 @@ msgid "Recently:"
 msgstr "最近使った:"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "談話室:"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1816
 msgid "Server:"
 msgstr "サーバー:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
-#, fuzzy
 msgid "_Bookmark this room"
-msgstr "この談話室をブックマーク"
+msgstr "この談話室をブックマーク (_B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
 #: ../src/disco.py:1804
 msgid "_Join"
 msgstr "参加 (_J)"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "自動参加"
+msgid "A_uto join"
+msgstr "自動参加 (_u)"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
@@ -1723,20 +1492,23 @@ msgid "Manage Bookmarks"
 msgstr "ブックマークの管理"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "自動参加して最小化"
+msgid "Minimi_ze on Auto Join"
+msgstr "自動参加して最小化 (_z)"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
-msgstr "状況の表示:"
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+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 "タイトル:"
+msgid "_Title:"
+msgstr "タイトル (_T):"
 
 # (Mako)Personal Eventing via Pubsub
 #: ../data/gui/manage_pep_services_window.ui.h:1
-#, fuzzy
 msgid "PEP Service Configuration"
 msgstr "PEP サービスの調整"
 
@@ -1754,12 +1526,11 @@ msgstr "<b>設定</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
-msgstr ""
+msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-#, fuzzy
 msgid "HTTP Connect"
-msgstr "接続中"
+msgstr "HTTP 接続"
 
 #: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
@@ -1779,7 +1550,7 @@ msgstr "プロキシのポート (_P):"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
 msgid "SOCKS5"
-msgstr ""
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
@@ -1791,7 +1562,7 @@ msgstr "プロクシの認証を使用する (_e)"
 
 #: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
-msgstr "BOSH URL (_B):"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
 msgid "_Name:"
@@ -1811,82 +1582,67 @@ msgstr "パスフレーズ"
 
 #: ../data/gui/plugins_window.ui.h:1
 msgid "&lt;empty&gt;"
-msgstr ""
+msgstr "&lt;空&gt;"
 
 #: ../data/gui/plugins_window.ui.h:2
 msgid "<empty>"
-msgstr ""
+msgstr "<空>"
 
 #: ../data/gui/plugins_window.ui.h:3
-#, fuzzy
 msgid "Authors:"
-msgstr "承認する (_t)"
+msgstr "作者:"
 
 #: ../data/gui/plugins_window.ui.h:4
-#, fuzzy
-msgid "Available"
-msgstr "在席 (_A)"
+msgid "Configure"
+msgstr "調整"
 
 #: ../data/gui/plugins_window.ui.h:5
-#, fuzzy
-msgid "Configure"
-msgstr "調整 (_C)"
+msgid "Description:"
+msgstr "説明: "
 
 #: ../data/gui/plugins_window.ui.h:6
-#, fuzzy
-msgid "Descrition:"
-msgstr "説明: "
+msgid "Homepage:"
+msgstr "ホームページ:"
 
 #: ../data/gui/plugins_window.ui.h:7
-#, fuzzy
-msgid "Homepage:"
-msgstr "<b>ホームページ:</b>"
+msgid "Install from zip"
+msgstr "zip からインストール"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
-msgstr ""
+msgid "Installed"
+msgstr "インストール済"
 
 #: ../data/gui/plugins_window.ui.h:9
-#, fuzzy
-msgid "Installed"
-msgstr "滞っています"
-
-#: ../data/gui/plugins_window.ui.h:10
 msgid ""
 "Plug-in decription should be displayed here. This text will be erased during "
 "PluginsWindow initialization."
 msgstr ""
+"プラグインの説明がここに表示されます。この文はプラグインウィンドウの初期化の"
+"際に消去されます。"
 
-#: ../data/gui/plugins_window.ui.h:11
+#: ../data/gui/plugins_window.ui.h:10
 msgid "Plugins"
-msgstr ""
+msgstr "プラグイン"
 
-#: ../data/gui/plugins_window.ui.h:12
+#: ../data/gui/plugins_window.ui.h:11
 msgid "Uninstall"
-msgstr ""
+msgstr "アンインストール"
 
-#: ../data/gui/plugins_window.ui.h:13
-#, fuzzy
+#: ../data/gui/plugins_window.ui.h:12
 msgid "Version:"
-msgstr "GTK+ バージョン:"
-
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
-msgstr ""
+msgstr "バージョン:"
 
-#: ../data/gui/plugins_window.ui.h:15
+#: ../data/gui/plugins_window.ui.h:13
 msgid "homepage url"
-msgstr ""
+msgstr "ホームページ URL"
 
 #: ../data/gui/popup_notification_window.ui.h:1
-#, fuzzy
 msgid "Event Type"
-msgstr "イベント"
+msgstr "イベントの種類"
 
 #: ../data/gui/popup_notification_window.ui.h:2
-#, fuzzy
 msgid "Event desc"
-msgstr "イベント"
+msgstr "イベントの説明"
 
 #: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
@@ -1897,9 +1653,8 @@ msgid "<b>Applications</b>"
 msgstr "<b>アプリケーション</b>"
 
 #: ../data/gui/preferences_window.ui.h:3
-#, fuzzy
 msgid "<b>Audio</b>"
-msgstr "<b>操作</b>"
+msgstr "<b>音声</b>"
 
 #: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
@@ -1918,13 +1673,11 @@ msgid "<b>Chat state notifications</b>"
 msgstr "チャット状態の通知"
 
 #: ../data/gui/preferences_window.ui.h:8
-#, fuzzy
 msgid "<b>Connection</b>"
-msgstr "<b>状況</b>"
+msgstr "<b>接続</b>"
 
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:10
-#, fuzzy
 msgid "<b>Custom</b>"
 msgstr "<b>カスタム</b>"
 
@@ -1948,6 +1701,10 @@ msgstr "<b>プライバシー</b>"
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>名簿の外観</b>"
 
+#: ../data/gui/preferences_window.ui.h:17
+msgid "<b>Sounds</b>"
+msgstr "<b>耳への通知</b>"
+
 #: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>在席状況のメッセージ</b>"
@@ -1957,9 +1714,8 @@ msgid "<b>Themes</b>"
 msgstr "<b>テーマ</b>"
 
 #: ../data/gui/preferences_window.ui.h:20
-#, fuzzy
 msgid "<b>Video</b>"
-msgstr "<b>Middle:</b>"
+msgstr "<b>ビデオ</b>"
 
 #: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
@@ -1967,144 +1723,131 @@ msgstr "<b>目への通知</b>"
 
 #: ../data/gui/preferences_window.ui.h:22
 msgid "<i>(example: stunserver.org)</i>"
-msgstr ""
+msgstr "<i>(例: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "æ‹¡å¼µ"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "æ‹¡å¼µ..."
-
-#: ../data/gui/preferences_window.ui.h:25
-#, fuzzy
 msgid "All chat states"
-msgstr "すべての状況"
+msgstr "すべてのチャット状態"
 
-#: ../data/gui/preferences_window.ui.h:26
+#: ../data/gui/preferences_window.ui.h:25
 msgid "Allow _OS information to be sent"
 msgstr "OS 情報の送信を許可する (_O)"
 
-#: ../data/gui/preferences_window.ui.h:27
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow my _idle time to be sent"
-msgstr "OS 情報の送信を許可する (_O)"
+msgstr "操作しない時間の送信を許可する (_i)"
 
-#: ../data/gui/preferences_window.ui.h:28
+#: ../data/gui/preferences_window.ui.h:27
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "離席/不在/取り込み中/隠れ中のポップアップ/通知を許可する (_a)"
 
-#: ../data/gui/preferences_window.ui.h:29
+#: ../data/gui/preferences_window.ui.h:28
 msgid "Allow sound when I'm _busy"
 msgstr "取り込み中でもサウンドを鳴らす (_b)"
 
-#: ../data/gui/preferences_window.ui.h:30
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Always"
-msgstr "離席中です"
+msgstr "常に"
 
 # (Mako)語順が難しい
-#: ../data/gui/preferences_window.ui.h:31
+#: ../data/gui/preferences_window.ui.h:30
 msgid "Ask status message when I:"
 msgstr "状況メッセージを求めるのは、私が "
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:31 ../src/features_window.py:106
 msgid "Audio / Video"
-msgstr ""
+msgstr "音声/ビデオ"
 
-#: ../data/gui/preferences_window.ui.h:33
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:32
 msgid "Audio input device"
-msgstr "デフォルトのメッセージ"
+msgstr "音声入力デバイス"
 
-#: ../data/gui/preferences_window.ui.h:34
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio output device"
-msgstr ""
+msgstr "音声出力デバイス"
 
-#: ../data/gui/preferences_window.ui.h:35
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Chat message:"
 msgstr "チャットメッセージ:"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "起動時に、Gajim がデフォルトの Jabber クライアントかを調べる (_d)"
 
-#: ../data/gui/preferences_window.ui.h:37
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Composing only"
-msgstr "入力中"
+msgstr "入力中のみ"
 
-#: ../data/gui/preferences_window.ui.h:38
+#: ../data/gui/preferences_window.ui.h:37
 msgid "Configure color and font of the interface"
 msgstr "色とフォントの調整"
 
-#: ../data/gui/preferences_window.ui.h:39
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Contact's message:"
-msgstr "チャットメッセージ:"
+msgstr "相手先のメッセージ:"
 
-#: ../data/gui/preferences_window.ui.h:40
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's nickname:"
-msgstr "名前"
+msgstr "相手先のニックネーム:"
 
-#: ../data/gui/preferences_window.ui.h:41
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Custom"
-msgstr "<b>カスタム</b>"
+msgstr "カスタム"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Detached roster with chat grouped by account"
-msgstr ""
+msgstr "名簿は別ウィンドウ、チャットはアカウントでまとめたウィンドウ"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by type"
-msgstr ""
+msgstr "名簿は別ウィンドウ、チャットは種類でまとめたウィンドウ"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with detached chats"
-msgstr ""
+msgstr "名簿は別ウィンドウ、チャットは個々のウィンドウ"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with single chat"
-msgstr ""
+msgstr "名簿は別ウィンドウ、チャットはひとつにまとめたウィンドウ"
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
+#: ../data/gui/preferences_window.ui.h:45 ../src/config.py:170
+#: ../src/config.py:672
 msgid "Disabled"
 msgstr "無効"
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:46
 msgid "Display _activity of contacts in roster"
 msgstr "名簿に相手先の動向を表示する (_a)"
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _extra email details"
 msgstr "メールの詳細を表示する (_e)"
 
-#: ../data/gui/preferences_window.ui.h:49
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _location of contacts in roster"
-msgstr "名簿に相手先の気分を表示する (_o)"
+msgstr "名簿に相手先の位置を表示する (_l)"
 
-#: ../data/gui/preferences_window.ui.h:50
+#: ../data/gui/preferences_window.ui.h:49
 msgid "Display _tunes of contacts in roster"
 msgstr "名簿に相手先の聴いている楽曲を表示する (_t)"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display a_vatars of contacts in roster"
 msgstr "名簿に相手先のアバターを表示する"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display m_ood of contacts in roster"
 msgstr "名簿に相手先の気分を表示する (_o)"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display status _messages of contacts in roster"
 msgstr "名簿に相手先の状況メッセージを表示する"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../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 "
@@ -2113,7 +1856,7 @@ msgstr ""
 "Gajim は、相手先との会話に関連するメタ情報の送受信ができます。ここでは、"
 "チャットウィンドウへのチャット状態の表示について指定します。"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../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 "
@@ -2122,7 +1865,7 @@ msgstr ""
 "Gajim は、相手先との会話に関連するメタ情報の送受信ができます。ここでは、"
 "チャット状態の他人への送信について指定します。"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../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"
@@ -2130,30 +1873,30 @@ msgstr ""
 "画面の右下のポップアップウィンドウで、相手先がサインアウトしたときに通知しま"
 "す"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Hide all buttons in chat windows"
 msgstr "チャットウィンドウのすべてのボタンを隠します"
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:58
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "チェックをつけると、Gajim は使用中の OS を知られることを許可します"
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:59
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "チェックをつけると、Gajim は電子メールの送信者の情報を含めます"
 
-#: ../data/gui/preferences_window.ui.h:61
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "チェックをつけると、Gajim はコンピュータが使われていないとき、在席状況を「離"
 "席中」に変更します"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../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"
@@ -2161,7 +1904,7 @@ msgstr ""
 "チェックをつけると、Gajim はコンピュータが長い間使われていないとき、在席状況"
 "を「不在」に変更します"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../data/gui/preferences_window.ui.h:62
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2169,7 +1912,7 @@ msgstr ""
 "チェックをつけると、Gajim は名簿ウィンドウとグループチャットに相手先のアバ"
 "ターを表示します"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../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"
@@ -2177,30 +1920,30 @@ msgstr ""
 "チェックをつけると、Gajim は名簿ウィンドウとグループチャットの相手先名の下に"
 "状況メッセージを表示します"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の動向を表示します"
 
-#: ../data/gui/preferences_window.ui.h:66
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
-msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の気分を表示します"
+msgstr ""
+"チェックをつけると、Gajim は名簿ウィンドウに相手先の位置情報を表示します"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の気分を表示します"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "チェックをつけると、Gajim は名簿ウィンドウに相手先の聴いている楽曲を表示しま"
 "す"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../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 "
@@ -2211,16 +1954,16 @@ msgstr ""
 "ていない場合は、この相手先やグループチャットにはデフォルトの言語が適用されま"
 "す。"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../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 は承認していない相手先からのイベントを無視します。"
-"名簿にない相手先からのすべてのメッセージを拒否しますので、注意してください。"
+"名簿にない相手先からのすべてのメッセージを遮断しますので、注意してください。"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../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 "
@@ -2230,7 +1973,7 @@ msgstr ""
 "号化 (E2EE) の場合は相手先が記録に同意していなければなりません。そうでなけれ"
 "ば記録しないでください。"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2238,7 +1981,7 @@ msgstr ""
 "チェックをつけると、Gajim は GMail 経由で新しいメールを受け取ったとき、通知し"
 "ます"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../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, "
@@ -2248,7 +1991,7 @@ msgstr ""
 "(例: MSN からの相手先にはオンライン、離席、取り込み中...などの対応する MSN の"
 "アイコンがあります)"
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../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."
@@ -2256,7 +1999,7 @@ msgstr ""
 "チェックをつけると、Gajim は状況メッセージを要求しません。かわりに対応するデ"
 "フォルトのメッセージが使われます。"
 
-#: ../data/gui/preferences_window.ui.h:75
+#: ../data/gui/preferences_window.ui.h:74
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2264,6 +2007,11 @@ msgstr ""
 "「無効」でなければ、Gajim は ':)' のようなスマイリーを対応する画像に置き換え"
 "ます"
 
+# 起動時に名簿を表示するか
+#: ../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)"
@@ -2276,10 +2024,10 @@ msgstr "メッセージウィンドウを簡潔にする (_k)"
 msgid "Ma_nage..."
 msgstr "設定 (_n)..."
 
+# (Mako)systrayに表示
 #: ../data/gui/preferences_window.ui.h:79
-#, fuzzy
 msgid "Never"
-msgstr "サーバー"
+msgstr "しない"
 
 #: ../data/gui/preferences_window.ui.h:80
 msgid "Notifications"
@@ -2287,28 +2035,23 @@ msgstr "通知"
 
 #: ../data/gui/preferences_window.ui.h:81
 msgid "Notify me about contacts that sign _in"
-msgstr "相手先のログインを通知する (_i)"
+msgstr "相手先のサインインを通知する (_i)"
 
 #: ../data/gui/preferences_window.ui.h:82
 msgid "Notify me about contacts that sign _out"
-msgstr "相手先のログアウトを通知する (_o)"
+msgstr "相手先のサインアウトを通知する (_o)"
 
 #: ../data/gui/preferences_window.ui.h:83
-#, fuzzy
 msgid "Notify me about it"
-msgstr "相手先のログアウトを通知する (_o)"
+msgstr "それについて通知する"
 
 #: ../data/gui/preferences_window.ui.h:84
 msgid "Notify on new _GMail email"
 msgstr "新しい GMail メールを通知する (_G)"
 
 #: ../data/gui/preferences_window.ui.h:85
-#, fuzzy
 msgid "Only when pending events"
-msgstr ""
-"表示しない\n"
-"保留イベントがあるときだけ\n"
-"常に"
+msgstr "保留イベントがあるときだけ"
 
 #: ../data/gui/preferences_window.ui.h:86
 msgid "Personal Events"
@@ -2320,7 +2063,7 @@ msgstr "サウンドを鳴らす (_s)"
 
 #: ../data/gui/preferences_window.ui.h:88
 msgid "Pop it up"
-msgstr ""
+msgstr "ポップアップする"
 
 #: ../data/gui/preferences_window.ui.h:89
 msgid "Preferences"
@@ -2331,20 +2074,20 @@ msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
+"STUN サーバー。空なら、Gajim はサーバーから探索\n"
+"しようとします。"
 
 #: ../data/gui/preferences_window.ui.h:92
-#, fuzzy
 msgid "STUN server:"
-msgstr "サーバー:"
+msgstr "STUN サーバー:"
 
 #: ../data/gui/preferences_window.ui.h:93
 msgid "Show notification area icon:"
-msgstr ""
+msgstr "通知エリアのアイコンの表示:"
 
 #: ../data/gui/preferences_window.ui.h:94
-#, fuzzy
 msgid "Show only in roster"
-msgstr "イベントを名簿に表示する (_S)"
+msgstr "名簿にのみ表示する"
 
 # (Mako)"Ask status message when I:" に続く語
 #: ../data/gui/preferences_window.ui.h:95
@@ -2358,7 +2101,7 @@ msgstr "サインアウトしたとき (_o)"
 
 #: ../data/gui/preferences_window.ui.h:97
 msgid "Single window for everything"
-msgstr ""
+msgstr "すべてをひとつのウィンドウ"
 
 #: ../data/gui/preferences_window.ui.h:98
 msgid ""
@@ -2372,7 +2115,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "相手先を在席状況順に並べる"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:400
 msgid "Status"
 msgstr "在席状況"
 
@@ -2418,7 +2161,7 @@ msgstr "中継先のアイコンを使う (_t)"
 
 #: ../data/gui/preferences_window.ui.h:111
 msgid "Use default applications"
-msgstr ""
+msgstr "デフォルトのアプリケーションを使う"
 
 #: ../data/gui/preferences_window.ui.h:112
 msgid "Use system _default"
@@ -2426,34 +2169,31 @@ msgstr "システムのデフォルトを使う (_d)"
 
 #: ../data/gui/preferences_window.ui.h:113
 msgid "Video framerate"
-msgstr ""
+msgstr "ビデオのフレームレート"
 
 #: ../data/gui/preferences_window.ui.h:114
-#, fuzzy
 msgid "Video input device"
-msgstr "デフォルトのメッセージ"
+msgstr "ビデオ入力デバイス"
 
 #: ../data/gui/preferences_window.ui.h:115
 msgid "Video output device"
-msgstr ""
+msgstr "ビデオ出力デバイス"
 
 #: ../data/gui/preferences_window.ui.h:116
 msgid "Video size"
-msgstr ""
+msgstr "ビデオの大きさ"
 
 #: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
 msgstr "新しいイベントを受信したとき:"
 
 #: ../data/gui/preferences_window.ui.h:118
-#, fuzzy
 msgid "Your message:"
-msgstr "エラーメッセージ: %s"
+msgstr "あなたのメッセージ:"
 
 #: ../data/gui/preferences_window.ui.h:119
-#, fuzzy
 msgid "Your nickname:"
-msgstr "ニックネーム:"
+msgstr "あなたのニックネーム:"
 
 #: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
@@ -2512,34 +2252,37 @@ msgid "_Send chat state notifications:"
 msgstr "チャット状態通知を送信する (_S):"
 
 #: ../data/gui/preferences_window.ui.h:134
+msgid "_Show roster on startup:"
+msgstr "自動時に名簿を表示する (_S):"
+
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "状況メッセージ (_S):"
 
 # (Mako)あえてカッコ書き
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "URL 強調表示 (_U):"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "ウィンドウの配置 (_W):"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "グループチャットで (_g)"
 
-#: ../data/gui/preferences_window.ui.h:138
-#, fuzzy
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
-msgstr "名簿にありません"
+msgstr "名簿で (_r)"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "分後"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
-msgstr "個人リスト:"
+msgstr "プライバシーリスト:"
 
 #: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
@@ -2555,12 +2298,11 @@ msgstr "<i>プライバシーリスト</i>"
 
 #: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
-msgstr ""
+msgstr "このセッションで有効"
 
 #: ../data/gui/privacy_list_window.ui.h:5
-#, fuzzy
 msgid "Active on each startup"
-msgstr "Gajim 起動時に接続する (_o)"
+msgstr "起動ごとに有効"
 
 #: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
@@ -2583,65 +2325,54 @@ msgid "JabberID"
 msgstr "JabberID"
 
 #: ../data/gui/privacy_list_window.ui.h:11
-#, fuzzy
 msgid "Order:"
 msgstr "順位:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3802
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3966
 msgid "Privacy List"
 msgstr "プライバシーリスト"
 
 #: ../data/gui/privacy_list_window.ui.h:13
-#, fuzzy
 msgid "all by subscription"
-msgstr "在席通知のすべて"
+msgstr "在席通知の状態が"
 
 #: ../data/gui/privacy_list_window.ui.h:14
-#, fuzzy
 msgid "all in the group"
-msgstr "グループのすべて"
+msgstr "グループが"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-#, fuzzy
 msgid "both"
 msgstr "相互に承認"
 
-# #(Mako)helpers.pyは、
-# 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
+# (Mako)相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
 #: ../data/gui/privacy_list_window.ui.h:16
-#, fuzzy
 msgid "from"
 msgstr "こちらが承認"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-#, fuzzy
 msgid "none"
-msgstr "1"
+msgstr "なし"
 
+# (Mako)相手先の情報で、subscriptionの有無なので、「相手先が承認」としたい
 #: ../data/gui/privacy_list_window.ui.h:18
-#, fuzzy
 msgid "to"
-msgstr "2"
+msgstr "相手先が承認"
 
 #: ../data/gui/privacy_list_window.ui.h:19
-#, fuzzy
 msgid "to send me messages"
-msgstr "メッセージを私に送信する"
+msgstr "メッセージを私に送信すること"
 
 #: ../data/gui/privacy_list_window.ui.h:20
-#, fuzzy
 msgid "to send me queries"
-msgstr "クエリーを私に送信する"
+msgstr "クエリーを私に送信すること"
 
 #: ../data/gui/privacy_list_window.ui.h:21
-#, fuzzy
 msgid "to send me status"
-msgstr "状況を私に送信する"
+msgstr "状況を私に送信すること"
 
 #: ../data/gui/privacy_list_window.ui.h:22
-#, fuzzy
 msgid "to view my status"
-msgstr "私の状況を見せる"
+msgstr "私の状況を見ること"
 
 #: ../data/gui/profile_window.ui.h:1
 #: ../data/gui/vcard_information_window.ui.h:1
@@ -2668,110 +2399,109 @@ msgid "<b>Company:</b>"
 msgstr "<b>会社:</b>"
 
 #: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Country:</b>"
 msgstr "<b>国:</b>"
 
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../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:11
+#: ../data/gui/vcard_information_window.ui.h:12
 msgid "<b>E-Mail:</b>"
 msgstr "<b>メールアドレス:</b>"
 
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:13
 msgid "<b>Extra Address:</b>"
 msgstr "<b>建物名など:</b>"
 
 #. Family Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Family:</b>"
 msgstr "<b>姓:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:16
 msgid "<b>Full Name</b>"
 msgstr "<b>名前(フルネーム)</b>"
 
 #. Given Name
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Given:</b>"
 msgstr "<b>名:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Homepage:</b>"
 msgstr "<b>ホームページ:</b>"
 
 #. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Middle:</b>"
 msgstr "<b>Middle:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Name:</b>"
 msgstr "<b>名前:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:24
 msgid "<b>Nickname:</b>"
 msgstr "<b>ニックネーム:</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Phone No.:</b>"
 msgstr "<b>電話番号:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Position:</b>"
 msgstr "<b>役職:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:27
 msgid "<b>Postal Code:</b>"
 msgstr "<b>郵便番号:</b>"
 
 #. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefix:</b>"
 
-# (Mako)個人情報では「役」(劇の役のような意味で)、
-#       vcard では「職種」が適切と思われる。
+# (Mako)vcard では「職種」が適切
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>Role:</b>"
-msgstr "<b>役/職種:</b>"
+msgstr "<b>職種:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>State:</b>"
 msgstr "<b>州(県):</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:34
 msgid "<b>Street:</b>"
 msgstr "<b>町丁名・番地:</b>"
 
 #. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suffix:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "About"
 msgstr "概略"
 
@@ -2780,12 +2510,12 @@ msgid "Click to set your avatar"
 msgstr "アバターの設定"
 
 #: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:45
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "書式: YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "Personal Info"
 msgstr "個人情報"
 
@@ -2799,7 +2529,6 @@ msgid "<b>What do you want to do?</b>"
 msgstr "<b>あなたがやりたいことは ?</b>"
 
 #: ../data/gui/remove_account_window.ui.h:2
-#, fuzzy
 msgid "Remove account _only from Gajim"
 msgstr "アカウントを Gajim からのみ削除 (_o)"
 
@@ -2809,13 +2538,12 @@ msgstr "アカウントを Gajim とサーバーからも削除 (_s)"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5438
-#: ../src/roster_window.py:5564 ../src/roster_window.py:5694
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5639
+#: ../src/roster_window.py:5764 ../src/roster_window.py:5894
 msgid "_Remove"
 msgstr "削除 (_R)"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
-#, fuzzy
 msgid ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
@@ -2825,10 +2553,9 @@ msgstr ""
 
 #: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr ""
+msgstr "メッセージ本文 <現在使われていないため、デフォルトで表示されません>"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:3
-#, fuzzy
 msgid "Roster Item Exchange"
 msgstr "名簿の項目の交換"
 
@@ -2860,58 +2587,54 @@ msgstr "ヘルプ(オンライン)"
 
 #: ../data/gui/roster_window.ui.h:8
 msgid "P_lugins"
-msgstr ""
+msgstr "プラグイン (_l)"
 
 #: ../data/gui/roster_window.ui.h:9
 msgid "Profile, A_vatar"
 msgstr "プロフィールとアバター"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Only _Active Contacts"
 msgstr "アクティブな相手先のみ表示 (_A)"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show Trans_ports"
 msgstr "中継先を表示 (_p)"
 
-#: ../data/gui/roster_window.ui.h:12
+#: ../data/gui/roster_window.ui.h:13
 msgid "Show _Offline Contacts"
 msgstr "オフラインの相手先を表示 (_O)"
 
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
 msgid "Show _Roster"
-msgstr "名簿の表示 (_R)"
+msgstr "名簿を表示 (_R)"
 
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 msgid "_Accounts"
 msgstr "アカウント (_A)"
 
 #. 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:15
+#: ../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:17
+#: ../data/gui/roster_window.ui.h:18
 msgid "_Contents"
 msgstr "目次 (_C)"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
+#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "編集 (_E)"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:22
 msgid "_Help"
 msgstr "ヘルプ (_H)"
 
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "単発メッセージを送信する (_S)..."
-
 #: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "表示 (_V)"
@@ -2925,16 +2648,15 @@ msgid "Search"
 msgstr "検索"
 
 #: ../data/gui/search_window.ui.h:3
-#, fuzzy
 msgid "_Add contact"
-msgstr "相手先リストに追加する (_A)..."
+msgstr "相手先リストに追加 (_A)"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5706
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5906
 msgid "_Information"
 msgstr "情報 (_I)"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
 msgid "_Search"
 msgstr "検索 (_S)"
 
@@ -2947,9 +2669,8 @@ msgid "_Address:"
 msgstr "アドレス (_A):"
 
 #: ../data/gui/service_registration_window.ui.h:1
-#, fuzzy
 msgid "Register to"
-msgstr "登録"
+msgstr "登録 "
 
 #: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
@@ -3015,9 +2736,8 @@ msgid "Select the contacts you want to synchronise"
 msgstr "合わせたい相手先を選択してください"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
-#, fuzzy
 msgid "Synchronise : select contacts"
-msgstr "同期: 相手先の選択"
+msgstr "同調: 相手先の選択"
 
 #: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
@@ -3050,65 +2770,62 @@ msgid "<b>Client:</b>"
 msgstr "<b>クライアント:</b>"
 
 #: ../data/gui/vcard_information_window.ui.h:8
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>設定したアバター:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Contact time:</b>"
 msgstr "<b>通話時間:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:20
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:30
 msgid "<b>Resource:</b>"
 msgstr "<b>リソース:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Status:</b>"
 msgstr "<b>在席状況:</b>"
 
 #. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:36
 msgid "<b>Subscription:</b>"
 msgstr "<b>在席通知:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:39
 msgid "<b>System:</b>"
 msgstr "<b>システム:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:40
+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:42
-#, fuzzy
-msgid "Configured avatar:"
-msgstr "設定したアバター:"
-
-#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/vcard_information_window.ui.h:44
 #: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "相手先"
 
-#: ../data/gui/vcard_information_window.ui.h:44
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Contact Information"
 msgstr "相手先の情報"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "More"
 msgstr "その他の情報"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "ユーザーのアバター:"
-
 #: ../data/gui/xml_console_window.ui.h:1
-#, fuzzy
 msgid "<b>Filter</b>"
-msgstr "<b>フォント</b>"
+msgstr "<b>フィルタ</b>"
 
 #: ../data/gui/xml_console_window.ui.h:2
-#, fuzzy
 msgid "<b>Jabber Traffic</b>"
-msgstr "<b>Jabber 通信</b>"
+msgstr "<b>Jabber トラヒック</b>"
 
 #: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
@@ -3116,23 +2833,23 @@ msgstr "<b>XML 入力</b>"
 
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
-msgstr ""
+msgstr "IN スタンザを表示しない"
 
 #: ../data/gui/xml_console_window.ui.h:5
 msgid "Hide IQ stanzas"
-msgstr ""
+msgstr "IQ スタンザを表示しない"
 
 #: ../data/gui/xml_console_window.ui.h:6
 msgid "Hide Message stanzas"
-msgstr ""
+msgstr "Message スタンザを表示しない"
 
 #: ../data/gui/xml_console_window.ui.h:7
 msgid "Hide OUT stanzas"
-msgstr ""
+msgstr "OUT スタンザを表示しない"
 
 #: ../data/gui/xml_console_window.ui.h:8
 msgid "Hide Presence stanzas"
-msgstr ""
+msgstr "Presence スタンザを表示しない"
 
 #: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
@@ -3195,28 +2912,25 @@ msgid ""
 msgstr "コマンドの実行中です。本当に中止してもいいですか ?"
 
 #: ../src/adhoc_commands.py:370
-#, fuzzy
 msgid "Invalid Form"
-msgstr "談話室名が正しくありません"
+msgstr "フォームが正しくありません"
 
 #: ../src/adhoc_commands.py:371
-#, fuzzy
 msgid "The form is not filled correctly."
-msgstr "ニックネームに使用できない文字が含まれています。"
+msgstr "フォームが正しく入力されていません。"
 
 #: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
 msgid "Service sent malformed data"
-msgstr ""
+msgstr "サービスは不正なデータを送信しました"
 
 #: ../src/adhoc_commands.py:399
 msgid "Service changed the session identifier."
-msgstr ""
+msgstr "サービスはセッション ID を変更しました。"
 
 #. when stanza doesn't have error description
 #: ../src/adhoc_commands.py:513
-#, fuzzy
 msgid "Service returned an error."
-msgstr "エラーを返してきました。"
+msgstr "サービスはエラーを返しました。"
 
 #. For i18n
 #: ../src/advanced_configuration_window.py:91
@@ -3239,7 +2953,7 @@ msgstr "æ•´æ•°åž‹"
 msgid "Text"
 msgstr "文字列型"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:962
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1049
 msgid "Color"
 msgstr "色"
 
@@ -3261,203 +2975,218 @@ msgid "(None)"
 msgstr "(なし)"
 
 #: ../src/advanced_configuration_window.py:259
-#, fuzzy
 msgid "Hidden"
-msgstr "隠し"
+msgstr "(非表示)"
 
 #: ../src/atom_window.py:123
-#, fuzzy, python-format
+#, 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] "新しいエントリーを受け取りました (%(count)d が表示されません):"
-msgstr[1] "新しいエントリーを受け取りました (%(count)d が表示されません):"
+msgstr[0] "新しいエントリーを受け取りました (%d 件が表示されません):"
+msgstr[1] "新しいエントリーを受け取りました (%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:76
+#: ../src/chat_control.py:83
 msgid "English"
 msgstr "英語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Belarusian"
 msgstr "ベラルーシ語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Bulgarian"
 msgstr "ブルガリア語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Breton"
 msgstr "ブルトン語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Czech"
 msgstr "チェコ語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "German"
 msgstr "ドイツ語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Greek"
 msgstr "ギリシア語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "British"
 msgstr "英語 (イギリス)"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Esperanto"
 msgstr "エスペラント"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Spanish"
 msgstr "スペイン語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Basque"
 msgstr "バスク語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "French"
 msgstr "フランス語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Croatian"
 msgstr "クロアチア語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Italian"
 msgstr "イタリア語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Norwegian (b)"
 msgstr "ノルウェー語 (b)"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Dutch"
 msgstr "オランダ語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Norwegian"
 msgstr "ノルウェー語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Polish"
 msgstr "ポーランド語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Portuguese"
 msgstr "ポルトガル語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Brazilian Portuguese"
 msgstr "ポルトガル語 (ブラジル)"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Russian"
 msgstr "ロシア語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Serbian"
 msgstr "セルビア語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Slovak"
 msgstr "スロバキア語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Swedish"
 msgstr "スウェーデン語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Chinese (Ch)"
 msgstr "中国語 (Ch)"
 
-#: ../src/chat_control.py:496
+#: ../src/chat_control.py:226
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/chat_control.py:231
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s)"
+
+#: ../src/chat_control.py:236
+msgid "Error."
+msgstr "エラー"
+
+#: ../src/chat_control.py:561
 msgid "Spelling language"
 msgstr "スペルチェックの言語"
 
 #. we are not connected
-#: ../src/chat_control.py:528 ../src/chat_control.py:737
+#: ../src/chat_control.py:593 ../src/chat_control.py:809
 msgid "A connection is not available"
 msgstr "接続は有効ではありません"
 
-#: ../src/chat_control.py:529 ../src/chat_control.py:738
+#: ../src/chat_control.py:594 ../src/chat_control.py:810
 msgid "Your message can not be sent until you are connected."
 msgstr "接続するまでメッセージは送信されません。"
 
-#: ../src/chat_control.py:944
+#: ../src/chat_control.py:1031
 msgid "Underline"
 msgstr "下線"
 
-#: ../src/chat_control.py:945
+#: ../src/chat_control.py:1032
 msgid "Strike"
 msgstr "抹消線"
 
-#: ../src/chat_control.py:968
+#: ../src/chat_control.py:1055
 msgid "Font"
 msgstr "フォント"
 
-#: ../src/chat_control.py:977
+#: ../src/chat_control.py:1064
 msgid "Clear formating"
 msgstr "書式のクリア"
 
-#: ../src/chat_control.py:1055
+#: ../src/chat_control.py:1141
 msgid "Really send file?"
 msgstr "ファイルを送信しますか ?"
 
-#: ../src/chat_control.py:1056
+#: ../src/chat_control.py:1142
 #, 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:1520 ../src/chat_control.py:2010
-#, fuzzy
+#: ../src/chat_control.py:1622 ../src/chat_control.py:2145
 msgid "GPG encryption enabled"
 msgstr "GPG 暗号化は有効"
 
+#: ../src/chat_control.py:1643 ../src/chat_control.py:1646
+msgid "Requires python-farsight."
+msgstr "python-farsight が必要です。"
+
 #. Add to roster
-#: ../src/chat_control.py:1545 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1070 ../src/dialogs.py:2094
-#: ../src/dialogs.py:2123 ../src/gui_interface.py:551
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
-#: ../src/roster_window.py:1965 ../src/roster_window.py:3355
-#: ../src/roster_window.py:3382
+#: ../src/chat_control.py:1672 ../src/common/contacts.py:158
+#: ../src/common/contacts.py:277 ../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:472
+#: ../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:1575
+#: ../src/chat_control.py:1703
 msgid "This contact does not support file transfer."
 msgstr "この相手先はファイル転送をサポートしていません。"
 
-#: ../src/chat_control.py:1578
+#: ../src/chat_control.py:1706
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "ファイル転送を行なうには、本当の JID を知っている必要があります。"
 
-#: ../src/chat_control.py:1677
+#: ../src/chat_control.py:1813
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
-msgstr ""
+msgstr "%(type)s の状態: %(state)s  理由: %(reason)s"
 
-#: ../src/chat_control.py:1869
+#: ../src/chat_control.py:2004
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s さん (グループチャット %(room_name)s より)"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1990 ../src/dialogs.py:5278
+#: ../src/chat_control.py:2125 ../src/dialogs.py:5027
 msgid "No GPG key assigned"
 msgstr "GPG 鍵が割り当てられていません"
 
-#: ../src/chat_control.py:1991
+#: ../src/chat_control.py:2126
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3465,52 +3194,52 @@ msgstr ""
 "この相手先に GPG 鍵が割り当てられていないため、メッセージを GPG で暗号化する"
 "ことができません。"
 
-#: ../src/chat_control.py:2000
+#: ../src/chat_control.py:2135
 msgid "GPG encryption disabled"
 msgstr "GPG 暗号化は無効"
 
-#: ../src/chat_control.py:2026
+#: ../src/chat_control.py:2161
 msgid "Session WILL be logged"
 msgstr "セッションは記録されます"
 
-#: ../src/chat_control.py:2028
+#: ../src/chat_control.py:2163
 msgid "Session WILL NOT be logged"
 msgstr "セッションは記録されません"
 
 # (Mako)暗号化は有効 %s、
 #. encryption %s active
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2180
 msgid "is"
 msgstr "で"
 
-#: ../src/chat_control.py:2045
+#: ../src/chat_control.py:2180
 msgid "is NOT"
 msgstr "でなく"
 
 # #. チャットは記録 %s。
 #. chat session %s be logged
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2182
 msgid "will"
 msgstr "記録されます"
 
-#: ../src/chat_control.py:2047
+#: ../src/chat_control.py:2182
 msgid "will NOT"
 msgstr "記録されません"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2051
+#: ../src/chat_control.py:2186
 msgid "and authenticated"
 msgstr "認証されています"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2190
 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:2062
+#: ../src/chat_control.py:2197
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3519,32 +3248,31 @@ msgstr ""
 "%(type)s の暗号化は有効%(status)s、%(authenticated)s。\n"
 "チャットは%(logged)s。"
 
-#: ../src/chat_control.py:2205
+#: ../src/chat_control.py:2358
 msgid "Session negotiation cancelled"
-msgstr ""
+msgstr "セッションの確率を中止しました"
 
-#: ../src/chat_control.py:2215
+#: ../src/chat_control.py:2368
 msgid "This session WILL be archived on server"
-msgstr ""
+msgstr "セッションはサーバーに記録されます"
 
-#: ../src/chat_control.py:2217
-#, fuzzy
+#: ../src/chat_control.py:2370
 msgid "This session WILL NOT be archived on server"
-msgstr "セッションは記録されません"
+msgstr "セッションはサーバーに記録されません"
 
-#: ../src/chat_control.py:2226
+#: ../src/chat_control.py:2379
 msgid "This session is encrypted"
 msgstr "このセッションは暗号化されています"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2382
 msgid " and WILL be logged"
 msgstr " かつ、記録されます"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2384
 msgid " and WILL NOT be logged"
 msgstr " かつ、記録されません"
 
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3552,38 +3280,40 @@ msgstr ""
 "遠くの相手先の同一性は検証されませんでした。詳しくは盾ボタンをクリックしてく"
 "ださい。"
 
-#: ../src/chat_control.py:2238
+#: ../src/chat_control.py:2391
 msgid "E2E encryption disabled"
 msgstr "終端間暗号化 (E2EE) は無効"
 
-#: ../src/chat_control.py:2282 ../src/chat_control.py:2295
+#: ../src/chat_control.py:2435 ../src/chat_control.py:2448
 msgid "The following message was NOT encrypted"
-msgstr "次のメッセージは暗号化されませんでした:"
+msgstr "次のメッセージは暗号化されませんでした"
 
-#: ../src/chat_control.py:2288
+#: ../src/chat_control.py:2441
 msgid "The following message was encrypted"
-msgstr "次のメッセージは暗号化されました:"
+msgstr "次のメッセージは暗号化されました"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2566
+#: ../src/chat_control.py:2734
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" さんから新しいメッセージを受信しました"
 
-#: ../src/chat_control.py:2567
+#: ../src/chat_control.py:2735
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "このタブを閉じると、記録を残さない設定の場合、このメッセージは失われます。"
 
-#: ../src/chat_control.py:2713 ../src/common/connection_handlers.py:1593
-#: ../src/common/connection_handlers.py:1716 ../src/common/connection.py:454
-#: ../src/gajim.py:159 ../src/session.py:138
+#: ../src/chat_control.py:2902 ../src/common/connection_handlers_events.py:875
+#: ../src/common/connection_handlers.py:946
+#: ../src/common/connection_handlers.py:1056
+#: ../src/common/connection_handlers.py:1713 ../src/common/connection.py:463
+#: ../src/common/logger.py:1126 ../src/gajim.py:208 ../src/session.py:97
 msgid "Database Error"
 msgstr "データベースのエラー"
 
-#: ../src/chat_control.py:2714
+#: ../src/chat_control.py:2903
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3592,42 +3322,50 @@ msgstr ""
 "データベースファイル (%s) を読むことができません。修復するか、または削除(すべ"
 "ての履歴は失われます)してください。"
 
-#: ../src/chat_control.py:2962
+#: ../src/chat_control.py:3139 ../src/gui_interface.py:1037
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"%s さんからのメッセージを復号できません\n"
+"改竄の可能性があります。"
+
+#: ../src/chat_control.py:3172
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s さんは現在、%(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/common/check_paths.py:38
 msgid "creating logs database"
 msgstr "記録データベースを作っています"
 
-#: ../src/common/check_paths.py:85
-#, fuzzy
+#: ../src/common/check_paths.py:86
 msgid "creating cache database"
-msgstr "記録データベースを作っています"
+msgstr "キャッシュデータベースを作ります"
 
-#: ../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:326 ../src/common/check_paths.py:341
+#: ../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
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s はファイルです。ディレクトリでなければなりません"
 
-#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim は終了します"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s はディレクトリです。ファイルでなければなりません"
 
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:352
 #, python-format
 msgid "creating %s directory"
 msgstr "ディレクトリ %s を作ります"
@@ -3652,6 +3390,11 @@ msgstr "チャットできます"
 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
 msgid "Extended away"
 msgstr "長時間不在です"
@@ -3677,7 +3420,7 @@ msgid "Leave Groupchats"
 msgstr "グループチャットから退出"
 
 #: ../src/common/commands.py:197
-#, fuzzy, python-format
+#, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(room_jid)s の %(nickname)s さん"
 
@@ -3691,9 +3434,9 @@ msgstr "退出したいグループチャットを選択してください"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:815
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5323
+#: ../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
 msgid "Groupchats"
 msgstr "グループチャット"
 
@@ -3710,111 +3453,115 @@ msgid "All unread messages have been forwarded."
 msgstr "すべての未読メッセージが転送されました。"
 
 #: ../src/common/commands.py:295
-#, fuzzy
 msgid "Forward unread message then disconnect"
-msgstr "未読メッセージの転送"
+msgstr "未読メッセージを転送してから切断"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "取り込み中でもサウンドを鳴らす"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "通知を表示するために D-Bus と Notification-Daemon を使います"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "「オンライン」と「チャットできます」の相手先のみを名簿に表示します。"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "在席状況が「離席中」に変わるまでの時間(単位は分)。"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (操作のない状態が $T 分以上になった結果としての離席)"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr "$S は現在の状況メッセージに置き換えられます。$T は自動離席の時間です。"
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "在席状況が「不在」に変わるまでの時間(単位は分)。"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (操作のない状態が $T 分以上になった結果としての不在)"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S は現在の状況メッセージに置き換えられます。$T は自動不在の時間です。"
 
-#: ../src/common/config.py:88
-#, fuzzy
+#: ../src/common/config.py:89
 msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
-"いつシステムトレイアイコンを表示するか。'never'(表示しない), 'on_event'(保留"
-"イベントがあるときだけ), 'always'(常に)のいずれか。"
+"いつ通知エリアにアイコンを表示するか。'never'(表示しない)、'on_event'(保留イ"
+"ベントがあるときだけ)、'always'(常に)のいずれか。"
+
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+"トレイアイコンが表示されていない状態でも名簿ウィンドウを閉じることを許しま"
+"す。"
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "受信のニックネームの色。"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "送信のニックネームの色。"
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "受信の文の色。"
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "送信の文の色。"
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "状況メッセージ文の色。"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
 msgid "Incoming nickname font."
 msgstr "受信のニックネームのフォント。"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:103
 msgid "Outgoing nickname font."
 msgstr "送信のニックネームのフォント。"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:104
 msgid "Incoming text font."
 msgstr "受信の文のフォント。"
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:105
 msgid "Outgoing text font."
 msgstr "送信の文のフォント。"
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:106
 msgid "Status message text font."
 msgstr "状況メッセージの文のフォント。"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:107
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "折り畳む(アカウントやグループチャットの)行の一覧(空白で区切る)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3186
+#: ../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:2639
 msgid "default"
 msgstr "デフォルト"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:114
 msgid "Language used by speller"
 msgstr "スペルチェックのための言語"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:115
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3825,7 +3572,7 @@ msgstr ""
 "す。\n"
 "'never'(なし) - 時刻を印さない。"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:116
 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. "
@@ -3835,25 +3582,30 @@ msgstr ""
 "あいまい時計を使いません。1 が最も正確な時計で、4 が最も正確ではありません。"
 "print_time が 'sometimes'(時々) の場合のみ使われます。"
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:119
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "* / _ の組を、書式指定の文字として扱う。"
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:120
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "真なら、*/_ を除去しません. たとえば *abc* は太字になりますが * * は除かれま"
 "せん。"
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:123
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
+"HTML を送信するために構造化テキスト(ReStructured text markup)を使う(選択すれ"
+"ばアスキーフォーマットも)。文法は http://docutils.sourceforge.net/docs/ref/"
+"rst/\"\n"
+"\"restructuredtext.html を参照してください (これを使うには docutils をインス"
+"トールが必要です)。"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:132
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3861,7 +3613,7 @@ msgstr ""
 "グループチャットで、ニックネーム補完(タブ)を使うとき、ニックネームの後ろにつ"
 "け加えられる文字。"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:133
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3869,7 +3621,15 @@ msgstr ""
 "グループチャットで、希望したニックネームが他の誰かに使われていた場合、希望し"
 "たニックネームの後ろにつけ加えられる文字。"
 
-#: ../src/common/config.py:159
+#: ../src/common/config.py:151
+msgid ""
+"If true, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+"真なら、Gajim は名簿を閉じる際にその位置を保存し、開く際にはその位置に戻しま"
+"す。"
+
+#: ../src/common/config.py:162
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3879,42 +3639,48 @@ msgstr ""
 "%M] \" は \"[hour:minute] \" となります。詳しくは python の strftime に関する"
 "文書をご覧ください: http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "会話の中で、ニックネームの前に表示される文字列"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "会話の中で、ニックネームの後に表示される文字列"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:167
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
-msgstr ""
+msgstr "新たにメールが届いた際に起動するコマンド。例: /usr/bin/getmail -q"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:169
 msgid "Add * and [n] in roster title?"
 msgstr "* と [n] を名簿の題に追加するかどうか。"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:170
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr "チャットのタブまたはウィンドウを再び開いたとき、覚えている行数。"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:171
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "前の会話の最後から持続しておく時間(単位は分)。"
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
-msgstr "グループチャットに参加するとき、サーバーに要求する行数。"
+#: ../src/common/config.py:172
+msgid ""
+"How many lines to request to server when entering a groupchat. -1 means no "
+"limit"
+msgstr ""
+"グループチャットに参加するとき、サーバーに要求する行数。-1 は制限なし。"
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "グループチャットに参加するとき、記録を遡る時間(単位は分)。"
+#: ../src/common/config.py:173
+msgid ""
+"How many minutes back to request logs when a entering a groupchat. -1 means "
+"no limit"
+msgstr ""
+"グループチャットに参加するとき、記録を遡る時間(単位は分)。-1 は制限なし。"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:174
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
@@ -3922,7 +3688,12 @@ msgstr ""
 "切断されてからグループチャットに自動で再参加を試みるまでの待機時間(単位は"
 "秒)。"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:175
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr "談話室から蹴り出された場合、自動で再参加するか。"
+
+#: ../src/common/config.py:176
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3930,11 +3701,11 @@ msgstr ""
 "Ctrl+Enter をメッセージ送信として、Enter を改行とします (Mirabilis ICQ クライ"
 "アントのデフォルトの挙動)。"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:178
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ctrl+KeyUP で遡ることのできる行数。"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3943,12 +3714,11 @@ msgstr ""
 "独自の辞書の URL (%s を含めます。ここで %s は語/フレーズです)。または、"
 "WIKTIONARY を使う場合は単に 'WIKTIONARY' としてください。"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "チェックをつけると、Gajim を gajim-remote を使って遠隔操作できます。"
 
-#: ../src/common/config.py:182
-#, fuzzy
+#: ../src/common/config.py:185
 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 "
@@ -3957,25 +3727,25 @@ msgid ""
 msgstr ""
 "真なら、NetworkManager からの D-Bus 信号を監視して、ネットワーク接続の状態を"
 "もとに、相手先の在席状況を更新します(相手先が listen_to_network_manager を"
-"「偽」にしておらず、全体の在席状況に同期させている場合)。"
+"「偽」にしておらず、全体の在席状況に同調させている場合)。"
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
-"チャット状態通知の送信。「すべての状態」「入力中のみ」「通知しない」のいずれ"
-"か。"
+"チャット状態通知の送信。all (すべての状態)、composing_only (入力中のみ)、"
+"disabled (通知しない) のいずれか。"
 
 # (Mako)この場合 Disabled は「表示しない」とするべきか
-#: ../src/common/config.py:184
+#: ../src/common/config.py:187
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
-"チャットウィンドウに表示されるチャット状態通知。「すべての状態」「入力中の"
-"み」「通知しない」のいずれか。"
+"チャットウィンドウに表示されるチャット状態通知。all (すべての状態)、"
+"composing_only (入力中のみ)、disabled (通知しない) のいずれか。"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:189
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
@@ -3983,11 +3753,11 @@ msgstr ""
 "個々のメッセージに時刻を印すのではない場合(print_time==sometimes (時々))、時"
 "刻を印す時間間隔 (単位:分)。"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:190
 msgid "Ask before closing a group chat tab/window."
 msgstr "グループチャットのタブまたはウィンドウを閉じる前に確認を求めます。"
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
@@ -3995,15 +3765,15 @@ msgstr ""
 "グループチャット JID の一覧(空白で区切る)にあるグループチャットのタブまたは"
 "ウィンドウを閉じる前には、必ず確認を求めます。"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:192
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
 "of group chat jids."
 msgstr ""
-"グループチャット JID の一覧(空白で区切る)にあるグループチャットの タブまたは"
+"グループチャット JID の一覧(空白で区切る)にあるグループチャットのタブまたは"
 "ウィンドウを閉じる前には、決して確認を求めません。"
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid ""
 "Ask before closing tabbed chat window if there are control that can loose "
 "data (chat, private chat, groupchat that will not be minimized)"
@@ -4011,34 +3781,35 @@ msgstr ""
 "タブのあるチャットウィンドウを閉じる前に、それがデータを失う操作であることの"
 "確認を求めます"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
 msgstr ""
+"ローカルのインターフェースに加えて、アドレス変換 / ポートフォワーディングの場"
+"合にファイル転送に用いるホストの一覧(コンマ区切り)。"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:198
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 標準規格で、KiB は 1024 バイト、KB は 1000 バイト。"
 
-#: ../src/common/config.py:197
-#, fuzzy
+#: ../src/common/config.py:200
 msgid "Notify of events in the notification area."
-msgstr "システムのトレイアイコンでイベントを通知します。"
+msgstr "システムの通知エリアでイベントを通知します。"
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:206
 msgid "Show tab when only one conversation?"
 msgstr "ひとつだけの会話のときもタブを表示するかどうか。"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:207
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "チャットウィンドウにタブつき帳面の縁を表示するかどうか。"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:208
 msgid "Show close button in tab?"
 msgstr "閉じるボタンをタブに表示するかどうか。"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:209
 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 "
@@ -4050,32 +3821,31 @@ msgstr ""
 "です。大きな数値ほど安全ですが、セッションを始める際に計算に時間がかかりま"
 "す。"
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "新着のメッセージをポップアップ通知に表示するかどうか。"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:223
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "グループチャットで強調表示する語の一覧(セミコロンで区切る)。A"
 
-#: ../src/common/config.py:221
-#, fuzzy
+#: ../src/common/config.py:224
 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."
 msgstr ""
 "真なら、ウィンドウマネージャの×ボタンがクリックされた場合に Gajim を終了しま"
-"す。この設定はトレイアイコンが使用されているときのみ適用されます。"
+"す。この設定は通知アイコンが使用されているときのみ適用されます。"
 
-#: ../src/common/config.py:222
+#: ../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:223
+#: ../src/common/config.py:226
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4083,7 +3853,7 @@ msgstr ""
 "真なら、Gajim は未読メッセージのあるタブにアイコンを表示します。テーマに依存"
 "し、アイコンが動画のものもあります。"
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:227
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -4091,11 +3861,11 @@ msgstr ""
 "真なら、Gajim は名簿ウィンドウの相手先の名前の下に在席状況メッセージを(それが"
 "空でなければ)表示します。"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:233
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "名簿でのアバターの表示位置。left(左)またはright(右)"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:234
 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."
@@ -4103,7 +3873,7 @@ msgstr ""
 "真なら、前回アバターのない相手先または受け取ってから時間の経ち過ぎている相手"
 "先に対して、 Gajim はアバターを要求します。"
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:235
 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."
@@ -4111,7 +3881,7 @@ msgstr ""
 "偽なら、相手先が在席状況や状況メッセージを変更しても、Gajim はチャットに在席"
 "状況を表示しません。"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:236
 msgid ""
 "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 "
@@ -4126,30 +3896,34 @@ msgstr ""
 "\"in_and_out\"(入退室のみ)なら、Gajim はグループチャットへの参加/退出のみを表"
 "示します。"
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:238
+msgid "Log XHTML messages instead of plain text messages."
+msgstr "プレーンテキストのメッセージではなく XHTML のメッセージを記録する。"
+
+#: ../src/common/config.py:239
 msgid "Background color of contacts when they just signed in."
 msgstr "相手先がちょうどサインインしたときの背景色。"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:240
 msgid "Background color of contacts when they just signed out."
 msgstr "相手先がちょうどサインアウトしたときの背景色。"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:242
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "真なら、復元されたメッセージはデフォルトのフォントより小さいフォントを使いま"
 "す。"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:243
 msgid "Don't show avatar for the transport itself."
 msgstr "中継先そのもののアバターを表示しません。"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:244
 msgid "Don't show roster in the system taskbar."
 msgstr "システムのタスクバーに名簿を表示しません。"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:245
 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 "
@@ -4159,20 +3933,19 @@ msgstr ""
 "トがある場合にウィンドウをフラッシュさせます (たいていのウィンドウマネージャ"
 "のデフォルトです)。"
 
-#: ../src/common/config.py:243
-#, fuzzy
+# (Mako) sha がよくわからない。とりあえずそのままで。presence はとりあえず「相手先」
+#: ../src/common/config.py:247
 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 "
 "presences."
 msgstr ""
-"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 presences."
+"Jabberd1.4 は、パスワードで保護されたグループチャットに誰かが参加する際 sha "
+"のような情報を好みません。このオプションを偽にすると、グループチャットの相手"
+"先に sha を送るのをやめます。"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
-#, fuzzy
+#: ../src/common/config.py:250
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -4184,40 +3957,53 @@ msgid ""
 "specific window."
 msgstr ""
 "新着メッセージを置くウィンドウの制御。\n"
-"'always'(常に) - すべてのメッセージは単独のウィンドウに。\n"
-"'always_with_roster' - Like 'always' but the messages are in a single window "
-"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 "
-"specific window."
+"'always'(常に) - すべてのメッセージはひとつのウィンドウに。\n"
+"'always_with_roster'(名簿つき) - 'always'(常に) に似て、メッセージは名簿つき"
+"のひとつのウィンドウに。\n"
+"'never'(なし) - すべてのメッセージはそれぞれのウィンドウに。\n"
+"'peracct'(アカウントごと) - それぞれのアカウントへのメッセージはそれぞれの"
+"ウィンドウに。\n"
+"'pertype'(種類ごと) - メッセージの種類(たとえばチャット、グループチャット)ご"
+"とにそれぞれのウィンドウに。"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:251
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+"起動時に名簿を表示するか。\n"
+"'always'(常に) - 常に名簿を表示する。\n"
+"'never'(なし) - 名簿を表示しない。\n"
+"'last_state'(以前の状態) - 前の名簿の表示状態の通りにする。"
+
+#: ../src/common/config.py:252
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "偽なら、チャットウィンドウにアバターは表示されません。"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:253
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "真なら、エスケープキーを押すことでタブまたはウィンドウを閉じます。"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:254
 msgid "Hides the buttons in chat windows."
 msgstr "チャットウィンドウのボタンを表示しません。"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:255
 msgid "Hides the banner in a group chat window"
 msgstr "グループチャットのバナーを表示しません"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:256
 msgid "Hides the banner in two persons chat window"
 msgstr "一対一チャットのウィンドウのバナーを表示しません"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:257
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "グループチャットウィンドウで、在室者一覧を表示しません。"
 
 # (Mako)chat は group chat のことか?
-#: ../src/common/config.py:253
+#: ../src/common/config.py:258
 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."
@@ -4225,42 +4011,41 @@ msgstr ""
 "チャットで、前のメッセージと別の人の場合のみ、行の先頭にニックネームを表示し"
 "ます。"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:259
 msgid "Indentation when using merge consecutive nickname."
 msgstr "連続するニックネームを統合する際の字下げ幅。"
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:260
 msgid "Smooth scroll message in conversation window"
 msgstr "会話ウィンドウのスクロールをなめらかにします"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:261
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "グループチャットのニックネームに使われる色。\":\"で区切ってください。"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:262
 msgid "Ctrl-Tab go to next composing tab when none is unread."
-msgstr ""
+msgstr "未読のものがない場合、Ctrl-Tab で次の入力タブに移動します。"
 
-#: ../src/common/config.py:258
-#, fuzzy
+#: ../src/common/config.py:263
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
-"metacontact 作成の確認のダイアログを表示するかどうか。空文字ならダイアログを"
+"メタ相手先の作成の確認のダイアログを表示するかどうか。空文字ならダイアログを"
 "表示しません。"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:264
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
-"相手先の拒否の確認のダイアログを表示するかどうか。空文字ならダイアログを表示"
+"相手先の遮断の確認のダイアログを表示するかどうか。空文字ならダイアログを表示"
 "しません。"
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:265
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -4268,7 +4053,7 @@ msgstr ""
 "個別の在席状況の確認のダイアログを表示するかどうか。空文字ならダイアログを表"
 "示しません。"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:266
 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 "
@@ -4278,7 +4063,7 @@ msgstr ""
 "す。【注意】負の優先順位のままログインすると、サーバーからどんなメッセージも"
 "受信しません。"
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:267
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4286,7 +4071,7 @@ msgstr ""
 "真なら、Gajim はアカウントのパスワードを保存する際に Gnome Keyring (もしあれ"
 "ば) を使います。"
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:268
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4294,7 +4079,7 @@ msgstr ""
 "真なら Gajim はアカウントのパスワードを保持する際に KDE Wallet (もし "
 "kwalletcli があれば) を使います。"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:269
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4302,16 +4087,15 @@ msgstr ""
 "真なら、Gajim はアカウントとグループの行にオンラインと総計の相手先の数を表示"
 "します。"
 
-#: ../src/common/config.py:265
-#, fuzzy
+#: ../src/common/config.py:270
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
-"空白、'chat'(チャット)、'normal'(普通)のいずれか。もし空なら、すべての受信"
-"メッセージをこのタイプとして扱います"
+"空白、'chat'(チャット)、'normal'(普通) のいずれか。もし空でなければ、すべての"
+"受信メッセージをこのタイプとして扱います"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:271
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4319,7 +4103,7 @@ msgstr ""
 "真なら、チャットウィンドウが開いていない場合に、最新のメッセージをあなたに"
 "送った相手先をスクロールして選択します。"
 
-#: ../src/common/config.py:267
+#: ../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."
@@ -4327,37 +4111,34 @@ msgstr ""
 "真なら、Gajim は $$ と $$ の間の文字列を dvips を用いて画像に変換します。"
 "チャットウィンドウに挿入する前に変換します。"
 
-#: ../src/common/config.py:268
-#, fuzzy
+#: ../src/common/config.py:273
 msgid "Time of inactivity needed before the change status window closes down."
-msgstr "Time of 活動停止中 needed before the change status window closes down."
+msgstr "在籍情況変更ウィンドウを閉じるまでの活動停止の時間。"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:274
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "表示された会話の最大行数。古いほうから削除されます。"
 
-#: ../src/common/config.py:270
-#, fuzzy
+#: ../src/common/config.py:275
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr ""
-"真なら、notification-daemon からの通知はシステムトレイアイコンに付けられま"
-"す。"
+"真なら、notification-daemon からの通知は通知アイコンの脇に表示されます。"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:276
 msgid "Choose interval between 2 checks of idleness."
-msgstr ""
+msgstr "操作しない状態をチェックする時間間隔。"
 
-#: ../src/common/config.py:272
+#: ../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:273
+#: ../src/common/config.py:278
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4365,7 +4146,7 @@ msgstr ""
 "正当な URI スキーム。この一覧にあるスキームだけが”実際の”URIとして扱われます"
 "(mailto と xmpp は別々に扱います)。"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:279
 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!"
@@ -4374,11 +4155,11 @@ msgstr ""
 "メッセージを求めます。注意: 大量の送信すべきリクエストを発生させることがあり"
 "ます!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:280
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr "真なら、グループチャットでの補完をシェルの自動補完のようにします。"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:281
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4387,31 +4168,37 @@ msgstr ""
 "に)、\"when_other_resource\"(リソースが異なる場合)、\"never\"(表示しない)のい"
 "ずれか。"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr ""
+"jingle の出力のビデオのフレームレート (オプション)。例: 10/1 または 25/2"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Optionally resize jingle output video. Example: 320x240"
-msgstr ""
+msgstr "jingle の出力のビデオの大きさ (オプション). 例: 320x240"
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:290
 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."
 msgstr ""
+"真なら、Gajim は jingle を使う際に STUN サーバーを利用しようとします。サー"
+"バーは \"stun_server\" オプションか、または jabber サーバーによって与えられま"
+"す。"
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:291
 msgid "STUN server to use when using jingle"
-msgstr ""
+msgstr "jingle を使う際に利用する STUN サーバー"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:292
 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:300
+#: ../src/common/config.py:306
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4419,93 +4206,92 @@ msgstr ""
 "在席状況に応じて優先順位を自動的に変更します。優先順位は autopriority_* オプ"
 "ションで定義します。"
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:314
 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"
 msgstr ""
-"自動接続の際に使われる在席状況。online(オンライン), chat(チャット可), away(離"
-"席中), xa(不在), dnd(取り込み中), invisible(隠れ中)のいずれか。注意: このオプ"
-"ションは restore_last_status が無効のときのみ使われます"
+"自動接続の際に使われる在席状況。online (オンライン)、chat (チャット可)、away "
+"(離席中)、xa (不在)、dnd (取り込み中)、invisible (隠れ中) のいずれか。注意: "
+"このオプションは restore_last_status が無効のときのみ使われます"
 
 # (Mako) If enabled は If True であるべきだろう
-#: ../src/common/config.py:309
+#: ../src/common/config.py:315
 msgid "If enabled, restore the last status that was used."
 msgstr "真なら、最後に使われた在席状況を復元します。"
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:317
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "真なら、相手先の承認の要求は自動的に了承されます。"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:318
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "偽なら、このアカウントを無効にして、チャットウィンドウにアバターを表示しませ"
 "ん。"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:321
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
-msgstr ""
+msgstr "偽なら、たとえ GPG が設定されていても、GPG 鍵による署名を行いません。"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:323
 msgid "Enable ESessions encryption for this account."
-msgstr ""
+msgstr "このアカウントの暗号化セッションを有効にする"
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:324
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Gajim は(可能なら)自動的に暗号化セッションを始めるべきかどうか。"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:325
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr "試みる接続の種類の順番(空白で区切る)。「tls」「ssl」または「plain」"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:326
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "暗号化されない接続の場合、パスワードを送る前に警告のダイアログを表示します。"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:327
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "標準の SSL ライブラリを使う前に警告のダイアログを表示します。"
 
-#: ../src/common/config.py:322
-#, fuzzy
+#: ../src/common/config.py:328
 msgid ""
-"Show a warning dialog before sending PLAIN password over a plain conenction."
+"Show a warning dialog before sending PLAIN password over a plain connection."
 msgstr ""
-"暗号化されない接続の場合、パスワードを送る前に警告のダイアログを表示します。"
+"暗号化されない接続で平文でパスワードを送る前に、警告のダイアログを表示しま"
+"す。"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:330
 msgid "Space separated list of ssl errors to ignore."
 msgstr "無視すべき SSL のエラーの一覧(空白で区切って)。"
 
-#: ../src/common/config.py:333
-#, fuzzy
+#: ../src/common/config.py:339
 msgid "Whitespace sent after inactivity"
-msgstr "活動停止状態の後に空白を送ります"
+msgstr "活動停止状態の後に送られる空白"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:340
 msgid "XMPP ping sent after inactivity"
 msgstr "活動停止状態の後に XMPP ping を送ります"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:344
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
 msgstr "生存パケットを送ってから再接続を試みるまで待機する時間(単位は秒)。"
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:348
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 対策"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:351
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4513,15 +4299,24 @@ msgstr ""
 "チェックをつけると、Gajim はあなたの IP とプロキシを使います。プロキシはファ"
 "イル転送のために file_transfer_proxies オプションで定義します。"
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:365
 msgid "Answer to receipt requests"
-msgstr ""
+msgstr "受領確認に応じる"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:366
 msgid "Sent receipt requests"
-msgstr ""
+msgstr "受領確認を求める"
+
+#: ../src/common/config.py:375
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "Gajim が使用中の OS を通知することを許可します。"
+
+#: ../src/common/config.py:376
+msgid "Allow Gajim to send your local time."
+msgstr "Gajim があなたの現地時間を通知することを許可します。"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:377
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4529,20 +4324,19 @@ msgstr ""
 "暗号化セッションを確立しようとする際、メッセージの記録をとりたいと仮定するか"
 "どうか"
 
-#: ../src/common/config.py:373
-#, fuzzy
+#: ../src/common/config.py:380
 msgid "Message that is sent to contacts you want to add"
-msgstr "追加したい相手先の情報を入力してください"
+msgstr "追加したい相手先に送られるメッセージ"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:381
 msgid "Last time we syncronized with logs from server."
-msgstr ""
+msgstr "サーバーの履歴に同期した最後の時刻"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:443
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "この相手先に OpenPGP を使えるかどうか"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:444
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4550,108 +4344,97 @@ msgstr ""
 "Gajim はこの相手先について自動的に(可能なら)暗号化セッションを始めるべきかど"
 "うか"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:445 ../src/common/config.py:448
 msgid "Language for which we want to check misspelled words"
 msgstr "スペル間違いを調べたい言語"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "all(すべて)、状況を空白で区切って"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes'(はい)、'no'(いいえ)、'both'(両方)のいずれか"
-
-#: ../src/common/config.py:449 ../src/common/config.py:451
-#: ../src/common/config.py:452 ../src/common/config.py:455
-#: ../src/common/config.py:456
-msgid "'yes', 'no' or ''"
-msgstr "'yes'(はい)、'no'(いいえ)、''(空白)のいずれか"
-
-#: ../src/common/config.py:460
+#: ../src/common/config.py:451
 msgid ""
 "State whether plugins should be activated on exit (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
 msgstr ""
+"終了時にプラグインが有効化されるかどうか (これは Gajim の終了時に保存されま"
+"す)。このオプションをプラグインの有効化/無効化のために使用してはいけません。"
+"代わりに GUI を使用してください。"
 
-#: ../src/common/config.py:465 ../src/common/pep.py:157
+#: ../src/common/config.py:456 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "睡眠中"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:457
 msgid "Back soon"
 msgstr "すぐに戻ります"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:457
 msgid "Back in some minutes."
 msgstr "数分後に戻ります。"
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:458 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "食事"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:458
 msgid "I'm eating, so leave me a message."
 msgstr "食事のため、しばらく離れます。"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:459
 msgid "Movie"
 msgstr "映画"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:459
 msgid "I'm watching a movie."
 msgstr "ただいま映画鑑賞中です。"
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:460 ../src/common/pep.py:186
 msgid "Working"
 msgstr "仕事中"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:460
 msgid "I'm working."
 msgstr "仕事中です。"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:461
 msgid "Phone"
 msgstr "電話中"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:461
 msgid "I'm on the phone."
 msgstr "電話中です。"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:462
 msgid "Out"
 msgstr "外出中"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:462
 msgid "I'm out enjoying life."
 msgstr "出かけています。"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:473
 msgid "I'm available."
 msgstr "在席しています。"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:474
 msgid "I'm free for chat."
 msgstr "チャットできます。"
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:475 ../src/config.py:1609
 msgid "Be right back."
 msgstr "すぐ戻ります。"
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:476
 msgid "I'm not available."
 msgstr "不在です。"
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:477
 msgid "Do not disturb."
 msgstr "邪魔しないでください。"
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:478 ../src/common/config.py:479
 msgid "Bye!"
 msgstr "バイバイ !"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:489
 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."
@@ -4659,93 +4442,218 @@ msgstr ""
 "グループチャットのメッセージに、muc_highlight_words で設定した語、またはあな"
 "たのニックネームが含まれる場合にサウンドを鳴らします。"
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:490
 msgid "Sound to play when any MUC message arrives."
 msgstr "グループチャットのメッセージがあった際にサウンドを鳴らします。"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:499 ../src/common/optparser.py:310
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:503 ../src/common/optparser.py:296
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:507
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:511
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:94
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
-msgid "Unable to load idle module"
+#: ../src/common/connection_handlers_events.py:356
+#, 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/ のような名簿管理ツールを使ってください。"
+
+# (Mako) 実際に使われている場所を確認していないが、強引に訳す
+#: ../src/common/connection_handlers_events.py:787
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "%s から継読中止の要求"
+
+#: ../src/common/connection_handlers_events.py:872
+#: ../src/common/connection_handlers.py:339
+#: ../src/common/connection_handlers.py:944
+#: ../src/common/connection_handlers.py:1054
+#: ../src/common/connection_handlers.py:1711 ../src/common/connection.py:460
+#: ../src/common/logger.py:1124 ../src/gajim.py:390
+msgid "Disk Write Error"
+msgstr "ディスクの書き込みエラー"
+
+#: ../src/common/connection_handlers_events.py:876
+#: ../src/common/connection_handlers.py:947
+#: ../src/common/connection_handlers.py:1057
+#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:464
+#: ../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:897
+msgid "Room has been destroyed"
+msgstr "談話室は閉鎖されました"
+
+#: ../src/common/connection_handlers_events.py:905
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "代わりに次の談話室に参加します: %s"
+
+#: ../src/common/connection_handlers_events.py:978
+#: ../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:979
+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:1016
+#: ../src/gui_interface.py:420 ../src/gui_interface.py:434
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "%(message)s を送信する際にエラー ( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1434
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "未知の SSL エラー: %d"
+
+#: ../src/common/connection_handlers_events.py:1962 ../src/dialogs.py:2771
+#: ../src/notify.py:260
+msgid "New Single Message"
+msgstr "新着の単発メッセージ"
+
+#: ../src/common/connection_handlers_events.py:1964
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr "%(nickname)s からの新しい単発メッセージ"
+
+#: ../src/common/connection_handlers_events.py:1968 ../src/dialogs.py:2772
+#: ../src/notify.py:261
+msgid "New Private Message"
+msgstr "新着の私信"
+
+#: ../src/common/connection_handlers_events.py:1970
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "グループチャット %s からの新着の私信"
+
+#: ../src/common/connection_handlers_events.py:1973
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s さん: %(message)s"
+
+#: ../src/common/connection_handlers_events.py:1976
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "%(nickname)s さんからのメッセージ"
+
+#: ../src/common/connection_handlers_events.py:1980 ../src/dialogs.py:2771
+#: ../src/notify.py:260
+msgid "New Message"
+msgstr "新着メッセージ"
+
+#: ../src/common/connection_handlers_events.py:1982
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "%(nickname)s さんからの新着メッセージ"
+
+#: ../src/common/connection_handlers_events.py:2111
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s さんの在席状況が変わりました"
+
+#: ../src/common/connection_handlers_events.py:2113
+#: ../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:2118 ../src/dialogs.py:2783
+#: ../src/notify.py:274
+msgid "Contact Changed Status"
+msgstr "相手先が在席状況を変更"
+
+#: ../src/common/connection_handlers_events.py:2120
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s さんがサインインしました"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2125 ../src/dialogs.py:2767
+#: ../src/notify.py:256
+msgid "Contact Signed In"
+msgstr "相手先がサインインしました"
+
+#: ../src/common/connection_handlers_events.py:2127
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s さんがサインアウトしました"
+
+#: ../src/common/connection_handlers_events.py:2132 ../src/dialogs.py:2769
+#: ../src/notify.py:258
+msgid "Contact Signed Out"
+msgstr "相手先がサインアウトしました"
+
+# (Mako) idle をどうする
+#: ../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:127
+#: ../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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "登録が完了しました"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "エージェント %s の登録は成功しました"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:144
 msgid "Registration failed"
 msgstr "登録が失敗しました"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:144
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr "%(agent)s の登録は失敗しました。%(error)s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:466
-#: ../src/common/connection_handlers.py:1591
-#: ../src/common/connection_handlers.py:1714 ../src/common/connection.py:451
-#: ../src/gajim.py:341
-msgid "Disk Write Error"
-msgstr "ディスクの書き込みエラー"
-
-#: ../src/common/connection_handlers.py:702 ../src/common/connection.py:1477
-#, fuzzy
+#: ../src/common/connection_handlers.py:573 ../src/common/connection.py:1558
 msgid "Invisibility not supported"
 msgstr "「隠れています」はサポートされていません"
 
-#: ../src/common/connection_handlers.py:703 ../src/common/connection.py:1478
-#, fuzzy, python-format
+#: ../src/common/connection_handlers.py:574 ../src/common/connection.py:1559
+#, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "アカウント %s は「隠れています」をサポートしていません。"
 
-#: ../src/common/connection_handlers.py:1404 ../src/common/connection.py:255
-#: ../src/config.py:2093 ../src/config.py:2102 ../src/config.py:2170
-#: ../src/config.py:3577 ../src/dataforms_widget.py:603 ../src/dialogs.py:2947
-msgid "Invalid Jabber ID"
-msgstr "Jabber ID が正しくありません"
-
-#: ../src/common/connection_handlers.py:1405
-msgid "A message from a non-valid JID arrived, it has been ignored."
-msgstr "正しくない JID からメッセージが届きました。無視します。"
-
-#: ../src/common/connection_handlers.py:1594
-#: ../src/common/connection_handlers.py:1717 ../src/common/connection.py:455
-#: ../src/gajim.py:160 ../src/session.py:139
-#, 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 を参照のこと) か、または削除して (すべての履歴"
-"は失われます) ください。"
+#: ../src/common/connection_handlers.py:1756
+msgid "I would like to add you to my roster."
+msgstr "あなたを私の名簿に追加したいと思っています。"
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4873,31 +4781,31 @@ msgid "Key usage does not include certificate signing"
 msgstr "証明書署名に鍵の使い方が含まれていません"
 
 #: ../src/common/connection.py:99
-#, fuzzy
 msgid "Application verification failure"
-msgstr "検証に失敗しました"
+msgstr "アプリケーションの検証に失敗しました"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2948
+#: ../src/common/connection.py:260 ../src/dialogs.py:3080
 #, 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:278
+# (Mako) ここでは presence を「相手先」と訳す
+#: ../src/common/connection.py:282
 msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
+msgstr "相手先が署名していないか、鍵が割り当てられていません。"
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:285
 #, 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:333
+#: ../src/common/connection.py:338
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[このメッセージは *暗号化されています* (参考 :XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:447
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4906,77 +4814,74 @@ msgstr ""
 "件名: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:857
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "アカウント \"%s\" での接続が切れました"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:858
 msgid "Reconnect manually."
 msgstr "手動で再接続してください。"
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr ""
+msgstr "サーバー %(name)s は登録要求に対してエラーを返しました:  %(error)s"
 
-#: ../src/common/connection.py:856
+#. requested config has changed since first connection
+#: ../src/common/connection.py:911
 #, python-format
 msgid "Server %s provided a different registration form"
-msgstr ""
-
-#: ../src/common/connection.py:869
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "未知の SSL エラー: %d"
+msgstr "サーバー %s は異なる登録フォームを提供しています"
 
 #. wrong answer
-#: ../src/common/connection.py:884
-#, fuzzy
+#: ../src/common/connection.py:927
 msgid "Invalid answer"
-msgstr "回答が間違っています"
+msgstr "応答が正しくありません"
 
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:928
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
-msgstr ""
+msgstr "中継先 %(name)s は登録要求に対してエラーを返しました:  %(error)s"
 
-#: ../src/common/connection.py:1167 ../src/common/connection.py:1296
-#: ../src/common/connection.py:1792
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/connection.py:1236 ../src/common/connection.py:1370
+#: ../src/common/connection.py:1985
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "%s に接続できませんでした"
 
-#: ../src/common/connection.py:1168 ../src/gui_interface.py:632
+#: ../src/common/connection.py:1237 ../src/gui_interface.py:529
 msgid "Check your connection or try again later."
 msgstr "設定を確認するか、時間をおいて試してください。"
 
-#: ../src/common/connection.py:1173
+#: ../src/common/connection.py:1242
 #, python-format
 msgid "Server replied: %s"
 msgstr "サーバの応答: %s"
 
-#: ../src/common/connection.py:1186
+#: ../src/common/connection.py:1255
 msgid "Connection to proxy failed"
 msgstr "プロキシへの接続に失敗"
 
-#: ../src/common/connection.py:1217 ../src/common/connection.py:1276
+#: ../src/common/connection.py:1287 ../src/common/connection.py:1349
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "アカウント %s に接続できません"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1288 ../src/common/connection.py:1350
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "アカウント %s での接続が切れました。再接続を試みます。"
 
-#: ../src/common/connection.py:1243
+#: ../src/common/connection.py:1313
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "%s の証明書の真正性は検証できませんでした。"
 
-#: ../src/common/connection.py:1246
+#: ../src/common/connection.py:1316
 #, python-format
 msgid ""
 "\n"
@@ -4985,7 +4890,7 @@ msgstr ""
 "\n"
 "SSL エラー: <b>%s</b>"
 
-#: ../src/common/connection.py:1248
+#: ../src/common/connection.py:1318
 #, python-format
 msgid ""
 "\n"
@@ -4994,25 +4899,25 @@ msgstr ""
 "\n"
 "未知の SSL エラー: %d"
 
-#: ../src/common/connection.py:1297
+#: ../src/common/connection.py:1371
 msgid "Check your connection or try again later"
 msgstr "接続を確認するか、または後で再度試してください"
 
 # (Mako) %s はアカウントか
-#: ../src/common/connection.py:1329
+#: ../src/common/connection.py:1405
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" の認証に失敗しました"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1407
 msgid "Please check your login and password for correctness."
 msgstr "整合性のために、ログインとパスワードを確認してください。"
 
-#: ../src/common/connection.py:1400
+#: ../src/common/connection.py:1480
 msgid "Error while removing privacy list"
 msgstr "プライバシーリストを削除する際のエラー"
 
-#: ../src/common/connection.py:1401
+#: ../src/common/connection.py:1481
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -5021,41 +4926,40 @@ msgstr ""
 "プライバシーリスト %s は削除されませんでした。現在の接続に使用されているよう"
 "です。使用をやめてから再び試してください。"
 
-#: ../src/common/connection.py:1658
-#, fuzzy, python-format
+#: ../src/common/connection.py:1852
+#, python-format
 msgid "Sent contact: \"%s\" (%s)"
-msgstr "送った相手先: %s (%s)"
+msgstr "送った相手先: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1661
-#, fuzzy
+#: ../src/common/connection.py:1855
 msgid "Sent contacts:"
 msgstr "送った相手先:"
 
-#: ../src/common/connection.py:1807 ../src/common/connection.py:1830
+#: ../src/common/connection.py:2002 ../src/common/connection.py:2025
 msgid "Not fetched because of invisible status"
-msgstr ""
+msgstr "「隠れ中」のため取得できません"
 
-#: ../src/common/connection.py:2262
+#: ../src/common/connection.py:2555
 msgid "Unregister failed"
 msgstr "登録解除に失敗"
 
-#: ../src/common/connection.py:2263
+#: ../src/common/connection.py:2556
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "サーバー %(server)s での登録解除に失敗しました: %(error)s"
 
 # (Mako)承認なしに名簿にある状態
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:551
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:60
+#: ../src/gui_interface.py:472
 msgid "Observers"
 msgstr "オブザーバ"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1517 ../src/roster_window.py:854
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1626
-#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
-#: ../src/roster_window.py:2466
+#: ../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
 msgid "Transports"
 msgstr "中継先"
 
@@ -5065,14 +4969,12 @@ msgstr "名簿にありません"
 
 #. only say that to non Windows users
 #: ../src/common/dbus_support.py:40
-#, fuzzy
 msgid "D-Bus python bindings are missing in this computer"
-msgstr "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
-#, fuzzy
 msgid "D-Bus capabilities of Gajim cannot be used"
-msgstr "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
@@ -5080,14 +4982,15 @@ msgid "D-Bus does not run correctly on this machine"
 msgstr "このコンピュータでは D-Bus が正しく機能していません"
 
 #: ../src/common/dbus_support.py:54
-#, fuzzy
 msgid "D-Bus does not run correctly on this machine: system bus not present"
-msgstr "このコンピュータでは D-Bus が正しく機能していません"
+msgstr ""
+"このコンピュータでは D-Bus が正しく機能していません: システムバスがありません"
 
 #: ../src/common/dbus_support.py:57
-#, fuzzy
 msgid "D-Bus does not run correctly on this machine: session bus not present"
-msgstr "このコンピュータでは D-Bus が正しく機能していません"
+msgstr ""
+"このコンピュータでは D-Bus が正しく機能していません: セッションバスがありませ"
+"ã‚“"
 
 #: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
@@ -5099,10 +5002,10 @@ msgstr ""
 "サービスがありません: Gajim が起動していないか、あるいは remote_control が"
 "「偽」に設定されています"
 
-#: ../src/common/exceptions.py:67
+#: ../src/common/exceptions.py:67 ../src/gajim-remote.py:55
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
-"このコンピュータに D-Bus がないか、あるいは present のモジュールがありません"
+"このコンピュータに D-Bus がないか、あるいは python のモジュールがありません"
 
 #: ../src/common/exceptions.py:78
 #, python-format
@@ -5110,6 +5013,8 @@ msgid ""
 "Session bus is not available.\n"
 "Try reading %(url)s"
 msgstr ""
+"セッションバスが有効ではありません。\n"
+"%(url)s をご覧ください"
 
 #: ../src/common/exceptions.py:90
 #, python-format
@@ -5283,272 +5188,278 @@ msgstr "週の終わり"
 msgid "Weekend!"
 msgstr "週末 !"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:151
 msgid "Username must be between 1 and 1023 chars"
-msgstr ""
+msgstr "ユーザー名は1文字以上1023文字以下である必要があります"
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:156
 msgid "Invalid character in username."
 msgstr "ユーザー名に不正な文字が含まれています。"
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 msgid "Server must be between 1 and 1023 chars"
-msgstr ""
+msgstr "サーバー名は1文字以上1023文字以下である必要があります"
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:167
 msgid "Invalid character in hostname."
 msgstr "ホスト名に不正な文字が含まれています。"
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 msgid "Server address required."
 msgstr "サーバーのアドレスが必要です。"
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 msgid "Resource must be between 1 and 1023 chars"
-msgstr ""
+msgstr "リソースは1文字以上1023文字以下である必要があります"
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:178
 msgid "Invalid character in resource."
 msgstr "リソースに不正な文字が含まれています。"
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Busy"
 msgstr "取り込み中 (_B)"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:220 ../src/tooltips.py:195
 msgid "Busy"
-msgstr "取り込み中です"
+msgstr "取り込み中"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Not Available"
 msgstr "不在 (_N)"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:225 ../src/tooltips.py:197
+msgid "Not Available"
+msgstr "不在"
+
+#: ../src/common/helpers.py:228
 msgid "_Free for Chat"
 msgstr "チャット可 (_F)"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:230 ../src/tooltips.py:191
 msgid "Free for Chat"
-msgstr "チャットできます"
+msgstr "チャット可"
 
-#: ../src/common/helpers.py:230
-#, fuzzy
+#: ../src/common/helpers.py:233
 msgid "?user status:_Available"
-msgstr "一時停止しました"
+msgstr "在席 (_A)"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
-#, fuzzy
+#: ../src/common/helpers.py:235 ../src/tooltips.py:189
 msgid "?user status:Available"
-msgstr "一時停止しました"
+msgstr "在席"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Connecting"
 msgstr "接続中です"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "A_way"
 msgstr "離席中 (_w)"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:245
 msgid "_Offline"
 msgstr "オフライン (_O)"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:247 ../src/tooltips.py:199
 msgid "Offline"
-msgstr "オフラインです"
+msgstr "オフライン"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:250
 msgid "_Invisible"
 msgstr "隠れ中 (_I)"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:252
+msgid "Invisible"
+msgstr "隠れ中"
+
+#: ../src/common/helpers.py:256
 msgid "?contact has status:Unknown"
 msgstr "不明"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:258
 msgid "?contact has status:Has errors"
 msgstr "エラーが起こっています"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:263
 msgid "?Subscription we already have:None"
 msgstr "なし"
 
 # (Mako)subscription
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:265
 msgid "To"
 msgstr "相手先が承認"
 
-# #(Mako)helpers.pyは、
+# (Mako)groups_post_window.ui は、メールの「差出人」に相当
+# helpers.pyは、
 # 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
-#: ../src/common/helpers.py:264
-#, fuzzy
+#: ../src/common/helpers.py:267
 msgid "From"
 msgstr "こちらが承認"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Both"
 msgstr "相互に承認"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:277
 msgid "?Ask (for Subscription):None"
 msgstr "なし"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:279
 msgid "Subscribe"
 msgstr "申し込み"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "?Group Chat Contact Role:None"
 msgstr "なし"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Moderators"
 msgstr "司会者"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Moderator"
 msgstr "司会者"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:296
 msgid "Participants"
 msgstr "参加者"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:298
 msgid "Participant"
 msgstr "参加者"
 
 # (Mako)moderated room で、発言権(voice)を持たない者
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:301
 msgid "Visitors"
 msgstr "傍聴者"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:303
 msgid "Visitor"
 msgstr "傍聴者"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:309 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "なし"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:311 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "主宰者"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:313 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "管理人"
 
 # (Mako)「会員」では排他的なニュアンスが強いのでしかたなくカタカナ語で
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:315 ../src/tooltips.py:212
 msgid "Member"
 msgstr "メンバー"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:354
 msgid "is paying attention to the conversation"
 msgstr "さんはこの会話に目を向けています"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:356
 msgid "is doing something else"
 msgstr "さんは何かほかのことをしています"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:358
 msgid "is composing a message..."
 msgstr "さんがメッセージを書いています..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:361
 msgid "paused composing a message"
 msgstr "さんは書く手をちょっと止めています"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:363
 msgid "has closed the chat window or tab"
 msgstr "さんは会話ウインドウを閉じました"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:631
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:638
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
 # (Mako)これと、次の "from room %s" は連続して表示される
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1099 ../src/common/helpers.py:1106
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "保留メッセージ %d 件"
 msgstr[1] "保留メッセージ %d 件"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1112
 #, python-format
 msgid " from room %s"
 msgstr " - 談話室 \"%s\""
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1115 ../src/common/helpers.py:1132
 #, python-format
 msgid " from user %s"
 msgstr " - ユーザー %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1117
 #, python-format
 msgid " from %s"
 msgstr "- %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1130
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "保留イベント %d 件"
 msgstr[1] "保留イベント %d 件"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1162
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
 #: ../src/common/helpers.py:1341
 msgid "Hello, I am $name."
-msgstr ""
+msgstr "こんにちは。私は $name です。"
 
 #: ../src/common/jingle_rtp.py:107
-#, fuzzy, python-format
+#, python-format
 msgid "%s configuration error"
-msgstr "談話室の構成"
+msgstr "%s 設定エラー"
 
 #: ../src/common/jingle_rtp.py:108
 #, python-format
@@ -5561,33 +5472,42 @@ msgid ""
 "Error was:\n"
 "%s"
 msgstr ""
+"%s を使用できません。設定を見直してください。\n"
+"\n"
+"パイプライン:\n"
+"%s\n"
+"\n"
+"エラー:\n"
+"%s"
 
 #: ../src/common/jingle_rtp.py:205
 msgid "GStreamer error"
-msgstr ""
+msgstr "GStreamer エラー"
 
 #: ../src/common/jingle_rtp.py:206
-#, fuzzy, python-format
+#, python-format
 msgid ""
 "Error: %s\n"
 "Debug: %s"
-msgstr "エラーメッセージ: %s"
+msgstr ""
+"エラー: %s\n"
+"デバッグ: %s"
 
 #: ../src/common/jingle_rtp.py:335
 msgid "audio input"
-msgstr ""
+msgstr "音声入力"
 
 #: ../src/common/jingle_rtp.py:338
 msgid "audio output"
-msgstr ""
+msgstr "音声出力"
 
 #: ../src/common/jingle_rtp.py:381
 msgid "video input"
-msgstr ""
+msgstr "ビデオ入力"
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:390
 msgid "video output"
-msgstr ""
+msgstr "ビデオ出力"
 
 #: ../src/common/latex.py:109
 #, python-format
@@ -5595,66 +5515,72 @@ msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "\"%(command)s\" の実行中にエラー: %(error)s"
 
 #: ../src/common/logging_helpers.py:33
-#, fuzzy, python-format
+#, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s は正しいログレベルではありません"
 
-#: ../src/common/multimedia_helpers.py:37
-#, fuzzy
+#: ../src/common/multimedia_helpers.py:39
 msgid " Default device"
-msgstr "デフォルトのメッセージ"
+msgstr " デフォルトのデバイス"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:60
 msgid "Audio test"
-msgstr ""
+msgstr "音声テスト"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:63
+#: ../src/common/multimedia_helpers.py:79
+#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:111
 msgid "Autodetect"
-msgstr ""
+msgstr "自動検出"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
-#, fuzzy, python-format
+#: ../src/common/multimedia_helpers.py:66
+#: ../src/common/multimedia_helpers.py:81
+#, python-format
 msgid "ALSA: %s"
-msgstr "サイズ: %s"
+msgstr "ALSA: %s"
+
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:83
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "Pulse: %s"
 
 #. Fake sink
 #. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:77
+#: ../src/common/multimedia_helpers.py:105
 msgid "Fake audio output"
-msgstr ""
+msgstr "偽の音声出力"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:90
 msgid "Video test"
-msgstr ""
+msgstr "ビデオのテスト"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:95
 #, python-format
 msgid "V4L2: %s"
-msgstr ""
+msgstr "V4L2: %s"
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:108
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
-msgstr ""
+msgstr "X ウィンドウシステム (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:110
 msgid "X Window System (without Xv)"
-msgstr ""
+msgstr "X ウィンドウシステム (without Xv)"
 
 #. we talk about a file
 #: ../src/common/optparser.py:53
@@ -5662,13 +5588,14 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr "エラー: 読み込みモードで %s を開けません"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:305 ../src/common/optparser.py:306
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:383
+# (Mako) create index のこと
+#: ../src/common/optparser.py:385
 msgid "migrating logs database to indices"
-msgstr ""
+msgstr "記録データベースからインデックスを作成します"
 
 #: ../src/common/passwords.py:123
 #, python-format
@@ -6303,19 +6230,19 @@ msgstr "勉強中"
 msgid "Writing"
 msgstr "執筆中"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:339
 msgid "Unknown Artist"
 msgstr "不明"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:342
 msgid "Unknown Title"
 msgstr "不明"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:345
 msgid "Unknown Source"
 msgstr "不明"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:348
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6337,7 +6264,7 @@ msgid ""
 msgstr "別の Gajim が起動しているようです。ファイル転送は中止されました。"
 
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:424
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6345,11 +6272,11 @@ msgstr ""
 "[暗号化セッションの途中です。このメッセージを見ているということは、何か失敗し"
 "ています。]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 msgid "Avahi error"
 msgstr "Avahi エラー"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6358,72 +6285,73 @@ msgstr ""
 "%s\n"
 "ローカルの伝送がうまく働いていないようです。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Avahi か Bonjour がインストールされているか確認してください。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
-#: ../src/common/zeroconf/connection_zeroconf.py:206
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:219
 msgid "Could not start local service"
 msgstr "ローカルのサービスを起動できません"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "ポート %d を開けません。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:207
-#: ../src/common/zeroconf/connection_zeroconf.py:286
-#: ../src/common/zeroconf/connection_zeroconf.py:297
-#: ../src/common/zeroconf/connection_zeroconf.py:311
+#: ../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
 msgid "Please check if avahi-daemon is running."
 msgstr "avahi-daemon が起動しているか確認してください。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:285
-#: ../src/common/zeroconf/connection_zeroconf.py:296
-#: ../src/common/zeroconf/connection_zeroconf.py:310
+#: ../src/common/zeroconf/connection_zeroconf.py:303
+#: ../src/common/zeroconf/connection_zeroconf.py:316
+#: ../src/common/zeroconf/connection_zeroconf.py:332
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "アカウント \"%s\" の在席状況を変更できませんでした"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:328
+#: ../src/common/zeroconf/connection_zeroconf.py:351
+#: ../src/common/zeroconf/connection_zeroconf.py:390
 msgid "Your message could not be sent."
 msgstr "メッセージを送信できませんでした。"
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:338
+#: ../src/common/zeroconf/connection_zeroconf.py:365
+#: ../src/common/zeroconf/connection_zeroconf.py:404
 msgid "Contact is offline. Your message could not be sent."
 msgstr "相手先はオフラインです。メッセージを送信できませんでした。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:363
+#: ../src/common/zeroconf/connection_zeroconf.py:432
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "ホストへの接続を確立できませんでした: データ送信中の時間切れです。"
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_avahi.py:193
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "サービスの追加中のエラーです。%s"
 
-#: ../src/config.py:397
+#: ../src/config.py:406
 msgid "Default Message"
 msgstr "デフォルトのメッセージ"
 
-#: ../src/config.py:406
+#: ../src/config.py:415
 msgid "Enabled"
 msgstr "有効"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3115
 msgid "Default"
 msgstr "デフォルト"
 
-#: ../src/config.py:733 ../src/dialogs.py:1409
+#: ../src/config.py:746 ../src/dialogs.py:1493
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "言語 %s の辞書はありません"
 
-#: ../src/config.py:734
+#: ../src/config.py:747
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6432,214 +6360,213 @@ msgstr ""
 "スペルチェックを行なうには %s の辞書をインストールしなければなりません。ある"
 "いは、speller_language オプションで別の言語を選択してください。"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1223
 msgid "status message title"
 msgstr "状況メッセージのタイトル"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1223
 msgid "status message text"
 msgstr "状況メッセージの文"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2399 ../src/dialogs.py:2465
-#: ../src/dialogs.py:3231 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../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
 msgid "Name"
 msgstr "名前"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1618
 msgid "Relogin now?"
 msgstr "今すぐ再ログインしますか ?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1619
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "すべての変更を直ちに有効にするには、再ログインしてください。"
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1773 ../src/config.py:1906
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP はこのコンピュータでは使えません。"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1946 ../src/config.py:1993
 msgid "Unread events"
 msgstr "未読のイベント"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1947
 msgid "Read all pending events before removing this account."
 msgstr "このアカウントを削除する前にすべての保留イベントを読みます。"
 
-#: ../src/config.py:1963
+#: ../src/config.py:1976
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "アカウント %s でチャット中です"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1977
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "すべてのチャットとグループチャットのウィンドウを閉じます。続けてもいいです"
 "か ?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:1989 ../src/config.py:2531 ../src/config.py:2567
 msgid "You are currently connected to the server"
 msgstr "現在サーバーに接続している状態です"
 
-#: ../src/config.py:1977
+#: ../src/config.py:1990
 msgid "To change the account name, you must be disconnected."
 msgstr "アカウント名を変更するには、接続を切らなければなりません。"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1994
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "アカウント名を変更するには、保留されているすべてのイベントを読まなければなり"
 "ません。"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2000
 msgid "Account Name Already Used"
 msgstr "アカウン名は既に使われています"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2001
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "この名前は別のアカウントで既に使われています。別の名前にしてください。"
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2005 ../src/config.py:2009
 msgid "Invalid account name"
 msgstr "アカウント名が正しくありません"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2006
 msgid "Account name cannot be empty."
 msgstr "アカウント名は空白にできません。"
 
-#: ../src/config.py:1997
+#: ../src/config.py:2010
 msgid "Account name cannot contain spaces."
 msgstr "アカウント名にスペースを含めることはできません。"
 
-#: ../src/config.py:2074
+#: ../src/config.py:2087
 msgid "Rename Account"
 msgstr "アカウントの変更"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2088
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "%s さんの新しい名前を入力してください"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2116
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID は \"user@サーバー名\" の形をしていなければなりません。"
 
-#: ../src/config.py:2320 ../src/config.py:3623
+#: ../src/config.py:2339 ../src/config.py:3665
 msgid "Invalid entry"
 msgstr "入力内容が正しくありません"
 
-#: ../src/config.py:2321 ../src/config.py:3624
+#: ../src/config.py:2340 ../src/config.py:3666
 msgid "Custom port must be a port number."
 msgstr "ポートは番号で指定しなければなりません。"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2361
 msgid "Failed to get secret keys"
 msgstr "秘密鍵が見つかりません"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2362
 msgid "There is no OpenPGP secret key available."
 msgstr "利用できる OpenPGP の秘密鍵がありません。"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2396
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP キーの選択"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2397
 msgid "Choose your OpenPGP key"
 msgstr "OpenPGP の鍵を選択してください"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2404
 msgid "No such account available"
 msgstr "そのアカウントは無効です"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2405
 msgid "You must create your account before editing your personal information."
 msgstr "個人情報を編集するには、その前にアカウントを作成しなければなりません。"
 
-#: ../src/config.py:2393 ../src/dialogs.py:2152 ../src/dialogs.py:2387
-#: ../src/dialogs.py:2573 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../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
 msgid "You are not connected to the server"
 msgstr "サーバに接続していません"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2413
 msgid "Without a connection, you can not edit your personal information."
 msgstr "接続していない状態では個人情報の編集はできません。"
 
-#: ../src/config.py:2398
+#: ../src/config.py:2417
 msgid "Your server doesn't support Vcard"
 msgstr "このサーバーは Vcard をサポートしていません"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2418
 msgid "Your server can't save your personal information."
 msgstr "このサーバーは個人情報を保持できません。"
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2532 ../src/config.py:2568
 msgid "To disable the account, you must be disconnected."
-msgstr "アカウントの無効にするには、接続を切らなければなりません。"
+msgstr "アカウントを無効にするには、接続を切らなければなりません。"
 
-#: ../src/config.py:2517
+#: ../src/config.py:2537
 msgid "Account Local already exists."
 msgstr "アカウント Local は既に存在しています。"
 
-#: ../src/config.py:2518
-#, fuzzy
+#: ../src/config.py:2538
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Please rename or remove it before enabling link-local messaging."
+msgstr "ローカルの伝送を有効にするには、名前の変更または削除を行ってください。"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2695
 #, python-format
 msgid "Edit %s"
 msgstr "%s を編集"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2697
 #, python-format
 msgid "Register to %s"
 msgstr "%s を登録"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2733
 msgid "Ban List"
 msgstr "追放者の一覧"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2734
 msgid "Member List"
 msgstr "メンバーの一覧"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2734
 msgid "Owner List"
 msgstr "主宰者の一覧"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2735
 msgid "Administrator List"
 msgstr "管理人の一覧"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2799 ../src/disco.py:893 ../src/history_manager.py:207
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2809
 msgid "Reason"
 msgstr "理由"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2816
 msgid "Nick"
 msgstr "ニックネーム"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2822
 msgid "Role"
 msgstr "å½¹"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2849
 msgid "Banning..."
 msgstr "締め出し中..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2851
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6647,11 +6574,11 @@ msgstr ""
 "<b>誰を締め出したいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2853
 msgid "Adding Member..."
 msgstr "メンバーを追加..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2854
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6659,11 +6586,11 @@ msgstr ""
 "<b>誰をメンバーにしたいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2856
 msgid "Adding Owner..."
 msgstr "主宰者を追加..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2857
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6671,11 +6598,11 @@ msgstr ""
 "<b>誰を主宰者にしたいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2859
 msgid "Adding Administrator..."
 msgstr "管理人を追加..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2860
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6683,7 +6610,7 @@ msgstr ""
 "<b>誰を管理人にしたいですか ?</b>\n"
 "\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2861
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6699,110 +6626,110 @@ msgstr ""
 "4. ドメイン (ドメインの合致。どんな user@domain や domain/resource や\n"
 "サブドメインを含んでも可)"
 
-#: ../src/config.py:2943
+#: ../src/config.py:2962
 #, python-format
 msgid "Removing %s account"
 msgstr "アカウント %s を削除します"
 
-#: ../src/config.py:2958
-#, fuzzy
+#: ../src/config.py:2977
 msgid "Account is disabled"
-msgstr "感情アイコンは無効"
+msgstr "アカウントは無効です"
 
-#: ../src/config.py:2959
+#: ../src/config.py:2978
 msgid "To unregister from a server, account must be enabled."
 msgstr ""
+"サーバーから登録を解除するには、アカウントを有効にしなければなりません。"
 
-#: ../src/config.py:2972 ../src/gui_interface.py:311
-#: ../src/gui_interface.py:1048
+#: ../src/config.py:2991 ../src/gui_interface.py:278
+#: ../src/gui_interface.py:701
 msgid "Password Required"
 msgstr "パスワードが必要です"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:1028
+#: ../src/config.py:2992 ../src/gui_interface.py:681
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s のパスワードを入力してください"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:1048
+#: ../src/config.py:2993 ../src/gui_interface.py:701
 msgid "Save password"
 msgstr "パスワードを保存する"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3003
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "アカウント \"%s\" はサーバに接続しています"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3004
 msgid "If you remove it, the connection will be lost."
 msgstr "削除すると、接続が失われます。"
 
-#: ../src/config.py:2999
-#, fuzzy, python-format
+#: ../src/config.py:3018
+#, python-format
 msgid "Connection to server %s failed"
-msgstr "プロキシへの接続に失敗"
+msgstr "サーバー %s への接続に失敗しました"
 
-#: ../src/config.py:3000
-#, fuzzy
+#: ../src/config.py:3019
 msgid "What would you like to do?"
 msgstr "何をしたいですか ?"
 
-#: ../src/config.py:3001
-#, fuzzy
+#: ../src/config.py:3020
 msgid "Remove only from Gajim"
-msgstr "アカウントを Gajim からのみ削除 (_o)"
+msgstr "アカウントを Gajim からのみ削除"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3021
 msgid "Don't remove anything. I'll try again later"
-msgstr ""
+msgstr "何も削除できません。あとで再び試みます"
 
-#: ../src/config.py:3095
+#: ../src/config.py:3115
 msgid "?print_status:All"
 msgstr "すべて"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3116
 msgid "Enter and leave only"
 msgstr "入退室のみ"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3117
 msgid "?print_status:None"
 msgstr "なし"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3189
 msgid "New Group Chat"
 msgstr "新しいグループチャット"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3222
 msgid "This bookmark has invalid data"
 msgstr "このブックマークは不正なデータを含んでいます"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3223
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "サーバーと談話室の欄を正しく入力するか、このブックマークを削除してください。"
 
 #. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1950
+#: ../src/config.py:3348 ../src/dialogs.py:2070
 msgid "Invalid nickname"
 msgstr "ニックネームが正しくありません"
 
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3349 ../src/config.py:3360 ../src/config.py:3369
+#: ../src/config.py:3380 ../src/config.py:3388
 msgid "Character not allowed"
 msgstr "使えない文字です"
 
-#: ../src/config.py:3333 ../src/config.py:3599
+#: ../src/config.py:3360 ../src/config.py:3368 ../src/config.py:3380
+#: ../src/config.py:3641
 msgid "Invalid server"
 msgstr "サーバー名が正しくありません"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3387
 msgid "Invalid room"
 msgstr "談話室名が正しくありません"
 
-#: ../src/config.py:3515
+#: ../src/config.py:3557
 msgid "Account has been added successfully"
 msgstr "アカウントは無事に追加されました"
 
-#: ../src/config.py:3516 ../src/config.py:3522
+#: ../src/config.py:3558 ../src/config.py:3564
 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 "
@@ -6811,32 +6738,32 @@ msgstr ""
 "「拡張」ボタンで、詳細なオプションの設定ができます。また後で、メインウィンド"
 "ウの「編集」メニューの「アカウント」を選択して設定することができます。"
 
-#: ../src/config.py:3521
+#: ../src/config.py:3563
 msgid "Your new account has been created successfully"
 msgstr "新しいアカウントは無事に作られました"
 
-#: ../src/config.py:3560
+#: ../src/config.py:3602
 msgid "Invalid username"
 msgstr "ユーザー名が正しくありません"
 
-#: ../src/config.py:3562
+#: ../src/config.py:3604
 msgid "You must provide a username to configure this account."
 msgstr "このアカウントを編集するには、ユーザー名を指定しなければなりません。"
 
-#: ../src/config.py:3600
+#: ../src/config.py:3642
 msgid "Please provide a server on which you want to register."
 msgstr "登録したいサーバーを指定してください。"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1693
+#: ../src/config.py:3698 ../src/gui_interface.py:1179
 msgid "Certificate Already in File"
 msgstr "証明書はファイルにあります"
 
-#: ../src/config.py:3657 ../src/gui_interface.py:1694
+#: ../src/config.py:3699 ../src/gui_interface.py:1180
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "この証明書は既にファイル %s にあります。再び追加することはできません。"
 
-#: ../src/config.py:3734
+#: ../src/config.py:3788
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6851,7 +6778,7 @@ msgstr ""
 "SSL エラー: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: ../src/config.py:3740 ../src/gui_interface.py:1721
+#: ../src/config.py:3794 ../src/gui_interface.py:1208
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6862,73 +6789,77 @@ msgstr ""
 "この証明書の SHA1 指紋:\n"
 "%s"
 
-#: ../src/config.py:3772 ../src/config.py:3806
+#: ../src/config.py:3826 ../src/config.py:3860
 msgid "An error occurred during account creation"
 msgstr "アカウント作成時にエラーが起きました"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3925
 msgid "Account name is in use"
 msgstr "アカウント名は使われています"
 
-#: ../src/config.py:3872
+#: ../src/config.py:3926
 msgid "You already have an account using this name."
 msgstr "この名前のアカウントは既に存在しています。"
 
-#: ../src/config.py:3991
-#, fuzzy
+#: ../src/config.py:4056
 msgid "PEP node was not removed"
-msgstr "PEP node was not removed"
+msgstr "PEP ノードは削除されませんでした"
 
-#: ../src/config.py:3992
-#, fuzzy, python-format
+#: ../src/config.py:4057
+#, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr "PEP node %(node)s was not removed: %(message)s"
+msgstr "PEP ノード %(node)s は削除されませんでした: %(message)s"
+
+#: ../src/config.py:4085
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "%s を調整"
 
-#: ../src/config.py:4036
+#: ../src/config.py:4101 ../src/plugins/gui.py:73
 msgid "Active"
 msgstr "有効"
 
-#: ../src/config.py:4044
+#: ../src/config.py:4109
 msgid "Event"
 msgstr "イベント"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4144
 msgid "First Message Received"
 msgstr "最初のメッセージを受信した"
 
-#: ../src/config.py:4080
+#: ../src/config.py:4145
 msgid "Next Message Received Focused"
 msgstr "開いているチャットで、その次のメッセージを受信した"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4147
 msgid "Next Message Received Unfocused"
 msgstr "開いていないチャットで、その次のメッセージを受信した"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4148
 msgid "Contact Connected"
 msgstr "相手先が接続した"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4149
 msgid "Contact Disconnected"
 msgstr "相手先が切断した"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4150
 msgid "Message Sent"
 msgstr "メッセージを送信した"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4151
 msgid "Group Chat Message Highlight"
 msgstr "グループチャットのメッセージの強調"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4152
 msgid "Group Chat Message Received"
 msgstr "グループチャットのメッセージを受信した"
 
-#: ../src/config.py:4088
+#: ../src/config.py:4153
 msgid "GMail Email Received"
 msgstr "GMail メールを受信した"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:603
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6938,7 +6869,7 @@ msgstr ""
 "示すものです。もし長時間表示されたままなら、メッセージは\n"
 "失われたと考えられます。"
 
-#: ../src/conversation_textview.py:620
+#: ../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"
@@ -6946,239 +6877,236 @@ msgstr ""
 "この線より下の文は、このグループチャットを\n"
 "最後に読んだとき以降に発生したものです"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:742
 msgid "_Quote"
 msgstr "引用 (_Q)"
 
-#: ../src/conversation_textview.py:747
-#, fuzzy, python-format
+#: ../src/conversation_textview.py:749
+#, python-format
 msgid "_Actions for \"%s\""
-msgstr "%s に対する操作 (_A)"
+msgstr "\"%s\" に対する操作 (_A)"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:762
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia の項を読む"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:767
 msgid "Look it up in _Dictionary"
 msgstr "辞書を引く (_D)"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:784
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "辞書の URL に \"%s\" が含まれていません。また、WIKTIONARY でもありません"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:795
+#: ../src/conversation_textview.py:797
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web 検索の URL に \"%s\" が含まれていません"
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:800
 msgid "Web _Search for it"
 msgstr "Web で検索する (_S)"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:806
 msgid "Open as _Link"
 msgstr "リンクとして開く (_L)"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
-#, fuzzy, python-format
+#: ../src/conversation_textview.py:1310
+#, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "昨日"
-msgstr[1] "昨日"
+msgstr[1] "%(nb_days)i日前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1359 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "件名: %s\n"
 
-#: ../src/dataforms_widget.py:545
-#, fuzzy
+#: ../src/dataforms_widget.py:565
 msgid "Unable to load image"
-msgstr "メッセージを復号できません"
+msgstr "画像をロードできません"
 
-#: ../src/dataforms_widget.py:547
-#, fuzzy, python-format
+#: ../src/dataforms_widget.py:567
+#, python-format
 msgid "Media type not supported: %s"
-msgstr "「隠れています」はサポートされていません"
+msgstr "メディアタイプはサポートされていません: %s"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:582
 msgid "This field is required"
-msgstr ""
+msgstr "この欄は必須項目です"
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:627
 msgid "Jabber ID already in list"
 msgstr "Jabber ID は一覧にあります"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:628
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 "入力された Jabber ID は既に一覧に載っています。別の Jabber ID を選択してくだ"
 "さい。"
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
-#, fuzzy
+#: ../src/dataforms_widget.py:639
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
-#, fuzzy, python-format
+#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
+#, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "相手先名: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:197
 msgid "Group"
 msgstr "グループ"
 
-#: ../src/dialogs.py:202
-#, fuzzy
+#: ../src/dialogs.py:204
 msgid "In the group"
 msgstr "グループ内"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:295
 msgid "KeyID"
 msgstr "鍵 ID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:300
 msgid "Contact name"
 msgstr "名前"
 
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:475
 msgid "Set Mood"
 msgstr "気分の設定"
 
-#: ../src/dialogs.py:590
+#: ../src/dialogs.py:595
 #, python-format
 msgid "%s Status Message"
 msgstr "%s の状況メッセージ"
 
-#: ../src/dialogs.py:604
+#: ../src/dialogs.py:609
 msgid "Status Message"
 msgstr "状況メッセージ"
 
-#: ../src/dialogs.py:794
+#: ../src/dialogs.py:800
 msgid "Overwrite Status Message?"
 msgstr "状況メッセージを上書きしますか ?"
 
-#: ../src/dialogs.py:795
+#: ../src/dialogs.py:801
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "この名前は既に使われています。この状況メッセージを上書きしますか ?"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:809
 msgid "Save as Preset Status Message"
 msgstr "用意しておく状況メッセージとして保存"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:810
 msgid "Please type a name for this status message"
 msgstr "この状況メッセージの名前を入力してください"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:838
 msgid "AIM Address:"
 msgstr "AIM アドレス:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:839
 msgid "GG Number:"
 msgstr "GG 番号:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:840
 msgid "ICQ Number:"
 msgstr "ICQ 番号:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:841
 msgid "MSN Address:"
 msgstr "MSN アドレス:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:842
 msgid "Yahoo! Address:"
 msgstr "Yahoo! アドレス:"
 
-#: ../src/dialogs.py:873
+#: ../src/dialogs.py:879
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "アカウント %s に追加したい相手先の情報を入力してください"
 
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:882
 msgid "Please fill in the data of the contact you want to add"
 msgstr "追加したい相手先の情報を入力してください"
 
-#: ../src/dialogs.py:1045 ../src/dialogs.py:1051 ../src/dialogs.py:1056
-#: ../src/dialogs.py:3464
+#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
+#: ../src/dialogs.py:3615
 msgid "Invalid User ID"
 msgstr "ユーザー ID が正しくありません"
 
-#: ../src/dialogs.py:1052
+#: ../src/dialogs.py:1081
 msgid "The user ID must not contain a resource."
 msgstr "ユーザー ID にはリソースを含めません。"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1086
 msgid "You cannot add yourself to your roster."
 msgstr "あなた自身を名簿に追加することはできません。"
 
-#: ../src/dialogs.py:1071
+#: ../src/dialogs.py:1100
 msgid "Contact already in roster"
 msgstr "相手先は既に名簿にあります"
 
-#: ../src/dialogs.py:1072
+#: ../src/dialogs.py:1101
 msgid "This contact is already listed in your roster."
 msgstr "この相手先は既に名簿に登録されています。"
 
-#: ../src/dialogs.py:1118
+#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
 msgid "User ID:"
 msgstr "ユーザー ID:"
 
-#: ../src/dialogs.py:1189
-msgid "A GTK+ jabber client"
-msgstr "A GTK+ jabber client"
+#: ../src/dialogs.py:1273
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "GTK+ Jabber/XMPP クライアント"
 
-#: ../src/dialogs.py:1190
+#: ../src/dialogs.py:1274
 msgid "GTK+ Version:"
 msgstr "GTK+ バージョン:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1275
 msgid "PyGTK Version:"
-msgstr "PyGTK+ バージョン:"
+msgstr "PyGTK バージョン:"
 
-#: ../src/dialogs.py:1201
+#: ../src/dialogs.py:1285
 msgid "Current Developers:"
 msgstr "現在の開発者:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1287
 msgid "Past Developers:"
 msgstr "過去の開発者:"
 
-#: ../src/dialogs.py:1209
+#: ../src/dialogs.py:1293
 msgid "THANKS:"
 msgstr "謝意:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1215
+#: ../src/dialogs.py:1299
 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:1227
+#: ../src/dialogs.py:1311
 msgid "translator-credits"
 msgstr "Mako (mako AT pasero.net)"
 
-#: ../src/dialogs.py:1410
+#: ../src/dialogs.py:1494
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7191,461 +7119,428 @@ msgstr ""
 "\n"
 "スペル間違いの強調表示は使われません"
 
-#: ../src/dialogs.py:1951 ../src/dialogs.py:2338
+#: ../src/dialogs.py:1872
+msgid "_Resume"
+msgstr "残す (_R)"
+
+#: ../src/dialogs.py:1880
+msgid "Re_place"
+msgstr "置換する (_p)"
+
+#: ../src/dialogs.py:2071 ../src/dialogs.py:2470
 msgid "The nickname has not allowed characters."
 msgstr "ニックネームに使用できない文字が含まれています。"
 
-#: ../src/dialogs.py:2069
+#: ../src/dialogs.py:2189
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "アカウント %(account)s に対して、%(jid)s さんからの在席通知の申し込み"
 
-#: ../src/dialogs.py:2072
+#: ../src/dialogs.py:2192
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s さんから在席通知の申し込み"
 
-#: ../src/dialogs.py:2147 ../src/gui_interface.py:2470
+#: ../src/dialogs.py:2276 ../src/gui_interface.py:1930
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "既にグループチャット %s に参加しています。"
 
-#: ../src/dialogs.py:2153
+#: ../src/dialogs.py:2282
 msgid "You can not join a group chat unless you are connected."
 msgstr "接続しないと、グループチャットに参加できません。"
 
-#: ../src/dialogs.py:2194
+#: ../src/dialogs.py:2326
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "アカウント %s でグループチャットに参加"
 
-#: ../src/dialogs.py:2325
+#: ../src/dialogs.py:2457
 msgid "Invalid Account"
 msgstr "アカウントが正しくありません"
 
-#: ../src/dialogs.py:2326
+#: ../src/dialogs.py:2458
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "グループチャット参加に使用するアカウントを選択してください。"
 
-#: ../src/dialogs.py:2337
+#: ../src/dialogs.py:2469
 msgid "Invalid Nickname"
 msgstr "ニックネームが正しくありません"
 
-#: ../src/dialogs.py:2342 ../src/dialogs.py:2348
-#: ../src/groupchat_control.py:1847
+#: ../src/dialogs.py:2474 ../src/dialogs.py:2480
+#: ../src/groupchat_control.py:2079
 msgid "Invalid group chat Jabber ID"
 msgstr "グループチャットの JID が正しくありません"
 
-#: ../src/dialogs.py:2343
-#, fuzzy
+#: ../src/dialogs.py:2475
 msgid "Please enter the group chat Jabber ID as room@server."
-msgstr "グループチャットの JID に使えない文字が含まれています。"
+msgstr "グループチャットの JID を、room@server のように、入力してください。"
 
-#: ../src/dialogs.py:2349 ../src/groupchat_control.py:1848
+#: ../src/dialogs.py:2481 ../src/groupchat_control.py:2080
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "グループチャットの JID に使えない文字が含まれています。"
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2485 ../src/gui_interface.py:1912
 msgid "This is not a group chat"
 msgstr "グループチャットではありません"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2486 ../src/gui_interface.py:1913
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s はグループチャット名ではありません。"
 
-#: ../src/dialogs.py:2388
-#, fuzzy
+#: ../src/dialogs.py:2518
 msgid "Without a connection, you can not synchronise your contacts."
-msgstr "Without a connection, you can not synchronise your contacts."
+msgstr "接続していないと、相手先を合わせることはできません。"
 
-#: ../src/dialogs.py:2402
+#: ../src/dialogs.py:2531
 msgid "Server"
 msgstr "サーバー"
 
-#: ../src/dialogs.py:2437
+#: ../src/dialogs.py:2567
 msgid "This account is not connected to the server"
 msgstr "このアカウントはサーバに接続していません"
 
-#: ../src/dialogs.py:2438
-#, fuzzy
+#: ../src/dialogs.py:2568
 msgid "You cannot synchronize with an account unless it is connected."
-msgstr "You cannot synchronise with an account unless it is connected."
+msgstr "接続していないと、相手先に合わせることはできません。"
 
-#: ../src/dialogs.py:2462
-#, fuzzy
+#: ../src/dialogs.py:2593
 msgid "Synchronise"
-msgstr "Synchronise"
+msgstr "同調"
 
-#: ../src/dialogs.py:2523
+#: ../src/dialogs.py:2654
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "アカウント %s でチャットを開始する"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2656
 msgid "Start Chat"
 msgstr "チャットを開始する"
 
-#: ../src/dialogs.py:2526
+#: ../src/dialogs.py:2657
 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 を入力してください:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2552 ../src/dialogs.py:2933 ../src/dialogs.py:3145
+#: ../src/dialogs.py:2684 ../src/dialogs.py:3065 ../src/dialogs.py:3295
 msgid "Connection not available"
 msgstr "接続していません"
 
-#: ../src/dialogs.py:2553 ../src/dialogs.py:2934 ../src/dialogs.py:3146
-#, fuzzy, python-format
+#: ../src/dialogs.py:2685 ../src/dialogs.py:3066 ../src/dialogs.py:3296
+#, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "\"%s\" に接続していることを確認してください。"
 
-#: ../src/dialogs.py:2562 ../src/dialogs.py:2565
+#: ../src/dialogs.py:2694 ../src/dialogs.py:2697
 msgid "Invalid JID"
 msgstr "JID が正しくありません"
 
-#: ../src/dialogs.py:2565
-#, fuzzy, python-format
+#: ../src/dialogs.py:2697
+#, python-format
 msgid "Unable to parse \"%s\"."
-msgstr "\"%s\" さんを追加できません"
+msgstr "\"%s\" を解析できません。"
 
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2706
 msgid "Without a connection, you can not change your password."
 msgstr "接続しないと、パスワードは変更できません。"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2725
 msgid "Invalid password"
 msgstr "パスワードが正しくありません。"
 
-#: ../src/dialogs.py:2593
+#: ../src/dialogs.py:2725
 msgid "You must enter a password."
 msgstr "パスワードを入力してください。"
 
-#: ../src/dialogs.py:2597
+#: ../src/dialogs.py:2729
 msgid "Passwords do not match"
 msgstr "パスワードが一致しません"
 
-#: ../src/dialogs.py:2598
+#: ../src/dialogs.py:2730
 msgid "The passwords typed in both fields must be identical."
 msgstr "ふたつの欄のパスワードは同一でなければなりません。"
 
-#. default value
-#: ../src/dialogs.py:2635 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "相手先がサインインしました"
-
-#: ../src/dialogs.py:2637 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "相手先がサインアウトしました"
-
-#. chat message
-#: ../src/dialogs.py:2639 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "新着メッセージ"
-
-#. single message
-#: ../src/dialogs.py:2639 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "新着の単発メッセージ"
-
-#. private message
-#: ../src/dialogs.py:2640 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "新着の私信"
-
-#: ../src/dialogs.py:2640 ../src/gui_interface.py:1158 ../src/notify.py:487
+#: ../src/dialogs.py:2772 ../src/gui_interface.py:818 ../src/notify.py:270
 msgid "New E-mail"
 msgstr "新着メール"
 
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1217 ../src/notify.py:480
+#: ../src/dialogs.py:2774 ../src/gui_interface.py:873 ../src/notify.py:263
 msgid "File Transfer Request"
 msgstr "ファイル転送の要求"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1120
-#: ../src/gui_interface.py:1186 ../src/notify.py:482
+#: ../src/dialogs.py:2776 ../src/gui_interface.py:780
+#: ../src/gui_interface.py:844 ../src/notify.py:265
 msgid "File Transfer Error"
 msgstr "ファイル転送のエラー"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1263
-#: ../src/gui_interface.py:1286 ../src/gui_interface.py:1303
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2778 ../src/gui_interface.py:919
+#: ../src/gui_interface.py:942 ../src/gui_interface.py:959
+#: ../src/notify.py:267
 msgid "File Transfer Completed"
 msgstr "ファイルの転送の完了"
 
-#: ../src/dialogs.py:2647 ../src/gui_interface.py:1266 ../src/notify.py:485
+#: ../src/dialogs.py:2779 ../src/gui_interface.py:922 ../src/notify.py:268
 msgid "File Transfer Stopped"
 msgstr "ファイルの転送の中断"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:971 ../src/notify.py:489
+#: ../src/dialogs.py:2781 ../src/gui_interface.py:614 ../src/notify.py:272
 msgid "Groupchat Invitation"
 msgstr "グループチャットへの招待"
 
-#: ../src/dialogs.py:2651 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "相手先が在席状況を変更"
-
-#: ../src/dialogs.py:2852
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "Single Message using account %s"
 msgstr "account %s で単発メッセージ"
 
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:2986
 #, python-format
 msgid "Single Message in account %s"
 msgstr "アカウント %s での単発メッセージ"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:2988
 msgid "Single Message"
 msgstr "単発メッセージ"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2859
+#: ../src/dialogs.py:2991
 #, python-format
 msgid "Send %s"
 msgstr "%s を送信する"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2882
+#: ../src/dialogs.py:3014
 #, python-format
 msgid "Received %s"
 msgstr "%s を受信"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2905
-#, fuzzy, python-format
+#: ../src/dialogs.py:3037
+#, python-format
 msgid "Form %s"
-msgstr "差出人"
+msgstr "フォーム %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2984
+#: ../src/dialogs.py:3116
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3117
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:3044
+#: ../src/dialogs.py:3176
 #, python-format
 msgid "XML Console for %s"
 msgstr "%s の XML コンソール"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3178
 msgid "XML Console"
 msgstr "XML コンソール"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3175
-#, fuzzy
+#: ../src/dialogs.py:3325
 msgid "add"
-msgstr "悲"
+msgstr "追加"
 
-#: ../src/dialogs.py:3175
-#, fuzzy
+#: ../src/dialogs.py:3325
 msgid "modify"
-msgstr "変更する"
+msgstr "変更"
 
-#: ../src/dialogs.py:3176
-#, fuzzy
+#: ../src/dialogs.py:3326
 msgid "remove"
-msgstr "削除 (_v)"
+msgstr "削除"
 
-#: ../src/dialogs.py:3204
-#, fuzzy, python-format
+#: ../src/dialogs.py:3355
+#, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
 "roster."
-msgstr "私はあなたを私の連絡先リストに追加しようと思います。"
+msgstr ""
+"<b>%(jid)s</b> さんは、あなたの名簿にあるいくつかの相手先に <b>%(action)s</"
+"b> を行うよう、求めています。"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3220 ../src/dialogs.py:3266
+#: ../src/dialogs.py:3371 ../src/dialogs.py:3417
 msgid "Add"
-msgstr "追加する"
+msgstr "追加"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3297
+#: ../src/dialogs.py:3373 ../src/dialogs.py:3448
 msgid "Modify"
-msgstr "変更する"
+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:3228
+#: ../src/dialogs.py:3379
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3234
+#: ../src/dialogs.py:3385
 msgid "Groups"
 msgstr "グループ"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3342
-#, fuzzy, python-format
+#: ../src/dialogs.py:3493
+#, python-format
 msgid "%s suggested me to add you in my roster."
-msgstr "彼を追加しますか？"
+msgstr "あなたを名簿に追加するよう、%s さんは私に勧めました。"
 
-#: ../src/dialogs.py:3356
-#, fuzzy, python-format
+#: ../src/dialogs.py:3507
+#, python-format
 msgid "Added  %s contacts"
-msgstr "相手先リストに追加 (_A)"
+msgstr "%s の相手先を追加しました"
 
-#: ../src/dialogs.py:3393
-#, fuzzy, python-format
+#: ../src/dialogs.py:3544
+#, python-format
 msgid "Removed  %s contacts"
-msgstr "相手先を名簿から削除します"
+msgstr "%s の相手先を削除しました"
 
-#: ../src/dialogs.py:3433 ../src/dialogs.py:3610
+#: ../src/dialogs.py:3584 ../src/dialogs.py:3761
 #, python-format
 msgid "Archiving Preferences for %s"
-msgstr ""
+msgstr "%s の書庫の設定"
 
-#: ../src/dialogs.py:3473
-#, fuzzy
+#: ../src/dialogs.py:3624
 msgid "Invalid expire value"
-msgstr "サーバー名が正しくありません"
+msgstr "期限の値が正しくありません"
 
-#: ../src/dialogs.py:3474
+#: ../src/dialogs.py:3625
 msgid "Expire must be a valid positive integer."
-msgstr ""
+msgstr "期限は正の整数でなければなりません。"
 
-#: ../src/dialogs.py:3521
+#: ../src/dialogs.py:3672
 msgid "There is an error with the form"
-msgstr ""
+msgstr "書式に誤りがあります"
 
-#: ../src/dialogs.py:3732
-#, fuzzy
+#: ../src/dialogs.py:3892
 msgid "There is an error"
-msgstr "エラーを返してきました。"
+msgstr "誤りがあります"
 
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:3960
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "プライバシーリスト <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3800
+#: ../src/dialogs.py:3964
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s のプライバシーリスト"
 
-#: ../src/dialogs.py:3856
+#: ../src/dialogs.py:4031
 #, 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:3861
+#: ../src/dialogs.py:4036
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "順位: %(order)s, 操作: %(action)s"
 
-#: ../src/dialogs.py:3905
+#: ../src/dialogs.py:4087
 msgid "<b>Edit a rule</b>"
 msgstr "<b>規則の編集</b>"
 
-#: ../src/dialogs.py:4016
+#: ../src/dialogs.py:4198
 msgid "<b>Add a rule</b>"
 msgstr "<b>規則の追加</b>"
 
-#: ../src/dialogs.py:4116
+#: ../src/dialogs.py:4297
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s のプライバシーリスト"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4299
 msgid "Privacy Lists"
 msgstr "プライバシーリスト"
 
-#: ../src/dialogs.py:4188
+#: ../src/dialogs.py:4388
 msgid "Invalid List Name"
 msgstr "リスト名が正しくありません"
 
-#: ../src/dialogs.py:4189
+#: ../src/dialogs.py:4389
 msgid "You must enter a name to create a privacy list."
 msgstr "プライバシーリストを作成するには、名前を入力しなければなりません。"
 
-#: ../src/dialogs.py:4221
+#: ../src/dialogs.py:4421
 msgid "You are invited to a groupchat"
 msgstr "グループチャットへの招待を受けました"
 
-#: ../src/dialogs.py:4224
-#, fuzzy
+#: ../src/dialogs.py:4424
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact さんがあなたを議論に参加するよう招待しています"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4426
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact さんがあなたをグループチャット %(room_jid)s へ招待しています"
 
-#: ../src/dialogs.py:4234
+#: ../src/dialogs.py:4434
 #, python-format
 msgid "Comment: %s"
 msgstr "コメント: %s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4436
 msgid "Do you want to accept the invitation?"
 msgstr "招待に応じますか ?"
 
-#: ../src/dialogs.py:4298
+#: ../src/dialogs.py:4498
 msgid "Choose Client Cert #PCKS12"
-msgstr ""
+msgstr "#PCKS12 形式のクライアント証明書の選択"
 
-#: ../src/dialogs.py:4308 ../src/dialogs.py:4351 ../src/dialogs.py:4407
-#: ../src/dialogs.py:4495
+#: ../src/dialogs.py:4508 ../src/dialogs.py:4550 ../src/dialogs.py:4606
+#: ../src/dialogs.py:4694
 msgid "All files"
 msgstr "すべてのファイル"
 
-#: ../src/dialogs.py:4313
+#: ../src/dialogs.py:4513
 msgid "PKCS12 Files"
-msgstr ""
+msgstr "PKCS12 形式のファイル"
 
-#: ../src/dialogs.py:4341
+#: ../src/dialogs.py:4540
 msgid "Choose Sound"
 msgstr "サウンドの選択"
 
-#: ../src/dialogs.py:4356
+#: ../src/dialogs.py:4555
 msgid "Wav Sounds"
 msgstr "WAV サウンド"
 
-#: ../src/dialogs.py:4394
+#: ../src/dialogs.py:4593
 msgid "Choose Image"
 msgstr "画像の選択"
 
-#: ../src/dialogs.py:4412
+#: ../src/dialogs.py:4611
 msgid "Images"
 msgstr "画像"
 
-#: ../src/dialogs.py:4482
-#, fuzzy
+#: ../src/dialogs.py:4681
 msgid "Choose Archive"
-msgstr "画像の選択"
+msgstr "書庫の選択"
 
-#: ../src/dialogs.py:4500
-#, fuzzy
+#: ../src/dialogs.py:4699
 msgid "Zip files"
-msgstr "すべてのファイル"
+msgstr "Zip ファイル"
 
-#: ../src/dialogs.py:4525
+#: ../src/dialogs.py:4725
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s が次のようになったとき:"
 
-#: ../src/dialogs.py:4527
-#, fuzzy, python-format
+#: ../src/dialogs.py:4727
+#, python-format
 msgid "Adding Special Notification for %s"
 msgstr "%s の特別通知の追加"
 
-#: ../src/dialogs.py:4602
-msgid "Condition"
-msgstr "状態"
-
-#: ../src/dialogs.py:4722
-msgid "when I am "
-msgstr ""
-
-#: ../src/dialogs.py:5198
+#: ../src/dialogs.py:4947
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7656,19 +7551,19 @@ msgstr ""
 "\n"
 "このチャットの認証文字列 (SAS)は <b>%(sas)s</b> です。"
 
-#: ../src/dialogs.py:5201
+#: ../src/dialogs.py:4950
 msgid "You have already verified this contact's identity."
 msgstr "相手先の同一性を既に確認しています。"
 
-#: ../src/dialogs.py:5207 ../src/dialogs.py:5291
+#: ../src/dialogs.py:4956 ../src/dialogs.py:5040
 msgid "Contact's identity verified"
 msgstr "相手先の同一性を確認しました"
 
-#: ../src/dialogs.py:5213
+#: ../src/dialogs.py:4962
 msgid "Verify again..."
 msgstr "再検証中..."
 
-#: ../src/dialogs.py:5218
+#: ../src/dialogs.py:4967
 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 "
@@ -7678,19 +7573,19 @@ msgstr ""
 "を送ることができることを確実にするため、その人が本人であることを検証する必要"
 "があります。次のボタンをクリックしてください。"
 
-#: ../src/dialogs.py:5221 ../src/dialogs.py:5272 ../src/dialogs.py:5285
+#: ../src/dialogs.py:4970 ../src/dialogs.py:5021 ../src/dialogs.py:5034
 msgid "Contact's identity NOT verified"
 msgstr "相手先の同一性を確認していません"
 
-#: ../src/dialogs.py:5226
+#: ../src/dialogs.py:4975
 msgid "Verify..."
 msgstr "検証中..."
 
-#: ../src/dialogs.py:5237
+#: ../src/dialogs.py:4986
 msgid "Have you verified the contact's identity?"
 msgstr "相手先の同一性を確認しましたか ?"
 
-#: ../src/dialogs.py:5238
+#: ../src/dialogs.py:4987
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7704,23 +7599,23 @@ msgstr ""
 "\n"
 "この接続の認証文字列は <b>%(sas)s</b> です。"
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:4988
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "遠くの相手先と話して、認証文字列(SAS)を確認しましたか ?"
 
-#: ../src/dialogs.py:5273
+#: ../src/dialogs.py:5022
 #, 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:5279
+#: ../src/dialogs.py:5028
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "この相手先に対して GPG 鍵は割り当てられていません。そのため、メッセージは暗号"
 "化されません。 "
 
-#: ../src/dialogs.py:5286
+#: ../src/dialogs.py:5035
 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."
@@ -7729,7 +7624,7 @@ msgstr ""
 "いません</b>。メッセージは暗号化<b>されません</b>。鍵に信頼を与えるには GPG "
 "クライアントを使ってください。"
 
-#: ../src/dialogs.py:5292
+#: ../src/dialogs.py:5041
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7737,24 +7632,74 @@ msgstr ""
 "この相手先に対して GPG 鍵が割り当てられています。その鍵を信頼して、メッセージ"
 "は暗号化されます。"
 
-#: ../src/dialogs.py:5357
+#: ../src/dialogs.py:5106
 msgid "an audio and video"
-msgstr ""
+msgstr "音声とビデオ"
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5108
 msgid "an audio"
-msgstr ""
+msgstr "音声"
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5110
 msgid "a video"
-msgstr ""
+msgstr "ビデオ"
 
-#: ../src/dialogs.py:5365
+#: ../src/dialogs.py:5114
 #, 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
+#, python-format
+msgid "Certificate for account %s"
+msgstr "アカウント %s の証明書"
+
+#: ../src/dialogs.py:5182
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n"
+"\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n"
+"\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n"
+"\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+"<b>発行先:</b>\n"
+"共通名 (CN): %(scn)s\n"
+"組織 (O): %(sorg)s\n"
+"部門 (OU): %(sou)s\n"
+"シリアル番号: %(sn)s\n"
+"\n"
+"<b>発行者:</b>\n"
+"共通名 (CN): %(icn)s\n"
+"組織 (O): %(iorg)s\n"
+"部門 (OU): %(iou)s\n"
+"\n"
+"<b>妥当性:</b>\n"
+"発行日: %(io)s\n"
+"有効期限: %(eo)s\n"
+"\n"
+"<b>指紋</b>\n"
+"SHA1 指紋: %(sha1)s"
+
+#: ../src/dialogs.py:5216 ../src/dialogs.py:5233
+msgid "View cert..."
+msgstr "証明書を表示..."
 
 #: ../src/disco.py:119
 msgid "Others"
@@ -7765,24 +7710,24 @@ msgstr "その他"
 msgid "Conference"
 msgstr "会議室(グループチャット)"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:516
 msgid "Without a connection, you can not browse available services"
 msgstr "接続しないと、サービスを見ることはできません"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:602
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "アカウント %s でサービス探索"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:604
 msgid "Service Discovery"
 msgstr "サービス探索"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:760
 msgid "The service could not be found"
 msgstr "サービスが見つかりません"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:761
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -7790,36 +7735,36 @@ msgstr ""
 "あなたが入力したアドレスにサービスが見つからないか、または応答がありません。"
 "アドレスを確認し、もういちどお試しください。"
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:765 ../src/disco.py:1102
 msgid "The service is not browsable"
 msgstr "このサービスを見ることはできません"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:766
 msgid "This type of service does not contain any items to browse."
 msgstr "This type of service does not contain any items to browse."
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:806 ../src/disco.py:816
 msgid "Invalid Server Name"
 msgstr "サーバー名が正しくありません"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:870
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "アカウント %(account)s で %(address)s を眺める"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:914
 msgid "_Browse"
 msgstr "一覧 (_B)"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1103
 msgid "This service does not contain any items to browse."
 msgstr "このサービスには表示すべき項目がありません。"
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1343
 msgid "_Execute Command"
 msgstr "コマンド実行 (_E)"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1353 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "登録 (_g)"
 
@@ -7843,182 +7788,186 @@ msgstr "説明"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2995
+#: ../src/disco.py:1835 ../src/gui_interface.py:2448
 msgid "Bookmark already set"
 msgstr "既にブックマーク"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2996
+#: ../src/disco.py:1836 ../src/gui_interface.py:2449
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "グループチャット \"%s\" は既にブックマークにあります。"
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:3010
+#: ../src/disco.py:1845 ../src/gui_interface.py:2463
 msgid "Bookmark has been added successfully"
 msgstr "ブックマークが追加されました"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:3011
+#: ../src/disco.py:1846 ../src/gui_interface.py:2464
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "ブックマークは、名簿の「アクション」メニューから管理できます。"
 
-#: ../src/disco.py:2057
-#, fuzzy
+#: ../src/disco.py:2055
 msgid "Subscribed"
 msgstr "継読中"
 
-#: ../src/disco.py:2065
-#, fuzzy
+#: ../src/disco.py:2063
 msgid "Node"
 msgstr "ノード"
 
 # (Mako)pubsubのところ
-#: ../src/disco.py:2129
+#: ../src/disco.py:2127
 msgid "New post"
 msgstr "新しい投稿"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2133
 msgid "_Subscribe"
 msgstr "継読 (_S)"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2139
 msgid "_Unsubscribe"
 msgstr "継読の取り消し (_U)"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#: ../src/features_window.py:50
+msgid "SSL certificate validation"
 msgstr "SSL 証明書の検証"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 "安全な接続を確実にするために、サーバー証明書の検証に使われるライブラリ。"
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:52 ../src/features_window.py:53
 msgid "Requires python-pyopenssl."
 msgstr "python-pyopenssl が必要です。"
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 "ローカルなネットワークで自動検出されたクライアントとサーバーなしのチャットで"
 "きます。"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "python-avahi が必要です。"
 
-#: ../src/features_window.py:56
+#: ../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:57
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "コマンド行"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "コマンド行から Gajim を制御するスクリプトです。"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "python-dbus が必要です。"
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../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
 msgid "Feature not available under Windows."
 msgstr "Windows ではこの機能は無効です。"
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 msgid "OpenGPG message encryption"
 msgstr "OpenGPG メッセージ暗号化"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 msgid "Encrypting chat messages with gpg keys."
 msgstr "チャットメッセージを gpg 鍵で暗号化します。"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "gpg とpython-GnuPGInterface が必要です。"
+#: ../src/features_window.py:64
+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
+msgid "Requires gpg.exe in PATH."
+msgstr "gpg.exe が PATH に必要です。"
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "ネットワークマネージャ"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "ネットワークの状態を自動検出します。"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "gnome-network-manager と python-dbus が必要です。"
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "セッション管理"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim のセッションを、ログアウト時に保存し、ログイン時に復活させます。"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "python-gnome2 が必要です。"
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "パスワード暗号化"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "パスワードを平文ではないようにして、安全に保存できます。"
 
-#: ../src/features_window.py:75
+#: ../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:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "SRV レコードを使うサーバーとの接続を可能にします。"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "dnsutils が必要です。"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "SRV レコードを使うために nslookup が必要です。"
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "スペルチェッカ"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "入力するメッセージのスペルチェックをします。"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "libgtkspell が必要です。"
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "通知"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "イベントをポップアップ通知に渡します。"
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
@@ -8026,65 +7975,64 @@ msgstr ""
 "python-notify , または notification-daemon と組み合わせた python-dbus が必要"
 "です。"
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "在席状況の自動変更"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "在席状況を自動的に変更するため、操作のない時間を計測します。"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "libxss ライブラリが必要です。"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "python2.5 が必要です。"
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "$$ $$ で囲まれた LaTeX 表現を変換します。"
 
-#: ../src/features_window.py:95
-#, fuzzy
+#: ../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 が必要です。詳細設定エディタ 'use_latex' を"
-"「真」に設定しなければなりません。"
+"texlive-latex-base (それに dvipng と ImageMagick) が必要です。詳細設定エディ"
+"タ 'use_latex' を「真」に設定しなければなりません。"
 
-#: ../src/features_window.py:96
-#, fuzzy
+#: ../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 が必要です(どちらも MikTeX に含まれています)。 "
-"詳細設定エディタ 'use_latex' を「真」に設定しなければなりません。"
+"texlive-latex-base (それに dvipng と ImageMagick) が必要です (どちらも "
+"MikTeX に含まれています)。 詳細設定エディタ 'use_latex' を「真」に設定しなけ"
+"ればなりません。"
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "全線暗号化"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 msgid "Encrypting chat messages."
 msgstr "チャットのメッセージを終端間で暗号化します(E2EE)。"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "python-crypto が必要です。"
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST 生成器"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -8092,28 +8040,49 @@ msgstr ""
 "RST コードから XHTML 出力を生成します (http://docutils.sourceforge.net/docs/"
 "ref/rst/restructuredtext.html を参照してください)。"
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "python-docutils が必要です。"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Ability to start audio and video chat."
-msgstr ""
+msgstr "音声・ビデオチャットの可能性。"
 
-#: ../src/features_window.py:107
+#: ../src/features_window.py:108
+msgid "Requires python-farsight and gstreamer-plugins-bad."
+msgstr "python-farsight と gstreamer-plugins-bad が必要です。"
+
+#: ../src/features_window.py:110
+msgid "UPnP-IGD"
+msgstr "UPnP-IGD"
+
+#: ../src/features_window.py:111
 #, fuzzy
-msgid "Requires python-farsight."
-msgstr "python-avahi が必要です。"
+msgid "Ability to request your router to forward port for file transfer."
+msgstr "ファイル転送のフォワードポートのためのルーターの要求の可能性。"
+
+#: ../src/features_window.py:112
+msgid "Requires python-gupnp-igd."
+msgstr "python-gupnp-igd が必要です。"
+
+#: ../src/features_window.py:114
+msgid "UPower"
+msgstr ""
 
-# (Mako)features_window.py (機能設定画面のラベル) では
-#       「有効/無効」などとしたほうががいい。
-#       在席状況では「在席しています」
 #: ../src/features_window.py:115
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:116
 #, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "python-dbus が必要です。"
+
+#: ../src/features_window.py:124
 msgid "?features:Available"
-msgstr "在席しています"
+msgstr "有効"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:131
 msgid "Feature"
 msgstr "機能"
 
@@ -8134,7 +8103,7 @@ msgstr "進捗"
 msgid "Filename: %s"
 msgstr "ファイル名: %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:333
 #, python-format
 msgid "Size: %s"
 msgstr "サイズ: %s"
@@ -8142,7 +8111,7 @@ 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:522
+#: ../src/history_manager.py:541
 msgid "You"
 msgstr "あなた"
 
@@ -8151,7 +8120,7 @@ msgstr "あなた"
 msgid "Sender: %s"
 msgstr "送信者: %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:627
 #: ../src/tooltips.py:742
 msgid "Recipient: "
 msgstr "受取人: "
@@ -8170,12 +8139,12 @@ msgid "File transfer cancelled"
 msgstr "ファイルの転送が中止されました"
 
 #: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-#, fuzzy
 msgid "Connection with peer cannot be established."
-msgstr "Connection with peer cannot be established."
+msgstr "ピア接続は確立できませんでした。"
 
+# (Mako) とりあえず「受取人」で
 #: ../src/filetransfers_window.py:235
-#, fuzzy, python-format
+#, python-format
 msgid "Recipient: %s"
 msgstr "受取人: %s"
 
@@ -8188,80 +8157,80 @@ msgstr "エラーメッセージ: %s"
 msgid "File transfer stopped"
 msgstr "ファイルの転送が中断しました"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:266
 msgid "Choose File to Send..."
 msgstr "転送するファイルを選択..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:282 ../src/tooltips.py:780
 msgid "Description: "
 msgstr "説明: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:295
 msgid "Gajim cannot access this file"
 msgstr "このファイルにアクセスできません"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:296
 msgid "This file is being used by another process."
 msgstr "このファイルは別のプログラムが使用中です。"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "File: %s"
 msgstr "ファイル: %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "Type: %s"
 msgstr "種類: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:338
 #, python-format
 msgid "Description: %s"
 msgstr "説明: %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:339
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s さんがファイルを転送したがっています:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:850
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "既存のファイル \"%s\" に上書きできない"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:907
+#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:851
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "この名前のファイルは既に存在し、かつ上書きの権限がありません。"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
 msgid "This file already exists"
 msgstr "そのファイルは既に存在しています"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:911
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
 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:369 ../src/gtkgui_helpers.py:918
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:862
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "ディレクトリ \"%s\" に書き込む権限がありません"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:919
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:863
 msgid "You do not have permission to create files in this directory."
 msgstr "このディレクトリにファイルを作成する権限がありません。"
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:389
 msgid "Save File as..."
 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:449
+#: ../src/filetransfers_window.py:459
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -8269,69 +8238,65 @@ 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:542
+#: ../src/filetransfers_window.py:552
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/秒)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:595 ../src/filetransfers_window.py:598
 msgid "Invalid File"
 msgstr "ファイルが正しくありません"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:595
 msgid "File: "
 msgstr "ファイル: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:599
 msgid "It is not possible to send empty files"
 msgstr "空のファイルを転送することはできません"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:623 ../src/tooltips.py:732
 msgid "Name: "
 msgstr "名前: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:625 ../src/tooltips.py:736
 msgid "Sender: "
 msgstr "送信者: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:787
 msgid "Pause"
 msgstr "一時停止"
 
-#: ../src/gajim.py:142
+#: ../src/gajim.py:191
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim には X server が必要です。終了します..."
 
-#: ../src/gajim.py:144
+#: ../src/gajim.py:193
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "PyGTK のインポートに失敗しました: %s"
 
-#: ../src/gajim.py:186
-#, fuzzy
+#: ../src/gajim.py:235
 msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "Gajim には PyGTK 2.12 以上が必要です"
+msgstr "Gajim には PyGTK 2.16 以上が必要です"
 
-#: ../src/gajim.py:187
-#, fuzzy
+#: ../src/gajim.py:236
 msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "Gajim には PyGTK 2.12 またはそれ以上が必要です。終了します..."
+msgstr "Gajim には PyGTK 2.16 またはそれ以上が必要です。終了します..."
 
-#: ../src/gajim.py:189
-#, fuzzy
+#: ../src/gajim.py:238
 msgid "Gajim needs GTK 2.16 or above"
-msgstr "Gajim には GTK 2.12 以上が必要です"
+msgstr "Gajim には GTK 2.16 以上が必要です"
 
-#: ../src/gajim.py:190
-#, fuzzy
+#: ../src/gajim.py:239
 msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "Gajim には GTK 2.12 またはそれ以上が必要です。終了します..."
+msgstr "Gajim には GTK 2.16 またはそれ以上が必要です。終了します..."
 
-#: ../src/gajim.py:199
+#: ../src/gajim.py:248
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim には pywin32 が必要です"
 
-#: ../src/gajim.py:200
+#: ../src/gajim.py:249
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8341,51 +8306,44 @@ msgstr ""
 "きます"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:316
+#: ../src/gajim.py:365
 msgid "Gajim is already running"
 msgstr "Gajim は既に起動しています"
 
-#: ../src/gajim.py:317
+#: ../src/gajim.py:366
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
 msgstr "別の Gajim が既に起動しているようですそれでも起動しますか ?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "指定のコマンドに対するヘルプを表示します"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "コマンド"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "コマンドのヘルプを表示します"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "名簿ウィンドウの表示/非表示"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "次の保留イベントをポップアップウィンドウに表示します"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:93
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
 msgstr ""
 "名簿にある相手先をすべて表示します。それぞれの相手先は空行で区切られます"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../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
@@ -8397,35 +8355,38 @@ msgstr ""
 msgid "account"
 msgstr "アカウント"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "指定されたアカウントの相手先のみ表示します"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "登録アカウントの一覧の表示します"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "アカウントの在席状況の変更します"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "在席状況"
 
-#: ../src/gajim-remote-plugin.py:106
-#, fuzzy
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#: ../src/gajim-remote.py:109
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"account's previous status"
 msgstr ""
-"次のいずれか: offline (オフライン)、online (オンライン)、chat (チャット可)、"
-"away (離席中)、xa (不在)、dnd (邪魔しないで)、invisible (隠れ中)"
+"次のいずれか: offline (オフライン)、online (オンライン)、chat (チャット"
+"可)、\n"
+"away (離席中)、xa (不在)、dnd (邪魔しないで)、invisible (隠れ中)。\n"
+"設定されなければ、アカウントの以前の状況が使われます"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "状況メッセージ"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:111
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8434,20 +8395,45 @@ msgstr ""
 "合、\"sync with global status\" オプションが設定されているアカウントすべての"
 "在席状況を変更します。"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "アカウントの優先順位を変更します"
+
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "優先順位"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "アカウントに設定したい優先順位"
+
+#: ../src/gajim-remote.py:121
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"アカウントの優先順位を変更します。アカウントが指定されない場合、\"sync with "
+"global status\" オプションの設定されたアカウントすべての優先順位を変更します"
+
+#: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "チャットのダイアログを表示し、相手先にメッセージを送信できます"
 
-#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
+#: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "チャットしたい相手先の JID"
 
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "指定した場合、相手先はこのアカウントの相手先一覧から選択します"
 
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+"メッセージの内容。アカウントを指定していなければなりません。そうでない場合は"
+"\"\"としなければなりません"
+
+#: ../src/gajim-remote.py:139
 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 "
@@ -8457,34 +8443,29 @@ msgstr ""
 "らもなくてもかまいません。 'アカウント' だけを設定して 'OpenPGP 鍵' を設定し"
 "たくない場合、'OpenPGP 鍵' は '' としてください。"
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "メッセージを受け取りたい相手先の JID"
 
-#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "メッセージの内容"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp 鍵"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "指定した場合、メッセージはこの公開鍵で暗号化されます"
 
-#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "指定した場合、メッセージはこのアカウントを使って送られます"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:152
 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 "
@@ -8494,138 +8475,135 @@ msgstr ""
 "しなくてもかまいません。アカウント(account)だけを指定して'OpenPGP 鍵'を指定し"
 "たくない場合は、'OpenPGP 鍵'は単に '' としてください。"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "件名"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "メッセージの件名"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "参加しているグループチャットに新しいメッセージを送信します。"
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "メッセージを受け取る談話室そのものの JID"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "相手先の詳細情報を取得します"
 
-#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "相手先の JID"
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "アカウントの詳細情報を取得します"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "アカウント名"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "相手先にファイルを転送します"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "ファイル"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "ファイルの場所"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "指定した場合、このアカウントを使ってファイルを転送します"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "すべての設定項目とその値の一覧を表示します"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "項目 'key' の値に 'value' を設定します。"
 
 # (Mako)訳さずにそのままにしよう
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "key=value"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "'key' は設定項目の名前、'value' はそれに設定したい値"
 
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "設定項目を削除します"
 
 # (Mako)訳さずにそのままにしよう
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "key"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "削除する設定項目の名前"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "Gajim の設定の現在の状態を .config ファイルに書き出します"
 
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "相手先を名簿から削除します"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "相手先を名簿に追加します"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "このアカウントに新しい相手先を追加します"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr ""
 "現在の在席状況を返します (もしアカウントが指定されなければ、全体の在席状況を"
 "返します)"
 
-#: ../src/gajim-remote-plugin.py:226
-#, fuzzy
+#: ../src/gajim-remote.py:242
 msgid ""
-"Returns current status message(the global one unless account is specified)"
+"Returns current status message (the global one unless account is specified)"
 msgstr ""
 "現在の状況メッセージを返します (もしアカウントが指定されなければ、全体の状況"
 "メッセージを返します)"
 
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "未読メッセージ数を返します"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "'チャットを開始する' のダイアログを開きます"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "このアカウントでチャットを開始します"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "独自の XML を送信します"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "送信する XML"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:262
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
@@ -8633,44 +8611,87 @@ msgstr ""
 "XML が送信されるアカウント。指定されない場合、XML はすべてのアカウントに送信"
 "されます"
 
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:268
+msgid "Change the avatar"
+msgstr "アバターを変更する"
+
+#: ../src/gajim-remote.py:270
+msgid "Picture to use"
+msgstr "使いたい画像"
+
+#: ../src/gajim-remote.py:271
+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
 msgid "Handle a xmpp:/ uri"
 msgstr "xmpp:/ の URI を取り扱います"
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:279
+msgid "URI to handle"
+msgstr "取り扱う URI"
+
+#: ../src/gajim-remote.py:280
+msgid "Account in which you want to handle it"
+msgstr "URI を取り扱うアカウント"
+
+#: ../src/gajim-remote.py:282
+msgid "Message content"
+msgstr "メッセージの内容"
+
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "談話室に参加します"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "談話室"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:288
+msgid "Room JID"
+msgstr "談話室JID"
+
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "ニックネーム"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:289
+msgid "Nickname to use"
+msgstr "使いたいニックネーム"
+
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "パスワード"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:290
+msgid "Password to enter the room"
+msgstr "談話室のパスワード"
+
+#: ../src/gajim-remote.py:291
+msgid "Account from which you want to enter the room"
+msgstr "談話室の参加に使うアカウント"
+
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Gajim が起動しているかチェックします"
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
 #: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "ipython ウィンドウの表示/非表示"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "引数 \"contact_jid\" がありません"
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:349
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8679,160 +8700,42 @@ msgstr ""
 "'%s' は名簿にありません。\n"
 "メッセージを送るためのアカウントを指定してください。"
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:352
 msgid "You have no active account"
 msgstr "有効になっているアカウントがありません"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:405
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim が起動していないようです。そのため gajim-remote は使えません。"
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:432
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
+"使い方: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:436
 msgid "Arguments:"
 msgstr "引数:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
-#, python-format
-msgid "%s not found"
-msgstr "%s は見つかりません"
-
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
-msgid ""
-"Usage: %s command [arguments]\n"
-"Command is one of:\n"
-msgstr ""
-"使い方: %s コマンド [引数]\n"
-"コマンドは次のいずれか:\n"
-
-#: ../src/gajim-remote-plugin.py:496
-#, fuzzy, python-format
-msgid ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"引数が多すぎます。\n"
-"詳しくは \"%(basename)s help %(command)s\" と入力してください"
-
-#: ../src/gajim-remote-plugin.py:500
-#, fuzzy, python-format
-msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"引数 \"%(arg)s\" が指定されていません。\n"
-"詳しくは \"%(basename)s help %(command)s\" と入力してください"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "uri が間違っています"
-
-#: ../src/gajim-remote.py:109
-#, fuzzy
-msgid ""
-"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
-"account's previous status"
-msgstr ""
-"次のいずれか: offline (オフライン)、online (オンライン)、chat (チャット可)、"
-"away (離席中)、xa (不在)、dnd (邪魔しないで)、invisible (隠れ中)"
-
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "アカウントの優先順位を変更します"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "優先順位"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "アカウントに設定したい優先順位"
-
-#: ../src/gajim-remote.py:121
-msgid ""
-"change the priority of the given account. If not specified, change status of "
-"all accounts that have \"sync with global status\" option set"
-msgstr ""
-"アカウントの優先順位を変更します。アカウントが指定されない場合、\"sync with "
-"global status\" オプションの設定されたアカウントすべての優先順位を変更します"
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr ""
-"メッセージの内容。アカウントを指定していなければなりません。そうでない場合は"
-"\"\"としなければなりません"
-
-#: ../src/gajim-remote.py:242
-msgid ""
-"Returns current status message (the global one unless account is specified)"
-msgstr ""
-"現在の状況メッセージを返します (もしアカウントが指定されなければ、全体の状況"
-"メッセージを返します)"
-
-#: ../src/gajim-remote.py:268
-#, fuzzy
-msgid "Change the avatar"
-msgstr "在席状況を変更する"
-
-#: ../src/gajim-remote.py:270
-#, fuzzy
-msgid "Picture to use"
-msgstr "使いたいニックネーム"
-
-#: ../src/gajim-remote.py:271
-#, fuzzy
-msgid ""
-"Account in which the avatar will be set; if not specified, the avatar will "
-"be set for all accounts"
-msgstr ""
-"XML が送信されるアカウント。指定されない場合、XML はすべてのアカウントに送信"
-"されます"
-
-#: ../src/gajim-remote.py:279
-msgid "URI to handle"
-msgstr "取り扱う URI"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "URI を取り扱うアカウント"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "メッセージの内容"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "談話室JID"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "使いたいニックネーム"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "談話室のパスワード"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "談話室の参加に使うアカウント"
-
-#: ../src/gajim-remote.py:431
+#: ../src/gajim-remote.py:440
+#, python-format
+msgid "%s not found"
+msgstr "%s は見つかりません"
+
+#: ../src/gajim-remote.py:446
 #, python-format
 msgid ""
-"Usage: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
+"Usage: %s command [arguments]\n"
+"Command is one of:\n"
 msgstr ""
-"使い方: %(basename)s %(command)s %(arguments)s \n"
-"\t %(help)s"
+"使い方: %s コマンド [引数]\n"
+"コマンドは次のいずれか:\n"
 
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:515
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8841,7 +8744,7 @@ msgstr ""
 "引数が多すぎます。\n"
 "詳しくは \"%(basename)s help %(command)s\" と入力してください"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:520
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8850,9 +8753,13 @@ msgstr ""
 "引数 \"%(arg)s\" が指定されていません。\n"
 "詳しくは \"%(basename)s help %(command)s\" と入力してください"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:539
 msgid "No uri given"
-msgstr ""
+msgstr "uri がありません"
+
+#: ../src/gajim-remote.py:541
+msgid "Wrong uri"
+msgstr "uri が間違っています"
 
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
@@ -8879,183 +8786,213 @@ msgstr "現在のテーマを削除することはできません"
 msgid "Please first choose another for your current theme."
 msgstr "まず、現在のテーマとして別のものを選んでください。"
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:176 ../src/groupchat_control.py:1557
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s さんは現在 %(new_nick)s さんと認識されました"
+
+#: ../src/groupchat_control.py:230
 msgid "Sending private message failed"
 msgstr "私信の送信に失敗しました"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:232
 #, 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:455
+#: ../src/groupchat_control.py:560
 msgid "Insert Nickname"
 msgstr "ニックネームの挿入"
 
-#: ../src/groupchat_control.py:636
-#, fuzzy
+# (Mako) 語順が問題。コロンでごまかしてみる
+#: ../src/groupchat_control.py:743
 msgid "Conversation with "
-msgstr "会話"
+msgstr "会話中: "
 
-#: ../src/groupchat_control.py:638
-#, fuzzy
+#: ../src/groupchat_control.py:745
 msgid "Continued conversation"
-msgstr "続いている会話"
+msgstr "会話中"
+
+#: ../src/groupchat_control.py:1222
+#, 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:1282 ../src/gui_interface.py:923
+#: ../src/groupchat_control.py:1240 ../src/groupchat_control.py:1499
 msgid "Any occupant is allowed to see your full JID"
-msgstr "入室者の誰もがあなたのフルJID を知ることができます"
+msgstr "在室者の誰もがあなたのフルJID を知ることができます"
+
+#: ../src/groupchat_control.py:1243
+msgid "Room now shows unavailable member"
+msgstr "談話室はメンバー以外にも見えます"
+
+#: ../src/groupchat_control.py:1245
+msgid "room now does not show unavailable members"
+msgstr "談話室はメンバー以外には見えません"
+
+#: ../src/groupchat_control.py:1247
+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
+msgid "Room logging is now enabled"
+msgstr "談話室の記録を取りはじめます"
+
+#: ../src/groupchat_control.py:1253
+msgid "Room logging is now disabled"
+msgstr "談話室の記録を止めます"
+
+#: ../src/groupchat_control.py:1255
+msgid "Room is now non-anonymous"
+msgstr "談話室は非匿名です"
+
+#: ../src/groupchat_control.py:1258
+msgid "Room is now semi-anonymous"
+msgstr "談話室は半匿名です"
+
+#: ../src/groupchat_control.py:1261
+msgid "Room is now fully-anonymous"
+msgstr "談話室は完全匿名です"
 
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1504
 msgid "Room logging is enabled"
-msgstr "談話室の記録はとられます"
+msgstr "談話室の会話は記録されています"
 
-#: ../src/groupchat_control.py:1288
+#: ../src/groupchat_control.py:1506
 msgid "A new room has been created"
 msgstr "新しい談話室が作成されました"
 
-#: ../src/groupchat_control.py:1291
+#: ../src/groupchat_control.py:1509
 msgid "The server has assigned or modified your roomnick"
 msgstr "サーバーはあなたの談話室ニックネームを割り当て(または変更し)ました"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1297
+#: ../src/groupchat_control.py:1515
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s は蹴り出されました: %(reason)s"
 
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1518
 #, 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:1309
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s は締め出されました: %(reason)s"
 
-#: ../src/groupchat_control.py:1312
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s は %(who)s: によって締め出されました: %(reason)s"
 
-#: ../src/groupchat_control.py:1323 ../src/groupchat_control.py:1427
+#: ../src/groupchat_control.py:1541 ../src/groupchat_control.py:1645
 #, python-format
 msgid "You are now known as %s"
 msgstr "あなたは %s と認識されました"
 
-#: ../src/groupchat_control.py:1339 ../src/gui_interface.py:763
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s さんは現在 %(new_nick)s さんと認識されました"
-
-#: ../src/groupchat_control.py:1381 ../src/groupchat_control.py:1386
-#: ../src/groupchat_control.py:1392
+#: ../src/groupchat_control.py:1599 ../src/groupchat_control.py:1604
+#: ../src/groupchat_control.py:1610
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s は退出しました (%(reason)s)"
 
-#: ../src/groupchat_control.py:1383
+#: ../src/groupchat_control.py:1601
 msgid "affiliation changed"
 msgstr "分掌を変更しました"
 
-#: ../src/groupchat_control.py:1388
+#: ../src/groupchat_control.py:1606
 msgid "room configuration changed to members-only"
 msgstr "談話室はメンバー制に変更されました"
 
-#: ../src/groupchat_control.py:1394
+#: ../src/groupchat_control.py:1612
 msgid "system shutdown"
 msgstr "システムのシャットダウン"
 
-#: ../src/groupchat_control.py:1477
+#: ../src/groupchat_control.py:1695
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 "** %(actor)s さんによって、%(nick)s さんの分掌は %(affiliation)s に設定されま"
 "した"
 
-#: ../src/groupchat_control.py:1481
+#: ../src/groupchat_control.py:1699
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s さんの分掌は %(affiliation)s に設定されました"
 
 # (Mako)ここでの role は「役」
-#: ../src/groupchat_control.py:1496
+#: ../src/groupchat_control.py:1714
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 "** %(actor)s さんによって、%(nick)s さんの役は %(role)s に設定されました"
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1718
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s さんの役は %(role)s に設定されました"
 
-#: ../src/groupchat_control.py:1530
+#: ../src/groupchat_control.py:1748
 #, python-format
 msgid "%s has left"
 msgstr "%s さんが退出しました"
 
-#: ../src/groupchat_control.py:1535
+#: ../src/groupchat_control.py:1753
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s さんが参加しました"
 
-#: ../src/groupchat_control.py:1537 ../src/gui_interface.py:790
-#: ../src/history_window.py:447 ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s さんは現在 %(status)s"
-
-#: ../src/groupchat_control.py:1774
+#: ../src/groupchat_control.py:2006
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "本当にグループチャット \"%s\" から退出してもいいですか ?"
 
-#: ../src/groupchat_control.py:1776
+#: ../src/groupchat_control.py:2008
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "このウィンドウを閉じると、このグループチャットから切断されます。"
 
-#: ../src/groupchat_control.py:1780 ../src/gui_interface.py:1021
-#: ../src/gui_interface.py:1781 ../src/gui_interface.py:1818
-#: ../src/gui_interface.py:1853 ../src/message_window.py:224
-#: ../src/roster_window.py:2805 ../src/roster_window.py:3465
-#: ../src/roster_window.py:4195
-#, fuzzy
+#: ../src/groupchat_control.py:2012 ../src/gui_interface.py:673
+#: ../src/gui_interface.py:1282 ../src/gui_interface.py:1322
+#: ../src/gui_interface.py:1363 ../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 "次回から質問しない (_n)"
+msgstr "次回から質問しない (_D)"
 
-#: ../src/groupchat_control.py:1814
+#: ../src/groupchat_control.py:2046
 msgid "Changing Subject"
 msgstr "題の変更"
 
-#: ../src/groupchat_control.py:1815
+#: ../src/groupchat_control.py:2047
 msgid "Please specify the new subject:"
 msgstr "新しい題を入力してください:"
 
-#: ../src/groupchat_control.py:1822
+#: ../src/groupchat_control.py:2054
 msgid "Changing Nickname"
 msgstr "ニックネームの変更"
 
-#: ../src/groupchat_control.py:1823
+#: ../src/groupchat_control.py:2055
 msgid "Please specify the new nickname you want to use:"
 msgstr "使いたい新しいニックネームを入力してください:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1854
+#: ../src/groupchat_control.py:2086
 #, python-format
 msgid "Destroying %s"
 msgstr "%s の閉鎖"
 
-#: ../src/groupchat_control.py:1855
+#: ../src/groupchat_control.py:2087
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -9063,22 +9000,22 @@ msgstr ""
 "この談話室を閉鎖しようとしています。\n"
 "下に理由を入力できます:"
 
-#: ../src/groupchat_control.py:1857
+#: ../src/groupchat_control.py:2089
 msgid "You may also enter an alternate venue:"
 msgstr "また、代替の談話室を入力することもできます:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2046
+#: ../src/groupchat_control.py:2284
 #, python-format
 msgid "Kicking %s"
 msgstr "%s を蹴り出し"
 
-#: ../src/groupchat_control.py:2047 ../src/groupchat_control.py:2374
+#: ../src/groupchat_control.py:2285 ../src/groupchat_control.py:2617
 msgid "You may specify a reason below:"
 msgstr "下に理由を書くことができます:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2373
+#: ../src/groupchat_control.py:2616
 #, python-format
 msgid "Banning %s"
 msgstr "%s を締め出し"
@@ -9107,61 +9044,59 @@ msgstr "詳細"
 msgid "Error: cannot open %s for reading"
 msgstr "エラー: 読み込みモードで %s を開けません"
 
-#: ../src/gtkgui_helpers.py:404
+#: ../src/gtkgui_helpers.py:348
 msgid "Error reading file:"
 msgstr "ファイル読み込みエラー:"
 
-#: ../src/gtkgui_helpers.py:407
+#: ../src/gtkgui_helpers.py:351
 msgid "Error parsing file:"
 msgstr "ファイル解析エラー:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:448
+#: ../src/gtkgui_helpers.py:392
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr ""
+msgstr "%s に書き込むことができません。セッション管理サポートは機能しません"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:822
+#: ../src/gtkgui_helpers.py:766
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim はデフォルトの Jabber クライアントではありません"
 
-#: ../src/gtkgui_helpers.py:823
+#: ../src/gtkgui_helpers.py:767
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Gajim をデフォルトの Jabber クライアントにしますか ?"
 
-#: ../src/gtkgui_helpers.py:824
-#, fuzzy
+#: ../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:891
-#, fuzzy
+#: ../src/gtkgui_helpers.py:835
 msgid "Extension not supported"
 msgstr "拡張はサポートされていません"
 
-#: ../src/gtkgui_helpers.py:892
+#: ../src/gtkgui_helpers.py:836
 #, 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:928
+#: ../src/gtkgui_helpers.py:872
 msgid "Save Image as..."
 msgstr "画像の保存..."
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:137 ../src/gui_interface.py:323
-#: ../src/gui_interface.py:332 ../src/gui_interface.py:337
-#: ../src/gui_interface.py:340 ../src/gui_interface.py:343
-#: ../src/gui_interface.py:348
+#: ../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
 msgid "Unable to join group chat"
 msgstr "グループに参加できません"
 
-#: ../src/gui_interface.py:138
+#: ../src/gui_interface.py:127
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -9172,92 +9107,86 @@ msgstr ""
 "す。\n"
 "別のニックネームを下に入力してください:"
 
-#: ../src/gui_interface.py:141
+#: ../src/gui_interface.py:130
 msgid "Always use this nickname when there is a conflict"
 msgstr "衝突が生じたときはいつもこのニックネームを使う"
 
-#: ../src/gui_interface.py:158
+#: ../src/gui_interface.py:147
 msgid "Do you accept this request?"
 msgstr "この申し込みを承認しますか ?"
 
-#: ../src/gui_interface.py:160
+#: ../src/gui_interface.py:149
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "アカウント %s への申し込みを承認しますか ?"
 
-#: ../src/gui_interface.py:163
-#, fuzzy, python-format
+#: ../src/gui_interface.py:152
+#, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "%(url)s に対する HTTP (%(method)s) の承認 (id: %(id)s)"
 
-#: ../src/gui_interface.py:209 ../src/notify.py:493
+#: ../src/gui_interface.py:195 ../src/notify.py:276
 msgid "Connection Failed"
 msgstr "接続に失敗しました"
 
-#: ../src/gui_interface.py:312
+#: ../src/gui_interface.py:279
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "談話室 %s に参加するにはパスワードが必要です。入力してください。"
 
-#: ../src/gui_interface.py:324
+#: ../src/gui_interface.py:291
 #, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "%s の人数制限に達しています"
+msgid "Maximum number of users for <b>%s</b> has been reached"
+msgstr "<b>%s</b> の人数の上限に達しています"
 
-#: ../src/gui_interface.py:333
+#: ../src/gui_interface.py:300
 #, python-format
-msgid "You are banned from group chat %s."
-msgstr "グループチャット %s さんに締め出されています。"
+msgid "You are banned from group chat <b>%s</b>."
+msgstr "グループチャット <b>%s</b> から締め出されています。"
 
-#: ../src/gui_interface.py:338
+#: ../src/gui_interface.py:306
 #, python-format
-msgid "Group chat %s does not exist."
-msgstr "グループチャット %s は存在しません。"
+msgid "Group chat <b>%s</b> does not exist."
+msgstr "グループチャット <b>%s</b> は存在しません。"
 
-#: ../src/gui_interface.py:341
+#: ../src/gui_interface.py:309
 msgid "Group chat creation is restricted."
 msgstr "グループチャットの作成は制限されています。"
 
-#: ../src/gui_interface.py:344
+#: ../src/gui_interface.py:312
 #, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "登録したニックネームは、グループチャット %s で使われます。"
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
+msgstr "登録したニックネームは、グループチャット <b>%s</b> で使われます。"
 
-#: ../src/gui_interface.py:349
+#: ../src/gui_interface.py:317
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "あなたはグループチャット %s のメンバー一覧にありません。"
 
-#: ../src/gui_interface.py:483 ../src/gui_interface.py:487
+#: ../src/gui_interface.py:405 ../src/gui_interface.py:409
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "エラー %(code)s: %(msg)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:498 ../src/gui_interface.py:513
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "%(message)s を送信する際にエラー ( %(error)s )"
-
-#: ../src/gui_interface.py:540 ../src/notify.py:495
+#: ../src/gui_interface.py:461 ../src/notify.py:278
 msgid "Subscription request"
 msgstr "在席通知申込"
 
-#: ../src/gui_interface.py:565
+#: ../src/gui_interface.py:486
 msgid "Authorization accepted"
 msgstr "承認が得られました"
 
-#: ../src/gui_interface.py:566
+#: ../src/gui_interface.py:487
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "相手先 %s さんは、あなたが在席状況を見ることを承認しました。"
 
-#: ../src/gui_interface.py:579
+#: ../src/gui_interface.py:495
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "相手先 \"%s\" さんは、あなたからの申し込みを却下しました。"
 
-#: ../src/gui_interface.py:580
+#: ../src/gui_interface.py:496
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -9265,54 +9194,16 @@ msgstr ""
 "この相手先を常にオフラインとして見ることになります。\n"
 "相手先一覧から削除しますか ?"
 
-#: ../src/gui_interface.py:604 ../src/notify.py:497
+#: ../src/gui_interface.py:517 ../src/notify.py:280
 msgid "Unsubscribed"
 msgstr "在席通知の取り消し"
 
-#: ../src/gui_interface.py:631
-#, fuzzy, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "Contact with \"%s\" cannot be established"
-
-#: ../src/gui_interface.py:859
+#: ../src/gui_interface.py:528
 #, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s さんは題を %(subject)s に設定しました"
-
-#: ../src/gui_interface.py:926
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gui_interface.py:928
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gui_interface.py:930
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:934
-msgid "Room logging is now enabled"
-msgstr "談話室の記録を取ります。"
-
-#: ../src/gui_interface.py:936
-msgid "Room logging is now disabled"
-msgstr "談話室の記録を止めます"
-
-#: ../src/gui_interface.py:938
-msgid "Room is now non-anonymous"
-msgstr "談話室は非匿名です"
-
-#: ../src/gui_interface.py:941
-msgid "Room is now semi-anonymous"
-msgstr "談話室は半匿名です"
-
-#: ../src/gui_interface.py:944
-msgid "Room is now fully-anonymous"
-msgstr "談話室は完全匿名です"
+msgid "Contact with \"%s\" cannot be established"
+msgstr "\"%s\" との接続は確立できませんでした"
 
-#: ../src/gui_interface.py:985
+#: ../src/gui_interface.py:626
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -9320,23 +9211,32 @@ msgstr ""
 "Gajim は GPG エージェントを使用するよう設定されました。しかし、GPG エージェン"
 "トが起動していないか、あるいはパスフレーズが間違っています。\n"
 
-#: ../src/gui_interface.py:987 ../src/gui_interface.py:994
+#: ../src/gui_interface.py:628 ../src/gui_interface.py:636
 msgid "You are currently connected without your OpenPGP key."
 msgstr "現在、OpenPGP 鍵を使わずに接続しています。"
 
-#: ../src/gui_interface.py:989
+#: ../src/gui_interface.py:630
 msgid "Your passphrase is incorrect"
 msgstr "パスフレーズが違います"
 
-#: ../src/gui_interface.py:993
+#: ../src/gui_interface.py:635
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG のパスフレーズが違います"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:648
+msgid "Certificate Passphrase Required"
+msgstr "証明書のパスフレーズが必要です"
+
+#: ../src/gui_interface.py:649
+#, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "アカウント %s の証明書のパスフレーズを入力してください。"
+
+#: ../src/gui_interface.py:671
 msgid "GPG key not trusted"
 msgstr "GPG 鍵に信用がありません"
 
-#: ../src/gui_interface.py:1019
+#: ../src/gui_interface.py:671
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
@@ -9344,29 +9244,28 @@ msgstr ""
 "このチャットの暗号化に使った GPG 鍵には信用がありません。ほんとうにこのメッ"
 "セージを暗号化したいですか ?"
 
-#: ../src/gui_interface.py:1031
-#, fuzzy
+#: ../src/gui_interface.py:684
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
+"Gnome Keyring is installed but not correctly started (environment variable "
+"probably not correctly set)"
 msgstr ""
-"Gnome Keyring はインストールされています。しかし、\t\t\t\t正しく起動できませ"
-"ん (環境変数が正しく設定されていないよ\t\t\t\tうです)。"
+"Gnome Keyring はインストールされています。しかし、正しく起動できません(環境変"
+"数が正しく設定されていないようです)。"
 
-#: ../src/gui_interface.py:1131
+#: ../src/gui_interface.py:791
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "%(gmail_mail_address)s に新着メール"
 
-#: ../src/gui_interface.py:1133
-#, fuzzy, python-format
+#: ../src/gui_interface.py:793
+#, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "新着メールが %d 件あります"
 msgstr[1] "新着メールが %d 件あります"
 
-#: ../src/gui_interface.py:1146
-#, fuzzy, python-format
+#: ../src/gui_interface.py:806
+#, python-format
 msgid ""
 "\n"
 "\n"
@@ -9380,81 +9279,58 @@ msgstr ""
 "件名: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1215
+#: ../src/gui_interface.py:871
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s さんがファイルを転送したがっています。"
 
-#: ../src/gui_interface.py:1252 ../src/roster_window.py:1877
-#, fuzzy
+#: ../src/gui_interface.py:908 ../src/roster_window.py:1891
 msgid "Remote contact stopped transfer"
 msgstr "遠くの相手先が転送を中止しました"
 
-#: ../src/gui_interface.py:1255 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:911 ../src/roster_window.py:1893
 msgid "Error opening file"
 msgstr "ファイルを開く際のエラー"
 
-#: ../src/gui_interface.py:1287
+#: ../src/gui_interface.py:943
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(name)s さんからファイル %(filename)s を受け取りました。"
 
 #. ft stopped
-#: ../src/gui_interface.py:1291
+#: ../src/gui_interface.py:947
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "%(name)s さんからのファイル %(filename)s の転送を中断しました。"
 
-#: ../src/gui_interface.py:1304
+#: ../src/gui_interface.py:960
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s さんへファイル %(filename)s を送りました。"
 
 #. ft stopped
-#: ../src/gui_interface.py:1308
+#: ../src/gui_interface.py:964
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "%(name)s さんへのファイル %(filename)s の転送を中断しました。"
 
-#: ../src/gui_interface.py:1426
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"%s さんからのメッセージを復号できません\n"
-"改竄の可能性があります。"
-
-#: ../src/gui_interface.py:1433
+#: ../src/gui_interface.py:1039
 msgid "Unable to decrypt message"
 msgstr "メッセージを復号できません"
 
-#: ../src/gui_interface.py:1505
+#: ../src/gui_interface.py:1051
 msgid "Username Conflict"
 msgstr "ユーザー名の重複"
 
-#: ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1052
 msgid "Please type a new username for your local account"
 msgstr "ローカルのアカウントの新しいユーザー名を入力してください"
 
-#: ../src/gui_interface.py:1519
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1532
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s)"
-
-#: ../src/gui_interface.py:1543
-msgid "Error."
-msgstr "エラー"
-
-#: ../src/gui_interface.py:1556
+#: ../src/gui_interface.py:1067
 msgid "Resource Conflict"
 msgstr "リソースの衝突"
 
-#: ../src/gui_interface.py:1557
+#: ../src/gui_interface.py:1068
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9463,21 +9339,20 @@ msgstr ""
 "てください"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1604
-#, fuzzy, python-format
+#: ../src/gui_interface.py:1113
+#, python-format
 msgid "%s wants to start a voice chat."
-msgstr "%s さんがファイルを転送したがっています。"
+msgstr "%s さんがファイルを音声チャットを始めたがっています。"
 
-#: ../src/gui_interface.py:1607
-#, fuzzy
+#: ../src/gui_interface.py:1116
 msgid "Voice Chat Request"
-msgstr "ファイル転送の要求"
+msgstr "音声チャットの要求"
 
-#: ../src/gui_interface.py:1716
+#: ../src/gui_interface.py:1203
 msgid "Error verifying SSL certificate"
 msgstr "SSL 証明書の検証エラー"
 
-#: ../src/gui_interface.py:1717
+#: ../src/gui_interface.py:1204
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9487,15 +9362,15 @@ msgstr ""
 "jabber サーバーの SSL 証明書の検証にエラーがあります: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: ../src/gui_interface.py:1725
+#: ../src/gui_interface.py:1213
 msgid "Ignore this error for this certificate."
 msgstr "この証明書のこのエラーを無視します。"
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1238
 msgid "SSL certificate error"
 msgstr "SSL 証明書エラー"
 
-#: ../src/gui_interface.py:1746
+#: ../src/gui_interface.py:1239
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9512,27 +9387,28 @@ msgstr ""
 "\n"
 "それでも接続して、証明書の指紋を更新しますか ?"
 
-#: ../src/gui_interface.py:1776 ../src/gui_interface.py:1813
-#: ../src/gui_interface.py:1849
+#: ../src/gui_interface.py:1275 ../src/gui_interface.py:1317
+#: ../src/gui_interface.py:1359
 msgid "Insecure connection"
 msgstr "安全でない接続"
 
-#: ../src/gui_interface.py:1777
-#, fuzzy
+#: ../src/gui_interface.py:1276
+#, python-format
 msgid ""
-"You are about to connect to the server with an insecure connection. This "
-"means all your conversations will be exchanged unencrypted. Are you sure you "
-"want to do that?"
+"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 ""
-"安全でない接続でパスワードを送ろうとしています。それを避けるには PyOpenSSL を"
-"インストールすべきです。あなたがやりたいことですか ?"
+"安全でない接続でアカウント %(account)s (サーバー %(server)s) に接続しようとし"
+"ています。これは、すべての会話が暗号化されずに交わされること意味します。あな"
+"たがやりたいことですか ?"
 
-#: ../src/gui_interface.py:1780 ../src/gui_interface.py:1817
-#: ../src/gui_interface.py:1852
+#: ../src/gui_interface.py:1281 ../src/gui_interface.py:1321
+#: ../src/gui_interface.py:1362
 msgid "Yes, I really want to connect insecurely"
 msgstr "はい。安全でないまま接続したいです"
 
-#: ../src/gui_interface.py:1814
+#: ../src/gui_interface.py:1318
 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?"
@@ -9540,21 +9416,20 @@ msgstr ""
 "安全でない接続でパスワードを送ろうとしています。それを避けるには PyOpenSSL を"
 "インストールすべきです。あなたがやりたいことですか ?"
 
-#: ../src/gui_interface.py:1850
-#, fuzzy
+#: ../src/gui_interface.py:1360
 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:2422 ../src/gui_interface.py:2445
+#: ../src/gui_interface.py:1869 ../src/gui_interface.py:1892
 msgid "Emoticons disabled"
 msgstr "感情アイコンは無効"
 
-#: ../src/gui_interface.py:2423
+#: ../src/gui_interface.py:1870
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9562,7 +9437,7 @@ msgstr ""
 "指定された感情アイコンのテーマは見つかりません。そのため、感情アイコンは無効"
 "です。"
 
-#: ../src/gui_interface.py:2446
+#: ../src/gui_interface.py:1893
 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 "
@@ -9572,42 +9447,42 @@ msgstr ""
 "ルの書式を更新する必要があるかも知れません。詳しくは http://trac.gajim.org/"
 "wiki/Emoticons をご覧ください。"
 
-#: ../src/gui_interface.py:2477 ../src/roster_window.py:3632
+#: ../src/gui_interface.py:1937 ../src/roster_window.py:3784
 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:2871
+#: ../src/gui_interface.py:2324
 msgid "Could not save your settings and preferences"
 msgstr "設定を保存できませんでした"
 
-#: ../src/gui_interface.py:3411
+#: ../src/gui_interface.py:2874
 msgid "Passphrase Required"
 msgstr "パスフレーズが必要です"
 
-#: ../src/gui_interface.py:3412
+#: ../src/gui_interface.py:2875
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "鍵ID %(keyid)s (アカウント %(account)s) の GPG 鍵のパスフレーズを入力してくだ"
 "さい。"
 
-#: ../src/gui_interface.py:3426
+#: ../src/gui_interface.py:2889
 msgid "GPG key expired"
-msgstr "GPG 鍵は失効しています"
+msgstr "GPG 鍵は期限切れです"
 
-#: ../src/gui_interface.py:3427
-#, fuzzy, python-format
+#: ../src/gui_interface.py:2890
+#, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
-msgstr "GPG 鍵は失効しています。OpenPGP なしに %s さんに接続します。"
+msgstr "GPG 鍵は有効期限が切れています。OpenPGP なしに %s に接続します。"
 
 #. ask again
-#: ../src/gui_interface.py:3436
+#: ../src/gui_interface.py:2899
 msgid "Wrong Passphrase"
 msgstr "パスフレーズが間違っています"
 
-#: ../src/gui_interface.py:3437
+#: ../src/gui_interface.py:2900
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "GPG のパスフレーズをもういちど入力するか、または「中止」を押してください。"
@@ -9616,42 +9491,42 @@ msgstr ""
 msgid "_New Group Chat"
 msgstr "新しいグループチャット (_N)"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:419
 msgid "I would like to add you to my roster"
 msgstr "私はあなたを名簿に追加したいと思っています"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:116
 msgid "Cannot find history logs database"
 msgstr "履歴記録データベースが見つかりません"
 
 #. holds jid
-#: ../src/history_manager.py:154
+#: ../src/history_manager.py:156
 msgid "Contacts"
 msgstr "相手先"
 
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_manager.py:169 ../src/history_manager.py:213
 #: ../src/history_window.py:98
 msgid "Date"
 msgstr "日付"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:176 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "ニックネーム"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_manager.py:185 ../src/history_manager.py:220
 #: ../src/history_window.py:106
 msgid "Message"
 msgstr "メッセージ"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:193 ../src/history_manager.py:226
 msgid "Subject"
 msgstr "題"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:252
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9659,7 +9534,7 @@ msgstr ""
 "データベースを消去しますか ? (Gajim が起動している場合、まったくお勧めできま"
 "せん)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:254
 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 "
@@ -9667,27 +9542,44 @@ msgid ""
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
+"通常、データベース領域が空になるわけではなく、再使用可能になるだけです。もし"
+"データベース領域を本当に消去したい場合は YES を、そうでなければ NO をクリック"
+"してください。\n"
+"\n"
+"YES をクリックした場合、しばらくお待ちください..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:259
+msgid "Database Cleanup"
+msgstr "データベースの掃除"
+
+#: ../src/history_manager.py:477
 msgid "Exporting History Logs..."
 msgstr "履歴記録を書き出しています..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:554
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(time)s 、%(who)s さんは言いました: %(message)s\n"
 
-#: ../src/history_manager.py:572
-msgid "Do you really want to delete logs of the selected contact?"
-msgid_plural "Do you really want to delete logs of the selected contacts?"
-msgstr[0] "本当に、選択した相手先の記録を削除してもいいですか ?"
-msgstr[1] "本当に、選択した相手先の記録を削除してもいいですか ?"
+#: ../src/history_manager.py:592
+#, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "本当に、%(jid)s の記録を削除してもいいですか ?"
+
+#: ../src/history_manager.py:596
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "本当に、選択した相手先の記録を削除してもいいですか ?"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:598 ../src/history_manager.py:637
 msgid "This is an irreversible operation."
-msgstr ""
+msgstr "これは不可逆的な操作です。"
+
+#: ../src/history_manager.py:600 ../src/history_manager.py:639
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "中止の確認"
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:634
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "本当に、選択したメッセージを削除してもいいですか ?"
@@ -9726,14 +9618,19 @@ msgstr "現在の状況: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "現在の状況: %(status)s"
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523 ../src/htmltextview.py:533
 msgid "Timeout loading image"
 msgstr "画像の読み込みに失敗しました"
 
-#: ../src/htmltextview.py:535
+#: ../src/htmltextview.py:543
 msgid "Image is too big"
 msgstr "画像が大きすぎます"
 
+#: ../src/htmltextview.py:576
+#, fuzzy
+msgid "Loading"
+msgstr "読み込み中"
+
 #: ../src/message_window.py:222
 msgid "You are going to close several tabs"
 msgstr "タブを閉じようとしています"
@@ -9742,19 +9639,19 @@ msgstr "タブを閉じようとしています"
 msgid "Do you really want to close them all?"
 msgstr "本当にそれらをすべて閉じてもいいですか ?"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:497
 msgid "Chats"
 msgstr "チャット"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:499
 msgid "Group Chats"
 msgstr "グループチャット"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:501
 msgid "Private Chats"
 msgstr "個人チャット"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:507
 msgid "Messages"
 msgstr "メッセージ"
 
@@ -9766,153 +9663,151 @@ msgstr "- メッセージは記録されます"
 msgid "- messages will not be logged"
 msgstr "- メッセージは記録されません"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s さんの在席状況が変わりました"
+#: ../src/notify.py:319
+msgid "Ignore"
+msgstr "無視する"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s さんがサインインしました"
+#: ../src/plugins/gui.py:67
+msgid "Plugin"
+msgstr "プラグイン"
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s さんがサインアウトしました"
+#: ../src/plugins/gui.py:161
+msgid "Plugin failed"
+msgstr "プラグインに失敗しました"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr "%(nickname)s からの新しい単発メッセージ"
+#: ../src/plugins/gui.py:205
+msgid "Unable to properly remove the plugin"
+msgstr "プラグインを正しく削除することができません"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "グループチャット %s からの新着の私信"
+#. members not safe
+#: ../src/plugins/gui.py:213 ../src/plugins/pluginmanager.py:497
+#: ../src/plugins/pluginmanager.py:505
+msgid "Archive is malformed"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s さん: %(message)s"
+#: ../src/plugins/gui.py:236 ../src/plugins/gui.py:244
+#: ../src/plugins/pluginmanager.py:513
+msgid "Plugin already exists"
+msgstr "プラグインは既に存在しています"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "%(nickname)s さんからのメッセージ"
+#: ../src/plugins/gui.py:236
+msgid "Overwrite?"
+msgstr "上書きしますか ?"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "%(nickname)s さんからの新着メッセージ"
+#: ../src/plugins/gui.py:265
+msgid "Configuration"
+msgstr "調整"
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "無視する"
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:483 ../src/plugins/pluginmanager.py:489
+msgid "Archive corrupted"
+msgstr "書庫が壊れています"
+
+#: ../src/plugins/pluginmanager.py:485
+msgid "Archive empty"
+msgstr "書庫が空です"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "プロフィールを取得中..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3001
+#: ../src/profile_window.py:125 ../src/roster_window.py:3137
 msgid "File is empty"
 msgstr "ファイルが空です"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3004
+#: ../src/profile_window.py:128 ../src/roster_window.py:3140
 msgid "File does not exist"
 msgstr "ファイルがありません"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3006 ../src/roster_window.py:3017
+#: ../src/profile_window.py:142 ../src/profile_window.py:158
+#: ../src/roster_window.py:3142 ../src/roster_window.py:3153
 msgid "Could not load image"
 msgstr "画像を読み込めませんでした"
 
-#: ../src/profile_window.py:215
-#, fuzzy
+#: ../src/profile_window.py:229
 msgid "Wrong date format"
-msgstr "相手先の情報"
+msgstr "日付の書式が正しくありません"
 
-#: ../src/profile_window.py:216
-#, fuzzy
+#: ../src/profile_window.py:230
 msgid "Format of the date must be YYYY-MM-DD"
-msgstr "書式: YYYY-MM-DD"
+msgstr "日付の書式は YYYY-MM-DD でなければなりません"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:284
 msgid "Information received"
 msgstr "情報を受信しました"
 
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:362
 msgid "Without a connection you can not publish your contact information."
 msgstr "接続しないと、情報を公開できません。"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:375
 msgid "Sending profile..."
 msgstr "プロフィールを送信しています..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:394
 msgid "Information NOT published"
 msgstr "情報は公開されません"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:401
 msgid "vCard publication failed"
 msgstr "vCard の公開に失敗しました"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:402
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
 msgstr ""
 "個人情報の公開する際にエラーが発生しました。時間をおいて再度試みてください。"
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1026
-#, fuzzy
+#: ../src/roster_window.py:240 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "統合アカウント"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:1956
 msgid "Authorization has been sent"
 msgstr "承認が送信されました"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1957
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "現在 \"%s\" さんはあなたの在席状況を知ることができます。"
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:1980
 msgid "Subscription request has been sent"
 msgstr "在席通知の申し込みを送信しました"
 
-#: ../src/roster_window.py:1967
-#, fuzzy, python-format
+#: ../src/roster_window.py:1981
+#, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "\"%s\" さんがこの申し込みを承認したら、相手先の在席状況を知ることができます。"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:1995
 msgid "Authorization has been removed"
 msgstr "承認が取り消されました"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:1996
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" さんは常にあなたをオフラインとして見ることになります。"
 
-#: ../src/roster_window.py:2009
+#: ../src/roster_window.py:2023
 msgid "GPG is not usable"
 msgstr "GPG は使用できません"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2024
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "OpenPGP なしに、%s さんに接続します。"
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3562
+#: ../src/roster_window.py:2231 ../src/roster_window.py:3714
 msgid "You are participating in one or more group chats"
 msgstr "一つ以上のグループチャットに参加中です。"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3563
+#: ../src/roster_window.py:2232 ../src/roster_window.py:3715
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9920,39 +9815,37 @@ msgstr ""
 "在席状況を「隠れ中」にすると、グループチャットから退出することになります。ほ"
 "んとうに「隠れ中」にしますか ?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2258
 msgid "desync'ed"
 msgstr "不揃い"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2324
 msgid "Really quit Gajim?"
 msgstr "本当に Gajim を終了しますか ?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2325
 msgid "Are you sure you want to quit Gajim?"
 msgstr "本当に Gajim を終了してもいいですか ?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2326
 msgid "Always close Gajim"
 msgstr "常に Gajim を終了する"
 
-#: ../src/roster_window.py:2396
-#, fuzzy
+#: ../src/roster_window.py:2410
 msgid "You have running file transfers"
-msgstr "ファイルの転送を中止する"
+msgstr "ファイルの転送を実行中です"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2411
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
-msgstr ""
+msgstr "いま終了すると、転送中のファイルは中断されます。それでも終了しますか?"
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2719
+#: ../src/roster_window.py:2442 ../src/roster_window.py:2856
 msgid "You have unread messages"
 msgstr "未読のメッセージがあります"
 
-#: ../src/roster_window.py:2429
-#, fuzzy
+#: ../src/roster_window.py:2443
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9960,37 +9853,37 @@ msgstr ""
 "履歴が有効になっていて、かつ相手先が名簿にあれば、メッセージは後で読むことが"
 "できます。"
 
-#: ../src/roster_window.py:2720
+#: ../src/roster_window.py:2857
 msgid "You must read them before removing this transport."
 msgstr "この中継先を削除する前に、それらを読まなければなりません。"
 
-#: ../src/roster_window.py:2723
+#: ../src/roster_window.py:2860
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "中継先 \"%s\" を削除します"
 
-#: ../src/roster_window.py:2724
+#: ../src/roster_window.py:2861
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "この中継先をとおして相手先にメッセージを送受信することはできません。"
 
-#: ../src/roster_window.py:2727
+#: ../src/roster_window.py:2864
 msgid "Transports will be removed"
 msgstr "中継先は削除されます"
 
-#: ../src/roster_window.py:2732
+#: ../src/roster_window.py:2869
 #, 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:2800
+#: ../src/roster_window.py:2937
 msgid "You are about to block a contact. Are you sure you want to continue?"
-msgstr "相手先を拒否しようとしています。続行してもいいですか ?"
+msgstr "相手先を遮断しようとしています。続行してもいいですか ?"
 
-#: ../src/roster_window.py:2802
+#: ../src/roster_window.py:2939
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9999,56 +9892,56 @@ msgstr ""
 "ん。"
 
 #. it's jid
-#: ../src/roster_window.py:2893
+#: ../src/roster_window.py:3029
 msgid "Rename Contact"
 msgstr "相手先の名前を変更"
 
-#: ../src/roster_window.py:2894
+#: ../src/roster_window.py:3030
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "相手先 %s さんの新しいニックネームを入力してください"
 
-#: ../src/roster_window.py:2901
+#: ../src/roster_window.py:3037
 msgid "Rename Group"
 msgstr "グループの名前変更"
 
-#: ../src/roster_window.py:2902
+#: ../src/roster_window.py:3038
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "グループ %s の新しい名前を入力してください"
 
-#: ../src/roster_window.py:2947
+#: ../src/roster_window.py:3083
 msgid "Remove Group"
 msgstr "グループの削除"
 
-#: ../src/roster_window.py:2948
+#: ../src/roster_window.py:3084
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "名簿からグループ %s を削除しますか ?"
 
-#: ../src/roster_window.py:2949
+#: ../src/roster_window.py:3085
 msgid "Also remove all contacts in this group from your roster"
 msgstr "名簿のこのグループのすべての相手先も削除します"
 
-#: ../src/roster_window.py:2988
+#: ../src/roster_window.py:3124
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP 鍵の割り当て"
 
-#: ../src/roster_window.py:2989
+#: ../src/roster_window.py:3125
 msgid "Select a key to apply to the contact"
 msgstr "相手先に適用する鍵を選択してください"
 
-#: ../src/roster_window.py:3372
+#: ../src/roster_window.py:3524
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "相手先 \"%s\" さんを名簿から削除します"
 
-#: ../src/roster_window.py:3374
+#: ../src/roster_window.py:3526
 #, 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:3379
+#: ../src/roster_window.py:3531
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -10057,11 +9950,11 @@ msgstr ""
 "を常にオフラインとして見ることになります。"
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3537
 msgid "Do you want to continue?"
 msgstr "続けますか ?"
 
-#: ../src/roster_window.py:3389
+#: ../src/roster_window.py:3541
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -10069,16 +9962,16 @@ msgstr ""
 "この相手先を名簿から削除すると、デフォルトで在席通知の承認も取り消します。相"
 "手先はあなたを常にオフラインとして見ることになります。"
 
-#: ../src/roster_window.py:3392
+#: ../src/roster_window.py:3544
 msgid "I want this contact to know my status after removal"
 msgstr "削除後も、この相手先に自分の在席状況を知らせる"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3548
 msgid "Contacts will be removed from your roster"
 msgstr "相手先は名簿から削除されました"
 
-#: ../src/roster_window.py:3401
+#: ../src/roster_window.py:3553
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -10088,14 +9981,13 @@ msgstr ""
 "を名簿から削除すると、在席通知の承認も取り消します。相手先はあなたを常にオフ"
 "ラインとして見ることになります。"
 
-#: ../src/roster_window.py:3459
-#, fuzzy
+#: ../src/roster_window.py:3611
 msgid ""
 "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "独自の在席状況を送信しようとしています。続行してもいいですか ?"
 
-#: ../src/roster_window.py:3461
-#, fuzzy, python-format
+#: ../src/roster_window.py:3613
+#, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
 "change your status. Then he or she will see your global status."
@@ -10104,189 +9996,198 @@ msgstr ""
 "が在席状況を変更するまでの間です。その後はあなたの全体の在席状況を見ることに"
 "なります。"
 
-#: ../src/roster_window.py:3480
+#: ../src/roster_window.py:3632
 msgid "No account available"
 msgstr "アカウントがありません"
 
-#: ../src/roster_window.py:3481
+#: ../src/roster_window.py:3633
 msgid "You must create an account before you can chat with other contacts."
 msgstr "相手先とチャットを開始する前に、アカウントを作成しなければなりません。"
 
-#: ../src/roster_window.py:4095
+#: ../src/roster_window.py:4286
 msgid "Metacontacts storage not supported by your server"
-msgstr ""
+msgstr "サーバーはメタ相手先の保存をサポートしていません"
 
-#: ../src/roster_window.py:4097
+#: ../src/roster_window.py:4288
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
+"サーバーはメタ相手先の情報の保存をサポートしていません。したがってその情報は"
+"次の接続の際には失われています。"
 
-#: ../src/roster_window.py:4189
-#, fuzzy
+#: ../src/roster_window.py:4380
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
-msgstr "metacontact を作成しようとしています。続行してもいいですか ?"
+msgstr "メタ相手先を作成しようとしています。続行してもいいですか ?"
 
-#: ../src/roster_window.py:4191
+#: ../src/roster_window.py:4382
 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 "
 "accounts."
 msgstr ""
+"メタ相手先は、いくつかの相手先を一行にまとめるひとつの方法です。一般に、同一"
+"人物が複数の Jabber アカウントや中継先アカウントを持っているときに使用しま"
+"す。"
 
-#: ../src/roster_window.py:4306
+#: ../src/roster_window.py:4503
 msgid "Invalid file URI:"
 msgstr "ファイルの URI が正しくありません:"
 
-#: ../src/roster_window.py:4318
-#, fuzzy, python-format
+#: ../src/roster_window.py:4515
+#, 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 さんに転送しますか"
-msgstr[1] "このファイルを %s さんに転送しますか"
+msgstr[0] "このファイルを %s さんに転送しますか:"
+msgstr[1] "これらのファイルを %s さんに転送しますか:"
 
-#: ../src/roster_window.py:4433
-#, fuzzy, python-format
+#: ../src/roster_window.py:4650
+#, python-format
 msgid "Send %s to %s"
-msgstr "送信する"
+msgstr "%s を %s に送信"
+
+#: ../src/roster_window.py:4661
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "%s を優先の相手先とする"
 
-#: ../src/roster_window.py:4439
+# (Mako) よくわからない。Make [c_source.get_shown_name()] and [c_dest.get_shown_name()] metacontacts
+#: ../src/roster_window.py:4664
 #, python-format
 msgid "Make %s and %s metacontacts"
-msgstr ""
+msgstr "%s と %s をメタ相手先とする"
 
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4888 ../src/roster_window.py:4961
-#: ../src/roster_window.py:4970 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "アカウント %s で"
 
 #. add
-#: ../src/roster_window.py:4977
+#: ../src/roster_window.py:5174
 #, python-format
 msgid "to %s account"
 msgstr "アカウント %s に対して"
 
 #. disco
-#: ../src/roster_window.py:4982
+#: ../src/roster_window.py:5179
 #, python-format
 msgid "using %s account"
 msgstr "アカウント %s で"
 
-#: ../src/roster_window.py:5020 ../src/statusicon.py:326
+#: ../src/roster_window.py:5218 ../src/statusicon.py:327
 msgid "_Manage Bookmarks..."
 msgstr "ブックマークの管理 (_M)..."
 
 #. profile, avatar
-#: ../src/roster_window.py:5040
+#: ../src/roster_window.py:5238
 #, python-format
 msgid "of account %s"
 msgstr "アカウント %s の"
 
-#: ../src/roster_window.py:5081
+#: ../src/roster_window.py:5279
 #, python-format
 msgid "for account %s"
 msgstr "アカウント %s について"
 
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5246
+#: ../src/roster_window.py:5339 ../src/roster_window.py:5447
 msgid "_Change Status Message"
 msgstr "状況メッセージの変更 (_C)"
 
-#: ../src/roster_window.py:5174
+#: ../src/roster_window.py:5372
 msgid "Publish Tune"
 msgstr "聴いている楽曲名を公開"
 
-#: ../src/roster_window.py:5176
-#, fuzzy
+#: ../src/roster_window.py:5374
 msgid "Publish Location"
-msgstr "聴いている楽曲名を公開"
+msgstr "位置情報を公開"
 
-#: ../src/roster_window.py:5179
+#: ../src/roster_window.py:5377
 msgid "Configure Services..."
-msgstr "サービスの構成"
+msgstr "サービスの調整..."
 
 # (Mako)ここでは「復元」の意味か
-#: ../src/roster_window.py:5324
+#: ../src/roster_window.py:5525
 msgid "_Maximize All"
 msgstr "ウィンドウをすべて復元 (_M)"
 
-#: ../src/roster_window.py:5334 ../src/roster_window.py:5508
+#: ../src/roster_window.py:5535 ../src/roster_window.py:5708
 msgid "Send Group M_essage"
 msgstr "メッセージの一斉送信 (_e)"
 
-#: ../src/roster_window.py:5342
+#: ../src/roster_window.py:5543
 msgid "To all users"
 msgstr "すべてのユーザーに"
 
-#: ../src/roster_window.py:5346
+#: ../src/roster_window.py:5547
 msgid "To all online users"
 msgstr "オンラインのすべてのユーザーに"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5528
+#: ../src/roster_window.py:5728
 msgid "_Manage Contacts"
 msgstr "相手先の管理 (_M)"
 
 #. Edit Groups
-#: ../src/roster_window.py:5537
+#: ../src/roster_window.py:5737
 msgid "Edit _Groups"
 msgstr "グループの編集 (_G)"
 
 #. Send single message
-#: ../src/roster_window.py:5592
+#: ../src/roster_window.py:5792
 msgid "Send Single Message"
 msgstr "単発メッセージの送信"
 
 #. Execute Command
-#: ../src/roster_window.py:5639
+#: ../src/roster_window.py:5839
 msgid "Execute Command..."
 msgstr "コマンドを実行する..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5649
+#: ../src/roster_window.py:5849
 msgid "_Manage Transport"
 msgstr "中継先の管理 (_M)"
 
 #. Modify Transport
-#: ../src/roster_window.py:5658
+#: ../src/roster_window.py:5858
 msgid "_Modify Transport"
 msgstr "中継先の変更 (_M)"
 
 #. Rename
-#: ../src/roster_window.py:5668
+#: ../src/roster_window.py:5868
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
 # (Mako)ここでは「復元」の意味か
-#: ../src/roster_window.py:5728
+#: ../src/roster_window.py:5928
 msgid "_Maximize"
 msgstr "ウィンドウの復元 (_M)"
 
-#: ../src/roster_window.py:5737
+#: ../src/roster_window.py:5937
 msgid "_Reconnect"
 msgstr "再接続 (_R)"
 
-#: ../src/roster_window.py:5744
+#: ../src/roster_window.py:5944
 msgid "_Disconnect"
 msgstr "切断 (_D)"
 
 #. History manager
-#: ../src/roster_window.py:5833
+#: ../src/roster_window.py:6033
 msgid "History Manager"
 msgstr "履歴マネージャ"
 
-#: ../src/roster_window.py:5844
+#: ../src/roster_window.py:6044
 msgid "_Join New Group Chat"
 msgstr "新しいグループチャットに参加 (_J)"
 
-#: ../src/roster_window.py:6019
+#: ../src/roster_window.py:6263
 msgid "Change Status Message..."
 msgstr "状況メッセージを変更する..."
 
@@ -10303,21 +10204,16 @@ msgstr "ファイルを受ける際のエラー"
 msgid "No result"
 msgstr "見つかりません"
 
-#: ../src/session.py:136
+#: ../src/session.py:95
 msgid "Disk WriteError"
 msgstr "ディスクの書き込みエラー"
 
-#: ../src/session.py:258
-#, fuzzy, python-format
-msgid "Subject: %s"
-msgstr "件名: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:408 ../src/session.py:452
 msgid "Confirm these session options"
-msgstr ""
+msgstr "セッションのオプションを確認する"
 
-#: ../src/session.py:448
-#, fuzzy, python-format
+#: ../src/session.py:409
+#, python-format
 msgid ""
 "The remote client wants '\n"
 "                            'to negotiate an session with these features:\n"
@@ -10326,14 +10222,15 @@ msgid ""
 "\n"
 "Are these options acceptable?"
 msgstr ""
-"The remote client wants to negotiate an session with these features:\n"
+"遠くのクライアントが\n"
+"次の機能とともにセッションを確立しようとしています:\n"
 "\n"
 "\t%s\n"
 "\n"
-"\tAre these options acceptable?"
+"\tこれらのオプションを受け付けますか ?"
 
-#: ../src/session.py:492
-#, fuzzy, python-format
+#: ../src/session.py:453
+#, python-format
 msgid ""
 "The remote client selected these options:\n"
 "\n"
@@ -10341,22 +10238,21 @@ msgid ""
 "\n"
 "Continue with the session?"
 msgstr ""
-"The remote client selected these options:\n"
+"遠くのクライアントが次のオプションを選択しました:\n"
 "\n"
 "%s\n"
 "\n"
-"Continue with the session?"
+"セッションを続けますか ?"
 
-#: ../src/statusicon.py:227
+#: ../src/statusicon.py:228
 msgid "_Change Status Message..."
 msgstr "状況メッセージを変更する (_C)..."
 
-#: ../src/statusicon.py:339
-#, fuzzy
+#: ../src/statusicon.py:342
 msgid "Hide _Roster"
-msgstr "名簿で (_r)"
+msgstr "名簿を閉じる (_R)"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:353
 msgid "Hide this menu"
 msgstr "このメニューを表示しない"
 
@@ -10375,11 +10271,11 @@ msgstr "このグループチャットの %(owner_or_admin_or_member)s "
 
 #: ../src/tooltips.py:502
 msgid " [blocked]"
-msgstr "[拒否されています]"
+msgstr "遮断しています]"
 
 #: ../src/tooltips.py:506
 msgid " [minimized]"
-msgstr "[最小化されています]"
+msgstr "[最小化しています]"
 
 #: ../src/tooltips.py:521 ../src/tooltips.py:777
 msgid "Status: "
@@ -10413,34 +10309,34 @@ msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
 #: ../src/tooltips.py:646
-#, fuzzy, python-format
+#, python-format
 msgid "Idle since %s"
-msgstr " %s から"
+msgstr " %s から操作のない状態"
 
 #: ../src/tooltips.py:647
-#, fuzzy, python-format
+#, python-format
 msgid "Idle for %s"
-msgstr "%s の XML コンソール"
+msgstr "%s 間、操作のない状態"
 
 #: ../src/tooltips.py:698
-#, fuzzy, python-format
+#, python-format
 msgid "Mood: %s"
-msgstr "気分:"
+msgstr "気分: %s"
 
 #: ../src/tooltips.py:702
-#, fuzzy, python-format
+#, python-format
 msgid "Activity: %s"
-msgstr "動向:"
+msgstr "動向: %s"
 
 #: ../src/tooltips.py:706
-#, fuzzy, python-format
+#, python-format
 msgid "Tune: %s"
-msgstr "楽曲:"
+msgstr "楽曲: %s"
 
 #: ../src/tooltips.py:710
-#, fuzzy, python-format
+#, python-format
 msgid "Location: %s"
-msgstr "通知"
+msgstr "位置: %s"
 
 #: ../src/tooltips.py:735
 msgid "Download"
@@ -10451,7 +10347,6 @@ msgid "Upload"
 msgstr "アップロード"
 
 #: ../src/tooltips.py:748
-#, fuzzy
 msgid "Type: "
 msgstr "種類: "
 
@@ -10496,32 +10391,36 @@ msgstr ""
 "このサービスは詳細情報を返答することができません。\n"
 "古いか、または壊れています"
 
-#: ../src/vcard.py:265
+#: ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
+
+#: ../src/vcard.py:285
 msgid "?Client:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid "?OS:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:310
 msgid "?Time:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
 #, python-format
 msgid "since %s"
 msgstr "%s から"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:367
 msgid "?Role in Group Chat:<b>Role:</b>"
-msgstr ""
+msgstr "<b>å½¹:</b>"
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:371
 msgid "<b>Affiliation:</b>"
 msgstr "<b>分掌:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:379
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10529,7 +10428,7 @@ msgstr ""
 "この相手先はあなたの在席情報に関心があります。しかし、あなたはこの相手先の在"
 "席情報に関心がありません。"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:381
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10537,320 +10436,25 @@ msgstr ""
 "あなたは相手先の在席情報に関心があります。しかし、相手先はあなたの在席情報に"
 "関心がありません。"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:383
 msgid "You and the contact are interested in each other's presence information"
 msgstr "あなたと相手先は相互の在席情報に関心があります。"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:385
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "あなたも相手先も相互の在席情報に関心がありません。"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:392
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "あなたからの在席通知の申し込みに対する相手先からの回答を待っています。"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:394
 msgid "There is no pending subscription request."
 msgstr "保留中の在席通知の申し込みはありません。"
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
 msgid " resource with priority "
 msgstr " リソース。優先順位は "
-
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ msgid "_Disable showing event in systray"
-#~ msgstr "システムトレイへのイベントの表示をやめる (_D)"
-
-#~ msgid "_Show event in systray"
-#~ msgstr "イベントをシステムトレイに表示する (_S)"
-
-#, fuzzy
-#~ msgid "Autodetect on every Gajim startup"
-#~ msgstr "Gajim 起動時に接続する (_o)"
-
-#~ msgid "Show systray:"
-#~ msgstr "システムトレイに表示:"
-
-#, fuzzy
-#~ msgid "Nickname not allowed: %s"
-#~ msgstr "ニックネームは許されません: %s"
-
-#~ msgid "Room has been destroyed"
-#~ msgstr "談話室は閉鎖されました"
-
-#~ msgid "You can join this room instead: %s"
-#~ msgstr "代わりに次の談話室に参加します: %s"
-
-#~ msgid "I would like to add you to my roster."
-#~ msgstr "あなたを私の名簿に追加したいと思っています。"
-
-#~ 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/ のような名簿管理ツールを使ってくださ"
-#~ "い。"
-
-#~ msgid "Account Modification"
-#~ msgstr "アカウントの変更"
-
-# (Mako)broadcast 困った。しかたなくカタカナで
-#~ msgid ""
-#~ "Check this so Gajim will connect in port 5223 where legacy servers are "
-#~ "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
-#~ "default if broadcasted by the server, and with this option enabled TLS "
-#~ "will be disabled"
-#~ msgstr ""
-#~ "これをチェックすると、Gajim はポート 5223 で接続します。このポートは古いタ"
-#~ "イプのサーバーで SSL として期待されるものです。 サーバーによってブロード"
-#~ "キャストされる場合、Gajim のデフォルトでは TLS が用いられることに注意して"
-#~ "ください。またこのオプションを有効にすると TLS は無効とされることに注意し"
-#~ "てください。"
-
-#~ msgid "Edit Personal Information..."
-#~ msgstr "個人情報を編集する..."
-
-#~ msgid "Hostname: "
-#~ msgstr "ホスト名: "
-
-#~ msgid ""
-#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-#~ "permission only for you"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim はパスワードを ~/.gajim/config に保存し、ユー"
-#~ "ザーのみに「読み出し」を許可します"
-
-#~ msgid "Port: "
-#~ msgstr "ポート番号: "
-
-#~ msgid "Proxy:"
-#~ msgstr "プロキシ:"
-
-#~ msgid "Save _passphrase (insecure)"
-#~ msgstr "パスフレーズの保存 (安全ではない) (_p)"
-
-#~ msgid "Send keep-alive packets"
-#~ msgstr "生存パケットを送信する"
-
-#~ msgid "Use _SSL (legacy)"
-#~ msgstr "SSL を使う (旧式) (_S) "
-
-#~ msgid "_Adjust to status"
-#~ msgstr "在席状況に合わせる (_A)"
-
-#~ msgid ""
-#~ "Receive a Message\n"
-#~ "Contact Disconnected \n"
-#~ "Contact Change Status \n"
-#~ "Group Chat Message Highlight \n"
-#~ "Group Chat Message Received \n"
-#~ "File Transfer Request \n"
-#~ "File Transfer Started \n"
-#~ "File Transfer Finished"
-#~ msgstr ""
-#~ "メッセージを受信した\n"
-#~ "相手先が切断した\n"
-#~ "相手先の在席状況が変化した\n"
-#~ "グループチャットのメッセージを強調した\n"
-#~ "グループチャットのメッセージを受信した\n"
-#~ "ファイル転送の要求があった\n"
-#~ "ファイル転送の開始した\n"
-#~ "ファイル転送の完了した"
-
-#~ msgid ""
-#~ "contact(s)\n"
-#~ "group(s)\n"
-#~ "everybody"
-#~ msgstr ""
-#~ "相手先\n"
-#~ "グループ\n"
-#~ "すべて"
-
-#~ msgid ""
-#~ "Account row\n"
-#~ "Group row\n"
-#~ "Contact row\n"
-#~ "Chat Banner"
-#~ msgstr ""
-#~ "アカウント行\n"
-#~ "グループ行\n"
-#~ "相手先\n"
-#~ "チャットバナー"
-
-#~ msgid ""
-#~ "Enter JID or Contact name\n"
-#~ "Groupchat Histories\n"
-#~ "All Chat Histories"
-#~ msgstr ""
-#~ "JID または相手先名\n"
-#~ "グループチャットの履歴\n"
-#~ "すべてのチャットの履歴"
-
-#~ msgid "Manage Accounts"
-#~ msgstr "アカウントの管理"
-
-#~ msgid ""
-#~ "HTTP Connect\n"
-#~ "SOCKS5\n"
-#~ "BOSH"
-#~ msgstr ""
-#~ "HTTP 接続\n"
-#~ "SOCKS5\n"
-#~ "BOSH"
-
-#~ msgid "Send a file (Ctrl+F)"
-#~ msgstr "ファイルの送信 (Ctrl+F)"
-
-#~ msgid ""
-#~ "All chat states\n"
-#~ "Composing only\n"
-#~ "Disabled"
-#~ msgstr ""
-#~ "すべての状態\n"
-#~ "入力中のみ\n"
-#~ "通知しない"
-
-#~ msgid ""
-#~ "Autodetect on every Gajim startup\n"
-#~ "Always use GNOME default applications\n"
-#~ "Always use KDE default applications\n"
-#~ "Always use Xfce default applications\n"
-#~ "Custom"
-#~ msgstr ""
-#~ "Gajim の起動のたびにチェックする\n"
-#~ "常に GNOME のデフォルトのアプリケーション\n"
-#~ "常に KDE のデフォルトのアプリケーション\n"
-#~ "常に Xfce のデフォルトのアプリケーション\n"
-#~ "ここで設定"
-
-#~ msgid ""
-#~ "Detached roster with detached chats\n"
-#~ "Detached roster with single chat\n"
-#~ "Single window for everything\n"
-#~ "Detached roster with chat grouped by account\n"
-#~ "Detached roster with chat grouped by type"
-#~ msgstr ""
-#~ "名簿は別ウィンドウ、チャットは個々のウィンドウ\n"
-#~ "名簿は別ウィンドウ、チャットはひとつにまとめたウィンドウ\n"
-#~ "すべてをひとつのウィンドウ\n"
-#~ "名簿は別ウィンドウ、チャットはアカウントでまとめたウィンドウ\n"
-#~ "名簿は別ウィンドウ、チャットは種類でまとめたウィンドウ"
-
-#~ msgid ""
-#~ "Pop it up\n"
-#~ "Notify me about it\n"
-#~ "Show only in roster"
-#~ msgstr ""
-#~ "ポップアップする\n"
-#~ "それについて通知する\n"
-#~ "名簿に表示するだけ"
-
-#~ msgid "_Incoming message:"
-#~ msgstr "受信メッセージ (_I):"
-
-#~ msgid "_Outgoing message:"
-#~ msgstr "送信メッセージ (_O):"
-
-#, fuzzy
-#~ msgid ""
-#~ "none\n"
-#~ "both\n"
-#~ "from\n"
-#~ "to"
-#~ msgstr ""
-#~ "なし\n"
-#~ "両方\n"
-#~ "from\n"
-#~ "to"
-
-#~ msgid "_Quit"
-#~ msgstr "終了 (_Q)"
-
-#~ msgid "Enable"
-#~ msgstr "有効"
-
-#~ msgid "Invalid local address? :-O"
-#~ msgstr "ローカルアドレスが正しくありません。"
-
-#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-#~ msgstr ""
-#~ "pysqlite2 (旧 python-pysqlite2 ) の依存性が失われています。終了します..."
-
-#~ msgid ""
-#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
-#~ "not valid, so ignored."
-#~ msgstr ""
-#~ "詳細オプション ft_add_hosts_to_send で指定されたホスト %s は正しくありませ"
-#~ "ん。無視します。"
-
-#~ msgid "OpenPGP passphrase was not given"
-#~ msgstr "OpenPGP のパスフレーズがありません。"
-
-#~ msgid ""
-#~ "To continue sending and receiving messages, you will need to reconnect."
-#~ msgstr "メッセージの送受信を続けるには、再接続する必要があります。"
-
-#~ msgid ""
-#~ "You are not connected or not visible to others. Your message could not be "
-#~ "sent."
-#~ msgstr ""
-#~ "あなたは接続していないか、他から見えない状態です。メッセージは送信されませ"
-#~ "んでした。"
-
-#~ msgid "[This message is encrypted]"
-#~ msgstr "[このメッセージは暗号化されています]"
-
-#~ msgid "%i days ago"
-#~ msgstr "%i 日前"
-
-#~ msgid "Trayicon"
-#~ msgstr "トレイアイコン"
-
-#~ msgid "A icon in systemtray reflecting the current presence."
-#~ msgstr "システムトレイに現在の状態に応じたアイコンを表示します。"
-
-#~ msgid ""
-#~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
-#~ "sources."
-#~ msgstr ""
-#~ "python-gnome2-extras , または Gajim をソースからの trayicon モジュールのコ"
-#~ "ンパイルが必要です。"
-
-#~ msgid "Requires PyGTK >= 2.10."
-#~ msgstr "PyGTK (2.10以上) が必要です。"
-
-#~ msgid "Banners and clickable links"
-#~ msgstr "バナーとクリックできるリンク"
-
-#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
-#~ msgstr ""
-#~ "チャットウィンドウとグループチャットウィンドウのバナーで URL をクリックで"
-#~ "きるようにします。"
-
-#~ msgid "Requires python-sexy."
-#~ msgstr "python-sexy が必要です。"
-
-#~ msgid "GTK+ runtime is missing libglade support"
-#~ msgstr "GTK+ ランタイムが libglade をサポートしていません"
-
-#~ msgid ""
-#~ "Please remove your current GTK+ runtime and install the latest stable "
-#~ "version from %s"
-#~ msgstr ""
-#~ "現在の GTK+ ランタイムを削除し、%s から最新の安定バージョンをインストール"
-#~ "してください"
-
-#~ msgid ""
-#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
-#~ msgstr ""
-#~ "システムの GTK+ と PyGTK が libglade をサポートしていることを確認してくだ"
-#~ "さい。"
-
-#~ msgid "Gajim needs PySQLite2 to run"
-#~ msgstr "Gajim には PySQLite2 が必要です"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4f53053fe3f62a80fefe1162b460dda40e0be38c..85119f9c2ccf714209d74cfa3df57b9d309931a7 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -4,19 +4,14 @@
 # wwld <wwld@radio.lzusiyu.org>, 2005.
 # kangkang <kanger@gamil.com>, 2005.
 # Guanhao Yin <yinguanhao@gmail.com>, 2010.
-# Wei-Lun Chao <chaoweilun@gmail.com>, 2010.
-#
-#: ../src/gajim-remote-plugin.py:221 ../src/gajim-remote-plugin.py:228
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote-plugin.py:255
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote-plugin.py:262
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote-plugin.py:264
+# Wei-Lun Chao <chaoweilun@gmail.com>, 2011.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gajim \n"
+"Project-Id-Version: gajim 0.15a1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:53+0800\n"
-"PO-Revision-Date: 2010-11-04 23:10+0800\n"
+"POT-Creation-Date: 2011-09-07 22:43+0800\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"
 "Language: zh_TW\n"
@@ -33,7 +28,7 @@ msgstr "加入聊天室(_G)…"
 msgid "_Add Contact..."
 msgstr "加入聯絡人(_A)…"
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:19
 msgid "_Discover Services"
 msgstr "探索服務(_D)"
 
@@ -72,7 +67,7 @@ msgstr ""
 
 #: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
-msgstr "<b>請選擇一個選項</b>: "
+msgstr "<b>請選擇一個選項</b>:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
@@ -121,18 +116,18 @@ msgstr "管理…"
 
 #: ../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:1280 ../src/config.py:1383 ../src/config.py:1694
-#: ../src/config.py:1699 ../src/config.py:2265 ../src/config.py:2344
-#: ../src/config.py:2357 ../src/config.py:3612 ../src/config.py:3687
-#: ../src/dialogs.py:309 ../src/dialogs.py:311 ../src/dialogs.py:517
-#: ../src/dialogs.py:530 ../src/roster_window.py:2967
-#: ../src/roster_window.py:2973 ../src/roster_window.py:2978
+#: ../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:3654 ../src/config.py:3729
+#: ../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 "ç„¡"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
 msgid "Prox_y:"
-msgstr "代理伺服器(_Y): "
+msgstr "代理伺服器(_Y):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
 #: ../data/gui/accounts_window.ui.h:48
@@ -156,7 +151,7 @@ msgstr ""
 "Jabber 網路"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
+#: ../data/gui/roster_window.ui.h:17
 msgid "_Advanced"
 msgstr "進階(_A)"
 
@@ -166,25 +161,27 @@ msgstr "完成(_F)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Hostname:"
-msgstr "主機名稱(_H): "
+msgstr "主機名稱(_H):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
+#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "_Password:"
-msgstr "密碼(_P): "
+msgstr "密碼(_P):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
 msgid "_Port:"
-msgstr "連接埠(_P)"
+msgstr "連接埠(_P):"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
+#: ../data/gui/manage_bookmarks_window.ui.h:9
 msgid "_Server:"
-msgstr "伺服器(_S): "
+msgstr "伺服器(_S):"
 
 #: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
@@ -235,17 +232,17 @@ msgid "C_onnect on Gajim startup"
 msgstr "Gajim 啟動時連線(_O)"
 
 #: ../data/gui/accounts_window.ui.h:13
+msgid "Certificate is e_ncrypted"
+msgstr "憑證已加密(_N)"
+
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Chan_ge Password"
 msgstr "變更密碼(_G)"
 
-#: ../data/gui/accounts_window.ui.h:14
+#: ../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:15
-msgid "Choose Client Cert"
-msgstr "選擇客戶端證書"
-
 #: ../data/gui/accounts_window.ui.h:16
 msgid "Choose _Key..."
 msgstr "選擇密鑰(_K)…"
@@ -273,27 +270,28 @@ msgstr "連線"
 #: ../data/gui/accounts_window.ui.h:22
 #: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "E-Mail:"
-msgstr "E-Mail : "
+msgstr "E-Mail:"
 
 #: ../data/gui/accounts_window.ui.h:23
 #: ../data/gui/zeroconf_information_window.ui.h:3
 msgid "First Name:"
-msgstr "名稱: "
+msgstr "名稱:"
 
 #. No configured account
 #: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
+#: ../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"
 
 #. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
+#. 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:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2909 ../src/roster_window.py:5434
+#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:56
+#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:124
+#: ../src/roster_window.py:3034 ../src/roster_window.py:5652
 msgid "General"
 msgstr "一般"
 
@@ -330,22 +328,22 @@ 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:1817
-#: ../src/dialogs.py:833
+#: ../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 "姓: "
+msgstr "姓:"
 
 #: ../data/gui/accounts_window.ui.h:37
 msgid "Mer_ge accounts"
 msgstr "合併帳號(_G)"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
+#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1799
+#: ../src/config.py:2377
 msgid "No key selected"
 msgstr "沒有選擇密鑰"
 
@@ -368,13 +366,13 @@ msgid "Priority will change automatically according to your status."
 msgstr "優先等級將根據您的狀態自動轉換。"
 
 #. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5384
+#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5602
 msgid "Re_name"
 msgstr "重新命名(_N)"
 
 #: ../data/gui/accounts_window.ui.h:45
 msgid "Resour_ce:"
-msgstr "資源(_C): "
+msgstr "資源(_C):"
 
 #: ../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)"
@@ -405,61 +403,57 @@ msgid "Synchronise contacts"
 msgstr "同步聯絡人"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr "客戶端證書路徑(PKCS#12 格式)"
-
-#: ../data/gui/accounts_window.ui.h:54
 msgid "Use G_PG Agent"
 msgstr "使用 G_PG Agent"
 
-#: ../data/gui/accounts_window.ui.h:55
+#: ../data/gui/accounts_window.ui.h:54
 msgid "Use cust_om hostname/port"
 msgstr "使用自訂主機名稱/連接埠號碼"
 
-#: ../data/gui/accounts_window.ui.h:56
+#: ../data/gui/accounts_window.ui.h:55
 msgid "Use cust_om port:"
-msgstr "使用自訂連接埠號碼: "
+msgstr "使用自訂連接埠號碼:"
 
-#: ../data/gui/accounts_window.ui.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "Use file transfer proxies"
 msgstr "使用檔案傳輸代理伺服器"
 
-#: ../data/gui/accounts_window.ui.h:58
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Client Cert File:"
 msgstr "客戶端證書檔案(_C)"
 
-#: ../data/gui/accounts_window.ui.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Edit Personal Information..."
 msgstr "編輯個人資訊…"
 
 #. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
+#: ../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:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Hostname: "
 msgstr "主機名稱(_H): "
 
-#: ../data/gui/accounts_window.ui.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_Manage..."
 msgstr "管理…"
 
-#: ../data/gui/accounts_window.ui.h:65
+#: ../data/gui/accounts_window.ui.h:64
 msgid "_Port: "
 msgstr "連接埠號碼(_P): "
 
-#: ../data/gui/accounts_window.ui.h:66
+#: ../data/gui/accounts_window.ui.h:65
 msgid "_Warn before using an insecure connection"
 msgstr "在使用不安全的連線之前警告(_W)"
 
-#: ../data/gui/accounts_window.ui.h:67
+#: ../data/gui/accounts_window.ui.h:66
 msgid "_use HTTP__PROXY environment variable"
 msgstr "使用 HTTP__PROXY 環境變數(_U)"
 
 #: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
-msgstr "帳號(_C): "
+msgstr "帳號(_C):"
 
 #: ../data/gui/add_new_contact_window.ui.h:2
 msgid "A_llow this contact to view my status"
@@ -494,19 +488,20 @@ msgstr ""
 
 #: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
-msgstr "群組(_G): "
+msgstr "群組(_G):"
 
 #: ../data/gui/add_new_contact_window.ui.h:12
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "_Nickname:"
-msgstr "暱稱(_N): "
+msgstr "暱稱(_N):"
 
 #: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
-msgstr "協定(_P): "
+msgstr "協定(_P):"
 
 #: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
-msgstr "註冊(_G): "
+msgstr "註冊(_G):"
 
 #: ../data/gui/add_new_contact_window.ui.h:15
 msgid "_Save subscription message"
@@ -518,7 +513,7 @@ msgstr "使用者 ID(_U):"
 
 #: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
-msgstr "<b>發生了一個錯誤: </b>"
+msgstr "<b>發生了一個錯誤:</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
@@ -563,7 +558,7 @@ msgstr "<b>描述</b>"
 
 #: ../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 以使某些設定生效"
+msgstr "<b>注意:</b>您必須重新啟動 gajim 以使某些設定生效"
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
@@ -571,7 +566,7 @@ msgstr "進階設定編輯器"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
-msgstr "過濾器: "
+msgstr "過濾器:"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Delete MOTD"
@@ -621,179 +616,6 @@ msgstr "管理員(_A)"
 msgid "_Send Server Message..."
 msgstr "傳送伺服器訊息(_S)…"
 
-#: ../data/gui/advanced_notifications_window.ui.h:1
-msgid " a window/tab opened with that contact "
-msgstr "與此聯絡人聊天時開啟的視窗/標籤"
-
-#: ../data/gui/advanced_notifications_window.ui.h:2
-msgid "<b>Actions</b>"
-msgstr "<b>動作</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:3
-msgid "<b>Conditions</b>"
-msgstr "<b>條件</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:4
-#: ../data/gui/preferences_window.ui.h:17
-msgid "<b>Sounds</b>"
-msgstr "<b>聲音</b>"
-
-#: ../data/gui/advanced_notifications_window.ui.h:5
-msgid "Advanced Actions"
-msgstr "進階動作"
-
-#: ../data/gui/advanced_notifications_window.ui.h:6
-msgid "Advanced Notifications Control"
-msgstr "進階通知控制項設定"
-
-#: ../data/gui/advanced_notifications_window.ui.h:7
-msgid "All statuses"
-msgstr "所有狀態"
-
-#: ../data/gui/advanced_notifications_window.ui.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:239
-#: ../src/tooltips.py:193
-msgid "Away"
-msgstr "離開"
-
-#: ../data/gui/advanced_notifications_window.ui.h:9
-msgid "Busy "
-msgstr "忙碌"
-
-#: ../data/gui/advanced_notifications_window.ui.h:10
-msgid "Contact Change Status "
-msgstr "聯絡人變更了狀態"
-
-#: ../data/gui/advanced_notifications_window.ui.h:11
-msgid "Contact Disconnected "
-msgstr "聯絡人已中斷連線"
-
-#: ../data/gui/advanced_notifications_window.ui.h:12
-msgid "Don't have "
-msgstr "沒有"
-
-#: ../data/gui/advanced_notifications_window.ui.h:13
-msgid "File Transfer Finished"
-msgstr "檔案傳輸完畢"
-
-#: ../data/gui/advanced_notifications_window.ui.h:14
-msgid "File Transfer Request "
-msgstr "檔案傳輸請求"
-
-#: ../data/gui/advanced_notifications_window.ui.h:15
-msgid "File Transfer Started "
-msgstr "檔案傳輸開始"
-
-#: ../data/gui/advanced_notifications_window.ui.h:16
-msgid "Group Chat Message Highlight "
-msgstr "多人聊天訊息高亮度顯示"
-
-#: ../data/gui/advanced_notifications_window.ui.h:17
-msgid "Group Chat Message Received "
-msgstr "收到多人聊天訊息"
-
-#: ../data/gui/advanced_notifications_window.ui.h:18
-msgid "Have "
-msgstr "有"
-
-#: ../data/gui/advanced_notifications_window.ui.h:19
-#: ../src/common/helpers.py:249
-msgid "Invisible"
-msgstr "隱身"
-
-#: ../data/gui/advanced_notifications_window.ui.h:20
-msgid "Launch a command"
-msgstr "執行命令"
-
-#: ../data/gui/advanced_notifications_window.ui.h:21
-#: ../src/common/helpers.py:222 ../src/tooltips.py:197
-msgid "Not Available"
-msgstr "離開很久了"
-
-#: ../data/gui/advanced_notifications_window.ui.h:22
-msgid "One or more special statuses..."
-msgstr "一或多個指定的狀態…"
-
-#: ../data/gui/advanced_notifications_window.ui.h:23
-msgid "Online / Free For Chat"
-msgstr "線上/和我聊天吧"
-
-#: ../data/gui/advanced_notifications_window.ui.h:24
-msgid "Play a sound"
-msgstr "播放聲音"
-
-#: ../data/gui/advanced_notifications_window.ui.h:25
-msgid "Receive a Message"
-msgstr "收到一條訊息"
-
-#: ../data/gui/advanced_notifications_window.ui.h:26
-msgid "When "
-msgstr "當"
-
-#: ../data/gui/advanced_notifications_window.ui.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "啟用視窗管理器事件提示使工作列的聊天視窗閃爍(_A)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:28
-msgid "_Disable auto opening chat window"
-msgstr "停用自動開啟聊天視窗(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:29
-msgid "_Disable existing popup window"
-msgstr "停用現有的彈出視窗(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:30
-msgid "_Disable existing sound for this event"
-msgstr "停用現有的此事件的聲音(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:31
-msgid "_Disable showing event in notification area"
-msgstr "停用在通知區域中顯示事件(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:32
-msgid "_Disable showing event in roster"
-msgstr "停用在聯絡人清單中顯示事件(_D)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:33
-msgid "_Inform me with a popup window"
-msgstr "使用彈出視窗通知(_I)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:34
-msgid "_Open chat window with user"
-msgstr "與使用者開啟聊天視窗(_O)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:35
-msgid "_Show event in notification area"
-msgstr "在通知區域中顯示事件(_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "在聯絡人清單中顯示事件(_S)"
-
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "與我"
-
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "聯絡人"
-
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "每個人"
-
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "為"
-
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "群組"
-
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "當我在"
-
 #: ../data/gui/archiving_preferences_window.ui.h:1
 msgid "<i>Method Auto</i>"
 msgstr "<i>Method Auto</i>"
@@ -856,14 +678,14 @@ msgstr "被阻斷的聯絡人"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
 #: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5403
-#: ../src/roster_window.py:5531 ../src/roster_window.py:5664
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/roster_window.py:5621
+#: ../src/roster_window.py:5748 ../src/roster_window.py:5881
 msgid "_Unblock"
 msgstr "解除阻斷(_U)"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
-msgstr "<b>訊息: </b>"
+msgstr "<b>訊息:</b>"
 
 #: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
@@ -875,11 +697,11 @@ msgstr "設定活動"
 
 #: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
-msgstr "<b>訊息: </b>"
+msgstr "<b>訊息:</b>"
 
 #: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
-msgstr "<b>心情: </b>"
+msgstr "<b>心情:</b>"
 
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
@@ -887,7 +709,7 @@ msgstr "變更密碼"
 
 #: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
-msgstr "再次輸入以確認: "
+msgstr "再次輸入以確認:"
 
 #: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
@@ -899,15 +721,15 @@ msgstr "<b>輸入新的狀態訊息</b>"
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
 msgid "Activity:"
-msgstr "活動: "
+msgstr "活動:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:3
 msgid "Mood:"
-msgstr "心情: "
+msgstr "心情:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
-msgstr "預設的訊息: "
+msgstr "預設的訊息:"
 
 #: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
@@ -944,8 +766,7 @@ msgstr "在瀏覽器中開啟連結(_O)"
 msgid "_Start Chat"
 msgstr "開始聊天(_S)"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4598
+#: ../data/gui/chat_control.ui.h:1
 msgid "#"
 msgstr "#"
 
@@ -1031,7 +852,7 @@ msgstr "切換視訊作業階段"
 
 #. 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:266
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:275
 msgid "_Send"
 msgstr "傳送(_S)"
 
@@ -1085,8 +906,9 @@ msgstr "編輯群組(_G)…"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5499
+#: ../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
 msgid "In_vite to"
 msgstr "邀請到(_V)"
 
@@ -1098,12 +920,12 @@ msgstr "邀請聯絡人(_C)"
 msgid "Remo_ve"
 msgstr "移除(_R)"
 
-#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5349
-#: ../src/roster_window.py:5588
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5567
+#: ../src/roster_window.py:5805
 msgid "Send Cus_tom Status"
 msgstr "傳送個性化狀態(_T)"
 
-#: ../data/gui/contact_context_menu.ui.h:10
+#: ../data/gui/contact_context_menu.ui.h:10 ../data/gui/roster_window.ui.h:10
 msgid "Send Single _Message..."
 msgstr "傳送單條訊息(_M)…"
 
@@ -1132,8 +954,8 @@ msgid "_Allow him/her to see my status"
 msgstr "允許他/她檢視我的狀態(_A)"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5411
-#: ../src/roster_window.py:5537 ../src/roster_window.py:5667
+#: ../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)"
 
@@ -1143,8 +965,8 @@ 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:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5738
+#: ../data/gui/gc_occupants_menu.ui.h:9 ../data/gui/roster_window.ui.h:23
+#: ../src/roster_window.py:5955
 msgid "_History"
 msgstr "命令歷程(_H)"
 
@@ -1246,7 +1068,7 @@ msgstr ""
 msgid "When a file transfer is complete show a popup notification"
 msgstr "當檔案傳輸完成時彈出提示"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
+#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:798
 msgid "_Continue"
 msgstr "繼續(_C)"
 
@@ -1274,7 +1096,7 @@ msgstr "<b>各聊天狀態下標籤顏色</b>"
 msgid "Account row"
 msgstr "帳號"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:956
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:1029
 msgid "Bold"
 msgstr "ç²—é«”"
 
@@ -1292,7 +1114,7 @@ msgstr "聯絡人"
 
 #: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
-msgstr "字型風格: "
+msgstr "字型風格:"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
@@ -1310,7 +1132,7 @@ msgstr "群組"
 msgid "Inactive"
 msgstr "未活動的"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:957
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:1030
 msgid "Italic"
 msgstr "斜體"
 
@@ -1336,11 +1158,11 @@ msgstr "暫停編輯"
 
 #: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
-msgstr "文字顏色(_C): "
+msgstr "文字顏色(_C):"
 
 #: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
-msgstr "文字字型(_F): "
+msgstr "文字字型(_F):"
 
 #: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
@@ -1374,47 +1196,51 @@ msgstr "管理聊天室(_M)"
 msgid "_Minimize on close"
 msgstr "關閉時最小化視窗"
 
-#: ../data/gui/gc_occupants_menu.ui.h:1
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+msgid "_Request Voice"
+msgstr "要求語音(_R)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Mo_derator"
 msgstr "仲裁人(_D)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Occupant Actions"
 msgstr "室友動作"
 
-#: ../data/gui/gc_occupants_menu.ui.h:3
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "Send _File"
 msgstr "傳送檔案(_F)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Add to Roster"
 msgstr "加入至聯絡人清單(_A)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Admin"
 msgstr "管理(_A)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Ban"
 msgstr "封禁(_B)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:10
 msgid "_Kick"
 msgstr "踢除(_K)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:11
 msgid "_Member"
 msgstr "成員(_M)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:12
 msgid "_Owner"
 msgstr "所有人(_O)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:12
+#: ../data/gui/gc_occupants_menu.ui.h:13
 msgid "_Send Private Message"
 msgstr "傳送私人聊天訊息(_S)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:15
 msgid "_Voice"
 msgstr "語音(_V)"
 
@@ -1437,19 +1263,19 @@ msgstr "建立新訊息"
 #: ../data/gui/groups_post_window.ui.h:2
 #: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
-msgstr "從: "
+msgstr "從:"
 
 #: ../data/gui/groups_post_window.ui.h:3
 #: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
-msgstr "主題: "
+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"
+"<b>警告:</b>\n"
 "如果您要進行大量的刪除，請確認 Gajim 不再執行。\n"
 "一般而言，如果您正在與某個聯絡人聊天，請不要刪除與他的聊天記錄。"
 
@@ -1457,21 +1283,15 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>歡迎使用 Gajim 命令歷程記錄管理器</b></big>"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/gui/history_manager.ui.h:4 ../src/dialogs.py:3226
-#: ../src/dialogs.py:3323
-msgid "Delete"
-msgstr "刪除"
-
-#: ../data/gui/history_manager.ui.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "匯出"
 
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim 命令歷程記錄管理器"
 
-#: ../data/gui/history_manager.ui.h:7
+#: ../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\n"
 "Use this program to delete or export logs. You can select logs from the left and/or search database from below."
@@ -1479,7 +1299,7 @@ msgstr ""
 "這個命令歷程記錄管理器並非為了瀏覽命令歷程記錄而設計。如果您需要瀏覽命令歷程記錄，請使用命令歷程視窗。\n\n"
 "使用這個程式來刪除或匯出命令歷程記錄。您可以在左側進行選擇且/或在下方進行搜尋。"
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "搜尋資料庫(_S)"
 
@@ -1501,7 +1321,7 @@ msgstr "多人聊天命令歷程"
 
 #: ../data/gui/history_window.ui.h:5
 msgid "Search:"
-msgstr "搜尋: "
+msgstr "搜尋:"
 
 #: ../data/gui/history_window.ui.h:6
 #: ../data/gui/zeroconf_information_window.ui.h:10
@@ -1533,13 +1353,11 @@ msgid "forbid"
 msgstr "forbid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:229
 msgid "jid"
 msgstr "jid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote-plugin.py:128
-#: ../src/gajim-remote-plugin.py:142 ../src/gajim-remote-plugin.py:153
 #: ../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
@@ -1574,7 +1392,7 @@ msgstr "stream"
 msgid "Bro_wse Rooms"
 msgstr "Bro_wse Rooms"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2198
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2328
 msgid "Join Group Chat"
 msgstr "加入多人聊天"
 
@@ -1583,41 +1401,37 @@ msgid "Join this room _automatically when I connect"
 msgstr "當我連線後自動加入此聊天室(_A)"
 
 #: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
-msgstr "暱稱: "
+msgstr "暱稱:"
 
 #: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
-msgstr "密碼: "
+msgstr "密碼:"
 
 #: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
-msgstr "最近: "
+msgstr "最近:"
 
 #: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
-msgstr "聊天室: "
+msgstr "聊天室:"
 
-#: ../data/gui/join_groupchat_window.ui.h:9
-#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1807
+#: ../data/gui/join_groupchat_window.ui.h:9 ../src/config.py:1816
 msgid "Server:"
-msgstr "伺服器: "
+msgstr "伺服器:"
 
 #: ../data/gui/join_groupchat_window.ui.h:10
 msgid "_Bookmark this room"
 msgstr "將本聊天室加入書籤(_B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1361
 #: ../src/disco.py:1804
 msgid "_Join"
 msgstr "加入(_J)"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "自動加入"
+msgid "A_uto join"
+msgstr "自動聯結(_U)"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
@@ -1628,16 +1442,20 @@ msgid "Manage Bookmarks"
 msgstr "書籤管理"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "自動加入時最小化"
+msgid "Minimi_ze on Auto Join"
+msgstr "自動聯結時縮到最小(_Z)"
 
-#: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
-msgstr "顯示狀態: "
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+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 "標題: "
+msgid "_Title:"
+msgstr "標題(_T):"
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1673,11 +1491,11 @@ msgstr "密碼(_W)"
 
 #: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
-msgstr "代理伺服器位址(_H): "
+msgstr "代理伺服器位址(_H):"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
-msgstr "代理伺服器連接埠(_P): "
+msgstr "代理伺服器連接埠(_P):"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
 msgid "SOCKS5"
@@ -1697,15 +1515,15 @@ msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
 msgid "_Name:"
-msgstr "名稱(_N): "
+msgstr "名稱(_N):"
 
 #: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
-msgstr "é¡žåž‹(_T): "
+msgstr "é¡žåž‹(_T):"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
-msgstr "使用者名稱(_U): "
+msgstr "使用者名稱(_U):"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
@@ -1721,53 +1539,45 @@ msgstr "<empty>"
 
 #: ../data/gui/plugins_window.ui.h:3
 msgid "Authors:"
-msgstr "作者: "
+msgstr "作者:"
 
 #: ../data/gui/plugins_window.ui.h:4
-msgid "Available"
-msgstr "線上"
-
-#: ../data/gui/plugins_window.ui.h:5
 msgid "Configure"
 msgstr "配置"
 
+#: ../data/gui/plugins_window.ui.h:5
+msgid "Description:"
+msgstr "描述:"
+
 #: ../data/gui/plugins_window.ui.h:6
-msgid "Descrition:"
-msgstr "描述: "
+msgid "Homepage:"
+msgstr "首頁:"
 
 #: ../data/gui/plugins_window.ui.h:7
-msgid "Homepage:"
-msgstr "首頁: "
+msgid "Install from zip"
+msgstr "從 zip 檔安裝"
 
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
-msgstr "安裝"
-
-#: ../data/gui/plugins_window.ui.h:9
 msgid "Installed"
 msgstr "已安裝"
 
-#: ../data/gui/plugins_window.ui.h:10
+#: ../data/gui/plugins_window.ui.h:9
 msgid "Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization."
 msgstr "外掛程式的描述會被顯示在這裡。這些文字在外掛程式視窗初始化時將被去除"
 
-#: ../data/gui/plugins_window.ui.h:11
+#: ../data/gui/plugins_window.ui.h:10
 msgid "Plugins"
 msgstr "外掛程式"
 
-#: ../data/gui/plugins_window.ui.h:12
+#: ../data/gui/plugins_window.ui.h:11
 msgid "Uninstall"
 msgstr "卸載"
 
-#: ../data/gui/plugins_window.ui.h:13
+#: ../data/gui/plugins_window.ui.h:12
 msgid "Version:"
-msgstr "版本: "
-
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
-msgstr "按鈕"
+msgstr "版本:"
 
-#: ../data/gui/plugins_window.ui.h:15
+#: ../data/gui/plugins_window.ui.h:13
 msgid "homepage url"
 msgstr "首頁連結"
 
@@ -1836,6 +1646,10 @@ msgstr "<b>隱私策略</b>"
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>聯絡人清單外觀</b>"
 
+#: ../data/gui/preferences_window.ui.h:17
+msgid "<b>Sounds</b>"
+msgstr "<b>聲音</b>"
+
 #: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>狀態訊息</b>"
@@ -1861,219 +1675,219 @@ msgid "Advanced"
 msgstr "進階"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "進階…"
-
-#: ../data/gui/preferences_window.ui.h:25
 msgid "All chat states"
 msgstr "所有聊天狀態"
 
-#: ../data/gui/preferences_window.ui.h:26
+#: ../data/gui/preferences_window.ui.h:25
 msgid "Allow _OS information to be sent"
 msgstr "允許傳送關於作業系統的資訊(_O)"
 
-#: ../data/gui/preferences_window.ui.h:27
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow my _idle time to be sent"
 msgstr "允許傳送關於閒置時間的資訊(_I)"
 
-#: ../data/gui/preferences_window.ui.h:28
+#: ../data/gui/preferences_window.ui.h:27
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "允許彈出提示，當我離開/無法使用/忙/隱身(_A)"
 
-#: ../data/gui/preferences_window.ui.h:29
+#: ../data/gui/preferences_window.ui.h:28
 msgid "Allow sound when I'm _busy"
 msgstr "在我忙碌時允許播放聲音(_B)"
 
-#: ../data/gui/preferences_window.ui.h:30
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Always"
 msgstr "總是"
 
-#: ../data/gui/preferences_window.ui.h:31
+#: ../data/gui/preferences_window.ui.h:30
 msgid "Ask status message when I:"
-msgstr "詢問狀態訊息，當我: "
+msgstr "詢問狀態訊息，當我:"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
+#: ../data/gui/preferences_window.ui.h:31 ../src/features_window.py:106
 msgid "Audio / Video"
 msgstr "音訊/視訊"
 
-#: ../data/gui/preferences_window.ui.h:33
+#: ../data/gui/preferences_window.ui.h:32
 msgid "Audio input device"
 msgstr "音訊輸入裝置"
 
-#: ../data/gui/preferences_window.ui.h:34
+#: ../data/gui/preferences_window.ui.h:33
 msgid "Audio output device"
 msgstr "音訊輸出裝置"
 
-#: ../data/gui/preferences_window.ui.h:35
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Chat message:"
-msgstr "聊天訊息: "
+msgstr "聊天訊息:"
 
-#: ../data/gui/preferences_window.ui.h:36
+#: ../data/gui/preferences_window.ui.h:35
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "在啟動是偵測 Gajim 是否是預設的 Jabber 客戶端程式"
 
-#: ../data/gui/preferences_window.ui.h:37
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Composing only"
 msgstr "僅正在編輯"
 
-#: ../data/gui/preferences_window.ui.h:38
+#: ../data/gui/preferences_window.ui.h:37
 msgid "Configure color and font of the interface"
 msgstr "配置介面顏色與字型"
 
-#: ../data/gui/preferences_window.ui.h:39
+#: ../data/gui/preferences_window.ui.h:38
 msgid "Contact's message:"
-msgstr "聯絡人訊息: "
+msgstr "聯絡人訊息:"
 
-#: ../data/gui/preferences_window.ui.h:40
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Contact's nickname:"
 msgstr "聯絡人暱稱"
 
-#: ../data/gui/preferences_window.ui.h:41
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Custom"
 msgstr "自訂"
 
-#: ../data/gui/preferences_window.ui.h:42
+#: ../data/gui/preferences_window.ui.h:41
 msgid "Detached roster with chat grouped by account"
 msgstr "聊天視窗與聯絡人清單分離，依據帳號分組"
 
-#: ../data/gui/preferences_window.ui.h:43
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Detached roster with chat grouped by type"
 msgstr "聊天視窗與聯絡人清單分離，依據類型分組"
 
-#: ../data/gui/preferences_window.ui.h:44
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Detached roster with detached chats"
 msgstr "聊天視窗與聯絡人清單分離，且互相分離"
 
-#: ../data/gui/preferences_window.ui.h:45
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Detached roster with single chat"
 msgstr "單一聊天視窗，與聯絡人清單分離"
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
+#: ../data/gui/preferences_window.ui.h:45 ../src/config.py:170
+#: ../src/config.py:672
 msgid "Disabled"
 msgstr "停用"
 
-#: ../data/gui/preferences_window.ui.h:47
+#: ../data/gui/preferences_window.ui.h:46
 msgid "Display _activity of contacts in roster"
 msgstr "在聯絡人清單中顯示聯絡人的活動(_A)"
 
-#: ../data/gui/preferences_window.ui.h:48
+#: ../data/gui/preferences_window.ui.h:47
 msgid "Display _extra email details"
 msgstr "顯示額外的郵件資訊(_E)"
 
-#: ../data/gui/preferences_window.ui.h:49
+#: ../data/gui/preferences_window.ui.h:48
 msgid "Display _location of contacts in roster"
 msgstr "在聯絡人清單中顯示聯絡人的位置資訊(_L)"
 
-#: ../data/gui/preferences_window.ui.h:50
+#: ../data/gui/preferences_window.ui.h:49
 msgid "Display _tunes of contacts in roster"
 msgstr "在聯絡人清單中顯示聯絡人正在播放音樂的資訊(_T)"
 
-#: ../data/gui/preferences_window.ui.h:51
+#: ../data/gui/preferences_window.ui.h:50
 msgid "Display a_vatars of contacts in roster"
 msgstr "在聯絡人清單顯示中聯絡人的頭像(_V)"
 
-#: ../data/gui/preferences_window.ui.h:52
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display m_ood of contacts in roster"
 msgstr "在聯絡人清單中顯示聯絡人的心情(_O)"
 
-#: ../data/gui/preferences_window.ui.h:53
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display status _messages of contacts in roster"
 msgstr "在聯絡人清單中顯示聯絡人的狀態資訊(_M)"
 
-#: ../data/gui/preferences_window.ui.h:54
+#: ../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"
 "視窗中顯示的聊天狀態資訊。"
 
-#: ../data/gui/preferences_window.ui.h:55
+#: ../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 可以收發您與聯絡人正在進行對話的相關資訊。此處您可以指定要發給第三方的聊天狀態資訊。"
 
-#: ../data/gui/preferences_window.ui.h:56
+#: ../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 會透過螢幕右下方的彈出氣泡提示剛剛離開的聯絡人"
 
-#: ../data/gui/preferences_window.ui.h:58
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Hide all buttons in chat windows"
 msgstr "在聊天視窗中隱藏所有按鈕"
 
-#: ../data/gui/preferences_window.ui.h:59
+#: ../data/gui/preferences_window.ui.h:58
 msgid "If checked, Gajim will allow others to detect the operation system you are using"
 msgstr "如果選取，Gajim 會允許他人偵測到您所使用的作業系統"
 
-#: ../data/gui/preferences_window.ui.h:60
+#: ../data/gui/preferences_window.ui.h:59
 msgid "If checked, Gajim will also include information about the sender of the new emails"
 msgstr "如果選取，Gajim 將同時包含新電子郵件傳送者的資訊"
 
-#: ../data/gui/preferences_window.ui.h:61
+#: ../data/gui/preferences_window.ui.h:60
 msgid "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "如果選取，Gajim 在電腦閒置時會將您的狀態設定為離開。"
 
-#: ../data/gui/preferences_window.ui.h:62
+#: ../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 會在電腦閒置更長時間後將您的狀態設定為離開很久了。"
 
-#: ../data/gui/preferences_window.ui.h:63
+#: ../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 會在聯絡人清單和多人聊天視窗中顯示聯絡人清單中的聯絡人細節"
 
-#: ../data/gui/preferences_window.ui.h:64
+#: ../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"
 msgstr "如果選取，Gajim 會在聯絡人清單和多人聊天視窗中聯絡人名稱下方顯示聯絡人狀態訊息"
 
-#: ../data/gui/preferences_window.ui.h:65
+#: ../data/gui/preferences_window.ui.h:64
 msgid "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的活動。"
 
-#: ../data/gui/preferences_window.ui.h:66
+#: ../data/gui/preferences_window.ui.h:65
 msgid "If checked, Gajim will display the location of contacts in the roster window"
 msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的位置。"
 
-#: ../data/gui/preferences_window.ui.h:67
+#: ../data/gui/preferences_window.ui.h:66
 msgid "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人的心情。"
 
-#: ../data/gui/preferences_window.ui.h:68
+#: ../data/gui/preferences_window.ui.h:67
 msgid "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr "如果選取，Gajim 會在聯絡人清單視窗中顯示聯絡人正在播放的音樂。"
 
-#: ../data/gui/preferences_window.ui.h:69
+#: ../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"
 "使用。"
 
-#: ../data/gui/preferences_window.ui.h:70
+#: ../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 會忽略未認證的聯絡人引發的事件。請謹慎使用，因為這將阻斷所有不在聯絡人清單中的聯絡人發來的訊息。"
 
-#: ../data/gui/preferences_window.ui.h:71
+#: ../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 不會記錄。"
 
-#: ../data/gui/preferences_window.ui.h:72
+#: ../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 收到新的電子郵件是會顯示一個通知"
 
-#: ../data/gui/preferences_window.ui.h:73
+#: ../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...)"
 msgstr ""
 "如果選取，Gajim 會以協定特定的方式顯示狀態圖示。(例如，MSN 聯絡人會以同\n"
 "MSN 相同的圖示顯示線上，離開，忙，等等狀態…)"
 
-#: ../data/gui/preferences_window.ui.h:74
+#: ../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:75
+#: ../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 會用相對的動態或靜態的圖形代替字元表情，例如':)'"
 
+#: ../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)"
@@ -2138,11 +1952,11 @@ msgstr "STUN 伺服器的主機名稱。如果沒有給出，Gajim 會嘗試從
 
 #: ../data/gui/preferences_window.ui.h:92
 msgid "STUN server:"
-msgstr "STUN 伺服器: "
+msgstr "STUN 伺服器:"
 
 #: ../data/gui/preferences_window.ui.h:93
 msgid "Show notification area icon:"
-msgstr "在通知區域顯示圖示: "
+msgstr "在通知區域顯示圖示:"
 
 #: ../data/gui/preferences_window.ui.h:94
 msgid "Show only in roster"
@@ -2168,13 +1982,13 @@ msgstr "一些訊息會包含豐富的內容(例如格式，顏色等)。如果
 msgid "Sort contacts by status"
 msgstr "將聯絡人按狀態排序"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
+#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:400
 msgid "Status"
 msgstr "狀態"
 
 #: ../data/gui/preferences_window.ui.h:101
 msgid "Status _iconset:"
-msgstr "狀態圖示集(_I): "
+msgstr "狀態圖示集(_I):"
 
 #: ../data/gui/preferences_window.ui.h:102
 msgid "Style"
@@ -2234,31 +2048,31 @@ msgstr "視訊尺寸"
 
 #: ../data/gui/preferences_window.ui.h:117
 msgid "When new event is received:"
-msgstr "當收到新的事件: "
+msgstr "當收到新的事件:"
 
 #: ../data/gui/preferences_window.ui.h:118
 msgid "Your message:"
-msgstr "您的訊息: "
+msgstr "您的訊息:"
 
 #: ../data/gui/preferences_window.ui.h:119
 msgid "Your nickname:"
-msgstr "您的暱稱: "
+msgstr "您的暱稱:"
 
 #: ../data/gui/preferences_window.ui.h:120
 msgid "_Away after:"
-msgstr "在此時間後設定狀態為離開(_A): "
+msgstr "在此時間後設定狀態為離開(_A):"
 
 #: ../data/gui/preferences_window.ui.h:121
 msgid "_Browser:"
-msgstr "瀏覽器(_B): "
+msgstr "瀏覽器(_B):"
 
 #: ../data/gui/preferences_window.ui.h:122
 msgid "_Display chat state notifications:"
-msgstr "顯示聊天狀態資訊(_D): "
+msgstr "顯示聊天狀態資訊(_D):"
 
 #: ../data/gui/preferences_window.ui.h:123
 msgid "_Emoticons:"
-msgstr "表情(_E): "
+msgstr "表情(_E):"
 
 #: ../data/gui/preferences_window.ui.h:124
 msgid "_File manager:"
@@ -2282,11 +2096,11 @@ msgstr "記錄聯絡人狀態變化(_L)"
 
 #: ../data/gui/preferences_window.ui.h:129
 msgid "_Mail client:"
-msgstr "郵件客戶端(_M): "
+msgstr "郵件客戶端(_M):"
 
 #: ../data/gui/preferences_window.ui.h:130
 msgid "_Not available after:"
-msgstr "在此時間後設定狀態為離開很久了(_N): "
+msgstr "在此時間後設定狀態為離開很久了(_N):"
 
 #: ../data/gui/preferences_window.ui.h:131
 msgid "_Open..."
@@ -2298,35 +2112,39 @@ msgstr "恢復為預設顏色設定(_R)"
 
 #: ../data/gui/preferences_window.ui.h:133
 msgid "_Send chat state notifications:"
-msgstr "傳送聊天狀態資訊(_S): "
+msgstr "傳送聊天狀態資訊(_S):"
 
 #: ../data/gui/preferences_window.ui.h:134
+msgid "_Show roster on startup:"
+msgstr "啟動時顯示名冊(_S):"
+
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "狀態訊息:(_S)"
 
-#: ../data/gui/preferences_window.ui.h:135
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
-msgstr "URL 高亮度顯示: "
+msgstr "URL 高亮度顯示:"
 
-#: ../data/gui/preferences_window.ui.h:136
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "視窗行為(_W)"
 
-#: ../data/gui/preferences_window.ui.h:137
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "在多人聊天視窗中(_G)"
 
-#: ../data/gui/preferences_window.ui.h:138
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "在聯絡人清單中(_R)"
 
-#: ../data/gui/preferences_window.ui.h:139
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "分鐘"
 
 #: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
-msgstr "隱私策略清單: "
+msgstr "隱私策略清單:"
 
 #: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
@@ -2372,7 +2190,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Order:"
 
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3804
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3966
 msgid "Privacy List"
 msgstr "隱私策略清單"
 
@@ -2423,126 +2241,126 @@ msgstr "<b>位址</b>"
 
 #: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
-msgstr "<b>頭像: </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>"
+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>"
+msgstr "<b>城市:</b>"
 
 #: ../data/gui/profile_window.ui.h:5
 #: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
-msgstr "<b>公司: </b>"
+msgstr "<b>公司:</b>"
 
 #: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Country:</b>"
-msgstr "<b>國家: </b>"
+msgstr "<b>國家:</b>"
 
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
+#: ../data/gui/vcard_information_window.ui.h:11
 msgid "<b>Department:</b>"
-msgstr "<b>部門: </b>"
+msgstr "<b>部門:</b>"
 
 #: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:12
 msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail: </b>"
+msgstr "<b>E-Mail:</b>"
 
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:13
 msgid "<b>Extra Address:</b>"
-msgstr "<b>附加位址: </b>"
+msgstr "<b>附加位址:</b>"
 
 #. Family Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Family:</b>"
-msgstr "姓: "
+msgstr "<b>姓:</b>"
 
 #: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:16
 msgid "<b>Full Name</b>"
 msgstr "<b>全名稱</b>"
 
 #. Given Name
 #: ../data/gui/profile_window.ui.h:14
-#: ../data/gui/vcard_information_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Given:</b>"
-msgstr "<b>名稱: </b>"
+msgstr "<b>名稱:</b>"
 
 #: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Homepage:</b>"
-msgstr "<b>首頁: </b>"
+msgstr "<b>首頁:</b>"
 
 #. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Middle:</b>"
-msgstr "<b>中間名稱: </b>"
+msgstr "<b>中間名稱:</b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Name:</b>"
-msgstr "<b>名稱: </b>"
+msgstr "<b>名稱:</b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:24
 msgid "<b>Nickname:</b>"
-msgstr "<b>暱稱: </b>"
+msgstr "<b>暱稱:</b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Phone No.:</b>"
-msgstr "<b>電話號碼: </b>"
+msgstr "<b>電話號碼:</b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Position:</b>"
-msgstr "<b>職位: </b>"
+msgstr "<b>職位:</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:27
 msgid "<b>Postal Code:</b>"
-msgstr "<b>郵遞區號: </b>"
+msgstr "<b>郵遞區號:</b>"
 
 #. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Prefix:</b>"
-msgstr "<b>字首: </b>"
+msgstr "<b>字首:</b>"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>Role:</b>"
-msgstr "<b>角色: </b>"
+msgstr "<b>角色:</b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>State:</b>"
-msgstr "<b>å·ž: </b>"
+msgstr "<b>å·ž:</b>"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:34
 msgid "<b>Street:</b>"
-msgstr "<b>街道: </b>"
+msgstr "<b>街道:</b>"
 
 #. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>Suffix:</b>"
-msgstr "<b>å­—å°¾: </b>"
+msgstr "<b>å­—å°¾:</b>"
 
 #. "About" is the text of a tab of vcard window
 #: ../data/gui/profile_window.ui.h:31
-#: ../data/gui/vcard_information_window.ui.h:40
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "About"
 msgstr "關於"
 
@@ -2551,12 +2369,12 @@ msgid "Click to set your avatar"
 msgstr "按一下以設定您的頭像"
 
 #: ../data/gui/profile_window.ui.h:33
-#: ../data/gui/vcard_information_window.ui.h:45
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Format: YYYY-MM-DD"
 msgstr "格式:  YYYY-MM-DD"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "Personal Info"
 msgstr "個人資訊"
 
@@ -2579,8 +2397,8 @@ msgstr "同時從 Gajim 和伺服器移除帳號(_S)"
 
 #. Remove group
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5421
-#: ../src/roster_window.py:5547 ../src/roster_window.py:5677
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5639
+#: ../src/roster_window.py:5764 ../src/roster_window.py:5894
 msgid "_Remove"
 msgstr "移除(_R)"
 
@@ -2629,52 +2447,48 @@ msgstr "外掛程式(_L)"
 msgid "Profile, A_vatar"
 msgstr "側寫，頭像(V)"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:11
 msgid "Show Only _Active Contacts"
 msgstr "只顯示活動的聯絡人(_A)"
 
-#: ../data/gui/roster_window.ui.h:11
+#: ../data/gui/roster_window.ui.h:12
 msgid "Show Trans_ports"
 msgstr "顯示代理(_P)"
 
-#: ../data/gui/roster_window.ui.h:12
+#: ../data/gui/roster_window.ui.h:13
 msgid "Show _Offline Contacts"
 msgstr "顯示離線聯絡人"
 
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:14 ../src/statusicon.py:346
 msgid "Show _Roster"
 msgstr "顯示聯絡人清單(_R)"
 
-#: ../data/gui/roster_window.ui.h:14
+#: ../data/gui/roster_window.ui.h:15
 msgid "_Accounts"
 msgstr "帳號(_A)"
 
 #. 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:15
+#: ../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:17
+#: ../data/gui/roster_window.ui.h:18
 msgid "_Contents"
 msgstr "內容(_C)"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
+#: ../data/gui/roster_window.ui.h:20 ../src/disco.py:1520
 msgid "_Edit"
 msgstr "編輯(_E)"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:21
 msgid "_FAQ"
 msgstr "常見問題(_A)"
 
-#: ../data/gui/roster_window.ui.h:21
+#: ../data/gui/roster_window.ui.h:22
 msgid "_Help"
 msgstr "求助(_H)"
 
-#: ../data/gui/roster_window.ui.h:23
-msgid "_Send Single Message..."
-msgstr "傳送單條訊息(_S)…"
-
 #: ../data/gui/roster_window.ui.h:25
 msgid "_View"
 msgstr "檢視(_V)"
@@ -2692,11 +2506,11 @@ msgid "_Add contact"
 msgstr "加入聯絡人(_C)"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5689
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5906
 msgid "_Information"
 msgstr "資訊(_I)"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1373
 msgid "_Search"
 msgstr "搜尋(_S)"
 
@@ -2734,7 +2548,7 @@ msgstr "傳送訊息並關閉視窗"
 
 #: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
-msgstr "到: "
+msgstr "到:"
 
 #: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
@@ -2799,62 +2613,62 @@ msgstr "多人聊天(_G)"
 #. Given Name
 #: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
-msgstr "<b>請求: </b>"
+msgstr "<b>請求:</b>"
 
 #: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
-msgstr "<b>客戶端: </b>"
+msgstr "<b>客戶端:</b>"
 
 #: ../data/gui/vcard_information_window.ui.h:8
+msgid "<b>Configured avatar:</b>"
+msgstr "<b>已設定頭像:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Contact time:</b>"
-msgstr "<b>聯絡人時間: </b>"
+msgstr "<b>聯絡人時間:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:20
 msgid "<b>Jabber ID:</b>"
-msgstr "<b>Jabber ID: </b>"
+msgstr "<b>Jabber ID:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:30
 msgid "<b>Resource:</b>"
-msgstr "<b>資源: </b>"
+msgstr "<b>資源:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Status:</b>"
-msgstr "<b>狀態: </b>"
+msgstr "<b>狀態:</b>"
 
 #. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
+#: ../data/gui/vcard_information_window.ui.h:36
 msgid "<b>Subscription:</b>"
-msgstr "<b>認證: </b>"
+msgstr "<b>認證:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:39
 msgid "<b>System:</b>"
-msgstr "<b>系統: </b>"
+msgstr "<b>系統:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "<b>User avatar:</b>"
+msgstr "<b>使用者頭像:</b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
+#: ../data/gui/vcard_information_window.ui.h:43
 msgid "Comments"
 msgstr "註釋"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
-msgstr "設定頭像: "
-
-#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/vcard_information_window.ui.h:44
 #: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "聯絡人"
 
-#: ../data/gui/vcard_information_window.ui.h:44
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Contact Information"
 msgstr "聯絡人資訊"
 
-#: ../data/gui/vcard_information_window.ui.h:46
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "More"
 msgstr "更多"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "使用者頭像: "
-
 #: ../data/gui/xml_console_window.ui.h:1
 msgid "<b>Filter</b>"
 msgstr "<b>過濾器</b>"
@@ -2910,7 +2724,7 @@ msgstr "修改帳號(_M)…"
 
 #: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
-msgstr "本地 JID: "
+msgstr "本地 JID:"
 
 #: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
@@ -2918,11 +2732,11 @@ msgstr "個人"
 
 #: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
-msgstr "資源: "
+msgstr "資源:"
 
 #: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
-msgstr "狀態: "
+msgstr "狀態:"
 
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
@@ -2986,7 +2800,7 @@ msgstr "Integer"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:976
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:1049
 msgid "Color"
 msgstr "Color"
 
@@ -3022,231 +2836,248 @@ msgstr[0] "您收到了新的事件 (還有 %d 個沒有顯示)"
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "English"
 msgstr "英語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Belarusian"
 msgstr "白俄語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Bulgarian"
 msgstr "保加利亞語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Breton"
 msgstr "布列塔尼語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Czech"
 msgstr "捷克語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "German"
 msgstr "德語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Greek"
 msgstr "希臘語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "British"
 msgstr "英語(英國)"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Esperanto"
 msgstr "世界語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Spanish"
 msgstr "西班牙語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Basque"
 msgstr "巴斯克語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "French"
 msgstr "法語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Croatian"
 msgstr "克羅埃西亞語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Italian"
 msgstr "義大利語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Norwegian (b)"
 msgstr "挪威語 (b)"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Dutch"
 msgstr "荷蘭語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Norwegian"
 msgstr "挪威語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Polish"
 msgstr "波蘭語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Portuguese"
 msgstr "葡萄牙語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Brazilian Portuguese"
 msgstr "巴西葡萄牙語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Russian"
 msgstr "俄語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Serbian"
 msgstr "塞爾維亞語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Slovak"
 msgstr "斯洛伐克語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Swedish"
 msgstr "瑞典語"
 
-#: ../src/chat_control.py:76
+#: ../src/chat_control.py:83
 msgid "Chinese (Ch)"
 msgstr "漢語"
 
-#: ../src/chat_control.py:510
+#: ../src/chat_control.py:226
+msgid "Ping?"
+msgstr "Ping?"
+
+#: ../src/chat_control.py:231
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
+
+#: ../src/chat_control.py:236
+msgid "Error."
+msgstr "錯誤。"
+
+#: ../src/chat_control.py:561
 msgid "Spelling language"
 msgstr "拼寫語言"
 
 #. we are not connected
-#: ../src/chat_control.py:542 ../src/chat_control.py:751
+#: ../src/chat_control.py:593 ../src/chat_control.py:809
 msgid "A connection is not available"
 msgstr "一個連線無法使用"
 
-#: ../src/chat_control.py:543 ../src/chat_control.py:752
+#: ../src/chat_control.py:594 ../src/chat_control.py:810
 msgid "Your message can not be sent until you are connected."
 msgstr "連線之後您的訊息才能傳送"
 
-#: ../src/chat_control.py:958
+#: ../src/chat_control.py:1031
 msgid "Underline"
 msgstr "底線"
 
-#: ../src/chat_control.py:959
+#: ../src/chat_control.py:1032
 msgid "Strike"
 msgstr "劃去"
 
-#: ../src/chat_control.py:982
+#: ../src/chat_control.py:1055
 msgid "Font"
 msgstr "å­—åž‹"
 
-#: ../src/chat_control.py:991
+#: ../src/chat_control.py:1064
 msgid "Clear formating"
 msgstr "清楚格式"
 
-#: ../src/chat_control.py:1069
+#: ../src/chat_control.py:1141
 msgid "Really send file?"
 msgstr "確定要傳送檔案?"
 
-#: ../src/chat_control.py:1070
+#: ../src/chat_control.py:1142
 #, 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:1534 ../src/chat_control.py:2024
+#: ../src/chat_control.py:1622 ../src/chat_control.py:2145
 msgid "GPG encryption enabled"
 msgstr "GPG 加密已啟用"
 
+#: ../src/chat_control.py:1643 ../src/chat_control.py:1646
+msgid "Requires python-farsight."
+msgstr "需要 python-farsight。"
+
 #. Add to roster
-#: ../src/chat_control.py:1563 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:57
-#: ../src/common/helpers.py:251 ../src/dialogs.py:1072 ../src/dialogs.py:2096
-#: ../src/dialogs.py:2125 ../src/gui_interface.py:530
-#: ../src/gui_menu_builder.py:252 ../src/gui_menu_builder.py:395
-#: ../src/roster_window.py:1630 ../src/roster_window.py:1632
-#: ../src/roster_window.py:1965 ../src/roster_window.py:3366
-#: ../src/roster_window.py:3393
+#: ../src/chat_control.py:1672 ../src/common/contacts.py:158
+#: ../src/common/contacts.py:277 ../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:472
+#: ../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:1593
+#: ../src/chat_control.py:1703
 msgid "This contact does not support file transfer."
 msgstr "這個聯絡人不支援檔案傳輸"
 
-#: ../src/chat_control.py:1596
+#: ../src/chat_control.py:1706
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "您需要知道這個聯絡人的真實 JID 才能向他/她傳送檔案。"
 
-#: ../src/chat_control.py:1691
+#: ../src/chat_control.py:1813
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 狀態: %(state)s，原因: %(reason)s"
 
-#: ../src/chat_control.py:1883
+#: ../src/chat_control.py:2004
 #, 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:2004 ../src/dialogs.py:5280
+#: ../src/chat_control.py:2125 ../src/dialogs.py:5027
 msgid "No GPG key assigned"
 msgstr "沒有指定 GPG 密鑰"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:2126
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
 msgstr "尚未為這個聯絡人指定 GPG 密鑰。因此您不能用 GPG 加密資訊。"
 
-#: ../src/chat_control.py:2014
+#: ../src/chat_control.py:2135
 msgid "GPG encryption disabled"
 msgstr "GPG 加密已停用"
 
-#: ../src/chat_control.py:2040
+#: ../src/chat_control.py:2161
 msgid "Session WILL be logged"
 msgstr "作業階段將被記錄"
 
-#: ../src/chat_control.py:2042
+#: ../src/chat_control.py:2163
 msgid "Session WILL NOT be logged"
 msgstr "作業階段將不會被記錄"
 
 #. encryption %s active
-#: ../src/chat_control.py:2059
+#: ../src/chat_control.py:2180
 msgid "is"
 msgstr "是"
 
-#: ../src/chat_control.py:2059
+#: ../src/chat_control.py:2180
 msgid "is NOT"
 msgstr "不是"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2061
+#: ../src/chat_control.py:2182
 msgid "will"
 msgstr "會"
 
-#: ../src/chat_control.py:2061
+#: ../src/chat_control.py:2182
 msgid "will NOT"
 msgstr "不會"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2065
+#: ../src/chat_control.py:2186
 msgid "and authenticated"
 msgstr "且已被認證"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2190
 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:2076
+#: ../src/chat_control.py:2197
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3255,104 +3086,113 @@ msgstr ""
 "%(type)s 加密 %(status)s 活動 %(authenticated)s。\n"
 "您的聊天作業階段 %(logged)s 將被記錄。"
 
-#: ../src/chat_control.py:2219
+#: ../src/chat_control.py:2358
 msgid "Session negotiation cancelled"
 msgstr "作業階段協商已取消"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:2368
 msgid "This session WILL be archived on server"
 msgstr "本次作業階段將在伺服器上被存檔"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:2370
 msgid "This session WILL NOT be archived on server"
 msgstr "本次作業階段將不會在伺服器上被存檔"
 
-#: ../src/chat_control.py:2240
+#: ../src/chat_control.py:2379
 msgid "This session is encrypted"
 msgstr "本次作業階段已被加密"
 
-#: ../src/chat_control.py:2243
+#: ../src/chat_control.py:2382
 msgid " and WILL be logged"
 msgstr "且會被記錄"
 
-#: ../src/chat_control.py:2245
+#: ../src/chat_control.py:2384
 msgid " and WILL NOT be logged"
 msgstr "且不會被記錄"
 
-#: ../src/chat_control.py:2250
+#: ../src/chat_control.py:2389
 msgid "Remote contact's identity not verified. Click the shield button for more details."
 msgstr "遠端聯絡人的身分未確認。點擊盾型按鈕檢視詳情。"
 
-#: ../src/chat_control.py:2252
+#: ../src/chat_control.py:2391
 msgid "E2E encryption disabled"
 msgstr "E2E 加密被停用"
 
-#: ../src/chat_control.py:2296 ../src/chat_control.py:2309
+#: ../src/chat_control.py:2435 ../src/chat_control.py:2448
 msgid "The following message was NOT encrypted"
 msgstr "下面的訊息沒有被加密"
 
-#: ../src/chat_control.py:2302
+#: ../src/chat_control.py:2441
 msgid "The following message was encrypted"
 msgstr "下面的訊息是加密的"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2580
+#: ../src/chat_control.py:2734
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "您剛剛收到一條來自 \"%s\" 的訊息"
 
-#: ../src/chat_control.py:2581
+#: ../src/chat_control.py:2735
 msgid "If you close this tab and you have history disabled, this message will be lost."
 msgstr "如果您關閉此標籤並且停用了命令歷程，此訊息會丟失。"
 
-#: ../src/chat_control.py:2727 ../src/common/connection_handlers_events.py:807
-#: ../src/common/connection_handlers.py:1506
-#: ../src/common/connection_handlers.py:1625
-#: ../src/common/connection_handlers.py:1798 ../src/common/connection.py:454
-#: ../src/common/logger.py:1126 ../src/gajim.py:192 ../src/session.py:138
+#: ../src/chat_control.py:2902 ../src/common/connection_handlers_events.py:875
+#: ../src/common/connection_handlers.py:937
+#: ../src/common/connection_handlers.py:1038
+#: ../src/common/connection_handlers.py:1695 ../src/common/connection.py:463
+#: ../src/common/logger.py:1126 ../src/gajim.py:203 ../src/session.py:97
 msgid "Database Error"
 msgstr "資料庫錯誤"
 
-#: ../src/chat_control.py:2728
+#: ../src/chat_control.py:2903
 #, python-format
 msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
 msgstr "資料庫檔案 (%s) 不能被讀取。請嘗試修復它或是移除它(所有命令歷程記錄會丟失)。"
 
-#: ../src/chat_control.py:2976
+#: ../src/chat_control.py:3139 ../src/gui_interface.py:1037
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"無法解密來自 %s 的訊息\n"
+"它可能被篡改了。"
+
+#: ../src/chat_control.py:3172
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s 的狀態是 %(status)s"
 
-#: ../src/common/check_paths.py:37
+#: ../src/common/check_paths.py:38
 msgid "creating logs database"
 msgstr "建立日誌資料庫"
 
-#: ../src/common/check_paths.py:85
+#: ../src/common/check_paths.py:86
 msgid "creating cache database"
 msgstr "建立快取資料庫"
 
-#: ../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:326 ../src/common/check_paths.py:341
+#: ../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
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 是一個檔案但它應該是一個目錄"
 
-#: ../src/common/check_paths.py:277 ../src/common/check_paths.py:284
-#: ../src/common/check_paths.py:291 ../src/common/check_paths.py:298
-#: ../src/common/check_paths.py:305 ../src/common/check_paths.py:312
-#: ../src/common/check_paths.py:320 ../src/common/check_paths.py:327
-#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:342
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim 即將離開"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:334 ../src/common/check_paths.py:342
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一個目錄但它應該是一個檔案"
 
-#: ../src/common/check_paths.py:351
+#: ../src/common/check_paths.py:352
 #, python-format
 msgid "creating %s directory"
 msgstr "正在建立 %s 目錄"
@@ -3377,6 +3217,11 @@ msgstr "和我聊天吧"
 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
 msgid "Extended away"
 msgstr "離開很久了"
@@ -3391,7 +3236,7 @@ msgstr "離線 - 未連線"
 
 #: ../src/common/commands.py:114
 msgid "Presence description:"
-msgstr "狀態描述: "
+msgstr "狀態描述:"
 
 #: ../src/common/commands.py:149 ../src/common/commands.py:317
 msgid "The status has been changed."
@@ -3416,15 +3261,15 @@ msgstr "選擇您想要離開的聊天室"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:57 ../src/roster_window.py:817
-#: ../src/roster_window.py:1634 ../src/roster_window.py:1636
-#: ../src/roster_window.py:5306
+#: ../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
 msgid "Groupchats"
 msgstr "多人聊天"
 
 #: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
-msgstr "您離開了下列聊天室: "
+msgstr "您離開了下列聊天室:"
 
 #: ../src/common/commands.py:265
 msgid "Forward unread messages"
@@ -3438,102 +3283,106 @@ msgstr "所有未讀訊息都已被轉發。"
 msgid "Forward unread message then disconnect"
 msgstr " 轉發未讀訊息然後中斷連線"
 
-#: ../src/common/config.py:75
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "在用於忙是播放聲音"
 
-#: ../src/common/config.py:76
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "使用 D-Bus 和通知處理序顯示通知"
 
-#: ../src/common/config.py:78
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr "在聯絡人清單中只顯示線上和和我聊天吧的聯絡人。"
 
-#: ../src/common/config.py:81
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "時間，以分鐘為單位。在此時間後將狀態變更為離開。"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (離開，因為閒置超過了$T分鐘)"
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr "$S 會被目前的狀態訊息替換，$T 會被自動離開的時間替換。"
 
-#: ../src/common/config.py:84
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "時間，以分鐘為單位。在此時間後將狀態變更為離開很久了。"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (離開很久了，因為閒置超過了$T分鐘)"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr "$S 會被目前的狀態訊息替換，$T 會被自動無法使用的時間替換。"
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:89
 msgid "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr "何時在通知區域顯示圖示。可以是'永遠不'，'當有未處理的事件時'，'總是'。"
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:90
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr "即使系統匣圖示未顯示，仍然允許隱藏名冊視窗。"
+
+#: ../src/common/config.py:95
 msgid "Incoming nickname color."
 msgstr "收到訊息的暱稱顏色。"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:96
 msgid "Outgoing nickname color."
 msgstr "發出訊息的暱稱顏色。"
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:97
 msgid "Incoming text color."
 msgstr "收到訊息的文字顏色。"
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:98
 msgid "Outgoing text color."
 msgstr "發出訊息的文字顏色。"
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:99
 msgid "Status message text color."
 msgstr "狀態訊息文字顏色"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:102
 msgid "Incoming nickname font."
 msgstr "收到訊息的暱稱的字型。"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:103
 msgid "Outgoing nickname font."
 msgstr "發出訊息的暱稱字型。"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:104
 msgid "Incoming text font."
 msgstr "收到訊息的文字字型。"
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:105
 msgid "Outgoing text font."
 msgstr "發出訊息的文字字型。"
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:106
 msgid "Status message text font."
 msgstr "狀態訊息文字字型。"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:107
 msgid "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr "折疊的列(帳號和組)的清單(空格分隔)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:505
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:490
-#: ../src/common/optparser.py:524 ../src/gui_interface.py:3118
+#: ../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:2639
 msgid "default"
 msgstr "預設"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:114
 msgid "Language used by speller"
 msgstr "拼寫檢查的語言"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:115
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3543,199 +3392,207 @@ msgstr ""
 "'有時' - 如 iChat 風格每隔幾分鐘顯示時間。\n"
 "'永遠不' - 永遠不顯示時間。"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:116
 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. This is used only if print_time is 'sometimes'."
 msgstr "使用模糊時鐘列印時間。模糊度的值從 1 到 4，或是 0 停用模糊時鐘。1 是最精確的時鐘，4 是最不精確的。只在'有時'顯示時間時使用。"
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:119
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "將成對出現的 * / _ 視為可能的格式控制字元。"
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:120
 msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果為真，則不移除 */_。這樣 *abc* 將被加粗但 * * 不會被移除。"
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:123
 msgid "Uses ReStructured text markup to send HTML, plus ascii formatting if selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 "使用重構的文字標記傳送 HTML，並加入 ASCII 格式控制(如果選取)。語法請參\n"
 "考http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (如果\n"
 "您想使用此功能，請安裝 docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:132
 msgid "Character to add after nickname when using nick completion (tab) in group chat."
 msgstr "當在多人聊天中使用暱稱補全(Tab)時加到暱稱後的字元。"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:133
 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:159
+#: ../src/common/config.py:151
+msgid "If true, Gajim will save roster position when hiding roster, and restore it when showing roster."
+msgstr "如果為真，當隱藏名冊時 Gajim 將會儲存名冊位置，並於顯示名冊時還原。"
+
+#: ../src/common/config.py:162
 msgid "This option let you customize timestamp that is printed in conversation. For exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on strftime for full documentation: http://docs.python.org/lib/module-time.html"
 msgstr ""
 "這個選項允許您自訂對話中顯示的時間戳記格式。比如，\"[%H:%M] \" 會顯示為\n\"[小時:分鐘]\"。請參考 Python doc 關於 strftime 的文件:\n"
 "http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:163
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "在對話中顯示在暱稱前的字元"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:164
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "在對話中顯示在暱稱後的字元"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:167
 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:166
+#: ../src/common/config.py:169
 msgid "Add * and [n] in roster title?"
 msgstr "在聯絡人清單標題中加入 * 和 [n]?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:170
 msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
 msgstr "聊天標籤/視窗被重新開啟時顯示之前進行的對話的最後多少列。"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:171
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "上次談話的最後幾列保留多少分鐘。"
 
-#: ../src/common/config.py:169
-msgid "How many lines to request to server when entering a groupchat."
-msgstr "當加入聊天室時向伺服器請求聊天記錄的列數。"
+#: ../src/common/config.py:172
+msgid "How many lines to request to server when entering a groupchat. -1 means no limit"
+msgstr "當加入多人聊天時，向伺服器請求聊天記錄的列數。-1 表示無限制"
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "當加入聊天室時請求多少分鐘以內的聊天記錄。"
+#: ../src/common/config.py:173
+msgid "How many minutes back to request logs when a entering a groupchat. -1 means no limit"
+msgstr "當加入多人聊天時，向伺服器請求多少分鐘以內的聊天記錄。-1 表示無限制"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:174
 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:173
+#: ../src/common/config.py:175
+msgid "Should autorejoin be activated when we are being kicked from a conference?"
+msgstr "當我們從會議中被踢出時，是否應該啟用自動重新加入？"
+
+#: ../src/common/config.py:176
 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:175
+#: ../src/common/config.py:178
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "為 Ctrl+KeyUP 儲存多少列。"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:181
 #, python-format
 msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
 msgstr "自訂位址，在其中應包含 %s，%s 是單字/片語; 或'WIKTIONARY'以使用 wiktionary。"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:184
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果選取，Gajim 可以被 gajim-remote 遠端控制。"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:185
 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 False and they sync with global status) based upon the status of the network connection."
 msgstr ""
 "如果為真，監聽 NetworkManager 的 D-Bus 信號並依據網路連線狀態變更帳號狀\n"
 "態(如果它們沒有將 listen_to_network_manager 設定為假而且它們被設定為與\n"
 "全域狀態同步)。"
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:186
 msgid "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "傳送聊天狀態通知。可以是全部，僅正在編輯，停用中的一個。"
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:187
 msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
 msgstr "在聊天視窗中顯示聊天狀態通知。可以是全部，近正在編輯，停用中的一個。"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:189
 msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
 msgstr "當不是每條訊息都顯示時間('有時'顯示時間)時，每多少分鐘顯示時間。"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:190
 msgid "Ask before closing a group chat tab/window."
 msgstr "關閉多人聊天標籤/視窗前詢問。"
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:191
 msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
 msgstr "關閉這個空格分隔的清單中的聊天室的標籤/視窗前總是詢問。"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:192
 msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
 msgstr "關閉這個空格分隔的清單中的聊天室的標籤/視窗前永遠不詢問。"
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:193
 msgid "Ask before closing tabbed chat window if there are control that can loose data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "如果有可能丟失資料的控制項(不會被最小化的聊天，私人聊天，多人聊天)，在關\n"
 "閉有標籤的視窗前詢問。"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:196
 msgid "Comma separated list of hosts that we send, in addition of local interfaces, for File Transfer in case of address translation/port forwarding."
 msgstr ""
 "逗號分割的清單。在有位址翻譯/連接埠轉發的情況下，除了本地介面，還將向其中\n"
 "的主機傳送檔案傳輸請求。"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:198
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 標準規定 1 KiB = 1024 bytes(位元組)，1 KB = 1000 bytes。"
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:200
 msgid "Notify of events in the notification area."
 msgstr "在通知區域中提示事件"
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:206
 msgid "Show tab when only one conversation?"
 msgstr "只有一個對話時顯示標籤?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:207
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天視窗中顯示標籤組的邊框。"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:208
 msgid "Show close button in tab?"
 msgstr "在標籤上顯示關閉按鈕?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:209
 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 numbers are more secure, but take longer to calculate when you start a session."
 msgstr ""
 "在 Diffie-Hellman 中使用的 modp 組，排在前面的優先使用，以逗號分隔。合\n"
 "法的組有 1，2，5，14，15，16，17 和 18。更高的數字更安全，但在您開始會\n"
 "話時需要更長的時間計算"
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:218
 msgid "Preview new messages in notification popup?"
 msgstr "在彈出提示中預覽訊息?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:223
 msgid "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "用分號隔開的在多人聊天中將高亮度顯示的單字清單。"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:224
 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."
 msgstr "如果為真，按一下視窗管理器的 X 按鈕會離開 Gajim。此一設定僅當啟用通知區域圖示時會生效。"
 
-#: ../src/common/config.py:222
+#: ../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:223
+#: ../src/common/config.py:226
 msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
 msgstr "如果為真， Gajim 會在每個含有未讀訊息的標籤上顯示一個圖示。根據主題，該圖示可能是動態的。"
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:227
 msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
 msgstr "如果為真， Gajim 將在聯絡人清單視窗中每一個聯絡人名稱的下方顯示狀態資訊(如果不為空)。"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:233
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "定義了在聯絡人清單中頭像的顯示位置。可以是左或右"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:234
 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."
 msgstr "如過為真，Gajim 會向每一個快取的頭像太久或上次未能獲得其頭像的聯絡人請求頭像。"
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:235
 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."
 msgstr "如果為假，Gajim 將不會在聯絡人的狀態或狀態訊息變化時在聊天視窗中顯示一列提示。"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:236
 msgid "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 group chat."
 msgstr ""
 "可以是\"無\"，\"全部\"或\"登入與登出\"。如果是\"無\"，當成員變更他/她的狀態或他\n"
@@ -3743,38 +3600,42 @@ msgstr ""
 "有的狀態訊息。如果是\"登入與登出\"，Gajim 將只提示聊天室中中登入與登出\n"
 "訊息。"
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:238
+msgid "Log XHTML messages instead of plain text messages."
+msgstr "記錄 XHTML 訊息以代替純文字訊息。"
+
+#: ../src/common/config.py:239
 msgid "Background color of contacts when they just signed in."
 msgstr "當聯絡人剛剛登入時的背景色。"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:240
 msgid "Background color of contacts when they just signed out."
 msgstr "當聯絡人剛剛登出時的背景色。"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:242
 msgid "If True, restored messages will use a smaller font than the default one."
 msgstr "如果為真，恢復顯示的訊息將用較小的字型顯示。"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:243
 msgid "Don't show avatar for the transport itself."
 msgstr "不顯示代理本身的頭像。"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:244
 msgid "Don't show roster in the system taskbar."
 msgstr "不要將聯絡人清單視窗顯示在系統的工作列中。"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:245
 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 pending events."
 msgstr ""
 "如果為真並且安裝的 GTK+ 和 PyGTK 的版本至少為 2.8，當有未處理事件時使窗\n"
 "口閃爍(大部分視窗管理器的預設回應)"
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:247
 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 presences."
 msgstr "有人加入被密碼保護的多人聊天時，Jabberd1.4 不喜歡 SHA 資訊。將此選項置為\"假\"以停止在多人聊天中傳送 SHA 資訊。"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:250
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3790,459 +3651,555 @@ msgstr ""
 "'peracct' - 每個帳號的訊息傳送到一個單獨的視窗。\n"
 "'pertype' - 每種類型的訊息 (例如，聊天 及 多人聊天) 傳送到一個單獨的視窗。"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:251
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+"啟動時顯示名冊。\n"
+"「自動」- 自動顯示名冊。\n"
+"「永不」- 永不顯示名冊。\n"
+"「last_state」- 還原最後狀態名冊。"
+
+#: ../src/common/config.py:252
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "如果為假，您將不會在視窗中看到頭像。"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:253
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "如果為真，按 Escape 鍵將關閉標籤/視窗。"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:254
 msgid "Hides the buttons in chat windows."
 msgstr "在聊天視窗中隱藏按鈕。"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:255
 msgid "Hides the banner in a group chat window"
 msgstr "在多人聊天視窗中隱藏標語"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:256
 msgid "Hides the banner in two persons chat window"
 msgstr "在雙人聊天視窗中隱藏標語"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:257
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "在多人聊天視窗中隱藏室友清單。"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:258
 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:254
+#: ../src/common/config.py:259
 msgid "Indentation when using merge consecutive nickname."
 msgstr "當合併連續暱稱時縮排。"
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:260
 msgid "Smooth scroll message in conversation window"
 msgstr "平滑捲動聊天視窗中的訊息"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:261
 msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
 msgstr "在多人聊天中用於暱稱的顏色清單，以\":\"分隔。"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:262
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "當所有分頁中沒有未讀訊息時按 Ctrl-Tab 轉到下一個正在編輯的標籤。"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:263
 msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
 msgstr "是否顯示確認元聯絡人建立對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:264
 msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
 msgstr "是否顯示確認阻斷聯絡人對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:265
 msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
 msgstr "是否顯示確認傳送自訂狀態對話方塊?空字串意味著永遠不顯示對話方塊。"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:266
 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 negative priority, you will NOT receive any message from your server."
 msgstr "如果為真，您將可以在修改帳號視窗中為您的帳號可以設定一個負的優先等級。注意!當您使用負的優先等級登入時您將不能從伺服器收到任何訊息。"
 
-#: ../src/common/config.py:262
+#: ../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:263
+#: ../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:264
+#: ../src/common/config.py:269
 msgid "If True, Gajim will show number of online and total contacts in account and group rows."
 msgstr "如果為真，Gajim 會在帳號和群組所在列顯示線上和總共聯絡人數目。"
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:270
 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:266
+#: ../src/common/config.py:271
 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:267
+#: ../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:268
+#: ../src/common/config.py:273
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "時間，如果在此時間內沒有活動，將變更狀態視窗關閉。"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:274
 msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
 msgstr "在對話中最多顯示的列數。最舊的那些列會被清除。"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:275
 msgid "If True, notification windows from notification-daemon will be attached to notification icon."
 msgstr "如果為真，由 notification-daemon 建立的提示視窗會依附於通知區域圖示。"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:276
 msgid "Choose interval between 2 checks of idleness."
 msgstr "兩次檢查閒置之間的時間間隔。"
 
-#: ../src/common/config.py:272
+#: ../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:273
+#: ../src/common/config.py:278
 msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
 msgstr "合法的 URI Scheme。只有這個清單中的 Scheme 會被接受為\"真正的\" URI。(mailto 和 xmpp 被分開處理)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:279
 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!"
 msgstr "請求所有離線聯絡人的離線狀態訊息，當一個帳號建立連線時。警告: 這會傳送大量的請求!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:280
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr "如果為真，多人聊天中會像 shell 一樣自動補全"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:281
 msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
 msgstr "何時顯示自己。可以是\"總是\"，\"當用其他資源連線時\"或\"永遠不\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr "可選地修正 jingle 視訊輸出的圖框速率。比如: 10/1 或 25/2"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "可選地縮放 jingle 視訊輸出尺寸。比如: 320x240"
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:290
 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."
 msgstr "如果為真，Gajim 在使用 jingle 時會嘗試使用 STUN 伺服器。伺服器可以由\"stun_server\"選項給出，或由 jabber 伺服器給出。"
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:291
 msgid "STUN server to use when using jingle"
 msgstr "在使用 jingle 時使用的 STUN 伺服器"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:292
 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:300
+#: ../src/common/config.py:306
 msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
 msgstr "優先等級將根據您的狀態自動變更。優先等級在 autopriority_* 選項中定義。"
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:314
 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"
 msgstr ""
 "自動連線時使用的狀態。可以是\"線上\"，\"聊天\"，\"離開\"，\"離開很久了\"，\"請勿\n"
 "打擾\"，\"隱身\"。注意: 僅當 restore_last_status 被停用時這個選項其作用"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:315
 msgid "If enabled, restore the last status that was used."
 msgstr "如果啟用，則恢復上次使用的狀態。"
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:317
 msgid "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "如果為真，聯絡人的認證請求將被自動接受。"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:318
 msgid "If False, this account will be disabled and will not appear in roster window."
 msgstr "如果為假，這個帳號將被停用且不會出現在聯絡人清單視窗中。"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:321
 msgid "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr "如果停用，即使 GPG 被配置，也不使用 GPG 密鑰簽名 presences。"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:323
 msgid "Enable ESessions encryption for this account."
 msgstr "為這個帳號啟用 ESession 加密。"
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:324
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Gajim 是否應該在可能時自動發起加密的作業階段?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:325
 msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
 msgstr "應嘗試的連線類型的有序清單(用空格分隔)。可以包含 tls，ssl，或 plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:326
 msgid "Show a warning dialog before sending password on an plaintext connection."
 msgstr "在使用明文連線傳送密碼前顯示一個警告對話方塊。"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:327
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "在使用標準 SSL 函式庫前顯示一個警告對話方塊。"
 
-#: ../src/common/config.py:322
-msgid "Show a warning dialog before sending PLAIN password over a plain conenction."
-msgstr "在透過明文連線明文傳送密碼前顯示一個警告對話方塊。"
+#: ../src/common/config.py:328
+msgid "Show a warning dialog before sending PLAIN password over a plain connection."
+msgstr "在透過明文連線傳送明文密碼前顯示警告對話框。"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:330
 msgid "Space separated list of ssl errors to ignore."
 msgstr "應忽略的 SSL 錯誤清單，以空格分隔"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:339
 msgid "Whitespace sent after inactivity"
 msgstr "在不活動後傳送的空白"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:340
 msgid "XMPP ping sent after inactivity"
 msgstr "在不活動後傳送的 XMPP ping"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:344
 msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
 msgstr "在重新連線前等待 ping alive packet 的回應多少秒"
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:348
 msgid "Jabberd2 workaround"
 msgstr "為 Jabberd2 變通"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:351
 msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
 msgstr "如果選取，Gajim 會使用您在 file_transfer_proxies 選項中定義的 IP 和代理進行檔案傳輸。"
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:365
 msgid "Answer to receipt requests"
 msgstr "對回執請求的回應"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:366
 msgid "Sent receipt requests"
 msgstr "傳送回執請求"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:375
+msgid "Allow Gajim to send information about the operating system you are running."
+msgstr "允許 Gajim 發送您正在執行的作業系統相關資訊。"
+
+#: ../src/common/config.py:376
+msgid "Allow Gajim to send your local time."
+msgstr "允許 Gajim 發送您的本地時間。"
+
+#: ../src/common/config.py:377
 msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
 msgstr "在協商加密的作業階段時，Gajim 是否應該假設您想要您的訊息被記錄?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:380
 msgid "Message that is sent to contacts you want to add"
 msgstr "向您希望加入的聯絡人傳送的訊息"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:381
 msgid "Last time we syncronized with logs from server."
 msgstr "上次從伺服器同步命令歷程記錄"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:443
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否為此聯絡人使用 OpenPGP?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:444
 msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
 msgstr "對於此聯絡人，Gajim 是否應該自動發起加密作業階段，當可能時?"
 
-#: ../src/common/config.py:438 ../src/common/config.py:441
+#: ../src/common/config.py:445 ../src/common/config.py:448
 msgid "Language for which we want to check misspelled words"
 msgstr "想要進行拼寫檢查的語言"
 
-#: ../src/common/config.py:447
-msgid "all or space separated status"
-msgstr "all 或 空格分割的一些狀態"
-
-#: ../src/common/config.py:448
-msgid "'yes', 'no', or 'both'"
-msgstr "'yes'，'no'，或'both'"
-
-#: ../src/common/config.py:449 ../src/common/config.py:451
-#: ../src/common/config.py:452 ../src/common/config.py:455
-#: ../src/common/config.py:456
-msgid "'yes', 'no' or ''"
-msgstr "'yes'，'no' 或 ''"
-
-#: ../src/common/config.py:460
+#: ../src/common/config.py:451
 msgid "State whether plugins should be activated on exit (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:465 ../src/common/pep.py:157
+#: ../src/common/config.py:456 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "正在睡覺"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:457
 msgid "Back soon"
 msgstr "馬上回來"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:457
 msgid "Back in some minutes."
 msgstr "幾分鐘就回來。"
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:458 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "吃東西"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:458
 msgid "I'm eating, so leave me a message."
 msgstr "我在吃東西，請留言"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:459
 msgid "Movie"
 msgstr "電影"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:459
 msgid "I'm watching a movie."
 msgstr "我正在看電影。"
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:460 ../src/common/pep.py:186
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:460
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:461
 msgid "Phone"
 msgstr "打電話"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:461
 msgid "I'm on the phone."
 msgstr "我正在打電話"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:462
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:462
 msgid "I'm out enjoying life."
 msgstr "我正在享受戶外生活。"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:473
 msgid "I'm available."
 msgstr "我現在線上。"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:474
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:475 ../src/config.py:1609
 msgid "Be right back."
 msgstr "很快回來。"
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:476
 msgid "I'm not available."
 msgstr "我已經很久不在了。"
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:477
 msgid "Do not disturb."
 msgstr "請勿打擾。"
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:478 ../src/common/config.py:479
 msgid "Bye!"
 msgstr "再見!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:489
 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:499
+#: ../src/common/config.py:490
 msgid "Sound to play when any MUC message arrives."
 msgstr "收到任意多人聊天訊息播放的聲音。"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:499 ../src/common/optparser.py:310
 msgid "green"
 msgstr "綠色"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:503 ../src/common/optparser.py:296
 msgid "grocery"
 msgstr "雜貨店"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:507
 msgid "human"
 msgstr "人類別"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:511
 msgid "marine"
 msgstr "æµ·æ´‹"
 
-#: ../src/common/connection_handlers_events.py:322
+#: ../src/common/connection_handlers_events.py:356
 #, 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:746
+#: ../src/common/connection_handlers_events.py:787
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "來自 %s 的解除認證請求"
 
-#: ../src/common/connection_handlers_events.py:804
-#: ../src/common/connection_handlers.py:469
-#: ../src/common/connection_handlers.py:1504
-#: ../src/common/connection_handlers.py:1623
-#: ../src/common/connection_handlers.py:1796 ../src/common/connection.py:451
-#: ../src/common/logger.py:1124 ../src/gajim.py:374
+#: ../src/common/connection_handlers_events.py:872
+#: ../src/common/connection_handlers.py:339
+#: ../src/common/connection_handlers.py:935
+#: ../src/common/connection_handlers.py:1036
+#: ../src/common/connection_handlers.py:1693 ../src/common/connection.py:460
+#: ../src/common/logger.py:1124 ../src/gajim.py:385
 msgid "Disk Write Error"
 msgstr "磁碟寫入錯誤"
 
-#: ../src/common/connection_handlers_events.py:808
-#: ../src/common/connection_handlers.py:1507
-#: ../src/common/connection_handlers.py:1626
-#: ../src/common/connection_handlers.py:1799 ../src/common/connection.py:455
-#: ../src/common/logger.py:1127 ../src/gajim.py:193 ../src/session.py:139
+#: ../src/common/connection_handlers_events.py:876
+#: ../src/common/connection_handlers.py:938
+#: ../src/common/connection_handlers.py:1039
+#: ../src/common/connection_handlers.py:1696 ../src/common/connection.py:464
+#: ../src/common/logger.py:1127 ../src/gajim.py:204 ../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:826
+#: ../src/common/connection_handlers_events.py:897
 msgid "Room has been destroyed"
 msgstr "聊天室已經被銷毀了"
 
-#: ../src/common/connection_handlers_events.py:834
+#: ../src/common/connection_handlers_events.py:905
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "做為替代，您可以加入這個聊天室: %s"
 
-#: ../src/common/connection_handlers_events.py:903
-#: ../src/common/connection.py:255 ../src/config.py:2093 ../src/config.py:2102
-#: ../src/config.py:2170 ../src/config.py:3576 ../src/dataforms_widget.py:603
-#: ../src/dialogs.py:2949
+#: ../src/common/connection_handlers_events.py:978
+#: ../src/common/connection.py:259 ../src/config.py:2106 ../src/config.py:2115
+#: ../src/config.py:2183 ../src/config.py:3618 ../src/dataforms_widget.py:623
+#: ../src/dialogs.py:3079
 msgid "Invalid Jabber ID"
 msgstr "無效的 Jabber ID"
 
-#: ../src/common/connection_handlers_events.py:904
+#: ../src/common/connection_handlers_events.py:979
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "收到了一個從一個無效的 JID 傳送的訊息，它已經被忽略了。"
 
-#: ../src/common/connection_handlers.py:94
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1016
+#: ../src/gui_interface.py:420 ../src/gui_interface.py:434
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "傳送 %(message)s 時出現錯誤( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1432
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "不明的 SSL 錯誤: %d"
+
+#: ../src/common/connection_handlers_events.py:1960 ../src/dialogs.py:2771
+#: ../src/notify.py:260
+msgid "New Single Message"
+msgstr "新單條訊息"
+
+#: ../src/common/connection_handlers_events.py:1962
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr " %(nickname)s 發來的新訊息"
+
+#: ../src/common/connection_handlers_events.py:1966 ../src/dialogs.py:2772
+#: ../src/notify.py:261
+msgid "New Private Message"
+msgstr "新個人訊息"
+
+#: ../src/common/connection_handlers_events.py:1968
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "來自聊天室 %s 的私人訊息"
+
+#: ../src/common/connection_handlers_events.py:1971
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s:  %(message)s"
+
+#: ../src/common/connection_handlers_events.py:1974
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "來自 %(nickname)s 的訊息"
+
+#: ../src/common/connection_handlers_events.py:1978 ../src/dialogs.py:2771
+#: ../src/notify.py:260
+msgid "New Message"
+msgstr "新訊息"
+
+#: ../src/common/connection_handlers_events.py:1980
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "來自 %(nickname)s 的新訊息"
+
+#: ../src/common/connection_handlers_events.py:2109
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s 變更了狀態"
+
+#: ../src/common/connection_handlers_events.py:2111
+#: ../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:2116 ../src/dialogs.py:2783
+#: ../src/notify.py:274
+msgid "Contact Changed Status"
+msgstr "聯絡人狀態變更"
+
+#: ../src/common/connection_handlers_events.py:2118
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s 上線了"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2123 ../src/dialogs.py:2767
+#: ../src/notify.py:256
+msgid "Contact Signed In"
+msgstr "聯絡人登入"
+
+#: ../src/common/connection_handlers_events.py:2125
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s 離開了"
+
+#: ../src/common/connection_handlers_events.py:2130 ../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:127
+#: ../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:134
+#: ../src/common/connection_handlers.py:135
 msgid "Registration succeeded"
 msgstr "註冊成功"
 
-#: ../src/common/connection_handlers.py:135
+#: ../src/common/connection_handlers.py:136
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "註冊成功，agent %s"
 
-#: ../src/common/connection_handlers.py:143
+#: ../src/common/connection_handlers.py:144
 msgid "Registration failed"
 msgstr "註冊失敗"
 
-#: ../src/common/connection_handlers.py:143
+#: ../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:712 ../src/common/connection.py:1479
+#: ../src/common/connection_handlers.py:573 ../src/common/connection.py:1558
 msgid "Invisibility not supported"
 msgstr "不支援隱身"
 
-#: ../src/common/connection_handlers.py:713 ../src/common/connection.py:1480
+#: ../src/common/connection_handlers.py:574 ../src/common/connection.py:1559
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "帳號 %s 不支援隱身"
 
-#: ../src/common/connection_handlers.py:1833
+#: ../src/common/connection_handlers.py:1738
 msgid "I would like to add you to my roster."
 msgstr "我想將您加入到我的聯絡人清單。"
 
@@ -4374,27 +4331,27 @@ msgstr "密鑰用途中不包含證書籤名稱"
 msgid "Application verification failure"
 msgstr "應用程式驗證失敗"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2950
+#: ../src/common/connection.py:260 ../src/dialogs.py:3080
 #, 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:278
+#: ../src/common/connection.py:282
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "遠端 presence 未簽名，也未指定密鑰。"
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:285
 #, 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:333
+#: ../src/common/connection.py:338
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[本條訊息已 *加密* (見: XEP:`27`]"
 
-#: ../src/common/connection.py:441
+#: ../src/common/connection.py:447
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4403,76 +4360,74 @@ msgstr ""
 "主題: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:857
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帳號\"%s\"的連線丟失"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:858
 msgid "Reconnect manually."
 msgstr "手動重連。"
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:869
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "伺服器 %(name)s 對註冊請求的回應有誤: %(error)s"
 
-#: ../src/common/connection.py:857
+#. requested config has changed since first connection
+#: ../src/common/connection.py:911
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "伺服器 %s 提供了一個不同的註冊表單"
 
-#: ../src/common/connection.py:870
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "不明的 SSL 錯誤: %d"
-
 #. wrong answer
-#: ../src/common/connection.py:885
+#: ../src/common/connection.py:927
 msgid "Invalid answer"
 msgstr "答案錯誤"
 
-#: ../src/common/connection.py:886
+#: ../src/common/connection.py:928
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服務代理 %(name)s 對註冊請求的回應有誤: %(error)s"
 
-#: ../src/common/connection.py:1168 ../src/common/connection.py:1297
-#: ../src/common/connection.py:1794
-#: ../src/common/zeroconf/connection_zeroconf.py:193
+#: ../src/common/connection.py:1236 ../src/common/connection.py:1370
+#: ../src/common/connection.py:1983
+#: ../src/common/zeroconf/connection_zeroconf.py:204
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "沒有能夠連線到\"%s\""
 
-#: ../src/common/connection.py:1169 ../src/gui_interface.py:603
+#: ../src/common/connection.py:1237 ../src/gui_interface.py:529
 msgid "Check your connection or try again later."
 msgstr "檢查連線或稍後重試。"
 
-#: ../src/common/connection.py:1174
+#: ../src/common/connection.py:1242
 #, python-format
 msgid "Server replied: %s"
 msgstr "伺服器回應: %s"
 
-#: ../src/common/connection.py:1187
+#: ../src/common/connection.py:1255
 msgid "Connection to proxy failed"
 msgstr "連線代理伺服器失敗"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1287 ../src/common/connection.py:1349
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "沒有能夠連線到帳號 %s"
 
-#: ../src/common/connection.py:1219 ../src/common/connection.py:1278
+#: ../src/common/connection.py:1288 ../src/common/connection.py:1350
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帳號 %s 的連線丟失。重新嘗試連線。"
 
-#: ../src/common/connection.py:1244
+#: ../src/common/connection.py:1313
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "%s 證書的認證可能是無效的"
 
-#: ../src/common/connection.py:1247
+#: ../src/common/connection.py:1316
 #, python-format
 msgid ""
 "\n"
@@ -4481,7 +4436,7 @@ msgstr ""
 "\n"
 "SSL 錯誤: <b>%s</b>"
 
-#: ../src/common/connection.py:1249
+#: ../src/common/connection.py:1318
 #, python-format
 msgid ""
 "\n"
@@ -4490,61 +4445,61 @@ msgstr ""
 "\n"
 "不明 SSL 錯誤: %d"
 
-#: ../src/common/connection.py:1298
+#: ../src/common/connection.py:1371
 msgid "Check your connection or try again later"
 msgstr "檢查連線或稍後重試"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1405
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\"登入驗證失敗"
 
-#: ../src/common/connection.py:1333
+#: ../src/common/connection.py:1407
 msgid "Please check your login and password for correctness."
 msgstr "請檢查登入資訊和密碼的正確性"
 
-#: ../src/common/connection.py:1402
+#: ../src/common/connection.py:1480
 msgid "Error while removing privacy list"
 msgstr "移除隱私策略清單時發生錯誤"
 
-#: ../src/common/connection.py:1403
+#: ../src/common/connection.py:1481
 #, python-format
 msgid "Privacy list %s has not been removed. It is maybe active in one of your connected resources. Deactivate it and try again."
 msgstr "隱私策略清單 %s 還沒有被移除。它可能在您的某個連線的資源中是活動的。停用它然後重試。"
 
-#: ../src/common/connection.py:1660
+#: ../src/common/connection.py:1850
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "已傳送聯絡人: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1663
+#: ../src/common/connection.py:1853
 msgid "Sent contacts:"
-msgstr "已傳送聯絡人: "
+msgstr "已傳送聯絡人:"
 
-#: ../src/common/connection.py:1809 ../src/common/connection.py:1832
+#: ../src/common/connection.py:2000 ../src/common/connection.py:2023
 msgid "Not fetched because of invisible status"
 msgstr "由於隱身狀態，未獲取"
 
-#: ../src/common/connection.py:2264
+#: ../src/common/connection.py:2553
 msgid "Unregister failed"
 msgstr "移除註冊失敗"
 
-#: ../src/common/connection.py:2265
+#: ../src/common/connection.py:2554
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "在伺服器上 %(server)s 移除註冊失敗: %(error)s"
 
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:530
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:60
+#: ../src/gui_interface.py:472
 msgid "Observers"
 msgstr "旁觀者"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:57 ../src/disco.py:120 ../src/disco.py:121
+#: ../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:1545 ../src/roster_window.py:1626
-#: ../src/roster_window.py:1628 ../src/roster_window.py:1790
-#: ../src/roster_window.py:2466
+#: ../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
 msgid "Transports"
 msgstr "服務代理"
 
@@ -4582,7 +4537,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/common/exceptions.py:67 ../src/gajim-remote.py:55
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "在這臺電腦上沒有 D-Bus 或是 Python 模組缺失"
 
@@ -4672,7 +4627,7 @@ msgstr "%(0)s點10分"
 #: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "quarter past %(0)s"
-msgstr "%(0)s點一刻"
+msgstr "%(0)s點15分"
 
 #: ../src/common/fuzzyclock.py:45
 #, python-format
@@ -4702,7 +4657,7 @@ msgstr "差20分%(1)s點"
 #: ../src/common/fuzzyclock.py:47
 #, python-format
 msgid "quarter to %(1)s"
-msgstr "差一刻%(1)s點"
+msgstr "差15分%(1)s點"
 
 #: ../src/common/fuzzyclock.py:47
 #, python-format
@@ -4767,249 +4722,257 @@ msgstr "一週末"
 msgid "Weekend!"
 msgstr "週末"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:151
 msgid "Username must be between 1 and 1023 chars"
 msgstr "使用者名稱必須在 1 到 1023 個字元之間"
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:156
 msgid "Invalid character in username."
 msgstr "在使用者名稱中有無效的字元。"
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:162
 msgid "Server must be between 1 and 1023 chars"
 msgstr "伺服器名稱必須在 1 到 1023 個字元之間"
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:167
 msgid "Invalid character in hostname."
 msgstr "主機名稱中有無效的字元。"
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:169
 msgid "Server address required."
 msgstr "伺服器的位址是必須的。"
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:173
 msgid "Resource must be between 1 and 1023 chars"
 msgstr "資源必須在 1 到 1023 個字元之間"
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:178
 msgid "Invalid character in resource."
 msgstr "資源中含有無效字元。"
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:218
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:220 ../src/tooltips.py:195
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:223
 msgid "_Not Available"
 msgstr "離開很久了(_N)"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:225 ../src/tooltips.py:197
+msgid "Not Available"
+msgstr "離開很久了"
+
+#: ../src/common/helpers.py:228
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:230 ../src/tooltips.py:191
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:233
 msgid "?user status:_Available"
 msgstr "線上(_A)"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:235 ../src/tooltips.py:189
 msgid "?user status:Available"
 msgstr "線上"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:237
 msgid "Connecting"
 msgstr "正在連線"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:240
 msgid "A_way"
 msgstr "離開(_A)"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:245
 msgid "_Offline"
 msgstr "離線(_O)"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:247 ../src/tooltips.py:199
 msgid "Offline"
 msgstr "離線"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:250
 msgid "_Invisible"
 msgstr "隱身(_I)"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:252
+msgid "Invisible"
+msgstr "隱身"
+
+#: ../src/common/helpers.py:256
 msgid "?contact has status:Unknown"
 msgstr "不明"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:258
 msgid "?contact has status:Has errors"
 msgstr "有錯誤"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:263
 msgid "?Subscription we already have:None"
 msgstr "ç„¡"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:265
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:267
 msgid "From"
 msgstr "From"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:269
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:277
 msgid "?Ask (for Subscription):None"
 msgstr "ç„¡"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:279
 msgid "Subscribe"
 msgstr "認證"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:288
 msgid "?Group Chat Contact Role:None"
 msgstr "ç„¡"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:291
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:293
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:296
 msgid "Participants"
 msgstr "參與者"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:298
 msgid "Participant"
 msgstr "參與者"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:301
 msgid "Visitors"
 msgstr "訪客"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:303
 msgid "Visitor"
 msgstr "訪客"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:309 ../src/tooltips.py:210
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "ç„¡"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:311 ../src/tooltips.py:216
 msgid "Owner"
 msgstr "所有者"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:313 ../src/tooltips.py:214
 msgid "Administrator"
 msgstr "管理員"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:315 ../src/tooltips.py:212
 msgid "Member"
 msgstr "成員"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:354
 msgid "is paying attention to the conversation"
 msgstr "注意著與您的對話"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:356
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:358
 msgid "is composing a message..."
 msgstr "正在輸入訊息…"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:361
 msgid "paused composing a message"
 msgstr "暫停輸入訊息"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:363
 msgid "has closed the chat window or tab"
 msgstr "關閉了聊天視窗或標籤"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:628
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:631
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:635
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:638
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:642
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:645
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:648
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1099 ../src/common/helpers.py:1106
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 條訊息未處理"
 
-#: ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1112
 #, python-format
 msgid " from room %s"
 msgstr " 來自聊天室 %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
+#: ../src/common/helpers.py:1115 ../src/common/helpers.py:1132
 #, python-format
 msgid " from user %s"
 msgstr " 來自使用者 %s"
 
-#: ../src/common/helpers.py:1126
+#: ../src/common/helpers.py:1117
 #, python-format
 msgid " from %s"
 msgstr " 來自 %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1130
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 個未處理事件"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1162
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5063,7 +5026,7 @@ msgstr "音訊輸出"
 msgid "video input"
 msgstr "視訊輸入"
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:390
 msgid "video output"
 msgstr "視訊輸出"
 
@@ -5077,59 +5040,66 @@ msgstr "在執行命令\"%(command)s\"時發生錯誤: %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s 不是一個合法的日誌層級"
 
-#: ../src/common/multimedia_helpers.py:37
+#: ../src/common/multimedia_helpers.py:39
 msgid " Default device"
 msgstr "預設裝置"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:60
 msgid "Audio test"
 msgstr "音訊測試"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:71
-#: ../src/common/multimedia_helpers.py:84
-#: ../src/common/multimedia_helpers.py:101
+#: ../src/common/multimedia_helpers.py:63
+#: ../src/common/multimedia_helpers.py:79
+#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:111
 msgid "Autodetect"
 msgstr "自動偵測"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:66
+#: ../src/common/multimedia_helpers.py:81
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:83
+#, python-format
+msgid "Pulse: %s"
+msgstr "Pulse: %s"
+
 #. Fake sink
 #. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:77
+#: ../src/common/multimedia_helpers.py:105
 msgid "Fake audio output"
 msgstr "偽裝音訊輸出"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:90
 msgid "Video test"
 msgstr "視訊測試"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:95
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:108
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X 視窗系統 (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:110
 msgid "X Window System (without Xv)"
 msgstr "X 視窗系統 (沒有Xv)"
 
@@ -5139,11 +5109,11 @@ msgstr "X 視窗系統 (沒有Xv)"
 msgid "error: cannot open %s for reading"
 msgstr "錯誤: 無法讀取檔案 %s"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:305 ../src/common/optparser.py:306
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:385
 msgid "migrating logs database to indices"
 msgstr "遷移記錄資料庫到索引"
 
@@ -5780,19 +5750,19 @@ msgstr "學習"
 msgid "Writing"
 msgstr "寫作"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:339
 msgid "Unknown Artist"
 msgstr "不明演出者"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:342
 msgid "Unknown Title"
 msgstr "不明標題"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:345
 msgid "Unknown Source"
 msgstr "不明來源"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:348
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5812,15 +5782,15 @@ msgid "Maybe you have another running instance of Gajim. File Transfer will be c
 msgstr "或許您有另一個正在執行的 Gajim 實體。檔案傳輸將被取消。"
 
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:424
 msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
 msgstr "[這是加密作業階段的一部分。如果您看到了這條訊息，一定是有什麼地方發生錯誤了。]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:182
+#: ../src/common/zeroconf/connection_zeroconf.py:192
 msgid "Avahi error"
 msgstr "Avahi 錯誤"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:183
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -5829,304 +5799,305 @@ msgstr ""
 "%s\n"
 "Link-local 訊息可能無法正常工作。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:205
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "請檢查 Avahi 或是 Bonjour 是否已經安裝。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/zeroconf/connection_zeroconf.py:219
 msgid "Could not start local service"
 msgstr "無法啟動本地服務"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:216
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "無法繫結連接埠 %d。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:208
-#: ../src/common/zeroconf/connection_zeroconf.py:288
-#: ../src/common/zeroconf/connection_zeroconf.py:299
-#: ../src/common/zeroconf/connection_zeroconf.py:313
+#: ../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
 msgid "Please check if avahi-daemon is running."
 msgstr "請檢查 avahi-daemon 是否正在執行。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:287
-#: ../src/common/zeroconf/connection_zeroconf.py:298
-#: ../src/common/zeroconf/connection_zeroconf.py:312
+#: ../src/common/zeroconf/connection_zeroconf.py:303
+#: ../src/common/zeroconf/connection_zeroconf.py:316
+#: ../src/common/zeroconf/connection_zeroconf.py:332
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "無法變更帳號\"%s\"的狀態"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:330
+#: ../src/common/zeroconf/connection_zeroconf.py:351
+#: ../src/common/zeroconf/connection_zeroconf.py:390
 msgid "Your message could not be sent."
 msgstr "您的訊息未能被傳送。"
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:340
+#: ../src/common/zeroconf/connection_zeroconf.py:365
+#: ../src/common/zeroconf/connection_zeroconf.py:404
 msgid "Contact is offline. Your message could not be sent."
 msgstr "聯絡人離線。您的訊息未能被傳送。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:365
+#: ../src/common/zeroconf/connection_zeroconf.py:432
 msgid "Connection to host could not be established: Timeout while sending data."
 msgstr "無法建立到主機的連線: 傳送資料逾時。"
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:192
+#: ../src/common/zeroconf/zeroconf_avahi.py:193
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "加入服務錯誤。 %s"
 
-#: ../src/config.py:397
+#: ../src/config.py:406
 msgid "Default Message"
 msgstr "預設訊息"
 
-#: ../src/config.py:406
+#: ../src/config.py:415
 msgid "Enabled"
 msgstr "啟用"
 
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:468 ../src/config.py:472 ../src/config.py:3115
 msgid "Default"
 msgstr "預設"
 
-#: ../src/config.py:733 ../src/dialogs.py:1411
+#: ../src/config.py:746 ../src/dialogs.py:1493
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "語言 %s 的詞典無法使用"
 
-#: ../src/config.py:734
+#: ../src/config.py:747
 #, python-format
 msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
 msgstr "您需安裝 %s 詞典以使用拼寫檢查，或是設定拼寫檢查選項以選擇另外一種語言。(_L)"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1223
 msgid "status message title"
 msgstr "狀態訊息標題"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1223
 msgid "status message text"
 msgstr "狀態訊息文字"
 
 #. Name column
-#: ../src/config.py:1514 ../src/dialogs.py:2401 ../src/dialogs.py:2467
-#: ../src/dialogs.py:3233 ../src/disco.py:884 ../src/disco.py:1744
-#: ../src/disco.py:2048 ../src/history_window.py:90
+#: ../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
 msgid "Name"
 msgstr "名稱"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1618
 msgid "Relogin now?"
 msgstr "現在重新登入?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1619
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有調整立即生效，您必須重新登入。"
 
-#: ../src/config.py:1764 ../src/config.py:1893
+#: ../src/config.py:1773 ../src/config.py:1906
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP 在這臺電腦上無法使用"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:1946 ../src/config.py:1993
 msgid "Unread events"
 msgstr "未讀取的事件"
 
-#: ../src/config.py:1934
+#: ../src/config.py:1947
 msgid "Read all pending events before removing this account."
 msgstr "移除帳號前請檢視所有未處理事件。"
 
-#: ../src/config.py:1963
+#: ../src/config.py:1976
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在帳號 %s 開啟聊天"
 
-#: ../src/config.py:1964
+#: ../src/config.py:1977
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和多人聊天視窗將會關閉。您想繼續嗎?"
 
-#: ../src/config.py:1976 ../src/config.py:2511 ../src/config.py:2547
+#: ../src/config.py:1989 ../src/config.py:2531 ../src/config.py:2567
 msgid "You are currently connected to the server"
 msgstr "正在連線到伺服器"
 
-#: ../src/config.py:1977
+#: ../src/config.py:1990
 msgid "To change the account name, you must be disconnected."
 msgstr "如要變更帳號名稱，需中斷連線。"
 
-#: ../src/config.py:1981
+#: ../src/config.py:1994
 msgid "To change the account name, you must read all pending events."
 msgstr "如要變更帳號名稱，需先處理所有未處理事件"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2000
 msgid "Account Name Already Used"
 msgstr "帳號名稱已經被佔用"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2001
 msgid "This name is already used by another of your accounts. Please choose another name."
 msgstr "該名稱已被您的另一個帳號使用。請選擇其他名稱"
 
-#: ../src/config.py:1992 ../src/config.py:1996
+#: ../src/config.py:2005 ../src/config.py:2009
 msgid "Invalid account name"
 msgstr "無效的帳號名稱"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2006
 msgid "Account name cannot be empty."
 msgstr "帳號名稱不能為空。"
 
-#: ../src/config.py:1997
+#: ../src/config.py:2010
 msgid "Account name cannot contain spaces."
 msgstr "帳號名稱不能包含空格。"
 
-#: ../src/config.py:2074
+#: ../src/config.py:2087
 msgid "Rename Account"
 msgstr "重新命名帳號"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2088
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "為帳號 %s 輸入新的名稱"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2116
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式為 \"使用者@伺服器名稱\"。"
 
-#: ../src/config.py:2320 ../src/config.py:3622
+#: ../src/config.py:2339 ../src/config.py:3664
 msgid "Invalid entry"
 msgstr "無效輸入"
 
-#: ../src/config.py:2321 ../src/config.py:3623
+#: ../src/config.py:2340 ../src/config.py:3665
 msgid "Custom port must be a port number."
 msgstr "自訂連接埠必須為連接埠號碼。"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2361
 msgid "Failed to get secret keys"
 msgstr "獲取密鑰失敗"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2362
 msgid "There is no OpenPGP secret key available."
 msgstr "沒有可用的 OpenPGP 私鑰"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2396
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密鑰選擇"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2397
 msgid "Choose your OpenPGP key"
 msgstr "選擇您的 OpenPGP 密鑰"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2404
 msgid "No such account available"
 msgstr "不明的帳號可用"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2405
 msgid "You must create your account before editing your personal information."
 msgstr "您必須在編輯個人資訊前建立帳號。"
 
-#: ../src/config.py:2393 ../src/dialogs.py:2154 ../src/dialogs.py:2389
-#: ../src/dialogs.py:2575 ../src/disco.py:512 ../src/profile_window.py:340
+#: ../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
 msgid "You are not connected to the server"
 msgstr "尚未連線到伺服器"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2413
 msgid "Without a connection, you can not edit your personal information."
 msgstr "無法離線編輯個人資訊。"
 
-#: ../src/config.py:2398
+#: ../src/config.py:2417
 msgid "Your server doesn't support Vcard"
 msgstr "您的伺服器不支援 Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2418
 msgid "Your server can't save your personal information."
 msgstr "您的伺服器無法儲存您的個人資訊。"
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2532 ../src/config.py:2568
 msgid "To disable the account, you must be disconnected."
 msgstr "要停用帳號，您必須中斷連線。"
 
-#: ../src/config.py:2517
+#: ../src/config.py:2537
 msgid "Account Local already exists."
 msgstr "帳號本地已存在。"
 
-#: ../src/config.py:2518
+#: ../src/config.py:2538
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "請在使用本地訊息前重新命名或移除它。"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2695
 #, python-format
 msgid "Edit %s"
 msgstr "編輯 %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2697
 #, python-format
 msgid "Register to %s"
 msgstr "註冊到 %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2733
 msgid "Ban List"
 msgstr "封禁名單"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2734
 msgid "Member List"
 msgstr "成員清單"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2734
 msgid "Owner List"
 msgstr "室長清單"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2735
 msgid "Administrator List"
 msgstr "管理員清單"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2779 ../src/disco.py:891 ../src/history_manager.py:201
+#: ../src/config.py:2799 ../src/disco.py:893 ../src/history_manager.py:207
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2809
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2816
 msgid "Nick"
 msgstr "暱稱"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2822
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2849
 msgid "Banning..."
 msgstr "封禁…"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2851
 msgid "<b>Whom do you want to ban?</b>\n\n"
 msgstr "<b>想做封禁誰?</b>\n\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2853
 msgid "Adding Member..."
 msgstr "正在加入成員…"
 
-#: ../src/config.py:2834
+#: ../src/config.py:2854
 msgid "<b>Whom do you want to make a member?</b>\n\n"
 msgstr "<b>想要將誰加為成員?</b>\n\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2856
 msgid "Adding Owner..."
 msgstr "加入室長…"
 
-#: ../src/config.py:2837
+#: ../src/config.py:2857
 msgid "<b>Whom do you want to make an owner?</b>\n\n"
 msgstr "<b>您想要讓誰成為室長?</b>\n\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2859
 msgid "Adding Administrator..."
 msgstr "加入管理員…"
 
-#: ../src/config.py:2840
+#: ../src/config.py:2860
 msgid "<b>Whom do you want to make an administrator?</b>\n\n"
 msgstr "<b>您想要讓誰成為管理員?</b>\n\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2861
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6142,134 +6113,136 @@ msgstr ""
 "4。domain (欄位名稱本身匹配，任何 user@domain，\n"
 "domain/resource，或是包含一個子欄位名稱的位址也匹配)。"
 
-#: ../src/config.py:2943
+#: ../src/config.py:2962
 #, python-format
 msgid "Removing %s account"
 msgstr "移除帳號 %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:2977
 msgid "Account is disabled"
 msgstr "帳號被停用"
 
-#: ../src/config.py:2959
+#: ../src/config.py:2978
 msgid "To unregister from a server, account must be enabled."
 msgstr "要從伺服器移除註冊，帳號必須被啟用。"
 
-#: ../src/config.py:2972 ../src/gui_interface.py:293
-#: ../src/gui_interface.py:985
+#: ../src/config.py:2991 ../src/gui_interface.py:278
+#: ../src/gui_interface.py:701
 msgid "Password Required"
 msgstr "需要密碼"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:965
+#: ../src/config.py:2992 ../src/gui_interface.py:681
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "輸入帳號 %s 的密碼"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:985
+#: ../src/config.py:2993 ../src/gui_interface.py:701
 msgid "Save password"
 msgstr "儲存密碼"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3003
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "帳號 \"%s\" 已連線到伺服器"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3004
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，將會丟失連線"
 
-#: ../src/config.py:2999
+#: ../src/config.py:3018
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "連線伺服器 %s 失敗"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3019
 msgid "What would you like to do?"
 msgstr "您想做什麼?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3020
 msgid "Remove only from Gajim"
 msgstr "僅從 Gajim 移除帳號"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3021
 msgid "Don't remove anything. I'll try again later"
 msgstr "不要移除任何東西。我過一會兒會重試一下"
 
-#: ../src/config.py:3095
+#: ../src/config.py:3115
 msgid "?print_status:All"
 msgstr "全部"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3116
 msgid "Enter and leave only"
 msgstr "只是進入和離開"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3117
 msgid "?print_status:None"
 msgstr "ç„¡"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3189
 msgid "New Group Chat"
 msgstr "新聊天室"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3222
 msgid "This bookmark has invalid data"
 msgstr "此書籤含無效資料"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3223
 msgid "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "請確認填寫伺服器與聊天室欄位或移除此書籤。"
 
 #. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1952
+#: ../src/config.py:3348 ../src/dialogs.py:2070
 msgid "Invalid nickname"
 msgstr "無效的暱稱"
 
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3349 ../src/config.py:3360 ../src/config.py:3369
+#: ../src/config.py:3380 ../src/config.py:3388
 msgid "Character not allowed"
 msgstr "不允許的字元"
 
-#: ../src/config.py:3333 ../src/config.py:3598
+#: ../src/config.py:3360 ../src/config.py:3368 ../src/config.py:3380
+#: ../src/config.py:3640
 msgid "Invalid server"
 msgstr "無效的伺服器"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3387
 msgid "Invalid room"
 msgstr "無效聊天室"
 
-#: ../src/config.py:3514
+#: ../src/config.py:3556
 msgid "Account has been added successfully"
 msgstr "帳號已成功加入"
 
-#: ../src/config.py:3515 ../src/config.py:3521
+#: ../src/config.py:3557 ../src/config.py:3563
 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 window."
 msgstr "您可以點擊\"進階\"按鈕以設定進階帳號選項，或稍後選擇主視窗\"編輯\"選單下\"帳號\"選單項。"
 
-#: ../src/config.py:3520
+#: ../src/config.py:3562
 msgid "Your new account has been created successfully"
 msgstr "註冊新帳號成功"
 
-#: ../src/config.py:3559
+#: ../src/config.py:3601
 msgid "Invalid username"
 msgstr "無效使用者名稱"
 
-#: ../src/config.py:3561
+#: ../src/config.py:3603
 msgid "You must provide a username to configure this account."
 msgstr "必須提供使用者名稱來配置此帳號。"
 
-#: ../src/config.py:3599
+#: ../src/config.py:3641
 msgid "Please provide a server on which you want to register."
 msgstr "請指定一個伺服器。您將註冊到這個伺服器。"
 
-#: ../src/config.py:3655 ../src/gui_interface.py:1624
+#: ../src/config.py:3697 ../src/gui_interface.py:1179
 msgid "Certificate Already in File"
 msgstr "證書已經在檔案中"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1625
+#: ../src/config.py:3698 ../src/gui_interface.py:1180
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "證書已經在檔案 %s 中，所以它沒有被再次加入。"
 
-#: ../src/config.py:3733
+#: ../src/config.py:3775
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n\n"
@@ -6282,7 +6255,7 @@ msgstr ""
 "SSL 錯誤: %(error)s\n"
 "您仍然想要連線到這個伺服器嗎?"
 
-#: ../src/config.py:3739 ../src/gui_interface.py:1652
+#: ../src/config.py:3781 ../src/gui_interface.py:1208
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6293,314 +6266,319 @@ msgstr ""
 "這個證書的 SHA1 指紋資訊: \n"
 "%s"
 
-#: ../src/config.py:3771 ../src/config.py:3805
+#: ../src/config.py:3813 ../src/config.py:3847
 msgid "An error occurred during account creation"
 msgstr "建立帳號期間發生錯誤"
 
-#: ../src/config.py:3870
+#: ../src/config.py:3912
 msgid "Account name is in use"
 msgstr "帳號名稱已經被使用"
 
-#: ../src/config.py:3871
+#: ../src/config.py:3913
 msgid "You already have an account using this name."
 msgstr "您已經有帳號使用這個名稱了。"
 
-#: ../src/config.py:3990
+#: ../src/config.py:4043
 msgid "PEP node was not removed"
 msgstr "PEP節點沒有被移除"
 
-#: ../src/config.py:3991
+#: ../src/config.py:4044
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP 節點 %(node)s 沒有被移除: %(message)s"
 
-#: ../src/config.py:4035
+#: ../src/config.py:4072
+#, python-format
+msgid "Configure %s"
+msgstr "組配 %s"
+
+#: ../src/config.py:4088 ../src/plugins/gui.py:73
 msgid "Active"
 msgstr "活動"
 
-#: ../src/config.py:4043
+#: ../src/config.py:4096
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:4078
+#: ../src/config.py:4131
 msgid "First Message Received"
 msgstr "最初收到的訊息"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4132
 msgid "Next Message Received Focused"
 msgstr "已聚焦收到的下一筆訊息"
 
-#: ../src/config.py:4081
+#: ../src/config.py:4134
 msgid "Next Message Received Unfocused"
 msgstr "解除聚焦收到的下一筆訊息"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4135
 msgid "Contact Connected"
 msgstr "已連線的聯絡人"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4136
 msgid "Contact Disconnected"
 msgstr "聯絡人已中斷連線"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4137
 msgid "Message Sent"
 msgstr "訊息已傳送"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4138
 msgid "Group Chat Message Highlight"
 msgstr "多人聊天訊息高亮度顯示"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4139
 msgid "Group Chat Message Received"
 msgstr "收到的多人聊天訊息"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4140
 msgid "GMail Email Received"
 msgstr "收到 GMail 郵件"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:603
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr "這個圖示是說這條訊息還沒有被遠端收到。如果這個圖示已經存在很久了，很可能這條訊息丟失了。"
 
-#: ../src/conversation_textview.py:620
+#: ../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 "以下文字是您上次注意這個聊天室以來的聊天內容"
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:742
 msgid "_Quote"
 msgstr "參照(_Q)"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:749
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\"的動作(_A)"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:762
 msgid "Read _Wikipedia Article"
 msgstr "檢視 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:767
 msgid "Look it up in _Dictionary"
 msgstr "從字典中搜尋(_D)"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:784
 #, 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:795
+#: ../src/conversation_textview.py:797
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "網路搜尋位址缺少 \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:800
 msgid "Web _Search for it"
 msgstr "在網際網路上搜尋(_S)"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:806
 msgid "Open as _Link"
 msgstr "做為連結開啟(_L)"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
+#: ../src/conversation_textview.py:1310
 #, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
-msgstr[0] "%i天前"
+msgid_plural "%(nb_days)i days ago"
+msgstr[0] "%(nb_days)i天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1359 ../src/history_window.py:480
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主題: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:565
 msgid "Unable to load image"
 msgstr "無法載入圖像"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:567
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "不支援的媒體類型: %s"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:582
 msgid "This field is required"
 msgstr "此一項是必須的"
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:627
 msgid "Jabber ID already in list"
 msgstr "Jabber ID 已經在清單中了"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:628
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "您輸入的 Jabber ID 已經在清單中了。請選擇另外一個。"
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:639
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:642 ../src/dataforms_widget.py:644
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "聯絡人名稱: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
-msgstr "Jabber ID:  <i>%s</i>"
+msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:197
 msgid "Group"
 msgstr "群組"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:204
 msgid "In the group"
 msgstr "群組內"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:295
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:300
 msgid "Contact name"
 msgstr "聯絡人名稱"
 
-#: ../src/dialogs.py:473
+#: ../src/dialogs.py:475
 msgid "Set Mood"
 msgstr "設定 Mood"
 
-#: ../src/dialogs.py:593
+#: ../src/dialogs.py:595
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 狀態訊息"
 
-#: ../src/dialogs.py:607
+#: ../src/dialogs.py:609
 msgid "Status Message"
 msgstr "狀態訊息"
 
-#: ../src/dialogs.py:796
+#: ../src/dialogs.py:800
 msgid "Overwrite Status Message?"
 msgstr "覆寫狀態訊息?"
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:801
 msgid "This name is already used. Do you want to overwrite this status message?"
 msgstr "這個名稱已被使用。您想要覆寫這個狀態訊息嗎?"
 
-#: ../src/dialogs.py:805
+#: ../src/dialogs.py:809
 msgid "Save as Preset Status Message"
 msgstr "另存為預設狀態訊息"
 
-#: ../src/dialogs.py:806
+#: ../src/dialogs.py:810
 msgid "Please type a name for this status message"
 msgstr "請為這個狀態訊息輸入一個名稱"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:838
 msgid "AIM Address:"
-msgstr "AIM 位址: "
+msgstr "AIM 位址:"
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:839
 msgid "GG Number:"
-msgstr "GG 號碼: "
+msgstr "GG 號碼:"
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:840
 msgid "ICQ Number:"
-msgstr "ICQ 號碼: "
+msgstr "ICQ 號碼:"
 
-#: ../src/dialogs.py:837
+#: ../src/dialogs.py:841
 msgid "MSN Address:"
-msgstr "MSN 位址: "
+msgstr "MSN 位址:"
 
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:842
 msgid "Yahoo! Address:"
-msgstr "Yahoo! 位址: "
+msgstr "Yahoo! 位址:"
 
-#: ../src/dialogs.py:875
+#: ../src/dialogs.py:879
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "請填入您想加入到帳號 %s 的聯絡人的資訊"
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:882
 msgid "Please fill in the data of the contact you want to add"
 msgstr "請填入您想加入的聯絡人的資訊"
 
-#: ../src/dialogs.py:1047 ../src/dialogs.py:1053 ../src/dialogs.py:1058
-#: ../src/dialogs.py:3466
+#: ../src/dialogs.py:1074 ../src/dialogs.py:1080 ../src/dialogs.py:1085
+#: ../src/dialogs.py:3615
 msgid "Invalid User ID"
 msgstr "無效的使用者ID"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1081
 msgid "The user ID must not contain a resource."
 msgstr "使用者ID不應包含資源。"
 
-#: ../src/dialogs.py:1059
+#: ../src/dialogs.py:1086
 msgid "You cannot add yourself to your roster."
 msgstr "您不能將您自己加入到您的聯絡人清單中。"
 
-#: ../src/dialogs.py:1073
+#: ../src/dialogs.py:1100
 msgid "Contact already in roster"
 msgstr "聯絡人已經在聯絡人清單中"
 
-#: ../src/dialogs.py:1074
+#: ../src/dialogs.py:1101
 msgid "This contact is already listed in your roster."
 msgstr "此聯絡人已經在您的聯絡人清單中了"
 
-#: ../src/dialogs.py:1120
+#: ../src/dialogs.py:1154 ../src/dialogs.py:1188
 msgid "User ID:"
-msgstr "使用者 ID: "
+msgstr "使用者 ID:"
 
-#: ../src/dialogs.py:1191
+#: ../src/dialogs.py:1273
 msgid "A GTK+ jabber client"
 msgstr "一個 GTK+ Jabber 客戶端"
 
-#: ../src/dialogs.py:1192
+#: ../src/dialogs.py:1274
 msgid "GTK+ Version:"
-msgstr "GTK+ 版本: "
+msgstr "GTK+ 版本:"
 
-#: ../src/dialogs.py:1193
+#: ../src/dialogs.py:1275
 msgid "PyGTK Version:"
-msgstr "PyGTK 版本: "
+msgstr "PyGTK 版本:"
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1285
 msgid "Current Developers:"
-msgstr "目前的開發者: "
+msgstr "目前的開發者:"
 
-#: ../src/dialogs.py:1205
+#: ../src/dialogs.py:1287
 msgid "Past Developers:"
-msgstr "既往開發者: "
+msgstr "既往開發者:"
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1293
 msgid "THANKS:"
-msgstr "感謝: "
+msgstr "感謝:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1217
+#: ../src/dialogs.py:1299
 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:1229
+#: ../src/dialogs.py:1311
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>\n"
 "jeanet <qianxiaojun604@gmail.com>\n"
 "Guanhao Yin <yinguanhao@gmail.com>\n"
-"root <root@localdomain>"
+"趙惟倫 <chaoweilun@gmail.com>"
 
-#: ../src/dialogs.py:1412
+#: ../src/dialogs.py:1494
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option.\n\n"
@@ -6609,446 +6587,423 @@ msgstr ""
 "您必須安裝 %s 詞典才能使用拼寫檢查，或是在拼寫檢查語言選項中設定另一種語言。\n"
 "高亮度拼寫錯誤的特性不會被啟用。"
 
-#: ../src/dialogs.py:1953 ../src/dialogs.py:2340
+#: ../src/dialogs.py:1872
+msgid "_Resume"
+msgstr "再續(_R)"
+
+#: ../src/dialogs.py:1880
+msgid "Re_place"
+msgstr "置換(_P)"
+
+#: ../src/dialogs.py:2071 ../src/dialogs.py:2470
 msgid "The nickname has not allowed characters."
 msgstr "暱稱包含不合法字元。"
 
-#: ../src/dialogs.py:2071
+#: ../src/dialogs.py:2189
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "%(jid)s 對帳號 %(account)s 的認證請求"
 
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2192
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s 的認證請求"
 
-#: ../src/dialogs.py:2149 ../src/gui_interface.py:2402
+#: ../src/dialogs.py:2276 ../src/gui_interface.py:1930
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已經在聊天室 %s"
 
-#: ../src/dialogs.py:2155
+#: ../src/dialogs.py:2282
 msgid "You can not join a group chat unless you are connected."
 msgstr "您必須連線才能加入聊天室。"
 
-#: ../src/dialogs.py:2196
+#: ../src/dialogs.py:2326
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用帳號 %s 加入聊天室"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2457
 msgid "Invalid Account"
 msgstr "無效的帳號"
 
-#: ../src/dialogs.py:2328
+#: ../src/dialogs.py:2458
 msgid "You have to choose an account from which you want to join the groupchat."
 msgstr "您需要選擇一個帳號，用它來加入聊天室。"
 
-#: ../src/dialogs.py:2339
+#: ../src/dialogs.py:2469
 msgid "Invalid Nickname"
 msgstr "不合法的暱稱"
 
-#: ../src/dialogs.py:2344 ../src/dialogs.py:2350
-#: ../src/groupchat_control.py:1877
+#: ../src/dialogs.py:2474 ../src/dialogs.py:2480
+#: ../src/groupchat_control.py:2079
 msgid "Invalid group chat Jabber ID"
 msgstr "無效的聊天室 Jabber ID"
 
-#: ../src/dialogs.py:2345
+#: ../src/dialogs.py:2475
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "請輸入聊天室的 Jabber ID，以 room@server 的形式。"
 
-#: ../src/dialogs.py:2351 ../src/groupchat_control.py:1878
+#: ../src/dialogs.py:2481 ../src/groupchat_control.py:2080
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "聊天室 Jabber ID 包含不合法字元。"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2485 ../src/gui_interface.py:1912
 msgid "This is not a group chat"
 msgstr "這不是一個聊天室"
 
-#: ../src/dialogs.py:2359
+#: ../src/dialogs.py:2486 ../src/gui_interface.py:1913
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s 不是一個聊天室的名稱。"
 
-#: ../src/dialogs.py:2390
+#: ../src/dialogs.py:2518
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未連線時，您不能同步您的聯絡人。"
 
-#: ../src/dialogs.py:2404
+#: ../src/dialogs.py:2531
 msgid "Server"
 msgstr "伺服器"
 
-#: ../src/dialogs.py:2439
+#: ../src/dialogs.py:2567
 msgid "This account is not connected to the server"
 msgstr "這個帳號已經連線到伺服器"
 
-#: ../src/dialogs.py:2440
+#: ../src/dialogs.py:2568
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "這個帳號連線後您才可以與之同步"
 
-#: ../src/dialogs.py:2464
+#: ../src/dialogs.py:2593
 msgid "Synchronise"
 msgstr "同步"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2654
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用帳號 %s 開始聊天"
 
-#: ../src/dialogs.py:2527
+#: ../src/dialogs.py:2656
 msgid "Start Chat"
 msgstr "開始聊天"
 
-#: ../src/dialogs.py:2528
+#: ../src/dialogs.py:2657
 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，您將要給其傳送聊天訊息: "
+msgstr "填寫一個暱稱或是 Jabber ID，您將要給其傳送聊天訊息:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2554 ../src/dialogs.py:2935 ../src/dialogs.py:3147
+#: ../src/dialogs.py:2684 ../src/dialogs.py:3065 ../src/dialogs.py:3295
 msgid "Connection not available"
 msgstr "連線無法使用"
 
-#: ../src/dialogs.py:2555 ../src/dialogs.py:2936 ../src/dialogs.py:3148
+#: ../src/dialogs.py:2685 ../src/dialogs.py:3066 ../src/dialogs.py:3296
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "請確認您已經連線到 \"%s\"。"
 
-#: ../src/dialogs.py:2564 ../src/dialogs.py:2567
+#: ../src/dialogs.py:2694 ../src/dialogs.py:2697
 msgid "Invalid JID"
 msgstr "無效的 JID"
 
-#: ../src/dialogs.py:2567
+#: ../src/dialogs.py:2697
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "無法解析 \"%s\"。"
 
-#: ../src/dialogs.py:2576
+#: ../src/dialogs.py:2706
 msgid "Without a connection, you can not change your password."
 msgstr "連線後才可變更密碼。"
 
-#: ../src/dialogs.py:2595
+#: ../src/dialogs.py:2725
 msgid "Invalid password"
 msgstr "無效密碼"
 
-#: ../src/dialogs.py:2595
+#: ../src/dialogs.py:2725
 msgid "You must enter a password."
 msgstr "您必須輸入密碼"
 
-#: ../src/dialogs.py:2599
+#: ../src/dialogs.py:2729
 msgid "Passwords do not match"
 msgstr "密碼不符"
 
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2730
 msgid "The passwords typed in both fields must be identical."
 msgstr "在兩個輸入框中輸入的密碼必須一致。"
 
-#. default value
-#: ../src/dialogs.py:2637 ../src/notify.py:247 ../src/notify.py:473
-msgid "Contact Signed In"
-msgstr "聯絡人登入"
-
-#: ../src/dialogs.py:2639 ../src/notify.py:255 ../src/notify.py:475
-msgid "Contact Signed Out"
-msgstr "聯絡人離開登入"
-
-#. chat message
-#: ../src/dialogs.py:2641 ../src/notify.py:277 ../src/notify.py:477
-msgid "New Message"
-msgstr "新訊息"
-
-#. single message
-#: ../src/dialogs.py:2641 ../src/notify.py:259 ../src/notify.py:477
-msgid "New Single Message"
-msgstr "新單條訊息"
-
-#. private message
-#: ../src/dialogs.py:2642 ../src/notify.py:265 ../src/notify.py:478
-msgid "New Private Message"
-msgstr "新個人訊息"
-
-#: ../src/dialogs.py:2642 ../src/gui_interface.py:1095 ../src/notify.py:487
+#: ../src/dialogs.py:2772 ../src/gui_interface.py:818 ../src/notify.py:270
 msgid "New E-mail"
 msgstr "新電子郵件"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1154 ../src/notify.py:480
+#: ../src/dialogs.py:2774 ../src/gui_interface.py:873 ../src/notify.py:263
 msgid "File Transfer Request"
 msgstr "檔案傳輸請求"
 
-#: ../src/dialogs.py:2646 ../src/gui_interface.py:1057
-#: ../src/gui_interface.py:1123 ../src/notify.py:482
+#: ../src/dialogs.py:2776 ../src/gui_interface.py:780
+#: ../src/gui_interface.py:844 ../src/notify.py:265
 msgid "File Transfer Error"
 msgstr "檔案傳輸錯誤"
 
-#: ../src/dialogs.py:2648 ../src/gui_interface.py:1200
-#: ../src/gui_interface.py:1223 ../src/gui_interface.py:1240
-#: ../src/notify.py:484
+#: ../src/dialogs.py:2778 ../src/gui_interface.py:919
+#: ../src/gui_interface.py:942 ../src/gui_interface.py:959
+#: ../src/notify.py:267
 msgid "File Transfer Completed"
 msgstr "檔案傳輸完成"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:1203 ../src/notify.py:485
+#: ../src/dialogs.py:2779 ../src/gui_interface.py:922 ../src/notify.py:268
 msgid "File Transfer Stopped"
 msgstr "檔案傳輸已停止"
 
-#: ../src/dialogs.py:2651 ../src/gui_interface.py:908 ../src/notify.py:489
+#: ../src/dialogs.py:2781 ../src/gui_interface.py:614 ../src/notify.py:272
 msgid "Groupchat Invitation"
 msgstr "多人聊天邀請"
 
-#: ../src/dialogs.py:2653 ../src/notify.py:239 ../src/notify.py:491
-msgid "Contact Changed Status"
-msgstr "聯絡人狀態變更"
-
-#: ../src/dialogs.py:2854
+#: ../src/dialogs.py:2984
 #, python-format
 msgid "Single Message using account %s"
 msgstr "單條訊息，使用帳號 %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:2986
 #, python-format
 msgid "Single Message in account %s"
 msgstr "單條訊息，在帳號 %s"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:2988
 msgid "Single Message"
 msgstr "單條訊息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2861
+#: ../src/dialogs.py:2991
 #, python-format
 msgid "Send %s"
 msgstr "傳送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2884
+#: ../src/dialogs.py:3014
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2907
+#: ../src/dialogs.py:3037
 #, 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:2986
+#: ../src/dialogs.py:3116
 #, python-format
 msgid "RE: %s"
 msgstr "回復: %s"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3117
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 寫道: \n"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3176
 #, python-format
 msgid "XML Console for %s"
 msgstr "帳號 %s 的 XML 主控臺"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3178
 msgid "XML Console"
 msgstr " XML 主控臺"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3177
+#: ../src/dialogs.py:3325
 msgid "add"
 msgstr "加入"
 
-#: ../src/dialogs.py:3177
+#: ../src/dialogs.py:3325
 msgid "modify"
 msgstr "修改"
 
-#: ../src/dialogs.py:3178
+#: ../src/dialogs.py:3326
 msgid "remove"
 msgstr "移除"
 
-#: ../src/dialogs.py:3206
+#: ../src/dialogs.py:3355
 #, python-format
 msgid "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your roster."
 msgstr "<b>%(jid)s</b> 希望您 <b>%(action)s</b> 您的一些聯絡人。"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3268
+#: ../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:3224 ../src/dialogs.py:3299
+#: ../src/dialogs.py:3373 ../src/dialogs.py:3448
 msgid "Modify"
 msgstr "修改"
 
-#: ../src/dialogs.py:3230
+#. 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:3236
+#: ../src/dialogs.py:3385
 msgid "Groups"
 msgstr "群組"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3344
+#: ../src/dialogs.py:3493
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s 建議我將您加入到我的聯絡人清單。"
 
-#: ../src/dialogs.py:3358
+#: ../src/dialogs.py:3507
 #, python-format
 msgid "Added  %s contacts"
 msgstr "加入了 %s 聯絡人"
 
-#: ../src/dialogs.py:3395
+#: ../src/dialogs.py:3544
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "移除了 %s 聯絡人"
 
-#: ../src/dialogs.py:3435 ../src/dialogs.py:3612
+#: ../src/dialogs.py:3584 ../src/dialogs.py:3761
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s 的存檔偏好設定"
 
-#: ../src/dialogs.py:3475
+#: ../src/dialogs.py:3624
 msgid "Invalid expire value"
 msgstr "無效的過期值"
 
-#: ../src/dialogs.py:3476
+#: ../src/dialogs.py:3625
 msgid "Expire must be a valid positive integer."
 msgstr "過期值必須是一個有效的正整數。"
 
-#: ../src/dialogs.py:3523
+#: ../src/dialogs.py:3672
 msgid "There is an error with the form"
 msgstr "在表格中有一處錯誤"
 
-#: ../src/dialogs.py:3734
+#: ../src/dialogs.py:3892
 msgid "There is an error"
 msgstr "有一處錯誤"
 
-#: ../src/dialogs.py:3798
+#: ../src/dialogs.py:3960
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "隱私策略清單 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3802
+#: ../src/dialogs.py:3964
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的隱私策略清單"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4031
 #, 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:3863
+#: ../src/dialogs.py:4036
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "順序: %(order)s，動作: %(action)s"
 
-#: ../src/dialogs.py:3907
+#: ../src/dialogs.py:4087
 msgid "<b>Edit a rule</b>"
 msgstr "<b>編輯規則</b>"
 
-#: ../src/dialogs.py:4018
+#: ../src/dialogs.py:4198
 msgid "<b>Add a rule</b>"
 msgstr "<b>加入規則</b>"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4297
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的隱私策略清單"
 
-#: ../src/dialogs.py:4120
+#: ../src/dialogs.py:4299
 msgid "Privacy Lists"
 msgstr "隱私策略清單"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4388
 msgid "Invalid List Name"
 msgstr "不合法的清單名稱"
 
-#: ../src/dialogs.py:4191
+#: ../src/dialogs.py:4389
 msgid "You must enter a name to create a privacy list."
 msgstr "您必須輸入一個名稱以建立一個隱私策略清單。"
 
-#: ../src/dialogs.py:4223
+#: ../src/dialogs.py:4421
 msgid "You are invited to a groupchat"
 msgstr "您被邀請到一個聊天室"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4424
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact 邀請您加入一個聊天室"
 
-#: ../src/dialogs.py:4228
+#: ../src/dialogs.py:4426
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact 邀請您參加聊天室 %(room_jid)s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4434
 #, python-format
 msgid "Comment: %s"
 msgstr "註釋: %s"
 
-#: ../src/dialogs.py:4238
+#: ../src/dialogs.py:4436
 msgid "Do you want to accept the invitation?"
 msgstr "您是否接受邀請?"
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4498
 msgid "Choose Client Cert #PCKS12"
 msgstr "選擇客戶端證書 #PCKS12"
 
-#: ../src/dialogs.py:4310 ../src/dialogs.py:4353 ../src/dialogs.py:4409
-#: ../src/dialogs.py:4497
+#: ../src/dialogs.py:4508 ../src/dialogs.py:4550 ../src/dialogs.py:4606
+#: ../src/dialogs.py:4694
 msgid "All files"
 msgstr "所有檔案"
 
-#: ../src/dialogs.py:4315
+#: ../src/dialogs.py:4513
 msgid "PKCS12 Files"
 msgstr "PKCS12 檔案"
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4540
 msgid "Choose Sound"
 msgstr "選擇聲音"
 
-#: ../src/dialogs.py:4358
+#: ../src/dialogs.py:4555
 msgid "Wav Sounds"
 msgstr "Wav聲音"
 
-#: ../src/dialogs.py:4396
+#: ../src/dialogs.py:4593
 msgid "Choose Image"
 msgstr "選擇圖像"
 
-#: ../src/dialogs.py:4414
+#: ../src/dialogs.py:4611
 msgid "Images"
 msgstr "圖像"
 
-#: ../src/dialogs.py:4484
+#: ../src/dialogs.py:4681
 msgid "Choose Archive"
 msgstr "選擇歸檔檔案"
 
-#: ../src/dialogs.py:4502
+#: ../src/dialogs.py:4699
 msgid "Zip files"
 msgstr "Zip 檔案"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:4725
 #, python-format
 msgid "When %s becomes:"
-msgstr "當 %s 變為: "
+msgstr "當 %s 變為:"
 
-#: ../src/dialogs.py:4529
+#: ../src/dialogs.py:4727
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在為 %s 加入特殊提示"
 
-#: ../src/dialogs.py:4604
-msgid "Condition"
-msgstr "條件"
-
-#: ../src/dialogs.py:4724
-msgid "when I am "
-msgstr "當我"
-
-#: ../src/dialogs.py:5200
+#: ../src/dialogs.py:4947
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n\n"
@@ -7057,35 +7012,35 @@ msgstr ""
 "您與 <b>%(jid)s</b> 的聊天作業階段已被加密。\n\n"
 "作業階段的短認證字串是 <b>%(sas)s</b>。"
 
-#: ../src/dialogs.py:5203
+#: ../src/dialogs.py:4950
 msgid "You have already verified this contact's identity."
 msgstr "您已經確認了這個聯絡人的身分。"
 
-#: ../src/dialogs.py:5209 ../src/dialogs.py:5293
+#: ../src/dialogs.py:4956 ../src/dialogs.py:5040
 msgid "Contact's identity verified"
 msgstr "聯絡人身分已確認"
 
-#: ../src/dialogs.py:5215
+#: ../src/dialogs.py:4962
 msgid "Verify again..."
 msgstr "重新驗證…"
 
-#: ../src/dialogs.py:5220
+#: ../src/dialogs.py:4967
 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 below."
 msgstr "為了確保<b>只有</b>您期望的人可以看到您傳送的訊息或給您傳送訊息，您需要驗證他們的身分資訊。請點擊下面的按鈕。"
 
-#: ../src/dialogs.py:5223 ../src/dialogs.py:5274 ../src/dialogs.py:5287
+#: ../src/dialogs.py:4970 ../src/dialogs.py:5021 ../src/dialogs.py:5034
 msgid "Contact's identity NOT verified"
 msgstr "聯絡人身分未確認"
 
-#: ../src/dialogs.py:5228
+#: ../src/dialogs.py:4975
 msgid "Verify..."
 msgstr "確認…"
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:4986
 msgid "Have you verified the contact's identity?"
 msgstr "您確認了聯絡人的身分嗎?"
 
-#: ../src/dialogs.py:5240
+#: ../src/dialogs.py:4987
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> directly (in person or on the phone) and verify that they see the same Short Authentication String (SAS) as you.\n\n"
@@ -7094,44 +7049,86 @@ msgstr ""
 "為了防止您是在與不明方交談，您應該與 <b>%(jid)s</b> 直接交談(當面或通電話)並確認他們看到的短認證字串(SAS)與您相同。\n\n"
 "這次作業階段的短認證字串是 <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:5241
+#: ../src/dialogs.py:4988
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "您與遠端聯絡人通話並驗證了 SAS 嗎?"
 
-#: ../src/dialogs.py:5275
+#: ../src/dialogs.py:5022
 #, 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:5281
+#: ../src/dialogs.py:5028
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr "沒有為這個聯絡人指定密鑰。因此您無法加密訊息。"
 
-#: ../src/dialogs.py:5288
+#: ../src/dialogs.py:5035
 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."
 msgstr "盡管為這個聯絡人指定了密鑰，但您<b>不信任</b>他的密鑰，因此訊息<b>無法</b>被加密。使用您的 GPG 客戶端以信任他的密鑰。"
 
-#: ../src/dialogs.py:5294
+#: ../src/dialogs.py:5041
 msgid "GPG Key is assigned to this contact, and you trust his key, so messages will be encrypted."
 msgstr "聯絡人被指定了 GPG 密鑰，且您信任他的密鑰，所以訊息會被加密。"
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5106
 msgid "an audio and video"
 msgstr "一個音訊和視訊"
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5108
 msgid "an audio"
 msgstr "一個音訊"
 
-#: ../src/dialogs.py:5363
+#: ../src/dialogs.py:5110
 msgid "a video"
 msgstr "一個視訊"
 
-#: ../src/dialogs.py:5367
+#: ../src/dialogs.py:5114
 #, 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
+#, python-format
+msgid "Certificate for account %s"
+msgstr "帳號憑證 %s"
+
+#: ../src/dialogs.py:5182
+#, python-format
+msgid ""
+"<b>Issued to:</b>\n"
+"Common Name (CN): %(scn)s\n"
+"Organization (O): %(sorg)s\n"
+"Organizationl Unit (OU): %(sou)s\n"
+"Serial Number: %(sn)s\n\n"
+"<b>Issued by:</b>\n"
+"Common Name (CN): %(icn)s\n"
+"Organization (O): %(iorg)s\n"
+"Organizationl Unit (OU): %(iou)s\n\n"
+"<b>Validity:</b>\n"
+"Issued on: %(io)s\n"
+"Expires on: %(eo)s\n\n"
+"<b>Fingerprint</b>\n"
+"SHA1 Fingerprint: %(sha1)s"
+msgstr ""
+"<b>發行對象:</b>\n"
+"一般名稱 (CN):%(scn)s\n"
+"組織 (O):%(sorg)s\n"
+"組織單位 (OU):%(sou)s\n"
+"序號:%(sn)s\n\n"
+"<b>發行來源:</b>\n"
+"一般名稱 (CN):%(icn)s\n"
+"組織 (O):%(iorg)s\n"
+"組織單位 (OU):%(iou)s\n\n"
+"<b>效力:</b>\n"
+"發行日:%(io)s\n"
+"逾期日:%(eo)s\n\n"
+"<b>指紋</b>\n"
+"SHA1 指紋:%(sha1)s"
+
+#: ../src/dialogs.py:5216 ../src/dialogs.py:5233
+msgid "View cert..."
+msgstr "檢視憑證…"
+
 #: ../src/disco.py:119
 msgid "Others"
 msgstr "其他"
@@ -7141,57 +7138,57 @@ msgstr "其他"
 msgid "Conference"
 msgstr "會議"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:516
 msgid "Without a connection, you can not browse available services"
 msgstr "連線後才可瀏覽可用服務"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:602
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帳號 %s 來發掘服務"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:604
 msgid "Service Discovery"
 msgstr "搜尋服務"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:760
 msgid "The service could not be found"
 msgstr "找不到該服務"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:761
 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:763 ../src/disco.py:1100
+#: ../src/disco.py:765 ../src/disco.py:1102
 msgid "The service is not browsable"
 msgstr "該服務無法瀏覽"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:766
 msgid "This type of service does not contain any items to browse."
 msgstr "此服務沒有項目可瀏覽。"
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:806 ../src/disco.py:816
 msgid "Invalid Server Name"
 msgstr "無效的伺服器名稱"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:870
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "用帳號 %(account)s 瀏覽位址 %(address)s"
 
-#: ../src/disco.py:912
+#: ../src/disco.py:914
 msgid "_Browse"
 msgstr "瀏覽(_B)"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1103
 msgid "This service does not contain any items to browse."
 msgstr "此服務不包含任何項目可瀏覽。"
 
-#: ../src/disco.py:1341
+#: ../src/disco.py:1343
 msgid "_Execute Command"
 msgstr "執行命令(_E)…"
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1353 ../src/disco.py:1522
 msgid "Re_gister"
 msgstr "註冊(_G)"
 
@@ -7215,247 +7212,263 @@ msgstr "描述"
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2927
+#: ../src/disco.py:1835 ../src/gui_interface.py:2448
 msgid "Bookmark already set"
 msgstr "書籤已設定"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2928
+#: ../src/disco.py:1836 ../src/gui_interface.py:2449
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "聊天室\"%s\"已在您的書籤中。"
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:2942
+#: ../src/disco.py:1845 ../src/gui_interface.py:2463
 msgid "Bookmark has been added successfully"
 msgstr "書籤加入成功"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:2943
+#: ../src/disco.py:1846 ../src/gui_interface.py:2464
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以透過\"動作\"選單管理您的書籤。"
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2055
 msgid "Subscribed"
 msgstr "訂閱"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2063
 msgid "Node"
 msgstr "節點"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2127
 msgid "New post"
 msgstr "新發表"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2133
 msgid "_Subscribe"
 msgstr "訂閱(_S)"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2139
 msgid "_Unsubscribe"
 msgstr "退訂(_S)"
 
-#: ../src/features_window.py:49
-msgid "SSL certificat validation"
-msgstr "SSL 證書驗證"
-
 #: ../src/features_window.py:50
+msgid "SSL certificate validation"
+msgstr "SSL 憑證驗證"
+
+#: ../src/features_window.py:51
 msgid "A library used to validate server certificates to ensure a secure connection."
 msgstr "一個用於驗證伺服器的證書以保證連線安全的函式庫。"
 
-#: ../src/features_window.py:51 ../src/features_window.py:52
+#: ../src/features_window.py:52 ../src/features_window.py:53
 msgid "Requires python-pyopenssl."
 msgstr "需要 python-pyopenssl。"
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr "無需伺服器自動偵測本地網路中其他客戶端進行聊天"
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-avahi."
 msgstr "需要 python-avahi。"
 
-#: ../src/features_window.py:56
+#: ../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:57
+#: ../src/features_window.py:58
 msgid "Command line"
 msgstr "命令列"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "A script to control Gajim via commandline."
 msgstr "一個在命令列下控制 Gajim 的命令稿。"
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires python-dbus."
 msgstr "需要 python-dbus。"
 
-#: ../src/features_window.py:60 ../src/features_window.py:64
-#: ../src/features_window.py:68 ../src/features_window.py:72
-#: ../src/features_window.py:76 ../src/features_window.py:84
-#: ../src/features_window.py:88 ../src/features_window.py:108
+#: ../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
 msgid "Feature not available under Windows."
 msgstr "特性在 Windows 下無法使用。"
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 msgid "OpenGPG message encryption"
 msgstr "OpenPGP 訊息加密"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 msgid "Encrypting chat messages with gpg keys."
 msgstr "用 gpg 密鑰加密聊天訊息。"
 
-#: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "需要 gpg 和 python-GnuPGInterface。"
+#: ../src/features_window.py:64
+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
+msgid "Requires gpg.exe in PATH."
+msgstr "PATH 中要有 gpg.exe。"
+
+#: ../src/features_window.py:66
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Autodetection of network status."
 msgstr "自動偵測網路狀態。"
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "需要 gnome-network-manager 和 python-dbus。"
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Session Management"
 msgstr "作業階段管理"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim 作業階段在離開時會被儲存而後登入時恢復。"
 
-#: ../src/features_window.py:71
+#: ../src/features_window.py:72
 msgid "Requires python-gnome2."
 msgstr "需要 python-gnome2。"
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "Password encryption"
 msgstr "密碼加密"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "密碼可以被安全地儲存，而不只是以純文字方式。"
 
-#: ../src/features_window.py:75
+#: ../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:77
+#: ../src/features_window.py:78
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "連線到有 SRV 記錄的伺服器的能力。"
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires dnsutils."
 msgstr "需要 dnsutils。"
 
-#: ../src/features_window.py:80
+#: ../src/features_window.py:81
 msgid "Requires nslookup to use SRV records."
 msgstr "需要 nslookup 以使用 SRV 記錄。"
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Spell Checker"
 msgstr "拼寫檢查工具"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Spellchecking of composed messages."
 msgstr "對正在編輯的訊息進行拼寫檢查。"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid "Requires libgtkspell."
 msgstr "需要 libgtkspell。"
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
 msgid "Notification"
 msgstr "通知"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "Passive popups notifying for new events."
 msgstr "有新的時間時，主動彈出提示。"
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
 msgstr "需要 python-notify 或 python-dbus 和 notification-daemon的組合。"
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "自動調整狀態"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "測算閒置時間以自動調整狀態的能力。"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "需要 libxss 函式庫。"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "需要 python2.5。"
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "轉換 $$ $$ 之間的 LaTeX 運算式。"
 
-#: ../src/features_window.py:95
+#: ../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:96
+#: ../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:97
+#: ../src/features_window.py:98
 msgid "End to End message encryption"
 msgstr "End to End 訊息加密"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 msgid "Encrypting chat messages."
 msgstr "加密聊天訊息。"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "需要 python-crypto。"
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST 產生器"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:103
 msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
 msgstr "從 RST 程式碼產生 XHTML 輸出 (參考 http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)。"
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "需要 python-docutils。"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Ability to start audio and video chat."
 msgstr "開始進行語音視訊通話的能力。"
 
-#: ../src/features_window.py:107
-msgid "Requires python-farsight."
-msgstr "需要 python-farsight。"
+#: ../src/features_window.py:108
+msgid "Requires python-farsight and gstreamer-plugins-bad."
+msgstr "需要 python-farsight 和 gstreamer-plugins-bad。"
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:110
+msgid "UPnP-IGD"
+msgstr "UPnP-IGD"
+
+#: ../src/features_window.py:111
+msgid "Ability to request your router to forward port for file transfer."
+msgstr "要求您的路由器於檔案傳送時轉用通訊埠的能力。"
+
+#: ../src/features_window.py:112
+msgid "Requires python-gupnp-igd."
+msgstr "需要 python-gupnp-igd。"
+
+#: ../src/features_window.py:120
 msgid "?features:Available"
 msgstr "可用"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:127
 msgid "Feature"
 msgstr "特性"
 
@@ -7476,7 +7489,7 @@ msgstr "處理序"
 msgid "Filename: %s"
 msgstr "檔案名稱:  %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:333
 #, python-format
 msgid "Size: %s"
 msgstr "大小:  %s"
@@ -7484,7 +7497,7 @@ 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:522
+#: ../src/history_manager.py:541
 msgid "You"
 msgstr "您"
 
@@ -7493,15 +7506,15 @@ msgstr "您"
 msgid "Sender: %s"
 msgstr "傳送者:  %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:627
 #: ../src/tooltips.py:742
 msgid "Recipient: "
-msgstr "接收者:  %s"
+msgstr "接收者: "
 
 #: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
-msgstr "儲存在:  %s"
+msgstr "儲存在: %s"
 
 #: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
@@ -7529,78 +7542,78 @@ msgstr "錯誤訊息: %s"
 msgid "File transfer stopped"
 msgstr "檔案傳輸已停止"
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:266
 msgid "Choose File to Send..."
 msgstr "選擇要傳送的檔案…"
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:282 ../src/tooltips.py:780
 msgid "Description: "
 msgstr "描述: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:295
 msgid "Gajim cannot access this file"
 msgstr "Gajim 無法存取此檔案"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:296
 msgid "This file is being used by another process."
 msgstr "此檔案正在被其他程式使用。"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:330
 #, python-format
 msgid "File: %s"
 msgstr "檔案:  %s"
 
-#: ../src/filetransfers_window.py:326
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "Type: %s"
 msgstr "é¡žåž‹: %s"
 
-#: ../src/filetransfers_window.py:328
+#: ../src/filetransfers_window.py:338
 #, python-format
 msgid "Description: %s"
 msgstr "描述:  %s"
 
-#: ../src/filetransfers_window.py:329
+#: ../src/filetransfers_window.py:339
 #, python-format
 msgid "%s wants to send you a file:"
-msgstr "%s 想傳送給您一個檔案: "
+msgstr "%s 想傳送給您一個檔案:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:879
+#: ../src/filetransfers_window.py:352 ../src/gtkgui_helpers.py:850
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "無法覆寫現有檔案\"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:880
+#: ../src/filetransfers_window.py:353 ../src/gtkgui_helpers.py:851
 msgid "A file with this name already exists and you do not have permission to overwrite it."
 msgstr "檔案名稱已經存在且您沒有權限覆寫它。"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
 msgid "This file already exists"
 msgstr "檔案已經存在"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:855
 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:369 ../src/gtkgui_helpers.py:891
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:862
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目錄 \"%s\" 不可寫"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:892
+#: ../src/filetransfers_window.py:379 ../src/gtkgui_helpers.py:863
 msgid "You do not have permission to create files in this directory."
 msgstr "您沒有權限在這個目錄裡建立檔案。"
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:389
 msgid "Save File as..."
 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:449
+#: ../src/filetransfers_window.py:459
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7608,75 +7621,75 @@ 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:542
+#: ../src/filetransfers_window.py:552
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:595 ../src/filetransfers_window.py:598
 msgid "Invalid File"
 msgstr "無效檔案"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:595
 msgid "File: "
 msgstr "檔案: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:599
 msgid "It is not possible to send empty files"
 msgstr "無法傳送空檔案"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:623 ../src/tooltips.py:732
 msgid "Name: "
 msgstr "名稱: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:625 ../src/tooltips.py:736
 msgid "Sender: "
 msgstr "傳送者: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:787
 msgid "Pause"
 msgstr "暫停"
 
-#: ../src/gajim.py:175
+#: ../src/gajim.py:186
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim 需要 X 伺服器才能執行。離開…"
 
-#: ../src/gajim.py:177
+#: ../src/gajim.py:188
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "匯入 PyGTK 失敗: %s"
 
-#: ../src/gajim.py:219
+#: ../src/gajim.py:230
 msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim 需要 PyGTK 2.16 或更高版本"
 
-#: ../src/gajim.py:220
+#: ../src/gajim.py:231
 msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim 需要 PyGTK 2.16 或更高版本才能執行。離開…"
 
-#: ../src/gajim.py:222
+#: ../src/gajim.py:233
 msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim 需要 GTK 2.16 或更高版本"
 
-#: ../src/gajim.py:223
+#: ../src/gajim.py:234
 msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim 需要 GTK 2.16 或更高版本才能執行。離開…"
 
-#: ../src/gajim.py:232
+#: ../src/gajim.py:243
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim 需要 pywin32 才能執行"
 
-#: ../src/gajim.py:233
+#: ../src/gajim.py:244
 #, 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:349
+#: ../src/gajim.py:360
 msgid "Gajim is already running"
 msgstr "Gajim 已經在執行"
 
-#: ../src/gajim.py:350
+#: ../src/gajim.py:361
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7684,38 +7697,31 @@ msgstr ""
 "Gajim 另一個實體似乎正在執行\n"
 "不管怎樣，仍然執行?"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:77
 msgid "Shows a help on specific command"
 msgstr "為特定命令顯示求助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:80
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:81
 msgid "show help on command"
 msgstr "為命令顯示求助"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:85
 msgid "Shows or hides the roster window"
 msgstr "顯示/隱藏聯絡人清單視窗"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:89
 msgid "Pops up a window with the next pending event"
 msgstr "為下一筆未處理事件彈出視窗"
 
-#: ../src/gajim-remote-plugin.py:90 ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:93
 msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
 msgstr "列印聯絡人清單中所有聯絡人。每個聯絡人一列。"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote-plugin.py:108
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:131
-#: ../src/gajim-remote-plugin.py:145 ../src/gajim-remote-plugin.py:154
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote-plugin.py:205
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote-plugin.py:221
-#: ../src/gajim-remote-plugin.py:228 ../src/gajim-remote-plugin.py:239
-#: ../src/gajim-remote-plugin.py:255 ../src/gajim-remote-plugin.py:264
 #: ../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
@@ -7727,248 +7733,299 @@ msgstr "列印聯絡人清單中所有聯絡人。每個聯絡人一列。"
 msgid "account"
 msgstr "帳號"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:96
 msgid "show only contacts of the given account"
 msgstr "只顯示指定帳號的聯絡人"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:102
 msgid "Prints a list of registered accounts"
 msgstr "列印註冊的帳號"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:106
 msgid "Changes the status of account or accounts"
 msgstr "變更一個或多個帳號狀態"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
+#: ../src/gajim-remote.py:109
 msgid "status"
 msgstr "狀態"
 
-#: ../src/gajim-remote-plugin.py:106
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "下列中的一項: offline，online，chat，away，xa，dnd，invisible"
+#: ../src/gajim-remote.py:109
+msgid "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account's previous status"
+msgstr "下列之一: offline，online，chat，away，xa，dnd，invisible。如果沒有設定，使用帳號先前的狀態"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:110
 msgid "status message"
 msgstr "狀態訊息"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:111
 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-plugin.py:114 ../src/gajim-remote.py:127
-msgid "Shows the chat dialog so that you can send messages to a contact"
-msgstr "顯示對話方塊用於給聯絡人傳送訊息"
+#: ../src/gajim-remote.py:117
+msgid "Changes the priority of account or accounts"
+msgstr "變更一個或多個帳號的優先等級"
 
-#: ../src/gajim-remote-plugin.py:116 ../src/gajim-remote.py:129
-msgid "JID of the contact that you want to chat with"
+#: ../src/gajim-remote.py:119
+msgid "priority"
+msgstr "優先等級"
+
+#: ../src/gajim-remote.py:119
+msgid "priority you want to give to the account"
+msgstr "您想要給予這個帳號的優先等級"
+
+#: ../src/gajim-remote.py:121
+msgid "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
+msgstr "變更指定帳號的優先等級。如果不指明，將變更所有設定了\"與全域狀態同步\"選項的帳號"
+
+#: ../src/gajim-remote.py:127
+msgid "Shows the chat dialog so that you can send messages to a contact"
+msgstr "顯示對話方塊用於給聯絡人傳送訊息"
+
+#: ../src/gajim-remote.py:129
+msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote-plugin.py:118 ../src/gajim-remote-plugin.py:205
 #: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，將從此帳號清單下移出聯絡人"
 
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:134
+msgid "message content. The account must be specified or \"\""
+msgstr "訊息內容。帳號必須被指定或為\"\""
+
+#: ../src/gajim-remote.py:139
 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 key', just set 'OpenPGP key' to ''."
 msgstr "傳送新聊天訊息至聯絡人清單中的聯絡人。 OpenPGP 密鑰與帳號均可選。如果只選擇\"帳號\"而不需要\" OpenPGP 密鑰\"，只需將\" OpenPGP 密鑰\"置為空。"
 
-#: ../src/gajim-remote-plugin.py:127 ../src/gajim-remote-plugin.py:140
 #: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "聯絡人的JID將收到訊息"
 
-#: ../src/gajim-remote-plugin.py:128 ../src/gajim-remote-plugin.py:142
-#: ../src/gajim-remote-plugin.py:153 ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158 ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "訊息內容"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "PGP 密鑰"
 
-#: ../src/gajim-remote-plugin.py:129 ../src/gajim-remote-plugin.py:143
 #: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定，該訊息將使用本公共密鑰加密"
 
-#: ../src/gajim-remote-plugin.py:131 ../src/gajim-remote-plugin.py:145
-#: ../src/gajim-remote-plugin.py:154 ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161 ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定，訊息將被用此帳號傳送"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:152
 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 key', just set 'OpenPGP key' to ''."
 msgstr "傳送新單條訊息至聯絡人清單中的聯絡人。 OpenPGP 密鑰與帳號均可選。如果只選擇\"帳號\"而不需要\" OpenPGP 密鑰\"，只需將\" OpenPGP 密鑰\"置為空。"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
 msgid "subject"
 msgstr "主題"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:157
 msgid "message subject"
 msgstr "訊息主題"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:166
 msgid "Sends new message to a groupchat you've joined."
 msgstr "向一個您加入的聊天室傳送新訊息。"
 
-#: ../src/gajim-remote-plugin.py:152 ../src/gajim-remote.py:168
+#: ../src/gajim-remote.py:168
 msgid "JID of the room that will receive the message"
 msgstr "要收到這條訊息的聊天室的 JID"
 
-#: ../src/gajim-remote-plugin.py:159 ../src/gajim-remote.py:175
+#: ../src/gajim-remote.py:175
 msgid "Gets detailed info on a contact"
 msgstr "獲得聯絡人的詳細資訊"
 
-#: ../src/gajim-remote-plugin.py:161 ../src/gajim-remote-plugin.py:174
-#: ../src/gajim-remote-plugin.py:204 ../src/gajim-remote-plugin.py:213
 #: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
 #: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "聯絡人的 JID "
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:181
 msgid "Gets detailed info on a account"
 msgstr "獲得帳號的詳細資訊"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:183
 msgid "Name of the account"
 msgstr "帳號名稱"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:187
 msgid "Sends file to a contact"
 msgstr "向聯絡人傳送檔案"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
 msgid "file"
 msgstr "檔案"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:189
 msgid "File path"
 msgstr "檔案路徑"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:191
 msgid "if specified, file will be sent using this account"
 msgstr "如指定，檔案將被用此帳號傳送"
 
-#: ../src/gajim-remote-plugin.py:180 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:196
 msgid "Lists all preferences and their values"
 msgstr "列出所有的參數及它們的值"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:200
 msgid "Sets value of 'key' to 'value'."
 msgstr "將\"密鑰\"的值設為\"值\""
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
 msgid "key=value"
 msgstr "鍵=值"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "\"密鑰\"是參數名稱，而\"值\"是賦予參數的數值"
 
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
 msgstr "刪除一個參數項"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
 msgid "key"
 msgstr "鍵"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:209
 msgid "name of the preference to be deleted"
 msgstr "需要刪除的參數名稱"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:213
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "將目前Gajim的國家設定寫入 .config 檔案"
 
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:218
 msgid "Removes contact from roster"
 msgstr "從聯絡人清單移除聯絡人"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:227
 msgid "Adds contact to roster"
 msgstr "向聯絡人清單加入聯絡人"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:230
 msgid "Adds new contact to this account"
 msgstr "為此帳號加入新聯絡人"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "回傳目前狀態(如不指定帳號將回傳全域設定)"
 
-#: ../src/gajim-remote-plugin.py:226
-msgid "Returns current status message(the global one unless account is specified)"
-msgstr "回傳目前的狀態資訊 (如不指定帳號則回傳全域設定)"
+#: ../src/gajim-remote.py:242
+msgid "Returns current status message (the global one unless account is specified)"
+msgstr "回傳目前狀態資訊(如不指定帳號將回傳全域設定)"
 
-#: ../src/gajim-remote-plugin.py:233 ../src/gajim-remote.py:249
+#: ../src/gajim-remote.py:249
 msgid "Returns number of unread messages"
 msgstr "回傳未讀訊息數"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:253
 msgid "Opens 'Start Chat' dialog"
 msgstr "開啟 '開始聊天' 對話方塊"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:255
 msgid "Starts chat, using this account"
 msgstr "開始聊天，使用這個帳號"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:259
 msgid "Sends custom XML"
 msgstr "傳送自訂 XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:261
 msgid "XML to send"
 msgstr "傳送 XML"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:262
 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-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:268
+msgid "Change the avatar"
+msgstr "變更頭像"
+
+#: ../src/gajim-remote.py:270
+msgid "Picture to use"
+msgstr "要使用的圖片"
+
+#: ../src/gajim-remote.py:271
+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
 msgid "Handle a xmpp:/ uri"
 msgstr "處理一個 xmpp:/ uri"
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:279
+msgid "URI to handle"
+msgstr "要處理的 URI"
+
+#: ../src/gajim-remote.py:280
+msgid "Account in which you want to handle it"
+msgstr "您想要用其處理它的帳號"
+
+#: ../src/gajim-remote.py:282
+msgid "Message content"
+msgstr "訊息內容"
+
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "加入聊天室"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "聊天室"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
+#: ../src/gajim-remote.py:288
+msgid "Room JID"
+msgstr "聊天室 JID"
+
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "暱稱"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
+#: ../src/gajim-remote.py:289
+msgid "Nickname to use"
+msgstr "要使用的暱稱"
+
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "密碼"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:290
+msgid "Password to enter the room"
+msgstr "進入聊天室的密碼"
+
+#: ../src/gajim-remote.py:291
+msgid "Account from which you want to enter the room"
+msgstr "您想要用其加入聊天室的帳號"
+
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "請檢查 Gajim 是否正在執行"
 
-#: ../src/gajim-remote-plugin.py:272 ../src/gajim-remote-plugin.py:282
 #: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "顯示/隱藏 ipython 視窗"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"聯絡人 JID\"參數"
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:349
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -7977,29 +8034,29 @@ msgstr ""
 "\"%s\" 不在您的聯絡人清單中。\n"
 "請為傳送此訊息指定帳號。"
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:352
 msgid "You have no active account"
 msgstr "沒有活動的帳號"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:405
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "似乎 Gajim 不在執行。因此您無法使用 gajim-remote。"
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:432
 #, python-format
-msgid "Usage: %s %s %s \n\t %s"
-msgstr "用法:  %s %s %s \n\t %s"
+msgid "Usage: %(basename)s %(command)s %(arguments)s \n\t %(help)s"
+msgstr "用法: %(basename)s %(command)s %(arguments)s \n\t %(help)s"
 
-#: ../src/gajim-remote-plugin.py:415 ../src/gajim-remote.py:435
+#: ../src/gajim-remote.py:436
 msgid "Arguments:"
-msgstr "參數: "
+msgstr "參數:"
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:440
 #, python-format
 msgid "%s not found"
 msgstr " %s 找不到"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
+#: ../src/gajim-remote.py:446
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8008,102 +8065,7 @@ msgstr ""
 "用法: %s 命令 [參數] \n"
 "命令是下列之一: \n"
 
-#: ../src/gajim-remote-plugin.py:496
-#, python-format
-msgid ""
-"Too many arguments. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"參數太多。\n"
-"輸入\"%s help %s\"以獲取更多資訊"
-
-#: ../src/gajim-remote-plugin.py:500
-#, python-format
-msgid ""
-"Argument \"%s\" is not specified. \n"
-"Type \"%s help %s\" for more info"
-msgstr ""
-"參數\"%s\"未指定。\n"
-"輸入\"%s help %s\"以獲取更多資訊"
-
-#: ../src/gajim-remote-plugin.py:518 ../src/gajim-remote.py:540
-msgid "Wrong uri"
-msgstr "錯誤的 uri"
-
-#: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible. If not set, use account's previous status"
-msgstr "下列之一: offline，online，chat，away，xa，dnd，invisible。如果沒有設定，使用帳號先前的狀態"
-
-#: ../src/gajim-remote.py:117
-msgid "Changes the priority of account or accounts"
-msgstr "變更一個或多個帳號的優先等級"
-
-#: ../src/gajim-remote.py:119
-msgid "priority"
-msgstr "優先等級"
-
-#: ../src/gajim-remote.py:119
-msgid "priority you want to give to the account"
-msgstr "您想要給予這個帳號的優先等級"
-
-#: ../src/gajim-remote.py:121
-msgid "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
-msgstr "變更指定帳號的優先等級。如果不指明，將變更所有設定了\"與全域狀態同步\"選項的帳號"
-
-#: ../src/gajim-remote.py:134
-msgid "message content. The account must be specified or \"\""
-msgstr "訊息內容。帳號必須被指定或為\"\""
-
-#: ../src/gajim-remote.py:242
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "回傳目前狀態資訊(如不指定帳號將回傳全域設定)"
-
-#: ../src/gajim-remote.py:268
-msgid "Change the avatar"
-msgstr "變更頭像"
-
-#: ../src/gajim-remote.py:270
-msgid "Picture to use"
-msgstr "要使用的圖片"
-
-#: ../src/gajim-remote.py:271
-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:279
-msgid "URI to handle"
-msgstr "要處理的 URI"
-
-#: ../src/gajim-remote.py:280
-msgid "Account in which you want to handle it"
-msgstr "您想要用其處理它的帳號"
-
-#: ../src/gajim-remote.py:282
-msgid "Message content"
-msgstr "訊息內容"
-
-#: ../src/gajim-remote.py:288
-msgid "Room JID"
-msgstr "聊天室 JID"
-
-#: ../src/gajim-remote.py:289
-msgid "Nickname to use"
-msgstr "要使用的暱稱"
-
-#: ../src/gajim-remote.py:290
-msgid "Password to enter the room"
-msgstr "進入聊天室的密碼"
-
-#: ../src/gajim-remote.py:291
-msgid "Account from which you want to enter the room"
-msgstr "您想要用其加入聊天室的帳號"
-
-#: ../src/gajim-remote.py:431
-#, python-format
-msgid "Usage: %(basename)s %(command)s %(arguments)s \n\t %(help)s"
-msgstr "用法: %(basename)s %(command)s %(arguments)s \n\t %(help)s"
-
-#: ../src/gajim-remote.py:514
+#: ../src/gajim-remote.py:515
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8112,7 +8074,7 @@ msgstr ""
 "參數太多。\n"
 "輸入 \"%(basename)s help %(command)s\" 獲取更多資訊"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:520
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8121,10 +8083,14 @@ msgstr ""
 "參數 \"%(arg)s\" 未指定。\n"
 "輸入 \"%(basename)s help %(command)s\" 獲取更多資訊"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:539
 msgid "No uri given"
 msgstr "沒有給出 URI"
 
+#: ../src/gajim-remote.py:541
+msgid "Wrong uri"
+msgstr "錯誤的 uri"
+
 #: ../src/gajim_themes_window.py:59
 msgid "Theme"
 msgstr "主題"
@@ -8150,196 +8116,228 @@ msgstr "無法刪除目前主題"
 msgid "Please first choose another for your current theme."
 msgstr "請先選擇其他主題做為目前主題"
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:176 ../src/groupchat_control.py:1557
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s 現在成了 %(new_nick)s"
+
+#: ../src/groupchat_control.py:230
 msgid "Sending private message failed"
 msgstr "傳送私有訊息失敗"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:232
 #, 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:472
+#: ../src/groupchat_control.py:560
 msgid "Insert Nickname"
 msgstr "插入暱稱"
 
-#: ../src/groupchat_control.py:653
+#: ../src/groupchat_control.py:743
 msgid "Conversation with "
 msgstr "對話，與"
 
-#: ../src/groupchat_control.py:655
+#: ../src/groupchat_control.py:745
 msgid "Continued conversation"
 msgstr "繼續對話"
 
+#: ../src/groupchat_control.py:1222
+#, 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:1305 ../src/gui_interface.py:860
+#: ../src/groupchat_control.py:1240 ../src/groupchat_control.py:1499
 msgid "Any occupant is allowed to see your full JID"
 msgstr "所有室友可以看到您的全部 JID"
 
+#: ../src/groupchat_control.py:1243
+msgid "Room now shows unavailable member"
+msgstr "聊天室現在顯示了無法使用的成員"
+
+#: ../src/groupchat_control.py:1245
+msgid "room now does not show unavailable members"
+msgstr "聊天室現在不顯示無法使用的成員"
+
+#: ../src/groupchat_control.py:1247
+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
+msgid "Room logging is now enabled"
+msgstr "聊天室訊息記錄已啟用"
+
+#: ../src/groupchat_control.py:1253
+msgid "Room logging is now disabled"
+msgstr "聊天室訊息記錄已停用"
+
+#: ../src/groupchat_control.py:1255
+msgid "Room is now non-anonymous"
+msgstr "聊天室現在是非匿名的"
+
+#: ../src/groupchat_control.py:1258
+msgid "Room is now semi-anonymous"
+msgstr "聊天室現在是半匿名的"
+
+#: ../src/groupchat_control.py:1261
+msgid "Room is now fully-anonymous"
+msgstr "聊天室現在是完全匿名的"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1504
 msgid "Room logging is enabled"
 msgstr "聊天室記錄被啟用"
 
-#: ../src/groupchat_control.py:1311
+#: ../src/groupchat_control.py:1506
 msgid "A new room has been created"
 msgstr "一個新的聊天室被建立"
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1509
 msgid "The server has assigned or modified your roomnick"
 msgstr "伺服器指定或修改了您的聊天室暱稱"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1320
+#: ../src/groupchat_control.py:1515
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出: %(reason)s"
 
-#: ../src/groupchat_control.py:1323
+#: ../src/groupchat_control.py:1518
 #, 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:1332
+#: ../src/groupchat_control.py:1527
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁: %(reason)s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1530
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁: %(reason)s"
 
-#: ../src/groupchat_control.py:1346 ../src/groupchat_control.py:1450
+#: ../src/groupchat_control.py:1541 ../src/groupchat_control.py:1645
 #, python-format
 msgid "You are now known as %s"
 msgstr "您現在成了 %s "
 
-#: ../src/groupchat_control.py:1362 ../src/gui_interface.py:734
-#, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%(nick)s 現在成了 %(new_nick)s"
-
-#: ../src/groupchat_control.py:1404 ../src/groupchat_control.py:1409
-#: ../src/groupchat_control.py:1415
+#: ../src/groupchat_control.py:1599 ../src/groupchat_control.py:1604
+#: ../src/groupchat_control.py:1610
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s 已經被從這個聊天室移除(%(reason)s)"
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1601
 msgid "affiliation changed"
 msgstr "歸屬變更"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1606
 msgid "room configuration changed to members-only"
 msgstr "聊天室配置變為\"僅成員\""
 
-#: ../src/groupchat_control.py:1417
+#: ../src/groupchat_control.py:1612
 msgid "system shutdown"
 msgstr "系統關閉"
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1695
 #, 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:1504
+#: ../src/groupchat_control.py:1699
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s 的歸屬被設定為 %(affiliation)s"
 
-#: ../src/groupchat_control.py:1519
+#: ../src/groupchat_control.py:1714
 #, 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:1523
+#: ../src/groupchat_control.py:1718
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s 的角色被設定為 %(role)s"
 
-#: ../src/groupchat_control.py:1553
+#: ../src/groupchat_control.py:1748
 #, python-format
 msgid "%s has left"
 msgstr "%s 離開了"
 
-#: ../src/groupchat_control.py:1558
+#: ../src/groupchat_control.py:1753
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入聊天室"
 
-#: ../src/groupchat_control.py:1560 ../src/gui_interface.py:761
-#: ../src/history_window.py:447 ../src/notify.py:234
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s 的狀態是 %(status)s"
-
-#: ../src/groupchat_control.py:1804
+#: ../src/groupchat_control.py:2006
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "您確定要離開聊天室\"%s\"嗎?"
 
-#: ../src/groupchat_control.py:1806
+#: ../src/groupchat_control.py:2008
 msgid "If you close this window, you will be disconnected from this group chat."
 msgstr "如果關閉此視窗，您將中斷此聊天室的連線。"
 
-#: ../src/groupchat_control.py:1810 ../src/gui_interface.py:958
-#: ../src/gui_interface.py:1712 ../src/gui_interface.py:1749
-#: ../src/gui_interface.py:1784 ../src/message_window.py:224
-#: ../src/roster_window.py:2816 ../src/roster_window.py:3476
-#: ../src/roster_window.py:4206
+#: ../src/groupchat_control.py:2012 ../src/gui_interface.py:673
+#: ../src/gui_interface.py:1282 ../src/gui_interface.py:1322
+#: ../src/gui_interface.py:1363 ../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:1844
+#: ../src/groupchat_control.py:2046
 msgid "Changing Subject"
 msgstr "正在更換話題"
 
-#: ../src/groupchat_control.py:1845
+#: ../src/groupchat_control.py:2047
 msgid "Please specify the new subject:"
-msgstr "請指定新話題: "
+msgstr "請指定新話題:"
 
-#: ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2054
 msgid "Changing Nickname"
 msgstr "正在更換暱稱"
 
-#: ../src/groupchat_control.py:1853
+#: ../src/groupchat_control.py:2055
 msgid "Please specify the new nickname you want to use:"
-msgstr "請指定您想使用的新暱稱: "
+msgstr "請指定您想使用的新暱稱:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1884
+#: ../src/groupchat_control.py:2086
 #, python-format
 msgid "Destroying %s"
 msgstr "正在銷毀 %s"
 
-#: ../src/groupchat_control.py:1885
+#: ../src/groupchat_control.py:2087
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 "您正要徹底銷毀這個聊天室。\n"
-"您可以在下面指定一個原因: "
+"您可以在下面指定一個原因:"
 
-#: ../src/groupchat_control.py:1887
+#: ../src/groupchat_control.py:2089
 msgid "You may also enter an alternate venue:"
-msgstr "您也可以輸入一個可選的替代地點: "
+msgstr "您也可以輸入一個可選的替代地點:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2076
+#: ../src/groupchat_control.py:2284
 #, python-format
 msgid "Kicking %s"
 msgstr "將踢走 %s"
 
-#: ../src/groupchat_control.py:2077 ../src/groupchat_control.py:2404
+#: ../src/groupchat_control.py:2285 ../src/groupchat_control.py:2617
 msgid "You may specify a reason below:"
-msgstr "您可以指定一個原因: "
+msgstr "您可以指定一個原因:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2403
+#: ../src/groupchat_control.py:2616
 #, python-format
 msgid "Banning %s"
 msgstr "將封禁 %s"
@@ -8366,151 +8364,145 @@ msgstr "細節"
 msgid "Error: cannot open %s for reading"
 msgstr "錯誤: 無法按讀開啟檔案 %s"
 
-#: ../src/gtkgui_helpers.py:377
+#: ../src/gtkgui_helpers.py:348
 msgid "Error reading file:"
-msgstr "讀檔案錯誤: "
+msgstr "讀檔案錯誤:"
 
-#: ../src/gtkgui_helpers.py:380
+#: ../src/gtkgui_helpers.py:351
 msgid "Error parsing file:"
-msgstr "分析檔案錯誤: "
+msgstr "分析檔案錯誤:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:421
+#: ../src/gtkgui_helpers.py:392
 #, 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:795
+#: ../src/gtkgui_helpers.py:766
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim 不是預設的 Jabber 客戶端"
 
-#: ../src/gtkgui_helpers.py:796
+#: ../src/gtkgui_helpers.py:767
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "您想要使 Gajim 成為預設的 Jabber 客戶端嗎?"
 
-#: ../src/gtkgui_helpers.py:797
+#: ../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:864
+#: ../src/gtkgui_helpers.py:835
 msgid "Extension not supported"
 msgstr "不支援擴充"
 
-#: ../src/gtkgui_helpers.py:865
+#: ../src/gtkgui_helpers.py:836
 #, 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:901
+#: ../src/gtkgui_helpers.py:872
 msgid "Save Image as..."
 msgstr "圖片另存為…"
 
 #. we are banned
 #. group chat does not exist
-#: ../src/gui_interface.py:127 ../src/gui_interface.py:305
-#: ../src/gui_interface.py:314 ../src/gui_interface.py:319
-#: ../src/gui_interface.py:322 ../src/gui_interface.py:325
-#: ../src/gui_interface.py:330
+#: ../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
 msgid "Unable to join group chat"
 msgstr "無法加入聊天室"
 
-#: ../src/gui_interface.py:128
+#: ../src/gui_interface.py:127
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 "您在聊天室 %s 中希望使用的暱稱已經被使用或被其他人註冊了。\n"
-"在下面指定另一個暱稱: "
+"在下面指定另一個暱稱:"
 
-#: ../src/gui_interface.py:131
+#: ../src/gui_interface.py:130
 msgid "Always use this nickname when there is a conflict"
 msgstr "在發生衝突時總是使用這個暱稱"
 
-#: ../src/gui_interface.py:148
+#: ../src/gui_interface.py:147
 msgid "Do you accept this request?"
 msgstr "是否接受這個請求?"
 
-#: ../src/gui_interface.py:150
+#: ../src/gui_interface.py:149
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受這個對帳號 %s 的請求?"
 
-#: ../src/gui_interface.py:153
+#: ../src/gui_interface.py:152
 #, 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:199 ../src/notify.py:493
+#: ../src/gui_interface.py:195 ../src/notify.py:276
 msgid "Connection Failed"
 msgstr "連線失敗"
 
-#: ../src/gui_interface.py:294
+#: ../src/gui_interface.py:279
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "需要密碼才能加入聊天室 %s。請輸入一個密碼。"
 
-#: ../src/gui_interface.py:306
+#: ../src/gui_interface.py:291
 #, python-format
-msgid "Maximum number of users for %s has been reached"
-msgstr "%s 已經達到了最大的使用者數目"
+msgid "Maximum number of users for <b>%s</b> has been reached"
+msgstr "已經達到了 <b>%s</b> 的最大使用者數目"
 
-#: ../src/gui_interface.py:315
+#: ../src/gui_interface.py:300
 #, python-format
-msgid "You are banned from group chat %s."
-msgstr "您被聊天室 %s 封禁。"
+msgid "You are banned from group chat <b>%s</b>."
+msgstr "您被多人聊天 <b>%s</b> 封禁。"
 
-#: ../src/gui_interface.py:320
+#: ../src/gui_interface.py:306
 #, python-format
-msgid "Group chat %s does not exist."
-msgstr "聊天室 %s 不存在。"
+msgid "Group chat <b>%s</b> does not exist."
+msgstr "多人聊天 <b>%s</b> 不存在。"
 
-#: ../src/gui_interface.py:323
+#: ../src/gui_interface.py:309
 msgid "Group chat creation is restricted."
 msgstr "聊天室建立是受限的。"
 
-#: ../src/gui_interface.py:326
+#: ../src/gui_interface.py:312
 #, python-format
-msgid "Your registered nickname must be used in group chat %s."
-msgstr "您在聊天室 %s 中註冊的暱稱必須被使用。"
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
+msgstr "您已註冊的暱稱必須在多人聊天 <b>%s</b> 中使用。"
 
-#: ../src/gui_interface.py:331
+#: ../src/gui_interface.py:317
 #, python-format
 msgid "You are not in the members list in groupchat %s."
-msgstr "您不再聊天室 %s 的成員清單中。"
+msgstr "您不在聊天室 %s 的成員清單中。"
 
-#: ../src/gui_interface.py:465 ../src/gui_interface.py:469
+#: ../src/gui_interface.py:405 ../src/gui_interface.py:409
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "錯誤 %(code)s: %(msg)s"
 
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:480 ../src/gui_interface.py:495
-#, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "傳送 %(message)s 時出現錯誤( %(error)s )"
-
-#: ../src/gui_interface.py:519 ../src/notify.py:495
+#: ../src/gui_interface.py:461 ../src/notify.py:278
 msgid "Subscription request"
 msgstr "認證請求"
 
-#: ../src/gui_interface.py:544
+#: ../src/gui_interface.py:486
 msgid "Authorization accepted"
 msgstr "授權被接受"
 
-#: ../src/gui_interface.py:545
+#: ../src/gui_interface.py:487
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "聯絡人\"%s\"已授權您檢視他/她的狀態。"
 
-#: ../src/gui_interface.py:553
+#: ../src/gui_interface.py:495
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "聯絡人\"%s\"移除了對您的認證"
 
-#: ../src/gui_interface.py:554
+#: ../src/gui_interface.py:496
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8518,93 +8510,64 @@ msgstr ""
 "您將一直看到他/她處於離線狀態。\n"
 "要將他/她從您的聯絡人清單中移除嗎?"
 
-#: ../src/gui_interface.py:575 ../src/notify.py:497
+#: ../src/gui_interface.py:517 ../src/notify.py:280
 msgid "Unsubscribed"
 msgstr "已取消認證的"
 
-#: ../src/gui_interface.py:602
+#: ../src/gui_interface.py:528
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "無法與\"%s\"建立連線"
 
-#: ../src/gui_interface.py:796
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr "%(jid)s 將主題設定為 %(subject)s"
-
-#: ../src/gui_interface.py:863
-msgid "Room now shows unavailable member"
-msgstr "聊天室現在顯示了無法使用的成員"
-
-#: ../src/gui_interface.py:865
-msgid "room now does not show unavailable members"
-msgstr "聊天室現在不顯示無法使用的成員"
-
-#: ../src/gui_interface.py:867
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr "一個無關隱私的聊天室設定發生了變化"
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:871
-msgid "Room logging is now enabled"
-msgstr "聊天室訊息記錄已啟用"
-
-#: ../src/gui_interface.py:873
-msgid "Room logging is now disabled"
-msgstr "聊天室訊息記錄已停用"
-
-#: ../src/gui_interface.py:875
-msgid "Room is now non-anonymous"
-msgstr "聊天室現在是非匿名的"
-
-#: ../src/gui_interface.py:878
-msgid "Room is now semi-anonymous"
-msgstr "聊天室現在是半匿名的"
-
-#: ../src/gui_interface.py:881
-msgid "Room is now fully-anonymous"
-msgstr "聊天室現在是完全匿名的"
-
-#: ../src/gui_interface.py:922
+#: ../src/gui_interface.py:626
 msgid "You configured Gajim to use GPG agent, but there is no GPG agent running or it returned a wrong passphrase.\n"
 msgstr "您配置了 Gajim 使用 GPG agent，但並沒有正在執行的 GPG agent 或是它回傳了一個錯誤的密碼。\n"
 
-#: ../src/gui_interface.py:924 ../src/gui_interface.py:931
+#: ../src/gui_interface.py:628 ../src/gui_interface.py:636
 msgid "You are currently connected without your OpenPGP key."
 msgstr "您已經連線，但沒有使用您的 OpenPGP 密鑰。"
 
-#: ../src/gui_interface.py:926
+#: ../src/gui_interface.py:630
 msgid "Your passphrase is incorrect"
 msgstr "您的密碼不正確"
 
-#: ../src/gui_interface.py:930
+#: ../src/gui_interface.py:635
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenPGP 密碼不正確"
 
-#: ../src/gui_interface.py:956
+#: ../src/gui_interface.py:648
+msgid "Certificate Passphrase Required"
+msgstr "要求憑證密語"
+
+#: ../src/gui_interface.py:649
+#, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "輸入密語用於帳號憑證 %s"
+
+#: ../src/gui_interface.py:671
 msgid "GPG key not trusted"
 msgstr "GPG 密鑰不被信任"
 
-#: ../src/gui_interface.py:956
+#: ../src/gui_interface.py:671
 msgid "The GPG key used to encrypt this chat is not trusted. Do you really want to encrypt this message?"
 msgstr "用於加密這次對話的 GPG 密鑰未被信任。您確實想要加密這條訊息嗎?"
 
-#: ../src/gui_interface.py:968
-msgid "Gnome Keyring is installed but not                 correctly started (environment variable probably not                 correctly set)"
-msgstr "Gnome Keyring 雖然被安裝了但是沒有正確地啟動(環境變數可能沒有被正確地設定)"
+#: ../src/gui_interface.py:684
+msgid "Gnome Keyring is installed but not correctly started (environment variable probably not correctly set)"
+msgstr "Gnome Keyring 雖然已安裝但未正確啟動 (環境變數可能沒有正確設定)"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:791
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "%(gmail_mail_address)s 上的新郵件"
 
-#: ../src/gui_interface.py:1070
+#: ../src/gui_interface.py:793
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "您有 %d 條新郵件作業階段"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:806
 #, python-format
 msgid ""
 "\n\n"
@@ -8617,98 +8580,76 @@ msgstr ""
 "主題: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1152
+#: ../src/gui_interface.py:871
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想傳送給您一個檔案。"
 
-#: ../src/gui_interface.py:1189 ../src/roster_window.py:1877
+#: ../src/gui_interface.py:908 ../src/roster_window.py:1891
 msgid "Remote contact stopped transfer"
 msgstr "遠端聯絡人停止了傳輸"
 
-#: ../src/gui_interface.py:1192 ../src/roster_window.py:1879
+#: ../src/gui_interface.py:911 ../src/roster_window.py:1893
 msgid "Error opening file"
 msgstr "開啟檔案錯誤"
 
-#: ../src/gui_interface.py:1224
+#: ../src/gui_interface.py:943
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的從 %(name)s 收到檔案  %(filename)s。"
 
 #. ft stopped
-#: ../src/gui_interface.py:1228
+#: ../src/gui_interface.py:947
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "從 %(name)s 傳輸的檔案 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1241
+#: ../src/gui_interface.py:960
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的給 %(name)s 傳送了檔案 %(filename)s。"
 
 #. ft stopped
-#: ../src/gui_interface.py:1245
+#: ../src/gui_interface.py:964
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的檔案傳輸 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1363
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"無法解密來自 %s 的訊息\n"
-"它可能被篡改了。"
-
-#: ../src/gui_interface.py:1370
+#: ../src/gui_interface.py:1039
 msgid "Unable to decrypt message"
 msgstr "無法解密訊息"
 
-#: ../src/gui_interface.py:1442
+#: ../src/gui_interface.py:1051
 msgid "Username Conflict"
 msgstr "使用者名稱衝突"
 
-#: ../src/gui_interface.py:1443
+#: ../src/gui_interface.py:1052
 msgid "Please type a new username for your local account"
 msgstr "<b>請在您本地帳號填寫新的使用者名稱</b>"
 
-#: ../src/gui_interface.py:1456
-msgid "Ping?"
-msgstr "Ping?"
-
-#: ../src/gui_interface.py:1469
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr "Pong! (%s s.)"
-
-#: ../src/gui_interface.py:1480
-msgid "Error."
-msgstr "錯誤。"
-
-#: ../src/gui_interface.py:1493
+#: ../src/gui_interface.py:1067
 msgid "Resource Conflict"
 msgstr "資源衝突"
 
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1068
 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:1539
+#: ../src/gui_interface.py:1113
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要發起語音聊天。"
 
-#: ../src/gui_interface.py:1542
+#: ../src/gui_interface.py:1116
 msgid "Voice Chat Request"
 msgstr "語音聊天請求"
 
-#: ../src/gui_interface.py:1647
+#: ../src/gui_interface.py:1203
 msgid "Error verifying SSL certificate"
 msgstr "驗證 SSL 證書發生錯誤"
 
-#: ../src/gui_interface.py:1648
+#: ../src/gui_interface.py:1204
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %(error)s\n"
@@ -8718,15 +8659,15 @@ msgstr ""
 "%(error)s\n"
 "您仍然想要連線這個伺服器嗎?"
 
-#: ../src/gui_interface.py:1656
+#: ../src/gui_interface.py:1213
 msgid "Ignore this error for this certificate."
 msgstr "忽略這個證書的這個錯誤。"
 
-#: ../src/gui_interface.py:1676
+#: ../src/gui_interface.py:1238
 msgid "SSL certificate error"
 msgstr "SSL證書錯誤"
 
-#: ../src/gui_interface.py:1677
+#: ../src/gui_interface.py:1239
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your connection is being hacked.\n"
@@ -8739,75 +8680,76 @@ msgstr ""
 "新指紋: %(new)s\n\n"
 "您仍想連線並更新證書的指紋資訊嗎?"
 
-#: ../src/gui_interface.py:1707 ../src/gui_interface.py:1744
-#: ../src/gui_interface.py:1780
+#: ../src/gui_interface.py:1275 ../src/gui_interface.py:1317
+#: ../src/gui_interface.py:1359
 msgid "Insecure connection"
 msgstr "不安全的連線"
 
-#: ../src/gui_interface.py:1708
-msgid "You are about to connect to the server with an insecure connection. This means all your conversations will be exchanged unencrypted. Are you sure you want to do that?"
-msgstr "您將透過一個不安全的連線連線伺服器。這意味著您的所有對話都會不經加密地被交換。您確定要這樣做嗎?"
+#: ../src/gui_interface.py:1276
+#, 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:1711 ../src/gui_interface.py:1748
-#: ../src/gui_interface.py:1783
+#: ../src/gui_interface.py:1281 ../src/gui_interface.py:1321
+#: ../src/gui_interface.py:1362
 msgid "Yes, I really want to connect insecurely"
 msgstr "是的，我確實想要不安全地連線"
 
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1318
 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?"
 msgstr "您將透過不安全的連線傳送密碼。您應該安裝 PyOpenSSL 以阻止這樣的事情。您確定要這樣做嗎?"
 
-#: ../src/gui_interface.py:1781
+#: ../src/gui_interface.py:1360
 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:2354 ../src/gui_interface.py:2377
+#: ../src/gui_interface.py:1869 ../src/gui_interface.py:1892
 msgid "Emoticons disabled"
 msgstr "表情圖示被停用"
 
-#: ../src/gui_interface.py:2355
+#: ../src/gui_interface.py:1870
 msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
 msgstr "您配置的表情圖示主題找不到，所以表情圖示被停用。"
 
-#: ../src/gui_interface.py:2378
+#: ../src/gui_interface.py:1893
 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 for more details."
 msgstr "您配置的表情圖示主題無法載入。您可能需要升級 emoticons.py 檔案的格式。請參考 http://trac.gajim.org/wiki/Emoticons"
 
-#: ../src/gui_interface.py:2409 ../src/roster_window.py:3643
+#: ../src/gui_interface.py:1937 ../src/roster_window.py:3784
 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:2803
+#: ../src/gui_interface.py:2324
 msgid "Could not save your settings and preferences"
 msgstr "無法儲存您的設定。"
 
-#: ../src/gui_interface.py:3348
+#: ../src/gui_interface.py:2871
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/gui_interface.py:3349
+#: ../src/gui_interface.py:2872
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "輸入 GPG 密鑰 %(keyid)s (帳號 %(account)s) 的密碼。"
 
-#: ../src/gui_interface.py:3363
+#: ../src/gui_interface.py:2886
 msgid "GPG key expired"
 msgstr "GPG 密鑰過期"
 
-#: ../src/gui_interface.py:3364
+#: ../src/gui_interface.py:2887
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "您的 GPG 密鑰已過期，您將在沒有 OpenPGP 情況下連線到 %s。"
 
 #. ask again
-#: ../src/gui_interface.py:3373
+#: ../src/gui_interface.py:2896
 msgid "Wrong Passphrase"
 msgstr "錯誤欄位"
 
-#: ../src/gui_interface.py:3374
+#: ../src/gui_interface.py:2897
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "請重新輸入您的 GPG 欄位或點\"取消\""
 
@@ -8815,46 +8757,46 @@ msgstr "請重新輸入您的 GPG 欄位或點\"取消\""
 msgid "_New Group Chat"
 msgstr "新聊天室(_N)"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:419
 msgid "I would like to add you to my roster"
 msgstr "我希望將您加入到我的聯絡人清單"
 
-#: ../src/history_manager.py:114
+#: ../src/history_manager.py:116
 msgid "Cannot find history logs database"
 msgstr "無法找到命令歷程記錄資料庫"
 
 #. holds jid
-#: ../src/history_manager.py:154
+#: ../src/history_manager.py:156
 msgid "Contacts"
 msgstr "聯絡人"
 
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_manager.py:169 ../src/history_manager.py:213
 #: ../src/history_window.py:98
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:176 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "暱稱"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_manager.py:185 ../src/history_manager.py:220
 #: ../src/history_window.py:106
 msgid "Message"
 msgstr "訊息"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:193 ../src/history_manager.py:226
 msgid "Subject"
 msgstr "主題"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:252
 msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
 msgstr "您確定要清除資料庫?(強烈建議 GAJIM 執行時不要進行此作業)"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:254
 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 click NO.\n\n"
 "In case you click YES, please wait..."
@@ -8862,25 +8804,37 @@ msgstr ""
 "一般已佔用的資料庫空間不會被釋放，以便於恢復作業。如果您的確需要壓縮資料庫的體積，點擊 \"是\"，否則點擊\"否\"。\n\n"
 "如果您點擊\"是\"，請等待…"
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:259
+msgid "Database Cleanup"
+msgstr "資料庫清理"
+
+#: ../src/history_manager.py:477
 msgid "Exporting History Logs..."
 msgstr "輸出命令歷程記錄…"
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:554
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 時說:  %(message)s\n"
 
-#: ../src/history_manager.py:572
-msgid "Do you really want to delete logs of the selected contact?"
-msgid_plural "Do you really want to delete logs of the selected contacts?"
-msgstr[0] "您確定要刪除所選取聯絡人的命令歷程記錄?"
+#: ../src/history_manager.py:592
+#, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "您真的要刪除 %(jid)s 的記錄檔嗎？"
 
-#: ../src/history_manager.py:576 ../src/history_manager.py:611
+#: ../src/history_manager.py:596
+msgid "Do you really want to delete logs of the selected contacts?"
+msgstr "您真的要刪除已選聯絡人的記錄檔嗎？"
+
+#: ../src/history_manager.py:598 ../src/history_manager.py:637
 msgid "This is an irreversible operation."
 msgstr "該作業是不可撤消的。"
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:600 ../src/history_manager.py:639
+msgid "Deletion Confirmation"
+msgstr "刪除確認"
+
+#: ../src/history_manager.py:634
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您確定要刪除所選取的訊息?"
@@ -8918,14 +8872,18 @@ msgstr "現在狀態: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "現在狀態:  %(status)s "
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
+#: ../src/htmltextview.py:523 ../src/htmltextview.py:533
 msgid "Timeout loading image"
 msgstr "讀取檔案逾時"
 
-#: ../src/htmltextview.py:535
+#: ../src/htmltextview.py:543
 msgid "Image is too big"
 msgstr "圖片太大"
 
+#: ../src/htmltextview.py:576
+msgid "Loading"
+msgstr "載入"
+
 #: ../src/message_window.py:222
 msgid "You are going to close several tabs"
 msgstr "您將要關閉多個標籤"
@@ -8934,19 +8892,19 @@ msgstr "您將要關閉多個標籤"
 msgid "Do you really want to close them all?"
 msgstr "您確定要關閉所有這些嗎"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:497
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:499
 msgid "Group Chats"
 msgstr "多人聊天"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:501
 msgid "Private Chats"
 msgstr "私人聊天"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:507
 msgid "Messages"
 msgstr "訊息"
 
@@ -8958,286 +8916,287 @@ msgstr "- 訊息將會被記錄"
 msgid "- messages will not be logged"
 msgstr "- 訊息將不會被記錄"
 
-#: ../src/notify.py:232
-#, python-format
-msgid "%(nick)s Changed Status"
-msgstr "%(nick)s 變更了狀態"
+#: ../src/notify.py:319
+msgid "Ignore"
+msgstr "忽略"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s 上線了"
+#: ../src/plugins/gui.py:67
+msgid "Plugin"
+msgstr "外掛程式"
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s 離開了"
+#: ../src/plugins/gui.py:160
+msgid "Plugin failed"
+msgstr "外掛程式失敗"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr " %(nickname)s 發來的新訊息"
+#: ../src/plugins/gui.py:204
+msgid "Unable to properly remove the plugin"
+msgstr "無法適當地移除外掛程式"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "來自聊天室 %s 的私人訊息"
+#. members not safe
+#: ../src/plugins/gui.py:212 ../src/plugins/pluginmanager.py:495
+#: ../src/plugins/pluginmanager.py:503
+msgid "Archive is malformed"
+msgstr "存檔異常"
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s:  %(message)s"
+#: ../src/plugins/gui.py:235 ../src/plugins/gui.py:243
+#: ../src/plugins/pluginmanager.py:511
+msgid "Plugin already exists"
+msgstr "外掛程式已經存在"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "來自 %(nickname)s 的訊息"
+#: ../src/plugins/gui.py:235
+msgid "Overwrite?"
+msgstr "覆寫？"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "來自 %(nickname)s 的新訊息"
+#: ../src/plugins/gui.py:264
+msgid "Configuration"
+msgstr "組態"
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "忽略"
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:481 ../src/plugins/pluginmanager.py:487
+msgid "Archive corrupted"
+msgstr "存檔已損壞"
+
+#: ../src/plugins/pluginmanager.py:483
+msgid "Archive empty"
+msgstr "存檔為空"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:60
 msgid "Retrieving profile..."
 msgstr "正在獲取側寫…"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3012
+#: ../src/profile_window.py:125 ../src/roster_window.py:3137
 msgid "File is empty"
 msgstr "檔案為空"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3015
+#: ../src/profile_window.py:128 ../src/roster_window.py:3140
 msgid "File does not exist"
 msgstr "檔案不存在"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:128 ../src/profile_window.py:144
-#: ../src/roster_window.py:3017 ../src/roster_window.py:3028
+#: ../src/profile_window.py:142 ../src/profile_window.py:158
+#: ../src/roster_window.py:3142 ../src/roster_window.py:3153
 msgid "Could not load image"
 msgstr "無法讀取圖片"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:229
 msgid "Wrong date format"
 msgstr "錯誤的資料格式"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:230
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "日期的格式必須是 YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:284
 msgid "Information received"
 msgstr "資訊已收到"
 
-#: ../src/profile_window.py:341
+#: ../src/profile_window.py:362
 msgid "Without a connection you can not publish your contact information."
 msgstr "沒有連線的情況下您無法發布您的聯絡人資訊。"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:375
 msgid "Sending profile..."
 msgstr "傳送側寫…"
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:394
 msgid "Information NOT published"
 msgstr "資訊沒有發布"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:401
 msgid "vCard publication failed"
 msgstr "vCard 發布失敗"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:402
 msgid "There was an error while publishing your personal information, try again later."
 msgstr "發布您的個人資訊時發生錯誤，請稍後重試。"
 
-#: ../src/roster_window.py:262 ../src/roster_window.py:1028
+#: ../src/roster_window.py:240 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "已合併的帳號"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:1956
 msgid "Authorization has been sent"
 msgstr "授權傳送成功"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:1957
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "現在\"%s\"將知道您的狀態。"
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:1980
 msgid "Subscription request has been sent"
 msgstr "認證請求已發出"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:1981
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果\"%s\"接受此請求，您將知道他/她的狀態。"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:1995
 msgid "Authorization has been removed"
 msgstr "授權被移除"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:1996
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 將一直看到您的狀態為離線。"
 
-#: ../src/roster_window.py:2009
+#: ../src/roster_window.py:2023
 msgid "GPG is not usable"
 msgstr "GPG 無法使用"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2024
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "您將在無 OpenPGP 情況下連線到 %s。"
 
-#: ../src/roster_window.py:2222 ../src/roster_window.py:3573
+#: ../src/roster_window.py:2231 ../src/roster_window.py:3714
 msgid "You are participating in one or more group chats"
 msgstr "您正在參與一個或多個多人聊天"
 
-#: ../src/roster_window.py:2223 ../src/roster_window.py:3574
+#: ../src/roster_window.py:2232 ../src/roster_window.py:3715
 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:2249
+#: ../src/roster_window.py:2258
 msgid "desync'ed"
 msgstr "未同步"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2324
 msgid "Really quit Gajim?"
 msgstr "真得要離開 Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2325
 msgid "Are you sure you want to quit Gajim?"
 msgstr "您確定您要離開 Gajim 嗎?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2326
 msgid "Always close Gajim"
 msgstr "總是關閉 Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2410
 msgid "You have running file transfers"
 msgstr "您有傳送中的檔案"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2411
 msgid "If you quit now, the file(s) being transferred will be stopped. Do you still want to quit?"
 msgstr "如果現在離開，傳送中的檔案會停止傳輸。您仍然要離開嗎?"
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2730
+#: ../src/roster_window.py:2442 ../src/roster_window.py:2856
 msgid "You have unread messages"
 msgstr "您有未讀訊息"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2443
 msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
 msgstr ""
 "除非您啟用了命令歷程記錄而且向您傳送訊息的聯絡人在您的聯絡人清單中，您才能\n"
 "在以後讀到這些訊息。"
 
-#: ../src/roster_window.py:2731
+#: ../src/roster_window.py:2857
 msgid "You must read them before removing this transport."
 msgstr "在移除代理之前您必須檢視它們。"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2860
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理\"%s\"將被移除"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2861
 msgid "You will no longer be able to send and receive messages from contacts using this transport."
 msgstr "您將無法再和使用這個代理的聯絡人收發訊息。"
 
-#: ../src/roster_window.py:2738
+#: ../src/roster_window.py:2864
 msgid "Transports will be removed"
 msgstr "代理將被移除"
 
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2869
 #, 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:2811
+#: ../src/roster_window.py:2937
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "您將要阻斷一個聯絡人。您確定要繼續嗎?"
 
-#: ../src/roster_window.py:2813
+#: ../src/roster_window.py:2939
 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:2904
+#: ../src/roster_window.py:3029
 msgid "Rename Contact"
 msgstr "重新命名聯絡人"
 
-#: ../src/roster_window.py:2905
+#: ../src/roster_window.py:3030
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "為聯絡人 %s 輸入新的暱稱"
 
-#: ../src/roster_window.py:2912
+#: ../src/roster_window.py:3037
 msgid "Rename Group"
 msgstr "重新命名群組"
 
-#: ../src/roster_window.py:2913
+#: ../src/roster_window.py:3038
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "為群組 %s 輸入新的名稱"
 
-#: ../src/roster_window.py:2958
+#: ../src/roster_window.py:3083
 msgid "Remove Group"
 msgstr "移除群組"
 
-#: ../src/roster_window.py:2959
+#: ../src/roster_window.py:3084
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想從聯絡人清單中刪除組 %s ?"
 
-#: ../src/roster_window.py:2960
+#: ../src/roster_window.py:3085
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同時從聯絡人清單移除這個群組的所有聯絡人"
 
-#: ../src/roster_window.py:2999
+#: ../src/roster_window.py:3124
 msgid "Assign OpenPGP Key"
 msgstr "指定 OpenPGP 密鑰"
 
-#: ../src/roster_window.py:3000
+#: ../src/roster_window.py:3125
 msgid "Select a key to apply to the contact"
 msgstr "選擇一個對應於該聯絡人的密鑰。"
 
-#: ../src/roster_window.py:3383
+#: ../src/roster_window.py:3524
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "聯絡人\"%s\"將從您的聯絡人清單中被移除"
 
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3526
 #, 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:3390
+#: ../src/roster_window.py:3531
 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:3396
+#: ../src/roster_window.py:3537
 msgid "Do you want to continue?"
 msgstr "您要繼續嗎?"
 
-#: ../src/roster_window.py:3400
+#: ../src/roster_window.py:3541
 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:3403
+#: ../src/roster_window.py:3544
 msgid "I want this contact to know my status after removal"
 msgstr "我想讓此聯絡人在被移除之後仍然知道我的狀態"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3407
+#: ../src/roster_window.py:3548
 msgid "Contacts will be removed from your roster"
 msgstr "聯絡人將從您的聯絡人清單中被移除"
 
-#: ../src/roster_window.py:3412
+#: ../src/roster_window.py:3553
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9246,191 +9205,196 @@ msgstr ""
 "移除這些聯絡人: %s 的同時\n"
 "將移除認證導致他們將一直看到您為離線。"
 
-#: ../src/roster_window.py:3470
+#: ../src/roster_window.py:3611
 msgid "You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "您將傳送一個自訂的狀態。您確定要繼續嗎?"
 
-#: ../src/roster_window.py:3472
+#: ../src/roster_window.py:3613
 #, python-format
 msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he or she will see your global status."
 msgstr ""
 "這個聯絡人會暫時看到您的狀態為 %(status)s，直到您下次變更您的狀態。之後\n"
 "他/她會看到您的全域狀態。"
 
-#: ../src/roster_window.py:3491
+#: ../src/roster_window.py:3632
 msgid "No account available"
 msgstr "沒有有效帳號"
 
-#: ../src/roster_window.py:3492
+#: ../src/roster_window.py:3633
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必須在與他人聊天前新增帳號。"
 
-#: ../src/roster_window.py:4106
+#: ../src/roster_window.py:4286
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的伺服器不支援儲存元聯絡人資訊"
 
-#: ../src/roster_window.py:4108
+#: ../src/roster_window.py:4288
 msgid "Your server does not support storing metacontacts information. So those information will not be saved on next reconnection."
 msgstr "您的伺服器不支援儲存元聯絡人資訊。所以這些資訊在下次重新連線時不會被儲存。"
 
-#: ../src/roster_window.py:4200
+#: ../src/roster_window.py:4380
 msgid "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在建立一個元聯絡人。確定繼續?"
 
-#: ../src/roster_window.py:4202
+#: ../src/roster_window.py:4382
 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 accounts."
 msgstr ""
 "元聯絡人是將幾個聯絡人組合起來顯示在同一列。一般在某個人有幾個 Jabber\n"
 "帳號或代理帳號時用到。"
 
-#: ../src/roster_window.py:4317
+#: ../src/roster_window.py:4503
 msgid "Invalid file URI:"
-msgstr "無效的檔案位址: "
+msgstr "無效的檔案位址:"
 
-#: ../src/roster_window.py:4329
+#: ../src/roster_window.py:4515
 #, 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 嗎: "
+msgstr[0] "您想要將檔案傳送給 %s 嗎:"
 
-#: ../src/roster_window.py:4444
+#: ../src/roster_window.py:4650
 #, python-format
 msgid "Send %s to %s"
 msgstr "傳送 %s 給 %s"
 
-#: ../src/roster_window.py:4450
+#: ../src/roster_window.py:4661
+#, python-format
+msgid "Make %s first contact"
+msgstr "將 %s 設為第一聯絡人"
+
+#: ../src/roster_window.py:4664
 #, python-format
 msgid "Make %s and %s metacontacts"
-msgstr "由 %s 與 %s 建立元聯絡人"
+msgstr "將 %s 與 %s 設為中繼聯絡人"
 
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4889 ../src/roster_window.py:4943
-#: ../src/roster_window.py:4952 ../src/statusicon.py:263
-#: ../src/statusicon.py:310 ../src/statusicon.py:316
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "使用帳號 %s"
 
 #. add
-#: ../src/roster_window.py:4959
+#: ../src/roster_window.py:5174
 #, python-format
 msgid "to %s account"
 msgstr "至帳號 %s"
 
 #. disco
-#: ../src/roster_window.py:4964
+#: ../src/roster_window.py:5179
 #, python-format
 msgid "using %s account"
 msgstr "使用 %s 帳號"
 
-#: ../src/roster_window.py:5003 ../src/statusicon.py:326
+#: ../src/roster_window.py:5218 ../src/statusicon.py:327
 msgid "_Manage Bookmarks..."
 msgstr "管理書籤(_M)…"
 
 #. profile, avatar
-#: ../src/roster_window.py:5023
+#: ../src/roster_window.py:5238
 #, python-format
 msgid "of account %s"
 msgstr "帳號 %s 的"
 
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5279
 #, python-format
 msgid "for account %s"
 msgstr "帳號 %s"
 
-#: ../src/roster_window.py:5124 ../src/roster_window.py:5229
+#: ../src/roster_window.py:5339 ../src/roster_window.py:5447
 msgid "_Change Status Message"
 msgstr "變更狀態訊息(_C)"
 
-#: ../src/roster_window.py:5157
+#: ../src/roster_window.py:5372
 msgid "Publish Tune"
 msgstr "發布音樂"
 
-#: ../src/roster_window.py:5159
+#: ../src/roster_window.py:5374
 msgid "Publish Location"
 msgstr "發布位置資訊"
 
-#: ../src/roster_window.py:5162
+#: ../src/roster_window.py:5377
 msgid "Configure Services..."
 msgstr "配置服務…"
 
-#: ../src/roster_window.py:5307
+#: ../src/roster_window.py:5525
 msgid "_Maximize All"
 msgstr "放到最大全部(_M)"
 
-#: ../src/roster_window.py:5317 ../src/roster_window.py:5491
+#: ../src/roster_window.py:5535 ../src/roster_window.py:5708
 msgid "Send Group M_essage"
 msgstr "傳送群組訊息(_E)"
 
-#: ../src/roster_window.py:5325
+#: ../src/roster_window.py:5543
 msgid "To all users"
 msgstr "向所有的使用者"
 
-#: ../src/roster_window.py:5329
+#: ../src/roster_window.py:5547
 msgid "To all online users"
 msgstr "向所有線上使用者"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5511
+#: ../src/roster_window.py:5728
 msgid "_Manage Contacts"
 msgstr "管理聯絡人(_M)"
 
 #. Edit Groups
-#: ../src/roster_window.py:5520
+#: ../src/roster_window.py:5737
 msgid "Edit _Groups"
 msgstr "編輯群組(_G)"
 
 #. Send single message
-#: ../src/roster_window.py:5575
+#: ../src/roster_window.py:5792
 msgid "Send Single Message"
 msgstr "傳送單條訊息(_S)"
 
 #. Execute Command
-#: ../src/roster_window.py:5622
+#: ../src/roster_window.py:5839
 msgid "Execute Command..."
 msgstr "執行命令…"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5632
+#: ../src/roster_window.py:5849
 msgid "_Manage Transport"
 msgstr "管理代理(_M)"
 
 #. Modify Transport
-#: ../src/roster_window.py:5641
+#: ../src/roster_window.py:5858
 msgid "_Modify Transport"
 msgstr "修改代理(_M)"
 
 #. Rename
-#: ../src/roster_window.py:5651
+#: ../src/roster_window.py:5868
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
-#: ../src/roster_window.py:5711
+#: ../src/roster_window.py:5928
 msgid "_Maximize"
 msgstr "放到最大(_M)"
 
-#: ../src/roster_window.py:5720
+#: ../src/roster_window.py:5937
 msgid "_Reconnect"
 msgstr "重新連線(_R)"
 
-#: ../src/roster_window.py:5727
+#: ../src/roster_window.py:5944
 msgid "_Disconnect"
 msgstr "中斷連線(_D)"
 
 #. History manager
-#: ../src/roster_window.py:5816
+#: ../src/roster_window.py:6033
 msgid "History Manager"
 msgstr "命令歷程記錄管理器"
 
-#: ../src/roster_window.py:5827
+#: ../src/roster_window.py:6044
 msgid "_Join New Group Chat"
 msgstr "加入新的聊天室(_J)"
 
-#: ../src/roster_window.py:6055
+#: ../src/roster_window.py:6263
 msgid "Change Status Message..."
 msgstr "變更狀態訊息…"
 
@@ -9447,20 +9411,15 @@ msgstr "在收到的資料表中有錯誤"
 msgid "No result"
 msgstr "無結果"
 
-#: ../src/session.py:136
+#: ../src/session.py:95
 msgid "Disk WriteError"
 msgstr "磁碟寫入錯誤"
 
-#: ../src/session.py:258
-#, python-format
-msgid "Subject: %s"
-msgstr "主題: %s"
-
-#: ../src/session.py:447 ../src/session.py:491
+#: ../src/session.py:408 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "確定這些作業階段屬性"
 
-#: ../src/session.py:448
+#: ../src/session.py:409
 #, python-format
 msgid ""
 "The remote client wants '\n"
@@ -9473,7 +9432,7 @@ msgstr ""
 "%s\n\n"
 "是否接受?"
 
-#: ../src/session.py:492
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n\n"
@@ -9484,15 +9443,15 @@ msgstr ""
 "%s\n\n"
 "繼續進行作業階段?"
 
-#: ../src/statusicon.py:227
+#: ../src/statusicon.py:228
 msgid "_Change Status Message..."
 msgstr "變更狀態訊息_(C)…"
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:342
 msgid "Hide _Roster"
 msgstr "隱藏聯絡人清單(_R)"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:353
 msgid "Hide this menu"
 msgstr "隱藏本選單"
 
@@ -9631,56 +9590,57 @@ msgstr ""
 "這個服務無法應答詳細的資訊。\n"
 "這很可能是伺服器的遺留問題，或是伺服器被損壞了"
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:285
 msgid "?Client:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:287
 msgid "?OS:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:310
 msgid "?Time:Unknown"
 msgstr "不明"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:334 ../src/vcard.py:344 ../src/vcard.py:552
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:367
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>角色</b>"
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:371
 msgid "<b>Affiliation:</b>"
-msgstr "<b>歸屬: </b>"
+msgstr "<b>歸屬:</b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:379
 msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
 msgstr "此聯絡人對您的狀態資訊感興趣，但您不關心他/她的狀態"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:381
 msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
 msgstr "您對此聯絡人的狀態資訊感興趣，但他/她不關心您的狀態"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:383
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您與此聯絡人同時對對方的狀態資訊感興趣"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:385
 msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
 msgstr "您與他/她互不關心對方的狀態資訊"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:392
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待聯絡人回應您的認證請求"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:394
 msgid "There is no pending subscription request."
 msgstr "沒有未處理的認證請求"
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:399 ../src/vcard.py:453 ../src/vcard.py:575
 msgid " resource with priority "
 msgstr "帶有優先等級的資源"
+