update po files

author: Yann Leboulanger <asterix@lagaule.org> 2017-01-14 17:02:54 +0300
committer: Yann Leboulanger <asterix@lagaule.org> 2017-01-14 17:02:54 +0300
commit: b4678cec5bc7245543867ffd6a0668e777490ebb (patch)
tree: f2a090d61c9dba0bf8a4d5c596c0e7da5cf5dd61 /po/zh_CN.po
parent: bfd9c5a96bc431dff23d9ae76cc508eda39ee3ba (diff)
1 files changed, 5291 insertions, 4015 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e7ead4e4f..a6e1454a6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,15 +6,11 @@
 # kangkang <kanger@gamil.com>, 2005.
 # Guanhao Yin <yinguanhao@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
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-10-30 23:53+0800\n"
+"POT-Creation-Date: 2017-01-10 03:06+0000\n"
 "PO-Revision-Date: 2010-10-31 17:37+0800\n"
 "Last-Translator: Guanhao Yin <yinguanhao@gmail.com>\n"
 "Language-Team: \n"
@@ -24,298 +20,294 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/gui/account_context_menu.ui.h:1 ../data/gui/roster_window.ui.h:7
-msgid "Join _Group Chat..."
-msgstr "加入聊天室(_G)"
+#: ../data/gui/account_context_menu.ui.h:1
+#: ../data/gui/zeroconf_context_menu.ui.h:1
+msgid "_Status"
+msgstr "状态(_S)"
 
 #: ../data/gui/account_context_menu.ui.h:2
+msgid "_Personal Events"
+msgstr "个人事件"
+
+#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
+msgid "_Start Chat..."
+msgstr "开始聊天(_S)"
+
+#: ../data/gui/account_context_menu.ui.h:4 ../data/gui/chat_context_menu.ui.h:6
+#: ../data/gui/roster_window.ui.h:5 ../data/gui/systray_context_menu.ui.h:3
+msgid "Join _Group Chat"
+msgstr "加入聊天室(_G)"
+
+#: ../data/gui/account_context_menu.ui.h:5
 msgid "_Add Contact..."
 msgstr "添加联系人(_A)..."
 
-#: ../data/gui/account_context_menu.ui.h:3 ../data/gui/roster_window.ui.h:18
+#: ../data/gui/account_context_menu.ui.h:6 ../data/gui/roster_window.ui.h:7
 msgid "_Discover Services"
 msgstr "发现服务(_D)"
 
-#: ../data/gui/account_context_menu.ui.h:4
+#: ../data/gui/account_context_menu.ui.h:7
 msgid "_Execute Command..."
 msgstr "执行命令(_E)..."
 
-#: ../data/gui/account_context_menu.ui.h:5
-msgid "_Modify Account"
-msgstr "修改账户信息(_M)"
-
-#: ../data/gui/account_context_menu.ui.h:6
+#: ../data/gui/account_context_menu.ui.h:8
 msgid "_Open Gmail Inbox"
 msgstr "打开 Gmail 收件箱(_O)"
 
-#: ../data/gui/account_context_menu.ui.h:7
-msgid "_Personal Events"
-msgstr "个人事件"
-
-#: ../data/gui/account_context_menu.ui.h:8 ../data/gui/roster_window.ui.h:24
-msgid "_Start Chat..."
-msgstr "开始聊天(_S)"
-
 #: ../data/gui/account_context_menu.ui.h:9
 #: ../data/gui/zeroconf_context_menu.ui.h:2
-msgid "_Status"
-msgstr "状态(_S)"
+msgid "_Modify Account..."
+msgstr "修改帐户(_M)..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:1
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/change_mood_dialog.ui.h:3
+#: ../src/config.py:1247 ../src/config.py:1262 ../src/config.py:1267
+#: ../src/config.py:1315 ../src/config.py:1425 ../src/config.py:1755
+#: ../src/config.py:1760 ../src/config.py:2369 ../src/config.py:2451
+#: ../src/config.py:2466 ../src/config.py:3758 ../src/config.py:3835
+#: ../src/dialogs.py:327 ../src/dialogs.py:329 ../src/dialogs.py:537
+#: ../src/dialogs.py:550 ../src/roster_window.py:3086
+#: ../src/roster_window.py:3092 ../src/roster_window.py:3097
+msgid "None"
+msgstr "无"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:2
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: 账户创建向导"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:3
 msgid ""
-"<b>Connecting to server</b>\n"
-"\n"
-"Please wait..."
+"You need to have an account in order to connect\n"
+"to the Jabber network."
 msgstr ""
-"<b>正在连接服务器</b>\n"
-"\n"
-"请等待..."
+"您必须拥有一个账户以连接\n"
+"Jabber 网络"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+msgid "I already have an account I want to _use"
+msgstr "我已经有想要使用的账户了(_U)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:6
+msgid "I want to _register for a new account"
+msgstr "我想注册一个新账户(_R)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>请选择一个选项</b>: "
 
-#: ../data/gui/account_creation_wizard_window.ui.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>请填写您现有账号的信息</b>"
 
-#: ../data/gui/account_creation_wizard_window.ui.h:6
-msgid "<b>Please select a server</b>"
-msgstr "<b>请选择一个服务器</b>"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:7
-msgid ""
-"Add this certificate to the list of trusted certificates.\n"
-"SHA1 fingerprint of the certificate:\n"
-msgstr ""
-"将这个证书添加到可信任证书列表。\n"
-"这个证书的 SHA1 指纹信息: \n"
+#: ../data/gui/account_creation_wizard_window.ui.h:9
+#: ../data/gui/accounts_window.ui.h:7
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:10
 msgid "Anon_ymous authentication"
 msgstr "匿名认证(_Y)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:11
-msgid "Connect when I press Finish"
-msgstr "当我点击\"结束\"时连接"
+#: ../data/gui/accounts_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "_Password:"
+msgstr "密码(_P): "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:12
-msgid "Gajim: Account Creation Wizard"
-msgstr "Gajim: 账户创建向导"
+#: ../data/gui/accounts_window.ui.h:16
+msgid "Save pass_word"
+msgstr "保存密码(_W)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:13
-msgid "I already have an account I want to _use"
-msgstr "我已经有想要使用的账户了(_U)"
+#: ../data/gui/accounts_window.ui.h:17
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "如果选定, Gajim 会记录本账户的密码"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:14
-msgid "I want to _register for a new account"
-msgstr "我想注册一个新账户(_R)"
+msgid "<b>Please select a server</b>"
+msgstr "<b>请选择一个服务器</b>"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:15
-#: ../data/gui/accounts_window.ui.h:28
-msgid "If checked, Gajim will remember the password for this account"
-msgstr "如果选定, Gajim 会记录本账户的密码"
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "_Server:"
+msgstr "服务器(_S): "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:16
-msgid "Manage..."
-msgstr "管理..."
+msgid "Prox_y:"
+msgstr "代理服务器(_Y): "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:17
-#: ../data/gui/accounts_window.ui.h:39 ../data/gui/change_mood_dialog.ui.h:3
-#: ../src/config.py: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
-msgid "None"
-msgstr "无"
+msgid "Manage..."
+msgstr "管理..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:18
-msgid "Prox_y:"
-msgstr "代理服务器(_Y): "
+msgid "Use custom hostname/port"
+msgstr "使用自定义的主机名/端口"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:19
-#: ../data/gui/accounts_window.ui.h:48
-msgid "Save pass_word"
-msgstr "保存密码(_W)"
+msgid "_Hostname:"
+msgstr "主机名(_H): "
 
 #: ../data/gui/account_creation_wizard_window.ui.h:20
-msgid "Set my profile when I connect"
-msgstr "连接后设置我的名片"
+msgid "_Port:"
+msgstr "端口(_P)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:21
-msgid "Use custom hostname/port"
-msgstr "使用自定义的主机名/端口"
+#: ../data/gui/roster_window.ui.h:8
+msgid "_Advanced"
+msgstr "高级(_A)"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid ""
-"You need to have an account in order to connect\n"
-"to the Jabber network."
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
 msgstr ""
-"您必须拥有一个账户以连接\n"
-"Jabber 网络"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:24
-#: ../data/gui/roster_window.ui.h:16
-msgid "_Advanced"
-msgstr "高级(_A)"
+"将这个证书添加到可信任证书列表。\n"
+"这个证书的 SHA1 指纹信息: \n"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:25
-msgid "_Finish"
-msgstr "完成(_F)"
-
-#: ../data/gui/account_creation_wizard_window.ui.h:26
-msgid "_Hostname:"
-msgstr "主机名(_H): "
-
-#: ../data/gui/account_creation_wizard_window.ui.h:27
-#: ../data/gui/accounts_window.ui.h:62
-msgid "_Jabber ID:"
-msgstr "_Jabber ID:"
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>正在连接服务器</b>\n"
+"\n"
+"请等待..."
 
 #: ../data/gui/account_creation_wizard_window.ui.h:28
-#: ../data/gui/accounts_window.ui.h:64
-msgid "_Password:"
-msgstr "密码(_P): "
+msgid "Connect when I press Finish"
+msgstr "当我点击\"结束\"时连接"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:29
-msgid "_Port:"
-msgstr "端口(_P)"
+msgid "Set my profile when I connect"
+msgstr "连接后设置我的名片"
 
 #: ../data/gui/account_creation_wizard_window.ui.h:30
-msgid "_Server:"
-msgstr "服务器(_S): "
-
-#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
-msgid "<b>Miscellaneous</b>"
-msgstr "<b>杂项</b>"
+msgid "_Finish"
+msgstr "完成(_F)"
 
 #: ../data/gui/accounts_window.ui.h:2
-msgid "<b>OpenPGP</b>"
-msgstr "<b>OpenPGP</b>"
+msgid "Accounts"
+msgstr "账户"
 
-#: ../data/gui/accounts_window.ui.h:3
-msgid "<b>Personal Information</b>"
-msgstr "<b>个人信息</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:3 ../src/dialogs.py:3568
+#: ../src/dialogs.py:3614
+msgid "Add"
+msgstr "添加"
 
-#: ../data/gui/accounts_window.ui.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>代理服务器</b>"
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/gui/accounts_window.ui.h:4 ../src/dialogs.py:3572
+#: ../src/dialogs.py:3669
+msgid "Delete"
+msgstr "删除"
 
 #: ../data/gui/accounts_window.ui.h:5
-msgid "A_djust to status"
-msgstr "依据状态调整(_A)"
-
-#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
-msgid "Account"
-msgstr "账号"
-
-#: ../data/gui/accounts_window.ui.h:7
-msgid "Accounts"
-msgstr "账户"
+msgid "Re_name"
+msgstr "重命名(_N)"
 
-#: ../data/gui/accounts_window.ui.h:8
-msgid "Administration operations"
-msgstr "管理操作"
+#: ../data/gui/accounts_window.ui.h:6 ../src/config.py:4210
+#: ../src/plugins/gui.py:92
+msgid "Active"
+msgstr "活动"
 
 #: ../data/gui/accounts_window.ui.h:9
-msgid "Anonymous authentication"
-msgstr "匿名认证"
+msgid "Resour_ce:"
+msgstr "资源(_C): "
 
 #: ../data/gui/accounts_window.ui.h:10
-msgid "Auto-reconnect when connection is lost"
-msgstr "连接断开后自动重连"
+msgid "Priori_ty:"
+msgstr "优先级(_T):"
 
 #: ../data/gui/accounts_window.ui.h:11
-msgid "Browse..."
-msgstr "浏览..."
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"资源被发送给服务器以将用不同客户端登录的同一账户区分为两个或更多部分(取\n"
+"决于登录的客户端的数目)。比如, 您可以利用\"家庭\"和\"工作\"两个资源同时\n"
+"连接到服务器。拥有最高优先级的资源得到服务器的事件响应。（请看下面）"
 
-#: ../data/gui/accounts_window.ui.h:12
-msgid "C_onnect on Gajim startup"
-msgstr "Gajim 启动时连接(_O)"
+#. No configured account
+#: ../data/gui/accounts_window.ui.h:12 ../data/gui/roster_window.ui.h:1
+#: ../data/gajim.desktop.in.in.h:1 ../src/common/helpers.py:1119
+#: ../src/common/helpers.py:1131 ../src/notify.py:327 ../src/notify.py:350
+#: ../src/notify.py:401 ../src/notify.py:417
+msgid "Gajim"
+msgstr "Gajim"
 
 #: ../data/gui/accounts_window.ui.h:13
-msgid "Chan_ge Password"
-msgstr "更改密码(_G)"
+msgid "A_djust to status"
+msgstr "依据状态调整(_A)"
 
 #: ../data/gui/accounts_window.ui.h:14
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr "如果选定, Gajim 在通过不安全的网络连接发送密码前会询问您"
+msgid "Priority will change automatically according to your status."
+msgstr "优先级将根据您的状态自动转换。"
 
 #: ../data/gui/accounts_window.ui.h:15
-msgid "Choose Client Cert"
-msgstr "选择客户端证书"
-
-#: ../data/gui/accounts_window.ui.h:16
-msgid "Choose _Key..."
-msgstr "选择密钥(_K)..."
-
-#: ../data/gui/accounts_window.ui.h:17
-msgid "Click to change account's password"
-msgstr "点击以改变该账户的密码"
+msgid "Anonymous authentication"
+msgstr "匿名认证"
 
 #: ../data/gui/accounts_window.ui.h:18
-msgid "Click to request authorization to all contacts of another account"
-msgstr "点击以请求另一个账户所有联系人的认证"
+msgid ""
+"Priority is used in Jabber to determine who gets the events from the jabber "
+"server when two or more clients are connected using the same account; The "
+"client with the highest priority gets the events"
+msgstr ""
+"优先级是当多个客户端使用同一帐户连接到服务器时, 服务器决定事件响应对\n"
+"象的依据。优先级最高的客户端将得到事件响应"
 
 #: ../data/gui/accounts_window.ui.h:19
-msgid "Client certificate"
-msgstr "客户端证书"
+#, fuzzy
+msgid "Synchronize contacts"
+msgstr "同步联系人"
 
 #: ../data/gui/accounts_window.ui.h:20
-msgid "Co_nnect on Gajim startup"
-msgstr "Gajim 启动时连接(_O)"
+msgid "Click to request authorization to all contacts of another account"
+msgstr "点击以请求另一个账户所有联系人的认证"
 
 #: ../data/gui/accounts_window.ui.h:21
-msgid "Connection"
-msgstr "连接"
+msgid "Chan_ge Password"
+msgstr "更改密码(_G)"
 
 #: ../data/gui/accounts_window.ui.h:22
-#: ../data/gui/zeroconf_information_window.ui.h:2
-msgid "E-Mail:"
-msgstr "E-Mail : "
+msgid "Click to change account's password"
+msgstr "点击以改变该账户的密码"
 
 #: ../data/gui/accounts_window.ui.h:23
-#: ../data/gui/zeroconf_information_window.ui.h:3
-msgid "First Name:"
-msgstr "名: "
+msgid "Administration operations"
+msgstr "管理操作"
 
-#. No configured account
-#: ../data/gui/accounts_window.ui.h:24 ../data/gui/roster_window.ui.h:5
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:528 ../src/notify.py:551 ../src/notify.py:600
-#: ../src/notify.py:616
-msgid "Gajim"
-msgstr "Gajim"
+#: ../data/gui/accounts_window.ui.h:24
+msgid "_Client Cert File:"
+msgstr "客户端证书文件(_C)"
 
-#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
-#. General group cannot be changed
-#: ../data/gui/accounts_window.ui.h:25 ../data/gui/preferences_window.ui.h:57
-#: ../src/common/contacts.py:141 ../src/dialogs.py:112 ../src/dialogs.py:122
-#: ../src/roster_window.py:2909 ../src/roster_window.py:5434
-msgid "General"
-msgstr "常规"
+#: ../data/gui/accounts_window.ui.h:25
+msgid "Browse..."
+msgstr "浏览..."
 
 #: ../data/gui/accounts_window.ui.h:26
-msgid ""
-"If checked, Gajim will also broadcast some more IPs except from just your "
-"IP, so file transfer has higher chances of working."
-msgstr ""
-"如果选定,  Gajim 会广播更多的 IP地址, 这使得文件传输成功的可能性得到提高。"
+#, fuzzy
+msgid "Certificate is e_ncrypted"
+msgstr "证书被拒绝"
 
 #: ../data/gui/accounts_window.ui.h:27
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "如果选定, Gajim 会从一个 GPG agent （比如 Seahorse）得到密码"
+msgid "Client certificate"
+msgstr "客户端证书"
+
+#: ../data/gui/accounts_window.ui.h:28 ../data/gui/join_groupchat_window.ui.h:2
+msgid "Account"
+msgstr "账号"
 
 #: ../data/gui/accounts_window.ui.h:29
-msgid ""
-"If checked, Gajim will send keep-alive packets to prevent connection timeout "
-"which results in disconnection"
-msgstr "如果选定, Gajim 会发送数据包防止超时造成的连接断开"
+msgid "C_onnect on Gajim startup"
+msgstr "Gajim 启动时连接(_O)"
 
 #: ../data/gui/accounts_window.ui.h:30
 msgid ""
@@ -324,6 +316,23 @@ msgid ""
 msgstr "如果选定, Gajim 会在启动时自动使用本账户连接 jabber 服务器"
 
 #: ../data/gui/accounts_window.ui.h:31
+msgid "Auto-reconnect when connection is lost"
+msgstr "连接断开后自动重连"
+
+#: ../data/gui/accounts_window.ui.h:32
+msgid "Save conversation _logs for all contacts"
+msgstr "保存与所有联系人的聊天记录(_L)"
+
+#: ../data/gui/accounts_window.ui.h:33
+#, fuzzy
+msgid "Synchronize logs with server"
+msgstr "同步联系人"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Synch_ronize account status with global status"
+msgstr "将帐户状态与全局状态同步(_R)"
+
+#: ../data/gui/accounts_window.ui.h:35
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -332,183 +341,229 @@ msgstr ""
 "如果选定, 改变全局状态(在联系人列表窗口下方复选框中调节)就会相应地改变当前帐"
 "户的状态"
 
-#: ../data/gui/accounts_window.ui.h:32
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"如果用于接收消息的默认端口不合适, 您可以在这里选择另外一个。\n"
-"您可能需要改变防火墙设置。"
-
-#: ../data/gui/accounts_window.ui.h:34
-msgid "Information about you, as stored in the server"
-msgstr "服务器中保存的关于您的信息"
-
-#: ../data/gui/accounts_window.ui.h:35
-#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1817
-#: ../src/dialogs.py:833
-msgid "Jabber ID:"
-msgstr "Jabber ID"
-
 #: ../data/gui/accounts_window.ui.h:36
-#: ../data/gui/zeroconf_information_window.ui.h:5
-msgid "Last Name:"
-msgstr "姓: "
+msgid "Receive conversations from other resources (If server supports it)"
+msgstr ""
 
 #: ../data/gui/accounts_window.ui.h:37
-msgid "Mer_ge accounts"
-msgstr "合并帐户(_G)"
+msgid "Use file transfer proxies"
+msgstr "使用文件传输代理服务器"
 
-#: ../data/gui/accounts_window.ui.h:38 ../src/config.py:1790
-#: ../src/config.py:2358
-msgid "No key selected"
-msgstr "没有选择密钥"
+#: ../data/gui/accounts_window.ui.h:38
+msgid ""
+"If checked, Gajim will also broadcast some more IPs except from just your "
+"IP, so file transfer has higher chances of working."
+msgstr ""
+"如果选定,  Gajim 会广播更多的 IP地址, 这使得文件传输成功的可能性得到提高。"
 
-#: ../data/gui/accounts_window.ui.h:40 ../data/gui/profile_window.ui.h:35
-msgid "Personal Information"
-msgstr "个人信息"
+#. nick choosen by contact
+#. FIXME: Ugly workaround.
+#. FIXME: Ugly workaround.
+#. Maybe we haven't been in any group (defaults to General)
+#. General group cannot be changed
+#: ../data/gui/accounts_window.ui.h:39 ../data/gui/preferences_window.ui.h:42
+#: ../src/common/contacts.py:106 ../src/common/contacts.py:139
+#: ../src/dialogs.py:124 ../src/dialogs.py:136 ../src/roster_window.py:3028
+#: ../src/roster_window.py:4151 ../src/roster_window.py:5764
+msgid "General"
+msgstr "常规"
 
-#: ../data/gui/accounts_window.ui.h:41
-msgid "Priori_ty:"
-msgstr "优先级(_T):"
+#: ../data/gui/accounts_window.ui.h:40
+msgid "_use HTTP__PROXY environment variable"
+msgstr "使用 HTTP__PROXY 环境变量(_U)"
+
+#: ../data/gui/accounts_window.ui.h:41 ../data/gui/preferences_window.ui.h:140
+msgid "_Manage..."
+msgstr "管理..."
 
 #: ../data/gui/accounts_window.ui.h:42
-msgid ""
-"Priority is used in Jabber to determine who gets the events from the jabber "
-"server when two or more clients are connected using the same account; The "
-"client with the highest priority gets the events"
-msgstr ""
-"优先级是当多个客户端使用同一帐户连接到服务器时, 服务器决定事件响应对\n"
-"象的依据。优先级最高的客户端将得到事件响应"
+msgid "<b>Proxy</b>"
+msgstr "<b>代理服务器</b>"
 
 #: ../data/gui/accounts_window.ui.h:43
-msgid "Priority will change automatically according to your status."
-msgstr "优先级将根据您的状态自动转换。"
+msgid "_Warn before using an insecure connection"
+msgstr "在使用不安全的连接之前警告（_W）"
 
-#. Rename
-#: ../data/gui/accounts_window.ui.h:44 ../src/roster_window.py:5384
-msgid "Re_name"
-msgstr "重命名(_N)"
+#: ../data/gui/accounts_window.ui.h:44
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr "如果选定, Gajim 在通过不安全的网络连接发送密码前会询问您"
 
 #: ../data/gui/accounts_window.ui.h:45
-msgid "Resour_ce:"
-msgstr "资源(_C): "
+msgid "Send _keep-alive packets"
+msgstr "发送数据包以防止连接超时"
 
 #: ../data/gui/accounts_window.ui.h:46
 msgid ""
-"Resource is sent to the Jabber server in order to separate the same JID in "
-"two or more parts depending on the number of the clients connected in the "
-"same server with the same account. So you might be connected in the same "
-"account with resource 'Home' and 'Work' at the same time. The resource which "
-"has the highest priority will get the events. (see below)"
-msgstr ""
-"资源被发送给服务器以将用不同客户端登录的同一账户区分为两个或更多部分(取\n"
-"决于登录的客户端的数目)。比如, 您可以利用\"家庭\"和\"工作\"两个资源同时\n"
-"连接到服务器。拥有最高优先级的资源得到服务器的事件响应。（请看下面）"
+"If checked, Gajim will send keep-alive packets to prevent connection timeout "
+"which results in disconnection"
+msgstr "如果选定, Gajim 会发送数据包防止超时造成的连接断开"
 
 #: ../data/gui/accounts_window.ui.h:47
-msgid "Save conversation _logs for all contacts"
-msgstr "保存与所有联系人的聊天记录(_L)"
+msgid "Use cust_om hostname/port"
+msgstr "使用自定义主机名/端口号"
+
+#: ../data/gui/accounts_window.ui.h:48
+msgid "_Hostname: "
+msgstr "主机名(_H): "
 
 #: ../data/gui/accounts_window.ui.h:49
-msgid "Send _keep-alive packets"
-msgstr "发送数据包以防止连接超时"
+msgid "_Port: "
+msgstr "端口号(_P): "
 
-#: ../data/gui/accounts_window.ui.h:50
-msgid "Synch_ronize account status with global status"
-msgstr "将帐户状态与全局状态同步(_R)"
+#: ../data/gui/accounts_window.ui.h:50 ../data/gui/preferences_window.ui.h:143
+msgid "<b>Miscellaneous</b>"
+msgstr "<b>杂项</b>"
 
 #: ../data/gui/accounts_window.ui.h:51
-msgid "Synchroni_ze account status with global status"
-msgstr "将帐户状态与全局状态同步(_Z)"
+msgid "Connection"
+msgstr "连接"
 
-#: ../data/gui/accounts_window.ui.h:52
-#: ../data/gui/synchronise_select_account_dialog.ui.h:2
-msgid "Synchronise contacts"
-msgstr "同步联系人"
+#: ../data/gui/accounts_window.ui.h:52 ../src/config.py:1853
+#: ../src/config.py:2467
+msgid "No key selected"
+msgstr "没有选择密钥"
 
 #: ../data/gui/accounts_window.ui.h:53
-msgid "The path to the client certificate and key in PKCS#12 format"
-msgstr "客户端证书路径（PKCS#12 格式）"
+msgid "Choose _Key..."
+msgstr "选择密钥(_K)..."
 
 #: ../data/gui/accounts_window.ui.h:54
 msgid "Use G_PG Agent"
 msgstr "使用 G_PG Agent"
 
 #: ../data/gui/accounts_window.ui.h:55
-msgid "Use cust_om hostname/port"
-msgstr "使用自定义主机名/端口号"
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "如果选定, Gajim 会从一个 GPG agent （比如 Seahorse）得到密码"
 
 #: ../data/gui/accounts_window.ui.h:56
-msgid "Use cust_om port:"
-msgstr "使用自定义端口号: "
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
 
 #: ../data/gui/accounts_window.ui.h:57
-msgid "Use file transfer proxies"
-msgstr "使用文件传输代理服务器"
+msgid "_Edit Personal Information..."
+msgstr "编辑个人信息..."
 
 #: ../data/gui/accounts_window.ui.h:58
-msgid "_Client Cert File:"
-msgstr "客户端证书文件(_C)"
+msgid "Information about you, as stored in the server"
+msgstr "服务器中保存的关于您的信息"
 
 #: ../data/gui/accounts_window.ui.h:59
-msgid "_Edit Personal Information..."
-msgstr "编辑个人信息..."
+msgid "<b>Personal Information</b>"
+msgstr "<b>个人信息</b>"
 
-#. XML Console enable checkbutton
-#: ../data/gui/accounts_window.ui.h:60 ../data/gui/xml_console_window.ui.h:11
-msgid "_Enable"
-msgstr "启用(_E)"
+#: ../data/gui/accounts_window.ui.h:60 ../data/gui/profile_window.ui.h:1
+msgid "Personal Information"
+msgstr "个人信息"
 
 #: ../data/gui/accounts_window.ui.h:61
-msgid "_Hostname: "
-msgstr "主机名(_H): "
+msgid "Co_nnect on Gajim startup"
+msgstr "Gajim 启动时连接(_O)"
+
+#: ../data/gui/accounts_window.ui.h:62
+msgid "Synchroni_ze account status with global status"
+msgstr "将帐户状态与全局状态同步(_Z)"
 
 #: ../data/gui/accounts_window.ui.h:63
-msgid "_Manage..."
-msgstr "管理..."
+msgid "Use cust_om port:"
+msgstr "使用自定义端口号: "
 
-#: ../data/gui/accounts_window.ui.h:65
-msgid "_Port: "
-msgstr "端口号(_P): "
+#: ../data/gui/accounts_window.ui.h:64
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"如果用于接收消息的默认端口不合适, 您可以在这里选择另外一个。\n"
+"您可能需要改变防火墙设置。"
 
 #: ../data/gui/accounts_window.ui.h:66
-msgid "_Warn before using an insecure connection"
-msgstr "在使用不安全的连接之前警告（_W）"
+#: ../data/gui/zeroconf_information_window.ui.h:7
+msgid "First Name:"
+msgstr "名: "
 
 #: ../data/gui/accounts_window.ui.h:67
-msgid "_use HTTP__PROXY environment variable"
-msgstr "使用 HTTP__PROXY 环境变量(_U)"
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "Last Name:"
+msgstr "姓: "
 
-#: ../data/gui/add_new_contact_window.ui.h:1
-msgid "A_ccount:"
-msgstr "账号(_C): "
+#: ../data/gui/accounts_window.ui.h:68
+#: ../data/gui/archiving_313_preferences_item.ui.h:3
+#: ../data/gui/tooltip_gc_contact.ui.h:1
+#: ../data/gui/tooltip_roster_contact.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:9 ../src/config.py:1880
+#: ../src/dialogs.py:854
+msgid "Jabber ID:"
+msgstr "Jabber ID"
 
-#: ../data/gui/add_new_contact_window.ui.h:2
-msgid "A_llow this contact to view my status"
-msgstr "允许此联系人看到我的状态(_L)"
+#: ../data/gui/accounts_window.ui.h:69
+#: ../data/gui/zeroconf_information_window.ui.h:10
+msgid "E-Mail:"
+msgstr "E-Mail : "
 
-#: ../data/gui/add_new_contact_window.ui.h:3
-msgid "Add New Contact"
-msgstr "添加联系人"
+#: ../data/gui/accounts_window.ui.h:70
+msgid "Mer_ge accounts"
+msgstr "合并帐户(_G)"
 
-#: ../data/gui/add_new_contact_window.ui.h:4 ../src/common/helpers.py:1339
+#: ../data/gui/add_new_contact_window.ui.h:1 ../src/common/helpers.py:1317
 msgid "I would like to add you to my contact list."
 msgstr "我想添加您到我的联系人列表"
 
+#: ../data/gui/add_new_contact_window.ui.h:2
+msgid "Add New Contact"
+msgstr "添加联系人"
+
+#: ../data/gui/add_new_contact_window.ui.h:3
+msgid "A_ccount:"
+msgstr "账号(_C): "
+
+#: ../data/gui/add_new_contact_window.ui.h:4
+msgid "_Protocol:"
+msgstr "协议(_P): "
+
 #: ../data/gui/add_new_contact_window.ui.h:5
+msgid "_User ID:"
+msgstr "用户 ID(_U):"
+
+#: ../data/gui/add_new_contact_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:3
+msgid "_Nickname:"
+msgstr "昵称(_N): "
+
+#: ../data/gui/add_new_contact_window.ui.h:7
+msgid "_Group:"
+msgstr "群组(_G): "
+
+#: ../data/gui/add_new_contact_window.ui.h:8
+msgid "Choose a group of type a new group"
+msgstr ""
+
+#: ../data/gui/add_new_contact_window.ui.h:9
+msgid "A_llow this contact to view my status"
+msgstr "允许此联系人看到我的状态(_L)"
+
+#: ../data/gui/add_new_contact_window.ui.h:10
+msgid "_Save subscription message"
+msgstr "保存认证消息(_S)"
+
+#: ../data/gui/add_new_contact_window.ui.h:11
+#, fuzzy
 msgid ""
 "You have to register with this transport\n"
 "to be able to add a contact from this\n"
-"protocol. Click on register button to\n"
+"protocol. Click on Register button to\n"
 "proceed."
 msgstr ""
 "您必须注册才能\n"
 "添加此协议的联系人。\n"
 "点击注册按钮处理。"
 
-#: ../data/gui/add_new_contact_window.ui.h:9
+#: ../data/gui/add_new_contact_window.ui.h:15
+msgid "_Register"
+msgstr "注册(_G): "
+
+#: ../data/gui/add_new_contact_window.ui.h:16
 msgid ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
@@ -516,682 +571,576 @@ msgstr ""
 "您必须连接才能\n"
 "增加此协议的联系人。"
 
-#: ../data/gui/add_new_contact_window.ui.h:11
-msgid "_Group:"
-msgstr "群组(_G): "
-
-#: ../data/gui/add_new_contact_window.ui.h:12
-msgid "_Nickname:"
-msgstr "昵称(_N): "
-
-#: ../data/gui/add_new_contact_window.ui.h:13
-msgid "_Protocol:"
-msgstr "协议(_P): "
-
-#: ../data/gui/add_new_contact_window.ui.h:14
-msgid "_Register"
-msgstr "注册(_G): "
-
-#: ../data/gui/add_new_contact_window.ui.h:15
-msgid "_Save subscription message"
-msgstr "保存认证消息(_S)"
-
-#: ../data/gui/add_new_contact_window.ui.h:16
-msgid "_User ID:"
-msgstr "用户 ID(_U):"
-
-#: ../data/gui/adhoc_commands_window.ui.h:1
-msgid "<b>An error has occurred:</b>"
-msgstr "<b>发生了一个错误: </b>"
+#. displaying the window
+#: ../data/gui/adhoc_commands_window.ui.h:1 ../src/adhoc_commands.py:104
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc 命令 - Gajim"
 
 #: ../data/gui/adhoc_commands_window.ui.h:2
-msgid "<b>Choose command to execute:</b>"
-msgstr "<b>选择要执行的命令</b>"
+msgid "Please wait while retrieving command list..."
+msgstr "请稍等, 正在获取命令列表..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:3
-msgid "Ad-hoc Commands - Gajim"
-msgstr "Ad-hoc 命令 - Gajim"
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>选择要执行的命令</b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "请再检查一遍"
 
 #: ../data/gui/adhoc_commands_window.ui.h:5
-msgid "Error description..."
-msgstr "错误描述..."
+#, fuzzy
+msgid "Please wait while the command is being sent..."
+msgstr "请稍等, 正在发送命令..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:6
-msgid "F_inish"
-msgstr "完成(_F)"
+msgid "Please wait..."
+msgstr "请稍等..."
 
 #: ../data/gui/adhoc_commands_window.ui.h:7
-msgid "Please wait while retrieving command list..."
-msgstr "请稍等, 正在获取命令列表..."
+msgid "This jabber entity does not expose any commands."
+msgstr "这个 Jabber 节点没有提供任何命令"
 
 #: ../data/gui/adhoc_commands_window.ui.h:8
-msgid "Please wait while the command is sending..."
-msgstr "请稍等, 正在发送命令..."
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>发生了一个错误: </b>"
 
 #: ../data/gui/adhoc_commands_window.ui.h:9
-msgid "Please wait..."
-msgstr "请稍等..."
-
-#: ../data/gui/adhoc_commands_window.ui.h:10
-msgid "This jabber entity does not expose any commands."
-msgstr "这个 Jabber 节点没有提供任何命令"
+msgid "F_inish"
+msgstr "完成(_F)"
 
 #: ../data/gui/advanced_configuration_window.ui.h:1
-#: ../data/gui/features_window.ui.h:1
-msgid "<b>Description</b>"
-msgstr "<b>描述</b>"
+msgid "Advanced Configuration Editor"
+msgstr "高级设置编辑器"
 
 #: ../data/gui/advanced_configuration_window.ui.h:2
-msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-msgstr "<b>注意: </b>您必须重新启动 gajim 以使某些设置生效"
+msgid "Filter:"
+msgstr "过滤器: "
 
 #: ../data/gui/advanced_configuration_window.ui.h:3
-msgid "Advanced Configuration Editor"
-msgstr "高级设置编辑器"
+#: ../data/gui/features_window.ui.h:3
+msgid "<b>Description</b>"
+msgstr "<b>描述</b>"
 
 #: ../data/gui/advanced_configuration_window.ui.h:4
-msgid "Filter:"
-msgstr "过滤器: "
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>注意: </b>您必须重新启动 gajim 以使某些设置生效"
+
+#: ../data/gui/advanced_configuration_window.ui.h:5
+#, fuzzy
+msgid "_Reset to default"
+msgstr "恢复为默认颜色设置(_R)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:1
-msgid "Delete MOTD"
-msgstr "删除 MOTD"
+msgid "Show _XML Console"
+msgstr "显示 XML 控制台(_X)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:2
-msgid "Deletes Message of the Day"
-msgstr "删除每日消息"
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit Archi_ving Preferences"
 msgstr "编辑存档首选项(_V)"
 
-#: ../data/gui/advanced_menuitem_menu.ui.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Edit _Privacy Lists..."
 msgstr "编辑隐私策略列表(_P)"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "_Administrator"
+msgstr "管理员(_A)"
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sends a message to users currently connected to this server"
 msgstr "向所有当前连接到这个服务器的用户发送一条消息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:6
-msgid "Set MOTD..."
-msgstr "设定 MOTD..."
+msgid "_Send Server Message..."
+msgstr "发送服务器消息(_S)"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Sets Message of the Day"
 msgstr "设定每日消息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:8
-msgid "Show _XML Console"
-msgstr "显示 XML 控制台(_X)"
+msgid "Set MOTD..."
+msgstr "设定 MOTD..."
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:9
-msgid "Update MOTD..."
-msgstr "更新 MOTD..."
-
-#: ../data/gui/advanced_menuitem_menu.ui.h:10
 msgid "Updates Message of the Day"
 msgstr "更新每日消息"
 
+#: ../data/gui/advanced_menuitem_menu.ui.h:10
+msgid "Update MOTD..."
+msgstr "更新 MOTD..."
+
 #: ../data/gui/advanced_menuitem_menu.ui.h:11
-msgid "_Administrator"
-msgstr "管理员(_A)"
+msgid "Deletes Message of the Day"
+msgstr "删除每日消息"
 
 #: ../data/gui/advanced_menuitem_menu.ui.h:12
-msgid "_Send Server Message..."
-msgstr "发送服务器消息(_S)"
-
-#: ../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)"
+msgid "Delete MOTD"
+msgstr "删除 MOTD"
 
-#: ../data/gui/advanced_notifications_window.ui.h:36
-msgid "_Show event in roster"
-msgstr "在联系人列表中显示事件(_S)"
+#: ../data/gui/archiving_313_preferences_item.ui.h:1
+#: ../data/gui/archiving_313_preferences_window.ui.h:1
+#: ../data/gui/preferences_window.ui.h:8
+msgid "Always"
+msgstr "总是"
 
-#: ../data/gui/advanced_notifications_window.ui.h:37
-msgid "and I "
-msgstr "与我"
+#: ../data/gui/archiving_313_preferences_item.ui.h:2
+#: ../data/gui/archiving_313_preferences_window.ui.h:3
+#: ../data/gui/preferences_window.ui.h:6
+msgid "Never"
+msgstr "从不"
 
-#: ../data/gui/advanced_notifications_window.ui.h:38
-msgid "contact(s)"
-msgstr "联系人"
+#: ../data/gui/archiving_313_preferences_item.ui.h:4
+#, fuzzy
+msgid "Preference:"
+msgstr "参数"
 
-#: ../data/gui/advanced_notifications_window.ui.h:39
-msgid "everybody"
-msgstr "每个人"
+#: ../data/gui/archiving_313_preferences_window.ui.h:2
+#, fuzzy
+msgid "Roster"
+msgstr "显示联系人列表(_R)"
 
-#: ../data/gui/advanced_notifications_window.ui.h:40
-msgid "for "
-msgstr "为"
+#. holds jid
+#: ../data/gui/archiving_313_preferences_window.ui.h:4 ../src/dialogs.py:3576
+#: ../src/history_manager.py:168
+msgid "Jabber ID"
+msgstr "Jabber ID"
 
-#: ../data/gui/advanced_notifications_window.ui.h:41
-msgid "group(s)"
-msgstr "群组"
+#: ../data/gui/archiving_313_preferences_window.ui.h:5
+#, fuzzy
+msgid "Preference"
+msgstr "参数"
 
-#: ../data/gui/advanced_notifications_window.ui.h:42
-msgid "when I'm in"
-msgstr "当我在"
+#: ../data/gui/archiving_313_preferences_window.ui.h:6
+#, fuzzy
+msgid "Default:"
+msgstr "默认"
 
 #: ../data/gui/archiving_preferences_window.ui.h:1
-msgid "<i>Method Auto</i>"
-msgstr "<i>Method Auto</i>"
+msgid "No"
+msgstr "No"
 
 #: ../data/gui/archiving_preferences_window.ui.h:2
-msgid "<i>Method Local</i>"
-msgstr "<i>Method Local</i>"
+msgid "Yes"
+msgstr "Yes"
 
 #: ../data/gui/archiving_preferences_window.ui.h:3
-msgid "<i>Method Manual</i>"
-msgstr "<i>Method Manual</i>"
+msgid "Prefer"
+msgstr "Prefer"
 
 #: ../data/gui/archiving_preferences_window.ui.h:4
-msgid "Auto"
-msgstr "Auto"
-
-#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Concede"
 msgstr "Concede"
 
-#: ../data/gui/archiving_preferences_window.ui.h:6
+#: ../data/gui/archiving_preferences_window.ui.h:5
 msgid "Forbid"
 msgstr "Forbid"
 
+#: ../data/gui/archiving_preferences_window.ui.h:6
+msgid "Auto"
+msgstr "Auto"
+
 #: ../data/gui/archiving_preferences_window.ui.h:7
-msgid "No"
-msgstr "No"
+msgid "<i>Method Auto</i>"
+msgstr "<i>Method Auto</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:8
-msgid "Prefer"
-msgstr "Prefer"
+msgid "<i>Method Local</i>"
+msgstr "<i>Method Local</i>"
 
 #: ../data/gui/archiving_preferences_window.ui.h:9
-msgid "Yes"
-msgstr "Yes"
+msgid "<i>Method Manual</i>"
+msgstr "<i>Method Manual</i>"
 
 #: ../data/gui/atom_entry_window.ui.h:1
-msgid "Entry:"
-msgstr "Entry:"
+msgid "New entry received"
+msgstr "New entry received"
 
-#: ../data/gui/atom_entry_window.ui.h:2
+#: ../data/gui/atom_entry_window.ui.h:2 ../src/atom_window.py:129
+msgid "You have received new entry:"
+msgstr "You have received new entry:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Feed name:"
 msgstr "Feed name:"
 
-#: ../data/gui/atom_entry_window.ui.h:3
+#: ../data/gui/atom_entry_window.ui.h:4
+msgid "Entry:"
+msgstr "Entry:"
+
+#: ../data/gui/atom_entry_window.ui.h:5
 msgid "Last modified:"
 msgstr "Last modified:"
 
-#: ../data/gui/atom_entry_window.ui.h:4
-msgid "New entry received"
-msgstr "New entry received"
-
-#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:128
-msgid "You have received new entry:"
-msgstr "You have received new entry:"
+#: ../data/gui/atom_entry_window.ui.h:6
+msgid "Next entry"
+msgstr ""
 
 #: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "被屏蔽的联系人"
 
 #: ../data/gui/blocked_contacts_window.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:25
-#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/roster_window.py:5403
-#: ../src/roster_window.py:5531 ../src/roster_window.py:5664
+#: ../data/gui/contact_context_menu.ui.h:20
+#: ../data/gui/gc_occupants_menu.ui.h:14 ../src/gui_menu_builder.py:606
+#: ../src/roster_window.py:5742 ../src/roster_window.py:5857
 msgid "_Unblock"
 msgstr "解除屏蔽(_U)"
 
 #: ../data/gui/change_activity_dialog.ui.h:1
-msgid "<b>Message:</b> "
-msgstr "<b>消息: </b>"
-
-#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "设置活动"
 
-#: ../data/gui/change_activity_dialog.ui.h:3
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set an activity"
 msgstr "设置活动"
 
-#: ../data/gui/change_mood_dialog.ui.h:1
-msgid "<b>Message:</b>"
+#: ../data/gui/change_activity_dialog.ui.h:3
+msgid "<b>Message:</b> "
 msgstr "<b>消息: </b>"
 
-#: ../data/gui/change_mood_dialog.ui.h:2
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Mood:</b>"
 msgstr "<b>心情: </b>"
 
+#: ../data/gui/change_mood_dialog.ui.h:2
+msgid "<b>Message:</b>"
+msgstr "<b>消息: </b>"
+
 #: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "更改密码"
 
 #: ../data/gui/change_password_dialog.ui.h:2
-msgid "Enter it again for confirmation:"
-msgstr "再次输入以确认: "
-
-#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "输入新密码"
 
+#: ../data/gui/change_password_dialog.ui.h:3
+msgid "Enter it again for confirmation:"
+msgstr "再次输入以确认: "
+
 #: ../data/gui/change_status_message_dialog.ui.h:1
-msgid "<b>Type your new status message</b>"
-msgstr "<b>键入新的状态消息</b>"
+msgid "Save as Preset..."
+msgstr "另存为..."
 
 #: ../data/gui/change_status_message_dialog.ui.h:2
+msgid "Preset messages:"
+msgstr "预设的消息: "
+
+#: ../data/gui/change_status_message_dialog.ui.h:3
+#: ../data/gui/tooltip_roster_contact.ui.h:7
 msgid "Activity:"
 msgstr "活动: "
 
-#: ../data/gui/change_status_message_dialog.ui.h:3
+#: ../data/gui/change_status_message_dialog.ui.h:4
+#: ../data/gui/tooltip_roster_contact.ui.h:6
 msgid "Mood:"
 msgstr "心情: "
 
-#: ../data/gui/change_status_message_dialog.ui.h:4
-msgid "Preset messages:"
-msgstr "预设的消息: "
-
 #: ../data/gui/change_status_message_dialog.ui.h:5
-msgid "Save as Preset..."
-msgstr "另存为..."
+msgid "<b>Type your new status message</b>"
+msgstr "<b>键入新的状态消息</b>"
 
 #: ../data/gui/chat_context_menu.ui.h:1
-msgid "Join _Group Chat"
-msgstr "加入聊天室(_G)"
+msgid "_Copy Link Location"
+msgstr "复制链接位置(_C)"
 
 #: ../data/gui/chat_context_menu.ui.h:2
-#: ../data/gui/contact_context_menu.ui.h:16
-msgid "_Add to Roster..."
-msgstr "添加至联系人列表(_A)"
+msgid "_Open Link in Browser"
+msgstr "在浏览器中打开链接(_O)"
 
 #: ../data/gui/chat_context_menu.ui.h:3
 msgid "_Copy JID/Email Address"
 msgstr "复制 JID/电子邮件地址(_C)"
 
 #: ../data/gui/chat_context_menu.ui.h:4
-msgid "_Copy Link Location"
-msgstr "复制链接位置(_C)"
-
-#: ../data/gui/chat_context_menu.ui.h:5
 msgid "_Open Email Composer"
 msgstr "打开邮件编辑器(_O)"
 
-#: ../data/gui/chat_context_menu.ui.h:6
-msgid "_Open Link in Browser"
-msgstr "在浏览器中打开链接(_O)"
-
-#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/chat_context_menu.ui.h:5
 #: ../data/gui/subscription_request_popup_menu.ui.h:1
-#: ../data/gui/systray_context_menu.ui.h:6
 msgid "_Start Chat"
 msgstr "开始聊天(_S)"
 
-#. # means number
-#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4598
-msgid "#"
-msgstr "#"
+#: ../data/gui/chat_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Add to Roster..."
+msgstr "添加至联系人列表(_A)"
+
+#: ../data/gui/chat_control.ui.h:1
+#, fuzzy
+msgid "<b>1</b>"
+msgstr "<b>字体</b>"
 
 #: ../data/gui/chat_control.ui.h:2
-msgid "*"
-msgstr "*"
+#, fuzzy
+msgid "<b>2</b> abc"
+msgstr "<b>字体</b>"
 
-#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
-msgid "0"
-msgstr "0"
+#: ../data/gui/chat_control.ui.h:3
+#, fuzzy
+msgid "<b>3</b> def"
+msgstr "<b>字体</b>"
 
 #: ../data/gui/chat_control.ui.h:4
-msgid "1"
-msgstr "1"
+#, fuzzy
+msgid "<b>4</b> ghi"
+msgstr "<b>字体</b>"
 
 #: ../data/gui/chat_control.ui.h:5
-msgid "2"
-msgstr "2"
+#, fuzzy
+msgid "<b>5</b> jkl"
+msgstr "<b>字体</b>"
 
 #: ../data/gui/chat_control.ui.h:6
-msgid "3"
-msgstr "3"
+#, fuzzy
+msgid "<b>6</b> mno"
+msgstr "<b>字体</b>"
 
 #: ../data/gui/chat_control.ui.h:7
-msgid "4"
-msgstr "4"
+msgid "<b>7</b> pqrs"
+msgstr ""
 
 #: ../data/gui/chat_control.ui.h:8
-msgid "5"
-msgstr "5"
+#, fuzzy
+msgid "<b>8</b> tuv"
+msgstr "<b>字体</b>"
 
 #: ../data/gui/chat_control.ui.h:9
-msgid "6"
-msgstr "6"
+msgid "<b>9</b> wxyz"
+msgstr ""
 
 #: ../data/gui/chat_control.ui.h:10
-msgid "7"
-msgstr "7"
+#, fuzzy
+msgid "<b>*</b>"
+msgstr "<b>字体</b>"
 
 #: ../data/gui/chat_control.ui.h:11
-msgid "8"
-msgstr "8"
+#, fuzzy
+msgid "<b>0</b>"
+msgstr "<b>字体</b>"
 
 #: ../data/gui/chat_control.ui.h:12
-msgid "9"
-msgstr "9"
+#, fuzzy
+msgid "<b>#</b>"
+msgstr "<b>字体</b>"
 
-#: ../data/gui/chat_control.ui.h:13
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "向联系人列表中添加联系人(Ctrl+D)"
+#: ../data/gui/chat_control.ui.h:13 ../data/gui/gajim_themes_window.ui.h:10
+msgid "Bold"
+msgstr "粗体"
 
-#: ../data/gui/chat_control.ui.h:14 ../data/gui/groupchat_control.ui.h:2
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "浏览聊天记录(Ctrl+H)"
+#: ../data/gui/chat_control.ui.h:14 ../data/gui/gajim_themes_window.ui.h:11
+msgid "Italic"
+msgstr "斜体"
 
 #: ../data/gui/chat_control.ui.h:15
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "邀请联系人参与对话(Ctrl+G)"
+msgid "Underline"
+msgstr "下划线"
 
-#: ../data/gui/chat_control.ui.h:16 ../data/gui/groupchat_control.ui.h:5
+#: ../data/gui/chat_control.ui.h:16
+msgid "Strike"
+msgstr "划去"
+
+#: ../data/gui/chat_control.ui.h:17 ../src/advanced_configuration_window.py:99
+msgid "Color"
+msgstr "Color"
+
+#: ../data/gui/chat_control.ui.h:18
+msgid "Font"
+msgstr "字体"
+
+#: ../data/gui/chat_control.ui.h:19
+#, fuzzy
+msgid "Clear formatting"
+msgstr "清楚格式"
+
+#: ../data/gui/chat_control.ui.h:20 ../data/gui/groupchat_control.ui.h:1
 msgid "Show a list of emoticons (Alt+M)"
 msgstr "显示表情列表(Alt+M)"
 
-#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:6
-msgid "Show a list of formattings"
-msgstr "显示格式列表(Alt+M)"
+#: ../data/gui/chat_control.ui.h:21
+msgid "Add this contact to roster (Ctrl+D)"
+msgstr "向联系人列表中添加联系人(Ctrl+D)"
 
-#: ../data/gui/chat_control.ui.h:18 ../data/gui/groupchat_control.ui.h:7
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "显示高级功能菜单(Alt+D)"
+#: ../data/gui/chat_control.ui.h:22
+msgid "Invite contacts to the conversation (Ctrl+G)"
+msgstr "邀请联系人参与对话(Ctrl+G)"
 
-#: ../data/gui/chat_control.ui.h:19
+#: ../data/gui/chat_control.ui.h:23
+#, fuzzy
+msgid "Show the contact&apos;s profile (Ctrl+I)"
+msgstr "显示联系人的名片"
+
+#: ../data/gui/chat_control.ui.h:24
 msgid "Show the contact's profile (Ctrl+I)"
 msgstr "显示联系人的名片"
 
-#: ../data/gui/chat_control.ui.h:20
-msgid "Toggle audio session"
-msgstr "切换语音会话"
+#: ../data/gui/chat_control.ui.h:25 ../data/gui/groupchat_control.ui.h:6
+msgid "Browse the chat history (Ctrl+H)"
+msgstr "浏览聊天记录(Ctrl+H)"
 
-#: ../data/gui/chat_control.ui.h:21
-msgid "Toggle video session"
-msgstr "切换视频会话"
+#: ../data/gui/chat_control.ui.h:26 ../data/gui/groupchat_control.ui.h:7
+#, fuzzy
+msgid "Show advanced functions (Alt+D)"
+msgstr "显示高级功能菜单(Alt+D)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/chat_control.ui.h:23 ../data/gui/groupchat_control.ui.h:9
-#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+#: ../data/gui/chat_control.ui.h:27
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:28 ../data/gui/groupchat_control.ui.h:8
+#: ../data/gui/xml_console_window.ui.h:15 ../src/filetransfers_window.py:321
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../data/gui/chat_control.ui.h:24 ../data/gui/groupchat_control.ui.h:10
-msgid "label"
-msgstr "标签"
+#: ../data/gui/chat_control.ui.h:29 ../data/gui/groupchat_control.ui.h:9
+#: ../data/gui/single_message_window.ui.h:6
+msgid "Send message"
+msgstr "发送消息"
 
 #: ../data/gui/chat_to_muc_window.ui.h:1
-msgid "In_vite"
-msgstr "邀请(_V)"
-
-#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "邀请朋友!"
 
-#: ../data/gui/chat_to_muc_window.ui.h:3
-msgid "MUC server"
-msgstr "多人聊天服务器"
+#: ../data/gui/chat_to_muc_window.ui.h:2
+#, fuzzy
+msgid ""
+"You are now entering a groupchat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+"您将开始进行多人聊天。\n"
+"选择您想要邀请的联系人"
 
 #: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "请选择一个多人聊天服务器"
 
 #: ../data/gui/chat_to_muc_window.ui.h:5
-msgid ""
-"You are going to begin a Multi-User Chat.\n"
-"Select the contacts you want to invite"
-msgstr ""
-"您将开始进行多人聊天。\n"
-"选择您想要邀请的联系人"
+msgid "MUC server"
+msgstr "多人聊天服务器"
+
+#: ../data/gui/chat_to_muc_window.ui.h:6
+msgid "In_vite"
+msgstr "邀请(_V)"
 
 #: ../data/gui/contact_context_menu.ui.h:1
-msgid "A_sk to see his/her status"
-msgstr "要求查看他/她的状态(_S)"
+msgid "Start _Chat"
+msgstr "开始聊天(_C)"
 
-#: ../data/gui/contact_context_menu.ui.h:2
-msgid "Add Special _Notification..."
-msgstr "添加特殊提示(_N)"
+#. Send single message
+#: ../data/gui/contact_context_menu.ui.h:2 ../data/gui/roster_window.ui.h:4
+#: ../data/gui/systray_context_menu.ui.h:4 ../src/gui_menu_builder.py:541
+msgid "Send Single _Message..."
+msgstr "发送单条消息...(_M)"
 
 #: ../data/gui/contact_context_menu.ui.h:3
-msgid "Assign Open_PGP Key..."
-msgstr "指定 Open_PGP 密钥"
-
-#: ../data/gui/contact_context_menu.ui.h:4
-msgid "E_xecute Command..."
-msgstr "执行命令..."
-
-#: ../data/gui/contact_context_menu.ui.h:5
-msgid "Edit _Groups..."
-msgstr "编辑群组(_G)..."
+msgid "Send _File..."
+msgstr "发送文件(_F)..."
 
-#. Invite to
 #. Invite to Groupchat
-#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5499
+#: ../data/gui/contact_context_menu.ui.h:4
+#: ../data/gui/gc_occupants_menu.ui.h:11 ../src/roster_window.py:5687
+#: ../src/roster_window.py:5832
 msgid "In_vite to"
 msgstr "邀请到(_V)"
 
-#: ../data/gui/contact_context_menu.ui.h:7
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Invite _Contacts"
 msgstr "邀请联系人(_C)"
 
-#: ../data/gui/contact_context_menu.ui.h:8
-msgid "Remo_ve"
-msgstr "移除(_R)"
+#: ../data/gui/contact_context_menu.ui.h:6
+msgid "Toggle Open_PGP Encryption"
+msgstr "切换Open_PGP加密"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Toggle End to End Encryption"
+msgstr "切换E2E加密"
 
-#: ../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:8 ../src/gui_menu_builder.py:554
+#: ../src/roster_window.py:5695
 msgid "Send Cus_tom Status"
 msgstr "发送个性化状态(_T)"
 
+#. Execute Command
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/gui_menu_builder.py:574
+msgid "E_xecute Command..."
+msgstr "执行命令..."
+
 #: ../data/gui/contact_context_menu.ui.h:10
-msgid "Send Single _Message..."
-msgstr "发送单条消息...(_M)"
+#, fuzzy
+msgid "M_anage Contact"
+msgstr "管理联系人"
 
-#: ../data/gui/contact_context_menu.ui.h:11
-msgid "Send _File..."
-msgstr "发送文件(_F)..."
+#. Rename
+#: ../data/gui/contact_context_menu.ui.h:11 ../src/gui_menu_builder.py:595
+#: ../src/roster_window.py:5725
+msgid "_Rename..."
+msgstr "重命名(_R)"
 
-#: ../data/gui/contact_context_menu.ui.h:12
-msgid "Set Custom _Avatar..."
-msgstr "设置自定义头像(_A)"
+#. Edit Groups
+#: ../data/gui/contact_context_menu.ui.h:12 ../src/roster_window.py:5848
+msgid "Edit _Groups..."
+msgstr "编辑群组(_G)..."
 
 #: ../data/gui/contact_context_menu.ui.h:13
-msgid "Start _Chat"
-msgstr "开始聊天(_C)"
+msgid "Assign Open_PGP Key..."
+msgstr "指定 Open_PGP 密钥"
 
 #: ../data/gui/contact_context_menu.ui.h:14
-msgid "Toggle End to End Encryption"
-msgstr "切换E2E加密"
+msgid "Set Custom _Avatar..."
+msgstr "设置自定义头像(_A)"
 
 #: ../data/gui/contact_context_menu.ui.h:15
-msgid "Toggle Open_PGP Encryption"
-msgstr "切换Open_PGP加密"
+msgid "Add Special _Notification..."
+msgstr "添加特殊提示(_N)"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Subscription"
+msgstr "认证(_S)"
 
 #: ../data/gui/contact_context_menu.ui.h:17
-msgid "_Allow him/her to see my status"
-msgstr "允许他/她查看我的状态(_A)"
+#, fuzzy
+msgid "_Allow contact to see my status"
+msgstr "允许此联系人看到我的状态(_L)"
 
 #: ../data/gui/contact_context_menu.ui.h:18
-#: ../data/gui/gc_occupants_menu.ui.h:7 ../src/roster_window.py:5411
-#: ../src/roster_window.py:5537 ../src/roster_window.py:5667
-msgid "_Block"
-msgstr "屏蔽(_B)"
+#, fuzzy
+msgid "A_sk to see contact status"
+msgstr "要求查看他/她的状态(_S)"
 
 #: ../data/gui/contact_context_menu.ui.h:19
-msgid "_Forbid him/her to see my status"
+#, fuzzy
+msgid "_Forbid contact to see my status"
 msgstr "禁止他/她查看我的状态(_F)"
 
-#: ../data/gui/contact_context_menu.ui.h:20
-#: ../data/gui/gc_control_popup_menu.ui.h:6
-#: ../data/gui/gc_occupants_menu.ui.h:8 ../data/gui/roster_window.ui.h:22
-#: ../src/roster_window.py:5738
-msgid "_History"
-msgstr "历史(_H)"
-
 #: ../data/gui/contact_context_menu.ui.h:21
-msgid "_Ignore"
-msgstr "忽略(_I)"
+#: ../data/gui/gc_occupants_menu.ui.h:13 ../src/gui_menu_builder.py:609
+#: ../src/roster_window.py:5747 ../src/roster_window.py:5861
+msgid "_Block"
+msgstr "屏蔽(_B)"
 
 #: ../data/gui/contact_context_menu.ui.h:22
-msgid "_Manage Contact"
-msgstr "管理联系人"
+msgid "_Unignore"
+msgstr "取消忽略(_U)"
 
 #: ../data/gui/contact_context_menu.ui.h:23
-msgid "_Rename..."
-msgstr "重命名(_R)"
+msgid "_Ignore"
+msgstr "忽略(_I)"
 
-#: ../data/gui/contact_context_menu.ui.h:24
-msgid "_Subscription"
-msgstr "认证(_S)"
+#. Remove
+#. Remove group
+#: ../data/gui/contact_context_menu.ui.h:25 ../src/gui_menu_builder.py:617
+#: ../src/roster_window.py:5754
+msgid "Remo_ve"
+msgstr "移除(_R)"
 
 #: ../data/gui/contact_context_menu.ui.h:26
-msgid "_Unignore"
-msgstr "取消忽略(_U)"
+#: ../data/gui/gc_control_popup_menu.ui.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:15 ../data/gui/roster_window.ui.h:19
+#: ../src/roster_window.py:5927
+msgid "_History"
+msgstr "历史(_H)"
 
 #: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
@@ -1206,60 +1155,59 @@ msgid "Edit Groups"
 msgstr "编辑群组"
 
 #: ../data/gui/esession_info_window.ui.h:1
-msgid "(<b>ESession</b> info)"
-msgstr "<b>ESession</b>信息"
-
-#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "辨别(_V)"
 
+#: ../data/gui/features_window.ui.h:1
+msgid "Features"
+msgstr "特性"
+
 #: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Gajim 支持的特性列表</b>"
 
-#: ../data/gui/features_window.ui.h:3
-msgid "Features"
-msgstr "特性"
-
 #: ../data/gui/filetransfers.ui.h:1
-msgid "A list of active, completed and stopped file transfers"
-msgstr "正在传输, 传输完成和停止传输的文件列表"
+#, fuzzy
+msgid "Con_tinue"
+msgstr "继续(_C)"
 
 #: ../data/gui/filetransfers.ui.h:2
-msgid "Cancel file transfer"
-msgstr "取消文件传输"
+msgid "_Pause"
+msgstr "暂停(_P)"
 
 #: ../data/gui/filetransfers.ui.h:3
-msgid "Cancels the selected file transfer"
-msgstr "取消选定文件的传输"
+#: ../data/gui/service_registration_window.ui.h:2
+msgid "_Cancel"
+msgstr "取消(_C)"
 
-#: ../data/gui/filetransfers.ui.h:4
-msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "取消选定文件传输并删除未完成文件"
+#: ../data/gui/filetransfers.ui.h:4 ../src/chat_control.py:2029
+#: ../src/filetransfers_window.py:214
+msgid "_Open Containing Folder"
+msgstr "打开文件夹(_O)"
 
 #: ../data/gui/filetransfers.ui.h:5
-msgid "Clean _up"
-msgstr "清除(_U)"
-
-#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "文件传输"
 
+#: ../data/gui/filetransfers.ui.h:6
+msgid "file transfers list"
+msgstr "文件传输列表"
+
 #: ../data/gui/filetransfers.ui.h:7
-msgid "Hides the window"
-msgstr "隐藏该窗口"
+msgid "A list of active, completed and stopped file transfers"
+msgstr "正在传输, 传输完成和停止传输的文件列表"
 
 #: ../data/gui/filetransfers.ui.h:8
-msgid "Remove file transfer from the list."
-msgstr "从列表中移除文件传输。"
+msgid "Clean _up"
+msgstr "清除(_U)"
 
 #: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "从列表移除已完成, 已取消和失败的文件传输"
 
 #: ../data/gui/filetransfers.ui.h:10
-msgid "Shows a list of file transfers between you and others"
-msgstr "显示您与他人进行的传输文件列表"
+msgid "Remove file transfer from the list."
+msgstr "从列表中移除文件传输。"
 
 #: ../data/gui/filetransfers.ui.h:11
 msgid ""
@@ -1270,78 +1218,87 @@ msgstr ""
 "被移除"
 
 #: ../data/gui/filetransfers.ui.h:12
-msgid "When a file transfer is complete show a popup notification"
-msgstr "当文件传输完成时弹出提示"
+#, fuzzy
+msgid "Cancels the selected file transfer and removes incomplete files"
+msgstr "取消选定文件传输并删除未完成文件"
 
-#: ../data/gui/filetransfers.ui.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "继续(_C)"
+#: ../data/gui/filetransfers.ui.h:13
+msgid "Cancel file transfer"
+msgstr "取消文件传输"
 
 #: ../data/gui/filetransfers.ui.h:14
-msgid "_Notify me when a file transfer is complete"
-msgstr "文件传输完成时提醒我(_N)"
+msgid "Cancels the selected file transfer"
+msgstr "取消选定文件的传输"
 
-#: ../data/gui/filetransfers.ui.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "打开文件夹(_O)"
+#: ../data/gui/filetransfers.ui.h:15
+msgid "Hides the window"
+msgstr "隐藏该窗口"
 
 #: ../data/gui/filetransfers.ui.h:16
-msgid "_Pause"
-msgstr "暂停(_P)"
+msgid "_Notify me when a file transfer is complete"
+msgstr "文件传输完成时提醒我(_N)"
 
 #: ../data/gui/filetransfers.ui.h:17
-msgid "file transfers list"
-msgstr "文件传输列表"
+msgid "When a file transfer is complete show a popup notification"
+msgstr "当文件传输完成时弹出提示"
 
-#: ../data/gui/gajim_themes_window.ui.h:1
-msgid "<b>Chatstate Tab Colors</b>"
-msgstr "<b>各聊天状态下标签颜色</b>"
+#: ../data/gui/filetransfers.ui.h:18
+msgid "Shows a list of file transfers between you and others"
+msgstr "显示您与他人进行的传输文件列表"
 
-#: ../data/gui/gajim_themes_window.ui.h:2
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "Account row"
 msgstr "账户"
 
-#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:956
-msgid "Bold"
-msgstr "粗体"
+#: ../data/gui/gajim_themes_window.ui.h:2
+msgid "Group row"
+msgstr "群组"
+
+#: ../data/gui/gajim_themes_window.ui.h:3
+msgid "Contact row"
+msgstr "联系人"
 
 #: ../data/gui/gajim_themes_window.ui.h:4
 msgid "Chat Banner"
 msgstr "聊天窗口上方横幅"
 
 #: ../data/gui/gajim_themes_window.ui.h:5
-msgid "Composing"
-msgstr "正在编辑"
+msgid "Gajim Themes Customization"
+msgstr "Gajim 主题自定义"
 
 #: ../data/gui/gajim_themes_window.ui.h:6
-msgid "Contact row"
-msgstr "联系人"
+msgid "Text _color:"
+msgstr "文本颜色(_C): "
 
 #: ../data/gui/gajim_themes_window.ui.h:7
-msgid "Font style:"
-msgstr "字体风格: "
+msgid "_Background:"
+msgstr "背景(_B)"
 
 #: ../data/gui/gajim_themes_window.ui.h:8
-msgid "Gajim Themes Customization"
-msgstr "Gajim 主题自定义"
+msgid "Text _font:"
+msgstr "文本字体(_F): "
 
 #: ../data/gui/gajim_themes_window.ui.h:9
-msgid "Gone"
-msgstr "已离开"
-
-#: ../data/gui/gajim_themes_window.ui.h:10
-msgid "Group row"
-msgstr "群组"
+msgid "Font style:"
+msgstr "字体风格: "
 
-#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "未活动的"
 
-#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:957
-msgid "Italic"
-msgstr "斜体"
-
 #: ../data/gui/gajim_themes_window.ui.h:13
+msgid "Composing"
+msgstr "正在编辑"
+
+#: ../data/gui/gajim_themes_window.ui.h:14
+msgid "Paused"
+msgstr "暂停编辑"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid "Gone"
+msgstr "已离开"
+
+#: ../data/gui/gajim_themes_window.ui.h:16
 msgid ""
 "MUC\n"
 "Messages"
@@ -1349,7 +1306,7 @@ msgstr ""
 "多人聊天\n"
 "消息"
 
-#: ../data/gui/gajim_themes_window.ui.h:15
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1357,149 +1314,135 @@ msgstr ""
 "多人聊天指示性\n"
 "消息"
 
-#: ../data/gui/gajim_themes_window.ui.h:17
-msgid "Paused"
-msgstr "暂停编辑"
-
-#: ../data/gui/gajim_themes_window.ui.h:18
-msgid "Text _color:"
-msgstr "文本颜色(_C): "
-
-#: ../data/gui/gajim_themes_window.ui.h:19
-msgid "Text _font:"
-msgstr "文本字体(_F): "
-
 #: ../data/gui/gajim_themes_window.ui.h:20
-msgid "_Background:"
-msgstr "背景(_B)"
+msgid "<b>Chatstate Tab Colors</b>"
+msgstr "<b>各聊天状态下标签颜色</b>"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "Change _Nickname..."
 msgstr "更改昵称(_N)"
 
 #: ../data/gui/gc_control_popup_menu.ui.h:2
+msgid "_Manage Room"
+msgstr "管理聊天室(_M)"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:3
 msgid "Change _Subject..."
 msgstr "更改主题(_S)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:3
+#: ../data/gui/gc_control_popup_menu.ui.h:4
 msgid "Configure _Room..."
 msgstr "设置聊天室(_R)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:4 ../src/disco.py:1800
-msgid "_Bookmark"
-msgstr "将本聊天室加入书签(_B)"
-
 #: ../data/gui/gc_control_popup_menu.ui.h:5
 msgid "_Destroy Room"
 msgstr "删除聊天室(_D)"
 
-#: ../data/gui/gc_control_popup_menu.ui.h:7
-msgid "_Manage Room"
-msgstr "管理聊天室(_M)"
-
-#: ../data/gui/gc_control_popup_menu.ui.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:6
 msgid "_Minimize on close"
 msgstr "关闭时最小化窗口"
 
+#: ../data/gui/gc_control_popup_menu.ui.h:7
+#, fuzzy
+msgid "_Request Voice"
+msgstr "语音(_V)"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:8 ../src/disco.py:1803
+msgid "_Bookmark"
+msgstr "将本聊天室加入书签(_B)"
+
+#: ../data/gui/gc_control_popup_menu.ui.h:10 ../src/roster_window.py:5919
+msgid "_Disconnect"
+msgstr "断开连接(_D)"
+
 #: ../data/gui/gc_occupants_menu.ui.h:1
-msgid "Mo_derator"
-msgstr "仲裁人(_D)"
+msgid "_Send Private Message"
+msgstr "发送私聊消息(_S)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:2
-msgid "Occupant Actions"
-msgstr "房主动作"
-
-#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "Send _File"
 msgstr "发送文件(_F)"
 
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "Occupant Actions"
+msgstr "房主动作"
+
 #: ../data/gui/gc_occupants_menu.ui.h:4
-msgid "_Add to Roster"
-msgstr "添加至联系人列表(_A)"
+msgid "_Voice"
+msgstr "语音(_V)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "Mo_derator"
+msgstr "仲裁人(_D)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "成员(_M)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Admin"
 msgstr "管理(_A)"
 
-#: ../data/gui/gc_occupants_menu.ui.h:6
-msgid "_Ban"
-msgstr "封禁(_B)"
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Owner"
+msgstr "所有人(_O)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:9
 msgid "_Kick"
 msgstr "踢除(_K)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:10
-msgid "_Member"
-msgstr "成员(_M)"
-
-#: ../data/gui/gc_occupants_menu.ui.h:11
-msgid "_Owner"
-msgstr "所有人(_O)"
+msgid "_Ban"
+msgstr "封禁(_B)"
 
 #: ../data/gui/gc_occupants_menu.ui.h:12
-msgid "_Send Private Message"
-msgstr "发送私聊消息(_S)"
-
-#: ../data/gui/gc_occupants_menu.ui.h:14
-msgid "_Voice"
-msgstr "语音(_V)"
+msgid "_Add to Roster"
+msgstr "添加至联系人列表(_A)"
 
-#: ../data/gui/groupchat_control.ui.h:1
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "将本聊天室加入书签(Ctrl+B)"
+#: ../data/gui/groupchat_control.ui.h:2 ../src/chat_control.py:365
+msgid "Show a list of formattings"
+msgstr "显示格式列表(Alt+M)"
 
 #: ../data/gui/groupchat_control.ui.h:3
+msgid "Change your nickname (Ctrl+N)"
+msgstr "更改您的昵称(Ctrl+N)"
+
+#: ../data/gui/groupchat_control.ui.h:4
 msgid "Change the room's subject (Alt+T)"
 msgstr "更改本聊天室主题(Alt+T)"
 
-#: ../data/gui/groupchat_control.ui.h:4
-msgid "Change your nickname (Ctrl+N)"
-msgstr "更改您的昵称(Ctrl+N)"
+#: ../data/gui/groupchat_control.ui.h:5
+msgid "Bookmark this room (Ctrl+B)"
+msgstr "将本聊天室加入书签(Ctrl+B)"
 
 #: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "创建新消息"
 
 #: ../data/gui/groups_post_window.ui.h:2
-#: ../data/gui/single_message_window.ui.h:2
+#: ../data/gui/single_message_window.ui.h:1
 msgid "From:"
 msgstr "从: "
 
 #: ../data/gui/groups_post_window.ui.h:3
-#: ../data/gui/single_message_window.ui.h:7
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Subject:"
 msgstr "主题: "
 
 #: ../data/gui/history_manager.ui.h:1
-msgid ""
-"<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. "
-"Generally avoid deletions with contacts you currently chat with."
-msgstr ""
-"<b>警告: </b>\n"
-"如果您要进行大量的删除, 请确认 Gajim 不再运行。\n"
-"通常, 如果您正在与某个联系人聊天, 请不要删除与他的聊天记录。"
-
-#: ../data/gui/history_manager.ui.h:3
-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
-msgid "Export"
+#, fuzzy
+msgid "_Export"
 msgstr "导出"
 
-#: ../data/gui/history_manager.ui.h:6
+#: ../data/gui/history_manager.ui.h:2
 msgid "Gajim History Logs Manager"
 msgstr "Gajim 历史记录管理器"
 
-#: ../data/gui/history_manager.ui.h:7
+#: ../data/gui/history_manager.ui.h:3
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "<big><b>欢迎使用 Gajim 历史记录管理器</b></big>"
+
+#: ../data/gui/history_manager.ui.h:4
 msgid ""
 "This log manager is not intended for log viewing. If you are looking for "
 "such functionality, use the history window instead.\n"
@@ -1512,165 +1455,176 @@ msgstr ""
 "\n"
 "使用这个程序来删除或导出历史记录。您可以在左侧进行选择且/或在下方进行搜索。"
 
-#: ../data/gui/history_manager.ui.h:10
+#: ../data/gui/history_manager.ui.h:7
+msgid ""
+"<b>WARNING:</b>\n"
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
+msgstr ""
+"<b>警告: </b>\n"
+"如果您要进行大量的删除, 请确认 Gajim 不再运行。\n"
+"通常, 如果您正在与某个联系人聊天, 请不要删除与他的聊天记录。"
+
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "搜索数据库(_S)"
 
-#: ../data/gui/history_window.ui.h:1
-msgid "All Chat Histories"
-msgstr "所有聊天历史"
-
-#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
+#: ../data/gui/history_window.ui.h:1 ../src/history_window.py:337
 msgid "Conversation History"
 msgstr "对话历史"
 
+#: ../data/gui/history_window.ui.h:2
+msgid "Search:"
+msgstr "查找: "
+
 #: ../data/gui/history_window.ui.h:3
-msgid "Enter JID or Contact name"
-msgstr "输入 JID 或者联系人名"
+msgid "_In date search"
+msgstr ""
 
 #: ../data/gui/history_window.ui.h:4
-msgid "Groupchat Histories"
-msgstr "多人聊天历史"
+msgid "Searching only in the selected day "
+msgstr ""
 
 #: ../data/gui/history_window.ui.h:5
-msgid "Search:"
-msgstr "查找: "
-
-#: ../data/gui/history_window.ui.h:6
-#: ../data/gui/zeroconf_information_window.ui.h:10
+#: ../data/gui/zeroconf_information_window.ui.h:5
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
 
-#: ../data/gui/item_archiving_preferences_window.ui.h:1
-msgid "approve"
-msgstr "approve"
+#: ../data/gui/history_window.ui.h:6
+#, fuzzy
+msgid "_Show status changes"
+msgstr "记录联系人状态变化(_L)"
 
-#: ../data/gui/item_archiving_preferences_window.ui.h:2
+#: ../data/gui/item_archiving_preferences_window.ui.h:1
 msgid "body"
 msgstr "body"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:2
+msgid "false"
+msgstr "false"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:3
-msgid "concede"
-msgstr "concede"
+#: ../src/common/connection_handlers.py:1221
+msgid "message"
+msgstr "message"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:4
-msgid "expire"
-msgstr "expire"
+msgid "stream"
+msgstr "stream"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:5
-msgid "false"
-msgstr "false"
+msgid "approve"
+msgstr "approve"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:6
-msgid "forbid"
-msgstr "forbid"
+msgid "concede"
+msgstr "concede"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:7
-#: ../src/gajim-remote-plugin.py:213 ../src/gajim-remote.py:229
-msgid "jid"
-msgstr "jid"
+msgid "forbid"
+msgstr "forbid"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:8
-#: ../src/gajim-remote-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
-msgid "message"
-msgstr "message"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:9
 msgid "oppose"
 msgstr "oppose"
 
-#: ../data/gui/item_archiving_preferences_window.ui.h:10
-msgid "otr"
-msgstr "otr"
-
-#: ../data/gui/item_archiving_preferences_window.ui.h:11
+#: ../data/gui/item_archiving_preferences_window.ui.h:9
 msgid "prefer"
 msgstr "prefer"
 
-#: ../data/gui/item_archiving_preferences_window.ui.h:12
+#: ../data/gui/item_archiving_preferences_window.ui.h:10
 msgid "require"
 msgstr "require"
 
+#: ../data/gui/item_archiving_preferences_window.ui.h:11
+#: ../src/gajim-remote.py:231
+msgid "jid"
+msgstr "jid"
+
+#: ../data/gui/item_archiving_preferences_window.ui.h:12
+msgid "expire"
+msgstr "expire"
+
 #: ../data/gui/item_archiving_preferences_window.ui.h:13
-msgid "save"
-msgstr "save"
+msgid "otr"
+msgstr "otr"
 
 #: ../data/gui/item_archiving_preferences_window.ui.h:14
-msgid "stream"
-msgstr "stream"
-
-#: ../data/gui/join_groupchat_window.ui.h:2
-msgid "Bro_wse Rooms"
-msgstr "Bro_wse Rooms"
+msgid "save"
+msgstr "save"
 
-#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2198
+#: ../data/gui/join_groupchat_window.ui.h:1 ../src/dialogs.py:2461
 msgid "Join Group Chat"
 msgstr "加入多人聊天"
 
-#: ../data/gui/join_groupchat_window.ui.h:4
-msgid "Join this room _automatically when I connect"
-msgstr "当我连接后自动加入此聊天室(_A)"
+#: ../data/gui/join_groupchat_window.ui.h:3
+msgid "Recently:"
+msgstr "最近: "
 
-#: ../data/gui/join_groupchat_window.ui.h:5
-#: ../data/gui/manage_bookmarks_window.ui.h:5
+#: ../data/gui/join_groupchat_window.ui.h:4
 msgid "Nickname:"
 msgstr "昵称: "
 
-#: ../data/gui/join_groupchat_window.ui.h:6
-#: ../data/gui/manage_bookmarks_window.ui.h:6
-msgid "Password:"
-msgstr "密码: "
-
-#: ../data/gui/join_groupchat_window.ui.h:7
-msgid "Recently:"
-msgstr "最近: "
-
-#: ../data/gui/join_groupchat_window.ui.h:8
-#: ../data/gui/manage_bookmarks_window.ui.h:8
+#: ../data/gui/join_groupchat_window.ui.h:5
 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:6 ../src/config.py:1870
 msgid "Server:"
 msgstr "服务器: "
 
-#: ../data/gui/join_groupchat_window.ui.h:10
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Password:"
+msgstr "密码: "
+
+#: ../data/gui/join_groupchat_window.ui.h:8
 msgid "_Bookmark this room"
 msgstr "将本聊天室加入书签(_B)"
 
-#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1359
-#: ../src/disco.py:1804
+#: ../data/gui/join_groupchat_window.ui.h:9
+msgid "Join this room _automatically when I connect"
+msgstr "当我连接后自动加入此聊天室(_A)"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+msgid "Bro_wse Rooms"
+msgstr "Bro_wse Rooms"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/chat_control.py:2060
+#: ../src/disco.py:1807
 msgid "_Join"
 msgstr "加入(_J)"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:1
-msgid "Auto join"
-msgstr "自动加入"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:2
-msgid "If checked, Gajim will join this group chat on startup"
-msgstr "如果选定, Gajim 会在启动时加入此聊天室"
-
-#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "书签管理"
 
+#: ../data/gui/manage_bookmarks_window.ui.h:2
+#, fuzzy
+msgid "_Title:"
+msgstr "标题: "
+
 #: ../data/gui/manage_bookmarks_window.ui.h:4
-msgid "Minimize on Auto Join"
-msgstr "自动加入时最小化"
+msgid "Roo_m:"
+msgstr ""
 
 #: ../data/gui/manage_bookmarks_window.ui.h:7
-msgid "Print status:"
-msgstr "显示状态: "
+#, fuzzy
+msgid "A_uto join"
+msgstr "自动加入"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "If checked, Gajim will join this group chat on startup"
+msgstr "如果选定, Gajim 会在启动时加入此聊天室"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:9
+#, fuzzy
+msgid "Minimi_ze on Auto Join"
+msgstr "自动加入时最小化"
 
 #: ../data/gui/manage_bookmarks_window.ui.h:10
-msgid "Title:"
-msgstr "标题: "
+#, fuzzy
+msgid "Pr_int status:"
+msgstr "显示状态: "
 
 #: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
@@ -1681,131 +1635,122 @@ msgid "_Configure"
 msgstr "配置(_C)"
 
 #: ../data/gui/manage_proxies_window.ui.h:1
-msgid "<b>Properties</b>"
-msgstr "<b>属性</b>"
+msgid "HTTP Connect"
+msgstr "HTTP 连接"
 
 #: ../data/gui/manage_proxies_window.ui.h:2
-msgid "<b>Settings</b>"
-msgstr "<b>设置</b>"
+msgid "SOCKS5"
+msgstr "SOCKS5"
 
 #: ../data/gui/manage_proxies_window.ui.h:3
 msgid "BOSH"
 msgstr "BOSH"
 
 #: ../data/gui/manage_proxies_window.ui.h:4
-msgid "HTTP Connect"
-msgstr "HTTP 连接"
-
-#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "管理代理服务器设置"
 
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "_Name:"
+msgstr "名称(_N): "
+
 #: ../data/gui/manage_proxies_window.ui.h:6
-msgid "Pass_word:"
-msgstr "密码(_W)"
+msgid "_Type:"
+msgstr "类型(_T): "
 
 #: ../data/gui/manage_proxies_window.ui.h:7
-msgid "Proxy _Host:"
-msgstr "代理服务器地址(_H): "
+msgid "<b>Properties</b>"
+msgstr "<b>属性</b>"
 
 #: ../data/gui/manage_proxies_window.ui.h:8
-msgid "Proxy _Port:"
-msgstr "代理服务器端口(_P): "
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
 
 #: ../data/gui/manage_proxies_window.ui.h:9
-msgid "SOCKS5"
-msgstr "SOCKS5"
+msgid "Proxy _Host:"
+msgstr "代理服务器地址(_H): "
 
 #: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "使用 HTTP 代理(_Y)"
 
 #: ../data/gui/manage_proxies_window.ui.h:11
-msgid "Use proxy auth_entication"
-msgstr "代理服务器需要认证"
+msgid "Proxy _Port:"
+msgstr "代理服务器端口(_P): "
 
 #: ../data/gui/manage_proxies_window.ui.h:12
-msgid "_BOSH URL:"
-msgstr "_BOSH URL:"
+msgid "Use proxy auth_entication"
+msgstr "代理服务器需要认证"
 
 #: ../data/gui/manage_proxies_window.ui.h:13
-msgid "_Name:"
-msgstr "名称(_N): "
+msgid "_Username:"
+msgstr "用户名(_U): "
 
 #: ../data/gui/manage_proxies_window.ui.h:14
-msgid "_Type:"
-msgstr "类型(_T): "
+msgid "Pass_word:"
+msgstr "密码(_W)"
 
 #: ../data/gui/manage_proxies_window.ui.h:15
-msgid "_Username:"
-msgstr "用户名(_U): "
+msgid "<b>Settings</b>"
+msgstr "<b>设置</b>"
+
+#: ../data/gui/manage_sounds_window.ui.h:1
+#, fuzzy
+msgid "Manage sounds"
+msgstr "管理联系人(_M)"
 
 #: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "密文"
 
 #: ../data/gui/plugins_window.ui.h:1
-msgid "&lt;empty&gt;"
-msgstr "&lt;empty&gt;"
+msgid "Plugins"
+msgstr "插件"
 
 #: ../data/gui/plugins_window.ui.h:2
-msgid "<empty>"
-msgstr "<empty>"
+#, fuzzy
+msgid "Install from zip"
+msgstr "安装"
 
 #: ../data/gui/plugins_window.ui.h:3
-msgid "Authors:"
-msgstr "作者: "
+msgid "&lt;empty&gt;"
+msgstr "&lt;empty&gt;"
 
 #: ../data/gui/plugins_window.ui.h:4
-msgid "Available"
-msgstr "在线"
+msgid "Version:"
+msgstr "版本: "
 
 #: ../data/gui/plugins_window.ui.h:5
-msgid "Configure"
-msgstr "配置"
+msgid "Authors:"
+msgstr "作者: "
 
 #: ../data/gui/plugins_window.ui.h:6
-msgid "Descrition:"
-msgstr "描述: "
-
-#: ../data/gui/plugins_window.ui.h:7
 msgid "Homepage:"
 msgstr "主页: "
 
+#: ../data/gui/plugins_window.ui.h:7
+#, fuzzy
+msgid "Description:"
+msgstr "描述: "
+
 #: ../data/gui/plugins_window.ui.h:8
-msgid "Install"
-msgstr "安装"
+msgid "Uninstall"
+msgstr "卸载"
 
 #: ../data/gui/plugins_window.ui.h:9
+msgid "Configure"
+msgstr "配置"
+
+#: ../data/gui/plugins_window.ui.h:10
 msgid "Installed"
 msgstr "已安装"
 
-#: ../data/gui/plugins_window.ui.h:10
+#: ../data/gui/plugins_window.ui.h:11
 msgid ""
 "Plug-in decription should be displayed here. This text will be erased during "
 "PluginsWindow initialization."
 msgstr "插件的描述会被显示在这里。这些文字在插件窗口初始化时将被去除"
 
-#: ../data/gui/plugins_window.ui.h:11
-msgid "Plugins"
-msgstr "插件"
-
-#: ../data/gui/plugins_window.ui.h:12
-msgid "Uninstall"
-msgstr "卸载"
-
-#: ../data/gui/plugins_window.ui.h:13
-msgid "Version:"
-msgstr "版本: "
-
-#: ../data/gui/plugins_window.ui.h:14
-msgid "button"
-msgstr "按钮"
-
-#: ../data/gui/plugins_window.ui.h:15
-msgid "homepage url"
-msgstr "主页链接"
-
 #: ../data/gui/popup_notification_window.ui.h:1
 msgid "Event Type"
 msgstr "事件类型"
@@ -1815,1033 +1760,1052 @@ msgid "Event desc"
 msgstr "事件"
 
 #: ../data/gui/preferences_window.ui.h:1
-msgid "<b>Advanced Configuration Editor</b>"
-msgstr "<b>高级配置编辑器</b>"
+msgid "Use default applications"
+msgstr "使用默认的应用程序"
 
 #: ../data/gui/preferences_window.ui.h:2
-msgid "<b>Applications</b>"
-msgstr "<b>应用程序</b>"
+msgid "Custom"
+msgstr "自定义"
 
 #: ../data/gui/preferences_window.ui.h:3
-msgid "<b>Audio</b>"
-msgstr "<b>音频</b>"
+msgid "All chat states"
+msgstr "所有聊天状态"
 
 #: ../data/gui/preferences_window.ui.h:4
-msgid "<b>Auto Status</b>"
-msgstr "<b>自动调整状态</b>"
-
-#: ../data/gui/preferences_window.ui.h:5
-msgid "<b>Chat Appearance</b>"
-msgstr "<b>聊天窗口外观</b>"
+msgid "Composing only"
+msgstr "仅正在编辑"
 
-#: ../data/gui/preferences_window.ui.h:6
-msgid "<b>Chat Line Colors</b>"
-msgstr "<b>聊天窗口中文字颜色</b>"
+#: ../data/gui/preferences_window.ui.h:5 ../src/config.py:162
+#: ../src/config.py:654
+msgid "Disabled"
+msgstr "禁用"
 
 #: ../data/gui/preferences_window.ui.h:7
-msgid "<b>Chat state notifications</b>"
-msgstr "<b>聊天状态提示</b>"
+msgid "Only when pending events"
+msgstr "仅当有未处理的事件时"
 
-#: ../data/gui/preferences_window.ui.h:8
-msgid "<b>Connection</b>"
-msgstr "<b>连接</b>"
+#: ../data/gui/preferences_window.ui.h:9
+msgid "Pop it up"
+msgstr "弹出提示"
 
-#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:10
-msgid "<b>Custom</b>"
-msgstr "<b>自定义</b>"
+msgid "Notify me about it"
+msgstr "提醒我"
 
 #: ../data/gui/preferences_window.ui.h:11
-msgid "<b>Font</b>"
-msgstr "<b>字体</b>"
+msgid "Show only in roster"
+msgstr "只显示在联系人列表中"
 
 #: ../data/gui/preferences_window.ui.h:12
-msgid "<b>GMail Options</b>"
-msgstr "<b>GMail 选项</b>"
+msgid "Detached roster with detached chats"
+msgstr "聊天窗口与联系人列表分离, 且互相分离"
+
+#: ../data/gui/preferences_window.ui.h:13
+msgid "Detached roster with single chat"
+msgstr "单一聊天窗口, 与联系人列表分离"
 
 #: ../data/gui/preferences_window.ui.h:14
-msgid "<b>Preset Status Messages</b>"
-msgstr "<b>预设状态消息</b>"
+msgid "Single window for everything"
+msgstr "只使用单一窗口"
 
 #: ../data/gui/preferences_window.ui.h:15
-msgid "<b>Privacy</b>"
-msgstr "<b>隐私策略</b>"
+msgid "Detached roster with chat grouped by account"
+msgstr "聊天窗口与联系人列表分离, 依据账户分组"
 
 #: ../data/gui/preferences_window.ui.h:16
-msgid "<b>Roster Appearance</b>"
-msgstr "<b>联系人列表外观</b>"
+msgid "Detached roster with chat grouped by type"
+msgstr "聊天窗口与联系人列表分离, 依据类型分组"
+
+#: ../data/gui/preferences_window.ui.h:17
+#, fuzzy
+msgid "Last state"
+msgstr "最后状态: %s"
 
 #: ../data/gui/preferences_window.ui.h:18
-msgid "<b>Status Messages</b>"
-msgstr "<b>状态消息</b>"
+msgid "Preferences"
+msgstr "参数"
 
 #: ../data/gui/preferences_window.ui.h:19
-msgid "<b>Themes</b>"
-msgstr "<b>主题</b>"
+msgid "Display a_vatars of contacts in roster"
+msgstr "在联系人列表显示中联系人的头像(_V)"
 
 #: ../data/gui/preferences_window.ui.h:20
-msgid "<b>Video</b>"
-msgstr "<b>视频</b>"
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"如果选定, Gajim 会在联系人列表和多人聊天窗口中显示联系人列表中的联系人明细"
 
 #: ../data/gui/preferences_window.ui.h:21
-msgid "<b>Visual Notifications</b>"
-msgstr "<b>可视化提示</b>"
+msgid "Display status _messages of contacts in roster"
+msgstr "在联系人列表中显示联系人的状态信息(_M)"
 
 #: ../data/gui/preferences_window.ui.h:22
-msgid "<i>(example: stunserver.org)</i>"
-msgstr "<i>(例如: stunserver.org)</i>"
+#, fuzzy
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name, in roster window and in group chats"
+msgstr ""
+"如果选定, Gajim 会在联系人列表和多人聊天窗口中联系人名下方显示联系人状态消息"
 
 #: ../data/gui/preferences_window.ui.h:23
-msgid "Advanced"
-msgstr "高级"
+#, fuzzy
+msgid "Display e_xtra information of contacts in roster (mood, activity, ...)"
+msgstr "在联系人列表中显示联系人的位置信息(_L)"
 
 #: ../data/gui/preferences_window.ui.h:24
-msgid "Advanced..."
-msgstr "高级..."
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的心情。"
 
 #: ../data/gui/preferences_window.ui.h:25
-msgid "All chat states"
-msgstr "所有聊天状态"
+msgid "Sort contacts by status"
+msgstr "将联系人按状态排序"
 
 #: ../data/gui/preferences_window.ui.h:26
-msgid "Allow _OS information to be sent"
-msgstr "允许发送关于操作系统的信息(_O)"
+msgid "in _roster"
+msgstr "在联系人列表中(_R)"
 
 #: ../data/gui/preferences_window.ui.h:27
-msgid "Allow my _idle time to be sent"
-msgstr "允许发送关于闲置时间的信息(_I)"
+msgid "in _group chats"
+msgstr "在多人聊天窗口中(_G)"
 
 #: ../data/gui/preferences_window.ui.h:28
-msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "允许弹出提示, 当我离开/不可用/忙/隐身(_A)"
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>联系人列表外观</b>"
 
 #: ../data/gui/preferences_window.ui.h:29
-msgid "Allow sound when I'm _busy"
-msgstr "在我忙碌时允许播放声音(_B)"
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr "如果不禁用, Gajim 会用相应的动态或静态的图形代替字符表情, 例如':)'"
 
 #: ../data/gui/preferences_window.ui.h:30
-msgid "Always"
-msgstr "总是"
+msgid "_Emoticons:"
+msgstr "表情(_E): "
 
 #: ../data/gui/preferences_window.ui.h:31
-msgid "Ask status message when I:"
-msgstr "询问状态消息, 当我: "
+msgid "_Window behavior:"
+msgstr "窗口行为(_W)"
 
-#: ../data/gui/preferences_window.ui.h:32 ../src/features_window.py:105
-msgid "Audio / Video"
-msgstr "音频/视频"
+#: ../data/gui/preferences_window.ui.h:32
+msgid "_Show roster on startup:"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:33
-msgid "Audio input device"
-msgstr "音频输入设备"
+msgid "Ma_ke message windows compact"
+msgstr "使消息窗口紧凑(_K)"
 
 #: ../data/gui/preferences_window.ui.h:34
-msgid "Audio output device"
-msgstr "音频输出设备"
+msgid "Hide all buttons in chat windows"
+msgstr "在聊天窗口中隐藏所有按钮"
 
 #: ../data/gui/preferences_window.ui.h:35
-msgid "Chat message:"
-msgstr "聊天消息: "
+msgid "_Ignore rich content in incoming messages"
+msgstr "忽略收到的消息中的富文本内容(_I)"
 
 #: ../data/gui/preferences_window.ui.h:36
-msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "在启动是检测 Gajim 是否是默认的 Jabber 客户端程序"
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"一些消息会包含丰富的内容(例如格式, 颜色等)。如果选定, Gajim 将显示原本的消息"
+"内容。"
 
 #: ../data/gui/preferences_window.ui.h:37
-msgid "Composing only"
-msgstr "仅正在编辑"
+msgid "_Highlight misspelled words"
+msgstr "拼写检查(_H)"
 
 #: ../data/gui/preferences_window.ui.h:38
-msgid "Configure color and font of the interface"
-msgstr "配置界面颜色与字体"
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+"如果选定, Gajim 会在聊天窗口中将编辑框中的拼写错误高亮显示。如果没有通\n"
+"过在编辑框点击右键的方式显式设定语言, 联系人或聊天室的默认语言将被\n"
+"使用。"
 
 #: ../data/gui/preferences_window.ui.h:39
-msgid "Contact's message:"
-msgstr "联系人消息: "
+#, fuzzy
+msgid "Show icon when your messages are received"
+msgstr "收到任意多人聊天消息播放的声音。"
 
 #: ../data/gui/preferences_window.ui.h:40
-msgid "Contact's nickname:"
-msgstr "联系人昵称"
+msgid "Show avatar in chat tabs"
+msgstr ""
 
 #: ../data/gui/preferences_window.ui.h:41
-msgid "Custom"
-msgstr "自定义"
-
-#: ../data/gui/preferences_window.ui.h:42
-msgid "Detached roster with chat grouped by account"
-msgstr "聊天窗口与联系人列表分离, 依据账户分组"
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>聊天窗口外观</b>"
 
 #: ../data/gui/preferences_window.ui.h:43
-msgid "Detached roster with chat grouped by type"
-msgstr "聊天窗口与联系人列表分离, 依据类型分组"
+msgid "When new event is received:"
+msgstr "当收到新的事件: "
 
 #: ../data/gui/preferences_window.ui.h:44
-msgid "Detached roster with detached chats"
-msgstr "聊天窗口与联系人列表分离, 且互相分离"
+msgid "Notify me about contacts that sign _in"
+msgstr "提醒我联系人登录(_I)"
 
 #: ../data/gui/preferences_window.ui.h:45
-msgid "Detached roster with single chat"
-msgstr "单一聊天窗口, 与联系人列表分离"
+msgid "Notify me about contacts that sign _out"
+msgstr "提醒我联系人登出(_O)"
 
-#: ../data/gui/preferences_window.ui.h:46 ../src/config.py:170
-#: ../src/config.py:665
-msgid "Disabled"
-msgstr "禁用"
+#: ../data/gui/preferences_window.ui.h:46
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚离开的联系人"
 
 #: ../data/gui/preferences_window.ui.h:47
-msgid "Display _activity of contacts in roster"
-msgstr "在联系人列表中显示联系人的活动(_A)"
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "允许弹出提示, 当我离开/不可用/忙/隐身(_A)"
 
 #: ../data/gui/preferences_window.ui.h:48
-msgid "Display _extra email details"
-msgstr "显示额外的邮件信息(_E)"
+#, fuzzy
+msgid "Allow popup/notifications when a chat window is opened"
+msgstr "允许弹出提示, 当我离开/不可用/忙/隐身(_A)"
 
 #: ../data/gui/preferences_window.ui.h:49
-msgid "Display _location of contacts in roster"
-msgstr "在联系人列表中显示联系人的位置信息(_L)"
+msgid "Notify on new _GMail email"
+msgstr "新 Gmail 邮件通知"
 
 #: ../data/gui/preferences_window.ui.h:50
-msgid "Display _tunes of contacts in roster"
-msgstr "在联系人列表中显示联系人正在播放音乐的信息(_T)"
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr "如果选中, Gajim 在 GMail 收到新的电子邮件是会显示一个通知"
 
 #: ../data/gui/preferences_window.ui.h:51
-msgid "Display a_vatars of contacts in roster"
-msgstr "在联系人列表显示中联系人的头像(_V)"
+msgid "Display _extra email details"
+msgstr "显示额外的邮件信息(_E)"
 
 #: ../data/gui/preferences_window.ui.h:52
-msgid "Display m_ood of contacts in roster"
-msgstr "在联系人列表中显示联系人的心情(_O)"
+#, fuzzy
+msgid ""
+"If checked, Gajim will also include information about the sender of new "
+"emails"
+msgstr "如果选中, Gajim 将同时包含新电子邮件发送者的信息"
 
 #: ../data/gui/preferences_window.ui.h:53
-msgid "Display status _messages of contacts in roster"
-msgstr "在联系人列表中显示联系人的状态信息(_M)"
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail 选项</b>"
 
 #: ../data/gui/preferences_window.ui.h:54
-msgid ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"display in chat windows."
-msgstr ""
-"Gajim 可以收发您与联系人正在进行对话的相关信息。此处您可以指定您想在聊天\n"
-"窗口中显示的聊天状态信息。"
+msgid "Show notification area icon:"
+msgstr "在通知区域显示图标: "
 
 #: ../data/gui/preferences_window.ui.h:55
-msgid ""
-"Gajim can send and receive meta-information related to a conversation you "
-"may have with a contact. Here you can specify which chatstates you want to "
-"send to the other party."
-msgstr ""
-"Gajim 可以收发您与联系人正在进行对话的相关信息。此处您可以指定要发给第三方的"
-"聊天状态信息。"
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>可视化提示</b>"
 
 #: ../data/gui/preferences_window.ui.h:56
-msgid ""
-"Gajim will notify you via a popup window in the bottom right of the screen "
-"about contacts that just signed out"
-msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚离开的联系人"
+msgid "Play _sounds"
+msgstr "播放声音(_S)"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "Ma_nage..."
+msgstr "管理...(_N)"
 
 #: ../data/gui/preferences_window.ui.h:58
-msgid "Hide all buttons in chat windows"
-msgstr "在聊天窗口中隐藏所有按钮"
+msgid "Allow sound when I'm _busy"
+msgstr "在我忙碌时允许播放声音(_B)"
 
 #: ../data/gui/preferences_window.ui.h:59
-msgid ""
-"If checked, Gajim will allow others to detect the operation system you are "
-"using"
-msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
+msgid "<b>Sounds</b>"
+msgstr "<b>声音</b>"
 
 #: ../data/gui/preferences_window.ui.h:60
-msgid ""
-"If checked, Gajim will also include information about the sender of the new "
-"emails"
-msgstr "如果选中, Gajim 将同时包含新电子邮件发送者的信息"
+msgid "Notifications"
+msgstr "通知"
 
 #: ../data/gui/preferences_window.ui.h:61
 msgid ""
-"If checked, Gajim will change status to Away when the computer is unused."
-msgstr "如果选定, Gajim 在计算机空闲时会将您的状态设置为离开。"
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim 可以收发您与联系人正在进行对话的相关信息。此处您可以指定您想在聊天\n"
+"窗口中显示的聊天状态信息。"
 
 #: ../data/gui/preferences_window.ui.h:62
-msgid ""
-"If checked, Gajim will change status to Not Available when the computer has "
-"not been used even longer"
-msgstr "如果选定, Gajim 会在计算机空闲更长时间后将您的状态设置为离开很久了。"
+msgid "_Display chat state notifications:"
+msgstr "显示聊天状态信息(_D): "
 
 #: ../data/gui/preferences_window.ui.h:63
 msgid ""
-"If checked, Gajim will display avatars of contacts in roster window and in "
-"group chats"
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
 msgstr ""
-"如果选定, Gajim 会在联系人列表和多人聊天窗口中显示联系人列表中的联系人明细"
+"Gajim 可以收发您与联系人正在进行对话的相关信息。此处您可以指定要发给第三方的"
+"聊天状态信息。"
 
 #: ../data/gui/preferences_window.ui.h:64
-msgid ""
-"If checked, Gajim will display status messages of contacts under the contact "
-"name in roster window and in group chats"
-msgstr ""
-"如果选定, Gajim 会在联系人列表和多人聊天窗口中联系人名下方显示联系人状态消息"
+msgid "_Send chat state notifications:"
+msgstr "发送聊天状态信息(_S): "
 
 #: ../data/gui/preferences_window.ui.h:65
-msgid ""
-"If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的活动。"
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>聊天状态提示</b>"
 
 #: ../data/gui/preferences_window.ui.h:66
-msgid ""
-"If checked, Gajim will display the location of contacts in the roster window"
-msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的位置。"
+msgid "Personal Events"
+msgstr "个人事件"
 
 #: ../data/gui/preferences_window.ui.h:67
-msgid ""
-"If checked, Gajim will display the mood of contacts in the roster window"
-msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的心情。"
+msgid "_Away after:"
+msgstr "在此时间后设置状态为离开(_A): "
 
 #: ../data/gui/preferences_window.ui.h:68
 msgid ""
-"If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人正在播放的音乐。"
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr "如果选定, Gajim 在计算机空闲时会将您的状态设置为离开。"
 
 #: ../data/gui/preferences_window.ui.h:69
-msgid ""
-"If checked, Gajim will 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"
-"使用。"
+msgid "_Not available after:"
+msgstr "在此时间后设置状态为离开很久了(_N): "
 
 #: ../data/gui/preferences_window.ui.h:70
 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 会忽略未认证的联系人引发的事件。请谨慎使用, 因为这将屏蔽所有"
-"不在联系人列表中的联系人发来的消息。"
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr "如果选定, Gajim 会在计算机空闲更长时间后将您的状态设置为离开很久了。"
 
 #: ../data/gui/preferences_window.ui.h:71
-msgid ""
-"If checked, Gajim will 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 不会记录。"
+msgid "minutes"
+msgstr "分钟"
 
 #: ../data/gui/preferences_window.ui.h:72
 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
-msgid ""
-"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
-"from MSN will have the equivalent msn icon for status online, away, busy, "
-"etc...)"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-away timeout"
 msgstr ""
-"如果选中, Gajim 会以协议特定的方式显示状态图标。(例如, MSN 联系人会以同\n"
-"MSN 相同的图标显示在线, 离开, 忙, 等等状态...)"
-
-#: ../data/gui/preferences_window.ui.h:74
-msgid ""
-"If enabled, Gajim will not ask for a status message. The specified default "
-"message will be used instead."
-msgstr "如果选中, Gajim 不会询问状态消息, 而使用特定的默认消息。"
+"离开状态的自动消息。如果为空, Gajim 不会改变当前的状态消息\n"
+"$S会被上个状态消息替换\n"
+"$T会被自动离开的超时时间替换"
 
 #: ../data/gui/preferences_window.ui.h:75
 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:76
-msgid "Log _encrypted chat session"
-msgstr "记录加密的会话(_E)"
-
-#: ../data/gui/preferences_window.ui.h:77
-msgid "Ma_ke message windows compact"
-msgstr "使消息窗口紧凑(_K)"
+"The auto not available status message. If empty, Gajim will not change the "
+"current status message\n"
+"$S will be replaced by previous status message\n"
+"$T will be replaced by auto-not-available timeout"
+msgstr ""
+"离开很久了的自动消息。如果为空, Gajim 不会改变当前的状态消息\n"
+"$S会被上个状态消息替换\n"
+"$T会被自动不可用的超时时间替换"
 
 #: ../data/gui/preferences_window.ui.h:78
-msgid "Ma_nage..."
-msgstr "管理...(_N)"
+#, fuzzy
+msgid "12"
+msgstr "1"
 
 #: ../data/gui/preferences_window.ui.h:79
-msgid "Never"
-msgstr "从不"
+#, fuzzy
+msgid "20"
+msgstr "2"
 
 #: ../data/gui/preferences_window.ui.h:80
-msgid "Notifications"
-msgstr "通知"
+msgid "<b>Auto Status</b>"
+msgstr "<b>自动调整状态</b>"
 
 #: ../data/gui/preferences_window.ui.h:81
-msgid "Notify me about contacts that sign _in"
-msgstr "提醒我联系人登录(_I)"
+msgid "Ask status message when I:"
+msgstr "询问状态消息, 当我: "
 
 #: ../data/gui/preferences_window.ui.h:82
-msgid "Notify me about contacts that sign _out"
-msgstr "提醒我联系人登出(_O)"
+msgid "Sign _in"
+msgstr "登录(I)"
 
 #: ../data/gui/preferences_window.ui.h:83
-msgid "Notify me about it"
-msgstr "提醒我"
+msgid "Sign _out"
+msgstr "退出登录(_O)"
 
 #: ../data/gui/preferences_window.ui.h:84
-msgid "Notify on new _GMail email"
-msgstr "新 Gmail 邮件通知"
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr "如果选中, Gajim 不会询问状态消息, 而使用特定的默认消息。"
 
 #: ../data/gui/preferences_window.ui.h:85
-msgid "Only when pending events"
-msgstr "仅当有未处理的事件时"
+msgid "Status"
+msgstr "状态"
 
 #: ../data/gui/preferences_window.ui.h:86
-msgid "Personal Events"
-msgstr "个人事件"
+msgid "Default Message"
+msgstr "默认消息"
 
 #: ../data/gui/preferences_window.ui.h:87
-msgid "Play _sounds"
-msgstr "播放声音(_S)"
+msgid "Enabled"
+msgstr "启用"
 
 #: ../data/gui/preferences_window.ui.h:88
-msgid "Pop it up"
-msgstr "弹出提示"
+msgid "<b>Status Messages</b>"
+msgstr "<b>状态消息</b>"
 
 #: ../data/gui/preferences_window.ui.h:89
-msgid "Preferences"
-msgstr "参数"
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>预设状态消息</b>"
 
 #: ../data/gui/preferences_window.ui.h:90
-msgid ""
-"STUN server hostname. If none given, Gajim will try\n"
-"to discover one from server."
-msgstr "STUN 服务器的主机名。如果没有给出, Gajim 会尝试从服务器上发现一个。"
+msgid "Chat message:"
+msgstr "聊天消息: "
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "Use system _default"
+msgstr "使用系统默认(_D)"
 
 #: ../data/gui/preferences_window.ui.h:92
-msgid "STUN server:"
-msgstr "STUN 服务器: "
+msgid "<b>Font</b>"
+msgstr "<b>字体</b>"
 
 #: ../data/gui/preferences_window.ui.h:93
-msgid "Show notification area icon:"
-msgstr "在通知区域显示图标: "
+msgid "T_heme:"
+msgstr "主题: (_H)"
 
 #: ../data/gui/preferences_window.ui.h:94
-msgid "Show only in roster"
-msgstr "只显示在联系人列表中"
+msgid "Status _iconset:"
+msgstr "状态图标集(_I): "
 
 #: ../data/gui/preferences_window.ui.h:95
-msgid "Sign _in"
-msgstr "登录(I)"
+msgid "Use _transports icons"
+msgstr "使用代理的图标设定(_T)"
 
 #: ../data/gui/preferences_window.ui.h:96
-msgid "Sign _out"
-msgstr "退出登录(_O)"
+#, fuzzy
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (e.g. A contact "
+"from ICQ will have the equivalent ICQ icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"如果选中, Gajim 会以协议特定的方式显示状态图标。(例如, MSN 联系人会以同\n"
+"MSN 相同的图标显示在线, 离开, 忙, 等等状态...)"
 
 #: ../data/gui/preferences_window.ui.h:97
-msgid "Single window for everything"
-msgstr "只使用单一窗口"
+msgid "Configure color and font of the interface"
+msgstr "配置界面颜色与字体"
 
 #: ../data/gui/preferences_window.ui.h:98
-msgid ""
-"Some messages may include rich content (formatting, colors etc). If checked, "
-"Gajim will just display the raw message text."
-msgstr ""
-"一些消息会包含丰富的内容(例如格式, 颜色等)。如果选定, Gajim 将显示原本的消息"
-"内容。"
+msgid "<b>Themes</b>"
+msgstr "<b>主题</b>"
 
 #: ../data/gui/preferences_window.ui.h:99
-msgid "Sort contacts by status"
-msgstr "将联系人按状态排序"
+msgid "Contact's nickname:"
+msgstr "联系人昵称"
 
-#: ../data/gui/preferences_window.ui.h:100 ../src/config.py:391
-msgid "Status"
-msgstr "状态"
+#: ../data/gui/preferences_window.ui.h:100
+msgid "Contact's message:"
+msgstr "联系人消息: "
 
 #: ../data/gui/preferences_window.ui.h:101
-msgid "Status _iconset:"
-msgstr "状态图标集(_I): "
+msgid "_Status message:"
+msgstr "状态消息: (_S)"
 
 #: ../data/gui/preferences_window.ui.h:102
-msgid "Style"
-msgstr "风格"
+#, fuzzy
+msgid "Group chat highlight:"
+msgstr "多人聊天消息突出显示"
 
 #: ../data/gui/preferences_window.ui.h:103
-msgid "T_heme:"
-msgstr "主题: (_H)"
+msgid "Your nickname:"
+msgstr "您的昵称: "
 
 #: ../data/gui/preferences_window.ui.h:104
-msgid ""
-"The auto away status message. If empty, Gajim will not change the current "
-"status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-away timeout"
-msgstr ""
-"离开状态的自动消息。如果为空, Gajim 不会改变当前的状态消息\n"
-"$S会被上个状态消息替换\n"
-"$T会被自动离开的超时时间替换"
+msgid "Your message:"
+msgstr "您的消息: "
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "_URL highlight:"
+msgstr "URL 高亮显示: "
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "_Reset to Default Colors"
+msgstr "恢复为默认颜色设置(_R)"
 
 #: ../data/gui/preferences_window.ui.h:107
-msgid ""
-"The auto not available status message. If empty, Gajim will not change the "
-"current status message\n"
-"$S will be replaced by previous status message\n"
-"$T will be replaced by auto-not-available timeout"
-msgstr ""
-"离开很久了的自动消息。如果为空, Gajim 不会改变当前的状态消息\n"
-"$S会被上个状态消息替换\n"
-"$T会被自动不可用的超时时间替换"
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>聊天窗口中文字颜色</b>"
+
+#: ../data/gui/preferences_window.ui.h:108
+msgid "Style"
+msgstr "风格"
+
+#: ../data/gui/preferences_window.ui.h:109
+msgid "Audio input device"
+msgstr "音频输入设备"
 
 #: ../data/gui/preferences_window.ui.h:110
-msgid "Use _transports icons"
-msgstr "使用代理的图标设定(_T)"
+msgid "Audio output device"
+msgstr "音频输出设备"
 
 #: ../data/gui/preferences_window.ui.h:111
-msgid "Use default applications"
-msgstr "使用默认的应用程序"
+msgid "<b>Audio</b>"
+msgstr "<b>音频</b>"
 
 #: ../data/gui/preferences_window.ui.h:112
-msgid "Use system _default"
-msgstr "使用系统默认(_D)"
-
-#: ../data/gui/preferences_window.ui.h:113
-msgid "Video framerate"
-msgstr "视频帧速率"
-
-#: ../data/gui/preferences_window.ui.h:114
 msgid "Video input device"
 msgstr "视频输入设备"
 
-#: ../data/gui/preferences_window.ui.h:115
+#: ../data/gui/preferences_window.ui.h:113
 msgid "Video output device"
 msgstr "视频输出设备"
 
-#: ../data/gui/preferences_window.ui.h:116
+#: ../data/gui/preferences_window.ui.h:114
+msgid "Video framerate"
+msgstr "视频帧速率"
+
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Video size"
 msgstr "视频尺寸"
 
+#: ../data/gui/preferences_window.ui.h:116
+msgid "View own video source"
+msgstr ""
+
 #: ../data/gui/preferences_window.ui.h:117
-msgid "When new event is received:"
-msgstr "当收到新的事件: "
+msgid "<b>Video</b>"
+msgstr "<b>视频</b>"
 
 #: ../data/gui/preferences_window.ui.h:118
-msgid "Your message:"
-msgstr "您的消息: "
+msgid "STUN server:"
+msgstr "STUN 服务器: "
 
 #: ../data/gui/preferences_window.ui.h:119
-msgid "Your nickname:"
-msgstr "您的昵称: "
-
-#: ../data/gui/preferences_window.ui.h:120
-msgid "_Away after:"
-msgstr "在此时间后设置状态为离开(_A): "
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr "STUN 服务器的主机名。如果没有给出, Gajim 会尝试从服务器上发现一个。"
 
 #: ../data/gui/preferences_window.ui.h:121
-msgid "_Browser:"
-msgstr "浏览器(_B): "
+#, fuzzy
+msgid "<i>(example: stun.iptel.org)</i>"
+msgstr "<i>(例如: stunserver.org)</i>"
 
 #: ../data/gui/preferences_window.ui.h:122
-msgid "_Display chat state notifications:"
-msgstr "显示聊天状态信息(_D): "
+msgid "<b>Connection</b>"
+msgstr "<b>连接</b>"
 
-#: ../data/gui/preferences_window.ui.h:123
-msgid "_Emoticons:"
-msgstr "表情(_E): "
+#: ../data/gui/preferences_window.ui.h:123 ../src/features_window.py:93
+msgid "Audio / Video"
+msgstr "音频/视频"
 
 #: ../data/gui/preferences_window.ui.h:124
-msgid "_File manager:"
-msgstr "文件管理器: (_F)"
+msgid "_Mail client:"
+msgstr "邮件客户端(_M): "
 
 #: ../data/gui/preferences_window.ui.h:125
-msgid "_Highlight misspelled words"
-msgstr "拼写检查(_H)"
+msgid "_Browser:"
+msgstr "浏览器(_B): "
 
 #: ../data/gui/preferences_window.ui.h:126
-msgid "_Ignore events from contacts not in the roster"
-msgstr "忽略联系人列表以外的联系人触发的事件(_I)"
-
-#: ../data/gui/preferences_window.ui.h:127
-msgid "_Ignore rich content in incoming messages"
-msgstr "忽略收到的消息中的富文本内容(_I)"
+msgid "_File manager:"
+msgstr "文件管理器: (_F)"
 
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
 #: ../data/gui/preferences_window.ui.h:128
-msgid "_Log status changes of contacts"
-msgstr "记录联系人状态变化(_L)"
+msgid "<b>Custom</b>"
+msgstr "<b>自定义</b>"
 
 #: ../data/gui/preferences_window.ui.h:129
-msgid "_Mail client:"
-msgstr "邮件客户端(_M): "
+msgid "<b>Applications</b>"
+msgstr "<b>应用程序</b>"
 
 #: ../data/gui/preferences_window.ui.h:130
-msgid "_Not available after:"
-msgstr "在此时间后设置状态为离开很久了(_N): "
+msgid "_Ignore events from contacts not in the roster"
+msgstr "忽略联系人列表以外的联系人触发的事件(_I)"
 
 #: ../data/gui/preferences_window.ui.h:131
-msgid "_Open..."
-msgstr "打开...(_O)"
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"如果选中, Gajim 会忽略未认证的联系人引发的事件。请谨慎使用, 因为这将屏蔽所有"
+"不在联系人列表中的联系人发来的消息。"
 
 #: ../data/gui/preferences_window.ui.h:132
-msgid "_Reset to Default Colors"
-msgstr "恢复为默认颜色设置(_R)"
+#, fuzzy
+msgid "Allow client / _OS information to be sent"
+msgstr "允许发送关于操作系统的信息(_O)"
 
 #: ../data/gui/preferences_window.ui.h:133
-msgid "_Send chat state notifications:"
-msgstr "发送聊天状态信息(_S): "
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
 #: ../data/gui/preferences_window.ui.h:134
-msgid "_Status message:"
-msgstr "状态消息: (_S)"
+#, fuzzy
+msgid "Allow local system time information to be sent"
+msgstr "允许发送关于操作系统的信息(_O)"
 
 #: ../data/gui/preferences_window.ui.h:135
-msgid "_URL highlight:"
-msgstr "URL 高亮显示: "
+#, fuzzy
+msgid "If checked, Gajim will allow others to detect the time on your system"
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
 
 #: ../data/gui/preferences_window.ui.h:136
-msgid "_Window behavior:"
-msgstr "窗口行为(_W)"
+msgid "Log _encrypted chat session"
+msgstr "记录加密的会话(_E)"
 
 #: ../data/gui/preferences_window.ui.h:137
-msgid "in _group chats"
-msgstr "在多人聊天窗口中(_G)"
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+"如果选中, Gajim 会记录加密的消息。请注意, 使用 E2E 加密时, 必须对方同意\n"
+"记录, 否则 Gajim 不会记录。"
 
 #: ../data/gui/preferences_window.ui.h:138
-msgid "in _roster"
-msgstr "在联系人列表中(_R)"
+msgid "Allow my _idle time to be sent"
+msgstr "允许发送关于闲置时间的信息(_I)"
 
 #: ../data/gui/preferences_window.ui.h:139
-msgid "minutes"
-msgstr "分钟"
+msgid "Global proxy:"
+msgstr ""
 
-#: ../data/gui/privacy_lists_window.ui.h:1
-msgid "Privacy Lists:"
-msgstr "隐私策略列表: "
+#: ../data/gui/preferences_window.ui.h:141
+msgid "<b>Privacy</b>"
+msgstr "<b>隐私策略</b>"
+
+#: ../data/gui/preferences_window.ui.h:142
+msgid "_Log status changes of contacts"
+msgstr "记录联系人状态变化(_L)"
+
+#: ../data/gui/preferences_window.ui.h:144
+msgid "_Open..."
+msgstr "打开...(_O)"
+
+#: ../data/gui/preferences_window.ui.h:145
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>高级配置编辑器</b>"
+
+#: ../data/gui/preferences_window.ui.h:146
+msgid "Advanced"
+msgstr "高级"
 
 #: ../data/gui/privacy_list_window.ui.h:1
-msgid "<b>Add / Edit a rule</b>"
-msgstr "<b>添加/编辑规则</b>"
+msgid "none"
+msgstr "none"
 
 #: ../data/gui/privacy_list_window.ui.h:2
-msgid "<b>List of rules</b>"
-msgstr "<b>规则列表</b>"
+msgid "both"
+msgstr "both"
 
 #: ../data/gui/privacy_list_window.ui.h:3
+msgid "from"
+msgstr "from"
+
+#: ../data/gui/privacy_list_window.ui.h:4
+msgid "to"
+msgstr "to"
+
+#: ../data/gui/privacy_list_window.ui.h:5 ../src/dialogs.py:4325
+msgid "Privacy List"
+msgstr "隐私策略列表"
+
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "<i>Privacy List</i>"
 msgstr "<i>隐私策略列表</i>"
 
-#: ../data/gui/privacy_list_window.ui.h:4
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "Active for this session"
 msgstr "为此会话激活"
 
-#: ../data/gui/privacy_list_window.ui.h:5
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Active on each startup"
 msgstr "每次启动时激活"
 
-#: ../data/gui/privacy_list_window.ui.h:6
-msgid "All"
-msgstr "全部"
+#: ../data/gui/privacy_list_window.ui.h:9
+msgid "<b>List of rules</b>"
+msgstr "<b>规则列表</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:7
-msgid "All (including subscription)"
-msgstr "全部(包含认证)"
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "<b>Add / Edit a rule</b>"
+msgstr "<b>添加/编辑规则</b>"
 
-#: ../data/gui/privacy_list_window.ui.h:8
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Allow"
 msgstr "允许"
 
-#: ../data/gui/privacy_list_window.ui.h:9
+#: ../data/gui/privacy_list_window.ui.h:12
 msgid "Deny"
 msgstr "拒绝"
 
-#: ../data/gui/privacy_list_window.ui.h:10
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/gui/privacy_list_window.ui.h:11
-msgid "Order:"
-msgstr "Order:"
-
-#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3804
-msgid "Privacy List"
-msgstr "隐私策略列表"
-
-#: ../data/gui/privacy_list_window.ui.h:13
-msgid "all by subscription"
-msgstr "所有(除了认证)"
-
 #: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "所有在群组中的"
 
 #: ../data/gui/privacy_list_window.ui.h:15
-msgid "both"
-msgstr "both"
+msgid "all by subscription"
+msgstr "所有(除了认证)"
 
 #: ../data/gui/privacy_list_window.ui.h:16
-msgid "from"
-msgstr "from"
+msgid "All"
+msgstr "全部"
 
 #: ../data/gui/privacy_list_window.ui.h:17
-msgid "none"
-msgstr "none"
-
-#: ../data/gui/privacy_list_window.ui.h:18
-msgid "to"
-msgstr "to"
-
-#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "向我发送消息"
 
-#: ../data/gui/privacy_list_window.ui.h:20
+#: ../data/gui/privacy_list_window.ui.h:18
 msgid "to send me queries"
 msgstr "向我发送查询"
 
-#: ../data/gui/privacy_list_window.ui.h:21
+#: ../data/gui/privacy_list_window.ui.h:19
+msgid "to view my status"
+msgstr "查看我的状态"
+
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me status"
 msgstr "向我发送状态"
 
+#: ../data/gui/privacy_list_window.ui.h:21
+msgid "All (including subscription)"
+msgstr "全部(包含认证)"
+
 #: ../data/gui/privacy_list_window.ui.h:22
-msgid "to view my status"
-msgstr "查看我的状态"
+msgid "Order:"
+msgstr "Order:"
 
-#: ../data/gui/profile_window.ui.h:1
-#: ../data/gui/vcard_information_window.ui.h:1
-msgid "<b>Address</b>"
-msgstr "<b>地址</b>"
+#: ../data/gui/privacy_lists_window.ui.h:1
+msgid "Privacy Lists:"
+msgstr "隐私策略列表: "
 
 #: ../data/gui/profile_window.ui.h:2
-msgid "<b>Avatar:</b>"
-msgstr "<b>头像: </b>"
+#: ../data/gui/vcard_information_window.ui.h:15
+msgid "<b>Name:</b>"
+msgstr "<b>名字: </b>"
 
 #: ../data/gui/profile_window.ui.h:3
-#: ../data/gui/vcard_information_window.ui.h:4
-msgid "<b>Birthday:</b>"
-msgstr "<b>生日: </b>"
-
-#: ../data/gui/profile_window.ui.h:4
-#: ../data/gui/vcard_information_window.ui.h:5
-msgid "<b>City:</b>"
-msgstr "<b>城市: </b>"
+#: ../data/gui/vcard_information_window.ui.h:16
+msgid "<b>Nickname:</b>"
+msgstr "<b>昵称: </b>"
 
+#. Family Name
 #: ../data/gui/profile_window.ui.h:5
-#: ../data/gui/vcard_information_window.ui.h:7
-msgid "<b>Company:</b>"
-msgstr "<b>公司: </b>"
-
-#: ../data/gui/profile_window.ui.h:6
-#: ../data/gui/vcard_information_window.ui.h:9
-msgid "<b>Country:</b>"
-msgstr "<b>国家: </b>"
+#: ../data/gui/vcard_information_window.ui.h:30
+msgid "<b>Family:</b>"
+msgstr "姓: "
 
+#. Given Name
 #: ../data/gui/profile_window.ui.h:7
-#: ../data/gui/vcard_information_window.ui.h:10
-msgid "<b>Department:</b>"
-msgstr "<b>部门: </b>"
-
-#: ../data/gui/profile_window.ui.h:8
-#: ../data/gui/vcard_information_window.ui.h:11
-msgid "<b>E-Mail:</b>"
-msgstr "<b>E-Mail: </b>"
+#: ../data/gui/vcard_information_window.ui.h:36
+msgid "<b>Given:</b>"
+msgstr "<b>名: </b>"
 
+#. Middle Name
 #: ../data/gui/profile_window.ui.h:9
-#: ../data/gui/vcard_information_window.ui.h:12
-msgid "<b>Extra Address:</b>"
-msgstr "<b>附加地址: </b>"
+#: ../data/gui/vcard_information_window.ui.h:32
+msgid "<b>Middle:</b>"
+msgstr "<b>中间名: </b>"
 
-#. Family Name
+#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:11
-#: ../data/gui/vcard_information_window.ui.h:14
-msgid "<b>Family:</b>"
-msgstr "姓: "
+#: ../data/gui/vcard_information_window.ui.h:34
+msgid "<b>Prefix:</b>"
+msgstr "<b>前缀: </b>"
 
-#: ../data/gui/profile_window.ui.h:12
-#: ../data/gui/vcard_information_window.ui.h:15
+#. Suffix in Name
+#: ../data/gui/profile_window.ui.h:13
+#: ../data/gui/vcard_information_window.ui.h:38
+msgid "<b>Suffix:</b>"
+msgstr "<b>后缀: </b>"
+
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:39
 msgid "<b>Full Name</b>"
 msgstr "<b>全名</b>"
 
-#. Given Name
-#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/profile_window.ui.h:15
 #: ../data/gui/vcard_information_window.ui.h:17
-msgid "<b>Given:</b>"
-msgstr "<b>名: </b>"
+msgid "<b>Street:</b>"
+msgstr "<b>街道: </b>"
 
-#: ../data/gui/profile_window.ui.h:15
-#: ../data/gui/vcard_information_window.ui.h:18
-msgid "<b>Homepage:</b>"
-msgstr "<b>主页: </b>"
+#: ../data/gui/profile_window.ui.h:16
+#: ../data/gui/vcard_information_window.ui.h:20
+msgid "<b>Extra Address:</b>"
+msgstr "<b>附加地址: </b>"
 
-#. Middle Name
 #: ../data/gui/profile_window.ui.h:17
-#: ../data/gui/vcard_information_window.ui.h:21
-msgid "<b>Middle:</b>"
-msgstr "<b>中间名: </b>"
+#: ../data/gui/vcard_information_window.ui.h:18
+msgid "<b>City:</b>"
+msgstr "<b>城市: </b>"
 
 #: ../data/gui/profile_window.ui.h:18
-#: ../data/gui/vcard_information_window.ui.h:22
-msgid "<b>Name:</b>"
-msgstr "<b>名字: </b>"
+#: ../data/gui/vcard_information_window.ui.h:21
+msgid "<b>Postal Code:</b>"
+msgstr "<b>邮政编码: </b>"
 
 #: ../data/gui/profile_window.ui.h:19
-#: ../data/gui/vcard_information_window.ui.h:23
-msgid "<b>Nickname:</b>"
-msgstr "<b>昵称: </b>"
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>State:</b>"
+msgstr "<b>州: </b>"
 
 #: ../data/gui/profile_window.ui.h:20
-#: ../data/gui/vcard_information_window.ui.h:24
-msgid "<b>Phone No.:</b>"
-msgstr "<b>电话号码: </b>"
+#: ../data/gui/vcard_information_window.ui.h:22
+msgid "<b>Country:</b>"
+msgstr "<b>国家: </b>"
 
 #: ../data/gui/profile_window.ui.h:21
-#: ../data/gui/vcard_information_window.ui.h:25
-msgid "<b>Position:</b>"
-msgstr "<b>职位: </b>"
+#: ../data/gui/vcard_information_window.ui.h:23
+msgid "<b>Address</b>"
+msgstr "<b>地址</b>"
 
 #: ../data/gui/profile_window.ui.h:22
-#: ../data/gui/vcard_information_window.ui.h:26
-msgid "<b>Postal Code:</b>"
-msgstr "<b>邮政编码: </b>"
+#: ../data/gui/vcard_information_window.ui.h:24
+msgid "<b>Homepage:</b>"
+msgstr "<b>主页: </b>"
+
+#: ../data/gui/profile_window.ui.h:23
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>E-Mail:</b>"
+msgstr "<b>E-Mail: </b>"
 
-#. Prefix in Name
 #: ../data/gui/profile_window.ui.h:24
-#: ../data/gui/vcard_information_window.ui.h:28
-msgid "<b>Prefix:</b>"
-msgstr "<b>前缀: </b>"
+#: ../data/gui/vcard_information_window.ui.h:26
+msgid "<b>Phone No.:</b>"
+msgstr "<b>电话号码: </b>"
 
 #: ../data/gui/profile_window.ui.h:25
-#: ../data/gui/vcard_information_window.ui.h:30
-msgid "<b>Role:</b>"
-msgstr "<b>角色: </b>"
+msgid "<b>Avatar:</b>"
+msgstr "<b>头像: </b>"
 
 #: ../data/gui/profile_window.ui.h:26
-#: ../data/gui/vcard_information_window.ui.h:31
-msgid "<b>State:</b>"
-msgstr "<b>州: </b>"
+msgid "Click to set your avatar"
+msgstr "单击以设置您的头像"
 
 #: ../data/gui/profile_window.ui.h:27
-#: ../data/gui/vcard_information_window.ui.h:33
-msgid "<b>Street:</b>"
-msgstr "<b>街道: </b>"
+#: ../data/gui/vcard_information_window.ui.h:27
+msgid "Format: YYYY-MM-DD"
+msgstr "格式:  YYYY-MM-DD"
+
+#: ../data/gui/profile_window.ui.h:28
+#: ../data/gui/vcard_information_window.ui.h:28
+msgid "<b>Birthday:</b>"
+msgstr "<b>生日: </b>"
 
-#. Suffix in Name
 #: ../data/gui/profile_window.ui.h:29
-#: ../data/gui/vcard_information_window.ui.h:37
-msgid "<b>Suffix:</b>"
-msgstr "<b>后缀: </b>"
+#: ../data/gui/vcard_information_window.ui.h:41
+msgid "Personal Info"
+msgstr "个人信息"
+
+#: ../data/gui/profile_window.ui.h:30
+#: ../data/gui/vcard_information_window.ui.h:42
+msgid "<b>Company:</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
-msgid "About"
-msgstr "关于"
+#: ../data/gui/vcard_information_window.ui.h:43
+msgid "<b>Department:</b>"
+msgstr "<b>部门: </b>"
 
 #: ../data/gui/profile_window.ui.h:32
-msgid "Click to set your avatar"
-msgstr "单击以设置您的头像"
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "<b>Position:</b>"
+msgstr "<b>职位: </b>"
 
 #: ../data/gui/profile_window.ui.h:33
 #: ../data/gui/vcard_information_window.ui.h:45
-msgid "Format: YYYY-MM-DD"
-msgstr "格式:  YYYY-MM-DD"
+msgid "<b>Role:</b>"
+msgstr "<b>角色: </b>"
 
 #: ../data/gui/profile_window.ui.h:34
-#: ../data/gui/vcard_information_window.ui.h:47
-msgid "Personal Info"
-msgstr "个人信息"
-
-#: ../data/gui/profile_window.ui.h:36
-#: ../data/gui/vcard_information_window.ui.h:49
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "Work"
 msgstr "工作"
 
-#: ../data/gui/remove_account_window.ui.h:1
-msgid "<b>What do you want to do?</b>"
-msgstr "<b>您想要做什么?</b>"
+#. "About" is the text of a tab of vcard window
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "About"
+msgstr "关于"
 
-#: ../data/gui/remove_account_window.ui.h:2
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "Remove account _only from Gajim"
 msgstr "仅从 Gajim 移除帐户(_O)"
 
-#: ../data/gui/remove_account_window.ui.h:3
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account from Gajim and from _server"
 msgstr "同时从 Gajim 和服务器移除帐户(_S)"
 
-#. Remove group
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>您想要做什么?</b>"
+
 #. Remove
-#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5421
-#: ../src/roster_window.py:5547 ../src/roster_window.py:5677
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5869
 msgid "_Remove"
 msgstr "移除(_R)"
 
 #: ../data/gui/roster_item_exchange_window.ui.h:1
-msgid ""
-"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
-"your roster."
-msgstr ""
-"<b>someone@somewhere.com</b> 希望您向您的联系人列表 <b>添加</b> 一些联系人。"
-
-#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr "消息正文 <当前未被使用, 因此会被自动隐藏>"
 
-#: ../data/gui/roster_item_exchange_window.ui.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Roster Item Exchange"
 msgstr "联系人列表项交换"
 
-#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 #: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../data/gui/roster_window.ui.h:1
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/gui/roster_window.ui.h:2
+#: ../data/gui/subscription_request_window.ui.h:5
+msgid "_Actions"
+msgstr "动作(_A)"
+
+#: ../data/gui/roster_window.ui.h:6
 msgid "Add _Contact..."
 msgstr "添加联系人(_C)..."
 
-#: ../data/gui/roster_window.ui.h:2
-msgid "Fea_tures"
-msgstr "特性(_T)"
-
-#: ../data/gui/roster_window.ui.h:3
-msgid "File _Transfers"
-msgstr "文件传输(_T)"
+#: ../data/gui/roster_window.ui.h:9 ../src/disco.py:1518
+msgid "_Edit"
+msgstr "编辑(_E)"
 
-#: ../data/gui/roster_window.ui.h:4
-msgid "Frequently Asked Questions (online)"
-msgstr "被频繁提问的问题 (在线)"
+#: ../data/gui/roster_window.ui.h:10
+msgid "_Accounts"
+msgstr "帐户(_A)"
 
-#: ../data/gui/roster_window.ui.h:6
-msgid "Help online"
-msgstr "在线帮助"
+#: ../data/gui/roster_window.ui.h:11
+msgid "Profile, A_vatar"
+msgstr "名片, 头像(V)"
 
-#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/roster_window.ui.h:12
 msgid "P_lugins"
 msgstr "插件(_L)"
 
-#: ../data/gui/roster_window.ui.h:9
-msgid "Profile, A_vatar"
-msgstr "名片, 头像(V)"
+#: ../data/gui/roster_window.ui.h:13
+msgid "_View"
+msgstr "视图(_V)"
 
-#: ../data/gui/roster_window.ui.h:10
+#: ../data/gui/roster_window.ui.h:14
+msgid "Show _Offline Contacts"
+msgstr "显示离线联系人"
+
+#: ../data/gui/roster_window.ui.h:15
 msgid "Show Only _Active Contacts"
 msgstr "只显示活动的联系人(_A)"
 
-#: ../data/gui/roster_window.ui.h:11
-msgid "Show Trans_ports"
+#: ../data/gui/roster_window.ui.h:16
+#, fuzzy
+msgid "Show T_ransports"
 msgstr "显示代理(_P)"
 
-#: ../data/gui/roster_window.ui.h:12
-msgid "Show _Offline Contacts"
-msgstr "显示离线联系人"
-
-#: ../data/gui/roster_window.ui.h:13 ../src/statusicon.py:343
+#: ../data/gui/roster_window.ui.h:17 ../src/statusicon.py:352
 msgid "Show _Roster"
 msgstr "显示联系人列表(_R)"
 
-#: ../data/gui/roster_window.ui.h:14
-msgid "_Accounts"
-msgstr "帐户(_A)"
+#: ../data/gui/roster_window.ui.h:18
+msgid "File _Transfers"
+msgstr "文件传输(_T)"
 
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/gui/roster_window.ui.h:15
-#: ../data/gui/subscription_request_window.ui.h:6
-msgid "_Actions"
-msgstr "动作(_A)"
+#: ../data/gui/roster_window.ui.h:20
+msgid "_Help"
+msgstr "帮助(_H)"
 
-#: ../data/gui/roster_window.ui.h:17
+#: ../data/gui/roster_window.ui.h:21
+msgid "Help online"
+msgstr "在线帮助"
+
+#: ../data/gui/roster_window.ui.h:22
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../data/gui/roster_window.ui.h:19 ../src/disco.py:1520
-msgid "_Edit"
-msgstr "编辑(_E)"
+#: ../data/gui/roster_window.ui.h:23
+msgid "Frequently Asked Questions (online)"
+msgstr "被频繁提问的问题 (在线)"
 
-#: ../data/gui/roster_window.ui.h:20
+#: ../data/gui/roster_window.ui.h:24
 msgid "_FAQ"
 msgstr "常见问题(_A)"
 
-#: ../data/gui/roster_window.ui.h:21
-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)"
+msgid "Keyboard Shortcuts"
+msgstr ""
 
-#: ../data/gui/search_window.ui.h:1
-msgid "Please wait while retrieving search form..."
-msgstr "请等待, 正在搜索..."
+#: ../data/gui/roster_window.ui.h:26
+msgid "Fea_tures"
+msgstr "特性(_T)"
 
-#: ../data/gui/search_window.ui.h:2
+#: ../data/gui/search_window.ui.h:1 ../src/disco.py:1375
 msgid "Search"
 msgstr "查找"
 
+#: ../data/gui/search_window.ui.h:2
+msgid "Please wait while retrieving search form..."
+msgstr "请等待, 正在搜索..."
+
 #: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "添加联系人(_C)"
 
 #. Information
-#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5689
+#: ../data/gui/search_window.ui.h:4 ../src/gui_menu_builder.py:627
 msgid "_Information"
 msgstr "信息(_I)"
 
-#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1371
+#: ../data/gui/search_window.ui.h:5
 msgid "_Search"
 msgstr "查找(_S)"
 
 #: ../data/gui/service_discovery_window.ui.h:1
-msgid "G_o"
-msgstr "到(_O)"
-
-#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "地址(_A):"
 
+#: ../data/gui/service_discovery_window.ui.h:2
+msgid "G_o"
+msgstr "到(_O)"
+
 #: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "注册到"
 
-#: ../data/gui/service_registration_window.ui.h:2
-msgid "_Cancel"
-msgstr "取消(_C)"
-
-#: ../data/gui/single_message_window.ui.h:3
-msgid "Reply to this message"
-msgstr "回复本条消息"
+#: ../data/gui/single_message_window.ui.h:2
+msgid "To:"
+msgstr "到: "
 
 #: ../data/gui/single_message_window.ui.h:4
-msgid "Sen_d"
-msgstr "发送(_D)"
+msgid "0"
+msgstr "0"
 
 #: ../data/gui/single_message_window.ui.h:5
-msgid "Send message"
-msgstr "发送消息"
+msgid "Sen_d"
+msgstr "发送(_D)"
 
-#: ../data/gui/single_message_window.ui.h:6
-msgid "Send message and close window"
-msgstr "发送消息并关闭窗口"
+#: ../data/gui/single_message_window.ui.h:7
+msgid "_Reply"
+msgstr "回复(_R)"
 
 #: ../data/gui/single_message_window.ui.h:8
-msgid "To:"
-msgstr "到: "
+msgid "Reply to this message"
+msgstr "回复本条消息"
 
 #: ../data/gui/single_message_window.ui.h:9
-msgid "_Reply"
-msgstr "回复(_R)"
-
-#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "发送并关闭(_S)"
 
+#: ../data/gui/single_message_window.ui.h:10
+msgid "Send message and close window"
+msgstr "发送消息并关闭窗口"
+
 #: ../data/gui/subscription_request_window.ui.h:1
-msgid "Au_thorize"
-msgstr "授权(_T)"
+msgid "Subscription Request"
+msgstr "认证请求"
 
 #: ../data/gui/subscription_request_window.ui.h:2
-msgid "Authorize contact so he or she can know when you're connected"
-msgstr "向联系人授权则他/她将知道您是否在线"
+msgid "_Deny"
+msgstr "拒绝(_D)"
 
 #: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
@@ -2849,186 +2813,223 @@ msgid ""
 "connected"
 msgstr "拒绝向联系人授权则他/她将无法知道您是否在线"
 
-#: ../data/gui/subscription_request_window.ui.h:4
-msgid "Subscription Request"
-msgstr "认证请求"
+#: ../data/gui/subscription_request_window.ui.h:6
+msgid "Au_thorize"
+msgstr "授权(_T)"
 
 #: ../data/gui/subscription_request_window.ui.h:7
-msgid "_Deny"
-msgstr "拒绝(_D)"
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "向联系人授权则他/她将知道您是否在线"
 
 #: ../data/gui/synchronise_select_account_dialog.ui.h:1
+msgid "Synchronise contacts"
+msgstr "同步联系人"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 msgid "Select the account with which you want to synchronise"
 msgstr "选择您想要与之同步的账户"
 
 #: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
-msgid "Select the contacts you want to synchronise"
-msgstr "选择您想要同步的联系人"
-
-#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "同步: 选择联系人"
 
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
+msgid "Select the contacts you want to synchronise"
+msgstr "选择您想要同步的联系人"
+
 #: ../data/gui/systray_context_menu.ui.h:1
+msgid "Sta_tus"
+msgstr "状态(_T)"
+
+#: ../data/gui/systray_context_menu.ui.h:5
+msgid "Show All Pending _Events"
+msgstr "显示所有未处理事件(_E)"
+
+#: ../data/gui/systray_context_menu.ui.h:6
 msgid "Mute Sounds"
 msgstr "静音"
 
-#: ../data/gui/systray_context_menu.ui.h:2
-msgid "Send Single _Message"
-msgstr "发送单条消息(_M)"
+#: ../data/gui/tooltip_gc_contact.ui.h:2
+#: ../data/gui/tooltip_roster_contact.ui.h:2
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "Resource:"
+msgstr "资源: "
 
-#: ../data/gui/systray_context_menu.ui.h:3
-msgid "Show All Pending _Events"
-msgstr "显示所有未处理事件(_E)"
+#: ../data/gui/tooltip_roster_contact.ui.h:3
+#: ../data/gui/zeroconf_information_window.ui.h:4
+msgid "Status:"
+msgstr "状态: "
 
-#: ../data/gui/systray_context_menu.ui.h:4
-msgid "Sta_tus"
-msgstr "状态(_T)"
+#: ../data/gui/tooltip_roster_contact.ui.h:4
+#, fuzzy
+msgid "Idle since:"
+msgstr "空闲, 自从 %s"
 
-#: ../data/gui/systray_context_menu.ui.h:5
-msgid "_Group Chat"
-msgstr "多人聊天(_G)"
+#: ../data/gui/tooltip_roster_contact.ui.h:5
+#, fuzzy
+msgid "Idle for:"
+msgstr "空闲了 %s"
 
-#. Given Name
-#: ../data/gui/vcard_information_window.ui.h:3
-msgid "<b>Ask:</b>"
-msgstr "<b>请求: </b>"
+#: ../data/gui/tooltip_roster_contact.ui.h:8
+#, fuzzy
+msgid "Tune:"
+msgstr "音乐: %s"
 
-#: ../data/gui/vcard_information_window.ui.h:6
-msgid "<b>Client:</b>"
-msgstr "<b>客户端: </b>"
+#: ../data/gui/tooltip_roster_contact.ui.h:9
+#, fuzzy
+msgid "Location:"
+msgstr "位置: %s"
 
-#: ../data/gui/vcard_information_window.ui.h:8
-msgid "<b>Contact time:</b>"
-msgstr "<b>联系人时间: </b>"
+#: ../data/gui/tooltip_roster_contact.ui.h:10
+#, fuzzy
+msgid "OpenPGP:"
+msgstr "OpenPGP: "
 
-#: ../data/gui/vcard_information_window.ui.h:19
+#: ../data/gui/tooltip_roster_contact.ui.h:11
+#, fuzzy
+msgid "Subscription:"
+msgstr "认证: "
+
+#: ../data/gui/vcard_information_window.ui.h:1
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact Information"
+msgstr "联系人信息"
+
+#: ../data/gui/vcard_information_window.ui.h:2
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Resource:</b>"
 msgstr "<b>资源: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:32
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Status:</b>"
 msgstr "<b>状态: </b>"
 
-#. Family Name
-#: ../data/gui/vcard_information_window.ui.h:35
-msgid "<b>Subscription:</b>"
-msgstr "<b>认证: </b>"
+#: ../data/gui/vcard_information_window.ui.h:5
+msgid "<b>Client:</b>"
+msgstr "<b>客户端: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:38
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>System:</b>"
 msgstr "<b>系统: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:41
-msgid "Comments"
-msgstr "注释"
+#: ../data/gui/vcard_information_window.ui.h:7
+msgid "<b>Contact time:</b>"
+msgstr "<b>联系人时间: </b>"
 
-#: ../data/gui/vcard_information_window.ui.h:42
-msgid "Configured avatar:"
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>User avatar:</b>"
+msgstr "<b>头像: </b>"
+
+#: ../data/gui/vcard_information_window.ui.h:9
+#, fuzzy
+msgid "<b>Configured avatar:</b>"
 msgstr "设置头像: "
 
-#: ../data/gui/vcard_information_window.ui.h:43
-#: ../data/gui/zeroconf_information_window.ui.h:1
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:11
+msgid "<b>Ask:</b>"
+msgstr "<b>请求: </b>"
+
+#. Family Name
+#: ../data/gui/vcard_information_window.ui.h:13
+msgid "<b>Subscription:</b>"
+msgstr "<b>认证: </b>"
+
+#: ../data/gui/vcard_information_window.ui.h:14
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Contact"
 msgstr "联系人"
 
-#: ../data/gui/vcard_information_window.ui.h:44
-msgid "Contact Information"
-msgstr "联系人信息"
-
-#: ../data/gui/vcard_information_window.ui.h:46
-msgid "More"
-msgstr "更多"
+#: ../data/gui/vcard_information_window.ui.h:40
+msgid "button"
+msgstr "按钮"
 
-#: ../data/gui/vcard_information_window.ui.h:48
-msgid "User avatar:"
-msgstr "用户头像: "
+#: ../data/gui/vcard_information_window.ui.h:49
+msgid "Comments"
+msgstr "注释"
 
 #: ../data/gui/xml_console_window.ui.h:1
-msgid "<b>Filter</b>"
-msgstr "<b>过滤器</b>"
-
-#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber 通信</b>"
 
+#. XML Console enable checkbutton
 #: ../data/gui/xml_console_window.ui.h:3
-msgid "<b>XML Input</b>"
-msgstr "<b>XML 输入</b>"
+msgid "_Enable"
+msgstr "启用(_E)"
 
 #: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr "隐藏 IN stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:5
-msgid "Hide IQ stanzas"
-msgstr "隐藏 IQ stanzas"
+msgid "Hide OUT stanzas"
+msgstr "隐藏 OUT stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:6
-msgid "Hide Message stanzas"
-msgstr "隐藏 Message stanzas"
+msgid "Hide Presence stanzas"
+msgstr "隐藏 Presence stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:7
-msgid "Hide OUT stanzas"
-msgstr "隐藏 OUT stanzas"
+msgid "Hide IQ stanzas"
+msgstr "隐藏 IQ stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:8
-msgid "Hide Presence stanzas"
-msgstr "隐藏 Presence stanzas"
+msgid "Hide Message stanzas"
+msgstr "隐藏 Message stanzas"
 
 #: ../data/gui/xml_console_window.ui.h:9
-msgid "Info/Query"
-msgstr "信息/查询"
+msgid "<b>Filter</b>"
+msgstr "<b>过滤器</b>"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/gui/xml_console_window.ui.h:13
+#: ../data/gui/xml_console_window.ui.h:11
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/gui/xml_console_window.ui.h:14
-msgid "_Message"
-msgstr "_Message"
+#: ../data/gui/xml_console_window.ui.h:12
+msgid "Info/Query"
+msgstr "信息/查询"
 
-#: ../data/gui/xml_console_window.ui.h:15
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_Presence"
 msgstr "_Presence"
 
-#: ../data/gui/zeroconf_context_menu.ui.h:1
-msgid "_Modify Account..."
-msgstr "修改帐户(_M)..."
+#: ../data/gui/xml_console_window.ui.h:14
+msgid "_Message"
+msgstr "_Message"
 
-#: ../data/gui/zeroconf_information_window.ui.h:6
+#: ../data/gui/xml_console_window.ui.h:16
+msgid "<b>XML Input</b>"
+msgstr "<b>XML 输入</b>"
+
+#: ../data/gui/zeroconf_information_window.ui.h:2
 msgid "Local jid:"
 msgstr "本地 JID: "
 
-#: ../data/gui/zeroconf_information_window.ui.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:11
 msgid "Personal"
 msgstr "个人"
 
-#: ../data/gui/zeroconf_information_window.ui.h:8
-msgid "Resource:"
-msgstr "资源: "
-
-#: ../data/gui/zeroconf_information_window.ui.h:9
-msgid "Status:"
-msgstr "状态: "
+#: ../data/gajim-remote.desktop.in.in.h:1
+msgid "Open URI using Gajim"
+msgstr ""
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "一个 GTK+ 的 Jabber 客户端"
+#: ../data/gajim-remote.desktop.in.in.h:2 ../data/gajim.desktop.in.in.h:4
+msgid "chat;messaging;im;jabber;xmpp;bonjour;voip;"
+msgstr ""
 
 #: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr "Gajim 即时消息软件"
-
-#: ../data/gajim.desktop.in.in.h:3
 msgid "Jabber IM Client"
 msgstr "Jabber 即时消息客户端"
 
+#: ../data/gajim.desktop.in.in.h:3
+msgid "A GTK+ Jabber client"
+msgstr "一个 GTK+ 的 Jabber 客户端"
+
 #: ../src/adhoc_commands.py:323
 msgid "Cancel confirmation"
 msgstr "取消确认"
@@ -3046,7 +3047,7 @@ msgstr "不合法的格式"
 msgid "The form is not filled correctly."
 msgstr "表格没有被正确得填写。"
 
-#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:413
+#: ../src/adhoc_commands.py:390 ../src/adhoc_commands.py:414
 msgid "Service sent malformed data"
 msgstr "服务发送了畸形的数据"
 
@@ -3054,295 +3055,255 @@ msgstr "服务发送了畸形的数据"
 msgid "Service changed the session identifier."
 msgstr "服务改变了会话标识符"
 
+#: ../src/adhoc_commands.py:419
+#, fuzzy, python-format
+msgid "%s - Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc 命令 - Gajim"
+
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:513
+#: ../src/adhoc_commands.py:514
 msgid "Service returned an error."
 msgstr "服务返回了一个错误。"
 
 #. For i18n
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:94
 msgid "Activated"
 msgstr "激活的"
 
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:94
 msgid "Deactivated"
 msgstr "未激活的"
 
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:96
 msgid "Boolean"
 msgstr "Boolean"
 
-#: ../src/advanced_configuration_window.py:94
+#: ../src/advanced_configuration_window.py:97
 msgid "Integer"
 msgstr "Integer"
 
-#: ../src/advanced_configuration_window.py:95
+#: ../src/advanced_configuration_window.py:98
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:976
-msgid "Color"
-msgstr "Color"
-
-#: ../src/advanced_configuration_window.py:107
+#: ../src/advanced_configuration_window.py:110
 msgid "Preference Name"
 msgstr "Preference Name"
 
-#: ../src/advanced_configuration_window.py:113
+#: ../src/advanced_configuration_window.py:117
 msgid "Value"
 msgstr "值"
 
-#: ../src/advanced_configuration_window.py:121
+#: ../src/advanced_configuration_window.py:126
 msgid "Type"
 msgstr "类型"
 
 #. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:176
+#: ../src/advanced_configuration_window.py:182
 msgid "(None)"
 msgstr "(无)"
 
-#: ../src/advanced_configuration_window.py:259
+#: ../src/advanced_configuration_window.py:312
 msgid "Hidden"
 msgstr "隐藏"
 
-#: ../src/atom_window.py:123
-#, python-format
-msgid "You have received new entries (and %d not displayed):"
-msgid_plural "You have received new entries (and %d not displayed):"
-msgstr[0] "您收到了新的事件 (还有 %d 个没有显示)"
+#: ../src/application.py:49
+#, fuzzy
+msgid "Show the application's version"
+msgstr "在通知区域显示图标: "
 
-#. 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
-msgid "English"
-msgstr "英语"
+#: ../src/application.py:52
+#, fuzzy
+msgid "Show only critical errors"
+msgstr "只显示在联系人列表中"
 
-#: ../src/chat_control.py:76
-msgid "Belarusian"
-msgstr "白俄罗斯语"
-
-#: ../src/chat_control.py:76
-msgid "Bulgarian"
-msgstr "保加利亚语"
-
-#: ../src/chat_control.py:76
-msgid "Breton"
-msgstr "布列塔尼语"
-
-#: ../src/chat_control.py:76
-msgid "Czech"
-msgstr "捷克语"
-
-#: ../src/chat_control.py:76
-msgid "German"
-msgstr "德语"
-
-#: ../src/chat_control.py:76
-msgid "Greek"
-msgstr "希腊语"
-
-#: ../src/chat_control.py:76
-msgid "British"
-msgstr "英语（英国）"
-
-#: ../src/chat_control.py:76
-msgid "Esperanto"
-msgstr "世界语"
-
-#: ../src/chat_control.py:76
-msgid "Spanish"
-msgstr "西班牙语"
-
-#: ../src/chat_control.py:76
-msgid "Basque"
-msgstr "巴斯克语"
-
-#: ../src/chat_control.py:76
-msgid "French"
-msgstr "法语"
-
-#: ../src/chat_control.py:76
-msgid "Croatian"
-msgstr "克罗埃西亚语"
-
-#: ../src/chat_control.py:76
-msgid "Italian"
-msgstr "意大利语"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian (b)"
-msgstr "挪威语 (b)"
-
-#: ../src/chat_control.py:76
-msgid "Dutch"
-msgstr "荷兰语"
-
-#: ../src/chat_control.py:76
-msgid "Norwegian"
-msgstr "挪威语"
-
-#: ../src/chat_control.py:76
-msgid "Polish"
-msgstr "波兰语"
-
-#: ../src/chat_control.py:76
-msgid "Portuguese"
-msgstr "葡萄牙语"
-
-#: ../src/chat_control.py:76
-msgid "Brazilian Portuguese"
-msgstr "巴西葡萄牙语"
-
-#: ../src/chat_control.py:76
-msgid "Russian"
-msgstr "俄语"
-
-#: ../src/chat_control.py:76
-msgid "Serbian"
-msgstr "塞尔维亚语"
-
-#: ../src/chat_control.py:76
-msgid "Slovak"
-msgstr "斯洛伐克语"
-
-#: ../src/chat_control.py:76
-msgid "Swedish"
-msgstr "瑞典语"
-
-#: ../src/chat_control.py:76
-msgid "Chinese (Ch)"
-msgstr "中文"
-
-#: ../src/chat_control.py:510
-msgid "Spelling language"
-msgstr "拼写语言"
+#: ../src/application.py:55
+msgid "Separate profile files completely (even history db and plugins)"
+msgstr ""
 
-#. we are not connected
-#: ../src/chat_control.py:542 ../src/chat_control.py:751
-msgid "A connection is not available"
-msgstr "一个连接不可用"
+#: ../src/application.py:59
+msgid "Print xml stanzas and other debug information"
+msgstr ""
 
-#: ../src/chat_control.py:543 ../src/chat_control.py:752
-msgid "Your message can not be sent until you are connected."
-msgstr "连接之后您的消息才能发送"
+#: ../src/application.py:63
+msgid "Print stdout/stderr to the console on Windows"
+msgstr ""
 
-#: ../src/chat_control.py:958
-msgid "Underline"
-msgstr "下划线"
+#: ../src/application.py:67
+#, fuzzy
+msgid "Use defined profile in configuration directory"
+msgstr "高级设置编辑器"
 
-#: ../src/chat_control.py:959
-msgid "Strike"
-msgstr "划去"
+#: ../src/application.py:71
+#, fuzzy
+msgid "Set configuration directory"
+msgstr "%s 设置错误"
 
-#: ../src/chat_control.py:982
-msgid "Font"
-msgstr "字体"
+#: ../src/application.py:74
+msgid "Configure logging system"
+msgstr ""
 
-#: ../src/chat_control.py:991
-msgid "Clear formating"
-msgstr "清楚格式"
+#: ../src/application.py:119 ../src/chat_control.py:1671
+#: ../src/common/connection.py:550 ../src/common/connection_handlers.py:1079
+#: ../src/common/connection_handlers.py:1255
+#: ../src/common/connection_handlers_events.py:956 ../src/common/logger.py:1177
+#: ../src/session.py:110
+msgid "Database Error"
+msgstr "数据库错误"
 
-#: ../src/chat_control.py:1069
-msgid "Really send file?"
-msgstr "确定要发送文件?"
+#: ../src/application.py:121 ../src/common/connection.py:551
+#: ../src/common/connection_handlers.py:1080
+#: ../src/common/connection_handlers.py:1256
+#: ../src/common/connection_handlers_events.py:957 ../src/common/logger.py:1178
+#: ../src/session.py:111
+#, python-format
+msgid ""
+"The database file (%s) cannot be read. Try to repair it (see http://trac."
+"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
+msgstr ""
+"数据库文件 (%s) 不能被读取。请尝试修复它(参考 http://trac.gajim.org/wiki/"
+"DatabaseBackup)或移除它(所有历史记录将丢失)。"
 
-#: ../src/chat_control.py:1070
+#: ../src/atom_window.py:124
 #, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "如果您想 %s 发送文件, 他/她会获知您的真实 Jabber ID。"
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] "您收到了新的事件 (还有 %d 个没有显示)"
 
-#: ../src/chat_control.py:1534 ../src/chat_control.py:2024
-msgid "GPG encryption enabled"
+#: ../src/chat_control.py:307 ../src/chat_control.py:911
+#, fuzzy
+msgid "OpenPGP encryption enabled"
 msgstr "GPG 加密已启用"
 
+#: ../src/chat_control.py:369
+msgid "Formattings are not available when GPG is active"
+msgstr ""
+
+#: ../src/chat_control.py:372
+#, fuzzy
+msgid "This contact does not support HTML"
+msgstr "这个联系人不支持文件传输"
+
 #. 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:377 ../src/common/contacts.py:156
+#: ../src/common/contacts.py:277 ../src/common/helpers.py:73
+#: ../src/common/helpers.py:282 ../src/dialogs.py:1121 ../src/dialogs.py:2352
+#: ../src/dialogs.py:2381 ../src/dialogs.py:3595 ../src/gui_interface.py:493
+#: ../src/gui_menu_builder.py:292 ../src/gui_menu_builder.py:446
+#: ../src/roster_window.py:791 ../src/roster_window.py:1757
+#: ../src/roster_window.py:1759 ../src/roster_window.py:2093
+#: ../src/roster_window.py:3556 ../src/roster_window.py:3583
 msgid "Not in Roster"
 msgstr "不在联系人列表中"
 
-#: ../src/chat_control.py:1593
+#. change tooltip text for audio and video buttons if farstream is
+#. not installed
+#: ../src/chat_control.py:402
+#: ../src/command_system/implementation/standard.py:215
+msgid "Toggle audio session"
+msgstr "切换语音会话"
+
+#: ../src/chat_control.py:403
+#: ../src/command_system/implementation/standard.py:225
+msgid "Toggle video session"
+msgstr "切换视频会话"
+
+#: ../src/chat_control.py:405
+#, fuzzy
+msgid "Feature not available, see Help->Features"
+msgstr "特性在 Windows 下不可用。"
+
+#: ../src/chat_control.py:409
+msgid "Feature not supported by remote client"
+msgstr ""
+
+#: ../src/chat_control.py:422
+#, fuzzy
+msgid "Send files"
+msgstr "发送文件(_F)"
+
+#: ../src/chat_control.py:428
 msgid "This contact does not support file transfer."
 msgstr "这个联系人不支持文件传输"
 
-#: ../src/chat_control.py:1596
+#: ../src/chat_control.py:431
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "您需要知道这个联系人的真实 JID 才能向他/她发送文件。"
 
-#: ../src/chat_control.py:1691
+#: ../src/chat_control.py:549
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s 状态: %(state)s, 原因: %(reason)s"
 
-#: ../src/chat_control.py:1883
+#: ../src/chat_control.py:649 ../src/profile_window.py:214 ../src/vcard.py:210
+#: ../src/vcard.py:576
+#, fuzzy
+msgid "Save _As"
+msgstr "有"
+
+#: ../src/chat_control.py:753
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "聊天室 %(room_name)s 的 %(nickname)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:2004 ../src/dialogs.py:5280
-msgid "No GPG key assigned"
+#: ../src/chat_control.py:891 ../src/dialogs.py:5403
+#, fuzzy
+msgid "No OpenPGP key assigned"
 msgstr "没有指定 GPG 密钥"
 
-#: ../src/chat_control.py:2005
+#: ../src/chat_control.py:892
+#, fuzzy
 msgid ""
-"No GPG key is assigned to this contact. So you cannot encrypt messages with "
-"GPG."
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages "
+"with OpenPGP."
 msgstr "尚未为这个联系人指定 GPG 密钥。因此您不能用 GPG 加密信息。"
 
-#: ../src/chat_control.py:2014
-msgid "GPG encryption disabled"
+#: ../src/chat_control.py:901
+#, fuzzy
+msgid "OpenPGP encryption disabled"
 msgstr "GPG 加密已禁用"
 
-#: ../src/chat_control.py:2040
+#: ../src/chat_control.py:927
 msgid "Session WILL be logged"
 msgstr "会话将被记录"
 
-#: ../src/chat_control.py:2042
+#: ../src/chat_control.py:929
 msgid "Session WILL NOT be logged"
 msgstr "会话将不会被记录"
 
 #. encryption %s active
-#: ../src/chat_control.py:2059
+#: ../src/chat_control.py:946
 msgid "is"
 msgstr "是"
 
-#: ../src/chat_control.py:2059
+#: ../src/chat_control.py:946
 msgid "is NOT"
 msgstr "不是"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:2061
+#: ../src/chat_control.py:948
 msgid "will"
 msgstr "会"
 
-#: ../src/chat_control.py:2061
+#: ../src/chat_control.py:948
 msgid "will NOT"
 msgstr "不会"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2065
+#: ../src/chat_control.py:952
 msgid "and authenticated"
 msgstr "且已被认证"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:956
 msgid "and NOT authenticated"
 msgstr "且未被认证"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:963
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3351,69 +3312,66 @@ msgstr ""
 "%(type)s 加密 %(status)s 活动 %(authenticated)s。\n"
 "您的聊天会话 %(logged)s 将被记录。"
 
-#: ../src/chat_control.py:2219
+#: ../src/chat_control.py:1102
 msgid "Session negotiation cancelled"
 msgstr "会话协商已取消"
 
-#: ../src/chat_control.py:2229
+#: ../src/chat_control.py:1112
 msgid "This session WILL be archived on server"
 msgstr "本次会话将在服务器上被存档"
 
-#: ../src/chat_control.py:2231
+#: ../src/chat_control.py:1114
 msgid "This session WILL NOT be archived on server"
 msgstr "本次会话将不会在服务器上被存档"
 
-#: ../src/chat_control.py:2240
+#: ../src/chat_control.py:1123
 msgid "This session is encrypted"
 msgstr "本次会话已被加密"
 
-#: ../src/chat_control.py:2243
+#: ../src/chat_control.py:1126
 msgid " and WILL be logged"
 msgstr "且会被记录"
 
-#: ../src/chat_control.py:2245
+#: ../src/chat_control.py:1128
 msgid " and WILL NOT be logged"
 msgstr "且不会被记录"
 
-#: ../src/chat_control.py:2250
+#: ../src/chat_control.py:1133
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr "远程联系人的身份未确认。点击盾型按钮查看详情。"
 
-#: ../src/chat_control.py:2252
+#: ../src/chat_control.py:1135
 msgid "E2E encryption disabled"
 msgstr "E2E 加密被禁用"
 
-#: ../src/chat_control.py:2296 ../src/chat_control.py:2309
+#: ../src/chat_control.py:1184 ../src/chat_control.py:1198
 msgid "The following message was NOT encrypted"
 msgstr "下面的消息没有被加密"
 
-#: ../src/chat_control.py:2302
+#: ../src/chat_control.py:1190
 msgid "The following message was encrypted"
 msgstr "下面的消息是加密的"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2580
+#: ../src/chat_control.py:1488
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "您刚刚收到一条来自 \"%s\" 的消息"
 
-#: ../src/chat_control.py:2581
+#: ../src/chat_control.py:1490
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用了历史, 此消息会丢失。"
 
-#: ../src/chat_control.py: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
-msgid "Database Error"
-msgstr "数据库错误"
+#: ../src/chat_control.py:1521 ../src/groupchat_control.py:1390
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr "Pong! (%s s.)"
 
-#: ../src/chat_control.py:2728
+#: ../src/chat_control.py:1672
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3421,126 +3379,440 @@ msgid ""
 msgstr ""
 "数据库文件 (%s) 不能被读取。请尝试修复它或者移除它（所有历史记录会丢失）。"
 
-#: ../src/chat_control.py:2976
+#: ../src/chat_control.py:1704
+#, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"主题: %(subject)s\n"
+"%(message)s"
+
+#: ../src/chat_control.py:1883 ../src/gui_interface.py:1197
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+"无法解密来自 %s 的消息\n"
+"它可能被篡改了。"
+
+#: ../src/chat_control.py:1940
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s 的状态是 %(status)s"
 
+#: ../src/chat_control.py:1999
+#, fuzzy
+msgid "File transfer"
+msgstr "文件传输"
+
+#: ../src/chat_control.py:2002
+#, fuzzy
+msgid "Size"
+msgstr "大小:  %s"
+
+#: ../src/chat_control.py:2004
+#, fuzzy
+msgid "_Accept"
+msgstr "帐户(_A)"
+
+#: ../src/chat_control.py:2025 ../src/filetransfers_window.py:212
+msgid "File transfer completed"
+msgstr "文件传输已完成"
+
+#: ../src/chat_control.py:2057 ../src/dialogs.py:2983 ../src/dialogs.py:4830
+#: ../src/gui_interface.py:665 ../src/notify.py:289
+msgid "Groupchat Invitation"
+msgstr "多人聊天邀请"
+
+#: ../src/chat_control.py:2079 ../src/gui_interface.py:1040
+#: ../src/roster_window.py:2016
+msgid "Remote contact stopped transfer"
+msgstr "远程联系人停止了传输"
+
+#: ../src/chat_control.py:2081 ../src/gui_interface.py:1043
+#: ../src/roster_window.py:2018
+msgid "Error opening file"
+msgstr "打开文件错误"
+
+#: ../src/chat_control.py:2083 ../src/filetransfers_window.py:247
+msgid "File transfer stopped"
+msgstr "文件传输已停止"
+
+#: ../src/chat_control.py:2086 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:234
+msgid "File transfer cancelled"
+msgstr "文件传输已取消"
+
+#: ../src/chat_control.py:2087 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:235
+msgid "Connection with peer cannot be established."
+msgstr "无法与对方建立连接。"
+
+#. Example string. Do not translate
+#: ../src/command_system/implementation/custom.py:106
+msgid "The same as using a doc-string, except it supports translation"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:53
+msgid "Execute expression inside a shell, show output"
+msgstr ""
+
+#: ../src/command_system/implementation/execute.py:109
+msgid "Execute expression inside a shell, send output"
+msgstr ""
+
+#: ../src/command_system/implementation/middleware.py:72
+msgid "Error during command execution!"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:50
+msgid "Hide the chat buttons"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:56
+msgid ""
+"Show help on a given command or a list of available commands if -a is given"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:83
+#, fuzzy
+msgid "Send a message to the contact"
+msgstr "向联系人发送文件"
+
+#: ../src/command_system/implementation/standard.py:88
+msgid "Send action (in the third person) to the current chat"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:93
+msgid "Show logged messages which mention given text"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:99
+#, fuzzy, python-format
+msgid "%s: Nothing found"
+msgstr " %s 未找到"
+
+#: ../src/command_system/implementation/standard.py:105
+msgid "Limit must be an integer"
+msgstr ""
+
+#. Do not translate online, away, chat, xa, dnd
+#: ../src/command_system/implementation/standard.py:130
+msgid ""
+"\n"
+"    Set the current status\n"
+"\n"
+"    Status can be given as one of the following values:\n"
+"    online, away, chat, xa, dnd.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:148
+msgid "Set the current status to away"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:151
+#: ../src/common/commands.py:110 ../src/common/helpers.py:270
+#: ../src/tooltips.py:913
+msgid "Away"
+msgstr "离开"
+
+#: ../src/command_system/implementation/standard.py:162
+msgid "Set the current status to online"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:165
+msgid "Available"
+msgstr "在线"
+
+#: ../src/command_system/implementation/standard.py:185
+#: ../src/command_system/implementation/standard.py:267
+#, fuzzy
+msgid "Clear the text window"
+msgstr "隐藏该窗口"
+
+#: ../src/command_system/implementation/standard.py:190
+#, fuzzy
+msgid "Toggle the OpenPGP encryption"
+msgstr "切换Open_PGP加密"
+
+#: ../src/command_system/implementation/standard.py:195
+#: ../src/command_system/implementation/standard.py:415
+#, fuzzy
+msgid "Send a ping to the contact"
+msgstr "向联系人发送文件"
+
+#: ../src/command_system/implementation/standard.py:198
+#: ../src/command_system/implementation/standard.py:418
+msgid "Command is not supported for zeroconf accounts"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:202
+msgid "Send DTMF sequence through an open audio session"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:205
+msgid "No open audio sessions with the contact"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:208
+#, fuzzy, python-format
+msgid "%s is not a valid tone"
+msgstr "%s 不是一个合法的日志级别"
+
+#: ../src/command_system/implementation/standard.py:218
+#, fuzzy
+msgid "Audio sessions are not available"
+msgstr "一个连接不可用"
+
+#: ../src/command_system/implementation/standard.py:228
+#, fuzzy
+msgid "Video sessions are not available"
+msgstr "连接不可用"
+
+#: ../src/command_system/implementation/standard.py:235
+msgid "Send a message to the contact that will attract his (her) attention"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:274
+#, fuzzy
+msgid "Change your nickname in a group chat"
+msgstr "更改您的昵称(Ctrl+N)"
+
+#. invalid char
+#: ../src/command_system/implementation/standard.py:279 ../src/config.py:3439
+#: ../src/dialogs.py:2195
+msgid "Invalid nickname"
+msgstr "无效的昵称"
+
+#: ../src/command_system/implementation/standard.py:284
+#, fuzzy
+msgid "Open a private chat window with a specified occupant"
+msgstr "与用户打开聊天窗口(_O)"
+
+#: ../src/command_system/implementation/standard.py:290
+#: ../src/command_system/implementation/standard.py:299
+#: ../src/command_system/implementation/standard.py:353
+#: ../src/command_system/implementation/standard.py:365
+#: ../src/command_system/implementation/standard.py:377
+#, fuzzy
+msgid "Nickname not found"
+msgstr "要使用的昵称"
+
+#: ../src/command_system/implementation/standard.py:293
+msgid ""
+"Open a private chat window with a specified occupant and send him a message"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:302
+#, fuzzy
+msgid "Display or change a group chat topic"
+msgstr "关闭多人聊天标签/窗口前询问。"
+
+#: ../src/command_system/implementation/standard.py:310
+msgid "Invite a user to a room for a reason"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:313
+#, fuzzy, python-format
+msgid "Invited %s to %s"
+msgstr "发送 %s 给 %s"
+
+#: ../src/command_system/implementation/standard.py:316
+msgid "Join a group chat given by a jid, optionally using given nickname"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:333
+msgid ""
+"Leave the groupchat, optionally giving a reason, and close tab or window"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:338
+msgid ""
+"\n"
+"    Ban user by a nick or a jid from a groupchat\n"
+"\n"
+"    If given nickname is not found it will be treated as a jid.\n"
+"    "
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:350
+#, fuzzy
+msgid "Kick user by a nick from a groupchat"
+msgstr "您被邀请到一个聊天室"
+
+#. Do not translate moderator, participant, visitor, none
+#: ../src/command_system/implementation/standard.py:358
+msgid ""
+"Set occupant role in group chat.\n"
+"    Role can be given as one of the following values:\n"
+"    moderator, participant, visitor, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:363
+#, fuzzy
+msgid "Invalid role given"
+msgstr "无效的服务器"
+
+#. Do not translate owner, admin, member, outcast, none
+#: ../src/command_system/implementation/standard.py:370
+msgid ""
+"Set occupant affiliation in group chat.\n"
+"    Affiliation can be given as one of the following values:\n"
+"    owner, admin, member, outcast, none"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:375
+#, fuzzy
+msgid "Invalid affiliation given"
+msgstr "归属变更"
+
+#: ../src/command_system/implementation/standard.py:383
+#, fuzzy
+msgid "Display names of all group chat occupants"
+msgstr "%s 不是一个聊天室的名称。"
+
+#: ../src/command_system/implementation/standard.py:405
+msgid "Forbid an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/implementation/standard.py:410
+msgid "Allow an occupant to send you public or private messages"
+msgstr ""
+
+#: ../src/command_system/mapping.py:164 ../src/command_system/mapping.py:174
+#: ../src/command_system/mapping.py:194
+#, fuzzy
+msgid "Missing arguments"
+msgstr "缺失的\"联系人 JID\"参数"
+
+#: ../src/command_system/mapping.py:261
+msgid "Excessive arguments"
+msgstr ""
+
 #: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
-#: ../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:248
+#, fuzzy, python-format
+msgid "moving %s to %s"
+msgstr "发送 %s 给 %s"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:316 ../src/common/check_paths.py:323
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 是一个文件但它应该是一个目录"
 
-#: ../src/common/check_paths.py: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:275 ../src/common/check_paths.py:282
+#: ../src/common/check_paths.py:289 ../src/common/check_paths.py:296
+#: ../src/common/check_paths.py:303 ../src/common/check_paths.py:310
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:324
+#: ../src/common/check_paths.py:336 ../src/common/check_paths.py:344
 msgid "Gajim will now exit"
 msgstr "Gajim 即将退出"
 
-#: ../src/common/check_paths.py:319 ../src/common/check_paths.py:334
+#: ../src/common/check_paths.py:335 ../src/common/check_paths.py:343
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 是一个目录但它应该是一个文件"
 
-#: ../src/common/check_paths.py:351
-#, python-format
-msgid "creating %s directory"
-msgstr "正在建立 %s 目录"
-
-#: ../src/common/commands.py:82
+#: ../src/common/commands.py:86
 msgid "Change status information"
 msgstr "改变状态信息"
 
-#: ../src/common/commands.py:97
+#: ../src/common/commands.py:101
 msgid "Change status"
 msgstr "改变状态"
 
-#: ../src/common/commands.py:98
+#: ../src/common/commands.py:102
 msgid "Set the presence type and description"
 msgstr "设置状态类型与描述"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:108
 msgid "Free for chat"
 msgstr "和我聊天吧"
 
-#: ../src/common/commands.py:105
+#: ../src/common/commands.py:109
 msgid "Online"
 msgstr "在线"
 
-#: ../src/common/commands.py:107
+#: ../src/common/commands.py:111
 msgid "Extended away"
 msgstr "离开很久了"
 
-#: ../src/common/commands.py:108
+#: ../src/common/commands.py:112
 msgid "Do not disturb"
 msgstr "请无打扰"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:113
 msgid "Offline - disconnect"
 msgstr "离线 - 未连接"
 
-#: ../src/common/commands.py:114
+#: ../src/common/commands.py:118
 msgid "Presence description:"
 msgstr "状态描述: "
 
-#: ../src/common/commands.py:149 ../src/common/commands.py:317
+#: ../src/common/commands.py:153 ../src/common/commands.py:329
 msgid "The status has been changed."
 msgstr "状态发生了变化。"
 
-#: ../src/common/commands.py:181 ../src/common/commands.py:207
+#: ../src/common/commands.py:185 ../src/common/commands.py:211
 msgid "Leave Groupchats"
 msgstr "离开聊天室"
 
-#: ../src/common/commands.py:197
+#: ../src/common/commands.py:201
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "聊天室 %(room_jid)s 的 %(nickname)s"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:205
 msgid "You have not joined a groupchat."
 msgstr "您还没有加入聊天室。"
 
-#: ../src/common/commands.py:208
+#: ../src/common/commands.py:212
 msgid "Choose the groupchats you want to leave"
 msgstr "选择您想要离开的聊天室"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212 ../src/common/contacts.py: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/commands.py:216 ../src/common/contacts.py:135
+#: ../src/common/helpers.py:73 ../src/roster_window.py:844
+#: ../src/roster_window.py:1761 ../src/roster_window.py:1763
+#: ../src/roster_window.py:2629 ../src/roster_window.py:5655
 msgid "Groupchats"
 msgstr "多人聊天"
 
-#: ../src/common/commands.py:253
+#: ../src/common/commands.py:257
 msgid "You left the following groupchats:"
 msgstr "您退出了下列聊天室: "
 
-#: ../src/common/commands.py:265
+#: ../src/common/commands.py:269
 msgid "Forward unread messages"
 msgstr "转发未读消息"
 
-#: ../src/common/commands.py:287
+#: ../src/common/commands.py:296
 msgid "All unread messages have been forwarded."
 msgstr "所有未读消息都已被转发。"
 
-#: ../src/common/commands.py:295
+#: ../src/common/commands.py:304
 msgid "Forward unread message then disconnect"
 msgstr " 转发未读消息然后断开连接"
 
+#: ../src/common/config.py:74
+msgid ""
+"Show desktop notification even when a chat window is opened for this contact "
+"and does not have focus"
+msgstr ""
+
 #: ../src/common/config.py:75
 msgid "Play sound when user is busy"
 msgstr "在用于忙是播放声音"
@@ -3562,7 +3834,8 @@ msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (离开, 因为闲置超过了$T分钟)"
 
 #: ../src/common/config.py:82
-msgid "$S will be replaced by current status message, $T by autoaway time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoawaytime."
 msgstr "$S 会被当前的状态消息替换, $T 会被自动离开的时间替换。"
 
 #: ../src/common/config.py:84
@@ -3574,7 +3847,8 @@ msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (离开很久了, 因为闲置超过了$T分钟)"
 
 #: ../src/common/config.py:85
-msgid "$S will be replaced by current status message, $T by autoxa time."
+#, fuzzy
+msgid "$S will be replaced by current status message, $T by autoxatime."
 msgstr "$S 会被当前的状态消息替换, $T 会被自动不可用的时间替换。"
 
 #: ../src/common/config.py:88
@@ -3582,63 +3856,120 @@ msgid ""
 "When to show notification area icon. Can be 'never', 'on_event', 'always'."
 msgstr "何时在通知区域显示图标。可以是'从不', '当有未处理的事件时', '总是'。"
 
-#: ../src/common/config.py:93
+#: ../src/common/config.py:89
+msgid "Allow to hide the roster window even if the tray icon is not shown."
+msgstr ""
+
+#: ../src/common/config.py:94
 msgid "Incoming nickname color."
 msgstr "收到消息的昵称颜色。"
 
-#: ../src/common/config.py:94
+#: ../src/common/config.py:95
 msgid "Outgoing nickname color."
 msgstr "发出消息的昵称颜色。"
 
-#: ../src/common/config.py:95
+#: ../src/common/config.py:96
 msgid "Incoming text color."
 msgstr "收到消息的文本颜色。"
 
-#: ../src/common/config.py:96
+#: ../src/common/config.py:97
 msgid "Outgoing text color."
 msgstr "发出消息的文本颜色。"
 
-#: ../src/common/config.py:97
+#: ../src/common/config.py:98
 msgid "Status message text color."
 msgstr "状态消息文本颜色"
 
-#: ../src/common/config.py:100
+#: ../src/common/config.py:101
+#, fuzzy
+msgid "Contact signed in notification color."
+msgstr "在通知区域中显示事件(_S)"
+
+#. limegreen
+#: ../src/common/config.py:102
+#, fuzzy
+msgid "Contact signout notification color"
+msgstr "在通知区域中显示事件(_S)"
+
+#. red
+#: ../src/common/config.py:103
+#, fuzzy
+msgid "New message/email notification color."
+msgstr "在弹出提示中预览消息?"
+
+#. dodgerblue
+#: ../src/common/config.py:104
+#, fuzzy
+msgid "File transfer request notification color."
+msgstr "文件传输请求"
+
+#. khaki
+#: ../src/common/config.py:105
+#, fuzzy
+msgid "File transfer error notification color."
+msgstr "文件传输已取消"
+
+#. firebrick
+#: ../src/common/config.py:106
+#, fuzzy
+msgid "File transfer complete or stopped notification color."
+msgstr "当文件传输完成时弹出提示"
+
+#. yellowgreen
+#: ../src/common/config.py:107
+#, fuzzy
+msgid "Groupchat invitation notification color"
+msgstr "多人聊天邀请"
+
+#. tan1
+#: ../src/common/config.py:108
+#, fuzzy
+msgid "Background color of status changed notification"
+msgstr "当联系人刚刚登入时的背景色。"
+
+#. thistle2
+#: ../src/common/config.py:109
+msgid "Other dialogs color."
+msgstr ""
+
+#. white
+#: ../src/common/config.py:110
 msgid "Incoming nickname font."
 msgstr "收到消息的昵称的字体。"
 
-#: ../src/common/config.py:101
+#: ../src/common/config.py:111
 msgid "Outgoing nickname font."
 msgstr "发出消息的昵称字体。"
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:112
 msgid "Incoming text font."
 msgstr "收到消息的文本字体。"
 
-#: ../src/common/config.py:103
+#: ../src/common/config.py:113
 msgid "Outgoing text font."
 msgstr "发出消息的文本字体。"
 
-#: ../src/common/config.py:104
+#: ../src/common/config.py:114
 msgid "Status message text font."
 msgstr "状态消息文本字体。"
 
-#: ../src/common/config.py:105
+#: ../src/common/config.py:115
 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:116 ../src/common/config.py:537
+#: ../src/common/optparser.py:304 ../src/common/optparser.py:500
+#: ../src/common/optparser.py:534 ../src/gui_interface.py:2850
 msgid "default"
 msgstr "默认"
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:122
 msgid "Language used by speller"
 msgstr "拼写检查的语言"
 
-#: ../src/common/config.py:113
+#: ../src/common/config.py:123
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3648,7 +3979,7 @@ msgstr ""
 "'有时' - 如 iChat 风格每隔几分钟显示时间。\n"
 "'从不' - 从不显示时间。"
 
-#: ../src/common/config.py:114
+#: ../src/common/config.py:124
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
@@ -3657,16 +3988,16 @@ msgstr ""
 "使用模糊时钟打印时间。模糊度的值从 1 到 4, 或者 0 禁用模糊时钟。1 是最精确的"
 "时钟, 4 是最不精确的。只在'有时'显示时间时使用。"
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:127
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "将成对出现的 * / _ 视为可能的格式控制字符。"
 
-#: ../src/common/config.py:118
+#: ../src/common/config.py:128
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果为真, 则不移除 */_。这样 *abc* 将被加粗但 * * 不会被移除。"
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:131
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
@@ -3676,13 +4007,13 @@ msgstr ""
 "考http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (如果\n"
 "您想使用此功能, 请安装 docutils)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:140
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
 msgstr "当在多人聊天中使用昵称补全(Tab)时加到昵称后的字符。"
 
-#: ../src/common/config.py:131
+#: ../src/common/config.py:141
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3690,6 +4021,16 @@ msgstr "当请求的昵称被聊天室中的其他人使用时加到请求的昵
 
 #: ../src/common/config.py:159
 msgid ""
+"If True, Gajim will save roster position when hiding roster, and restore it "
+"when showing roster."
+msgstr ""
+
+#: ../src/common/config.py:165
+msgid "Place the roster on the right in single window mode"
+msgstr ""
+
+#: ../src/common/config.py:172
+msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
 "strftime for full documentation: http://docs.python.org/lib/module-time.html"
@@ -3698,59 +4039,71 @@ msgstr ""
 "\"[小时:分钟]\"。请参考 Python doc 关于 strftime 的文档:\n"
 "http://docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:160
+#: ../src/common/config.py:173
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "在对话中显示在昵称前的字符"
 
-#: ../src/common/config.py:161
+#: ../src/common/config.py:174
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "在对话中显示在昵称后的字符"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:177
 msgid ""
 "Specify the command to run when new mail arrives, e.g.: /usr/bin/getmail -q"
 msgstr "指定新电子邮件到达时执行的命令, 比如: /usr/bin/getmail -q"
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:179
 msgid "Add * and [n] in roster title?"
 msgstr "在联系人列表标题中加入 * 和 [n]?"
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:180
+#, fuzzy
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
-"is reopened."
+"is reopened?"
 msgstr "聊天标签/窗口被重新打开时显示之前进行的对话的最后多少行。"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:181
 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."
+#: ../src/common/config.py:182
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit"
 msgstr "当加入聊天室时向服务器请求聊天记录的行数。"
 
-#: ../src/common/config.py:170
-msgid "How many minutes back to request logs when a entering a groupchat."
+#: ../src/common/config.py:183
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit"
 msgstr "当加入聊天室时请求多少分钟以内的聊天记录。"
 
-#: ../src/common/config.py:171
+#: ../src/common/config.py:184
 msgid ""
 "How many seconds to wait before trying to autorejoin to a conference you are "
 "being disconnected from. Set to 0 to disable autorejoining."
 msgstr ""
 "自动重新加入一个断开了的聊天室前等待多少秒。设为 0 以禁用自动重新加入。"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:185
+msgid ""
+"Should autorejoin be activated when we are being kicked from a conference?"
+msgstr ""
+
+#: ../src/common/config.py:186
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr "用 Ctrl+Enter 发送消息, Enter 开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:188
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "为 Ctrl+KeyUP 存储多少行。"
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:191
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3759,11 +4112,11 @@ msgstr ""
 "自定义地址, 在其中应包含 %s, %s 是单词/短语; 或'WIKTIONARY'以使用 "
 "wiktionary。"
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:194
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果选中, Gajim 可以被 gajim-remote 远程控制。"
 
-#: ../src/common/config.py:182
+#: ../src/common/config.py:195
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
 "of accounts (provided they do not have listen_to_network_manager set to "
@@ -3774,48 +4127,51 @@ msgstr ""
 "态(如果它们没有将 listen_to_network_manager 设置为假而且它们被设置为与\n"
 "全局状态同步)。"
 
-#: ../src/common/config.py:183
+#: ../src/common/config.py:196
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:197
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr "在聊天窗口中显示聊天状态通知。可以是全部, 近正在编辑, 禁用中的一个。"
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:199
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr "当不是每条消息都显示时间('有时'显示时间)时, 每多少分钟显示时间。"
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:200
 msgid "Ask before closing a group chat tab/window."
 msgstr "关闭多人聊天标签/窗口前询问。"
 
-#: ../src/common/config.py:188
+#: ../src/common/config.py:201
+#, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr "关闭这个空格分隔的列表中的聊天室的标签/窗口前总是询问。"
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:202
+#, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
-"of group chat jids."
+"of group chat JIDs."
 msgstr "关闭这个空格分隔的列表中的聊天室的标签/窗口前从不询问。"
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:203
+#, fuzzy
 msgid ""
-"Ask before closing tabbed chat window if there are control that can loose "
+"Ask before closing tabbed chat window if there are controls that can lose "
 "data (chat, private chat, groupchat that will not be minimized)"
 msgstr ""
 "如果有可能丢失数据的控件(不会被最小化的聊天, 私人聊天, 多人聊天), 在关\n"
 "闭有标签的窗口前询问。"
 
-#: ../src/common/config.py:193
+#: ../src/common/config.py:206
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
 "for File Transfer in case of address translation/port forwarding."
@@ -3823,27 +4179,33 @@ msgstr ""
 "逗号分割的列表。在有地址翻译/端口转发的情况下, 除了本地接口, 还将向其中\n"
 "的主机发送文件传输请求。"
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:208
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 1 KiB = 1024 bytes(字节), 1 KB = 1000 bytes。"
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:210
 msgid "Notify of events in the notification area."
 msgstr "在通知区域中提示事件"
 
-#: ../src/common/config.py:203
+#: ../src/common/config.py:211
+msgid ""
+"If False, Gajim will display a static event icon instead of the blinking "
+"status icon in the notification area when notifying on event."
+msgstr ""
+
+#: ../src/common/config.py:217
 msgid "Show tab when only one conversation?"
 msgstr "只有一个对话时显示标签?"
 
-#: ../src/common/config.py:204
+#: ../src/common/config.py:218
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "在聊天窗口中显示标签组的边框。"
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:219
 msgid "Show close button in tab?"
 msgstr "在标签上显示关闭按钮?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:220
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3854,27 +4216,24 @@ msgstr ""
 "法的组有 1, 2, 5, 14, 15, 16, 17 和 18。更高的数字更安全, 但在您开始会\n"
 "话时需要更长的时间计算"
 
-#: ../src/common/config.py:215
+#: ../src/common/config.py:241
 msgid "Preview new messages in notification popup?"
 msgstr "在弹出提示中预览消息?"
 
-#: ../src/common/config.py:220
+#: ../src/common/config.py:246
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "用分号隔开的在多人聊天中将高亮显示的单词列表。"
 
-#: ../src/common/config.py:221
+#: ../src/common/config.py:247
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if notification icon is used."
-msgstr "如果为真, 单击窗口管理器的 X 按钮会退出 Gajim。这一设定仅当启用通知区域图标时会生效。"
-
-#: ../src/common/config.py:222
-msgid ""
-"If True, Gajim will check if it's the default jabber client on each startup."
-msgstr "如果为真,  Gajim 会在每次启动时检测它是否是默认的 jabber 客户端。"
+msgstr ""
+"如果为真, 单击窗口管理器的 X 按钮会退出 Gajim。这一设定仅当启用通知区域图标时"
+"会生效。"
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:248
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3882,7 +4241,7 @@ msgstr ""
 "如果为真,  Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题, 该图标可"
 "能是动态的。"
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window."
@@ -3890,11 +4249,11 @@ msgstr ""
 "如果为真,  Gajim 将在联系人列表窗口中每一个联系人名字的下方显示状态信息（如果"
 "不为空）。"
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:255
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "定义了在联系人列表中头像的显示位置。可以是左或右"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:256
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3902,7 +4261,7 @@ msgstr ""
 "如过为真, Gajim 会向每一个缓存的头像太久或上次未能获得其头像的联系人请求头"
 "像。"
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:257
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or his or her status message."
@@ -3910,9 +4269,10 @@ msgstr ""
 "如果为假, Gajim 将不会在联系人的状态或状态消息变化时在聊天窗口中显示一行提"
 "示。"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:258
+#, fuzzy
 msgid ""
-"can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
+"Can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
 "status and/or his or her status message. If \"all\" Gajim will print all "
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
@@ -3924,28 +4284,32 @@ msgstr ""
 "有的状态消息。如果是\"登入与登出\", Gajim 将只提示聊天室中中登入与登出\n"
 "消息。"
 
-#: ../src/common/config.py:235
+#: ../src/common/config.py:260
+msgid "Log XHTML messages instead of plain text messages."
+msgstr ""
+
+#: ../src/common/config.py:261
 msgid "Background color of contacts when they just signed in."
 msgstr "当联系人刚刚登入时的背景色。"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:262
 msgid "Background color of contacts when they just signed out."
 msgstr "当联系人刚刚登出时的背景色。"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:264
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "如果为真, 恢复显示的消息将用较小的字体显示。"
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:265
 msgid "Don't show avatar for the transport itself."
 msgstr "不显示代理本身的头像。"
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:266
 msgid "Don't show roster in the system taskbar."
 msgstr "不要将联系人列表窗口显示在系统的任务栏中。"
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:267
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3954,7 +4318,7 @@ msgstr ""
 "如果为真并且安装的 GTK+ 和 PyGTK 的版本至少为 2.8, 当有未处理事件时使窗\n"
 "口闪烁(大部分窗口管理器的默认响应)"
 
-#: ../src/common/config.py:243
+#: ../src/common/config.py:269
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
 "chat. Turn this option to False to stop sending sha info in group chat "
@@ -3964,7 +4328,8 @@ msgstr ""
 "\"以停止在多人聊天中发送 SHA 信息。"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:246
+#: ../src/common/config.py:272
+#, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3972,7 +4337,7 @@ msgid ""
 "along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"'pertype' - Each message type (e.g. chats vs. groupchats) is sent to a "
 "specific window."
 msgstr ""
 "控制新消息被放置的窗口。\n"
@@ -3983,102 +4348,97 @@ msgstr ""
 "'peracct' - 每个账户的消息发送到一个单独的窗口。\n"
 "'pertype' - 每种类型的消息 (例如, 聊天 及 多人聊天) 发送到一个单独的窗口。"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:273
+msgid ""
+"Show roster on startup.\n"
+"'always' - Always show roster.\n"
+"'never' - Never show roster.\n"
+"'last_state' - Restore the last state roster."
+msgstr ""
+
+#: ../src/common/config.py:274
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "如果为假, 您将不会在窗口中看到头像。"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:275
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "如果为真, 按 Escape 键将关闭标签/窗口。"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:276
 msgid "Hides the buttons in chat windows."
 msgstr "在聊天窗口中隐藏按钮。"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:277
 msgid "Hides the banner in a group chat window"
 msgstr "在多人聊天窗口中隐藏标语"
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:278
 msgid "Hides the banner in two persons chat window"
 msgstr "在双人聊天窗口中隐藏标语"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:279
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "在多人聊天窗口中隐藏房主列表。"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:280
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
 msgstr ""
 "在聊天中, 只在当前一条消息不是由同一个人发出的的时候才在一行前显示昵称。"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:281
 msgid "Indentation when using merge consecutive nickname."
 msgstr "当合并连续昵称时缩进。"
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:282
 msgid "Smooth scroll message in conversation window"
 msgstr "平滑滚动聊天窗口中的消息"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:283
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "在多人聊天中用于昵称的颜色列表, 以\":\"分隔。"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:284
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "当所有标签中没有未读消息时按 Ctrl-Tab 转到下一个正在编辑的标签。"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:285
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr "是否显示确认元联系人创建对话框?空字符串意味着从不显示对话框。"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:286
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr "是否显示确认屏蔽联系人对话框?空字符串意味着从不显示对话框。"
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:287
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr "是否显示确认发送自定义状态对话框?空字符串意味着从不显示对话框。"
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:288
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
-"如果为真, 您将可以在修改账户窗口中为您的账户可以设置一个负的优先级。注意!当"
-"您使用负的优先级登入时您将不能从服务器收到任何消息。"
-
-#: ../src/common/config.py:262
-msgid ""
-"If True, Gajim will use Gnome Keyring (if available) to store account "
-"passwords."
-msgstr "如果为真, Gajim 会使用 Gnome Keyring (如果可用) 存储账户的密码。"
-
-#: ../src/common/config.py:263
-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:289
 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:290
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4086,48 +4446,34 @@ msgstr ""
 "可以是空字符串, 'chat'或'normal'。如果不为空, 将把所有收到的消息当作这个类"
 "型。"
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:291
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 "如果为真, 在聊天窗口没有打开时, Gajim 会滚动并选出最后给您发送消息的联系人。"
 
-#: ../src/common/config.py:267
-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:292
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "时间, 如果在此时间内没有活动, 将改变状态窗口关闭。"
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:293
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "在对话中最多显示的行数。最旧的那些行会被清除。"
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:294
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "notification icon."
 msgstr "如果为真, 由 notification-daemon 创建的提示窗口会依附于通知区域图标。"
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:295
 msgid "Choose interval between 2 checks of idleness."
 msgstr "两次检查闲置之间的时间间隔。"
 
-#: ../src/common/config.py:272
-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:296
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4135,715 +4481,944 @@ msgstr ""
 "合法的 URI Scheme。只有这个列表中的 Scheme 会被接受为\"真正的\" URI。(mailto "
 "和 xmpp 被分开处理)"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:297
+#, fuzzy
 msgid ""
 "Ask offline status message to all offline contacts when connection to an "
-"accoutn is established. WARNING: This causes a lot of requests to be sent!"
-msgstr "请求所有离线联系人的离线状态消息, 当一个账户建立连接时。警告: 这会发送大量的请求!"
+"account is established. WARNING: This causes a lot of requests to be sent!"
+msgstr ""
+"请求所有离线联系人的离线状态消息, 当一个账户建立连接时。警告: 这会发送大量的"
+"请求!"
 
-#: ../src/common/config.py:275
+#: ../src/common/config.py:298
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr "如果为真, 多人聊天中会像 shell 一样自动补全"
 
-#: ../src/common/config.py:276
+#: ../src/common/config.py:299
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr "何时显示自己。可以是\"总是\", \"当用其他资源连接时\"或\"从不\""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:304
 msgid "Optionally fix jingle output video framerate. Example: 10/1 or 25/2"
 msgstr "可选地修正 jingle 视频输出的帧速率。比如: 10/1 或 25/2"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:305
 msgid "Optionally resize jingle output video. Example: 320x240"
 msgstr "可选地缩放 jingle 视频输出尺寸。比如: 320x240"
 
-#: ../src/common/config.py:285
+#: ../src/common/config.py:306
+msgid "If True, You will also see your webcam"
+msgstr ""
+
+#: ../src/common/config.py:309
 msgid ""
 "If True, Gajim will try to use a STUN server when using jingle. The one in "
 "\"stun_server\" option, or the one given by the jabber server."
-msgstr "如果为真, Gajim 在使用 jingle 时会尝试使用 STUN 服务器。服务器可以由\"stun_server\"选项给出, 或由 jabber 服务器给出。"
+msgstr ""
+"如果为真, Gajim 在使用 jingle 时会尝试使用 STUN 服务器。服务器可以由"
+"\"stun_server\"选项给出, 或由 jabber 服务器给出。"
 
-#: ../src/common/config.py:286
+#: ../src/common/config.py:310
 msgid "STUN server to use when using jingle"
 msgstr "在使用 jingle 时使用的 STUN 服务器"
 
-#: ../src/common/config.py:287
+#: ../src/common/config.py:311
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr "如果为真, Gajim 会在聊天室的房主的状态图标上加上一个彩色方框以示归属"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:312
+msgid ""
+"Proxy used for all outgoing connections if the account does not have a "
+"specific proxy configured"
+msgstr ""
+
+#: ../src/common/config.py:313
+msgid "If True, Gajim will ignore incoming attention requestd (\"wizz\")."
+msgstr ""
+
+#: ../src/common/config.py:314
+msgid ""
+"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
+"was closed."
+msgstr ""
+
+#: ../src/common/config.py:315
+#, fuzzy
+msgid ""
+"If enabled, Gajim will show an icon to show that sent message has been "
+"received by your contact"
+msgstr "如果选中, Gajim 不会询问状态消息, 而使用特定的默认消息。"
+
+#: ../src/common/config.py:316
+msgid "Show a mini avatar in chat window tabs and in window icon"
+msgstr ""
+
+#: ../src/common/config.py:330
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:338
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
-"自动连接时使用的状态。可以是\"在线\", \"聊天\", \"离开\", \"离开很久了"
-"\", \"请勿\n"
+"自动连接时使用的状态。可以是\"在线\", \"聊天\", \"离开\", \"离开很久了\", "
+"\"请勿\n"
 "打扰\", \"隐身\"。注意: 仅当 restore_last_status 被禁用时这个选项其作用"
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:339
 msgid "If enabled, restore the last status that was used."
 msgstr "如果启用, 则恢复上次使用的状态。"
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:341
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "如果为真, 联系人的认证请求将被自动接受。"
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:342
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "如果为假, 这个账户将被禁用且不会出现在联系人列表窗口中。"
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:345
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr "如果禁用, 即使 GPG 被配置, 也不使用 GPG 密钥签名 presences。"
 
-#: ../src/common/config.py:317
+#: ../src/common/config.py:347
 msgid "Enable ESessions encryption for this account."
 msgstr "为这个账户启用 ESession 加密。"
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:348
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Gajim 是否应该在可能时自动发起加密的会话?"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:349
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr "应尝试的连接类型的有序列表(用空格分隔)。可以包含 tls, ssl, 或 plain"
 
-#: ../src/common/config.py:320
+#: ../src/common/config.py:352
 msgid ""
-"Show a warning dialog before sending password on an plaintext connection."
+"List (space separated) of authentication mechanisms to try. Can contain "
+"ANONYMOUS, EXTERNAL, GSSAPI, SCRAM-SHA-1-PLUS, SCRAM-SHA-1, DIGEST-MD5, "
+"PLAIN, X-MESSENGER-OAUTH2 or XEP-0078"
+msgstr ""
+
+#: ../src/common/config.py:353
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection. "
+"Can be 'warn', 'connect', 'disconnect'"
 msgstr "在使用明文连接发送密码前显示一个警告对话框。"
 
-#: ../src/common/config.py:321
+#: ../src/common/config.py:354
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "在使用标准 SSL 库前显示一个警告对话框。"
 
-#: ../src/common/config.py:322
+#: ../src/common/config.py:355
+#, fuzzy
 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:358
 msgid "Space separated list of ssl errors to ignore."
 msgstr "应忽略的 SSL 错误列表, 以空格分隔"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:364
+msgid ""
+"Space separated list of JIDs for which you do not want to store logs. You "
+"can also add account name to log nothing for this account."
+msgstr ""
+
+#: ../src/common/config.py:365
+msgid ""
+"Download logs stored on server on Gajim startup if server supports XEP-0136 "
+"or XEP-0313"
+msgstr ""
+
+#: ../src/common/config.py:366
+msgid ""
+"Space separated list of JIDs for which you accept to not log conversations "
+"if he does not want to."
+msgstr ""
+
+#: ../src/common/config.py:369
 msgid "Whitespace sent after inactivity"
 msgstr "在不活动后发送的空白"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:370
 msgid "XMPP ping sent after inactivity"
 msgstr "在不活动后发送的 XMPP ping"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:374
+#, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
-"to reconnect."
+"to reconnect?"
 msgstr "在重新连接前等待 ping alive packet 的回应多少秒"
 
 #. yes, no, ask
-#: ../src/common/config.py:342
+#: ../src/common/config.py:378
 msgid "Jabberd2 workaround"
 msgstr "为 Jabberd2 变通"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:381
 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 和代理进行文件传输。"
+msgstr ""
+"如果选中, Gajim 会使用您在 file_transfer_proxies 选项中定义的 IP 和代理进行文"
+"件传输。"
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:382
+msgid ""
+"If True, Gajim will test file transfer proxies on startup to be sure it "
+"works. Openfire's proxies are known to fail this test even if they work."
+msgstr ""
+
+#: ../src/common/config.py:396
 msgid "Answer to receipt requests"
 msgstr "对回执请求的回应"
 
-#: ../src/common/config.py:360
+#: ../src/common/config.py:397
 msgid "Sent receipt requests"
 msgstr "发送回执请求"
 
-#: ../src/common/config.py:370
+#: ../src/common/config.py:406
+#, fuzzy
+msgid ""
+"Allow Gajim to send information about the operating system you are running."
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
+
+#: ../src/common/config.py:407
+#, fuzzy
+msgid "Allow Gajim to send your local time."
+msgstr "%s 想发送给您一个文件。"
+
+#: ../src/common/config.py:408
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr "在协商加密的会话时, Gajim 是否应该假设您想要您的消息被记录?"
 
-#: ../src/common/config.py:373
+#: ../src/common/config.py:411
 msgid "Message that is sent to contacts you want to add"
 msgstr "向您希望添加的联系人发送的消息"
 
-#: ../src/common/config.py:374
+#: ../src/common/config.py:412
 msgid "Last time we syncronized with logs from server."
 msgstr "上次从服务器同步历史记录"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:413
+msgid ""
+"If enabled and if server supports this feature, Gajim will receive messages "
+"sent and received by other resources."
+msgstr ""
+
+#: ../src/common/config.py:414
+msgid ""
+"If enabled, Gajim will send your local IPs so your contact can connect to "
+"your machine to transfer files."
+msgstr ""
+
+#: ../src/common/config.py:415
+#, fuzzy
+msgid "Latest token for Oauth2 authentication."
+msgstr "匿名认证"
+
+#: ../src/common/config.py:416
+#, fuzzy
+msgid "client_id for Oauth2 authentication."
+msgstr "匿名认证(_Y)"
+
+#: ../src/common/config.py:417
+msgid "redirect_url for Oauth2 authentication."
+msgstr ""
+
+#: ../src/common/config.py:418
+msgid ""
+"Space separated list of JIDs for which we want to re-open a chat window on "
+"next startup."
+msgstr ""
+
+#: ../src/common/config.py:419
+#, fuzzy
+msgid "Last MAM id we are syncronized with"
+msgstr "上次从服务器同步历史记录"
+
+#: ../src/common/config.py:481
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否为此联系人使用 OpenPGP?"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:482
 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:483 ../src/common/config.py:486
 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:487
+#, fuzzy
+msgid ""
+"How many lines to request from server when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "当加入聊天室时向服务器请求聊天记录的行数。"
 
-#: ../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:488
+#, fuzzy
+msgid ""
+"How many minutes back to request logs when entering a groupchat. -1 means no "
+"limit, -2 means global value"
+msgstr "当加入聊天室时请求多少分钟以内的聊天记录。"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:491
+#, fuzzy
 msgid ""
-"State whether plugins should be activated on exit (this is saved on Gajim "
+"State whether plugins should be activated on startup (this is saved on Gajim "
 "exit). This option SHOULD NOT be used to (de)activate plug-ins. Use GUI "
 "instead."
-msgstr "表述在退出时是否激活插件(在 Gajim 退出时这会被保存)。这个选项不应该用于激活或禁用插件。使用图形界面代替。"
+msgstr ""
+"表述在退出时是否激活插件(在 Gajim 退出时这会被保存)。这个选项不应该用于激活或"
+"禁用插件。使用图形界面代替。"
 
-#: ../src/common/config.py:465 ../src/common/pep.py:157
+#: ../src/common/config.py:496 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:497
 msgid "Back soon"
 msgstr "马上回来"
 
-#: ../src/common/config.py:466
+#: ../src/common/config.py:497
 msgid "Back in some minutes."
 msgstr "几分钟就回来。"
 
-#: ../src/common/config.py:467 ../src/common/pep.py:127
+#: ../src/common/config.py:498 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "吃东西"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:498
 msgid "I'm eating, so leave me a message."
 msgstr "我在吃东西, 请留言"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:499
 msgid "Movie"
 msgstr "电影"
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:499
 msgid "I'm watching a movie."
 msgstr "我正在看电影。"
 
-#: ../src/common/config.py:469 ../src/common/pep.py:186
+#: ../src/common/config.py:500 ../src/common/pep.py:186
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:469
+#: ../src/common/config.py:500
 msgid "I'm working."
 msgstr "我正在工作。"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:501
 msgid "Phone"
 msgstr "打电话"
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:501
 msgid "I'm on the phone."
 msgstr "我正在打电话"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:502
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:502
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活。"
 
-#: ../src/common/config.py:482
+#: ../src/common/config.py:513
 msgid "I'm available."
 msgstr "我现在在线。"
 
-#: ../src/common/config.py:483
+#: ../src/common/config.py:514
 msgid "I'm free for chat."
 msgstr "和我聊天吧"
 
-#: ../src/common/config.py:484 ../src/config.py:1600
+#: ../src/common/config.py:515 ../src/config.py:1656
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: ../src/common/config.py:485
+#: ../src/common/config.py:516
 msgid "I'm not available."
 msgstr "我已经很久不在了。"
 
-#: ../src/common/config.py:486
+#: ../src/common/config.py:517
 msgid "Do not disturb."
 msgstr "请勿打扰。"
 
-#: ../src/common/config.py:487 ../src/common/config.py:488
+#: ../src/common/config.py:518 ../src/common/config.py:519
 msgid "Bye!"
 msgstr "再见!"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:530
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
 "muc_highlight_words, or when a group chat message contains your nickname."
-msgstr "当收到的多人聊天消息包含 \"muc_highlight_words\" 或您的昵称时播放的声音。"
+msgstr ""
+"当收到的多人聊天消息包含 \"muc_highlight_words\" 或您的昵称时播放的声音。"
 
-#: ../src/common/config.py:499
+#: ../src/common/config.py:531
 msgid "Sound to play when any MUC message arrives."
 msgstr "收到任意多人聊天消息播放的声音。"
 
-#: ../src/common/config.py:508 ../src/common/optparser.py:308
+#: ../src/common/config.py:540 ../src/common/optparser.py:318
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:512 ../src/common/optparser.py:294
+#: ../src/common/config.py:544 ../src/common/optparser.py:304
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:516
+#: ../src/common/config.py:548
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:520
+#: ../src/common/config.py:552
 msgid "marine"
 msgstr "海洋"
 
-#: ../src/common/connection_handlers_events.py:322
-#, 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
-#, 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
-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
-#, 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
-msgid "Room has been destroyed"
-msgstr "聊天室已经被销毁了"
-
-#: ../src/common/connection_handlers_events.py:834
-#, 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
-msgid "Invalid Jabber ID"
-msgstr "无效的 Jabber ID"
-
-#: ../src/common/connection_handlers_events.py:904
-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
-msgid "Unable to load idle module"
-msgstr "无法加载闲置模块"
-
-#: ../src/common/connection_handlers.py:127
-#, python-format
-msgid "Registration information for transport %s has not arrived in time"
-msgstr "代理 %s 的注册信息未按时抵达"
-
-#: ../src/common/connection_handlers.py:134
-msgid "Registration succeeded"
-msgstr "注册成功"
-
-#: ../src/common/connection_handlers.py:135
-#, python-format
-msgid "Registration with agent %s succeeded"
-msgstr "注册成功, agent %s"
-
-#: ../src/common/connection_handlers.py:143
-msgid "Registration failed"
-msgstr "注册失败"
-
-#: ../src/common/connection_handlers.py:143
-#, python-format
-msgid ""
-"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr "注册失败, agent %(agent)s, 错误 %(error)s: %(error_msg)s"
-
-#: ../src/common/connection_handlers.py:712 ../src/common/connection.py:1479
-msgid "Invisibility not supported"
-msgstr "不支持隐身"
-
-#: ../src/common/connection_handlers.py:713 ../src/common/connection.py:1480
-#, python-format
-msgid "Account %s doesn't support invisibility."
-msgstr "账户 %s 不支持隐身"
-
-#: ../src/common/connection_handlers.py:1833
-msgid "I would like to add you to my roster."
-msgstr "我想将您添加到我的联系人列表。"
+#: ../src/common/config.py:559
+#, fuzzy
+msgid "Tor"
+msgstr "To"
 
-#: ../src/common/connection.py:68
+#: ../src/common/connection.py:74
 msgid "Unable to get issuer certificate"
 msgstr "无法获得发行者的证书"
 
-#: ../src/common/connection.py:69
+#: ../src/common/connection.py:75
 msgid "Unable to get certificate CRL"
 msgstr "无法获得证书吊销列表"
 
-#: ../src/common/connection.py:70
+#: ../src/common/connection.py:76
 msgid "Unable to decrypt certificate's signature"
 msgstr "无法解密证书签名"
 
-#: ../src/common/connection.py:71
+#: ../src/common/connection.py:77
 msgid "Unable to decrypt CRL's signature"
 msgstr "无法解密证书吊销列表的签名"
 
-#: ../src/common/connection.py:72
+#: ../src/common/connection.py:78
 msgid "Unable to decode issuer public key"
 msgstr "无法解码发行者的公钥"
 
-#: ../src/common/connection.py:73
+#: ../src/common/connection.py:79
 msgid "Certificate signature failure"
 msgstr "证书签名失败"
 
-#: ../src/common/connection.py:74
+#: ../src/common/connection.py:80
 msgid "CRL signature failure"
 msgstr "吊销证书列表签名失败"
 
-#: ../src/common/connection.py:75
+#: ../src/common/connection.py:81
 msgid "Certificate is not yet valid"
 msgstr "证书还未生效"
 
-#: ../src/common/connection.py:76
+#: ../src/common/connection.py:82
 msgid "Certificate has expired"
 msgstr "证书已过期"
 
-#: ../src/common/connection.py:77
+#: ../src/common/connection.py:83
 msgid "CRL is not yet valid"
 msgstr "证书吊销列表还未生效"
 
-#: ../src/common/connection.py:78
+#: ../src/common/connection.py:84
 msgid "CRL has expired"
 msgstr "证书吊销列表已过期"
 
-#: ../src/common/connection.py:79
+#: ../src/common/connection.py:85
 msgid "Format error in certificate's notBefore field"
 msgstr "格式错误, 在证书的'不早于'字段"
 
-#: ../src/common/connection.py:80
+#: ../src/common/connection.py:86
 msgid "Format error in certificate's notAfter field"
 msgstr "格式错误, 在证书的'不迟于'字段"
 
-#: ../src/common/connection.py:81
+#: ../src/common/connection.py:87
 msgid "Format error in CRL's lastUpdate field"
 msgstr "格式错误, 在证书吊销列表的'最后更新'字段"
 
-#: ../src/common/connection.py:82
+#: ../src/common/connection.py:88
 msgid "Format error in CRL's nextUpdate field"
 msgstr "格式错误, 在证书吊销列表的'下次更新'字段"
 
-#: ../src/common/connection.py:83
+#: ../src/common/connection.py:89
 msgid "Out of memory"
 msgstr "内存耗尽"
 
-#: ../src/common/connection.py:84
+#: ../src/common/connection.py:90
 msgid "Self signed certificate"
 msgstr "自签名的证书"
 
-#: ../src/common/connection.py:85
+#: ../src/common/connection.py:91
 msgid "Self signed certificate in certificate chain"
 msgstr "自签名的证书, 在证书链中"
 
-#: ../src/common/connection.py:86
+#: ../src/common/connection.py:92
 msgid "Unable to get local issuer certificate"
 msgstr "无法获得本地发行者证书"
 
-#: ../src/common/connection.py:87
+#: ../src/common/connection.py:93
 msgid "Unable to verify the first certificate"
 msgstr "无法验证第一个证书"
 
-#: ../src/common/connection.py:88
+#: ../src/common/connection.py:94
 msgid "Certificate chain too long"
 msgstr "证书链太长"
 
-#: ../src/common/connection.py:89
+#: ../src/common/connection.py:95
 msgid "Certificate revoked"
 msgstr "证书已被吊销"
 
-#: ../src/common/connection.py:90
+#: ../src/common/connection.py:96
 msgid "Invalid CA certificate"
 msgstr "无效的 CA 证书"
 
-#: ../src/common/connection.py:91
+#: ../src/common/connection.py:97
 msgid "Path length constraint exceeded"
 msgstr "超过了路径长度限制"
 
-#: ../src/common/connection.py:92
+#: ../src/common/connection.py:98
 msgid "Unsupported certificate purpose"
 msgstr "不支持的证书用途"
 
-#: ../src/common/connection.py:93
+#: ../src/common/connection.py:99
 msgid "Certificate not trusted"
 msgstr "不被信任的证书"
 
-#: ../src/common/connection.py:94
+#: ../src/common/connection.py:100
 msgid "Certificate rejected"
 msgstr "证书被拒绝"
 
-#: ../src/common/connection.py:95
+#: ../src/common/connection.py:101
 msgid "Subject issuer mismatch"
 msgstr "Subject 与 发行者 不匹配"
 
-#: ../src/common/connection.py:96
+#: ../src/common/connection.py:102
 msgid "Authority and subject key identifier mismatch"
 msgstr "Authority 与 subject key identifier 不匹配"
 
-#: ../src/common/connection.py:97
+#: ../src/common/connection.py:103
 msgid "Authority and issuer serial number mismatch"
 msgstr "Authority 与 发行者序列号 不匹配"
 
-#: ../src/common/connection.py:98
+#: ../src/common/connection.py:104
 msgid "Key usage does not include certificate signing"
 msgstr "密钥用途中不包含证书签名"
 
-#: ../src/common/connection.py:99
+#: ../src/common/connection.py:105
 msgid "Application verification failure"
 msgstr "应用程序验证失败"
 
-#: ../src/common/connection.py:256 ../src/dialogs.py:2950
+#: ../src/common/connection.py:279 ../src/common/connection.py:289
+#: ../src/common/connection_handlers_events.py:1156
+#: ../src/common/connection_handlers_events.py:1202 ../src/config.py:2176
+#: ../src/config.py:2185 ../src/config.py:2253 ../src/config.py:3722
+#: ../src/dataforms_widget.py:642 ../src/dialogs.py:3302
+msgid "Invalid Jabber ID"
+msgstr "无效的 Jabber ID"
+
+#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/dialogs.py:3303
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "不能向 %s 发送消息, 无效的 JID。"
 
-#: ../src/common/connection.py:278
+#: ../src/common/connection.py:313
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "远程 presence 未签名, 也未指定密钥。"
 
-#: ../src/common/connection.py:281
+#: ../src/common/connection.py:316
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr "联系人的密钥(%s)与 Gajim 中指定的密钥不匹配"
 
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:333
+#. we're not english: one in locale and one en
+#: ../src/common/connection.py:374
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[本条消息已 *加密* (见: XEP:`27`]"
 
-#: ../src/common/connection.py:441
-#, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"主题: %(subject)s\n"
-"%(message)s"
+#: ../src/common/connection.py:547 ../src/common/connection_handlers.py:340
+#: ../src/common/connection_handlers.py:1077
+#: ../src/common/connection_handlers.py:1253
+#: ../src/common/connection_handlers_events.py:953 ../src/common/logger.py:1175
+#: ../src/session.py:107
+msgid "Disk Write Error"
+msgstr "磁盘写入错误"
 
-#: ../src/common/connection.py:809
+#: ../src/common/connection.py:978
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户\"%s\"的连接丢失"
 
-#: ../src/common/connection.py:810
+#: ../src/common/connection.py:979
 msgid "Reconnect manually."
 msgstr "手动重连。"
 
-#: ../src/common/connection.py:822
+#. it's a new account
+#. wrong answer
+#: ../src/common/connection.py:990
 #, 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:1032
 #, 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:1049
 msgid "Invalid answer"
 msgstr "答案错误"
 
-#: ../src/common/connection.py:886
+#: ../src/common/connection.py:1050
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %(name)s 对注册请求的响应有误: %(error)s"
 
-#: ../src/common/connection.py:1168 ../src/common/connection.py:1297
-#: ../src/common/connection.py:1794
-#: ../src/common/zeroconf/connection_zeroconf.py:193
-#, python-format
-msgid "Could not connect to \"%s\""
+#: ../src/common/connection.py:1177
+#, fuzzy
+msgid "Wrong Custom Hostname"
+msgstr "使用自定义的主机名/端口"
+
+#: ../src/common/connection.py:1359
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\" via proxy \"%(proxy)s\""
 msgstr "没有能够连接到\"%s\""
 
-#: ../src/common/connection.py:1169 ../src/gui_interface.py:603
+#: ../src/common/connection.py:1362
+#, fuzzy, python-format
+msgid "Could not connect to \"%(host)s\""
+msgstr "没有能够连接到\"%s\""
+
+#: ../src/common/connection.py:1364 ../src/common/connection.py:1557
+#: ../src/gui_interface.py:551
 msgid "Check your connection or try again later."
 msgstr "检查连接或稍后再试。"
 
-#: ../src/common/connection.py:1174
+#: ../src/common/connection.py:1369
 #, python-format
 msgid "Server replied: %s"
 msgstr "服务器回应: %s"
 
-#: ../src/common/connection.py:1187
+#: ../src/common/connection.py:1384
 msgid "Connection to proxy failed"
 msgstr "连接代理服务器失败"
 
-#: ../src/common/connection.py:1218 ../src/common/connection.py:1277
+#: ../src/common/connection.py:1422 ../src/common/connection.py:1532
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "没有能够连接到账户 %s"
 
-#: ../src/common/connection.py:1219 ../src/common/connection.py:1278
+#: ../src/common/connection.py:1423 ../src/common/connection.py:1533
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帐户 %s 的连接丢失。重新尝试连接。"
 
-#: ../src/common/connection.py:1244
-#, python-format
-msgid "The authenticity of the %s certificate could be invalid."
+#: ../src/common/connection.py:1457
+#, fuzzy, python-format
+msgid "The authenticity of the %s certificate could be invalid"
 msgstr "%s 证书的认证可能是无效的"
 
-#: ../src/common/connection.py:1247
+#: ../src/common/connection.py:1460
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
-msgstr "\nSSL 错误: <b>%s</b>"
+msgstr ""
+"\n"
+"SSL 错误: <b>%s</b>"
 
-#: ../src/common/connection.py:1249
+#: ../src/common/connection.py:1462
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
-msgstr "\n未知 SSL 错误: %d"
+msgstr ""
+"\n"
+"未知 SSL 错误: %d"
 
-#: ../src/common/connection.py:1298
-msgid "Check your connection or try again later"
-msgstr "检查连接或稍后重试"
+#: ../src/common/connection.py:1508
+#, fuzzy, python-format
+msgid ""
+"The authenticity of the %s certificate could be invalid.\n"
+"The certificate does not cover this domain."
+msgstr "%s 证书的认证可能是无效的"
 
-#: ../src/common/connection.py:1331
+#: ../src/common/connection.py:1556 ../src/common/connection.py:2351
+#: ../src/common/zeroconf/connection_zeroconf.py:205
+#, python-format
+msgid "Could not connect to \"%s\""
+msgstr "没有能够连接到\"%s\""
+
+#: ../src/common/connection.py:1592
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\"登录验证失败"
 
-#: ../src/common/connection.py:1333
+#: ../src/common/connection.py:1593
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
-#: ../src/common/connection.py:1402
+#: ../src/common/connection.py:1669
 msgid "Error while removing privacy list"
 msgstr "移除隐私策略列表时出错"
 
-#: ../src/common/connection.py:1403
+#: ../src/common/connection.py:1670
 #, 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 还没有被移除。它可能在您的某个连接的资源中是活动的。禁用它然后重试。"
+msgstr ""
+"隐私策略列表 %s 还没有被移除。它可能在您的某个连接的资源中是活动的。禁用它然"
+"后重试。"
+
+#: ../src/common/connection.py:1863 ../src/common/connection.py:1977
+msgid "Invisibility not supported"
+msgstr "不支持隐身"
+
+#: ../src/common/connection.py:1864 ../src/common/connection.py:1978
+#, python-format
+msgid "Account %s doesn't support invisibility."
+msgstr "账户 %s 不支持隐身"
 
-#: ../src/common/connection.py:1660
+#: ../src/common/connection.py:2215
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "已发送联系人: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1663
+#: ../src/common/connection.py:2218
 msgid "Sent contacts:"
 msgstr "已发送联系人: "
 
-#: ../src/common/connection.py:1809 ../src/common/connection.py:1832
+#: ../src/common/connection.py:2368 ../src/common/connection.py:2390
 msgid "Not fetched because of invisible status"
 msgstr "由于隐身状态, 未获取"
 
-#: ../src/common/connection.py:2264
+#: ../src/common/connection.py:3001
 msgid "Unregister failed"
 msgstr "移除注册失败"
 
-#: ../src/common/connection.py:2265
+#: ../src/common/connection.py:3002
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "在服务器上 %(server)s 移除注册失败: %(error)s"
 
-#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
-#: ../src/gui_interface.py:530
+#: ../src/common/connection_handlers.py:89
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:50
+msgid "Unable to load idle module"
+msgstr "无法加载闲置模块"
+
+#: ../src/common/connection_handlers.py:124
+#, python-format
+msgid "Registration information for transport %s has not arrived in time"
+msgstr "代理 %s 的注册信息未按时抵达"
+
+#: ../src/common/connection_handlers.py:132
+msgid "Registration succeeded"
+msgstr "注册成功"
+
+#: ../src/common/connection_handlers.py:133
+#, python-format
+msgid "Registration with agent %s succeeded"
+msgstr "注册成功, agent %s"
+
+#: ../src/common/connection_handlers.py:142
+msgid "Registration failed"
+msgstr "注册失败"
+
+#: ../src/common/connection_handlers.py:143
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr "注册失败, agent %(agent)s, 错误 %(error)s: %(error_msg)s"
+
+#: ../src/common/connection_handlers.py:1948
+msgid "I would like to add you to my roster."
+msgstr "我想将您添加到我的联系人列表。"
+
+#: ../src/common/connection_handlers_events.py:393
+#, python-format
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s 不符合 RFC 标准。它没有被加入联系人列表。请使用诸如 http://jru."
+"jabberstudio.org/ 的联系人列表管理工具移除它"
+
+#: ../src/common/connection_handlers_events.py:871
+#, python-format
+msgid "unsubscribe request from %s"
+msgstr "来自 %s 的解除认证请求"
+
+#. Room has been destroyed. see
+#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
+#: ../src/common/connection_handlers_events.py:978
+msgid "Room has been destroyed"
+msgstr "聊天室已经被销毁了"
+
+#: ../src/common/connection_handlers_events.py:986
+#, python-format
+msgid "You can join this room instead: %s"
+msgstr "作为替代, 您可以加入这个聊天室: %s"
+
+#: ../src/common/connection_handlers_events.py:1157
+#: ../src/common/connection_handlers_events.py:1203
+msgid "A message from a non-valid JID arrived, it has been ignored."
+msgstr "收到了一个从一个无效的 JID 发送的消息, 它已经被忽略了。"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/common/connection_handlers_events.py:1246 ../src/gui_interface.py:441
+#: ../src/gui_interface.py:455
+#, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "发送 %(message)s 时出现错误( %(error)s )"
+
+#: ../src/common/connection_handlers_events.py:1485
+msgid "URL:"
+msgstr ""
+
+#: ../src/common/connection_handlers_events.py:1851
+#, python-format
+msgid "Unknown SSL error: %d"
+msgstr "未知的 SSL 错误: %d"
+
+#: ../src/common/connection_handlers_events.py:2483 ../src/dialogs.py:2973
+#: ../src/notify.py:277
+msgid "New Single Message"
+msgstr "新单条消息"
+
+#: ../src/common/connection_handlers_events.py:2485
+#, python-format
+msgid "New Single Message from %(nickname)s"
+msgstr " %(nickname)s 发来的新消息"
+
+#: ../src/common/connection_handlers_events.py:2489 ../src/dialogs.py:2974
+#: ../src/notify.py:278
+msgid "New Private Message"
+msgstr "新个人消息"
+
+#: ../src/common/connection_handlers_events.py:2491
+#, python-format
+msgid "New Private Message from group chat %s"
+msgstr "来自聊天室 %s 的私人消息"
+
+#: ../src/common/connection_handlers_events.py:2494
+#, python-format
+msgid "%(nickname)s: %(message)s"
+msgstr "%(nickname)s:  %(message)s"
+
+#: ../src/common/connection_handlers_events.py:2497
+#, python-format
+msgid "Messaged by %(nickname)s"
+msgstr "来自 %(nickname)s 的消息"
+
+#: ../src/common/connection_handlers_events.py:2501 ../src/dialogs.py:2973
+#: ../src/notify.py:277
+msgid "New Message"
+msgstr "新消息"
+
+#: ../src/common/connection_handlers_events.py:2503
+#, python-format
+msgid "New Message from %(nickname)s"
+msgstr "来自 %(nickname)s 的新消息"
+
+#: ../src/common/connection_handlers_events.py:2669
+#, python-format
+msgid "%(nick)s Changed Status"
+msgstr "%(nick)s 改变了状态"
+
+#: ../src/common/connection_handlers_events.py:2671
+#: ../src/groupchat_control.py:215 ../src/groupchat_control.py:1909
+#: ../src/history_window.py:472
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s 的状态是 %(status)s"
+
+#: ../src/common/connection_handlers_events.py:2675 ../src/dialogs.py:2985
+#: ../src/notify.py:291
+msgid "Contact Changed Status"
+msgstr "联系人状态改变"
+
+#: ../src/common/connection_handlers_events.py:2677
+#, python-format
+msgid "%(nickname)s Signed In"
+msgstr "%(nickname)s 上线了"
+
+#. default value
+#: ../src/common/connection_handlers_events.py:2681 ../src/dialogs.py:2969
+#: ../src/notify.py:273
+msgid "Contact Signed In"
+msgstr "联系人登录"
+
+#: ../src/common/connection_handlers_events.py:2683
+#, python-format
+msgid "%(nickname)s Signed Out"
+msgstr "%(nickname)s 离开了"
+
+#: ../src/common/connection_handlers_events.py:2687 ../src/dialogs.py:2971
+#: ../src/notify.py:275
+msgid "Contact Signed Out"
+msgstr "联系人退出登录"
+
+#: ../src/common/contacts.py:133 ../src/common/helpers.py:73
+#: ../src/gui_interface.py:493
 msgid "Observers"
 msgstr "旁观者"
 
-#: ../src/common/contacts.py: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: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
+#. Invite to
+#: ../src/common/contacts.py:137 ../src/common/contacts.py:365
+#: ../src/common/helpers.py:73 ../src/disco.py:129 ../src/disco.py:130
+#: ../src/disco.py:1514 ../src/roster_window.py:883
+#: ../src/roster_window.py:1643 ../src/roster_window.py:1753
+#: ../src/roster_window.py:1755 ../src/roster_window.py:1918
+#: ../src/roster_window.py:2597 ../src/roster_window.py:5685
 msgid "Transports"
 msgstr "服务代理"
 
-#: ../src/common/contacts.py:374
+#: ../src/common/contacts.py:373
 msgid "Not in roster"
 msgstr "不在联系人列表中"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:40
+#: ../src/common/dbus_support.py:41
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "这台计算机缺少 D-Bus 的 python 绑定"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
+#: ../src/common/dbus_support.py:42 ../src/common/dbus_support.py:53
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim 的 D-Bus 兼容性无法使用"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:52
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus 在这台计算机上没有正常运行"
 
-#: ../src/common/dbus_support.py:54
+#: ../src/common/dbus_support.py:55
 msgid "D-Bus does not run correctly on this machine: system bus not present"
 msgstr "D-Bus 在这台计算机上没有正常运行: 未发现系统总线"
 
-#: ../src/common/dbus_support.py:57
+#: ../src/common/dbus_support.py:58
 msgid "D-Bus does not run correctly on this machine: session bus not present"
 msgstr "D-Bus 在这台计算机上没有正常运行: 未发现会话总线"
 
@@ -4855,7 +5430,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:57
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "在这台计算机上没有 D-Bus 或者 Python 模块缺失"
 
@@ -4877,426 +5452,453 @@ msgstr ""
 "系统总线不可用。\n"
 "请参考 %(url)s"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "twelve"
 msgstr "十二"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "one"
 msgstr "一"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "two"
 msgstr "二"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "three"
 msgstr "三"
 
-#: ../src/common/fuzzyclock.py:38
+#: ../src/common/fuzzyclock.py:37
 msgid "four"
 msgstr "四"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "five"
 msgstr "五"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "six"
 msgstr "六"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "seven"
 msgstr "七"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "eight"
 msgstr "八"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "nine"
 msgstr "九"
 
-#: ../src/common/fuzzyclock.py:39
+#: ../src/common/fuzzyclock.py:38
 msgid "ten"
 msgstr "十"
 
-#: ../src/common/fuzzyclock.py:40
+#: ../src/common/fuzzyclock.py:39
 msgid "eleven"
 msgstr "十一"
 
 #. Strings to use for the output. %(0)s will be replaced with the preceding hour
 #. (e.g. "x PAST %(0)s"), %(1)s with the coming hour (e.g. "x TO %(0)s"). '''
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "%(0)s o'clock"
 msgstr "%(0)s点"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "five past %(0)s"
 msgstr "%(0)s点5分"
 
-#: ../src/common/fuzzyclock.py:44
+#: ../src/common/fuzzyclock.py:43
 #, python-format
 msgid "ten past %(0)s"
 msgstr "%(0)s点10分"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "quarter past %(0)s"
 msgstr "%(0)s点一刻"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty past %(0)s"
 msgstr "%(0)s点20分"
 
-#: ../src/common/fuzzyclock.py:45
+#: ../src/common/fuzzyclock.py:44
 #, python-format
 msgid "twenty five past %(0)s"
 msgstr "%(0)s点25分"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "half past %(0)s"
 msgstr "%(0)s点半"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty five to %(1)s"
 msgstr "差25分%(1)s点"
 
-#: ../src/common/fuzzyclock.py:46
+#: ../src/common/fuzzyclock.py:45
 #, python-format
 msgid "twenty to %(1)s"
 msgstr "差20分%(1)s点"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "quarter to %(1)s"
 msgstr "差一刻%(1)s点"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "ten to %(1)s"
 msgstr "差10分%(1)s点"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "five to %(1)s"
 msgstr "差5分%(1)s点"
 
-#: ../src/common/fuzzyclock.py:47
+#: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "%(1)s o'clock"
 msgstr "%(1)s点"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:50
 msgid "Night"
 msgstr "夜晚"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:48
 msgid "Early morning"
 msgstr "清晨"
 
-#: ../src/common/fuzzyclock.py:49
+#: ../src/common/fuzzyclock.py:48
 msgid "Morning"
 msgstr "上午"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Almost noon"
 msgstr "将近中午"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Noon"
 msgstr "中午"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Afternoon"
 msgstr "下午"
 
-#: ../src/common/fuzzyclock.py:50
+#: ../src/common/fuzzyclock.py:49
 msgid "Evening"
 msgstr "傍晚"
 
-#: ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:50
 msgid "Late evening"
 msgstr "晚上"
 
-#: ../src/common/fuzzyclock.py:53
+#: ../src/common/fuzzyclock.py:52
 msgid "Start of week"
 msgstr "一周开始"
 
-#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:53
 msgid "Middle of week"
 msgstr "一周中"
 
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
 msgid "End of week"
 msgstr "一周末"
 
-#: ../src/common/fuzzyclock.py:54
+#: ../src/common/fuzzyclock.py:53
 msgid "Weekend!"
 msgstr "周末"
 
-#: ../src/common/helpers.py:148
+#: ../src/common/helpers.py:179
 msgid "Username must be between 1 and 1023 chars"
 msgstr "用户名必须在 1 到 1023 个字符之间"
 
-#: ../src/common/helpers.py:153
+#: ../src/common/helpers.py:184
 msgid "Invalid character in username."
 msgstr "在用户名中有无效的字符。"
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:190
 msgid "Server must be between 1 and 1023 chars"
 msgstr "服务器名必须在 1 到 1023 个字符之间"
 
-#: ../src/common/helpers.py:164
+#: ../src/common/helpers.py:195
 msgid "Invalid character in hostname."
 msgstr "主机名中有无效的字符。"
 
-#: ../src/common/helpers.py:166
+#: ../src/common/helpers.py:197
 msgid "Server address required."
 msgstr "服务器的地址是必须的。"
 
-#: ../src/common/helpers.py:170
+#: ../src/common/helpers.py:201
 msgid "Resource must be between 1 and 1023 chars"
 msgstr "资源必须在 1 到 1023 个字符之间"
 
-#: ../src/common/helpers.py:175
+#: ../src/common/helpers.py:206
 msgid "Invalid character in resource."
 msgstr "资源中含有无效字符。"
 
-#: ../src/common/helpers.py:215
+#: ../src/common/helpers.py:246
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:217 ../src/tooltips.py:195
+#: ../src/common/helpers.py:248 ../src/tooltips.py:915
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:251
 msgid "_Not Available"
 msgstr "离开很久了(_N)"
 
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:253 ../src/tooltips.py:917
+msgid "Not Available"
+msgstr "离开很久了"
+
+#: ../src/common/helpers.py:256
 msgid "_Free for Chat"
 msgstr "和我聊天吧(_F)"
 
-#: ../src/common/helpers.py:227 ../src/tooltips.py:191
+#: ../src/common/helpers.py:258 ../src/tooltips.py:911
 msgid "Free for Chat"
 msgstr "和我聊天吧"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:261
 msgid "?user status:_Available"
 msgstr "在线(_A)"
 
-#: ../src/common/helpers.py:232 ../src/tooltips.py:189
+#: ../src/common/helpers.py:263 ../src/tooltips.py:909
 msgid "?user status:Available"
 msgstr "在线"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:265
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:268
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:273
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: ../src/common/helpers.py:244 ../src/tooltips.py:199
+#: ../src/common/helpers.py:275 ../src/tooltips.py:919
 msgid "Offline"
 msgstr "离线"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:278
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:280
+msgid "Invisible"
+msgstr "隐身"
+
+#: ../src/common/helpers.py:284
 msgid "?contact has status:Unknown"
 msgstr "未知"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:286
 msgid "?contact has status:Has errors"
 msgstr "有错误"
 
-#: ../src/common/helpers.py:260
+#: ../src/common/helpers.py:291
 msgid "?Subscription we already have:None"
 msgstr "无"
 
-#: ../src/common/helpers.py:262
+#: ../src/common/helpers.py:293
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:295
 msgid "From"
 msgstr "From"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:297
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:305
 msgid "?Ask (for Subscription):None"
 msgstr "无"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:307
 msgid "Subscribe"
 msgstr "认证"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:316
 msgid "?Group Chat Contact Role:None"
 msgstr "无"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:319
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:321
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:324
 msgid "Participants"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:295
+#: ../src/common/helpers.py:326
 msgid "Participant"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:329
 msgid "Visitors"
 msgstr "访客"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:331
 msgid "Visitor"
 msgstr "访客"
 
-#: ../src/common/helpers.py:306 ../src/tooltips.py:210
+#: ../src/common/helpers.py:337 ../src/tooltips.py:403
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "无"
 
-#: ../src/common/helpers.py:308 ../src/tooltips.py:216
+#: ../src/common/helpers.py:339 ../src/tooltips.py:409
 msgid "Owner"
 msgstr "所有者"
 
-#: ../src/common/helpers.py:310 ../src/tooltips.py:214
+#: ../src/common/helpers.py:341 ../src/tooltips.py:407
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../src/common/helpers.py:312 ../src/tooltips.py:212
+#: ../src/common/helpers.py:343 ../src/tooltips.py:405
 msgid "Member"
 msgstr "成员"
 
-#: ../src/common/helpers.py:351
+#: ../src/common/helpers.py:382
 msgid "is paying attention to the conversation"
 msgstr "注意着与您的对话"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:384
 msgid "is doing something else"
 msgstr "在做其他事情"
 
-#: ../src/common/helpers.py:355
+#: ../src/common/helpers.py:386
 msgid "is composing a message..."
 msgstr "正在输入消息..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:358
+#: ../src/common/helpers.py:389
 msgid "paused composing a message"
 msgstr "暂停输入消息"
 
-#: ../src/common/helpers.py:360
+#: ../src/common/helpers.py:391
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:597
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:600
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:604
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:607
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:639
+#: ../src/common/helpers.py:611
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:642
+#: ../src/common/helpers.py:614
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:645
+#: ../src/common/helpers.py:617
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
+#: ../src/common/helpers.py:1069 ../src/common/helpers.py:1076
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d 条消息未处理"
 
-#: ../src/common/helpers.py:1121
-#, python-format
-msgid " from room %s"
+#: ../src/common/helpers.py:1083
+#, fuzzy, python-format
+msgid "from room %s"
 msgstr " 来自聊天室 %s"
 
-#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
-#, python-format
-msgid " from user %s"
+#: ../src/common/helpers.py:1086 ../src/common/helpers.py:1103
+#, fuzzy, python-format
+msgid "from user %s"
 msgstr " 来自用户 %s"
 
-#: ../src/common/helpers.py:1126
-#, python-format
-msgid " from %s"
+#: ../src/common/helpers.py:1088
+#, fuzzy, python-format
+msgid "from %s"
 msgstr " 来自 %s"
 
-#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1095 ../src/common/helpers.py:1101
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d 个未处理事件"
 
-#: ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1133
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1341
+#: ../src/common/helpers.py:1319
 msgid "Hello, I am $name."
 msgstr "您好, 我是$name"
 
-#: ../src/common/jingle_rtp.py:107
+#: ../src/common/helpers.py:1433 ../src/common/helpers.py:1442
+#: ../src/common/helpers.py:1501
+msgid "Timeout loading image"
+msgstr "读取文件超时"
+
+#: ../src/common/helpers.py:1452 ../src/common/helpers.py:1499
+msgid "Image is too big"
+msgstr "图片太大"
+
+#: ../src/common/helpers.py:1463
+#, fuzzy
+msgid "PyCURL is not installed"
+msgstr "证书吊销列表还未生效"
+
+#: ../src/common/helpers.py:1503
+#, fuzzy
+msgid "Error loading image"
+msgstr "读取文件超时"
+
+#: ../src/common/jingle_rtp.py:115
 #, python-format
 msgid "%s configuration error"
 msgstr "%s 设置错误"
 
-#: ../src/common/jingle_rtp.py:108
+#: ../src/common/jingle_rtp.py:116
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5315,11 +5917,11 @@ msgstr ""
 "错误: \n"
 "%s"
 
-#: ../src/common/jingle_rtp.py:205
+#: ../src/common/jingle_rtp.py:221
 msgid "GStreamer error"
 msgstr "GStreamer 错误"
 
-#: ../src/common/jingle_rtp.py:206
+#: ../src/common/jingle_rtp.py:221
 #, python-format
 msgid ""
 "Error: %s\n"
@@ -5328,103 +5930,119 @@ msgstr ""
 "错误: %s\n"
 "调试信息: %s"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:355
 msgid "audio input"
 msgstr "音频输入"
 
-#: ../src/common/jingle_rtp.py:338
+#: ../src/common/jingle_rtp.py:358
 msgid "audio output"
 msgstr "音频输出"
 
-#: ../src/common/jingle_rtp.py:381
+#: ../src/common/jingle_rtp.py:415
 msgid "video input"
 msgstr "视频输入"
 
-#: ../src/common/jingle_rtp.py:389
+#: ../src/common/jingle_rtp.py:422
 msgid "video output"
 msgstr "视频输出"
 
-#: ../src/common/latex.py:109
-#, python-format
-msgid "Error executing \"%(command)s\": %(error)s"
-msgstr "在执行命令\"%(command)s\"时发生错误: %(error)s"
-
-#: ../src/common/logging_helpers.py:33
+#: ../src/common/logging_helpers.py:32
 #, python-format
 msgid "%s is not a valid loglevel"
 msgstr "%s 不是一个合法的日志级别"
 
-#: ../src/common/multimedia_helpers.py:37
-msgid " Default device"
+#: ../src/common/multimedia_helpers.py:40
+#, fuzzy
+msgid "Default device"
 msgstr "默认设备"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:55
+#: ../src/common/multimedia_helpers.py:59
 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:62
+#: ../src/common/multimedia_helpers.py:78
+#: ../src/common/multimedia_helpers.py:92
+#: ../src/common/multimedia_helpers.py:110
 msgid "Autodetect"
 msgstr "自动侦测"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:61
-#: ../src/common/multimedia_helpers.py:73
+#: ../src/common/multimedia_helpers.py:65
+#: ../src/common/multimedia_helpers.py:80
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
+#. Pulseaudio src
+#. Pulseaudio sink
+#: ../src/common/multimedia_helpers.py:68
+#: ../src/common/multimedia_helpers.py:82
+#, fuzzy, python-format
+msgid "Pulse: %s"
+msgstr "文件:  %s"
+
 #. Fake sink
-#. Fake video output
-#: ../src/common/multimedia_helpers.py:69
-#: ../src/common/multimedia_helpers.py:96
+#: ../src/common/multimedia_helpers.py:76
 msgid "Fake audio output"
 msgstr "伪装音频输出"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:81
+#: ../src/common/multimedia_helpers.py:89
 msgid "Video test"
 msgstr "视频测试"
 
 #. V4L2 src
-#: ../src/common/multimedia_helpers.py:86
+#: ../src/common/multimedia_helpers.py:94
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:98
+#. Funny things, just to test...
+#. self.devices['GOOM'] = 'audiotestsrc ! goom'
+#: ../src/common/multimedia_helpers.py:97
+#, fuzzy
+msgid "Screen"
+msgstr "绿色"
+
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:104
+#, fuzzy
+msgid "Fake video output"
+msgstr "视频输出"
+
+#: ../src/common/multimedia_helpers.py:107
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X 窗口系统 (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:100
+#: ../src/common/multimedia_helpers.py:109
 msgid "X Window System (without Xv)"
 msgstr "X 窗口系统 (没有Xv)"
 
 #. we talk about a file
-#: ../src/common/optparser.py:53
+#. we talk about file
+#: ../src/common/optparser.py:55 ../src/gtkgui_helpers.py:215
+#: ../src/gtkgui_helpers.py:231
 #, python-format
-msgid "error: cannot open %s for reading"
-msgstr "错误: 无法读取文件 %s"
+msgid "Error: cannot open %s for reading"
+msgstr "错误: 无法按读打开文件 %s"
 
-#: ../src/common/optparser.py:303 ../src/common/optparser.py:304
+#: ../src/common/optparser.py:313 ../src/common/optparser.py:314
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:383
+#: ../src/common/optparser.py:393
 msgid "migrating logs database to indices"
 msgstr "迁移记录数据库到索引"
 
-#: ../src/common/passwords.py:123
+#: ../src/common/passwords.py:100
 #, python-format
 msgid "XMPP account %s@%s"
 msgstr "XMPP 帐户 %s@%s"
@@ -6057,19 +6675,116 @@ msgstr "学习"
 msgid "Writing"
 msgstr "写作"
 
-#: ../src/common/pep.py:340
+#: ../src/common/pep.py:195
+msgid "accuracy"
+msgstr ""
+
+#: ../src/common/pep.py:196
+#, fuzzy
+msgid "alt"
+msgstr "默认"
+
+#: ../src/common/pep.py:197
+msgid "area"
+msgstr ""
+
+#: ../src/common/pep.py:198
+#, fuzzy
+msgid "bearing"
+msgstr "海洋"
+
+#: ../src/common/pep.py:199
+#, fuzzy
+msgid "building"
+msgstr "藏起来"
+
+#: ../src/common/pep.py:200
+#, fuzzy
+msgid "country"
+msgstr "账号"
+
+#: ../src/common/pep.py:201
+#, fuzzy
+msgid "countrycode"
+msgstr "账户"
+
+#: ../src/common/pep.py:202
+msgid "datum"
+msgstr ""
+
+#: ../src/common/pep.py:203
+#, fuzzy
+msgid "description"
+msgstr "描述"
+
+#: ../src/common/pep.py:204
+#, fuzzy
+msgid "error"
+msgstr "错误"
+
+#: ../src/common/pep.py:205
+msgid "floor"
+msgstr ""
+
+#: ../src/common/pep.py:206
+msgid "lat"
+msgstr ""
+
+#: ../src/common/pep.py:207
+msgid "locality"
+msgstr ""
+
+#: ../src/common/pep.py:208
+#, fuzzy
+msgid "lon"
+msgstr "一"
+
+#: ../src/common/pep.py:209
+msgid "postalcode"
+msgstr ""
+
+#: ../src/common/pep.py:210
+msgid "region"
+msgstr ""
+
+#: ../src/common/pep.py:211
+msgid "room"
+msgstr "聊天室"
+
+#: ../src/common/pep.py:212
+msgid "speed"
+msgstr ""
+
+#: ../src/common/pep.py:213
+#, fuzzy
+msgid "street"
+msgstr "stream"
+
+#: ../src/common/pep.py:214
+msgid "text"
+msgstr ""
+
+#: ../src/common/pep.py:215
+msgid "timestamp"
+msgstr ""
+
+#: ../src/common/pep.py:216
+msgid "uri"
+msgstr "uri"
+
+#: ../src/common/pep.py:341
 msgid "Unknown Artist"
 msgstr "未知艺术家"
 
-#: ../src/common/pep.py:343
+#: ../src/common/pep.py:344
 msgid "Unknown Title"
 msgstr "未知标题"
 
-#: ../src/common/pep.py:346
+#: ../src/common/pep.py:347
 msgid "Unknown Source"
 msgstr "未知来源"
 
-#: ../src/common/pep.py:349
+#: ../src/common/pep.py:350
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6078,30 +6793,18 @@ msgstr ""
 "<b>\"%(title)s\"</b> 作者 <i>%(artist)s</i>\n"
 "出自 <i>%(source)s</i>"
 
-#. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:91
-#, python-format
-msgid "Unable to bind to port %s."
-msgstr "无法绑定端口%s。"
-
-#: ../src/common/socks5.py:92
-msgid ""
-"Maybe you have another running instance of Gajim. File Transfer will be "
-"cancelled."
-msgstr "或许您有另一个正在运行的 Gajim 实例。文件传输将被取消。"
-
 #. we're not english
-#: ../src/common/stanza_session.py:423
+#: ../src/common/stanza_session.py:425
 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:193
 msgid "Avahi error"
 msgstr "Avahi 错误"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:183
+#: ../src/common/zeroconf/connection_zeroconf.py:193
 #, python-format
 msgid ""
 "%s\n"
@@ -6110,79 +6813,71 @@ msgstr ""
 "%s\n"
 "Link-local 消息可能无法正常工作。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:194
+#: ../src/common/zeroconf/connection_zeroconf.py:206
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "请检查 Avahi 或者 Bonjour 是否已经安装。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:203
-#: ../src/common/zeroconf/connection_zeroconf.py:207
+#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:220
 msgid "Could not start local service"
 msgstr "无法启动本地服务"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, 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:221
+#: ../src/common/zeroconf/connection_zeroconf.py:306
+#: ../src/common/zeroconf/connection_zeroconf.py:319
+#: ../src/common/zeroconf/connection_zeroconf.py:335
 msgid "Please check if avahi-daemon is running."
 msgstr "请检查 avahi-daemon 是否正在运行。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:287
-#: ../src/common/zeroconf/connection_zeroconf.py:298
-#: ../src/common/zeroconf/connection_zeroconf.py:312
+#: ../src/common/zeroconf/connection_zeroconf.py:305
+#: ../src/common/zeroconf/connection_zeroconf.py:318
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "无法改变账户\"%s\"的状态"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:330
+#: ../src/common/zeroconf/connection_zeroconf.py:357
 msgid "Your message could not be sent."
 msgstr "您的消息未能被发送。"
 
-#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:340
+#: ../src/common/zeroconf/connection_zeroconf.py:369
 msgid "Contact is offline. Your message could not be sent."
 msgstr "联系人离线。您的消息未能被发送。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:365
+#: ../src/common/zeroconf/connection_zeroconf.py:396
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "无法建立到主机的连接: 发送数据超时。"
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:192
-#: ../src/common/zeroconf/zeroconf_bonjour.py:191
+#: ../src/common/zeroconf/zeroconf_avahi.py:221
+#: ../src/common/zeroconf/zeroconf_bonjour.py:194
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "添加服务错误。 %s"
 
-#: ../src/config.py:397
-msgid "Default Message"
-msgstr "默认消息"
-
-#: ../src/config.py:406
-msgid "Enabled"
-msgstr "启用"
-
-#: ../src/config.py:459 ../src/config.py:463 ../src/config.py:3095
+#: ../src/config.py:449 ../src/config.py:453 ../src/config.py:3218
 msgid "Default"
 msgstr "默认"
 
-#: ../src/config.py:733 ../src/dialogs.py:1411
+#: ../src/config.py:724 ../src/dialogs.py:1530
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "语言 %s 的词典不可用"
 
-#: ../src/config.py:734
+#: ../src/config.py:725
 #, 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)"
+msgstr ""
+"您需安装 %s 词典以使用拼写检查, 或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/config.py:1214
+#: ../src/config.py:1213
 msgid "status message title"
 msgstr "状态消息标题"
 
@@ -6191,200 +6886,201 @@ 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:1559 ../src/dialogs.py:2725 ../src/dialogs.py:2792
+#: ../src/dialogs.py:3579 ../src/disco.py:912 ../src/disco.py:1747
+#: ../src/disco.py:2035 ../src/history_window.py:94
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config.py:1609
+#: ../src/config.py:1666
 msgid "Relogin now?"
 msgstr "现在重新登录?"
 
-#: ../src/config.py:1610
+#: ../src/config.py:1667
 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:1827 ../src/config.py:1962
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP 在这台计算机上不可用"
 
-#: ../src/config.py:1933 ../src/config.py:1980
+#: ../src/config.py:2007 ../src/config.py:2057
 msgid "Unread events"
 msgstr "未读取的事件"
 
-#: ../src/config.py:1934
+#: ../src/config.py:2008
 msgid "Read all pending events before removing this account."
 msgstr "移除账户前请阅读所有未处理事件。"
 
-#: ../src/config.py:1963
+#: ../src/config.py:2038
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在账户 %s 打开聊天"
 
-#: ../src/config.py:1964
+#: ../src/config.py:2039
 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:2052 ../src/config.py:2628 ../src/config.py:2666
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1977
+#: ../src/config.py:2053
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称, 需断开连接。"
 
-#: ../src/config.py:1981
+#: ../src/config.py:2058
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称, 需先处理所有未处理事件"
 
-#: ../src/config.py:1987
+#: ../src/config.py:2064
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1988
+#: ../src/config.py:2065
 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:2069 ../src/config.py:2074
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1993
+#: ../src/config.py:2070
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1997
+#: ../src/config.py:2075
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:2074
+#: ../src/config.py:2156
 msgid "Rename Account"
 msgstr "重命名账户"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2157
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "为账户 %s 输入新的名称"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2187
 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:2425 ../src/config.py:3768
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:2321 ../src/config.py:3623
+#: ../src/config.py:2426 ../src/config.py:3769
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:2342
+#: ../src/config.py:2448
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:2343
+#: ../src/config.py:2449
 msgid "There is no OpenPGP secret key available."
 msgstr "没有可用的 OpenPGP 私钥"
 
-#: ../src/config.py:2377
+#: ../src/config.py:2487
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:2378
+#: ../src/config.py:2488
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 密钥"
 
-#: ../src/config.py:2385
+#: ../src/config.py:2496
 msgid "No such account available"
 msgstr "没有这样的账户可用"
 
-#: ../src/config.py:2386
+#: ../src/config.py:2497
 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:2504 ../src/dialogs.py:2412 ../src/dialogs.py:2713
+#: ../src/dialogs.py:2903 ../src/disco.py:529 ../src/profile_window.py:375
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:2394
+#: ../src/config.py:2505
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:2398
-msgid "Your server doesn't support Vcard"
+#: ../src/config.py:2510
+#, fuzzy
+msgid "Your server doesn't support vCard"
 msgstr "您的服务器不支持 Vcard"
 
-#: ../src/config.py:2399
+#: ../src/config.py:2511
 msgid "Your server can't save your personal information."
 msgstr "您的服务器无法保存您的个人信息。"
 
-#: ../src/config.py:2512 ../src/config.py:2548
+#: ../src/config.py:2629 ../src/config.py:2667
 msgid "To disable the account, you must be disconnected."
 msgstr "要禁用账户, 您必需断开连接。"
 
-#: ../src/config.py:2517
+#: ../src/config.py:2636
 msgid "Account Local already exists."
 msgstr "帐户本地已存在。"
 
-#: ../src/config.py:2518
+#: ../src/config.py:2637
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "请在使用本地消息前重命名或移除它。"
 
-#: ../src/config.py:2675
+#: ../src/config.py:2798
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:2677
+#: ../src/config.py:2800
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
 #. list at the beginning
-#: ../src/config.py:2713
+#: ../src/config.py:2836
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2837
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:2714
+#: ../src/config.py:2837
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2838
 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:2902 ../src/disco.py:919 ../src/history_manager.py:219
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2789
+#: ../src/config.py:2912
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2919
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2802
+#: ../src/config.py:2925
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2829
+#: ../src/config.py:2952
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2831
+#: ../src/config.py:2954
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6392,11 +7088,11 @@ msgstr ""
 "<b>想做封禁谁?</b>\n"
 "\n"
 
-#: ../src/config.py:2833
+#: ../src/config.py:2956
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2834
+#: ../src/config.py:2957
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6404,27 +7100,31 @@ msgstr ""
 "<b>想要将谁加为成员?</b>\n"
 "\n"
 
-#: ../src/config.py:2836
+#: ../src/config.py:2959
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2837
+#: ../src/config.py:2960
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
-msgstr "<b>您想要让谁成为房主?</b>\n\n"
+msgstr ""
+"<b>您想要让谁成为房主?</b>\n"
+"\n"
 
-#: ../src/config.py:2839
+#: ../src/config.py:2962
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2840
+#: ../src/config.py:2963
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
-msgstr "<b>您想要让谁成为管理员?</b>\n\n"
+msgstr ""
+"<b>您想要让谁成为管理员?</b>\n"
+"\n"
 
-#: ../src/config.py:2841
+#: ../src/config.py:2964
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6440,138 +7140,136 @@ msgstr ""
 "4. domain (域名本身匹配, 任何 user@domain, \n"
 "domain/resource, 或者包含一个子域名的地址也匹配)。"
 
-#: ../src/config.py:2943
+#: ../src/config.py:3064
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2958
+#: ../src/config.py:3079
 msgid "Account is disabled"
 msgstr "账户被禁用"
 
-#: ../src/config.py:2959
+#: ../src/config.py:3080
 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:3093 ../src/gui_interface.py:290
+#: ../src/gui_interface.py:748
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2973 ../src/gui_interface.py:965
+#: ../src/config.py:3094 ../src/gui_interface.py:733
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2974 ../src/gui_interface.py:985
+#: ../src/config.py:3095 ../src/gui_interface.py:748
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2984
+#: ../src/config.py:3105
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 \"%s\" 已连接到服务器"
 
-#: ../src/config.py:2985
+#: ../src/config.py:3106
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除, 将会丢失连接"
 
-#: ../src/config.py:2999
+#: ../src/config.py:3120
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "连接服务器 %s 失败"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3121
 msgid "What would you like to do?"
 msgstr "您想做什么?"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3122
 msgid "Remove only from Gajim"
 msgstr "仅从 Gajim 移除帐户"
 
-#: ../src/config.py:3002
+#: ../src/config.py:3123
 msgid "Don't remove anything. I'll try again later"
 msgstr "不要移除任何东西。我过一会儿会再试一下"
 
-#: ../src/config.py:3095
+#: ../src/config.py:3218
 msgid "?print_status:All"
 msgstr "全部"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3219
 msgid "Enter and leave only"
 msgstr "只是进入和离开"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3220
 msgid "?print_status:None"
 msgstr "无"
 
-#: ../src/config.py:3167
+#: ../src/config.py:3280
 msgid "New Group Chat"
 msgstr "新聊天室"
 
-#: ../src/config.py:3200
+#: ../src/config.py:3316
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:3201
+#: ../src/config.py:3317
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与聊天室字段或移除此书签。"
 
-#. invalid char
-#: ../src/config.py:3319 ../src/dialogs.py:1952
-msgid "Invalid nickname"
-msgstr "无效的昵称"
-
-#: ../src/config.py:3320 ../src/config.py:3334 ../src/config.py:3348
+#: ../src/config.py:3440 ../src/config.py:3456 ../src/config.py:3467
+#: ../src/config.py:3495
 msgid "Character not allowed"
 msgstr "不允许的字符"
 
-#: ../src/config.py:3333 ../src/config.py:3598
+#: ../src/config.py:3455 ../src/config.py:3466 ../src/config.py:3744
 msgid "Invalid server"
 msgstr "无效的服务器"
 
-#: ../src/config.py:3347
+#: ../src/config.py:3494
 msgid "Invalid room"
 msgstr "无效聊天室"
 
-#: ../src/config.py:3514
+#: ../src/config.py:3658
 msgid "Account has been added successfully"
 msgstr "账户已成功添加"
 
-#: ../src/config.py:3515 ../src/config.py:3521
+#: ../src/config.py:3659 ../src/config.py:3665
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
-msgstr "您可以点击\"高级\"按钮以设置高级账户选项, 或稍后选择主窗口\"编辑\"菜单下\"账户\"菜单项。"
+msgstr ""
+"您可以点击\"高级\"按钮以设置高级账户选项, 或稍后选择主窗口\"编辑\"菜单下\"账"
+"户\"菜单项。"
 
-#: ../src/config.py:3520
+#: ../src/config.py:3664
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:3559
+#: ../src/config.py:3702
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:3561
+#: ../src/config.py:3704
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:3599
+#: ../src/config.py:3745
 msgid "Please provide a server on which you want to register."
 msgstr "请指定一个服务器。您将注册到这个服务器。"
 
-#: ../src/config.py:3655 ../src/gui_interface.py:1624
+#: ../src/config.py:3801 ../src/gui_interface.py:1351
 msgid "Certificate Already in File"
 msgstr "证书已经在文件中"
 
-#: ../src/config.py:3656 ../src/gui_interface.py:1625
+#: ../src/config.py:3802 ../src/gui_interface.py:1352
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "证书已经在文件 %s 中, 所以它没有被再次添加。"
 
-#: ../src/config.py:3733
+#: ../src/config.py:3895
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6586,317 +7284,344 @@ msgstr ""
 "SSL 错误: %(error)s\n"
 "您仍然想要连接到这个服务器吗?"
 
-#: ../src/config.py:3739 ../src/gui_interface.py:1652
-#, python-format
+#: ../src/config.py:3901 ../src/gui_interface.py:1382
+#, fuzzy, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
+"%s\n"
+"SHA256 fingerprint of the certificate:\n"
 "%s"
 msgstr ""
 "将这个证书添加到可信任证书列表。\n"
 "这个证书的 SHA1 指纹信息: \n"
 "%s"
 
-#: ../src/config.py:3771 ../src/config.py:3805
+#: ../src/config.py:3934 ../src/config.py:3968
 msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:3870
+#: ../src/config.py:4033
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:3871
+#: ../src/config.py:4034
 msgid "You already have an account using this name."
 msgstr "您已经有账户使用了这个名字了。"
 
-#: ../src/config.py:3990
+#: ../src/config.py:4164
 msgid "PEP node was not removed"
 msgstr "PEP节点没有被移除"
 
-#: ../src/config.py:3991
+#: ../src/config.py:4165
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP 节点 %(node)s 没有被移除: %(message)s"
 
-#: ../src/config.py:4035
-msgid "Active"
-msgstr "活动"
+#: ../src/config.py:4193
+#, fuzzy, python-format
+msgid "Configure %s"
+msgstr "配置"
 
-#: ../src/config.py:4043
+#: ../src/config.py:4218
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:4078
+#: ../src/config.py:4252
+#, fuzzy
+msgid "Attention Message Received"
+msgstr "最初收到的消息"
+
+#: ../src/config.py:4253
 msgid "First Message Received"
 msgstr "最初收到的消息"
 
-#: ../src/config.py:4079
+#: ../src/config.py:4254
 msgid "Next Message Received Focused"
 msgstr "已聚焦收到的下一条消息"
 
-#: ../src/config.py:4081
+#: ../src/config.py:4256
 msgid "Next Message Received Unfocused"
 msgstr "解除聚焦收到的下一条消息"
 
-#: ../src/config.py:4082
+#: ../src/config.py:4257
 msgid "Contact Connected"
 msgstr "已连接的联系人"
 
-#: ../src/config.py:4083
+#: ../src/config.py:4258
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
 
-#: ../src/config.py:4084
+#: ../src/config.py:4259
 msgid "Message Sent"
 msgstr "消息已发送"
 
-#: ../src/config.py:4085
+#: ../src/config.py:4260
 msgid "Group Chat Message Highlight"
 msgstr "多人聊天消息突出显示"
 
-#: ../src/config.py:4086
+#: ../src/config.py:4261
 msgid "Group Chat Message Received"
 msgstr "收到的多人聊天消息"
 
-#: ../src/config.py:4087
+#: ../src/config.py:4262
 msgid "GMail Email Received"
 msgstr "收到 GMail 邮件"
 
-#: ../src/conversation_textview.py:601
+#: ../src/conversation_textview.py:351
+msgid ""
+"Text below this line is what has been said since the\n"
+"last time you paid attention to this group chat"
+msgstr "以下文字是您上次注意这个聊天室以来的聊天内容"
+
+#: ../src/conversation_textview.py:657
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
-msgstr "这个图标是说这条消息还没有被远端收到。如果这个图标已经存在很久了, 很可能这条消息丢失了。"
+msgstr ""
+"这个图标是说这条消息还没有被远端收到。如果这个图标已经存在很久了, 很可能这条"
+"消息丢失了。"
 
-#: ../src/conversation_textview.py:620
-msgid ""
-"Text below this line is what has been said since the\n"
-"last time you paid attention to this group chat"
-msgstr "以下文字是您上次注意这个聊天室以来的聊天内容"
+#. show clear
+#: ../src/conversation_textview.py:761 ../src/profile_window.py:220
+msgid "_Clear"
+msgstr ""
 
-#: ../src/conversation_textview.py:740
+#: ../src/conversation_textview.py:772
 msgid "_Quote"
 msgstr "引用(_Q)"
 
-#: ../src/conversation_textview.py:747
+#: ../src/conversation_textview.py:780
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "\"%s\"的动作(_A)"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:794
 msgid "Read _Wikipedia Article"
 msgstr "阅读 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:799
 msgid "Look it up in _Dictionary"
 msgstr "从字典中搜索(_D)"
 
-#: ../src/conversation_textview.py:782
+#: ../src/conversation_textview.py:816
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "字典地址中缺少 \"%s\" 并且它不是 \"WIKTIONARY\""
 
-#. we must have %s in the url
-#: ../src/conversation_textview.py:795
+#: ../src/conversation_textview.py:830
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网络搜索地址缺少 \"%s\""
 
-#: ../src/conversation_textview.py:798
+#: ../src/conversation_textview.py:833
 msgid "Web _Search for it"
 msgstr "在互联网上搜索(_S)"
 
-#: ../src/conversation_textview.py:804
+#: ../src/conversation_textview.py:839
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)"
 
+#: ../src/conversation_textview.py:1221
+#, fuzzy
+msgid "Invalid URL"
+msgstr "无效的 JID"
+
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1298
-#, python-format
+#: ../src/conversation_textview.py:1444
+#, fuzzy, python-format
 msgid "Yesterday"
-msgid_plural "%i days ago"
+msgid_plural "%(nb_days)i days ago"
 msgstr[0] "%i天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1346 ../src/history_window.py:480
+#: ../src/conversation_textview.py:1532 ../src/history_window.py:507
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题: %s\n"
 
-#: ../src/dataforms_widget.py:545
+#: ../src/dataforms_widget.py:585
 msgid "Unable to load image"
 msgstr "无法载入图像"
 
-#: ../src/dataforms_widget.py:547
+#: ../src/dataforms_widget.py:587
 #, python-format
 msgid "Media type not supported: %s"
 msgstr "不支持的媒体类型: %s"
 
-#: ../src/dataforms_widget.py:562
+#: ../src/dataforms_widget.py:602
 msgid "This field is required"
 msgstr "这一项是必须的"
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:646
 msgid "Jabber ID already in list"
 msgstr "Jabber ID 已经在列表中了"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:647
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr "您输入的 Jabber ID 已经在列表中了。请选择另外一个。"
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:658
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:661 ../src/dataforms_widget.py:663
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:93
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "联系人名称: <i>%s</i>"
 
-#: ../src/dialogs.py:84
+#: ../src/dialogs.py:95
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID:  <i>%s</i>"
 
-#: ../src/dialogs.py:195
+#: ../src/dialogs.py:209
 msgid "Group"
 msgstr "群组"
 
-#: ../src/dialogs.py:202
+#: ../src/dialogs.py:216
 msgid "In the group"
 msgstr "群组内"
 
-#: ../src/dialogs.py:293
+#: ../src/dialogs.py:309
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:314
 msgid "Contact name"
 msgstr "联系人名"
 
-#: ../src/dialogs.py:473
+#: ../src/dialogs.py:492
 msgid "Set Mood"
 msgstr "设置 Mood"
 
-#: ../src/dialogs.py:593
+#: ../src/dialogs.py:613
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:607
+#: ../src/dialogs.py:627
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:796
+#: ../src/dialogs.py:817
 msgid "Overwrite Status Message?"
 msgstr "覆盖状态消息?"
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:818
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr "这个名称已被使用。您想要覆盖这个状态消息吗?"
 
-#: ../src/dialogs.py:805
+#: ../src/dialogs.py:826
 msgid "Save as Preset Status Message"
 msgstr "保存为预设状态消息"
 
-#: ../src/dialogs.py:806
+#: ../src/dialogs.py:827
 msgid "Please type a name for this status message"
 msgstr "请为这个状态消息输入一个名称"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:855
 msgid "AIM Address:"
 msgstr "AIM 地址: "
 
-#: ../src/dialogs.py:835
+#: ../src/dialogs.py:856
 msgid "GG Number:"
 msgstr "GG 号码: "
 
-#: ../src/dialogs.py:836
+#: ../src/dialogs.py:857
 msgid "ICQ Number:"
 msgstr "ICQ 号码: "
 
-#: ../src/dialogs.py:837
+#: ../src/dialogs.py:858
 msgid "MSN Address:"
 msgstr "MSN 地址: "
 
-#: ../src/dialogs.py:838
+#: ../src/dialogs.py:859
 msgid "Yahoo! Address:"
 msgstr "Yahoo! 地址: "
 
-#: ../src/dialogs.py:875
-#, python-format
-msgid "Please fill in the data of the contact you want to add in account %s"
+#: ../src/dialogs.py:896
+#, fuzzy, python-format
+msgid ""
+"Please fill in the data of the contact you want\n"
+"to add to your account <b>%s</b>"
 msgstr "请填入您想添加到账户 %s 的联系人的信息"
 
-#: ../src/dialogs.py:878
+#: ../src/dialogs.py:899
 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:1096 ../src/dialogs.py:1102 ../src/dialogs.py:1107
+#: ../src/dialogs.py:3814
 msgid "Invalid User ID"
 msgstr "无效的用户ID"
 
-#: ../src/dialogs.py:1054
+#: ../src/dialogs.py:1103
 msgid "The user ID must not contain a resource."
 msgstr "用户ID不应包含资源。"
 
-#: ../src/dialogs.py:1059
+#: ../src/dialogs.py:1108
 msgid "You cannot add yourself to your roster."
 msgstr "您不能将您自己添加到您的联系人列表中。"
 
-#: ../src/dialogs.py:1073
+#: ../src/dialogs.py:1122
 msgid "Contact already in roster"
 msgstr "联系人已经在联系人列表中"
 
-#: ../src/dialogs.py:1074
+#: ../src/dialogs.py:1123
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已经在您的联系人列表中了"
 
-#: ../src/dialogs.py:1120
+#: ../src/dialogs.py:1176 ../src/dialogs.py:1210
 msgid "User ID:"
 msgstr "用户 ID: "
 
-#: ../src/dialogs.py:1191
-msgid "A GTK+ jabber client"
-msgstr "一个 GTK+ Jabber 客户端"
+#: ../src/dialogs.py:1308
+#, fuzzy
+msgid "A GTK+ Jabber/XMPP client"
+msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:1192
+#: ../src/dialogs.py:1309
 msgid "GTK+ Version:"
 msgstr "GTK+ 版本: "
 
-#: ../src/dialogs.py:1193
-msgid "PyGTK Version:"
+#: ../src/dialogs.py:1309
+#, fuzzy
+msgid "PyGobject Version:"
 msgstr "PyGTK 版本: "
 
-#: ../src/dialogs.py:1203
+#: ../src/dialogs.py:1310
+msgid "python-nbxmpp Version:"
+msgstr ""
+
+#: ../src/dialogs.py:1321
 msgid "Current Developers:"
 msgstr "当前的开发者: "
 
-#: ../src/dialogs.py:1205
+#: ../src/dialogs.py:1323
 msgid "Past Developers:"
 msgstr "既往开发者: "
 
-#: ../src/dialogs.py:1211
+#: ../src/dialogs.py:1329
 msgid "THANKS:"
 msgstr "感谢: "
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1217
+#: ../src/dialogs.py:1335
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "最后但不是最不重要的, 我们要感谢所有的软件包维护者。"
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1229
+#: ../src/dialogs.py:1347
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
@@ -6904,7 +7629,7 @@ msgstr ""
 "jeanet <qianxiaojun604@gmail.com>\n"
 "Guanhao Yin <yinguanhao@gmail.com>"
 
-#: ../src/dialogs.py:1412
+#: ../src/dialogs.py:1531
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6912,267 +7637,299 @@ msgid ""
 "\n"
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-"您必须安装 %s 词典才能使用拼写检查, 或者在拼写检查语言选项中设置另一种语言。\n"
+"您必须安装 %s 词典才能使用拼写检查, 或者在拼写检查语言选项中设置另一种语"
+"言。\n"
 "高亮拼写错误的特性不会被启用。"
 
-#: ../src/dialogs.py:1953 ../src/dialogs.py:2340
-msgid "The nickname has not allowed characters."
+#: ../src/dialogs.py:1876 ../src/dialogs.py:1892 ../src/gui_interface.py:1502
+#: ../src/gui_interface.py:1544
+msgid "Insecure connection"
+msgstr "不安全的连接"
+
+#: ../src/dialogs.py:1877
+#, fuzzy, python-format
+msgid ""
+"You are about to connect to the account %(account)s (%(server)s) with an "
+"insecure connection. This means all your conversations will be exchanged "
+"unencrypted. This type of connection is really discouraged.\n"
+"Are you sure you want to do that?"
+msgstr ""
+"您将通过一个不安全的连接连接服务器。这意味着您的所有对话都会不经加密地被交"
+"换。您确定要这样做吗?"
+
+#: ../src/dialogs.py:1883 ../src/gui_interface.py:1506
+#: ../src/gui_interface.py:1547
+msgid "Yes, I really want to connect insecurely"
+msgstr "是的, 我确实想要不安全地连接"
+
+#: ../src/dialogs.py:1884
+msgid "Gajim will NOT connect unless you check this box"
+msgstr ""
+
+#: ../src/dialogs.py:1885 ../src/groupchat_control.py:2187
+#: ../src/gui_interface.py:725 ../src/gui_interface.py:1507
+#: ../src/gui_interface.py:1548 ../src/message_window.py:240
+#: ../src/roster_window.py:2986 ../src/roster_window.py:3666
+#: ../src/roster_window.py:4495
+msgid "_Do not ask me again"
+msgstr "不要再问我了(_D)"
+
+#: ../src/dialogs.py:1984
+msgid "_Resume"
+msgstr ""
+
+#: ../src/dialogs.py:1992
+msgid "Re_place"
+msgstr ""
+
+#: ../src/dialogs.py:2196 ../src/dialogs.py:2661
+#, fuzzy
+msgid "The nickname contains invalid characters."
 msgstr "昵称包含不合法字符。"
 
-#: ../src/dialogs.py:2071
+#: ../src/dialogs.py:2319
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "%(jid)s 对账户 %(account)s 的认证请求"
 
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2322
 #, python-format
 msgid "Subscription request from %s"
 msgstr "%s 的认证请求"
 
-#: ../src/dialogs.py:2149 ../src/gui_interface.py:2402
+#: ../src/dialogs.py:2407 ../src/gui_interface.py:2143
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已经在聊天室 %s"
 
-#: ../src/dialogs.py:2155
+#: ../src/dialogs.py:2413
 msgid "You can not join a group chat unless you are connected."
 msgstr "您必须连接才能加入聊天室。"
 
-#: ../src/dialogs.py:2196
+#: ../src/dialogs.py:2459
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入聊天室"
 
-#: ../src/dialogs.py:2327
+#: ../src/dialogs.py:2597 ../src/dialogs.py:2608
+#, fuzzy
+msgid "Wrong server"
+msgstr "错误的 uri"
+
+#: ../src/dialogs.py:2597 ../src/dialogs.py:2608
+#, fuzzy, python-format
+msgid "%s is not a groupchat server"
+msgstr "这不是一个聊天室"
+
+#: ../src/dialogs.py:2648
 msgid "Invalid Account"
 msgstr "无效的账户"
 
-#: ../src/dialogs.py:2328
+#: ../src/dialogs.py:2649
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "您需要选择一个账户, 用它来加入聊天室。"
 
-#: ../src/dialogs.py:2339
+#: ../src/dialogs.py:2660
 msgid "Invalid Nickname"
 msgstr "不合法的昵称"
 
-#: ../src/dialogs.py:2344 ../src/dialogs.py:2350
-#: ../src/groupchat_control.py:1877
+#: ../src/dialogs.py:2665 ../src/dialogs.py:2671
+#: ../src/groupchat_control.py:2260
 msgid "Invalid group chat Jabber ID"
 msgstr "无效的聊天室 Jabber ID"
 
-#: ../src/dialogs.py:2345
+#: ../src/dialogs.py:2666
 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
-msgid "The group chat Jabber ID has not allowed characters."
+#: ../src/dialogs.py:2672
+#, fuzzy
+msgid "The group chat Jabber ID contains invalid characters."
 msgstr "聊天室 Jabber ID 包含不合法字符。"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2677 ../src/gui_interface.py:2123
 msgid "This is not a group chat"
 msgstr "这不是一个聊天室"
 
-#: ../src/dialogs.py:2359
+#: ../src/dialogs.py:2678 ../src/gui_interface.py:2124
 #, python-format
-msgid "%s is not the name of a group chat."
-msgstr "%s 不是一个聊天室的名称。"
+msgid ""
+"%s is already in your roster. Please check if %s is a correct group chat "
+"name. If it is, delete it from your roster and try joining the group chat "
+"again."
+msgstr ""
 
-#: ../src/dialogs.py:2390
+#: ../src/dialogs.py:2714
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "未连接时, 您不能同步您的联系人。"
 
-#: ../src/dialogs.py:2404
+#: ../src/dialogs.py:2728
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/dialogs.py:2439
+#: ../src/dialogs.py:2764
 msgid "This account is not connected to the server"
 msgstr "这个账户已经连接到服务器"
 
-#: ../src/dialogs.py:2440
+#: ../src/dialogs.py:2765
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "这个账户连接后您才可以与之同步"
 
-#: ../src/dialogs.py:2464
+#: ../src/dialogs.py:2790
 msgid "Synchronise"
 msgstr "同步"
 
-#: ../src/dialogs.py:2525
+#: ../src/dialogs.py:2851
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 开始聊天"
 
-#: ../src/dialogs.py:2527
+#: ../src/dialogs.py:2853
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:2528
+#: ../src/dialogs.py:2854
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "填写一个昵称或者 Jabber ID, 您将要给其发送聊天消息: "
 
+#: ../src/dialogs.py:2856
+#, fuzzy
+msgid "Nickname / Jabber ID"
+msgstr "无效的 Jabber ID"
+
 #. if offline or connecting
-#: ../src/dialogs.py:2554 ../src/dialogs.py:2935 ../src/dialogs.py:3147
+#: ../src/dialogs.py:2882 ../src/dialogs.py:3271 ../src/dialogs.py:3493
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:2555 ../src/dialogs.py:2936 ../src/dialogs.py:3148
+#: ../src/dialogs.py:2883 ../src/dialogs.py:3272 ../src/dialogs.py:3494
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认您已经连接到 \"%s\"。"
 
-#: ../src/dialogs.py:2564 ../src/dialogs.py:2567
+#: ../src/dialogs.py:2892 ../src/dialogs.py:2895
 msgid "Invalid JID"
 msgstr "无效的 JID"
 
-#: ../src/dialogs.py:2567
+#: ../src/dialogs.py:2895
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "无法解析 \"%s\"。"
 
-#: ../src/dialogs.py:2576
+#: ../src/dialogs.py:2904
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2595
+#: ../src/dialogs.py:2924
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/dialogs.py:2595
+#: ../src/dialogs.py:2924
 msgid "You must enter a password."
 msgstr "您必须输入密码"
 
-#: ../src/dialogs.py:2599
+#: ../src/dialogs.py:2928
 msgid "Passwords do not match"
 msgstr "密码不匹配"
 
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2929
 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:2974 ../src/gui_interface.py:898 ../src/notify.py:287
 msgid "New E-mail"
 msgstr "新电子邮件"
 
-#: ../src/dialogs.py:2644 ../src/gui_interface.py:1154 ../src/notify.py:480
+#: ../src/dialogs.py:2976 ../src/gui_interface.py:962 ../src/notify.py:280
 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:2978 ../src/gui_interface.py:860
+#: ../src/gui_interface.py:927 ../src/notify.py:282
 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:2980 ../src/gui_interface.py:1057
+#: ../src/gui_interface.py:1086 ../src/gui_interface.py:1107
+#: ../src/notify.py:284
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:2649 ../src/gui_interface.py:1203 ../src/notify.py:485
+#: ../src/dialogs.py:2981 ../src/gui_interface.py:1061
+#: ../src/gui_interface.py:1090 ../src/gui_interface.py:1111
+#: ../src/notify.py:285
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:2651 ../src/gui_interface.py:908 ../src/notify.py:489
-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:3190
 #, python-format
 msgid "Single Message using account %s"
 msgstr "单条消息, 使用账户 %s"
 
-#: ../src/dialogs.py:2856
+#: ../src/dialogs.py:3192
 #, python-format
 msgid "Single Message in account %s"
 msgstr "单条消息, 在账户 %s"
 
-#: ../src/dialogs.py:2858
+#: ../src/dialogs.py:3194
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2861
+#: ../src/dialogs.py:3197
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2884
+#: ../src/dialogs.py:3220
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2907
+#: ../src/dialogs.py:3243
 #, python-format
 msgid "Form %s"
 msgstr "来自 %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2986
+#: ../src/dialogs.py:3326
 #, python-format
 msgid "RE: %s"
 msgstr "回复: %s"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3327
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道: \n"
 
-#: ../src/dialogs.py:3046
+#: ../src/dialogs.py:3387
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:3048
+#: ../src/dialogs.py:3389
 msgid "XML Console"
 msgstr " XML 控制台"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3177
+#: ../src/dialogs.py:3522
 msgid "add"
 msgstr "添加"
 
-#: ../src/dialogs.py:3177
+#: ../src/dialogs.py:3522
 msgid "modify"
 msgstr "修改"
 
-#: ../src/dialogs.py:3178
+#: ../src/dialogs.py:3523
 msgid "remove"
 msgstr "移除"
 
-#: ../src/dialogs.py:3206
+#: ../src/dialogs.py:3552
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7180,184 +7937,201 @@ msgid ""
 msgstr "<b>%(jid)s</b> 希望您 <b>%(action)s</b> 您的一些联系人。"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3222 ../src/dialogs.py:3268
-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:3570 ../src/dialogs.py:3645
 msgid "Modify"
 msgstr "修改"
 
-#: ../src/dialogs.py:3230
-msgid "Jabber ID"
-msgstr "Jabber ID"
-
-#: ../src/dialogs.py:3236
+#: ../src/dialogs.py:3582
 msgid "Groups"
 msgstr "群组"
 
 #. it is selected
-#. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3344
+#. remote_jid = model[iter_][1]
+#: ../src/dialogs.py:3690
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s 建议我将您添加到我的联系人列表。"
 
-#: ../src/dialogs.py:3358
-#, python-format
-msgid "Added  %s contacts"
-msgstr "添加了 %s 联系人"
+#: ../src/dialogs.py:3704
+#, fuzzy, python-format
+msgid "Added %d contact"
+msgid_plural "Added %d contacts"
+msgstr[0] "添加了 %s 联系人"
 
-#: ../src/dialogs.py:3395
-#, python-format
-msgid "Removed  %s contacts"
-msgstr "移除了 %s 联系人"
+#: ../src/dialogs.py:3742
+#, fuzzy, python-format
+msgid "Removed %d contact"
+msgid_plural "Removed %d contacts"
+msgstr[0] "移除了 %s 联系人"
 
-#: ../src/dialogs.py:3435 ../src/dialogs.py:3612
+#: ../src/dialogs.py:3783 ../src/dialogs.py:3960 ../src/dialogs.py:4131
 #, python-format
 msgid "Archiving Preferences for %s"
 msgstr "%s 的存档首选项"
 
-#: ../src/dialogs.py:3475
+#: ../src/dialogs.py:3823
 msgid "Invalid expire value"
 msgstr "无效的过期值"
 
-#: ../src/dialogs.py:3476
+#: ../src/dialogs.py:3824
 msgid "Expire must be a valid positive integer."
 msgstr "过期值必须是一个有效的正整数。"
 
-#: ../src/dialogs.py:3523
+#: ../src/dialogs.py:3871
 msgid "There is an error with the form"
 msgstr "在表格中有一处错误"
 
-#: ../src/dialogs.py:3734
+#: ../src/dialogs.py:4091
 msgid "There is an error"
 msgstr "有一处错误"
 
-#: ../src/dialogs.py:3798
+#: ../src/dialogs.py:4165
+msgid "Success!"
+msgstr ""
+
+#: ../src/dialogs.py:4165
+#, fuzzy
+msgid "Your Archiving Preferences have been saved!"
+msgstr "%s 的存档首选项"
+
+#: ../src/dialogs.py:4181
+msgid "We got no response from the Server"
+msgstr ""
+
+#: ../src/dialogs.py:4183
+#, fuzzy
+msgid "We received an error: {}"
+msgstr "有一处错误"
+
+#: ../src/dialogs.py:4187
+#, fuzzy
+msgid "Error!"
+msgstr "错误"
+
+#: ../src/dialogs.py:4246
+#, fuzzy
+msgid "Add Jabber ID"
+msgstr "Jabber ID"
+
+#: ../src/dialogs.py:4319
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "隐私策略列表 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3802
+#: ../src/dialogs.py:4323
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的隐私策略列表"
 
-#: ../src/dialogs.py:3858
+#: ../src/dialogs.py:4392
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "顺序: %(order)s, 动作: %(action)s, 类型: %(type)s, 值: %(value)s"
 
-#: ../src/dialogs.py:3863
+#: ../src/dialogs.py:4397
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "顺序: %(order)s, 动作: %(action)s"
 
-#: ../src/dialogs.py:3907
+#: ../src/dialogs.py:4451
 msgid "<b>Edit a rule</b>"
 msgstr "<b>编辑规则</b>"
 
-#: ../src/dialogs.py:4018
+#: ../src/dialogs.py:4563
 msgid "<b>Add a rule</b>"
 msgstr "<b>添加规则</b>"
 
-#: ../src/dialogs.py:4118
+#: ../src/dialogs.py:4664
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的隐私策略列表"
 
-#: ../src/dialogs.py:4120
+#: ../src/dialogs.py:4666
 msgid "Privacy Lists"
 msgstr "隐私策略列表"
 
-#: ../src/dialogs.py:4190
+#: ../src/dialogs.py:4756
 msgid "Invalid List Name"
 msgstr "不合法的列表名"
 
-#: ../src/dialogs.py:4191
+#: ../src/dialogs.py:4757
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个隐私策略列表。"
 
-#: ../src/dialogs.py:4223
+#: ../src/dialogs.py:4793
 msgid "You are invited to a groupchat"
 msgstr "您被邀请到一个聊天室"
 
-#: ../src/dialogs.py:4226
+#: ../src/dialogs.py:4796
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact 邀请您加入一个聊天室"
 
-#: ../src/dialogs.py:4228
+#: ../src/dialogs.py:4798
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact 邀请您参加聊天室 %(room_jid)s"
 
-#: ../src/dialogs.py:4236
+#: ../src/dialogs.py:4807
 #, python-format
 msgid "Comment: %s"
 msgstr "注释: %s"
 
-#: ../src/dialogs.py:4238
+#: ../src/dialogs.py:4809
 msgid "Do you want to accept the invitation?"
 msgstr "您是否接受邀请?"
 
-#: ../src/dialogs.py:4300
+#: ../src/dialogs.py:4828
+msgid "Reason (if you decline):"
+msgstr ""
+
+#: ../src/dialogs.py:4877
 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:4888 ../src/dialogs.py:4930 ../src/dialogs.py:4978
+#: ../src/dialogs.py:5067
 msgid "All files"
 msgstr "所有文件"
 
-#: ../src/dialogs.py:4315
+#: ../src/dialogs.py:4893
 msgid "PKCS12 Files"
 msgstr "PKCS12 文件"
 
-#: ../src/dialogs.py:4343
+#: ../src/dialogs.py:4919
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:4358
+#: ../src/dialogs.py:4935
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:4396
+#: ../src/dialogs.py:4965
 msgid "Choose Image"
 msgstr "选择图像"
 
-#: ../src/dialogs.py:4414
+#: ../src/dialogs.py:4983
 msgid "Images"
 msgstr "图像"
 
-#: ../src/dialogs.py:4484
+#: ../src/dialogs.py:5053
 msgid "Choose Archive"
 msgstr "选择归档文件"
 
-#: ../src/dialogs.py:4502
+#: ../src/dialogs.py:5072
 msgid "Zip files"
 msgstr "Zip 文件"
 
-#: ../src/dialogs.py:4527
+#: ../src/dialogs.py:5098
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为: "
 
-#: ../src/dialogs.py:4529
+#: ../src/dialogs.py:5100
 #, 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:5322
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7368,38 +8142,40 @@ msgstr ""
 "\n"
 "会话的短认证字符串是 <b>%(sas)s</b>。"
 
-#: ../src/dialogs.py:5203
+#: ../src/dialogs.py:5325
 msgid "You have already verified this contact's identity."
 msgstr "您已经确认了这个联系人的身份。"
 
-#: ../src/dialogs.py:5209 ../src/dialogs.py:5293
+#: ../src/dialogs.py:5331 ../src/dialogs.py:5416
 msgid "Contact's identity verified"
 msgstr "联系人身份已确认"
 
-#: ../src/dialogs.py:5215
+#: ../src/dialogs.py:5337
 msgid "Verify again..."
 msgstr "重新验证"
 
-#: ../src/dialogs.py:5220
+#: ../src/dialogs.py:5342
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
-msgstr "为了确保<b>只有</b>您期望的人可以看到您发送的消息或给您发送消息, 您需要验证他们的身份信息。请点击下面的按钮。"
+msgstr ""
+"为了确保<b>只有</b>您期望的人可以看到您发送的消息或给您发送消息, 您需要验证他"
+"们的身份信息。请点击下面的按钮。"
 
-#: ../src/dialogs.py:5223 ../src/dialogs.py:5274 ../src/dialogs.py:5287
+#: ../src/dialogs.py:5345 ../src/dialogs.py:5397 ../src/dialogs.py:5410
 msgid "Contact's identity NOT verified"
 msgstr "联系人身份未确认"
 
-#: ../src/dialogs.py:5228
+#: ../src/dialogs.py:5350
 msgid "Verify..."
 msgstr "确认..."
 
-#: ../src/dialogs.py:5239
+#: ../src/dialogs.py:5361
 msgid "Have you verified the contact's identity?"
 msgstr "您确认了联系人的身份吗?"
 
-#: ../src/dialogs.py:5240
+#: ../src/dialogs.py:5362
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7408,178 +8184,244 @@ msgid ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
-"为了防止您是在与未知方交谈, 您应该与 <b>%(jid)s</b> 直接交谈（当面或通电话）并确认他们看到的短认证字符串(SAS)与您相同。\n"
+"为了防止您是在与未知方交谈, 您应该与 <b>%(jid)s</b> 直接交谈（当面或通电话）"
+"并确认他们看到的短认证字符串(SAS)与您相同。\n"
 "\n"
 "这次会话的短认证字符串是 <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:5241
+#: ../src/dialogs.py:5363
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "您与远程联系人通话并验证了 SAS 吗?"
 
-#: ../src/dialogs.py:5275
+#: ../src/dialogs.py:5398
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr "联系人的密钥(%s)与在 Gajim 中指定的密钥<b>不匹配</b>。"
 
-#: ../src/dialogs.py:5281
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
+#: ../src/dialogs.py:5404
+#, fuzzy
+msgid ""
+"No OpenPGP key is assigned to this contact. So you cannot encrypt messages."
 msgstr "没有为这个联系人指定密钥。因此您无法加密消息。"
 
-#: ../src/dialogs.py:5288
+#: ../src/dialogs.py:5411
+#, fuzzy
 msgid ""
-"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
-"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
-msgstr "尽管为这个联系人指定了密钥, 但您<b>不信任</b>他的密钥, 因此消息<b>无法</b>被加密。使用您的 GPG 客户端以信任他的密钥。"
+"OpenPGP key is assigned to this contact, but <b>you do not trust his key</"
+"b>, so message <b>cannot</b> be encrypted. Use your OpenPGP client to trust "
+"this key."
+msgstr ""
+"尽管为这个联系人指定了密钥, 但您<b>不信任</b>他的密钥, 因此消息<b>无法</b>被"
+"加密。使用您的 GPG 客户端以信任他的密钥。"
 
-#: ../src/dialogs.py:5294
+#: ../src/dialogs.py:5417
+#, fuzzy
 msgid ""
-"GPG Key is assigned to this contact, and you trust his key, so messages will "
-"be encrypted."
+"OpenPGP Key is assigned to this contact, and you trust his key, so messages "
+"will be encrypted."
 msgstr "联系人被指定了 GPG 密钥, 且您信任他的密钥, 所以消息会被加密。"
 
-#: ../src/dialogs.py:5359
+#: ../src/dialogs.py:5483
 msgid "an audio and video"
 msgstr "一个音频和视频"
 
-#: ../src/dialogs.py:5361
+#: ../src/dialogs.py:5485
 msgid "an audio"
 msgstr "一个音频"
 
-#: ../src/dialogs.py:5363
+#: ../src/dialogs.py:5487
 msgid "a video"
 msgstr "一个视频"
 
-#: ../src/dialogs.py:5367
+#: ../src/dialogs.py:5491
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr "%(contact)s 想要与您发起一个 %(type)s 会话。您要响应吗?"
 
-#: ../src/disco.py:119
+#: ../src/dialogs.py:5596 ../src/dialogs.py:5632
+#, fuzzy, python-format
+msgid "Certificate for account %s"
+msgstr "帐户 %s"
+
+#: ../src/dialogs.py:5596
+#, 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\n"
+"\n"
+"SHA256 Fingerprint: %(sha256)s\n"
+msgstr ""
+
+#: ../src/dialogs.py:5643 ../src/gui_interface.py:1396
+#, fuzzy, python-format
+msgid "SSL Certificate Verification for %s"
+msgstr "SSL证书错误"
+
+#: ../src/dialogs.py:5644 ../src/dialogs.py:5661
+msgid "View cert..."
+msgstr ""
+
+#: ../src/disco.py:68
+msgid "This service has not yet responded with detailed information"
+msgstr "服务还没有详细的信息应答"
+
+#: ../src/disco.py:69
+msgid ""
+"This service could not respond with detailed information.\n"
+"It is most likely legacy or broken"
+msgstr ""
+"这个服务无法应答详细的信息。\n"
+"这很可能是服务器的遗留问题, 或者服务器被损坏了"
+
+#: ../src/disco.py:128
 msgid "Others"
 msgstr "其他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:132
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:513
+#: ../src/disco.py:530
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:600
+#: ../src/disco.py:616
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用账户 %s 来发掘服务"
 
-#: ../src/disco.py:602
+#: ../src/disco.py:618
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:758
+#: ../src/disco.py:779
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:759
+#: ../src/disco.py:780
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 msgstr "此地址没有服务或无应答。请检查地址后重试。"
 
-#: ../src/disco.py:763 ../src/disco.py:1100
+#: ../src/disco.py:786 ../src/disco.py:1138
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:764
+#: ../src/disco.py:787
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:804 ../src/disco.py:814
+#: ../src/disco.py:828 ../src/disco.py:838
 msgid "Invalid Server Name"
 msgstr "无效的服务器名"
 
-#: ../src/disco.py:868
+#: ../src/disco.py:896
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "用账户 %(account)s 浏览地址 %(address)s"
 
-#: ../src/disco.py:912
-msgid "_Browse"
+#: ../src/disco.py:943
+#, fuzzy
+msgid "Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:1101
+#: ../src/disco.py:1139
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1341
-msgid "_Execute Command"
+#: ../src/disco.py:1351
+#, fuzzy
+msgid "Execute Command"
 msgstr "执行命令(_E)..."
 
-#: ../src/disco.py:1351 ../src/disco.py:1522
+#: ../src/disco.py:1355 ../src/disco.py:1520
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1563
+#: ../src/disco.py:1366
+#, fuzzy
+msgid "Join"
+msgstr "加入(_J)"
+
+#: ../src/disco.py:1561
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "已扫描 %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1754
+#: ../src/disco.py:1757
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1762
+#: ../src/disco.py:1765
 msgid "Description"
 msgstr "描述"
 
 #. Id column
-#: ../src/disco.py:1770
+#: ../src/disco.py:1773
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1835 ../src/gui_interface.py:2927
+#: ../src/disco.py:1837 ../src/gui_interface.py:2629
 msgid "Bookmark already set"
 msgstr "书签已设定"
 
-#: ../src/disco.py:1836 ../src/gui_interface.py:2928
+#: ../src/disco.py:1838 ../src/gui_interface.py:2630
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "聊天室\"%s\"已在您的书签中。"
 
-#: ../src/disco.py:1845 ../src/gui_interface.py:2942
+#: ../src/disco.py:1848 ../src/gui_interface.py:2644
 msgid "Bookmark has been added successfully"
 msgstr "书签添加成功"
 
-#: ../src/disco.py:1846 ../src/gui_interface.py:2943
+#: ../src/disco.py:1849 ../src/gui_interface.py:2645
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以通过\"动作\"菜单管理您的书签。"
 
-#: ../src/disco.py:2057
+#: ../src/disco.py:2044
 msgid "Subscribed"
 msgstr "订阅"
 
-#: ../src/disco.py:2065
+#: ../src/disco.py:2053
 msgid "Node"
 msgstr "节点"
 
-#: ../src/disco.py:2129
+#: ../src/disco.py:2120
 msgid "New post"
 msgstr "新发表"
 
-#: ../src/disco.py:2135
+#: ../src/disco.py:2126
 msgid "_Subscribe"
 msgstr "订阅(_S)"
 
-#: ../src/disco.py:2141
+#: ../src/disco.py:2132
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
 #: ../src/features_window.py:49
-msgid "SSL certificat validation"
+#, fuzzy
+msgid "SSL certificate validation"
 msgstr "SSL 证书验证"
 
 #: ../src/features_window.py:50
@@ -7588,7 +8430,8 @@ msgid ""
 msgstr "一个用于验证服务器的证书以保证连接安全的库。"
 
 #: ../src/features_window.py:51 ../src/features_window.py:52
-msgid "Requires python-pyopenssl."
+#, fuzzy
+msgid "Requires python-pyopenssl > 0.12 and pyasn1."
 msgstr "需要 python-pyopenssl。"
 
 #: ../src/features_window.py:53
@@ -7604,8 +8447,10 @@ msgid "Requires python-avahi."
 msgstr "需要 python-avahi。"
 
 #: ../src/features_window.py:56
-msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "需要 pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)。"
+msgid ""
+"Requires pybonjour and bonjour SDK running (http://developer.apple.com/"
+"opensource/)."
+msgstr ""
 
 #: ../src/features_window.py:57
 msgid "Command line"
@@ -7619,24 +8464,30 @@ msgstr "一个在命令行下控制 Gajim 的脚本。"
 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:60 ../src/features_window.py:68
+#: ../src/features_window.py:72 ../src/features_window.py:80
+#: ../src/features_window.py:96 ../src/features_window.py:100
+#: ../src/features_window.py:104
 msgid "Feature not available under Windows."
 msgstr "特性在 Windows 下不可用。"
 
 #: ../src/features_window.py:61
-msgid "OpenGPG message encryption"
+#, fuzzy
+msgid "OpenPGP message encryption"
 msgstr "OpenPGP 消息加密"
 
 #: ../src/features_window.py:62
-msgid "Encrypting chat messages with gpg keys."
+#, fuzzy
+msgid "Encrypting chat messages with OpenPGP keys."
 msgstr "用 gpg 密钥加密聊天消息。"
 
 #: ../src/features_window.py:63
-msgid "Requires gpg and python-GnuPGInterface."
-msgstr "需要 gpg 和 python-GnuPGInterface。"
+msgid "Requires gpg and python-gnupg (http://code.google.com/p/python-gnupg/)."
+msgstr ""
+
+#: ../src/features_window.py:64
+msgid "Requires gpg.exe in PATH."
+msgstr ""
 
 #: ../src/features_window.py:65
 msgid "Network-manager"
@@ -7651,128 +8502,82 @@ msgid "Requires gnome-network-manager and python-dbus."
 msgstr "需要 gnome-network-manager 和 python-dbus。"
 
 #: ../src/features_window.py:69
-msgid "Session Management"
-msgstr "会话管理"
-
-#: ../src/features_window.py:70
-msgid "Gajim session is stored on logout and restored on login."
-msgstr "Gajim 会话在退出时会被存储而后登录时恢复。"
-
-#: ../src/features_window.py:71
-msgid "Requires python-gnome2."
-msgstr "需要 python-gnome2。"
-
-#: ../src/features_window.py:73
 msgid "Password encryption"
 msgstr "密码加密"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:70
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "密码可以被安全地存储, 而不只是以纯文本方式。"
 
-#: ../src/features_window.py:75
-msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
-msgstr "需要 gnome-keyring 和 python-gnome2-desktop, 或 kwalletcli。"
-
-#: ../src/features_window.py:77
-msgid "SRV"
-msgstr "SRV"
-
-#: ../src/features_window.py:78
-msgid "Ability to connect to servers which are using SRV records."
-msgstr "连接到有 SRV 记录的服务器的能力。"
-
-#: ../src/features_window.py:79
-msgid "Requires dnsutils."
-msgstr "需要 dnsutils。"
-
-#: ../src/features_window.py:80
-msgid "Requires nslookup to use SRV records."
-msgstr "需要 nslookup 以使用 SRV 记录。"
+#: ../src/features_window.py:71
+msgid ""
+"Requires libsecret and a provider (such as GNOME Keyring and KSecretService)."
+msgstr ""
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:73
 msgid "Spell Checker"
 msgstr "拼写检查工具"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:74
 msgid "Spellchecking of composed messages."
 msgstr "对正在编辑的消息进行拼写检查。"
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:75
 msgid "Requires libgtkspell."
 msgstr "需要 libgtkspell。"
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:76
+#, fuzzy
+msgid "Requires libgtkspell and libenchant."
+msgstr "需要 libgtkspell。"
+
+#: ../src/features_window.py:77
 msgid "Notification"
 msgstr "通知"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:78
 msgid "Passive popups notifying for new events."
 msgstr "有新的时间时, 主动弹出提示。"
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:79
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr "需要 python-notify 或 python-dbus 和 notification-daemon的组合。"
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:81
 msgid "Automatic status"
 msgstr "自动调整状态"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:82
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr "测算空闲时间以自动调整状态的能力。"
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:83
 msgid "Requires libxss library."
 msgstr "需要 libxss 库。"
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:84
 msgid "Requires python2.5."
 msgstr "需要 python2.5。"
 
-#: ../src/features_window.py:93
-msgid "LaTeX"
-msgstr "LaTeX"
-
-#: ../src/features_window.py:94
-msgid "Transform LaTeX expressions between $$ $$."
-msgstr "转换 $$ $$ 之间的 LaTeX 表达式。"
-
-#: ../src/features_window.py:95
-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
-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:85
 msgid "End to End message encryption"
 msgstr "End to End 消息加密"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:86
 msgid "Encrypting chat messages."
 msgstr "加密聊天消息。"
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:87 ../src/features_window.py:88
 msgid "Requires python-crypto."
 msgstr "需要 python-crypto。"
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:89
 msgid "RST Generator"
 msgstr "RST 生成器"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:90
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
@@ -7780,170 +8585,201 @@ 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:91 ../src/features_window.py:92
 msgid "Requires python-docutils."
 msgstr "需要 python-docutils。"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:94
 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:95
+msgid ""
+"Requires gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav and "
+"gstreamer1.0-plugins-ugly."
+msgstr ""
 
-#: ../src/features_window.py:115
+#: ../src/features_window.py:97
+msgid "UPnP-IGD"
+msgstr ""
+
+#: ../src/features_window.py:98
+msgid "Ability to request your router to forward port for file transfer."
+msgstr ""
+
+#: ../src/features_window.py:99
+#, fuzzy
+msgid "Requires python-gupnp-igd."
+msgstr "需要 python-gnome2。"
+
+#: ../src/features_window.py:101
+msgid "UPower"
+msgstr ""
+
+#: ../src/features_window.py:102
+msgid "Ability to disconnect properly just before suspending the machine."
+msgstr ""
+
+#: ../src/features_window.py:103
+#, fuzzy
+msgid "Requires upower and python-dbus."
+msgstr "需要 python-dbus。"
+
+#: ../src/features_window.py:111
 msgid "?features:Available"
 msgstr "可用"
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:118
 msgid "Feature"
 msgstr "特性"
 
-#: ../src/filetransfers_window.py:77
+#: ../src/filetransfers_window.py:85
 msgid "File"
 msgstr "文件"
 
-#: ../src/filetransfers_window.py:92
+#: ../src/filetransfers_window.py:100
 msgid "Time"
 msgstr "时间"
 
-#: ../src/filetransfers_window.py:104
+#: ../src/filetransfers_window.py:112
 msgid "Progress"
 msgstr "进程"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:243
 #, python-format
 msgid "Filename: %s"
 msgstr "文件名:  %s"
 
-#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:450
 #, python-format
 msgid "Size: %s"
 msgstr "大小:  %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
-#: ../src/history_manager.py:522
+#: ../src/filetransfers_window.py:197 ../src/filetransfers_window.py:207
+#: ../src/history_manager.py:550
 msgid "You"
 msgstr "您"
 
-#: ../src/filetransfers_window.py:189
+#: ../src/filetransfers_window.py:198
 #, python-format
 msgid "Sender: %s"
 msgstr "发送者:  %s"
 
-#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:742
+#: ../src/filetransfers_window.py:199 ../src/filetransfers_window.py:731
+#: ../src/tooltips.py:845
 msgid "Recipient: "
 msgstr "接收者:  %s"
 
-#: ../src/filetransfers_window.py:201
+#: ../src/filetransfers_window.py:210
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存在:  %s"
 
-#: ../src/filetransfers_window.py:203
-msgid "File transfer completed"
-msgstr "文件传输已完成"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
-msgid "File transfer cancelled"
-msgstr "文件传输已取消"
-
-#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
-msgid "Connection with peer cannot be established."
-msgstr "无法与对方建立连接。"
-
-#: ../src/filetransfers_window.py:235
+#: ../src/filetransfers_window.py:244
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者:  %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:246
 #, python-format
 msgid "Error message: %s"
 msgstr "错误消息: %s"
 
-#: ../src/filetransfers_window.py:238
-msgid "File transfer stopped"
-msgstr "文件传输已停止"
+#: ../src/filetransfers_window.py:283
+#, python-format
+msgid ""
+"The file %(file)s has been fully received, but it seems to be wrongly "
+"received.\n"
+"Do you want to reload it?"
+msgstr ""
 
-#: ../src/filetransfers_window.py:257
+#: ../src/filetransfers_window.py:311
 msgid "Choose File to Send..."
 msgstr "选择要发送的文件..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:780
+#: ../src/filetransfers_window.py:328 ../src/tooltips.py:880
 msgid "Description: "
 msgstr "描述: "
 
-#: ../src/filetransfers_window.py:286
+#: ../src/filetransfers_window.py:341
 msgid "Gajim cannot access this file"
 msgstr "Gajim 无法访问此文件"
 
-#: ../src/filetransfers_window.py:287
+#: ../src/filetransfers_window.py:342
 msgid "This file is being used by another process."
 msgstr "此文件正在被其它程序使用。"
 
-#: ../src/filetransfers_window.py:320
-#, python-format
-msgid "File: %s"
-msgstr "文件:  %s"
-
-#: ../src/filetransfers_window.py:326
-#, python-format
-msgid "Type: %s"
-msgstr "类型: %s"
-
-#: ../src/filetransfers_window.py:328
-#, python-format
-msgid "Description: %s"
-msgstr "描述:  %s"
-
-#: ../src/filetransfers_window.py:329
-#, python-format
-msgid "%s wants to send you a file:"
-msgstr "%s 想发送给您一个文件: "
-
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:879
+#: ../src/filetransfers_window.py:386 ../src/gtkgui_helpers.py:784
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "无法覆盖现有文件\"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:880
+#: ../src/filetransfers_window.py:387 ../src/gtkgui_helpers.py:785
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "文件名已经存在且您没有权限覆盖它。"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:404 ../src/gtkgui_helpers.py:789
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:884
+#: ../src/filetransfers_window.py:404 ../src/gtkgui_helpers.py:789
 msgid "What do you want to do?"
 msgstr "想做什么?"
 
-#. read-only bit is used to mark special folder under windows,
-#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:891
+#. read-only bit is used to mark special folder under
+#. windows, not to mark that a folder is read-only.
+#. See ticket #3587
+#: ../src/filetransfers_window.py:415 ../src/gtkgui_helpers.py:796
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目录 \"%s\" 不可写"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:892
+#: ../src/filetransfers_window.py:416 ../src/gtkgui_helpers.py:797
 msgid "You do not have permission to create files in this directory."
 msgstr "您没有权限在这个目录里创建文件。"
 
-#: ../src/filetransfers_window.py:379
+#: ../src/filetransfers_window.py:427
 msgid "Save File as..."
 msgstr "另存为..."
 
+#: ../src/filetransfers_window.py:447
+#, python-format
+msgid "File: %s"
+msgstr "文件:  %s"
+
+#: ../src/filetransfers_window.py:453
+#, python-format
+msgid "Type: %s"
+msgstr "类型: %s"
+
+#: ../src/filetransfers_window.py:455
+#, python-format
+msgid "Description: %s"
+msgstr "描述:  %s"
+
+#: ../src/filetransfers_window.py:456
+#, python-format
+msgid "%s wants to send you a file:"
+msgstr "%s 想发送给您一个文件: "
+
+#: ../src/filetransfers_window.py:497
+#, fuzzy
+msgid "Checking file..."
+msgstr "发送名片..."
+
+#: ../src/filetransfers_window.py:511
+#, fuzzy
+msgid "File error"
+msgstr "文件传输错误"
+
 #. Print remaining time in format 00:00:00
 #. You can change the places of (hours), (minutes), (seconds) -
 #. they are not translatable.
-#: ../src/filetransfers_window.py:449
+#: ../src/filetransfers_window.py:548
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7951,174 +8787,159 @@ 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:641
 #, 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:697 ../src/filetransfers_window.py:700
 msgid "Invalid File"
 msgstr "无效文件"
 
-#: ../src/filetransfers_window.py:585
+#: ../src/filetransfers_window.py:697
 msgid "File: "
 msgstr "文件: "
 
-#: ../src/filetransfers_window.py:589
+#: ../src/filetransfers_window.py:701
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:732
+#: ../src/filetransfers_window.py:727 ../src/tooltips.py:836
 msgid "Name: "
 msgstr "名称: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:736
+#: ../src/filetransfers_window.py:729 ../src/tooltips.py:839
 msgid "Sender: "
 msgstr "发送者: "
 
-#: ../src/filetransfers_window.py:777
+#: ../src/filetransfers_window.py:896
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/gajim.py:175
-msgid "Gajim needs X server to run. Quiting..."
-msgstr "Gajim 需要 X 服务器才能运行。退出..."
-
-#: ../src/gajim.py:177
-#, python-format
-msgid "importing PyGTK failed: %s"
-msgstr "导入 PyGTK 失败: %s"
-
-#: ../src/gajim.py:219
-msgid "Gajim needs PyGTK 2.16 or above"
-msgstr "Gajim 需要 PyGTK 2.16 或更高版本"
-
-#: ../src/gajim.py:220
-msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
-msgstr "Gajim 需要 PyGTK 2.16 或更高版本才能运行。退出..."
-
-#: ../src/gajim.py:222
-msgid "Gajim needs GTK 2.16 or above"
-msgstr "Gajim 需要 GTK 2.16 或更高版本"
-
-#: ../src/gajim.py:223
-msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
-msgstr "Gajim 需要 GTK 2.16 或更高版本才能运行。退出..."
-
-#: ../src/gajim.py:232
-msgid "Gajim needs pywin32 to run"
-msgstr "Gajim 需要 pywin32 才能运行"
-
-#: ../src/gajim.py:233
-#, 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
-msgid "Gajim is already running"
-msgstr "Gajim 已经在运行"
-
-#: ../src/gajim.py:350
-msgid ""
-"Another instance of Gajim seems to be running\n"
-"Run anyway?"
-msgstr ""
-"Gajim 另一个实例似乎正在运行\n"
-"不管怎样, 仍然运行?"
+#: ../src/filetransfers_window.py:907
+msgid "_Continue"
+msgstr "继续(_C)"
 
-#: ../src/gajim-remote-plugin.py:74 ../src/gajim-remote.py:77
+#: ../src/gajim-remote.py:79
 msgid "Shows a help on specific command"
 msgstr "为特定命令显示帮助"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote-plugin.py:77 ../src/gajim-remote.py:80
+#: ../src/gajim-remote.py:82
 msgid "command"
 msgstr "命令"
 
-#: ../src/gajim-remote-plugin.py:78 ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:83
 msgid "show help on command"
 msgstr "为命令显示帮助"
 
-#: ../src/gajim-remote-plugin.py:82 ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:87
 msgid "Shows or hides the roster window"
 msgstr "显示/隐藏联系人列表窗口"
 
-#: ../src/gajim-remote-plugin.py:86 ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:91
 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:95
 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
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
-#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
-#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
-#: ../src/gajim-remote.py:291
-msgid "account"
+#: ../src/gajim-remote.py:98 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:172 ../src/gajim-remote.py:193
+#: ../src/gajim-remote.py:223 ../src/gajim-remote.py:232
+#: ../src/gajim-remote.py:239 ../src/gajim-remote.py:246
+#: ../src/gajim-remote.py:257 ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:293
+#, fuzzy
+msgid "?CLI:account"
 msgstr "账户"
 
-#: ../src/gajim-remote-plugin.py:93 ../src/gajim-remote.py:96
+#: ../src/gajim-remote.py:98
 msgid "show only contacts of the given account"
 msgstr "只显示指定帐户的联系人"
 
-#: ../src/gajim-remote-plugin.py:99 ../src/gajim-remote.py:102
+#: ../src/gajim-remote.py:104
 msgid "Prints a list of registered accounts"
 msgstr "打印注册的账户"
 
-#: ../src/gajim-remote-plugin.py:103 ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:108
 msgid "Changes the status of account or accounts"
 msgstr "改变一个或多个账户状态"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote-plugin.py:106 ../src/gajim-remote.py:109
-msgid "status"
+#: ../src/gajim-remote.py:111
+#, fuzzy
+msgid "?CLI: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:111
+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:112 ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:284
+#, fuzzy
+msgid "?CLI:message"
+msgstr "message"
 
-#: ../src/gajim-remote-plugin.py:107 ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:112
 msgid "status message"
 msgstr "状态消息"
 
-#: ../src/gajim-remote-plugin.py:108 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:113
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
 msgstr "改变账户的状态。如果不指明, 将改变设置\"与全局同步\"选项的账户"
 
-#: ../src/gajim-remote-plugin.py:114 ../src/gajim-remote.py:127
+#: ../src/gajim-remote.py:119
+msgid "Changes the priority of account or accounts"
+msgstr "改变一个或多个账户的优先级"
+
+#: ../src/gajim-remote.py:121
+#, fuzzy
+msgid "?CLI:priority"
+msgstr "优先级"
+
+#: ../src/gajim-remote.py:121
+msgid "priority you want to give to the account"
+msgstr "您想要给予这个账户的优先级"
+
+#: ../src/gajim-remote.py:123
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"改变指定账户的优先级。如果不指明, 将改变所有设置了\"与全局状态同步\"选项的账"
+"户"
+
+#: ../src/gajim-remote.py:129
 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:131
 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
+#: ../src/gajim-remote.py:133 ../src/gajim-remote.py:223
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定, 将从此帐户列表下移出联系人"
 
-#: ../src/gajim-remote-plugin.py:123 ../src/gajim-remote.py:139
+#: ../src/gajim-remote.py:136
+msgid "message content. The account must be specified or \"\""
+msgstr "消息内容。账户必须被指定或为\"\""
+
+#: ../src/gajim-remote.py:141
 msgid ""
 "Sends new chat message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8127,34 +8948,29 @@ 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
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:158
 msgid "JID of the contact that will receive the message"
 msgstr "联系人的JID将收到消息"
 
-#: ../src/gajim-remote-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:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:171
 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
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 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
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "如指定, 该消息将使用本公共密钥加密"
 
-#: ../src/gajim-remote-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:149 ../src/gajim-remote.py:163
+#: ../src/gajim-remote.py:172
 msgid "if specified, the message will be sent using this account"
 msgstr "如指定, 消息将被用此账户发送"
 
-#: ../src/gajim-remote-plugin.py:136 ../src/gajim-remote.py:152
+#: ../src/gajim-remote.py:154
 msgid ""
 "Sends new single message to a contact in the roster. Both OpenPGP key and "
 "account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8163,174 +8979,217 @@ msgstr ""
 "发送新单条消息至联系人列表中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择"
 "\"帐户\"而不需要\" OpenPGP 密钥\", 只需将\" OpenPGP 密钥\"置为空。"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "subject"
 msgstr "主题"
 
-#: ../src/gajim-remote-plugin.py:141 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:159
 msgid "message subject"
 msgstr "消息主题"
 
-#: ../src/gajim-remote-plugin.py:150 ../src/gajim-remote.py:166
+#: ../src/gajim-remote.py:168
 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:170
 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:177
 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
+#: ../src/gajim-remote.py:179 ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
 msgid "JID of the contact"
 msgstr "联系人的 JID "
 
-#: ../src/gajim-remote-plugin.py:165 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:183
 msgid "Gets detailed info on a account"
 msgstr "获得账户的详细信息"
 
-#: ../src/gajim-remote-plugin.py:167 ../src/gajim-remote.py:183
+#: ../src/gajim-remote.py:185
 msgid "Name of the account"
 msgstr "账户名称"
 
-#: ../src/gajim-remote-plugin.py:171 ../src/gajim-remote.py:187
+#: ../src/gajim-remote.py:189
 msgid "Sends file to a contact"
 msgstr "向联系人发送文件"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "file"
 msgstr "文件"
 
-#: ../src/gajim-remote-plugin.py:173 ../src/gajim-remote.py:189
+#: ../src/gajim-remote.py:191
 msgid "File path"
 msgstr "文件路径"
 
-#: ../src/gajim-remote-plugin.py:175 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:193
 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:198
 msgid "Lists all preferences and their values"
 msgstr "列出所有的参数及它们的值"
 
-#: ../src/gajim-remote-plugin.py:184 ../src/gajim-remote.py:200
+#: ../src/gajim-remote.py:202
 msgid "Sets value of 'key' to 'value'."
 msgstr "将\"密钥\"的值设为\"值\""
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "key=value"
 msgstr "键=值"
 
-#: ../src/gajim-remote-plugin.py:186 ../src/gajim-remote.py:202
+#: ../src/gajim-remote.py:204
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
 msgstr "\"密钥\"是参数名, 而\"值\"是赋予参数的数值"
 
-#: ../src/gajim-remote-plugin.py:191 ../src/gajim-remote.py:207
+#: ../src/gajim-remote.py:209
 msgid "Deletes a preference item"
 msgstr "删除一个参数项"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:211
 msgid "key"
 msgstr "键"
 
-#: ../src/gajim-remote-plugin.py:193 ../src/gajim-remote.py:209
+#: ../src/gajim-remote.py:211
 msgid "name of the preference to be deleted"
 msgstr "需要删除的参数名"
 
-#: ../src/gajim-remote-plugin.py:197 ../src/gajim-remote.py:213
+#: ../src/gajim-remote.py:215
 msgid "Writes the current state of Gajim preferences to the .config file"
 msgstr "将当前Gajim的国家设置写入 .config 文件"
 
-#: ../src/gajim-remote-plugin.py:202 ../src/gajim-remote.py:218
+#: ../src/gajim-remote.py:220
 msgid "Removes contact from roster"
 msgstr "从联系人列表移除联系人"
 
-#: ../src/gajim-remote-plugin.py:211 ../src/gajim-remote.py:227
+#: ../src/gajim-remote.py:229
 msgid "Adds contact to roster"
 msgstr "向联系人列表添加联系人"
 
-#: ../src/gajim-remote-plugin.py:214 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:232
 msgid "Adds new contact to this account"
 msgstr "为此账户加入新联系人"
 
-#: ../src/gajim-remote-plugin.py:219 ../src/gajim-remote.py:235
+#: ../src/gajim-remote.py:237
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote-plugin.py:226
+#: ../src/gajim-remote.py:244
 msgid ""
-"Returns current status message(the global one unless account is specified)"
-msgstr "返回当前的状态信息 (如不指定账户则返回全局设置)"
+"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:251
 msgid "Returns number of unread messages"
 msgstr "返回未读消息数"
 
-#: ../src/gajim-remote-plugin.py:237 ../src/gajim-remote.py:253
+#: ../src/gajim-remote.py:255
 msgid "Opens 'Start Chat' dialog"
 msgstr "打开 '开始聊天' 对话框"
 
-#: ../src/gajim-remote-plugin.py:239 ../src/gajim-remote.py:255
+#: ../src/gajim-remote.py:257
 msgid "Starts chat, using this account"
 msgstr "开始聊天, 使用这个账户"
 
-#: ../src/gajim-remote-plugin.py:243 ../src/gajim-remote.py:259
+#: ../src/gajim-remote.py:261
 msgid "Sends custom XML"
 msgstr "发送自定义 XML"
 
-#: ../src/gajim-remote-plugin.py:245 ../src/gajim-remote.py:261
+#: ../src/gajim-remote.py:263
 msgid "XML to send"
 msgstr "发送 XML"
 
-#: ../src/gajim-remote-plugin.py:246 ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:264
 msgid ""
 "Account in which the xml will be sent; if not specified, xml will be sent to "
 "all accounts"
 msgstr "XML 将被发送的账户; 如果不指定, XML 将被发送至所有账户"
 
-#: ../src/gajim-remote-plugin.py:252 ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:270
+msgid "Change the avatar"
+msgstr "改变头像"
+
+#: ../src/gajim-remote.py:272
+msgid "Picture to use"
+msgstr "要使用的图片"
+
+#: ../src/gajim-remote.py:273
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr "要设置为这个头像的账户; 如果不指定, 所有账户都将被设置为这个头像。"
+
+#: ../src/gajim-remote.py:279
+#, fuzzy
 msgid "Handle a xmpp:/ uri"
 msgstr "处理一个 xmpp:/ uri"
 
-#: ../src/gajim-remote-plugin.py:254 ../src/gajim-remote.py:279
-msgid "uri"
-msgstr "uri"
+#: ../src/gajim-remote.py:281
+msgid "?CLI:uri"
+msgstr ""
+
+#: ../src/gajim-remote.py:281
+msgid "URI to handle"
+msgstr "要处理的 URI"
+
+#: ../src/gajim-remote.py:282
+msgid "Account in which you want to handle it"
+msgstr "您想要用其处理它的账户"
 
-#: ../src/gajim-remote-plugin.py:259 ../src/gajim-remote.py:286
+#: ../src/gajim-remote.py:284
+msgid "Message content"
+msgstr "消息内容"
+
+#: ../src/gajim-remote.py:288
 msgid "Join a MUC room"
 msgstr "加入聊天室"
 
-#: ../src/gajim-remote-plugin.py:261 ../src/gajim-remote.py:288
-msgid "room"
+#: ../src/gajim-remote.py:290
+#, fuzzy
+msgid "?CLI:room"
 msgstr "聊天室"
 
-#: ../src/gajim-remote-plugin.py:262 ../src/gajim-remote.py:289
-msgid "nick"
+#: ../src/gajim-remote.py:290
+msgid "Room JID"
+msgstr "聊天室 JID"
+
+#: ../src/gajim-remote.py:291
+#, fuzzy
+msgid "?CLI:nick"
 msgstr "昵称"
 
-#: ../src/gajim-remote-plugin.py:263 ../src/gajim-remote.py:290
-msgid "password"
+#: ../src/gajim-remote.py:291
+msgid "Nickname to use"
+msgstr "要使用的昵称"
+
+#: ../src/gajim-remote.py:292
+#, fuzzy
+msgid "?CLI:password"
 msgstr "密码"
 
-#: ../src/gajim-remote-plugin.py:268 ../src/gajim-remote.py:296
+#: ../src/gajim-remote.py:292
+msgid "Password to enter the room"
+msgstr "进入聊天室的密码"
+
+#: ../src/gajim-remote.py:293
+msgid "Account from which you want to enter the room"
+msgstr "您想要用其加入聊天室的账户"
+
+#: ../src/gajim-remote.py:298
 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
+#: ../src/gajim-remote.py:302
 msgid "Shows or hides the ipython window"
 msgstr "显示/隐藏 ipython 窗口"
 
-#: ../src/gajim-remote-plugin.py:306 ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:330
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的\"联系人 JID\"参数"
 
-#: ../src/gajim-remote-plugin.py:325 ../src/gajim-remote.py:348
+#: ../src/gajim-remote.py:352
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8339,148 +9198,44 @@ msgstr ""
 "\"%s\" 不在您的联系人列表中。\n"
 "请为发送此消息指定账户。"
 
-#: ../src/gajim-remote-plugin.py:328 ../src/gajim-remote.py:351
+#: ../src/gajim-remote.py:355
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote-plugin.py:383 ../src/gajim-remote.py:404
+#: ../src/gajim-remote.py:402
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "似乎 Gajim 不在运行。因此您无法使用 gajim-remote。"
 
-#: ../src/gajim-remote-plugin.py:412
+#: ../src/gajim-remote.py:429
 #, python-format
 msgid ""
-"Usage: %s %s %s \n"
-"\t %s"
+"Usage: %(basename)s %(command)s %(arguments)s \n"
+"\t %(help)s"
 msgstr ""
-"用法:  %s %s %s \n"
-"\t %s"
+"用法: %(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:433
 msgid "Arguments:"
 msgstr "参数: "
 
-#: ../src/gajim-remote-plugin.py:419 ../src/gajim-remote.py:439
+#: ../src/gajim-remote.py:437
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: ../src/gajim-remote-plugin.py:423 ../src/gajim-remote.py:445
-#, python-format
+#: ../src/gajim-remote.py:443
+#, fuzzy, python-format
 msgid ""
-"Usage: %s command [arguments]\n"
+"Usage:\n"
+"  %s command [arguments]\n"
+"\n"
 "Command is one of:\n"
 msgstr ""
 "用法: %s 命令 [参数] \n"
 "命令是下列之一: \n"
 
-#: ../src/gajim-remote-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:513
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8489,7 +9244,7 @@ msgstr ""
 "参数太多。\n"
 "输入 \"%(basename)s help %(command)s\" 获取更多信息"
 
-#: ../src/gajim-remote.py:519
+#: ../src/gajim-remote.py:518
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8498,203 +9253,244 @@ msgstr ""
 "参数 \"%(arg)s\" 未指定。\n"
 "输入 \"%(basename)s help %(command)s\" 获取更多信息"
 
-#: ../src/gajim-remote.py:538
+#: ../src/gajim-remote.py:537
 msgid "No uri given"
 msgstr "没有给出 URI"
 
-#: ../src/gajim_themes_window.py:59
+#: ../src/gajim-remote.py:539
+msgid "Wrong uri"
+msgstr "错误的 uri"
+
+#: ../src/gajim_themes_window.py:61
 msgid "Theme"
 msgstr "主题"
 
-#: ../src/gajim_themes_window.py:97
+#: ../src/gajim_themes_window.py:98
 msgid "You cannot make changes to the default theme"
 msgstr "您不能对默认主题进行更改"
 
-#: ../src/gajim_themes_window.py:98
+#: ../src/gajim_themes_window.py:99
 msgid "Please create a clean new theme with your desired name."
 msgstr "请用您想要的名字新建一个主题。"
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:169
+#: ../src/gajim_themes_window.py:170
 msgid "theme name"
 msgstr "主题名称"
 
-#: ../src/gajim_themes_window.py:186
+#: ../src/gajim_themes_window.py:187
 msgid "You cannot delete your current theme"
 msgstr "无法删除当前主题"
 
-#: ../src/gajim_themes_window.py:187
-msgid "Please first choose another for your current theme."
+#: ../src/gajim_themes_window.py:188
+#, fuzzy
+msgid "Please first choose another theme as your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:170
+#: ../src/groupchat_control.py:189 ../src/groupchat_control.py:1699
+#, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%(nick)s 现在成了 %(new_nick)s"
+
+#: ../src/groupchat_control.py:244
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:172
+#: ../src/groupchat_control.py:246
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr "您不再在聊天室\"%(room)s\"中或\"%(nick)s\"已离开。"
 
-#: ../src/groupchat_control.py:472
+#: ../src/groupchat_control.py:637
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
-#: ../src/groupchat_control.py:653
+#: ../src/groupchat_control.py:827
 msgid "Conversation with "
 msgstr "对话, 与"
 
-#: ../src/groupchat_control.py:655
+#: ../src/groupchat_control.py:829
 msgid "Continued conversation"
 msgstr "继续对话"
 
+#: ../src/groupchat_control.py:1311
+#, fuzzy, python-format
+msgid "%(nick)s has set the subject to %(subject)s"
+msgstr "%(jid)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:1329 ../src/groupchat_control.py:1641
 msgid "Any occupant is allowed to see your full JID"
 msgstr "所有房主可以看到您的全部 JID"
 
+#: ../src/groupchat_control.py:1332
+#, fuzzy
+msgid "Room now shows unavailable members"
+msgstr "聊天室现在显示了不可用的成员"
+
+#: ../src/groupchat_control.py:1334
+#, fuzzy
+msgid "Room now does not show unavailable members"
+msgstr "聊天室现在不显示不可用的成员"
+
+#: ../src/groupchat_control.py:1336
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr "一个无关隐私的聊天室设置发生了变化"
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1340
+msgid "Room logging is now enabled"
+msgstr "聊天室消息记录已启用"
+
+#: ../src/groupchat_control.py:1342
+msgid "Room logging is now disabled"
+msgstr "聊天室消息记录已禁用"
+
+#: ../src/groupchat_control.py:1344
+msgid "Room is now non-anonymous"
+msgstr "聊天室现在是非匿名的"
+
+#: ../src/groupchat_control.py:1347
+msgid "Room is now semi-anonymous"
+msgstr "聊天室现在是半匿名的"
+
+#: ../src/groupchat_control.py:1350
+msgid "Room is now fully-anonymous"
+msgstr "聊天室现在是完全匿名的"
+
+#: ../src/groupchat_control.py:1634 ../src/groupchat_control.py:2303
+#: ../src/gui_interface.py:623 ../src/roster_window.py:3262
+#, fuzzy, python-format
+msgid "%(jid)s has been invited in this room"
+msgstr "%(nick)s 已经被从这个聊天室移除(%(reason)s)"
+
 #. Can be a message (see handle_event_gc_config_change in
 #. gajim.py)
-#: ../src/groupchat_control.py:1309
+#: ../src/groupchat_control.py:1646
 msgid "Room logging is enabled"
 msgstr "聊天室记录被启用"
 
-#: ../src/groupchat_control.py:1311
+#: ../src/groupchat_control.py:1648
 msgid "A new room has been created"
 msgstr "一个新的聊天室被创建"
 
-#: ../src/groupchat_control.py:1314
+#: ../src/groupchat_control.py:1651
 msgid "The server has assigned or modified your roomnick"
 msgstr "服务器指定或修改了您的聊天室昵称"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1320
+#: ../src/groupchat_control.py:1657
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出: %(reason)s"
 
-#: ../src/groupchat_control.py:1323
+#: ../src/groupchat_control.py:1660
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 踢出: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1669
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁: %(reason)s"
 
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1672
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁: %(reason)s"
 
-#: ../src/groupchat_control.py:1346 ../src/groupchat_control.py:1450
+#: ../src/groupchat_control.py:1683 ../src/groupchat_control.py:1799
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py: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:1753 ../src/groupchat_control.py:1758
+#: ../src/groupchat_control.py:1764
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s 已经被从这个聊天室移除(%(reason)s)"
 
-#: ../src/groupchat_control.py:1406
+#: ../src/groupchat_control.py:1755
 msgid "affiliation changed"
 msgstr "归属变更"
 
-#: ../src/groupchat_control.py:1411
+#: ../src/groupchat_control.py:1760
 msgid "room configuration changed to members-only"
 msgstr "聊天室配置变为\"仅成员\""
 
-#: ../src/groupchat_control.py:1417
+#: ../src/groupchat_control.py:1766
 msgid "system shutdown"
 msgstr "系统关闭"
 
-#: ../src/groupchat_control.py:1500
+#: ../src/groupchat_control.py:1849
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr "** %(nick)s 的归属被 %(actor)s 设置为 %(affiliation)s"
 
-#: ../src/groupchat_control.py:1504
+#: ../src/groupchat_control.py:1853
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** %(nick)s 的归属被设置为 %(affiliation)s"
 
-#: ../src/groupchat_control.py:1519
+#: ../src/groupchat_control.py:1868
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** %(nick)s 的角色被 %(actor)s 设置为 %(role)s"
 
-#: ../src/groupchat_control.py:1523
+#: ../src/groupchat_control.py:1872
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** %(nick)s 的角色被设置为 %(role)s"
 
-#: ../src/groupchat_control.py:1553
+#: ../src/groupchat_control.py:1902
 #, python-format
 msgid "%s has left"
 msgstr "%s 离开了"
 
-#: ../src/groupchat_control.py:1558
+#: ../src/groupchat_control.py:1907
 #, 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:2181
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "您确定要离开聊天室\"%s\"吗?"
 
-#: ../src/groupchat_control.py:1806
+#: ../src/groupchat_control.py:2183
 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
-msgid "_Do not ask me again"
-msgstr "不要再问我了(_D)"
-
-#: ../src/groupchat_control.py:1844
+#: ../src/groupchat_control.py:2222
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1845
+#: ../src/groupchat_control.py:2223
 msgid "Please specify the new subject:"
 msgstr "请指定新话题: "
 
-#: ../src/groupchat_control.py:1852
+#: ../src/groupchat_control.py:2235
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1853
+#: ../src/groupchat_control.py:2236
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称: "
 
+#: ../src/groupchat_control.py:2261
+msgid "The group chat Jabber ID has not allowed characters."
+msgstr "聊天室 Jabber ID 包含不合法字符。"
+
 #. Ask for a reason
-#: ../src/groupchat_control.py:1884
+#: ../src/groupchat_control.py:2267
 #, python-format
 msgid "Destroying %s"
 msgstr "正在销毁 %s"
 
-#: ../src/groupchat_control.py:1885
+#: ../src/groupchat_control.py:2268
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8702,196 +9498,154 @@ msgstr ""
 "您正要彻底销毁这个聊天室。\n"
 "您可以在下面指定一个原因: "
 
-#: ../src/groupchat_control.py:1887
+#: ../src/groupchat_control.py:2270
 msgid "You may also enter an alternate venue:"
 msgstr "您也可以输入一个可选的替代地点: "
 
 #. ask for reason
-#: ../src/groupchat_control.py:2076
+#: ../src/groupchat_control.py:2452
 #, python-format
 msgid "Kicking %s"
 msgstr "将踢走 %s"
 
-#: ../src/groupchat_control.py:2077 ../src/groupchat_control.py:2404
+#: ../src/groupchat_control.py:2453 ../src/groupchat_control.py:2734
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因: "
 
 #. ask for reason
-#: ../src/groupchat_control.py:2403
+#: ../src/groupchat_control.py:2733
 #, python-format
 msgid "Banning %s"
 msgstr "将封禁 %s"
 
-#: ../src/gtkexcepthook.py:46
-msgid "A programming error has been detected"
-msgstr "一个程序错误被侦测到"
-
-#: ../src/gtkexcepthook.py:47
-msgid ""
-"It probably is not fatal, but should be reported to the developers "
-"nonetheless."
-msgstr "它可能不是致命的, 但仍应该被报告给开发者们。"
-
-#: ../src/gtkexcepthook.py:54
-msgid "_Report Bug"
-msgstr "报告错误(_R)"
-
-#: ../src/gtkexcepthook.py:76
-msgid "Details"
-msgstr "细节"
-
-#. we talk about file
-#: ../src/gtkgui_helpers.py:203 ../src/gtkgui_helpers.py:219
-#, python-format
-msgid "Error: cannot open %s for reading"
-msgstr "错误: 无法按读打开文件 %s"
-
-#: ../src/gtkgui_helpers.py:377
+#: ../src/gtkgui_helpers.py:392
 msgid "Error reading file:"
 msgstr "读文件错误: "
 
-#: ../src/gtkgui_helpers.py:380
+#: ../src/gtkgui_helpers.py:395
 msgid "Error parsing file:"
 msgstr "分析文件错误: "
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:421
+#: ../src/gtkgui_helpers.py:436
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "不能写入到 %s 。会话管理支持功能未启用"
 
-#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:795
-msgid "Gajim is not the default Jabber client"
-msgstr "Gajim 不是默认的 Jabber 客户端"
-
-#: ../src/gtkgui_helpers.py:796
-msgid "Would you like to make Gajim the default Jabber client?"
-msgstr "您想要使 Gajim 成为默认的 Jabber 客户端吗?"
-
-#: ../src/gtkgui_helpers.py:797
-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:770
 msgid "Extension not supported"
 msgstr "不支持扩展"
 
-#: ../src/gtkgui_helpers.py:865
+#: ../src/gtkgui_helpers.py:771
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "图片不能被保存为 %(type)s 格式。保存为 %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:901
+#: ../src/gtkgui_helpers.py:806
 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:137 ../src/gui_interface.py:305
+#: ../src/gui_interface.py:314 ../src/gui_interface.py:320
+#: ../src/gui_interface.py:323 ../src/gui_interface.py:326
+#: ../src/gui_interface.py:331
 msgid "Unable to join group chat"
 msgstr "无法加入聊天室"
 
-#: ../src/gui_interface.py:128
-#, python-format
+#: ../src/gui_interface.py:138
+#, fuzzy, python-format
 msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
+"Your desired nickname in group chat\n"
+"<b>%s</b>\n"
+"is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 "您在聊天室 %s 中希望使用的昵称已经被使用或被其他人注册了。\n"
 "在下面指定另一个昵称: "
 
-#: ../src/gui_interface.py:131
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "在发生冲突时总是使用这个昵称"
 
-#: ../src/gui_interface.py:148
+#: ../src/gui_interface.py:159
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求?"
 
-#: ../src/gui_interface.py:150
+#: ../src/gui_interface.py:161
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受这个对账户 %s 的请求?"
 
-#: ../src/gui_interface.py:153
+#: ../src/gui_interface.py:164
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "%(url)s (id: %(id)s) 的 HTTP (%(method)s) 认证"
 
-#: ../src/gui_interface.py:199 ../src/notify.py:493
+#: ../src/gui_interface.py:207 ../src/notify.py:293
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: ../src/gui_interface.py:294
+#: ../src/gui_interface.py:291
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "需要密码才能加入聊天室 %s。请输入一个密码。"
 
 #: ../src/gui_interface.py:306
-#, python-format
-msgid "Maximum number of users for %s has been reached"
+#, fuzzy, python-format
+msgid "Maximum number of users for <b>%s</b> has been reached"
 msgstr "%s 已经达到了最大的用户数目"
 
 #: ../src/gui_interface.py:315
-#, python-format
-msgid "You are banned from group chat %s."
+#, fuzzy, python-format
+msgid "You are banned from group chat <b>%s</b>."
 msgstr "您被聊天室 %s 封禁。"
 
-#: ../src/gui_interface.py:320
-#, python-format
-msgid "Group chat %s does not exist."
+#: ../src/gui_interface.py:321
+#, fuzzy, python-format
+msgid "Group chat <b>%s</b> does not exist."
 msgstr "聊天室 %s 不存在。"
 
-#: ../src/gui_interface.py:323
+#: ../src/gui_interface.py:324
 msgid "Group chat creation is restricted."
 msgstr "聊天室创建是受限的。"
 
-#: ../src/gui_interface.py:326
-#, python-format
-msgid "Your registered nickname must be used in group chat %s."
+#: ../src/gui_interface.py:327
+#, fuzzy, python-format
+msgid "Your registered nickname must be used in group chat <b>%s</b>."
 msgstr "您在聊天室 %s 中注册的昵称必须被使用。"
 
-#: ../src/gui_interface.py:331
+#: ../src/gui_interface.py:332
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "您不再聊天室 %s 的成员列表中。"
 
-#: ../src/gui_interface.py:465 ../src/gui_interface.py:469
+#: ../src/gui_interface.py:426 ../src/gui_interface.py:430
 #, 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:482 ../src/notify.py:295
 msgid "Subscription request"
 msgstr "认证请求"
 
-#: ../src/gui_interface.py:544
+#: ../src/gui_interface.py:507
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gui_interface.py:545
+#: ../src/gui_interface.py:508
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人\"%s\"已授权您查看他/她的状态。"
 
-#: ../src/gui_interface.py:553
+#: ../src/gui_interface.py:516
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人\"%s\"移除了对您的认证"
 
-#: ../src/gui_interface.py:554
+#: ../src/gui_interface.py:517
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8899,99 +9653,91 @@ msgstr ""
 "您将一直看到他/她处于离线状态。\n"
 "要将他/她从您的联系人列表中移除吗?"
 
-#: ../src/gui_interface.py:575 ../src/notify.py:497
+#: ../src/gui_interface.py:539 ../src/notify.py:297
 msgid "Unsubscribed"
 msgstr "已取消认证的"
 
-#: ../src/gui_interface.py:602
+#: ../src/gui_interface.py:550
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与\"%s\"建立连接"
 
-#: ../src/gui_interface.py:796
+#: ../src/gui_interface.py:643
 #, 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 "聊天室现在是半匿名的"
+msgid "%(jid)s declined the invitation: %(reason)s"
+msgstr ""
 
-#: ../src/gui_interface.py:881
-msgid "Room is now fully-anonymous"
-msgstr "聊天室现在是完全匿名的"
+#: ../src/gui_interface.py:647
+#, python-format
+msgid "%(jid)s declined the invitation"
+msgstr ""
 
-#: ../src/gui_interface.py:922
+#: ../src/gui_interface.py:677
+#, fuzzy
 msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr "您配置了 Gajim 使用 GPG agent, 但并没有正在运行的 GPG agent 或者它返回了一个错误的密码。\n"
+"You configured Gajim to use OpenPGP agent, but there is no OpenPGP agent "
+"running or it returned a wrong passphrase.\n"
+msgstr ""
+"您配置了 Gajim 使用 GPG agent, 但并没有正在运行的 GPG agent 或者它返回了一个"
+"错误的密码。\n"
 
-#: ../src/gui_interface.py:924 ../src/gui_interface.py:931
+#: ../src/gui_interface.py:680 ../src/gui_interface.py:688
 msgid "You are currently connected without your OpenPGP key."
 msgstr "您已经连接, 但没有使用您的 OpenPGP 密钥。"
 
-#: ../src/gui_interface.py:926
+#: ../src/gui_interface.py:682
 msgid "Your passphrase is incorrect"
 msgstr "您的密码不正确"
 
-#: ../src/gui_interface.py:930
-msgid "OpenGPG Passphrase Incorrect"
+#: ../src/gui_interface.py:687
+#, fuzzy
+msgid "OpenPGP Passphrase Incorrect"
 msgstr "OpenPGP 密码不正确"
 
-#: ../src/gui_interface.py:956
-msgid "GPG key not trusted"
+#: ../src/gui_interface.py:700
+#, fuzzy
+msgid "Certificate Passphrase Required"
+msgstr "证书已过期"
+
+#: ../src/gui_interface.py:701
+#, fuzzy, python-format
+msgid "Enter the passphrase for the certificate for account %s"
+msgstr "输入 GPG密钥 %(keyid)s (账户 %(account)s) 的密码。"
+
+#: ../src/gui_interface.py:723
+#, fuzzy
+msgid "OpenPGP key not trusted"
 msgstr "GPG 密钥不被信任"
 
-#: ../src/gui_interface.py:956
+#: ../src/gui_interface.py:723
+#, fuzzy
 msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
+"The OpenPGP key used to encrypt this chat is not trusted. Do you really want "
+"to encrypt this message?"
 msgstr "用于加密这次对话的 GPG 密钥未被信任。您确实想要加密这条消息吗?"
 
-#: ../src/gui_interface.py:968
+#: ../src/gui_interface.py:769
 msgid ""
-"Gnome Keyring is installed but not                 correctly started "
-"(environment variable probably not                 correctly set)"
-msgstr "Gnome Keyring 虽然被安装了但是没有正确地启动(环境变量可能没有被正确地设置)"
+"Please copy / paste the refresh token from the website that has just been "
+"opened."
+msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:772
+msgid "Oauth2 Credentials"
+msgstr ""
+
+#: ../src/gui_interface.py:871
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "%(gmail_mail_address)s 上的新邮件"
 
-#: ../src/gui_interface.py:1070
+#: ../src/gui_interface.py:873
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "您有 %d 条新邮件会话"
 
-#: ../src/gui_interface.py:1083
+#: ../src/gui_interface.py:886
 #, python-format
 msgid ""
 "\n"
@@ -9006,100 +9752,89 @@ msgstr ""
 "主题: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1152
+#: ../src/gui_interface.py:960
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gui_interface.py:1189 ../src/roster_window.py:1877
-msgid "Remote contact stopped transfer"
-msgstr "远程联系人停止了传输"
+#: ../src/gui_interface.py:1048 ../src/gui_interface.py:1424
+msgid "SSL certificate error"
+msgstr "SSL证书错误"
 
-#: ../src/gui_interface.py:1192 ../src/roster_window.py:1879
-msgid "Error opening file"
-msgstr "打开文件错误"
+#: ../src/gui_interface.py:1065
+#, fuzzy
+msgid "File Transfer Failed"
+msgstr "文件传输完毕"
 
-#: ../src/gui_interface.py:1224
+#: ../src/gui_interface.py:1087
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的从 %(name)s 收到文件  %(filename)s。"
 
-#. ft stopped
-#: ../src/gui_interface.py:1228
+#: ../src/gui_interface.py:1091
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1241
+#. ft hash error
+#: ../src/gui_interface.py:1095
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s from %(name)s failed."
+msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
+
+#: ../src/gui_interface.py:1108
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
-#. ft stopped
-#: ../src/gui_interface.py:1245
+#: ../src/gui_interface.py:1112
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1363
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-"无法解密来自 %s 的消息\n"
-"它可能被篡改了。"
+#. ft hash error
+#: ../src/gui_interface.py:1116
+#, fuzzy, python-format
+msgid "File transfer of %(filename)s to %(name)s failed."
+msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1370
+#: ../src/gui_interface.py:1199
 msgid "Unable to decrypt message"
 msgstr "无法解密消息"
 
-#: ../src/gui_interface.py:1442
+#: ../src/gui_interface.py:1211
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gui_interface.py:1443
+#: ../src/gui_interface.py:1212
 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:1227
 msgid "Resource Conflict"
 msgstr "资源冲突"
 
-#: ../src/gui_interface.py:1494
+#: ../src/gui_interface.py:1228
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "您已经用同一个资源连接到这个账户了。请输入一个新的资源"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1539
+#: ../src/gui_interface.py:1285
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想要发起语音聊天。"
 
-#: ../src/gui_interface.py:1542
+#: ../src/gui_interface.py:1288
 msgid "Voice Chat Request"
 msgstr "语音聊天请求"
 
-#: ../src/gui_interface.py:1647
+#: ../src/gui_interface.py:1377
 msgid "Error verifying SSL certificate"
 msgstr "验证 SSL 证书出错"
 
-#: ../src/gui_interface.py:1648
+#: ../src/gui_interface.py:1378
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: "
@@ -9110,21 +9845,25 @@ msgstr ""
 "%(error)s\n"
 "您仍然想要连接这个服务器吗?"
 
-#: ../src/gui_interface.py:1656
+#: ../src/gui_interface.py:1388
 msgid "Ignore this error for this certificate."
 msgstr "忽略这个证书的这个错误。"
 
-#: ../src/gui_interface.py:1676
-msgid "SSL certificate error"
-msgstr "SSL证书错误"
+#: ../src/gui_interface.py:1401
+msgid "Non Anonymous Server"
+msgstr ""
 
-#: ../src/gui_interface.py:1677
-#, python-format
+#: ../src/gui_interface.py:1425
+#, fuzzy, python-format
 msgid ""
-"It seems the SSL certificate of account %(account)s has changed or your "
-"connection is being hacked.\n"
-"Old fingerprint: %(old)s\n"
-"New fingerprint: %(new)s\n"
+"It seems the SSL certificate of account %(account)s has changed and is not "
+"valid or your connection is being hacked.\n"
+"\n"
+"Old SHA-1 fingerprint: %(old_sha1)s\n"
+"Old SHA-256 fingerprint: %(old_sha256)s\n"
+"\n"
+"New SHA-1 fingerprint: %(new_sha1)s\n"
+"New SHA-256 fingerprint: %(new_sha256)s\n"
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
@@ -9134,136 +9873,151 @@ msgstr ""
 "\n"
 "您仍想连接并更新证书的指纹信息吗?"
 
-#: ../src/gui_interface.py:1707 ../src/gui_interface.py:1744
-#: ../src/gui_interface.py:1780
-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:1711 ../src/gui_interface.py:1748
-#: ../src/gui_interface.py:1783
-msgid "Yes, I really want to connect insecurely"
-msgstr "是的, 我确实想要不安全地连接"
-
-#: ../src/gui_interface.py:1745
+#: ../src/gui_interface.py:1503
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr "您将通过不安全的连接发送密码。您应该安装 PyOpenSSL 以阻止这样的事情。您确定要这样做吗?"
+msgstr ""
+"您将通过不安全的连接发送密码。您应该安装 PyOpenSSL 以阻止这样的事情。您确定要"
+"这样做吗?"
 
-#: ../src/gui_interface.py:1781
+#: ../src/gui_interface.py:1545
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
 "Are you sure you want to do that?"
 msgstr "您将通过不安全的连接发送未经加密的密码。您确定要这样做吗?"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2354 ../src/gui_interface.py:2377
+#: ../src/gui_interface.py:2070 ../src/gui_interface.py:2077
+#: ../src/gui_interface.py:2101
 msgid "Emoticons disabled"
 msgstr "表情图标被禁用"
 
-#: ../src/gui_interface.py:2355
+#: ../src/gui_interface.py:2071
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "您配置的表情图标主题未找到, 所以表情图标被禁用。"
 
-#: ../src/gui_interface.py:2378
+#: ../src/gui_interface.py:2078 ../src/gui_interface.py:2102
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
-msgstr "您配置的表情图标主题无法载入。您可能需要升级 emoticons.py 文件的格式。请参考 http://trac.gajim.org/wiki/Emoticons"
+msgstr ""
+"您配置的表情图标主题无法载入。您可能需要升级 emoticons.py 文件的格式。请参考 "
+"http://trac.gajim.org/wiki/Emoticons"
 
-#: ../src/gui_interface.py:2409 ../src/roster_window.py:3643
+#: ../src/gui_interface.py:2150 ../src/roster_window.py:3832
 msgid "You cannot join a group chat while you are invisible"
 msgstr "隐身时无法加入聊天室"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2803
+#: ../src/gui_interface.py:2506
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: ../src/gui_interface.py:3348
+#: ../src/gui_interface.py:3105
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/gui_interface.py:3349
-#, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+#: ../src/gui_interface.py:3106
+#, fuzzy, python-format
+msgid "Enter OpenPGP key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "输入 GPG密钥 %(keyid)s (账户 %(account)s) 的密码。"
 
-#: ../src/gui_interface.py:3363
-msgid "GPG key expired"
+#: ../src/gui_interface.py:3120
+#, fuzzy
+msgid "OpenPGP key expired"
 msgstr "GPG密钥过期"
 
-#: ../src/gui_interface.py:3364
-#, python-format
-msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+#: ../src/gui_interface.py:3121
+#, fuzzy, python-format
+msgid ""
+"Your OpenPGP key has expired, you will be connected to %s without OpenPGP."
 msgstr "您的 GPG密钥已过期, 您将在没有 OpenPGP 情况下连接到 %s。"
 
 #. ask again
-#: ../src/gui_interface.py:3373
+#: ../src/gui_interface.py:3130
 msgid "Wrong Passphrase"
 msgstr "错误字段"
 
-#: ../src/gui_interface.py:3374
-msgid "Please retype your GPG passphrase or press Cancel."
+#: ../src/gui_interface.py:3131
+#, fuzzy
+msgid "Please retype your OpenPGP passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点\"取消\""
 
-#: ../src/gui_menu_builder.py:93
+#: ../src/gui_menu_builder.py:96
 msgid "_New Group Chat"
 msgstr "新聊天室(_N)"
 
-#: ../src/gui_menu_builder.py:410
+#: ../src/gui_menu_builder.py:461
 msgid "I would like to add you to my roster"
 msgstr "我希望将您添加到我的联系人列表"
 
-#: ../src/history_manager.py:114
+#. Manage Transport submenu
+#: ../src/gui_menu_builder.py:582
+msgid "_Manage Transport"
+msgstr "管理代理(_M)"
+
+#. Modify Transport
+#: ../src/gui_menu_builder.py:588
+msgid "_Modify Transport"
+msgstr "修改代理(_M)"
+
+#: ../src/history_manager.py:76
+#, fuzzy
+msgid "Usage:"
+msgstr "message"
+
+#: ../src/history_manager.py:78
+#, fuzzy
+msgid "Options:"
+msgstr "表情(_E): "
+
+#: ../src/history_manager.py:80
+msgid "Show this help message and exit"
+msgstr ""
+
+#: ../src/history_manager.py:81
+#, fuzzy
+msgid "Set logs directory"
+msgstr "正在建立 %s 目录"
+
+#: ../src/history_manager.py:128
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
 
-#. holds jid
-#: ../src/history_manager.py:154
-msgid "Contacts"
-msgstr "联系人"
-
 #. holds time
-#: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:98
+#: ../src/history_manager.py:181 ../src/history_manager.py:225
+#: ../src/history_window.py:102
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:173 ../src/history_manager.py:225
+#: ../src/history_manager.py:188 ../src/history_manager.py:244
 msgid "Nickname"
 msgstr "昵称"
 
 #. holds message
-#: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:106
+#: ../src/history_manager.py:197 ../src/history_manager.py:232
+#: ../src/history_window.py:110
 msgid "Message"
 msgstr "消息"
 
 #. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
+#: ../src/history_manager.py:205 ../src/history_manager.py:238
 msgid "Subject"
 msgstr "主题"
 
-#: ../src/history_manager.py:241
+#: ../src/history_manager.py:264
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "您确定要清除数据库?（强烈建议 GAJIM 运行时不要进行此操作）"
 
-#: ../src/history_manager.py:243
+#: ../src/history_manager.py:266
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9276,91 +10030,107 @@ msgstr ""
 "\n"
 "如果您点击\"是\", 请等待..."
 
-#: ../src/history_manager.py:460
+#: ../src/history_manager.py:271
+#, fuzzy
+msgid "Database Cleanup"
+msgstr "数据库错误"
+
+#: ../src/history_manager.py:486
 msgid "Exporting History Logs..."
 msgstr "输出历史记录..."
 
-#: ../src/history_manager.py:535
+#: ../src/history_manager.py:562
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 时说:  %(message)s\n"
 
-#: ../src/history_manager.py: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:600
+#, fuzzy, python-format
+msgid "Do you really want to delete the logs of %(jid)s?"
+msgstr "您确定要删除所选定的消息?"
+
+#: ../src/history_manager.py:604
+#, fuzzy
+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:606 ../src/history_manager.py:645
 msgid "This is an irreversible operation."
 msgstr "该操作是不可撤消的。"
 
-#: ../src/history_manager.py:608
+#: ../src/history_manager.py:608 ../src/history_manager.py:647
+#, fuzzy
+msgid "Deletion Confirmation"
+msgstr "取消确认"
+
+#: ../src/history_manager.py:642
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您确定要删除所选定的消息?"
 
-#: ../src/history_window.py:305
+#: ../src/history_window.py:319
 #, python-format
 msgid "Conversation History with %s"
 msgstr "与 %s 的聊天历史"
 
-#: ../src/history_window.py:355
+#: ../src/history_window.py:369
 msgid "Disk Error"
 msgstr "磁盘错误"
 
-#: ../src/history_window.py:443
+#: ../src/history_window.py:468
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:454
+#: ../src/history_window.py:479
 #, python-format
 msgid "Error: %s"
 msgstr "错误: %s"
 
-#: ../src/history_window.py:456
+#: ../src/history_window.py:481
 msgid "Error"
 msgstr "错误"
 
-#: ../src/history_window.py:458
+#: ../src/history_window.py:483
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "现在状态: %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:461
+#: ../src/history_window.py:486
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "现在状态:  %(status)s "
 
-#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
-msgid "Timeout loading image"
-msgstr "读取文件超时"
+#: ../src/htmltextview.py:559
+#, fuzzy
+msgid "Loading"
+msgstr "编写代码"
 
-#: ../src/htmltextview.py:535
-msgid "Image is too big"
-msgstr "图片太大"
+#: ../src/logind_listener.py:53 ../src/upower_listener.py:31
+msgid "Machine going to sleep"
+msgstr ""
 
-#: ../src/message_window.py:222
+#: ../src/message_window.py:238
 msgid "You are going to close several tabs"
 msgstr "您将要关闭多个标签"
 
-#: ../src/message_window.py:223
+#: ../src/message_window.py:239
 msgid "Do you really want to close them all?"
 msgstr "您确定要关闭所有这些吗"
 
-#: ../src/message_window.py:485
+#: ../src/message_window.py:529
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/message_window.py:487
+#: ../src/message_window.py:531
 msgid "Group Chats"
 msgstr "多人聊天"
 
-#: ../src/message_window.py:489
+#: ../src/message_window.py:533
 msgid "Private Chats"
 msgstr "私聊"
 
-#: ../src/message_window.py:495
+#: ../src/message_window.py:539
 msgid "Messages"
 msgstr "消息"
 
@@ -9372,184 +10142,198 @@ 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:335
+msgid "Ignore"
+msgstr "忽略"
 
-#: ../src/notify.py:242
-#, python-format
-msgid "%(nickname)s Signed In"
-msgstr "%(nickname)s 上线了"
+#: ../src/plugins/gui.py:81
+#, fuzzy
+msgid "Plugin"
+msgstr "插件"
 
-#: ../src/notify.py:250
-#, python-format
-msgid "%(nickname)s Signed Out"
-msgstr "%(nickname)s 离开了"
+#: ../src/plugins/gui.py:150
+#, fuzzy, python-format
+msgid "Warning: %s"
+msgstr "将封禁 %s"
 
-#: ../src/notify.py:261
-#, python-format
-msgid "New Single Message from %(nickname)s"
-msgstr " %(nickname)s 发来的新消息"
+#: ../src/plugins/gui.py:207
+#, fuzzy
+msgid "Plugin failed"
+msgstr "注册失败"
 
-#: ../src/notify.py:268
-#, python-format
-msgid "New Private Message from group chat %s"
-msgstr "来自聊天室 %s 的私人消息"
+#: ../src/plugins/gui.py:252
+msgid "Unable to properly remove the plugin"
+msgstr ""
 
-#: ../src/notify.py:270
-#, python-format
-msgid "%(nickname)s: %(message)s"
-msgstr "%(nickname)s:  %(message)s"
+#. members not safe
+#: ../src/plugins/gui.py:260 ../src/plugins/pluginmanager.py:566
+#: ../src/plugins/pluginmanager.py:574
+#, fuzzy
+msgid "Archive is malformed"
+msgstr "服务发送了畸形的数据"
 
-#: ../src/notify.py:273
-#, python-format
-msgid "Messaged by %(nickname)s"
-msgstr "来自 %(nickname)s 的消息"
+#: ../src/plugins/gui.py:284 ../src/plugins/gui.py:292
+#: ../src/plugins/pluginmanager.py:582
+#, fuzzy
+msgid "Plugin already exists"
+msgstr "文件已经存在"
 
-#: ../src/notify.py:279
-#, python-format
-msgid "New Message from %(nickname)s"
-msgstr "来自 %(nickname)s 的新消息"
+#: ../src/plugins/gui.py:284
+msgid "Overwrite?"
+msgstr ""
 
-#: ../src/notify.py:536
-msgid "Ignore"
-msgstr "忽略"
+#: ../src/plugins/gui.py:316
+#, fuzzy
+msgid "Configuration"
+msgstr "聊天室设置"
+
+#. it is not zip file
+#. CRC error
+#: ../src/plugins/pluginmanager.py:552 ../src/plugins/pluginmanager.py:558
+msgid "Archive corrupted"
+msgstr ""
+
+#: ../src/plugins/pluginmanager.py:554
+#, fuzzy
+msgid "Archive empty"
+msgstr "文件为空"
 
-#: ../src/profile_window.py:58
+#: ../src/profile_window.py:63
 msgid "Retrieving profile..."
 msgstr "正在获取名片..."
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:3012
+#: ../src/profile_window.py:132 ../src/roster_window.py:3131
 msgid "File is empty"
 msgstr "文件为空"
 
-#: ../src/profile_window.py:114 ../src/roster_window.py:3015
+#: ../src/profile_window.py:135 ../src/roster_window.py:3134
 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:149 ../src/profile_window.py:166
+#: ../src/roster_window.py:3136 ../src/roster_window.py:3147
 msgid "Could not load image"
 msgstr "无法读取图片"
 
-#: ../src/profile_window.py:215
+#: ../src/profile_window.py:239
 msgid "Wrong date format"
 msgstr "错误的数据格式"
 
-#: ../src/profile_window.py:216
+#: ../src/profile_window.py:240
 msgid "Format of the date must be YYYY-MM-DD"
 msgstr "日期的格式必须是 YYYY-MM-DD"
 
-#: ../src/profile_window.py:270
+#: ../src/profile_window.py:298
 msgid "Information received"
 msgstr "信息已收到"
 
-#: ../src/profile_window.py:341
-msgid "Without a connection you can not publish your contact information."
+#: ../src/profile_window.py:376
+#, fuzzy
+msgid "Without a connection, you can not publish your contact information."
 msgstr "没有连接的情况下您无法发布您的联系人信息。"
 
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:389
 msgid "Sending profile..."
 msgstr "发送名片..."
 
-#: ../src/profile_window.py:369
+#: ../src/profile_window.py:408
 msgid "Information NOT published"
 msgstr "信息没有发布"
 
-#: ../src/profile_window.py:376
+#: ../src/profile_window.py:415
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: ../src/profile_window.py:377
+#: ../src/profile_window.py:416
 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:258 ../src/roster_window.py:1059
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:1942
+#: ../src/roster_window.py:2070
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1943
+#: ../src/roster_window.py:2071
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在\"%s\"将知道您的状态。"
 
-#: ../src/roster_window.py:1966
+#: ../src/roster_window.py:2094
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1967
+#: ../src/roster_window.py:2095
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果\"%s\"接受此请求, 您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1981
+#: ../src/roster_window.py:2109
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1982
+#: ../src/roster_window.py:2110
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:2009
-msgid "GPG is not usable"
+#: ../src/roster_window.py:2137
+#, fuzzy
+msgid "OpenPGP is not usable"
 msgstr "GPG 不可用"
 
-#: ../src/roster_window.py:2010
+#: ../src/roster_window.py:2138
 #, 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:2345 ../src/roster_window.py:3762
 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:2346 ../src/roster_window.py:3763
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr "隐身将使您从这些聊天室中断开。确定要隐身?"
 
-#: ../src/roster_window.py:2249
+#: ../src/roster_window.py:2373
 msgid "desync'ed"
 msgstr "未同步"
 
-#: ../src/roster_window.py:2311
+#: ../src/roster_window.py:2438
 msgid "Really quit Gajim?"
 msgstr "真得要退出 Gajim?"
 
-#: ../src/roster_window.py:2312
+#: ../src/roster_window.py:2439
 msgid "Are you sure you want to quit Gajim?"
 msgstr "您确定您要退出 Gajim 吗?"
 
-#: ../src/roster_window.py:2313
+#: ../src/roster_window.py:2440
 msgid "Always close Gajim"
 msgstr "总是关闭 Gajim"
 
-#: ../src/roster_window.py:2396
+#: ../src/roster_window.py:2527
 msgid "You have running file transfers"
 msgstr "您有正在传输的文件"
 
-#: ../src/roster_window.py:2397
+#: ../src/roster_window.py:2528
 msgid ""
 "If you quit now, the file(s) being transferred will be stopped. Do you still "
 "want to quit?"
 msgstr "如果现在退出, 正在传输的文件会停止传输。您仍然要退出吗?"
 
-#: ../src/roster_window.py:2428 ../src/roster_window.py:2730
+#: ../src/roster_window.py:2559 ../src/roster_window.py:2917
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:2429
+#: ../src/roster_window.py:2560
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
@@ -9557,119 +10341,119 @@ msgstr ""
 "除非您启用了历史记录而且向您发送消息的联系人在您的联系人列表中, 您才能\n"
 "在以后读到这些消息。"
 
-#: ../src/roster_window.py:2731
+#: ../src/roster_window.py:2918
 msgid "You must read them before removing this transport."
 msgstr "在移除代理之前您必须阅读它们。"
 
-#: ../src/roster_window.py:2734
+#: ../src/roster_window.py:2921
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理\"%s\"将被移除"
 
-#: ../src/roster_window.py:2735
+#: ../src/roster_window.py:2922
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您将无法再和使用这个代理的联系人收发消息。"
 
-#: ../src/roster_window.py:2738
+#: ../src/roster_window.py:2925
 msgid "Transports will be removed"
 msgstr "代理将被移除"
 
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2930
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 msgstr "您无法再和来自这些代理的联系人收发消息: %s"
 
-#: ../src/roster_window.py:2811
+#: ../src/roster_window.py:2981
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "您将要屏蔽一个联系人。您确定要继续吗?"
 
-#: ../src/roster_window.py:2813
+#: ../src/roster_window.py:2983
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
 msgstr "这个联系人将看到您离线并且您不会在收到他发送给您的消息。"
 
 #. it's jid
-#: ../src/roster_window.py:2904
+#: ../src/roster_window.py:3023
 msgid "Rename Contact"
 msgstr "重命名联系人"
 
-#: ../src/roster_window.py:2905
+#: ../src/roster_window.py:3024
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: ../src/roster_window.py:2912
+#: ../src/roster_window.py:3031
 msgid "Rename Group"
 msgstr "重命名群组"
 
-#: ../src/roster_window.py:2913
+#: ../src/roster_window.py:3032
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/roster_window.py:2958
+#: ../src/roster_window.py:3077
 msgid "Remove Group"
 msgstr "移除群组"
 
-#: ../src/roster_window.py:2959
+#: ../src/roster_window.py:3078
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想从联系人列表中删除组 %s ?"
 
-#: ../src/roster_window.py:2960
+#: ../src/roster_window.py:3079
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同时从联系人列表移除这个群组的所有联系人"
 
-#: ../src/roster_window.py:2999
+#: ../src/roster_window.py:3118
 msgid "Assign OpenPGP Key"
 msgstr "指定 OpenPGP 密钥"
 
-#: ../src/roster_window.py:3000
+#: ../src/roster_window.py:3119
 msgid "Select a key to apply to the contact"
 msgstr "选择一个对应于该联系人的密钥。"
 
-#: ../src/roster_window.py:3383
+#: ../src/roster_window.py:3573
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人\"%s\"将从您的联系人列表中被移除"
 
-#: ../src/roster_window.py:3385
+#: ../src/roster_window.py:3575
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr "您将从您的联系人列表中将 \"%(name)s\" (%(jid)s) 移除。\n"
 
-#: ../src/roster_window.py:3390
+#: ../src/roster_window.py:3580
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr "移除此联系人的同时将移除认证, 导致他/她将一直看到您为离线。"
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3396
+#: ../src/roster_window.py:3586
 msgid "Do you want to continue?"
 msgstr "您要继续吗?"
 
-#: ../src/roster_window.py:3400
+#: ../src/roster_window.py:3590
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr "移除此联系人的同时将默认移除认证, 导致他/她将一直看到您为离线。"
 
-#: ../src/roster_window.py:3403
+#: ../src/roster_window.py:3593
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3407
+#: ../src/roster_window.py:3597
 msgid "Contacts will be removed from your roster"
 msgstr "联系人将从您的联系人列表中被移除"
 
-#: ../src/roster_window.py:3412
+#: ../src/roster_window.py:3602
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9678,12 +10462,13 @@ msgstr ""
 "移除这些联系人: %s 的同时\n"
 "将移除认证导致他们将一直看到您为离线。"
 
-#: ../src/roster_window.py:3470
+#: ../src/roster_window.py:3660
+#, fuzzy
 msgid ""
-"You are about to send a custom status. Are you sure you want  to continue?"
+"You are about to send a custom status. Are you sure you want to continue?"
 msgstr "您将发送一个自定义的状态。您确定要继续吗?"
 
-#: ../src/roster_window.py:3472
+#: ../src/roster_window.py:3662
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
@@ -9692,31 +10477,32 @@ msgstr ""
 "这个联系人会暂时看到您的状态为 %(status)s, 直到您下次改变您的状态。之后\n"
 "他/她会看到您的全局状态。"
 
-#: ../src/roster_window.py:3491
+#: ../src/roster_window.py:3681
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:3492
+#: ../src/roster_window.py:3682
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:4106
+#: ../src/roster_window.py:4391
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持存储元联系人信息"
 
-#: ../src/roster_window.py:4108
+#: ../src/roster_window.py:4393
+#, fuzzy
 msgid ""
-"Your server does not support storing metacontacts information. So those "
+"Your server does not support storing metacontacts information. So this "
 "information will not be saved on next reconnection."
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时不会被保存。"
 
-#: ../src/roster_window.py:4200
+#: ../src/roster_window.py:4489
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续?"
 
-#: ../src/roster_window.py:4202
+#: ../src/roster_window.py:4491
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9725,188 +10511,141 @@ msgstr ""
 "元联系人是将几个联系人组合起来显示在同一行。通常在某个人有几个 Jabber\n"
 "账户或代理账户时用到。"
 
-#: ../src/roster_window.py:4317
+#: ../src/roster_window.py:4613
 msgid "Invalid file URI:"
 msgstr "无效的文件地址: "
 
-#: ../src/roster_window.py:4329
+#: ../src/roster_window.py:4625
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "您想要将文件发送给 %s 吗: "
 
-#: ../src/roster_window.py:4444
+#: ../src/roster_window.py:4764
 #, python-format
 msgid "Send %s to %s"
 msgstr "发送 %s 给 %s"
 
-#: ../src/roster_window.py:4450
+#: ../src/roster_window.py:4777
+#, fuzzy, python-format
+msgid "Make %s first contact"
+msgstr "由 %s 与 %s 创建元联系人"
+
+#: ../src/roster_window.py:4782
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "由 %s 与 %s 创建元联系人"
 
-#. new chat
-#. single message
-#. for chat_with
-#. for single message
-#. join gc
-#: ../src/roster_window.py: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:5246 ../src/roster_window.py:5301
+#: ../src/roster_window.py:5311 ../src/statusicon.py:270
+#: ../src/statusicon.py:318 ../src/statusicon.py:325
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
-#. add
-#: ../src/roster_window.py:4959
+#: ../src/roster_window.py:5320
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
-#. disco
-#: ../src/roster_window.py:4964
+#: ../src/roster_window.py:5327
 #, python-format
 msgid "using %s account"
 msgstr "使用 %s 账户"
 
-#: ../src/roster_window.py:5003 ../src/statusicon.py:326
+#: ../src/roster_window.py:5366 ../src/statusicon.py:335
 msgid "_Manage Bookmarks..."
 msgstr "管理书签(_M)..."
 
-#. profile, avatar
-#: ../src/roster_window.py:5023
+#: ../src/roster_window.py:5384
 #, python-format
 msgid "of account %s"
 msgstr "帐户 %s 的"
 
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5426
 #, python-format
 msgid "for account %s"
 msgstr "帐户 %s"
 
-#: ../src/roster_window.py:5124 ../src/roster_window.py:5229
+#: ../src/roster_window.py:5480 ../src/roster_window.py:5581
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:5157
+#: ../src/roster_window.py:5510
 msgid "Publish Tune"
 msgstr "发布音乐"
 
-#: ../src/roster_window.py:5159
+#: ../src/roster_window.py:5512
 msgid "Publish Location"
 msgstr "发布位置信息"
 
-#: ../src/roster_window.py:5162
+#: ../src/roster_window.py:5516
 msgid "Configure Services..."
 msgstr "配置服务..."
 
-#: ../src/roster_window.py:5307
+#: ../src/roster_window.py:5657
 msgid "_Maximize All"
 msgstr "最大化全部(_M)"
 
-#: ../src/roster_window.py:5317 ../src/roster_window.py:5491
+#: ../src/roster_window.py:5664 ../src/roster_window.py:5826
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
-#: ../src/roster_window.py:5325
+#: ../src/roster_window.py:5671
 msgid "To all users"
 msgstr "向所有的用户"
 
-#: ../src/roster_window.py:5329
+#: ../src/roster_window.py:5675
 msgid "To all online users"
 msgstr "向所有在线用户"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5511
+#: ../src/roster_window.py:5842
 msgid "_Manage Contacts"
 msgstr "管理联系人(_M)"
 
-#. Edit Groups
-#: ../src/roster_window.py:5520
-msgid "Edit _Groups"
-msgstr "编辑群组(_G)"
-
-#. Send single message
-#: ../src/roster_window.py:5575
-msgid "Send Single Message"
-msgstr "发送单条消息(_S)"
-
-#. Execute Command
-#: ../src/roster_window.py:5622
-msgid "Execute Command..."
-msgstr "执行命令..."
-
-#. Manage Transport submenu
-#: ../src/roster_window.py:5632
-msgid "_Manage Transport"
-msgstr "管理代理(_M)"
-
-#. Modify Transport
-#: ../src/roster_window.py:5641
-msgid "_Modify Transport"
-msgstr "修改代理(_M)"
-
-#. Rename
-#: ../src/roster_window.py:5651
-msgid "_Rename"
-msgstr "重命名(_R)"
-
-#: ../src/roster_window.py:5711
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "最大化(_M)"
 
-#: ../src/roster_window.py:5720
+#: ../src/roster_window.py:5914
 msgid "_Reconnect"
 msgstr "重新连接(_R)"
 
-#: ../src/roster_window.py:5727
-msgid "_Disconnect"
-msgstr "断开连接(_D)"
-
 #. History manager
-#: ../src/roster_window.py:5816
+#: ../src/roster_window.py:6004
 msgid "History Manager"
 msgstr "历史记录管理器"
 
-#: ../src/roster_window.py:5827
+#: ../src/roster_window.py:6012
 msgid "_Join New Group Chat"
 msgstr "加入新的聊天室(_J)"
 
-#: ../src/roster_window.py:6055
+#: ../src/roster_window.py:6299
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
-#: ../src/search_window.py:105
+#: ../src/search_window.py:108
 msgid "Waiting for results"
 msgstr "等待结果"
 
-#: ../src/search_window.py:143 ../src/search_window.py:220
+#: ../src/search_window.py:146 ../src/search_window.py:224
 msgid "Error in received dataform"
 msgstr "在收到的数据表中有错误"
 
 #. No result
-#: ../src/search_window.py:177 ../src/search_window.py:212
+#: ../src/search_window.py:181 ../src/search_window.py:216
 msgid "No result"
 msgstr "无结果"
 
-#: ../src/session.py:136
-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:429 ../src/session.py:489
 msgid "Confirm these session options"
 msgstr "确定这些会话属性"
 
-#: ../src/session.py:448
-#, python-format
+#: ../src/session.py:431
+#, fuzzy, python-format
 msgid ""
-"The remote client wants '\n"
-"                            'to negotiate an session with these features:\n"
+"The remote client wants to negotiate a session with these features:\n"
 "\n"
 "%s\n"
 "\n"
@@ -9919,7 +10658,7 @@ msgstr ""
 "\n"
 "是否接受?"
 
-#: ../src/session.py:492
+#: ../src/session.py:491
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9934,209 +10673,746 @@ msgstr ""
 "\n"
 "继续进行会话?"
 
-#: ../src/statusicon.py:227
+#: ../src/session.py:494
+#, fuzzy
+msgid "Always accept for this contact"
+msgstr "是否为此联系人使用 OpenPGP?"
+
+#: ../src/statusicon.py:235
 msgid "_Change Status Message..."
 msgstr "更改状态消息_(C)..."
 
-#: ../src/statusicon.py:339
+#: ../src/statusicon.py:348
 msgid "Hide _Roster"
 msgstr "隐藏联系人列表(_R)"
 
-#: ../src/statusicon.py:350
+#: ../src/statusicon.py:360
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
-#: ../src/tooltips.py:392 ../src/tooltips.py:604
-msgid "Jabber ID: "
-msgstr "Jabber ID: "
-
-#: ../src/tooltips.py:395 ../src/tooltips.py:608
-msgid "Resource: "
-msgstr "资源: "
-
-#: ../src/tooltips.py:401
+#: ../src/tooltips.py:376
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此聊天室的 %(owner_or_admin_or_member)s"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:565
 msgid " [blocked]"
 msgstr "[已屏蔽]"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:569
 msgid " [minimized]"
 msgstr "[最小化的]"
 
-#: ../src/tooltips.py:521 ../src/tooltips.py:777
-msgid "Status: "
-msgstr "状态: "
-
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:768
 #, python-format
 msgid "Last status: %s"
 msgstr "最后状态: %s"
 
-#: ../src/tooltips.py:567
+#: ../src/tooltips.py:770
 #, python-format
 msgid " since %s"
 msgstr "自从 %s"
 
-#: ../src/tooltips.py:585
+#: ../src/tooltips.py:787
 msgid "Connected"
 msgstr "已连接"
 
-#: ../src/tooltips.py:587
+#: ../src/tooltips.py:789
 msgid "Disconnected"
 msgstr "已断开连接"
 
-#. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:615
-msgid "Subscription: "
-msgstr "认证: "
-
-#: ../src/tooltips.py:625
-msgid "OpenPGP: "
-msgstr "OpenPGP: "
-
-#: ../src/tooltips.py:646
-#, python-format
-msgid "Idle since %s"
-msgstr "空闲, 自从 %s"
-
-#: ../src/tooltips.py:647
-#, python-format
-msgid "Idle for %s"
-msgstr "空闲了 %s"
-
-#: ../src/tooltips.py:698
-#, python-format
-msgid "Mood: %s"
-msgstr "心情: %s"
-
-#: ../src/tooltips.py:702
-#, python-format
-msgid "Activity: %s"
-msgstr "活动: %s"
-
-#: ../src/tooltips.py:706
-#, python-format
-msgid "Tune: %s"
-msgstr "音乐: %s"
-
-#: ../src/tooltips.py:710
-#, python-format
-msgid "Location: %s"
-msgstr "位置: %s"
-
-#: ../src/tooltips.py:735
+#: ../src/tooltips.py:838
 msgid "Download"
 msgstr "下载"
 
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:844
 msgid "Upload"
 msgstr "上传"
 
-#: ../src/tooltips.py:748
+#: ../src/tooltips.py:851
 msgid "Type: "
 msgstr "类型: "
 
-#: ../src/tooltips.py:752
+#: ../src/tooltips.py:857
 msgid "Transferred: "
 msgstr "已传输: "
 
-#: ../src/tooltips.py:755 ../src/tooltips.py:776
+#: ../src/tooltips.py:860 ../src/tooltips.py:877
 msgid "Not started"
 msgstr "未开始"
 
-#: ../src/tooltips.py:759
+#: ../src/tooltips.py:862
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:761 ../src/tooltips.py:764
+#: ../src/tooltips.py:864 ../src/tooltips.py:867
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/tooltips.py:768
+#: ../src/tooltips.py:870
 msgid "?transfer status:Paused"
 msgstr "?transfer status:暂停"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:772
+#: ../src/tooltips.py:873
 msgid "Stalled"
 msgstr "已冻结"
 
-#: ../src/tooltips.py:774
+#: ../src/tooltips.py:875
 msgid "Transferring"
 msgstr "传输中"
 
-#: ../src/tooltips.py:812
-msgid "This service has not yet responded with detailed information"
-msgstr "服务还没有详细的信息应答"
-
-#: ../src/tooltips.py:815
-msgid ""
-"This service could not respond with detailed information.\n"
-"It is most likely legacy or broken"
-msgstr ""
-"这个服务无法应答详细的信息。\n"
-"这很可能是服务器的遗留问题, 或者服务器被损坏了"
+#: ../src/tooltips.py:878
+msgid "Status: "
+msgstr "状态: "
 
-#: ../src/vcard.py:265
+#: ../src/vcard.py:328 ../src/vcard.py:335
 msgid "?Client:Unknown"
 msgstr "未知"
 
-#: ../src/vcard.py:267
+#: ../src/vcard.py:332 ../src/vcard.py:337
 msgid "?OS:Unknown"
 msgstr "未知"
 
-#: ../src/vcard.py:288
+#: ../src/vcard.py:366 ../src/vcard.py:369
 msgid "?Time:Unknown"
 msgstr "未知"
 
-#: ../src/vcard.py:312 ../src/vcard.py:322 ../src/vcard.py:530
+#: ../src/vcard.py:397 ../src/vcard.py:406 ../src/vcard.py:614
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:345
+#: ../src/vcard.py:429
 msgid "?Role in Group Chat:<b>Role:</b>"
 msgstr "?Role in Group Chat:<b>角色</b>"
 
-#: ../src/vcard.py:349
+#: ../src/vcard.py:433
 msgid "<b>Affiliation:</b>"
 msgstr "<b>归属: </b>"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:441
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣, 但您不关心他/她的状态"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:443
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣, 但他/她不关心您的状态"
 
-#: ../src/vcard.py:361
+#: ../src/vcard.py:445
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:363
+#: ../src/vcard.py:447
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:370
+#: ../src/vcard.py:454
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:372
+#: ../src/vcard.py:456
 msgid "There is no pending subscription request."
 msgstr "没有未处理的认证请求"
 
-#: ../src/vcard.py:377 ../src/vcard.py:431 ../src/vcard.py:553
+#: ../src/vcard.py:461 ../src/vcard.py:515 ../src/vcard.py:637
 msgid " resource with priority "
 msgstr "带有优先级的资源"
+
+#~ msgid "Error description..."
+#~ msgstr "错误描述..."
+
+#, fuzzy
+#~ msgid "View contact information (Ctrl+I)"
+#~ msgstr "邀请联系人参与对话(Ctrl+G)"
+
+#~ msgid "3"
+#~ msgstr "3"
+
+#~ msgid "4"
+#~ msgstr "4"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "6"
+#~ msgstr "6"
+
+#~ msgid "7"
+#~ msgstr "7"
+
+#~ msgid "8"
+#~ msgstr "8"
+
+#~ msgid "9"
+#~ msgstr "9"
+
+#~ msgid "*"
+#~ msgstr "*"
+
+#~ msgid "(<b>ESession</b> info)"
+#~ msgstr "<b>ESession</b>信息"
+
+#~ msgid "Enter JID or Contact name"
+#~ msgstr "输入 JID 或者联系人名"
+
+#~ msgid "Groupchat Histories"
+#~ msgstr "多人聊天历史"
+
+#~ msgid "All Chat Histories"
+#~ msgstr "所有聊天历史"
+
+#~ msgid "<empty>"
+#~ msgstr "<empty>"
+
+#~ msgid "homepage url"
+#~ msgstr "主页链接"
+
+#~ msgid ""
+#~ "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts "
+#~ "in your roster."
+#~ msgstr ""
+#~ "<b>someone@somewhere.com</b> 希望您向您的联系人列表 <b>添加</b> 一些联系"
+#~ "人。"
+
+#~ msgid "More"
+#~ msgstr "更多"
+
+#~ msgid "Ping?"
+#~ msgstr "Ping?"
+
+#~ msgid "Error."
+#~ msgstr "错误。"
+
+#~ msgid "A connection is not available"
+#~ msgstr "一个连接不可用"
+
+#~ msgid "Your message can not be sent until you are connected."
+#~ msgstr "连接之后您的消息才能发送"
+
+#~ msgid "Really send file?"
+#~ msgstr "确定要发送文件?"
+
+#~ msgid "If you send a file to %s, he/she will know your real Jabber ID."
+#~ msgstr "如果您想 %s 发送文件, 他/她会获知您的真实 Jabber ID。"
+
+#~ msgid "creating %s directory"
+#~ msgstr "正在建立 %s 目录"
+
+#~ msgid ""
+#~ "If True, Gajim will use Gnome Keyring (if available) to store account "
+#~ "passwords."
+#~ msgstr "如果为真, Gajim 会使用 Gnome Keyring (如果可用) 存储账户的密码。"
+
+#~ msgid ""
+#~ "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+#~ "account passwords."
+#~ msgstr ""
+#~ "如果为真, Gajim 会使用 KDE Wallet (如果 kwalletcli 可用) 存储账户的密码。"
+
+#, fuzzy
+#~ msgid "Please check if avahi/bonjour-daemon is running."
+#~ msgstr "请检查 avahi-daemon 是否正在运行。"
+
+#~ msgid "%s is not the name of a group chat."
+#~ msgstr "%s 不是一个聊天室的名称。"
+
+#~ msgid "Session Management"
+#~ msgstr "会话管理"
+
+#~ msgid "Gajim session is stored on logout and restored on login."
+#~ msgstr "Gajim 会话在退出时会被存储而后登录时恢复。"
+
+#~ msgid "Requires python-gnome2."
+#~ msgstr "需要 python-gnome2。"
+
+#~ msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
+#~ msgstr "需要 gnome-keyring 和 python-gnome2-desktop, 或 kwalletcli。"
+
+#~ msgid "SRV"
+#~ msgstr "SRV"
+
+#~ msgid "Ability to connect to servers which are using SRV records."
+#~ msgstr "连接到有 SRV 记录的服务器的能力。"
+
+#~ msgid "Requires dnsutils."
+#~ msgstr "需要 dnsutils。"
+
+#~ msgid "Requires nslookup to use SRV records."
+#~ msgstr "需要 nslookup 以使用 SRV 记录。"
+
+#~ msgid "Gajim needs X server to run. Quiting..."
+#~ msgstr "Gajim 需要 X 服务器才能运行。退出..."
+
+#~ msgid "importing PyGTK failed: %s"
+#~ msgstr "导入 PyGTK 失败: %s"
+
+#, fuzzy
+#~ msgid "Gajim needs PyGTK 2.22 or above"
+#~ msgstr "Gajim 需要 PyGTK 2.16 或更高版本"
+
+#, fuzzy
+#~ msgid "Gajim needs PyGTK 2.22 or above to run. Quiting..."
+#~ msgstr "Gajim 需要 PyGTK 2.16 或更高版本才能运行。退出..."
+
+#, fuzzy
+#~ msgid "Gajim needs GTK 2.22 or above"
+#~ msgstr "Gajim 需要 GTK 2.16 或更高版本"
+
+#, fuzzy
+#~ msgid "Gajim needs GTK 2.22 or above to run. Quiting..."
+#~ msgstr "Gajim 需要 GTK 2.16 或更高版本才能运行。退出..."
+
+#~ msgid "Gajim needs pywin32 to run"
+#~ msgstr "Gajim 需要 pywin32 才能运行"
+
+#~ msgid ""
+#~ "Please make sure that Pywin32 is installed on your system. You can get it "
+#~ "at %s"
+#~ msgstr "请确认 Pywin32 已经安装在您的系统中。您可以从 %s 获得得它"
+
+#~ msgid "Gajim is already running"
+#~ msgstr "Gajim 已经在运行"
+
+#~ msgid ""
+#~ "Another instance of Gajim seems to be running\n"
+#~ "Run anyway?"
+#~ msgstr ""
+#~ "Gajim 另一个实例似乎正在运行\n"
+#~ "不管怎样, 仍然运行?"
+
+#~ msgid "A programming error has been detected"
+#~ msgstr "一个程序错误被侦测到"
+
+#~ msgid ""
+#~ "It probably is not fatal, but should be reported to the developers "
+#~ "nonetheless."
+#~ msgstr "它可能不是致命的, 但仍应该被报告给开发者们。"
+
+#~ msgid "_Report Bug"
+#~ msgstr "报告错误(_R)"
+
+#~ msgid "Details"
+#~ msgstr "细节"
+
+#, fuzzy
+#~ msgid ""
+#~ "Gnome Keyring is installed but not correctly started (environment "
+#~ "variable probably not correctly set)"
+#~ msgstr ""
+#~ "Gnome Keyring 虽然被安装了但是没有正确地启动(环境变量可能没有被正确地设置)"
+
+#~ msgid "Jabber ID: "
+#~ msgstr "Jabber ID: "
+
+#~ msgid "Resource: "
+#~ msgstr "资源: "
+
+#, fuzzy
+#~ msgid "Mood: "
+#~ msgstr "心情: "
+
+#, fuzzy
+#~ msgid "Activity: "
+#~ msgstr "活动: "
+
+#~ msgid "Join _Group Chat..."
+#~ msgstr "加入聊天室(_G)"
+
+#~ msgid "_Modify Account"
+#~ msgstr "修改账户信息(_M)"
+
+#~ msgid "Check on startup if Gajim is the _default Jabber client"
+#~ msgstr "在启动是检测 Gajim 是否是默认的 Jabber 客户端程序"
+
+#~ msgid "_Group Chat"
+#~ msgstr "多人聊天(_G)"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "发送单条消息(_M)"
+
+#~ msgid ""
+#~ "If True, Gajim will check if it's the default jabber client on each "
+#~ "startup."
+#~ msgstr "如果为真,  Gajim 会在每次启动时检测它是否是默认的 jabber 客户端。"
+
+#, fuzzy
+#~ msgid "Certificate"
+#~ msgstr "客户端证书"
+
+#~ msgid "Gajim is not the default Jabber client"
+#~ msgstr "Gajim 不是默认的 Jabber 客户端"
+
+#~ msgid "Would you like to make Gajim the default Jabber client?"
+#~ msgstr "您想要使 Gajim 成为默认的 Jabber 客户端吗?"
+
+#~ msgid "Always check to see if Gajim is the default Jabber client on startup"
+#~ msgstr "总是在启动时检测 Gajim 是否是默认的 Jabber 客户端"
+
+#~ msgid "Edit _Groups"
+#~ msgstr "编辑群组(_G)"
+
+#~ msgid "Send Single Message"
+#~ msgstr "发送单条消息(_S)"
+
+#~ msgid "Execute Command..."
+#~ msgstr "执行命令..."
+
+#~ msgid "_Rename"
+#~ msgstr "重命名(_R)"
+
+#~ msgid "Choose Client Cert"
+#~ msgstr "选择客户端证书"
+
+#~ msgid "The path to the client certificate and key in PKCS#12 format"
+#~ msgstr "客户端证书路径（PKCS#12 格式）"
+
+#~ msgid " a window/tab opened with that contact "
+#~ msgstr "与此联系人聊天时打开的窗口/标签"
+
+#~ msgid "<b>Actions</b>"
+#~ msgstr "<b>动作</b>"
+
+#~ msgid "<b>Conditions</b>"
+#~ msgstr "<b>条件</b>"
+
+#~ msgid "Advanced Actions"
+#~ msgstr "高级动作"
+
+#~ msgid "Advanced Notifications Control"
+#~ msgstr "高级通知控件设置"
+
+#~ msgid "All statuses"
+#~ msgstr "所有状态"
+
+#~ msgid "Busy "
+#~ msgstr "忙碌"
+
+#~ msgid "Contact Change Status "
+#~ msgstr "联系人改变了状态"
+
+#~ msgid "Contact Disconnected "
+#~ msgstr "联系人已断开连接"
+
+#~ msgid "Don't have "
+#~ msgstr "没有"
+
+#~ msgid "File Transfer Started "
+#~ msgstr "文件传输开始"
+
+#~ msgid "Group Chat Message Highlight "
+#~ msgstr "多人聊天消息高亮显示"
+
+#~ msgid "Group Chat Message Received "
+#~ msgstr "收到多人聊天消息"
+
+#~ msgid "Launch a command"
+#~ msgstr "运行命令"
+
+#~ msgid "One or more special statuses..."
+#~ msgstr "一或多个指定的状态..."
+
+#~ msgid "Online / Free For Chat"
+#~ msgstr "在线/和我聊天吧"
+
+#~ msgid "Play a sound"
+#~ msgstr "播放声音"
+
+#~ msgid "Receive a Message"
+#~ msgstr "收到一条消息"
+
+#~ msgid "When "
+#~ msgstr "当"
+
+#~ msgid ""
+#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
+#~ "flash"
+#~ msgstr "激活窗口管理器事件提示使任务栏的聊天窗口闪烁(_A)"
+
+#~ msgid "_Disable auto opening chat window"
+#~ msgstr "禁用自动打开聊天窗口(_D)"
+
+#~ msgid "_Disable existing popup window"
+#~ msgstr "禁用现有的弹出窗口(_D)"
+
+#~ msgid "_Disable existing sound for this event"
+#~ msgstr "禁用现有的此事件的声音(_D)"
+
+#~ msgid "_Disable showing event in notification area"
+#~ msgstr "禁用在通知区域中显示事件(_D)"
+
+#~ msgid "_Disable showing event in roster"
+#~ msgstr "禁用在联系人列表中显示事件(_D)"
+
+#~ msgid "_Inform me with a popup window"
+#~ msgstr "使用弹出窗口通知(_I)"
+
+#~ msgid "_Show event in roster"
+#~ msgstr "在联系人列表中显示事件(_S)"
+
+#~ msgid "and I "
+#~ msgstr "与我"
+
+#~ msgid "contact(s)"
+#~ msgstr "联系人"
+
+#~ msgid "everybody"
+#~ msgstr "每个人"
+
+#~ msgid "for "
+#~ msgstr "为"
+
+#~ msgid "group(s)"
+#~ msgstr "群组"
+
+#~ msgid "when I'm in"
+#~ msgstr "当我在"
+
+#~ msgid "label"
+#~ msgstr "标签"
+
+#~ msgid "_Allow him/her to see my status"
+#~ msgstr "允许他/她查看我的状态(_A)"
+
+#~ msgid "Descrition:"
+#~ msgstr "描述: "
+
+#~ msgid "Advanced..."
+#~ msgstr "高级..."
+
+#~ msgid "Display _activity of contacts in roster"
+#~ msgstr "在联系人列表中显示联系人的活动(_A)"
+
+#~ msgid "Display _tunes of contacts in roster"
+#~ msgstr "在联系人列表中显示联系人正在播放音乐的信息(_T)"
+
+#~ msgid "Display m_ood of contacts in roster"
+#~ msgstr "在联系人列表中显示联系人的心情(_O)"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the activity of contacts in the roster "
+#~ "window"
+#~ msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的活动。"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the location of contacts in the roster "
+#~ "window"
+#~ msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的位置。"
+
+#~ msgid ""
+#~ "If checked, Gajim will display the tunes of contacts in the roster window"
+#~ msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人正在播放的音乐。"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "发送单条消息...(_S)"
+
+#~ msgid "User avatar:"
+#~ msgstr "用户头像: "
+
+#~ msgid "Gajim Instant Messenger"
+#~ msgstr "Gajim 即时消息软件"
+
+#~ msgid "English"
+#~ msgstr "英语"
+
+#~ msgid "Belarusian"
+#~ msgstr "白俄罗斯语"
+
+#~ msgid "Bulgarian"
+#~ msgstr "保加利亚语"
+
+#~ msgid "Breton"
+#~ msgstr "布列塔尼语"
+
+#~ msgid "Czech"
+#~ msgstr "捷克语"
+
+#~ msgid "German"
+#~ msgstr "德语"
+
+#~ msgid "Greek"
+#~ msgstr "希腊语"
+
+#~ msgid "British"
+#~ msgstr "英语（英国）"
+
+#~ msgid "Esperanto"
+#~ msgstr "世界语"
+
+#~ msgid "Spanish"
+#~ msgstr "西班牙语"
+
+#~ msgid "Basque"
+#~ msgstr "巴斯克语"
+
+#~ msgid "French"
+#~ msgstr "法语"
+
+#~ msgid "Croatian"
+#~ msgstr "克罗埃西亚语"
+
+#~ msgid "Italian"
+#~ msgstr "意大利语"
+
+#~ msgid "Norwegian (b)"
+#~ msgstr "挪威语 (b)"
+
+#~ msgid "Dutch"
+#~ msgstr "荷兰语"
+
+#~ msgid "Norwegian"
+#~ msgstr "挪威语"
+
+#~ msgid "Polish"
+#~ msgstr "波兰语"
+
+#~ msgid "Portuguese"
+#~ msgstr "葡萄牙语"
+
+#~ msgid "Brazilian Portuguese"
+#~ msgstr "巴西葡萄牙语"
+
+#~ msgid "Russian"
+#~ msgstr "俄语"
+
+#~ msgid "Serbian"
+#~ msgstr "塞尔维亚语"
+
+#~ msgid "Slovak"
+#~ msgstr "斯洛伐克语"
+
+#~ msgid "Swedish"
+#~ msgstr "瑞典语"
+
+#~ msgid "Chinese (Ch)"
+#~ msgstr "中文"
+
+#~ msgid "Spelling language"
+#~ msgstr "拼写语言"
+
+#~ msgid ""
+#~ "If True, Gajim will convert string between $$ and $$ to an image using "
+#~ "dvips and convert before insterting it in chat window."
+#~ msgstr ""
+#~ "如果为真, Gajim 会将 $$ $$ 之间的字符串用 dvips 转换为图片, 在将它插入聊天"
+#~ "窗口之前。"
+
+#~ msgid ""
+#~ "Change the value to change the size of latex formulas displayed. The "
+#~ "higher is larger."
+#~ msgstr "改变这个值以改变显示的 LaTeX 方程的大小。更高则更大。"
+
+#~ msgid "all or space separated status"
+#~ msgstr "all 或 空格分割的一些状态"
+
+#~ msgid "'yes', 'no', or 'both'"
+#~ msgstr "'yes', 'no', 或'both'"
+
+#~ msgid "'yes', 'no' or ''"
+#~ msgstr "'yes', 'no' 或 ''"
+
+#~ msgid "Check your connection or try again later"
+#~ msgstr "检查连接或稍后重试"
+
+#~ msgid "Error executing \"%(command)s\": %(error)s"
+#~ msgstr "在执行命令\"%(command)s\"时发生错误: %(error)s"
+
+#~ msgid "error: cannot open %s for reading"
+#~ msgstr "错误: 无法读取文件 %s"
+
+#~ msgid "Unable to bind to port %s."
+#~ msgstr "无法绑定端口%s。"
+
+#~ msgid ""
+#~ "Maybe you have another running instance of Gajim. File Transfer will be "
+#~ "cancelled."
+#~ msgstr "或许您有另一个正在运行的 Gajim 实例。文件传输将被取消。"
+
+#~ msgid "A GTK+ jabber client"
+#~ msgstr "一个 GTK+ Jabber 客户端"
+
+#~ msgid "Condition"
+#~ msgstr "条件"
+
+#~ msgid "when I am "
+#~ msgstr "当我"
+
+#~ msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
+#~ msgstr "需要 pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)。"
+
+#~ msgid "Requires gpg and python-GnuPGInterface."
+#~ msgstr "需要 gpg 和 python-GnuPGInterface。"
+
+#~ msgid "LaTeX"
+#~ msgstr "LaTeX"
+
+#~ msgid "Transform LaTeX expressions between $$ $$."
+#~ msgstr "转换 $$ $$ 之间的 LaTeX 表达式。"
+
+#~ msgid ""
+#~ "Requires texlive-latex-base and (dvipng or ImageMagick). You have to set "
+#~ "'use_latex' to True in the Advanced Configuration Editor."
+#~ msgstr ""
+#~ "需要 texlive-latex-base 和 (dvipng 或 ImageMagick)。您需要在高级设置编辑器"
+#~ "中将 'use_latex' 设置为真。"
+
+#~ msgid ""
+#~ "Requires texlive-latex-base and (dvipng or ImageMagick) (All is in "
+#~ "MikTeX). You have to set 'use_latex' to True in the Advanced "
+#~ "Configuration Editor."
+#~ msgstr ""
+#~ "需要 texlive-latex-base 和 (dvipng 或 ImageMagick) (全部在 MikTeX 中)。您"
+#~ "需要在高级设置编辑器中将 'use_latex' 设置为真。"
+
+#~ msgid "Requires python-farsight."
+#~ msgstr "需要 python-farsight。"
+
+#~ msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#~ msgstr "下列中的一项: offline, online, chat, away, xa, dnd, invisible"
+
+#~ msgid ""
+#~ "Returns current status message(the global one unless account is specified)"
+#~ msgstr "返回当前的状态信息 (如不指定账户则返回全局设置)"
+
+#~ msgid ""
+#~ "Usage: %s %s %s \n"
+#~ "\t %s"
+#~ msgstr ""
+#~ "用法:  %s %s %s \n"
+#~ "\t %s"
+
+#~ msgid ""
+#~ "Too many arguments. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "参数太多。\n"
+#~ "输入\"%s help %s\"以获取更多信息"
+
+#~ msgid ""
+#~ "Argument \"%s\" is not specified. \n"
+#~ "Type \"%s help %s\" for more info"
+#~ msgstr ""
+#~ "参数\"%s\"未指定。\n"
+#~ "输入\"%s help %s\"以获取更多信息"
+
+#~ msgid "Contacts"
+#~ msgstr "联系人"
+
+#~ msgid "Disk WriteError"
+#~ msgstr "磁盘写入错误"
+
+#~ msgid "Subject: %s"
+#~ msgstr "主题: %s"
+
+#~ msgid "Mood: %s"
+#~ msgstr "心情: %s"
+
+#~ msgid "Activity: %s"
+#~ msgstr "活动: %s"
author	Yann Leboulanger <asterix@lagaule.org>	2017-01-14 17:02:54 +0300
committer	Yann Leboulanger <asterix@lagaule.org>	2017-01-14 17:02:54 +0300
commit	b4678cec5bc7245543867ffd6a0668e777490ebb (patch)
tree	f2a090d61c9dba0bf8a4d5c596c0e7da5cf5dd61 /po/zh_CN.po
parent	bfd9c5a96bc431dff23d9ae76cc508eda39ee3ba (diff)