Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Leboulanger <asterix@lagaule.org>2020-06-20 15:39:15 +0300
committerYann Leboulanger <asterix@lagaule.org>2020-06-20 15:39:15 +0300
commite76c8960697650ed24a7e4ce54fc50225934f4f5 (patch)
treef74c071a65f05b18bc7139caad73eb96d8a0f9d6 /po/zh_CN.po
parent3f38952ee6a2623ba666f0b683be67cd7da1041c (diff)
updated translations
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po3385
1 files changed, 1731 insertions, 1654 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 29d38988b..a2399853b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gajim\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-03-23 03:05+0000\n"
+"POT-Creation-Date: 2020-06-19 02:05+0000\n"
"PO-Revision-Date: 2010-10-31 17:37+0800\n"
"Last-Translator: Guanhao Yin <yinguanhao@gmail.com>\n"
"Language-Team: \n"
@@ -20,74 +20,80 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: gajim/chat_control_base.py:571
+#: gajim/chat_control_base.py:147 gajim/gtk/start_chat.py:643
+#: gajim/gtk/groupchat_invite.py:318
+#, fuzzy, python-format
+msgid "Account: %s"
+msgstr "账户"
+
+#: gajim/chat_control_base.py:570
msgid "and authenticated"
msgstr "且已被认证"
-#: gajim/chat_control_base.py:575
+#: gajim/chat_control_base.py:574
msgid "and NOT authenticated"
msgstr "且未被认证"
-#: gajim/chat_control_base.py:579
+#: gajim/chat_control_base.py:578
#, python-format
msgid "%(type)s encryption is active %(authenticated)s."
msgstr "%(type)s 加密已启用%(authenticated)s。"
-#: gajim/chat_control_base.py:702
+#: gajim/chat_control_base.py:698
msgid "_Undo"
msgstr ""
-#: gajim/chat_control_base.py:710 gajim/conversation_textview.py:507
+#: gajim/chat_control_base.py:706 gajim/conversation_textview.py:507
msgid "_Clear"
msgstr ""
-#: gajim/chat_control_base.py:715
+#: gajim/chat_control_base.py:711
msgid "Paste as quote"
msgstr ""
-#: gajim/chat_control_base.py:752
+#: gajim/chat_control_base.py:748
#, fuzzy
msgid "Paste Image"
msgstr "选择图像"
-#: gajim/chat_control_base.py:753
+#: gajim/chat_control_base.py:749
#, fuzzy
msgid "You are trying to paste an image"
msgstr "您将要关闭多个标签"
-#: gajim/chat_control_base.py:754
+#: gajim/chat_control_base.py:750
#, fuzzy
msgid ""
"Are you sure you want to paste your clipboard's image into the chat window?"
msgstr "您确定要离开聊天室\"%s\"吗?"
-#: gajim/chat_control_base.py:756 gajim/groupchat_control.py:1736
-#: gajim/roster_window.py:2837 gajim/roster_window.py:4070
+#: gajim/chat_control_base.py:752 gajim/groupchat_control.py:1736
+#: gajim/roster_window.py:2837 gajim/roster_window.py:4047
#: gajim/message_window.py:364
msgid "_Do not ask me again"
msgstr "不再询问(_D)"
-#: gajim/chat_control_base.py:759
+#: gajim/chat_control_base.py:755
msgid "_Paste"
msgstr ""
-#: gajim/chat_control_base.py:1315 gajim/gtk/accounts.py:304
+#: gajim/chat_control_base.py:1310 gajim/gtk/accounts.py:310
#, fuzzy
msgid "Privacy"
msgstr "隐私策略列表"
-#: gajim/chat_control_base.py:1316
+#: gajim/chat_control_base.py:1311
#, fuzzy
msgid "Warning"
msgstr "将封禁 %s"
-#: gajim/chat_control_base.py:1317
+#: gajim/chat_control_base.py:1312
#, fuzzy, python-format
msgid ""
"If you send a file to <b>%s</b>, your real XMPP address will be revealed."
msgstr "如果您想向 %s 发送文件, 对方会获知您的真实JID。"
-#: gajim/chat_control_base.py:1322
+#: gajim/chat_control_base.py:1317
msgid "_Continue"
msgstr "继续(_C)"
@@ -145,496 +151,491 @@ msgstr "没有未处理的认证请求"
msgid " resource with priority "
msgstr " 带有优先级的资源 "
-#: gajim/gui_menu_builder.py:255 gajim/gui_menu_builder.py:346
-#: gajim/chat_control.py:301 gajim/roster_window.py:781
-#: gajim/roster_window.py:1720 gajim/roster_window.py:1722
-#: gajim/roster_window.py:2034 gajim/roster_window.py:3280
-#: gajim/roster_window.py:3313 gajim/gui_interface.py:321
-#: gajim/common/contacts.py:214 gajim/common/contacts.py:344
-#: gajim/common/contacts.py:456 gajim/common/helpers.py:96
-#: gajim/common/helpers.py:321 gajim/gtk/add_contact.py:320
+#: gajim/gui_menu_builder.py:254 gajim/gui_menu_builder.py:345
+#: gajim/chat_control.py:295 gajim/roster_window.py:778
+#: gajim/roster_window.py:1717 gajim/roster_window.py:1719
+#: gajim/roster_window.py:2031 gajim/roster_window.py:3271
+#: gajim/roster_window.py:3304 gajim/gui_interface.py:295
+#: gajim/common/contacts.py:219 gajim/common/contacts.py:348
+#: gajim/common/contacts.py:459 gajim/common/helpers.py:94
+#: gajim/common/helpers.py:212 gajim/gtk/add_contact.py:320
#: gajim/gtk/subscription_request.py:63 gajim/gtk/subscription_request.py:95
#: gajim/gtk/roster_item_exchange.py:112
#, fuzzy
msgid "Not in contact list"
msgstr "显示离线联系人"
-#: gajim/gui_menu_builder.py:359
+#: gajim/gui_menu_builder.py:358
#, fuzzy
msgid "I would like to add you to my contact list"
msgstr "我想添加您到我的联系人列表"
-#: gajim/gui_menu_builder.py:437
+#: gajim/gui_menu_builder.py:436
msgid "Send Single _Message…"
msgstr "发送单条(_M)…"
-#: gajim/gui_menu_builder.py:452
+#: gajim/gui_menu_builder.py:451
#, fuzzy
msgid "E_xecute Command…"
msgstr "执行命令(_E)..."
-#: gajim/gui_menu_builder.py:460
+#: gajim/gui_menu_builder.py:459
msgid "_Manage Transport"
msgstr "管理代理(_M)"
-#: gajim/gui_menu_builder.py:466
+#: gajim/gui_menu_builder.py:465
msgid "_Modify Transport"
msgstr "修改代理(_M)"
-#: gajim/gui_menu_builder.py:473 gajim/roster_window.py:4938
+#: gajim/gui_menu_builder.py:472 gajim/roster_window.py:4915
#, fuzzy
msgid "_Rename…"
msgstr "重命名(_R)"
-#: gajim/gui_menu_builder.py:484 gajim/roster_window.py:4954
-#: gajim/roster_window.py:5069 gajim/data/gui/blocked_contacts_window.ui:52
+#: gajim/gui_menu_builder.py:483 gajim/roster_window.py:4931
+#: gajim/roster_window.py:5046 gajim/data/gui/blocked_contacts_window.ui:52
#: gajim/data/gui/contact_context_menu.ui:143
msgid "_Unblock"
msgstr "解除屏蔽(_U)"
-#: gajim/gui_menu_builder.py:487 gajim/roster_window.py:4959
-#: gajim/roster_window.py:5073 gajim/data/gui/contact_context_menu.ui:151
+#: gajim/gui_menu_builder.py:486 gajim/roster_window.py:4936
+#: gajim/roster_window.py:5050 gajim/data/gui/contact_context_menu.ui:151
msgid "_Block"
msgstr "屏蔽(_B)"
-#: gajim/gui_menu_builder.py:495 gajim/roster_window.py:4966
+#: gajim/gui_menu_builder.py:494 gajim/roster_window.py:4943
#: gajim/data/gui/contact_context_menu.ui:181
msgid "Remo_ve"
msgstr "移除(_R)"
-#: gajim/gui_menu_builder.py:505 gajim/data/gui/contact_context_menu.ui:198
+#: gajim/gui_menu_builder.py:504 gajim/data/gui/contact_context_menu.ui:198
msgid "_Information"
msgstr "信息(_I)"
-#: gajim/gui_menu_builder.py:518 gajim/groupchat_control.py:405
-#: gajim/chat_control.py:336
+#: gajim/gui_menu_builder.py:517
#, fuzzy
-msgid "Send File…"
+msgid "Send File"
msgstr "发送文件(_F)"
-#: gajim/gui_menu_builder.py:519
+#: gajim/gui_menu_builder.py:518
#, fuzzy
msgid "Upload File…"
msgstr "另存为..."
-#: gajim/gui_menu_builder.py:520
+#: gajim/gui_menu_builder.py:519
#, fuzzy
msgid "Send File Directly…"
msgstr "另存为..."
-#: gajim/gui_menu_builder.py:522 gajim/gui_menu_builder.py:590
+#: gajim/gui_menu_builder.py:521 gajim/gui_menu_builder.py:588
#, fuzzy
msgid "Send Chatstate"
msgstr "最后状态"
-#: gajim/gui_menu_builder.py:523
+#: gajim/gui_menu_builder.py:522 gajim/data/gui/groupchat_control.ui:283
#, fuzzy
-msgid "Invite Contacts"
+msgid "Invite Contacts…"
msgstr "邀请联系人(_C)"
-#: gajim/gui_menu_builder.py:524 gajim/gui_menu_builder.py:849
+#: gajim/gui_menu_builder.py:523 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:808 gajim/gui_menu_builder.py:847
#, fuzzy
-msgid "Add to Contact List"
+msgid "Add to Contact List…"
msgstr "添加联系人(_A)..."
-#: gajim/gui_menu_builder.py:525
+#: gajim/gui_menu_builder.py:524
#, fuzzy
msgid "Voice Chat"
msgstr "语音聊天请求"
-#: gajim/gui_menu_builder.py:526
+#: gajim/gui_menu_builder.py:525
#, fuzzy
msgid "Video Chat"
msgstr "视频测试"
-#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:574
-#: gajim/gui_menu_builder.py:844
+#: gajim/gui_menu_builder.py:526 gajim/gui_menu_builder.py:573
+#: gajim/gui_menu_builder.py:842
#, fuzzy
msgid "Information"
msgstr "信息(_I)"
-#: gajim/gui_menu_builder.py:528 gajim/gui_menu_builder.py:596
-#: gajim/data/gui/application_menu.ui:68
+#: gajim/gui_menu_builder.py:527 gajim/gui_menu_builder.py:594
#, fuzzy
msgid "History"
msgstr "历史(_H)"
-#: gajim/gui_menu_builder.py:534 gajim/gui_menu_builder.py:651
-#: gajim/data/gui/preferences_window.ui:1878
+#: gajim/gui_menu_builder.py:533 gajim/gui_menu_builder.py:649
+#: gajim/data/gui/preferences_window.ui:1886
msgid "Disabled"
msgstr "禁用"
-#: gajim/gui_menu_builder.py:535 gajim/gui_menu_builder.py:652
-msgid "Composing only"
+#: gajim/gui_menu_builder.py:534
+#, fuzzy
+msgid "Composing Only"
msgstr "仅正在编辑"
-#: gajim/gui_menu_builder.py:536 gajim/gui_menu_builder.py:653
-msgid "All chat states"
-msgstr "所有聊天状态"
-
-#: gajim/gui_menu_builder.py:575
+#: gajim/gui_menu_builder.py:535
#, fuzzy
-msgid "Invite Contact"
-msgstr "邀请联系人(_C)"
+msgid "All Chat States"
+msgstr "所有聊天状态"
-#: gajim/gui_menu_builder.py:576
+#: gajim/gui_menu_builder.py:574
#, fuzzy
msgid "Manage Group Chat"
msgstr "离开聊天室"
-#: gajim/gui_menu_builder.py:577 gajim/roster_window.py:3052
-#: gajim/roster_window.py:3053
+#: gajim/gui_menu_builder.py:575
#, fuzzy
-msgid "Rename Group Chat"
-msgstr "离开聊天室"
+msgid "Rename…"
+msgstr "重命名(_R)"
-#: gajim/gui_menu_builder.py:578 gajim/data/gui/groupchat_control.ui:629
+#: gajim/gui_menu_builder.py:576
#, fuzzy
-msgid "Change Subject"
+msgid "Change Subject…"
msgstr "更改主题(_S)"
-#: gajim/gui_menu_builder.py:579
-#, fuzzy
-msgid "Configure Group Chat"
-msgstr "离开聊天室"
-
-#: gajim/gui_menu_builder.py:580
+#: gajim/gui_menu_builder.py:577
#, fuzzy
msgid "Upload Avatar…"
msgstr "选择归档文件"
-#: gajim/gui_menu_builder.py:581
+#: gajim/gui_menu_builder.py:578
#, fuzzy
-msgid "Destroy Group Chat"
-msgstr "新聊天室"
+msgid "Configure…"
+msgstr "配置"
+
+#: gajim/gui_menu_builder.py:579
+#, fuzzy
+msgid "Destroy…"
+msgstr "正在销毁 %s"
-#: gajim/gui_menu_builder.py:583 gajim/data/gui/preferences_window.ui:845
+#: gajim/gui_menu_builder.py:581 gajim/data/gui/preferences_window.ui:843
#, fuzzy
msgid "Chat Settings"
msgstr "插件"
-#: gajim/gui_menu_builder.py:584
-msgid "Show join/leave"
+#: gajim/gui_menu_builder.py:582
+msgid "Show Join/Leave"
msgstr ""
-#: gajim/gui_menu_builder.py:585
+#: gajim/gui_menu_builder.py:583
#, fuzzy
-msgid "Show status changes"
+msgid "Show Status Changes"
msgstr "记录联系人状态变化(_L)"
-#: gajim/gui_menu_builder.py:586
+#: gajim/gui_menu_builder.py:584
#, fuzzy
-msgid "Notify on all messages"
+msgid "Notify on all Messages"
msgstr "预设的消息: "
-#: gajim/gui_menu_builder.py:587
+#: gajim/gui_menu_builder.py:585
#, fuzzy
-msgid "Minimize on close"
+msgid "Minimize on Close"
msgstr "关闭时最小化窗口"
-#: gajim/gui_menu_builder.py:589
+#: gajim/gui_menu_builder.py:587
#, fuzzy
-msgid "Minimize when joining automatically"
+msgid "Minimize When Joining Automatically"
msgstr "自动加入时最小化"
-#: gajim/gui_menu_builder.py:592
+#: gajim/gui_menu_builder.py:590
msgid "Sync Threshold"
msgstr ""
-#: gajim/gui_menu_builder.py:593
+#: gajim/gui_menu_builder.py:591
#, fuzzy
-msgid "Change Nickname"
+msgid "Change Nickname…"
msgstr "更改昵称(_N)"
-#: gajim/gui_menu_builder.py:594
+#: gajim/gui_menu_builder.py:592
#, fuzzy
msgid "Request Voice"
msgstr "语音(_V)"
-#: gajim/gui_menu_builder.py:595 gajim/gui_menu_builder.py:867
-#: gajim/roster_window.py:5145
+#: gajim/gui_menu_builder.py:593 gajim/gui_menu_builder.py:865
#, fuzzy
-msgid "Execute command"
+msgid "Execute Command…"
msgstr "执行命令(_E)..."
-#: gajim/gui_menu_builder.py:597
+#: gajim/gui_menu_builder.py:595
msgid "Leave"
msgstr ""
-#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:167
+#: gajim/gui_menu_builder.py:640 gajim/gtk/preferences.py:166
msgid "No threshold"
msgstr ""
-#: gajim/gui_menu_builder.py:644 gajim/gtk/preferences.py:169
+#: gajim/gui_menu_builder.py:642 gajim/gtk/preferences.py:168
#, python-format
msgid "%i day"
msgid_plural "%i days"
msgstr[0] ""
-#: gajim/gui_menu_builder.py:673
+#: gajim/gui_menu_builder.py:650
+msgid "Composing only"
+msgstr "仅正在编辑"
+
+#: gajim/gui_menu_builder.py:651
+msgid "All chat states"
+msgstr "所有聊天状态"
+
+#: gajim/gui_menu_builder.py:671
#, fuzzy
msgid "Add Contact…"
msgstr "添加联系人(_A)..."
-#: gajim/gui_menu_builder.py:674 gajim/gtk/profile.py:53
-#: gajim/gtk/accounts.py:689 gajim/gtk/accounts.py:727
+#: gajim/gui_menu_builder.py:672 gajim/gtk/profile.py:53
+#: gajim/gtk/accounts.py:708 gajim/gtk/accounts.py:746
#, fuzzy
msgid "Profile"
msgstr "文件"
-#: gajim/gui_menu_builder.py:675
+#: gajim/gui_menu_builder.py:673
msgid "Send Single Message…"
msgstr "发送单条消息…"
-#: gajim/gui_menu_builder.py:676
+#: gajim/gui_menu_builder.py:674
#, fuzzy
-msgid "Discover Services"
+msgid "Discover Services…"
msgstr "发现服务(_D)"
-#: gajim/gui_menu_builder.py:677 gajim/gtk/server_info.py:47
+#: gajim/gui_menu_builder.py:675 gajim/gtk/server_info.py:48
#, fuzzy
msgid "Server Info"
msgstr "服务器"
-#: gajim/gui_menu_builder.py:678 gajim/data/gui/preferences_window.ui:2739
+#: gajim/gui_menu_builder.py:676 gajim/data/gui/preferences_window.ui:2763
msgid "Advanced"
msgstr "高级"
-#: gajim/gui_menu_builder.py:679 gajim/gtk/mam_preferences.py:88
+#: gajim/gui_menu_builder.py:677 gajim/gtk/mam_preferences.py:98
#, fuzzy
msgid "Archiving Preferences"
msgstr "编辑存档首选项(_V)"
-#: gajim/gui_menu_builder.py:680
+#: gajim/gui_menu_builder.py:678
#, fuzzy
msgid "Blocking List"
msgstr "封禁名单"
-#: gajim/gui_menu_builder.py:681
+#: gajim/gui_menu_builder.py:679
#, fuzzy
msgid "Bookmarks"
msgstr "将本聊天室加入书签(_B)"
-#: gajim/gui_menu_builder.py:682
+#: gajim/gui_menu_builder.py:680
#, fuzzy
msgid "PEP Configuration"
msgstr "聊天室设置"
-#: gajim/gui_menu_builder.py:683 gajim/gtk/history_sync.py:108
-#: gajim/gtk/history_sync.py:182
+#: gajim/gui_menu_builder.py:681
#, fuzzy
-msgid "Synchronise History"
+msgid "Synchronise History…"
msgstr "同步"
-#: gajim/gui_menu_builder.py:684 gajim/gtk/privacy_list.py:409
+#: gajim/gui_menu_builder.py:682 gajim/gtk/privacy_list.py:409
msgid "Privacy Lists"
msgstr "隐私策略列表"
-#: gajim/gui_menu_builder.py:686 gajim/data/gui/groupchat_config.ui:36
-#: gajim/gtk/server_info.py:137
+#: gajim/gui_menu_builder.py:684 gajim/data/gui/groupchat_config.ui:36
+#: gajim/gtk/server_info.py:128
#, fuzzy
msgid "Admin"
msgstr "管理(_A)"
-#: gajim/gui_menu_builder.py:687
+#: gajim/gui_menu_builder.py:685
#, fuzzy
msgid "Send Server Message…"
msgstr "发送服务器消息(_S)"
-#: gajim/gui_menu_builder.py:688
+#: gajim/gui_menu_builder.py:686
#, fuzzy
msgid "Set MOTD…"
msgstr "设定 MOTD..."
-#: gajim/gui_menu_builder.py:689
+#: gajim/gui_menu_builder.py:687
#, fuzzy
msgid "Update MOTD…"
msgstr "更新 MOTD..."
-#: gajim/gui_menu_builder.py:690
+#: gajim/gui_menu_builder.py:688
#, fuzzy
msgid "Delete MOTD…"
msgstr "删除 MOTD"
-#: gajim/gui_menu_builder.py:727
+#: gajim/gui_menu_builder.py:725
#, fuzzy
msgid "_Add Account…"
msgstr "添加联系人(_A)..."
-#: gajim/gui_menu_builder.py:733
+#: gajim/gui_menu_builder.py:731
#, fuzzy
msgid "_Modify Accounts…"
msgstr "修改账户信息(_M)"
-#: gajim/gui_menu_builder.py:743 gajim/data/gui/zeroconf_context_menu.ui:26
+#: gajim/gui_menu_builder.py:741 gajim/data/gui/zeroconf_context_menu.ui:26
#: gajim/data/gui/account_context_menu.ui:79
#, fuzzy
msgid "_Modify Account…"
msgstr "修改账户信息(_M)"
-#: gajim/gui_menu_builder.py:747 gajim/data/gui/application_menu.ui:36
-#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/accounts.py:51
+#: gajim/gui_menu_builder.py:745 gajim/gtk/accounts.py:51
msgid "Accounts"
msgstr "账户"
-#: gajim/gui_menu_builder.py:776 gajim/gui_menu_builder.py:781
+#: gajim/gui_menu_builder.py:774 gajim/gui_menu_builder.py:779
#, fuzzy
msgid "Copy XMPP Address"
msgstr "复制 JID/电子邮件地址(_C)"
-#: gajim/gui_menu_builder.py:777 gajim/gui_menu_builder.py:809
+#: gajim/gui_menu_builder.py:775 gajim/gui_menu_builder.py:807
msgid "Join Groupchat"
msgstr "加入聊天室"
-#: gajim/gui_menu_builder.py:782 gajim/gui_menu_builder.py:808
-#: gajim/data/gui/application_menu.ui:8
+#: gajim/gui_menu_builder.py:780 gajim/gui_menu_builder.py:806
#: gajim/data/gui/subscription_request_window.ui:106
+#: gajim/gtk/start_chat.py:630
msgid "Start Chat"
msgstr "开始聊天"
-#: gajim/gui_menu_builder.py:783 gajim/gui_menu_builder.py:810
-#, fuzzy
-msgid "Add to Contact List…"
-msgstr "添加联系人(_A)..."
-
-#: gajim/gui_menu_builder.py:788
+#: gajim/gui_menu_builder.py:786
#, fuzzy
msgid "Copy Link Location"
msgstr "复制链接位置(_C)"
-#: gajim/gui_menu_builder.py:789
+#: gajim/gui_menu_builder.py:787
#, fuzzy
msgid "Open Link in Browser"
msgstr "在浏览器中打开链接(_O)"
-#: gajim/gui_menu_builder.py:794
+#: gajim/gui_menu_builder.py:792
#, fuzzy
msgid "Copy Email Address"
msgstr "复制 JID/电子邮件地址(_C)"
-#: gajim/gui_menu_builder.py:795 gajim/gui_menu_builder.py:807
+#: gajim/gui_menu_builder.py:793 gajim/gui_menu_builder.py:805
#, fuzzy
msgid "Open Email Composer"
msgstr "打开邮件编辑器(_O)"
-#: gajim/gui_menu_builder.py:800
+#: gajim/gui_menu_builder.py:798
#, fuzzy
msgid "Copy Location"
msgstr "复制链接位置(_C)"
-#: gajim/gui_menu_builder.py:801
+#: gajim/gui_menu_builder.py:799
#, fuzzy
msgid "Show Location"
msgstr "位置:"
-#: gajim/gui_menu_builder.py:806
+#: gajim/gui_menu_builder.py:804
#, fuzzy
msgid "Copy XMPP Address/Email"
msgstr "复制 JID/电子邮件地址(_C)"
-#: gajim/gui_menu_builder.py:858
+#: gajim/gui_menu_builder.py:856
#, fuzzy
msgid "Invite"
msgstr "邀请(_V)"
-#: gajim/gui_menu_builder.py:876
+#: gajim/gui_menu_builder.py:874
#, fuzzy
msgid "Unblock"
msgstr "解除屏蔽(_U)"
-#: gajim/gui_menu_builder.py:879
+#: gajim/gui_menu_builder.py:877
#, fuzzy
msgid "Block"
msgstr "屏蔽(_B)"
-#: gajim/gui_menu_builder.py:885
+#: gajim/gui_menu_builder.py:883
#, fuzzy
msgid "Kick"
msgstr "踢除(_K)"
-#: gajim/gui_menu_builder.py:893
+#: gajim/gui_menu_builder.py:891
#, fuzzy
msgid "Ban"
msgstr "封禁(_B)"
-#: gajim/gui_menu_builder.py:903
+#: gajim/gui_menu_builder.py:901
#, fuzzy
msgid "Make Owner"
msgstr "所有者"
-#: gajim/gui_menu_builder.py:912
+#: gajim/gui_menu_builder.py:910
#, fuzzy
msgid "Make Admin"
msgstr "管理(_A)"
-#: gajim/gui_menu_builder.py:921
+#: gajim/gui_menu_builder.py:919
#, fuzzy
msgid "Make Member"
msgstr "成员"
-#: gajim/gui_menu_builder.py:930
+#: gajim/gui_menu_builder.py:928
#, fuzzy
msgid "Revoke Member"
msgstr "成员"
-#: gajim/gui_menu_builder.py:940
+#: gajim/gui_menu_builder.py:938
msgid "Grant Voice"
msgstr ""
-#: gajim/gui_menu_builder.py:943
+#: gajim/gui_menu_builder.py:941
#, fuzzy
msgid "Revoke Voice"
msgstr "语音(_V)"
-#: gajim/gui_menu_builder.py:963
+#: gajim/gui_menu_builder.py:961
#, fuzzy
msgid "Copy"
msgstr "聊天室 JID"
-#: gajim/history_manager.py:70
+#: gajim/history_manager.py:78
#, fuzzy
msgid "Usage:"
msgstr "message"
-#: gajim/history_manager.py:72
+#: gajim/history_manager.py:80
#, fuzzy
msgid "Options:"
msgstr "表情(_E): "
-#: gajim/history_manager.py:74
+#: gajim/history_manager.py:82
msgid "Show this help message and exit"
msgstr ""
-#: gajim/history_manager.py:75
+#: gajim/history_manager.py:83
msgid "Choose folder for logfile"
msgstr ""
-#: gajim/history_manager.py:106
+#: gajim/history_manager.py:113
msgid "Cannot find history logs database"
msgstr "无法找到历史记录数据库"
-#: gajim/history_manager.py:107
+#: gajim/history_manager.py:114
#, fuzzy, python-format
msgid "%s does not exist."
msgstr "文件不存在"
-#: gajim/history_manager.py:140 gajim/history_manager.py:194
+#: gajim/history_manager.py:147 gajim/history_manager.py:201
#: gajim/data/gui/profile_window.ui:404 gajim/data/gui/mam_preferences.ui:117
#: gajim/data/gui/vcard_information_window.ui:55
#: gajim/data/gui/privacy_list_window.ui:317
#: gajim/data/gui/blocking_list.ui:115 gajim/data/gui/bookmarks.ui:101
-#: gajim/gtk/discovery.py:828 gajim/gtk/add_contact.py:31
-#: gajim/gtk/accounts.py:720
+#: gajim/gtk/discovery.py:829 gajim/gtk/add_contact.py:31
+#: gajim/gtk/accounts.py:739
#, fuzzy
msgid "XMPP Address"
msgstr "AIM 地址: "
-#: gajim/history_manager.py:153 gajim/history_manager.py:201
+#: gajim/history_manager.py:160 gajim/history_manager.py:208
#: gajim/data/gui/history_window.ui:89 gajim/gtk/history.py:108
msgid "Date"
msgstr "日期"
-#: gajim/history_manager.py:160 gajim/history_manager.py:224
+#: gajim/history_manager.py:167 gajim/history_manager.py:231
#: gajim/data/gui/join_groupchat_window.ui:208
#: gajim/data/gui/profile_window.ui:214
#: gajim/data/gui/vcard_information_window.ui:442
@@ -642,29 +643,29 @@ msgstr "日期"
msgid "Nickname"
msgstr "昵称"
-#: gajim/history_manager.py:171 gajim/history_manager.py:210
-#: gajim/data/gui/preferences_window.ui:1399
+#: gajim/history_manager.py:178 gajim/history_manager.py:217
+#: gajim/data/gui/preferences_window.ui:1397
#: gajim/data/gui/single_message_window.ui:266 gajim/gtk/history.py:117
msgid "Message"
msgstr "消息"
-#: gajim/history_manager.py:179 gajim/history_manager.py:217
+#: gajim/history_manager.py:186 gajim/history_manager.py:224
#: gajim/data/gui/groups_post_window.ui:49
#: gajim/data/gui/single_message_window.ui:205
msgid "Subject"
msgstr "主题"
-#: gajim/history_manager.py:247
+#: gajim/history_manager.py:254
#, fuzzy
msgid "Database Cleanup"
msgstr "数据库错误"
-#: gajim/history_manager.py:248
+#: gajim/history_manager.py:255
#, fuzzy
msgid "Clean up the database?"
msgstr "建立缓存数据库"
-#: gajim/history_manager.py:249
+#: gajim/history_manager.py:256
#, fuzzy
msgid ""
"This is STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING.\n"
@@ -676,278 +677,283 @@ msgstr ""
"\n"
"如果您点击\"是\", 请等待..."
-#: gajim/history_manager.py:255
+#: gajim/history_manager.py:262
#, fuzzy
msgid "_Cleanup"
msgstr "清除(_U)"
-#: gajim/history_manager.py:520 gajim/gtk/filetransfer.py:238
+#: gajim/history_manager.py:527 gajim/gtk/filetransfer.py:238
#: gajim/gtk/filetransfer.py:248
msgid "You"
msgstr "您"
-#: gajim/history_manager.py:532
+#: gajim/history_manager.py:539
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s 在 %(time)s 时说: %(message)s\n"
-#: gajim/history_manager.py:569 gajim/history_manager.py:608
-#: gajim/gtk/themes.py:340 gajim/gtk/roster_item_exchange.py:75
+#: gajim/history_manager.py:576 gajim/history_manager.py:615
+#: gajim/gtk/themes.py:352 gajim/gtk/roster_item_exchange.py:75
#: gajim/gtk/roster_item_exchange.py:185
msgid "Delete"
msgstr "删除"
-#: gajim/history_manager.py:570
+#: gajim/history_manager.py:577
#, fuzzy
msgid "Delete Conversation"
msgid_plural "Delete Conversations"
msgstr[0] "删除确认"
-#: gajim/history_manager.py:571
+#: gajim/history_manager.py:578
#, fuzzy, python-format
msgid "Do you want to permanently delete this conversation with <b>%s</b>?"
msgid_plural "Do you want to permanently delete these conversations?"
msgstr[0] "您确定要删除所选定的消息?"
-#: gajim/history_manager.py:609
+#: gajim/history_manager.py:616
#, fuzzy
msgid "Delete Message"
msgid_plural "Delete Messages"
msgstr[0] "默认消息"
-#: gajim/history_manager.py:610
+#: gajim/history_manager.py:617
#, fuzzy
msgid "Do you want to permanently delete this message?"
msgid_plural "Do you want to permanently delete these messages?"
msgstr[0] "您确定要删除所选定的消息?"
-#: gajim/dialogs.py:83
+#: gajim/dialogs.py:82
#, python-format
msgid "Contact name: <i>%s</i>"
msgstr "联系人名称: <i>%s</i>"
-#: gajim/dialogs.py:85
+#: gajim/dialogs.py:84
#, python-format
msgid "XMPP Address: <i>%s</i>"
msgstr ""
-#: gajim/dialogs.py:116 gajim/dialogs.py:129 gajim/roster_window.py:2891
-#: gajim/roster_window.py:3736 gajim/roster_window.py:4976
-#: gajim/common/contacts.py:157 gajim/common/contacts.py:198
-#: gajim/data/gui/preferences_window.ui:558
-#: gajim/data/gui/preferences_window.ui:610
-#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:302
+#: gajim/dialogs.py:115 gajim/dialogs.py:128 gajim/roster_window.py:2891
+#: gajim/roster_window.py:3713 gajim/roster_window.py:4953
+#: gajim/common/contacts.py:163 gajim/common/contacts.py:203
+#: gajim/data/gui/preferences_window.ui:556
+#: gajim/data/gui/preferences_window.ui:608
+#: gajim/data/gui/shortcuts_window.ui:184 gajim/gtk/accounts.py:308
msgid "General"
msgstr "常规"
-#: gajim/dialogs.py:202
+#: gajim/dialogs.py:201
msgid "Group"
msgstr "群组"
-#: gajim/dialogs.py:209
+#: gajim/dialogs.py:208
msgid "In the group"
msgstr "群组内"
-#: gajim/dialogs.py:357
+#: gajim/dialogs.py:356
msgid "Set Mood"
msgstr "设置 Mood"
-#: gajim/dialogs.py:404 gajim/dialogs.py:417
+#: gajim/dialogs.py:403 gajim/dialogs.py:416
#: gajim/data/gui/change_mood_dialog.ui:98
msgid "None"
msgstr "无"
-#: gajim/dialogs.py:478
+#: gajim/dialogs.py:477
#, python-format
msgid "%s Status Message"
msgstr "%s 状态信息"
-#: gajim/dialogs.py:492
+#: gajim/dialogs.py:491
msgid "Status Message"
msgstr "状态信息"
-#: gajim/dialogs.py:700
+#: gajim/dialogs.py:698
msgid "Overwrite"
msgstr ""
-#: gajim/dialogs.py:701
+#: gajim/dialogs.py:699
msgid "Overwrite Status Message?"
msgstr "覆盖状态信息?"
-#: gajim/dialogs.py:702
+#: gajim/dialogs.py:700
#, fuzzy
msgid "This name is already in use. Do you want to overwrite this preset?"
msgstr "这个名称已被使用。您想要覆盖这个状态信息吗?"
-#: gajim/dialogs.py:706 gajim/plugins/gui.py:292
+#: gajim/dialogs.py:704 gajim/plugins/gui.py:292
msgid "_Overwrite"
msgstr ""
-#: gajim/dialogs.py:718
+#: gajim/dialogs.py:716
#, fuzzy
msgid "Status Preset"
msgstr "状态信息"
-#: gajim/dialogs.py:719
+#: gajim/dialogs.py:717
#, fuzzy
msgid "Save status as preset"
msgstr "另存为..."
-#: gajim/dialogs.py:720
+#: gajim/dialogs.py:718
#, fuzzy
msgid "Please assign a name to this status message preset"
msgstr "请为这个状态信息输入一个名称"
-#: gajim/dialogs.py:723
+#: gajim/dialogs.py:721
#, fuzzy
msgid "_Save"
msgstr "另存为(_A)"
-#: gajim/dialogs.py:725
+#: gajim/dialogs.py:723
#, fuzzy
msgid "New Status"
msgstr "状态"
-#: gajim/dialogs.py:752 gajim/gtk/discovery.py:517 gajim/gtk/profile.py:306
+#: gajim/dialogs.py:750 gajim/gtk/discovery.py:518 gajim/gtk/profile.py:306
msgid "You are not connected to the server"
msgstr "尚未连接到服务器"
-#: gajim/dialogs.py:753
+#: gajim/dialogs.py:751
msgid "Without a connection, you can not synchronise your contacts."
msgstr "未连接时,您不能同步您的联系人。"
-#: gajim/dialogs.py:764 gajim/dialogs.py:835 gajim/data/gui/bookmarks.ui:122
-#: gajim/gtk/discovery.py:821 gajim/gtk/discovery.py:1645
-#: gajim/gtk/discovery.py:1891 gajim/gtk/history.py:99
+#: gajim/dialogs.py:762 gajim/dialogs.py:833 gajim/data/gui/bookmarks.ui:122
+#: gajim/gtk/discovery.py:822 gajim/gtk/discovery.py:1646
+#: gajim/gtk/discovery.py:1892 gajim/gtk/history.py:99
#: gajim/gtk/roster_item_exchange.py:83
msgid "Name"
msgstr "名称"
-#: gajim/dialogs.py:767 gajim/data/gui/join_groupchat_window.ui:163
+#: gajim/dialogs.py:765 gajim/data/gui/join_groupchat_window.ui:163
#: gajim/data/gui/server_info.ui:146
msgid "Server"
msgstr "服务器"
-#: gajim/dialogs.py:803
+#: gajim/dialogs.py:801
msgid "This account is not connected to the server"
msgstr "这个账户已经连接到服务器"
-#: gajim/dialogs.py:804
+#: gajim/dialogs.py:802
msgid "You cannot synchronize with an account unless it is connected."
msgstr "这个账户连接后您才可以与之同步"
-#: gajim/dialogs.py:833
+#: gajim/dialogs.py:831
msgid "Synchronise"
msgstr "同步"
-#: gajim/dialogs.py:1042
+#: gajim/dialogs.py:1043
msgid "an audio and video"
msgstr "一个音频和视频"
-#: gajim/dialogs.py:1044
+#: gajim/dialogs.py:1045
msgid "an audio"
msgstr "一个音频"
-#: gajim/dialogs.py:1046
+#: gajim/dialogs.py:1047
msgid "a video"
msgstr "一个视频"
-#: gajim/dialogs.py:1050
+#: gajim/dialogs.py:1051
#, fuzzy, python-format
msgid ""
"%(contact)s wants to start a %(type)s chat with you. Do you want to answer "
"the call?"
msgstr "%(contact)s 想要与您发起一个 %(type)s 会话。您要响应吗?"
-#: gajim/groupchat_control.py:409
+#: gajim/groupchat_control.py:407 gajim/chat_control.py:330
+#, fuzzy
+msgid "Send File…"
+msgstr "发送文件(_F)"
+
+#: gajim/groupchat_control.py:411
#, fuzzy, python-format
msgid "Send File (max. %s MiB)…"
msgstr "另存为..."
-#: gajim/groupchat_control.py:411 gajim/chat_control.py:338
+#: gajim/groupchat_control.py:413 gajim/chat_control.py:332
#, fuzzy
msgid "No File Transfer available"
msgstr "文件传输完毕"
-#: gajim/groupchat_control.py:539 gajim/dialog_messages.py:31
-#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:240
+#: gajim/groupchat_control.py:541 gajim/dialog_messages.py:31
+#: gajim/dialog_messages.py:36 gajim/gtk/single_message.py:238
#, fuzzy
msgid "Invalid XMPP Address"
msgstr "无效文件"
-#: gajim/groupchat_control.py:636 gajim/gtk/profile.py:133
+#: gajim/groupchat_control.py:638 gajim/gtk/profile.py:133
msgid "Could not load image"
msgstr "无法读取图片"
-#: gajim/groupchat_control.py:679
+#: gajim/groupchat_control.py:681
#, fuzzy, python-format
msgid "Kick %s"
msgstr "将踢走 %s"
-#: gajim/groupchat_control.py:688
+#: gajim/groupchat_control.py:690
#, fuzzy, python-format
msgid "Ban %s"
msgstr "封禁名单"
-#: gajim/groupchat_control.py:736
+#: gajim/groupchat_control.py:738
msgid "Insert Nickname"
msgstr "插入昵称"
-#: gajim/groupchat_control.py:828 gajim/groupchat_control.py:829
+#: gajim/groupchat_control.py:829 gajim/groupchat_control.py:830
#, fuzzy
msgid "Voice Request"
msgstr "语音聊天请求"
-#: gajim/groupchat_control.py:830
+#: gajim/groupchat_control.py:831
#, python-format
-msgid "<b>%s</b> from <b>%s</b> requests voice"
+msgid "<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice"
msgstr ""
-#: gajim/groupchat_control.py:834
+#: gajim/groupchat_control.py:835
#, fuzzy
msgid "_Approve"
msgstr "approve"
-#: gajim/groupchat_control.py:1057
+#: gajim/groupchat_control.py:1058
#, python-format
msgid "%(nick)s has set the subject to %(subject)s"
msgstr "%(nick)s 将主题设置为 %(subject)s"
-#: gajim/groupchat_control.py:1073
+#: gajim/groupchat_control.py:1074
#, fuzzy
msgid "Group chat now shows unavailable members"
msgstr "聊天室现在显示了不可用的成员"
-#: gajim/groupchat_control.py:1076
+#: gajim/groupchat_control.py:1077
#, fuzzy
msgid "Group chat now does not show unavailable members"
msgstr "聊天室现在不显示禁止的成员"
-#: gajim/groupchat_control.py:1080
+#: gajim/groupchat_control.py:1081
msgid "A setting not related to privacy has been changed"
msgstr ""
-#: gajim/groupchat_control.py:1087 gajim/groupchat_control.py:1247
+#: gajim/groupchat_control.py:1088 gajim/groupchat_control.py:1247
#, fuzzy
msgid "Conversations are stored on the server"
msgstr "本次会话将在服务器上被存档"
-#: gajim/groupchat_control.py:1090
+#: gajim/groupchat_control.py:1091
#, fuzzy
msgid "Conversations are not stored on the server"
msgstr "服务器中保存的关于您的信息"
-#: gajim/groupchat_control.py:1093
+#: gajim/groupchat_control.py:1094
#, fuzzy
msgid "Group chat is now non-anonymous"
msgstr "聊天室现在是非匿名的"
-#: gajim/groupchat_control.py:1097
+#: gajim/groupchat_control.py:1098
#, fuzzy
msgid "Group chat is now semi-anonymous"
msgstr "聊天室现在是半匿名的"
-#: gajim/groupchat_control.py:1101
+#: gajim/groupchat_control.py:1102
#, fuzzy
msgid "Group chat is now fully anonymous"
msgstr "聊天室现在是完全匿名的"
@@ -962,7 +968,7 @@ msgstr "Pong! (%s s.)"
msgid "Pong! (%(nick)s %(delay)s s.)"
msgstr "Pong! (%(nick)s %(delay)s s.)"
-#: gajim/groupchat_control.py:1153 gajim/chat_control.py:647
+#: gajim/groupchat_control.py:1153 gajim/chat_control.py:643
msgid "Error."
msgstr "错误。"
@@ -991,22 +997,22 @@ msgstr "一个新的聊天室被创建"
msgid "Failed to Configure Group Chat"
msgstr "离开聊天室"
-#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:106
+#: gajim/groupchat_control.py:1275 gajim/privatechat_control.py:105
#, python-format
msgid "You are now known as %s"
msgstr "您现在成了 %s "
-#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:108
+#: gajim/groupchat_control.py:1277 gajim/privatechat_control.py:107
#, python-brace-format
msgid "{nick} is now known as {new_nick}"
msgstr "{nick} 现在改名为{new_nick}"
-#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:134
+#: gajim/groupchat_control.py:1302 gajim/privatechat_control.py:133
#, python-brace-format
msgid "You are now {show}{status}"
msgstr "您现在成了{show}{status}"
-#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:140
+#: gajim/groupchat_control.py:1308 gajim/privatechat_control.py:139
#, python-brace-format
msgid "{nick} is now {show}{status}"
msgstr "{nick} 的状态是 {show}{status}"
@@ -1132,81 +1138,81 @@ msgstr "您确定要离开聊天室\"%s\"吗?"
msgid "If you close this window, you will leave '%s'."
msgstr "如果关闭此窗口, 您将断开此聊天室的连接。"
-#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5137
+#: gajim/groupchat_control.py:1740 gajim/roster_window.py:5108
msgid "_Leave"
msgstr ""
-#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3010
+#: gajim/groupchat_control.py:1785 gajim/roster_window.py:3001
#, fuzzy, python-format
msgid "%(jid)s has been invited to this group chat"
msgstr "%(jid)s 已经被邀请加入该聊天室"
-#: gajim/chat_control.py:429
+#: gajim/chat_control.py:423
msgid "Show a list of formattings"
msgstr "显示格式列表(Alt+M)"
-#: gajim/chat_control.py:433
+#: gajim/chat_control.py:427
#, fuzzy
msgid "This contact does not support HTML"
msgstr "这个联系人不支持文件传输"
-#: gajim/chat_control.py:642
+#: gajim/chat_control.py:638
msgid "Ping?"
msgstr "Ping?"
-#: gajim/chat_control.py:645
+#: gajim/chat_control.py:641
#, fuzzy, python-format
msgid "Pong! (%s seconds)"
msgstr "Pong! (%s s.)"
-#: gajim/chat_control.py:717
+#: gajim/chat_control.py:713
#, python-format
msgid "%(type)s state : %(state)s, reason: %(reason)s"
msgstr "%(type)s 状态: %(state)s, 原因: %(reason)s"
-#: gajim/chat_control.py:816
+#: gajim/chat_control.py:812
#, python-format
msgid "%(nickname)s from group chat %(room_name)s"
msgstr "聊天室 %(room_name)s 的 %(nickname)s"
-#: gajim/chat_control.py:1162
+#: gajim/chat_control.py:1129
#, fuzzy
msgid "Note: Chat history is disabled for this contact."
msgstr "忽略这个证书的这个错误。"
-#: gajim/chat_control.py:1164
+#: gajim/chat_control.py:1131
msgid "Note: Chat history is disabled for this account."
msgstr ""
-#: gajim/chat_control.py:1165
+#: gajim/chat_control.py:1132
#, fuzzy, python-format
msgid ""
"You just received a new message from %s.\n"
"Do you want to close this tab?"
msgstr "您刚刚收到一条来自 \"%s\" 的消息"
-#: gajim/chat_control.py:1171 gajim/gtk/change_password.py:44
+#: gajim/chat_control.py:1138 gajim/gtk/change_password.py:44
#: gajim/gtk/remove_account.py:44
#, fuzzy
msgid "Close"
msgstr "发送并关闭(_S)"
-#: gajim/chat_control.py:1172 gajim/common/connection_handlers_events.py:277
-#: gajim/gtk/notification.py:184 gajim/gtk/notification.py:213
-#: gajim/gtk/notification.py:284
+#: gajim/chat_control.py:1139 gajim/common/connection_handlers_events.py:237
+#: gajim/gtk/notification.py:185 gajim/gtk/notification.py:214
+#: gajim/gtk/notification.py:273
msgid "New Message"
msgstr "新消息"
-#: gajim/chat_control.py:1177 gajim/chat_control.py:1474
-#: gajim/chat_control.py:1483 gajim/message_window.py:367
-#: gajim/data/gui/groupchat_control.ui:979
-#: gajim/data/gui/groupchat_control.ui:1065
-#: gajim/data/gui/groupchat_control.ui:1171
+#: gajim/chat_control.py:1144 gajim/chat_control.py:1441
+#: gajim/chat_control.py:1450 gajim/message_window.py:367
+#: gajim/data/gui/groupchat_control.ui:1024
+#: gajim/data/gui/groupchat_control.ui:1110
+#: gajim/data/gui/groupchat_control.ui:1216
#, fuzzy
msgid "_Close"
msgstr "发送并关闭(_S)"
-#: gajim/chat_control.py:1264
+#: gajim/chat_control.py:1231
#, python-format
msgid ""
"Subject: %(subject)s\n"
@@ -1215,182 +1221,173 @@ msgstr ""
"主题: %(subject)s\n"
"%(message)s"
-#: gajim/chat_control.py:1377
+#: gajim/chat_control.py:1344
#, python-format
msgid "%(name)s is now %(show)s %(status)s"
msgstr "%(name)s 的状态是 %(show)s %(status)s"
-#: gajim/chat_control.py:1438 gajim/roster_window.py:4210
-#: gajim/roster_window.py:4211 gajim/data/gui/application_menu.ui:64
-#: gajim/gtk/filetransfer_progress.py:35
+#: gajim/chat_control.py:1405 gajim/roster_window.py:4187
+#: gajim/roster_window.py:4188 gajim/gtk/filetransfer_progress.py:35
#, fuzzy
msgid "File Transfer"
msgstr "文件传输"
-#: gajim/chat_control.py:1442
+#: gajim/chat_control.py:1409
msgid "Size"
msgstr "大小"
-#: gajim/chat_control.py:1444 gajim/chat_control.py:1504
+#: gajim/chat_control.py:1411 gajim/chat_control.py:1471
#: gajim/data/gui/groupchat_invitation_received.ui:77 gajim/gtk/dialogs.py:57
#, fuzzy
msgid "_Accept"
msgstr "帐户(_A)"
-#: gajim/chat_control.py:1446 gajim/chat_control.py:1506
+#: gajim/chat_control.py:1413 gajim/chat_control.py:1473
#: gajim/data/gui/groupchat_invitation_received.ui:62
#, fuzzy
msgid "_Decline"
msgstr "离线(_O)"
-#: gajim/chat_control.py:1468 gajim/gui_interface.py:718
-#: gajim/gui_interface.py:748 gajim/gui_interface.py:774
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:291
+#: gajim/chat_control.py:1435 gajim/gui_interface.py:693
+#: gajim/gui_interface.py:723 gajim/gui_interface.py:749
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:284
msgid "File Transfer Completed"
msgstr "文件传输完成"
-#: gajim/chat_control.py:1472 gajim/gtk/filetransfer.py:259
+#: gajim/chat_control.py:1439 gajim/gtk/filetransfer.py:259
#, fuzzy
msgid "Open _Folder"
msgstr "打开文件夹(_O)"
-#: gajim/chat_control.py:1501 gajim/gui_interface.py:411
+#: gajim/chat_control.py:1468 gajim/gui_interface.py:386
#: gajim/data/gui/groupchat_invitation_received.ui:42
-#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:209
-#: gajim/gtk/notification.py:294
+#: gajim/gtk/notification.py:189 gajim/gtk/notification.py:210
+#: gajim/gtk/notification.py:288
#, fuzzy
msgid "Group Chat Invitation"
msgstr "聊天室邀请"
-#: gajim/chat_control.py:1526 gajim/roster_window.py:1954
+#: gajim/chat_control.py:1493 gajim/roster_window.py:1951
msgid "Remote contact stopped transfer"
msgstr "远程联系人停止了传输"
-#: gajim/chat_control.py:1528 gajim/roster_window.py:1956
+#: gajim/chat_control.py:1495 gajim/roster_window.py:1953
msgid "Error opening file"
msgstr "打开文件错误"
-#: gajim/chat_control.py:1530 gajim/gtk/filetransfer.py:297
+#: gajim/chat_control.py:1497 gajim/gtk/filetransfer.py:297
msgid "File transfer stopped"
msgstr "文件传输已停止"
-#: gajim/chat_control.py:1535 gajim/gtk/filetransfer.py:275
+#: gajim/chat_control.py:1502 gajim/gtk/filetransfer.py:275
#: gajim/gtk/filetransfer.py:284
msgid "File transfer cancelled"
msgstr "文件传输已取消"
-#: gajim/chat_control.py:1536
+#: gajim/chat_control.py:1503
msgid "Connection with peer cannot be established."
msgstr "无法与对方建立连接。"
-#: gajim/application.py:79
+#: gajim/application.py:80
#, fuzzy
msgid "Show the application's version"
msgstr "在通知区域显示图标: "
-#: gajim/application.py:86
+#: gajim/application.py:87
#, fuzzy
msgid "Show only critical errors"
msgstr "只显示在联系人列表中"
-#: gajim/application.py:93
+#: gajim/application.py:94
msgid "Separate profile files completely (even history database and plugins)"
msgstr ""
-#: gajim/application.py:101
+#: gajim/application.py:102
msgid "Print XML stanzas and other debug information"
msgstr ""
-#: gajim/application.py:108
+#: gajim/application.py:109
#, fuzzy
msgid "Use defined profile in configuration directory"
msgstr "高级设置编辑器"
-#: gajim/application.py:116
+#: gajim/application.py:117
msgid "Set configuration directory"
msgstr "设置配置文件目录"
-#: gajim/application.py:124
+#: gajim/application.py:125
msgid "Configure logging system"
msgstr "配置日志系统"
-#: gajim/application.py:132
+#: gajim/application.py:133
msgid "Show all warnings"
msgstr "显示所有警告"
-#: gajim/application.py:139
+#: gajim/application.py:140
msgid "Open IPython shell"
msgstr "打开 IPython shell"
-#: gajim/application.py:146
+#: gajim/application.py:147
msgid "Pops up a window with the next pending event"
msgstr "为下一条未处理事件弹出窗口"
-#: gajim/application.py:152 gajim/data/gui/shortcuts_window.ui:189
+#: gajim/application.py:153 gajim/data/gui/shortcuts_window.ui:189
#: data/org.gajim.Gajim.desktop.in:21
msgid "Start a new chat"
msgstr "开始新聊天"
-#: gajim/application.py:159
-msgid "Simulate loss of connectivity"
-msgstr ""
-
-#: gajim/application.py:166
-msgid "Simulate regaining connectivity"
-msgstr ""
-
-#: gajim/application.py:210 gajim/gui_interface.py:124
+#: gajim/application.py:194 gajim/gui_interface.py:125
msgid "Database Error"
msgstr "数据库错误"
-#: gajim/roster_window.py:289 gajim/roster_window.py:1025
+#: gajim/roster_window.py:286 gajim/roster_window.py:1022
msgid "Merged accounts"
msgstr "已合并的帐户"
-#: gajim/roster_window.py:848 gajim/roster_window.py:1632
-#: gajim/roster_window.py:1665 gajim/roster_window.py:1716
-#: gajim/roster_window.py:1718 gajim/roster_window.py:1873
-#: gajim/roster_window.py:2514 gajim/roster_window.py:4290
-#: gajim/roster_window.py:4917 gajim/common/contacts.py:196
-#: gajim/common/contacts.py:448 gajim/common/helpers.py:96
-#: gajim/gtk/discovery.py:127 gajim/gtk/discovery.py:128
-#: gajim/gtk/discovery.py:1414
+#: gajim/roster_window.py:845 gajim/roster_window.py:1629
+#: gajim/roster_window.py:1662 gajim/roster_window.py:1713
+#: gajim/roster_window.py:1715 gajim/roster_window.py:1870
+#: gajim/roster_window.py:2514 gajim/roster_window.py:4267
+#: gajim/roster_window.py:4894 gajim/common/contacts.py:201
+#: gajim/common/contacts.py:451 gajim/common/helpers.py:93
+#: gajim/gtk/discovery.py:128 gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:1415
msgid "Transports"
msgstr "服务代理"
-#: gajim/roster_window.py:1724 gajim/roster_window.py:1726
-#: gajim/roster_window.py:4290 gajim/roster_window.py:4887
-#: gajim/gui_interface.py:1358 gajim/common/contacts.py:194
+#: gajim/roster_window.py:1721 gajim/roster_window.py:1723
+#: gajim/roster_window.py:4267 gajim/roster_window.py:4864
+#: gajim/gui_interface.py:1319 gajim/common/contacts.py:199
#: gajim/common/helpers.py:96
#, fuzzy
msgid "Group chats"
msgstr "聊天室"
-#: gajim/roster_window.py:2016
+#: gajim/roster_window.py:2013
#, fuzzy
msgid "Authorization sent"
msgstr "授权发送成功"
-#: gajim/roster_window.py:2017
+#: gajim/roster_window.py:2014
#, fuzzy, python-format
msgid "\"%s\" will now see your status."
msgstr "现在\"%s\"将知道您的状态。"
-#: gajim/roster_window.py:2035
+#: gajim/roster_window.py:2032
msgid "Subscription request has been sent"
msgstr "认证请求已发出"
-#: gajim/roster_window.py:2036
+#: gajim/roster_window.py:2033
#, fuzzy, python-format
msgid "If \"%s\" accepts this request you will know their status."
msgstr "如果\"%s\"接受此请求, 您将知道他/她的状态。"
-#: gajim/roster_window.py:2050
+#: gajim/roster_window.py:2047
#, fuzzy
msgid "Authorization removed"
msgstr "授权被移除"
-#: gajim/roster_window.py:2051
+#: gajim/roster_window.py:2048
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "\"%s\" 将一直看到您的状态为离线。"
@@ -1400,7 +1397,7 @@ msgstr "\"%s\" 将一直看到您的状态为离线。"
msgid "desynced"
msgstr "未同步"
-#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:245
+#: gajim/roster_window.py:2336 gajim/data/gui/shortcuts_window.ui:238
#, fuzzy
msgid "Quit Gajim"
msgstr "Gajim"
@@ -1420,7 +1417,8 @@ msgid "_Always quit when closing Gajim"
msgstr "总是关闭 Gajim"
#: gajim/roster_window.py:2342 gajim/roster_window.py:2438
-#: gajim/roster_window.py:2478 gajim/data/gui/systray_context_menu.ui:83
+#: gajim/roster_window.py:2478 gajim/data/gui/application_menu.ui:30
+#: gajim/data/gui/systray_context_menu.ui:83
msgid "_Quit"
msgstr ""
@@ -1569,8 +1567,8 @@ msgstr "重命名群组"
msgid "Please enter a new name"
msgstr "请用您想要的名字新建一个主题。"
-#: gajim/roster_window.py:2926 gajim/roster_window.py:3057
-#: gajim/data/gui/groupchat_control.ui:1692
+#: gajim/roster_window.py:2926 gajim/roster_window.py:3048
+#: gajim/data/gui/groupchat_control.ui:1737
#, fuzzy
msgid "_Rename"
msgstr "重命名(_N)"
@@ -1589,48 +1587,53 @@ msgstr "您想从联系人列表中删除组 %s ?"
msgid "_Also remove all contacts of this group from contact list"
msgstr "同时从联系人列表删除这个群组的所有联系人"
-#: gajim/roster_window.py:3054
+#: gajim/roster_window.py:3043 gajim/roster_window.py:3044
+#, fuzzy
+msgid "Rename Group Chat"
+msgstr "离开聊天室"
+
+#: gajim/roster_window.py:3045
#, fuzzy
msgid "Please enter a new name for this group chat"
msgstr "请在您本地账户填写新的用户名"
-#: gajim/roster_window.py:3297
+#: gajim/roster_window.py:3288
#, fuzzy
msgid "Remove Contact"
msgstr "重命名联系人"
-#: gajim/roster_window.py:3298
+#: gajim/roster_window.py:3289
#, fuzzy
msgid "Remove contact from contact list"
msgstr "从联系人列表删除联系人"
-#: gajim/roster_window.py:3299
+#: gajim/roster_window.py:3290
#, fuzzy, python-format
msgid "You are about to remove %(name)s (%(jid)s) from your contact list.\n"
msgstr "您将从您的联系人列表中将 \"%(name)s\" (%(jid)s) 移除。\n"
-#: gajim/roster_window.py:3308 gajim/roster_window.py:3328
+#: gajim/roster_window.py:3299 gajim/roster_window.py:3319
#, fuzzy
msgid ""
"By removing this contact you also remove authorization. This means the "
"contact will see you as offline."
msgstr "删除此联系人的同时将删除认证,这将导致对方一直看到您为离线。"
-#: gajim/roster_window.py:3319
+#: gajim/roster_window.py:3310
msgid "Do you want to continue?"
msgstr "您要继续吗?"
-#: gajim/roster_window.py:3330
+#: gajim/roster_window.py:3321
#, fuzzy
msgid "_I want this contact to know my status after removal"
msgstr "我想让此联系人在被移除之后仍然知道我的状态"
-#: gajim/roster_window.py:3337
+#: gajim/roster_window.py:3328
#, fuzzy
msgid "Remove contacts from contact list"
msgstr "从联系人列表删除联系人"
-#: gajim/roster_window.py:3343
+#: gajim/roster_window.py:3334
#, fuzzy, python-format
msgid ""
"By removing the following contacts, you will also remove authorization. This "
@@ -1639,24 +1642,24 @@ msgid ""
"%s"
msgstr "删除此联系人的同时将删除认证,这将导致对方一直看到您为离线。"
-#: gajim/roster_window.py:3347
+#: gajim/roster_window.py:3338
#, fuzzy
msgid "Remove Contacts"
msgstr "重命名联系人"
-#: gajim/roster_window.py:3367
+#: gajim/roster_window.py:3358
msgid "No account available"
msgstr "没有有效账户"
-#: gajim/roster_window.py:3368
+#: gajim/roster_window.py:3359
msgid "You must create an account before you can chat with other contacts."
msgstr "您必须在与他人聊天前新建账户。"
-#: gajim/roster_window.py:3963
+#: gajim/roster_window.py:3940
msgid "Metacontacts storage not supported by your server"
msgstr "您的服务器不支持存储元联系人信息"
-#: gajim/roster_window.py:3965
+#: gajim/roster_window.py:3942
#, fuzzy
msgid ""
"Your server does not support storing metacontacts information. So this "
@@ -1664,12 +1667,12 @@ msgid ""
msgstr ""
"您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时不会被保存。"
-#: gajim/roster_window.py:4062
+#: gajim/roster_window.py:4039
#, fuzzy
msgid "You are about to create a metacontact"
msgstr "您在创建一个元联系人。确定继续?"
-#: gajim/roster_window.py:4063
+#: gajim/roster_window.py:4040
#, fuzzy
msgid ""
"Metacontacts are a way to regroup several contacts in one single contact. "
@@ -1679,119 +1682,120 @@ msgstr ""
"元联系人是将几个联系人组合起来显示在同一行。通常在某个人有几个XMPP 账户或代理"
"账户时用到。"
-#: gajim/roster_window.py:4067
+#: gajim/roster_window.py:4044
#, fuzzy
msgid "Create Metacontact"
msgstr "重命名联系人"
-#: gajim/roster_window.py:4073 gajim/data/gui/groupchat_creation.ui:317
+#: gajim/roster_window.py:4050 gajim/data/gui/groupchat_creation.ui:317
#, fuzzy
msgid "_Create"
msgstr "创造"
-#: gajim/roster_window.py:4190
+#: gajim/roster_window.py:4167
msgid "Invalid file URI:"
msgstr "无效的文件地址: "
-#: gajim/roster_window.py:4202
+#: gajim/roster_window.py:4179
#, fuzzy, python-format
msgid "Send this file to %s:\n"
msgid_plural "Send these files to %s:\n"
msgstr[0] "您想要将文件发送给 %s 吗: "
-#: gajim/roster_window.py:4215 gajim/data/gui/xml_console.ui:334
+#: gajim/roster_window.py:4192 gajim/data/gui/xml_console.ui:334
msgid "_Send"
msgstr "发送(_S)"
-#: gajim/roster_window.py:4360
+#: gajim/roster_window.py:4337
#, fuzzy, python-format
msgid "Send %(from)s to %(to)s"
msgstr "发送 %s 给 %s"
-#: gajim/roster_window.py:4373
+#: gajim/roster_window.py:4350
#, python-format
msgid "Make %s first contact"
msgstr "将 %s 设为第一联系人"
-#: gajim/roster_window.py:4378
+#: gajim/roster_window.py:4355
#, python-format
msgid "Make %(contact1)s and %(contact2)s metacontacts"
msgstr "使用 %(contact1)s 与 %(contact2)s 创建元联系人"
-#: gajim/roster_window.py:4728 gajim/roster_window.py:4815
+#: gajim/roster_window.py:4705 gajim/roster_window.py:4792
msgid "_Change Status Message"
msgstr "更改状态信息(_C)"
-#: gajim/roster_window.py:4748
+#: gajim/roster_window.py:4725
msgid "Publish Tune"
msgstr "发布音乐"
-#: gajim/roster_window.py:4759
+#: gajim/roster_window.py:4736
msgid "Publish Location"
msgstr "发布位置信息"
-#: gajim/roster_window.py:4889
+#: gajim/roster_window.py:4866
msgid "_Maximize All"
msgstr "最大化全部(_M)"
-#: gajim/roster_window.py:4896 gajim/roster_window.py:5038
+#: gajim/roster_window.py:4873 gajim/roster_window.py:5015
msgid "Send Group M_essage"
msgstr "发送群组消息(_E)"
-#: gajim/roster_window.py:4903
+#: gajim/roster_window.py:4880
msgid "To all users"
msgstr "向所有的用户"
-#: gajim/roster_window.py:4907
+#: gajim/roster_window.py:4884
msgid "To all online users"
msgstr "向所有在线用户"
-#: gajim/roster_window.py:4919 gajim/roster_window.py:5044
+#: gajim/roster_window.py:4896 gajim/roster_window.py:5021
#: gajim/data/gui/contact_context_menu.ui:36
msgid "In_vite to"
msgstr "邀请到(_V)"
-#: gajim/roster_window.py:5054
+#: gajim/roster_window.py:5031
msgid "_Manage Contacts"
msgstr "管理联系人(_M)"
-#: gajim/roster_window.py:5060
+#: gajim/roster_window.py:5037
msgid "Edit _Groups…"
msgstr "编辑群组(_G)…"
-#: gajim/roster_window.py:5081 gajim/data/gui/filetransfers.ui:12
+#: gajim/roster_window.py:5058 gajim/data/gui/filetransfers.ui:12
#: gajim/gtk/dialogs.py:68
msgid "_Remove"
msgstr "移除(_R)"
-#: gajim/roster_window.py:5118
+#: gajim/roster_window.py:5095
msgid "_Maximize"
msgstr "最大化(_M)"
-#: gajim/roster_window.py:5123
+#: gajim/roster_window.py:5100
#, fuzzy
msgid "Re_name"
msgstr "重命名(_N)"
-#: gajim/roster_window.py:5132
-msgid "_Reconnect"
-msgstr "重新连接(_R)"
+#: gajim/roster_window.py:5116
+#, fuzzy
+msgid "Execute command"
+msgstr "执行命令(_E)..."
-#: gajim/roster_window.py:5153 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/roster_window.py:5124 gajim/data/gui/contact_context_menu.ui:205
+#: gajim/data/gui/application_menu.ui:68
msgid "_History"
msgstr "历史(_H)"
-#: gajim/roster_window.py:5234 gajim/data/gui/application_menu.ui:18
-#: gajim/data/gui/history_window.ui:57
+#: gajim/roster_window.py:5205 gajim/data/gui/history_window.ui:57
msgid "History Manager"
msgstr "历史记录管理器"
-#: gajim/roster_window.py:5315 gajim/gui_interface.py:322
-#: gajim/common/contacts.py:192 gajim/common/helpers.py:96
+#: gajim/roster_window.py:5286 gajim/gui_interface.py:296
+#: gajim/common/contacts.py:197 gajim/common/helpers.py:95
msgid "Observers"
msgstr "旁观者"
-#: gajim/roster_window.py:5318
+#: gajim/roster_window.py:5289
msgid "Observers can see your status, but you are not allowed to see theirs"
msgstr ""
@@ -1919,70 +1923,70 @@ msgstr "私聊"
msgid "Messages"
msgstr "消息"
-#: gajim/gui_interface.py:161
+#: gajim/gui_interface.py:162
#, fuzzy, python-format
msgid "HTTP (%(method)s) Authorization for %(url)s (ID: %(id)s)"
msgstr "%(url)s (id: %(id)s) 的 HTTP (%(method)s) 认证"
-#: gajim/gui_interface.py:166
+#: gajim/gui_interface.py:167
msgid "Do you accept this request?"
msgstr "是否接受这个请求?"
-#: gajim/gui_interface.py:168
+#: gajim/gui_interface.py:169
#, fuzzy, python-format
msgid "Do you accept this request (account: %s)?"
msgstr "是否接受这个对账户 %s 的请求?"
-#: gajim/gui_interface.py:174
+#: gajim/gui_interface.py:175
#, fuzzy
msgid "Authorization Request"
msgstr "授权发送成功"
-#: gajim/gui_interface.py:175
+#: gajim/gui_interface.py:176
#, fuzzy
msgid "HTTP Authorization Request"
msgstr "授权发送成功"
-#: gajim/gui_interface.py:178 gajim/gui_interface.py:358
+#: gajim/gui_interface.py:179 gajim/gui_interface.py:333
#: gajim/gtk/filetransfer.py:339
#, fuzzy
msgid "_No"
msgstr "No"
-#: gajim/gui_interface.py:196 gajim/gtk/notification.py:189
-#: gajim/gtk/notification.py:211
+#: gajim/gui_interface.py:197 gajim/gtk/notification.py:190
+#: gajim/gtk/notification.py:212
msgid "Connection Failed"
msgstr "连接失败"
-#: gajim/gui_interface.py:282
+#: gajim/gui_interface.py:256
#, python-format
msgid "error while sending %(message)s ( %(error)s )"
msgstr "发送 %(message)s 时出现错误( %(error)s )"
-#: gajim/gui_interface.py:307 gajim/gtk/notification.py:189
+#: gajim/gui_interface.py:281 gajim/gtk/notification.py:190
msgid "Subscription request"
msgstr "认证请求"
-#: gajim/gui_interface.py:342
+#: gajim/gui_interface.py:316
msgid "Authorization accepted"
msgstr "授权被接受"
-#: gajim/gui_interface.py:343
+#: gajim/gui_interface.py:317
#, fuzzy, python-format
msgid "The contact \"%s\" has authorized you to see their status."
msgstr "联系人\"%s\"已授权您查看他/她的状态。"
-#: gajim/gui_interface.py:353
+#: gajim/gui_interface.py:327
#, fuzzy
msgid "Subscription Removed"
msgstr "认证请求"
-#: gajim/gui_interface.py:354
+#: gajim/gui_interface.py:328
#, fuzzy, python-format
-msgid "%s (%s) has removed subscription from you"
+msgid "%(name)s (%(jid)s) has removed subscription from you"
msgstr "联系人\"%s\"移除了对您的关注"
-#: gajim/gui_interface.py:355
+#: gajim/gui_interface.py:330
#, fuzzy
msgid ""
"You will always see this contact as offline.\n"
@@ -1991,149 +1995,149 @@ msgstr ""
"您将一直看到对方处于离线状态。\n"
"要将对方从您的联系人列表中移除吗?"
-#: gajim/gui_interface.py:380 gajim/gtk/notification.py:190
+#: gajim/gui_interface.py:355 gajim/gtk/notification.py:191
msgid "Unsubscribed"
msgstr "已取消认证的"
-#: gajim/gui_interface.py:392
+#: gajim/gui_interface.py:367
#, python-format
msgid "%(jid)s declined the invitation: %(reason)s"
msgstr ""
-#: gajim/gui_interface.py:396
+#: gajim/gui_interface.py:371
#, python-format
msgid "%(jid)s declined the invitation"
msgstr ""
-#: gajim/gui_interface.py:412
+#: gajim/gui_interface.py:387
#, python-brace-format
msgid "You are invited to {room} by {user}"
msgstr "您被 {user}邀请到聊天室 {room}"
-#: gajim/gui_interface.py:433
+#: gajim/gui_interface.py:408
#, fuzzy
msgid "Certificate Passphrase Required"
msgstr "证书已过期"
-#: gajim/gui_interface.py:434
+#: gajim/gui_interface.py:409
#, python-format
msgid "Enter the certificate passphrase for account %s"
msgstr "输入账户 %s 的证书密码。"
-#: gajim/gui_interface.py:443
+#: gajim/gui_interface.py:418
#, python-format
msgid "Enter your password for account %s"
msgstr "输入帐户 %s 的密码"
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
msgid "Password Required"
msgstr "需要密码"
-#: gajim/gui_interface.py:455
+#: gajim/gui_interface.py:430
msgid "Save password"
msgstr "保存密码"
-#: gajim/gui_interface.py:524 gajim/gui_interface.py:555
+#: gajim/gui_interface.py:499 gajim/gui_interface.py:530
#: gajim/gtk/filetransfer.py:333 gajim/gtk/filetransfer.py:334
-#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:289
+#: gajim/gtk/notification.py:188 gajim/gtk/notification.py:281
msgid "File Transfer Error"
msgstr "文件传输错误"
-#: gajim/gui_interface.py:589
+#: gajim/gui_interface.py:564
#, python-format
msgid "%s wants to send you a file."
msgstr "%s 想发送给您一个文件。"
-#: gajim/gui_interface.py:591 gajim/gtk/filetransfer.py:485
-#: gajim/gtk/notification.py:186 gajim/gtk/notification.py:287
+#: gajim/gui_interface.py:566 gajim/gtk/filetransfer.py:485
+#: gajim/gtk/notification.py:187 gajim/gtk/notification.py:278
msgid "File Transfer Request"
msgstr "文件传输请求"
-#: gajim/gui_interface.py:694
+#: gajim/gui_interface.py:669
#, fuzzy
msgid "Remote Contact Stopped Transfer"
msgstr "远程联系人停止了传输"
-#: gajim/gui_interface.py:699
+#: gajim/gui_interface.py:674
#, fuzzy
msgid "Error Opening File"
msgstr "打开文件错误"
-#: gajim/gui_interface.py:709
+#: gajim/gui_interface.py:684
#, fuzzy
msgid "SSL Certificate Error"
msgstr "SSL证书错误"
-#: gajim/gui_interface.py:722 gajim/gui_interface.py:753
-#: gajim/gui_interface.py:780 gajim/gtk/notification.py:188
-#: gajim/gtk/notification.py:292
+#: gajim/gui_interface.py:697 gajim/gui_interface.py:728
+#: gajim/gui_interface.py:755 gajim/gtk/notification.py:189
+#: gajim/gtk/notification.py:285
msgid "File Transfer Stopped"
msgstr "文件传输已停止"
-#: gajim/gui_interface.py:726
+#: gajim/gui_interface.py:701
#, fuzzy
msgid "File Transfer Failed"
msgstr "文件传输完毕"
-#: gajim/gui_interface.py:749
+#: gajim/gui_interface.py:724
#, fuzzy, python-format
msgid "%(filename)s received from %(name)s."
msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
-#: gajim/gui_interface.py:754
+#: gajim/gui_interface.py:729
#, python-format
msgid "File transfer of %(filename)s from %(name)s stopped."
msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
-#: gajim/gui_interface.py:760
+#: gajim/gui_interface.py:735
#, fuzzy, python-format
msgid "File transfer of %(filename)s from %(name)s failed."
msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
-#: gajim/gui_interface.py:775
+#: gajim/gui_interface.py:750
#, python-format
msgid "You successfully sent %(filename)s to %(name)s."
msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
-#: gajim/gui_interface.py:781
+#: gajim/gui_interface.py:756
#, python-format
msgid "File transfer of %(filename)s to %(name)s stopped."
msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
-#: gajim/gui_interface.py:787
+#: gajim/gui_interface.py:762
#, fuzzy, python-format
msgid "File transfer of %(filename)s to %(name)s failed."
msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
-#: gajim/gui_interface.py:889 gajim/gui_interface.py:890
+#: gajim/gui_interface.py:850 gajim/gui_interface.py:851
msgid "Username Conflict"
msgstr "用户名冲突"
-#: gajim/gui_interface.py:891
+#: gajim/gui_interface.py:852
#, fuzzy
msgid "Please enter a new username for your local account"
msgstr "请在您本地账户填写新的用户名"
-#: gajim/gui_interface.py:895 gajim/data/gui/passphrase_dialog.ui:44
+#: gajim/gui_interface.py:856 gajim/data/gui/passphrase_dialog.ui:44
#: gajim/gtk/dialogs.py:49
msgid "_OK"
msgstr "确定(_O)"
-#: gajim/gui_interface.py:953
+#: gajim/gui_interface.py:914
#, python-format
msgid "%s wants to start a voice chat."
msgstr "%s 想要发起语音聊天。"
-#: gajim/gui_interface.py:955
+#: gajim/gui_interface.py:916
msgid "Voice Chat Request"
msgstr "语音聊天请求"
-#: gajim/gui_interface.py:1007 gajim/gui_interface.py:1008
+#: gajim/gui_interface.py:968 gajim/gui_interface.py:969
#, fuzzy
msgid "Insecure Connection"
msgstr "不安全的连接"
-#: gajim/gui_interface.py:1009
+#: gajim/gui_interface.py:970
#, fuzzy, python-format
msgid ""
"You are about to connect to the account %(account)s (%(server)s) using an "
@@ -2144,20 +2148,20 @@ msgstr ""
"对话都不会被加密。强烈建议您不要这么做。\n"
"您确定要这样做吗?"
-#: gajim/gui_interface.py:1016 gajim/data/gui/groupchat_control.ui:476
+#: gajim/gui_interface.py:977 gajim/data/gui/groupchat_control.ui:521
msgid "_Abort"
msgstr ""
-#: gajim/gui_interface.py:1019
+#: gajim/gui_interface.py:980
#, fuzzy
msgid "_Connect Anyway"
msgstr "正在连接"
-#: gajim/gui_interface.py:1872
+#: gajim/gui_interface.py:1721
msgid "Could not save your settings and preferences"
msgstr "无法保存您的设置。"
-#: gajim/gui_interface.py:1934
+#: gajim/gui_interface.py:1783
msgid "Gajim: IPython Console"
msgstr ""
@@ -2358,11 +2362,11 @@ msgstr ""
msgid "Avatar Upload Failed"
msgstr "vCard 发布失败"
-#: gajim/privatechat_control.py:198
+#: gajim/privatechat_control.py:197
msgid "Sending private message failed"
msgstr "发送私有消息失败"
-#: gajim/privatechat_control.py:200
+#: gajim/privatechat_control.py:199
#, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
msgstr "您不再在聊天室\"%(room)s\"中或\"%(nick)s\"已离开。"
@@ -2685,77 +2689,72 @@ msgstr ""
"参数 \"%(arg)s\" 未指定。\n"
"输入 \"%(basename)s help %(command)s\" 获取更多信息"
-#: gajim/common/logger.py:243 gajim/common/logger.py:248
+#: gajim/common/logger.py:210 gajim/common/logger.py:215
#, python-format
msgid "%s is a directory but should be a file"
msgstr "%s 是一个目录但它应该是一个文件"
-#: gajim/common/logger.py:268
+#: gajim/common/logger.py:235
#, fuzzy, python-format
msgid "Creating %s"
msgstr "正在销毁 %s"
-#: gajim/common/connection_handlers_events.py:73
-#, python-format
-msgid "Unknown SSL error: %d"
-msgstr "未知的 SSL 错误: %d"
-
-#: gajim/common/connection_handlers_events.py:274 gajim/gtk/notification.py:184
-#: gajim/gtk/notification.py:214 gajim/gtk/notification.py:285
+#: gajim/common/connection_handlers_events.py:234 gajim/gtk/notification.py:185
+#: gajim/gtk/notification.py:215 gajim/gtk/notification.py:274
msgid "New Private Message"
msgstr "新个人消息"
-#: gajim/common/connection_handlers_events.py:282
-#: gajim/common/connection_handlers_events.py:374
+#: gajim/common/connection_handlers_events.py:242
+#: gajim/common/connection_handlers_events.py:339
#, fuzzy, python-format
msgid "New message from %(nickname)s"
msgid_plural "%(n_msgs)i unread messages from %(nickname)s"
msgstr[0] "来自 %(nickname)s 的新消息"
-#: gajim/common/connection_handlers_events.py:363 gajim/gtk/notification.py:185
-#: gajim/gtk/notification.py:215
+#: gajim/common/connection_handlers_events.py:325 gajim/gtk/notification.py:186
+#: gajim/gtk/notification.py:216
#, fuzzy
msgid "New Group Chat Message"
msgstr "新聊天室"
-#: gajim/common/connection_handlers_events.py:449
+#: gajim/common/connection_handlers_events.py:414
#, python-format
msgid "%(nick)s Changed Status"
msgstr "%(nick)s 改变了状态"
-#: gajim/common/connection_handlers_events.py:451 gajim/gtk/history.py:581
+#: gajim/common/connection_handlers_events.py:416 gajim/gtk/history.py:581
#, python-format
msgid "%(nick)s is now %(status)s"
msgstr "%(nick)s 的状态是 %(status)s"
-#: gajim/common/connection_handlers_events.py:455 gajim/gtk/notification.py:186
-#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:296
+#: gajim/common/connection_handlers_events.py:420 gajim/gtk/notification.py:187
+#: gajim/gtk/notification.py:208 gajim/gtk/notification.py:291
msgid "Contact Changed Status"
msgstr "联系人状态改变"
-#: gajim/common/connection_handlers_events.py:457
+#: gajim/common/connection_handlers_events.py:422
#, python-format
msgid "%(nickname)s Signed In"
msgstr "%(nickname)s 上线了"
-#: gajim/common/connection_handlers_events.py:461 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:205 gajim/gtk/notification.py:280
+#: gajim/common/connection_handlers_events.py:426 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:267
msgid "Contact Signed In"
msgstr "联系人登录"
-#: gajim/common/connection_handlers_events.py:463
+#: gajim/common/connection_handlers_events.py:428
#, python-format
msgid "%(nickname)s Signed Out"
msgstr "%(nickname)s 离开了"
-#: gajim/common/connection_handlers_events.py:467 gajim/gtk/notification.py:183
-#: gajim/gtk/notification.py:206 gajim/gtk/notification.py:282
+#: gajim/common/connection_handlers_events.py:432 gajim/gtk/notification.py:184
+#: gajim/gtk/notification.py:207 gajim/gtk/notification.py:270
msgid "Contact Signed Out"
msgstr "联系人退出登录"
-#: gajim/common/client.py:247 gajim/common/const.py:905
-#: gajim/common/const.py:906 gajim/common/const.py:907
-#: gajim/common/const.py:910 gajim/gtk/account_wizard.py:305
+#: gajim/common/client.py:296 gajim/common/const.py:938
+#: gajim/common/const.py:939 gajim/common/const.py:940
+#: gajim/common/const.py:943 gajim/gtk/account_wizard.py:368
#, fuzzy
msgid "Authentication failed"
msgstr "\"%s\"登录验证失败"
@@ -2823,63 +2822,21 @@ msgstr ""
#: gajim/common/config.py:93
#, fuzzy
-msgid "Notification color for contacts signing in."
-msgstr "提醒我联系人登录(_I)"
-
-#: gajim/common/config.py:94
-#, fuzzy
-msgid "Notification color for contacts signing out."
-msgstr "提醒我联系人登出(_O)"
-
-#: gajim/common/config.py:95
-#, fuzzy
-msgid "Notification color for new message notification."
-msgstr "在弹出提示中预览消息?"
-
-#: gajim/common/config.py:96
-#, fuzzy
-msgid "Notification color for file transfer request."
-msgstr "文件传输完成时提醒我(_N)"
-
-#: gajim/common/config.py:97
-#, fuzzy
-msgid "Notification color for file transfer errors."
-msgstr "文件传输完成时提醒我(_N)"
-
-#: gajim/common/config.py:98
-msgid "Notification color for stopped or completed file transfers."
-msgstr ""
-
-#: gajim/common/config.py:99
-msgid "Notification color for group chat invitations."
-msgstr ""
-
-#: gajim/common/config.py:100
-#, fuzzy
-msgid "Notification background color for changed status."
-msgstr "状态变更通知的背景色"
-
-#: gajim/common/config.py:101
-msgid "Notification color for other dialogs."
-msgstr ""
-
-#: gajim/common/config.py:102
-#, fuzzy
msgid ""
"List of rows (accounts and groups) that are collapsed (space separated)."
msgstr "折叠的行(账户和组)的列表(空格分隔)。"
-#: gajim/common/config.py:103
+#: gajim/common/config.py:94
msgid "default"
msgstr "默认"
-#: gajim/common/config.py:109 gajim/common/config.py:378
-#: gajim/common/config.py:385
+#: gajim/common/config.py:100 gajim/common/config.py:355
+#: gajim/common/config.py:362
#, fuzzy
msgid "Language used for spell checking."
msgstr "拼写检查的语言"
-#: gajim/common/config.py:110
+#: gajim/common/config.py:101
msgid ""
"'always' - print time for every message.\n"
"'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -2889,46 +2846,46 @@ msgstr ""
"'有时' - 如 iChat 风格每隔几分钟显示时间。\n"
"'从不' - 从不显示时间。"
-#: gajim/common/config.py:112
+#: gajim/common/config.py:103
msgid "When enabled, ASCII emojis will be converted to graphical emojis."
msgstr ""
-#: gajim/common/config.py:114
+#: gajim/common/config.py:105
msgid "Treat * / _ pairs as possible formatting characters."
msgstr "将成对出现的 * / _ 视为可能的格式控制字符。"
-#: gajim/common/config.py:115
+#: gajim/common/config.py:106
#, fuzzy
msgid ""
"If enabled, do not remove */_ . So *abc* will be bold but with * * not "
"removed."
msgstr "如果为真, 则不要移除 */_。这样 *abc* 将被加粗,但是* * 不会被去除。"
-#: gajim/common/config.py:118
+#: gajim/common/config.py:109
#, fuzzy
msgid ""
"Character to add after nickname when using nickname completion (tab) in "
"group chat."
msgstr "当在聊天室中使用昵称补全(Tab)时加到昵称后的字符。"
-#: gajim/common/config.py:119
+#: gajim/common/config.py:110
#, fuzzy
msgid ""
"Character to propose to add after desired nickname when nickname is already "
"used in group chat."
msgstr "当请求的昵称被聊天室中的其他人使用时加到请求的昵称后的字符。"
-#: gajim/common/config.py:141
+#: gajim/common/config.py:132
msgid ""
"If enabled, Gajim will save the contact list window position when hiding it, "
"and restore it when showing the contact list window again."
msgstr ""
-#: gajim/common/config.py:147
+#: gajim/common/config.py:138
msgid "Place the contact list on the right in single window mode"
msgstr ""
-#: gajim/common/config.py:153
+#: gajim/common/config.py:144
#, fuzzy
msgid ""
"This option lets you customize the timestamp that is printed in "
@@ -2940,34 +2897,34 @@ msgstr ""
"钟]\"。请参考Python文档关于strftime的完整文档:http://docs.python.org/lib/"
"module-time.html"
-#: gajim/common/config.py:154
+#: gajim/common/config.py:145
#, fuzzy
msgid "Characters that are printed before the nickname in conversations."
msgstr "在对话中显示在昵称前的字符"
-#: gajim/common/config.py:155
+#: gajim/common/config.py:146
#, fuzzy
msgid "Characters that are printed after the nickname in conversations."
msgstr "在对话中显示在昵称后的字符"
-#: gajim/common/config.py:156
+#: gajim/common/config.py:147
#, fuzzy
msgid "If enabled, Gajim will add * and [n] in contact list window title."
msgstr "如果选中, Gajim 会在联系人列表窗口中显示显示联系人的心情。"
-#: gajim/common/config.py:157
+#: gajim/common/config.py:148
#, fuzzy
msgid ""
"Number of messages from chat history to be restored when a chat tab/window "
"is reopened."
msgstr "聊天标签/窗口被重新打开时显示之前进行的对话的最后多少行。"
-#: gajim/common/config.py:158
+#: gajim/common/config.py:149
msgid ""
"How far back in time (minutes) chat history is restored. -1 means no limit."
msgstr ""
-#: gajim/common/config.py:159
+#: gajim/common/config.py:150
#, fuzzy
msgid ""
"How many seconds to wait before trying to automatically rejoin a group chat "
@@ -2975,17 +2932,17 @@ msgid ""
msgstr ""
"自动重新加入一个断开了的聊天室前等待多少秒。设为 0 以禁用自动重新加入。"
-#: gajim/common/config.py:160
+#: gajim/common/config.py:151
#, fuzzy
msgid "Send message on Ctrl+Enter and make a new line with Enter."
msgstr "用 Ctrl+Enter 发送消息, Enter 开始新行(紫茉莉 ICQ 客户端默认操作)。"
-#: gajim/common/config.py:162
+#: gajim/common/config.py:153
#, fuzzy
msgid "How many lines to store for Ctrl+KeyUP (previously sent messages)."
msgstr "为 Ctrl+KeyUP 存储多少行。"
-#: gajim/common/config.py:165
+#: gajim/common/config.py:156
#, fuzzy, python-format
msgid ""
"Either a custom URL with %%s in it (where %%s is the word/phrase) or "
@@ -2994,26 +2951,26 @@ msgstr ""
"自定义地址, 在其中应包含 %s, %s 是单词/短语; 或'WIKTIONARY'以使用 "
"wiktionary。"
-#: gajim/common/config.py:168
+#: gajim/common/config.py:159
msgid "If checked, Gajim can be controlled remotely using gajim-remote."
msgstr "如果选中, Gajim 可以被 gajim-remote 远程控制。"
-#: gajim/common/config.py:169
+#: gajim/common/config.py:160
#, fuzzy
msgid ""
"When not printing time for every message ('print_time'==sometimes), print it "
"every x minutes."
msgstr "当不是每条消息都显示时间('有时'显示时间)时, 每多少分钟显示时间。"
-#: gajim/common/config.py:170
+#: gajim/common/config.py:161
msgid "Ask before pasting an image."
msgstr ""
-#: gajim/common/config.py:171
+#: gajim/common/config.py:162
msgid "Ask before closing a group chat tab/window."
msgstr "关闭聊天室标签/窗口前询问。"
-#: gajim/common/config.py:172
+#: gajim/common/config.py:163
#, fuzzy
msgid ""
"Ask before closing tabbed chat window if there are chats that can lose data "
@@ -3022,7 +2979,7 @@ msgstr ""
"如果关闭的是有可能会丢失数据的控件(不会被最小化的聊天、私人聊天、聊天室),在"
"关闭标签式聊天窗口前询问"
-#: gajim/common/config.py:175
+#: gajim/common/config.py:166
#, fuzzy
msgid ""
"List of send hosts (comma separated) in addition to local interfaces for "
@@ -3031,38 +2988,38 @@ msgstr ""
"逗号分割的列表。在有地址翻译/端口转发的情况下, 除了本地接口, 还将向其中的主机"
"发送文件传输请求。"
-#: gajim/common/config.py:176
+#: gajim/common/config.py:167
msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
msgstr "IEC 标准规定 1 KiB = 1024 bytes(字节), 1 KB = 1000 bytes。"
-#: gajim/common/config.py:178
+#: gajim/common/config.py:169
msgid "Notify of events in the notification area."
msgstr "在通知区域中提示事件"
-#: gajim/common/config.py:183
+#: gajim/common/config.py:174
msgid "Show tab when only one conversation?"
msgstr "只有一个对话时显示标签?"
-#: gajim/common/config.py:184
+#: gajim/common/config.py:175
msgid "Show tabbed notebook border in chat windows?"
msgstr "在聊天窗口中显示标签组的边框。"
-#: gajim/common/config.py:185
+#: gajim/common/config.py:176
msgid "Show close button in tab?"
msgstr "在标签上显示关闭按钮?"
-#: gajim/common/config.py:198
+#: gajim/common/config.py:177
msgid "Preview new messages in notification popup?"
msgstr "在弹出提示中预览消息?"
-#: gajim/common/config.py:201
+#: gajim/common/config.py:180
#, fuzzy
msgid ""
"A list of words (semicolon separated) that will be highlighted in group "
"chats."
msgstr "用分号隔开的在聊天室中将高亮显示的单词列表。"
-#: gajim/common/config.py:202
+#: gajim/common/config.py:181
#, fuzzy
msgid ""
"If enabled, Gajim quits when clicking the X button of your Window Manager. "
@@ -3072,22 +3029,13 @@ msgstr ""
"如果为真, 单击窗口管理器的 X 按钮会退出 Gajim。这一设定仅当启用通知区域图标时"
"会生效。"
-#: gajim/common/config.py:203
+#: gajim/common/config.py:182
msgid ""
"If enabled, Gajim hides the contact list window when pressing the X button "
"instead of minimizing into the notification area."
msgstr ""
-#: gajim/common/config.py:204
-#, fuzzy
-msgid ""
-"If enabled, Gajim will display an icon on each tab containing unread "
-"messages. Depending on the theme, this icon may be animated."
-msgstr ""
-"如果为真, Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题, 该图标可"
-"能是动态的。"
-
-#: gajim/common/config.py:205
+#: gajim/common/config.py:183
#, fuzzy
msgid ""
"If enabled, Gajim will display the status message (if not empty) underneath "
@@ -3096,13 +3044,13 @@ msgstr ""
"如果为真, Gajim 将在联系人列表窗口中每一个联系人名字的下方显示状态信息(如果"
"不为空)。"
-#: gajim/common/config.py:211
+#: gajim/common/config.py:189
#, fuzzy
msgid ""
"Define the position of avatars in the contact list. Can be 'left' or 'right'."
msgstr "定义了在联系人列表中头像的显示位置。可以是左或右"
-#: gajim/common/config.py:212
+#: gajim/common/config.py:190
#, fuzzy
msgid ""
"If disabled, Gajim will no longer print status messages in chats when a "
@@ -3111,26 +3059,26 @@ msgstr ""
"如果为否, Gajim 将不会在联系人的状态或状态信息变化时在聊天窗口中显示一行提"
"示。"
-#: gajim/common/config.py:213
+#: gajim/common/config.py:191
#, fuzzy
msgid ""
"Default Setting: Show a status message for every join or leave in a group "
"chat."
msgstr "无法加入聊天室"
-#: gajim/common/config.py:214
+#: gajim/common/config.py:192
#, fuzzy
msgid ""
"Default Setting: Show a status message for all status changes (away, dnd, "
"etc.) of users in a group chat."
msgstr "无法加入聊天室"
-#: gajim/common/config.py:216
+#: gajim/common/config.py:194
#, fuzzy
msgid "Don't show contact list window in the system taskbar."
msgstr "不要将联系人列表窗口显示在系统的任务栏中。"
-#: gajim/common/config.py:217
+#: gajim/common/config.py:195
#, fuzzy
msgid ""
"If enabled, Gajim makes the window flash (the default behaviour in most "
@@ -3139,7 +3087,7 @@ msgstr ""
"如果为真并且安装的 GTK+ 和 PyGTK 的版本至少为 2.8, 当有未处理事件时使窗口闪烁"
"(大部分窗口管理器的默认响应)"
-#: gajim/common/config.py:221
+#: gajim/common/config.py:199
#, fuzzy
msgid ""
"Controls the window where new messages are placed.\n"
@@ -3159,7 +3107,7 @@ msgstr ""
"'peracct' - 每个账户的消息发送到一个单独的窗口。\n"
"'pertype' - 每种类型的消息 (例如, 聊天 及 聊天室) 发送到一个单独的窗口。"
-#: gajim/common/config.py:222
+#: gajim/common/config.py:200
msgid ""
"Show contact list window on startup.\n"
"'always' - Always show contact list window.\n"
@@ -3167,32 +3115,32 @@ msgid ""
"'last_state' - Restore last state of the contact list window."
msgstr ""
-#: gajim/common/config.py:223
+#: gajim/common/config.py:201
#, fuzzy
msgid "If enabled, Gajim displays the avatar in the chat window."
msgstr "如果为假, 您将不会在窗口中看到头像。"
-#: gajim/common/config.py:224
+#: gajim/common/config.py:202
#, fuzzy
msgid "If enabled, pressing Esc closes a tab/window."
msgstr "如果为真, 按 Escape 键将关闭标签/窗口。"
-#: gajim/common/config.py:225
+#: gajim/common/config.py:203
#, fuzzy
msgid "Hides the banner in a group chat window."
msgstr "在聊天室窗口中隐藏标语"
-#: gajim/common/config.py:226
+#: gajim/common/config.py:204
#, fuzzy
msgid "Hides the banner in a 1:1 chat window."
msgstr "在聊天室窗口中隐藏标语"
-#: gajim/common/config.py:227
+#: gajim/common/config.py:205
#, fuzzy
msgid "Hides the group chat participants list in a group chat window."
msgstr "在聊天室聊天窗口中隐藏成员列表。"
-#: gajim/common/config.py:228
+#: gajim/common/config.py:206
#, fuzzy
msgid ""
"In a chat, show the nickname at the beginning of a line only when it's not "
@@ -3200,32 +3148,32 @@ msgid ""
msgstr ""
"在聊天中, 只在当前一条消息不是由同一个人发出的的时候才在一行前显示昵称。"
-#: gajim/common/config.py:229
+#: gajim/common/config.py:207
msgid "Indentation when using merge consecutive nickname."
msgstr "当合并连续昵称时缩进。"
-#: gajim/common/config.py:230
+#: gajim/common/config.py:208
#, fuzzy
msgid ""
"Ctrl+Tab switches to the next composing tab when there are no tabs with "
"messages pending."
msgstr "当所有标签中没有未读消息时按 Ctrl-Tab 转到下一个正在编辑的标签。"
-#: gajim/common/config.py:231
+#: gajim/common/config.py:209
#, fuzzy
msgid ""
"Show a confirmation dialog to create metacontacts? Empty string means never "
"show the dialog."
msgstr "是否显示确认屏蔽联系人对话框?空字符串意味着从不显示对话框。"
-#: gajim/common/config.py:232
+#: gajim/common/config.py:210
#, fuzzy
msgid ""
"Show a confirmation dialog to block a contact? Empty string means never show "
"the dialog."
msgstr "是否显示确认屏蔽联系人对话框?空字符串意味着从不显示对话框。"
-#: gajim/common/config.py:233
+#: gajim/common/config.py:211
#, fuzzy
msgid ""
"If enabled, you will be able to set a negative priority to your account in "
@@ -3235,14 +3183,14 @@ msgstr ""
"如果为真, 您将可以在修改账户窗口中为您的账户可以设置一个负的优先级。注意!当您"
"使用负的优先级登入时您将不能从服务器收到任何消息。"
-#: gajim/common/config.py:234
+#: gajim/common/config.py:212
#, fuzzy
msgid ""
"If enabled, Gajim will show both the number of online and total contacts in "
"account rows as well as in group rows."
msgstr "如果为是, Gajim 会在账户和群组显示在线人数和总联系人数。"
-#: gajim/common/config.py:235
+#: gajim/common/config.py:213
#, fuzzy
msgid ""
"If enabled, Gajim will scroll and select the contact who sent you the last "
@@ -3250,21 +3198,17 @@ msgid ""
msgstr ""
"如果为真, 在聊天窗口没有打开时, Gajim 会滚动并选出最后给您发送消息的联系人。"
-#: gajim/common/config.py:236
+#: gajim/common/config.py:214
msgid "Time of inactivity needed before the change status window closes down."
msgstr "时间, 如果在此时间内没有活动, 将改变状态窗口关闭。"
-#: gajim/common/config.py:237
+#: gajim/common/config.py:215
msgid ""
"Maximum number of lines that are printed in conversations. Oldest lines are "
"cleared."
msgstr "在对话中最多显示的行数。最旧的那些行会被清除。"
-#: gajim/common/config.py:238
-msgid "Choose interval between 2 checks of idleness."
-msgstr "2次检查闲置之间的时间间隔。"
-
-#: gajim/common/config.py:239
+#: gajim/common/config.py:216
#, fuzzy
msgid ""
"Valid URI schemes. Only schemes in this list will be accepted as 'real' URI "
@@ -3273,27 +3217,27 @@ msgstr ""
"合法的 URI Scheme。只有这个列表中的 Scheme 会被接受为\"真正的\" URI。(mailto "
"和 xmpp 被分开处理)"
-#: gajim/common/config.py:240
+#: gajim/common/config.py:217
#, fuzzy
msgid ""
"If enabled, completion in group chats will be like a shell auto-completion."
msgstr "如果为是, 聊天室中会像命令符一样自动补全"
-#: gajim/common/config.py:244
+#: gajim/common/config.py:221
#, fuzzy
msgid "Optionally fix Jingle output video framerate. Example: 10/1 or 25/2."
msgstr "可选地修正 jingle 视频输出的帧速率。比如: 10/1 或 25/2"
-#: gajim/common/config.py:245
+#: gajim/common/config.py:222
#, fuzzy
msgid "Optionally resize Jingle output video. Example: 320x240."
msgstr "可选地缩放 jingle 视频输出尺寸。比如: 320x240"
-#: gajim/common/config.py:246
+#: gajim/common/config.py:223
msgid "If enabled, you will see your webcam's video stream as well."
msgstr ""
-#: gajim/common/config.py:249
+#: gajim/common/config.py:226
#, fuzzy
msgid ""
"If enabled, Gajim will try to use a STUN server when using Jingle. The one "
@@ -3302,145 +3246,145 @@ msgstr ""
"如果为真, Gajim 在使用 jingle 时会尝试使用 STUN 服务器。服务器可以由"
"\"stun_server\"选项给出, 或由 jabber 服务器给出。"
-#: gajim/common/config.py:250
+#: gajim/common/config.py:227
#, fuzzy
msgid "STUN server to use when using Jingle"
msgstr "在使用 jingle 时使用的 STUN 服务器"
-#: gajim/common/config.py:251
+#: gajim/common/config.py:228
#, fuzzy
msgid ""
"If enabled, Gajim will show affiliation of group chat participants by adding "
"a colored square to the status icon."
msgstr "如果为是, Gajim 会在聊天室的成员的状态图标上加上一个彩色方框以显示阶级"
-#: gajim/common/config.py:252
+#: gajim/common/config.py:229
msgid ""
"Proxy used for all outgoing connections if the account does not have a "
"specific proxy configured."
msgstr ""
-#: gajim/common/config.py:253
+#: gajim/common/config.py:230
msgid "If enabled, Gajim will ignore incoming attention requests ('wizz')."
msgstr ""
-#: gajim/common/config.py:254
+#: gajim/common/config.py:231
msgid ""
"If enabled, Gajim will reopen chat windows that were opened last time Gajim "
"was closed."
msgstr ""
-#: gajim/common/config.py:255
+#: gajim/common/config.py:232
#, fuzzy
msgid ""
"If enabled, Gajim will display an icon to show that sent messages have been "
"received by your contact."
msgstr "如果选中, Gajim 在您发送的消息被您的联系人接收后不会显示图标"
-#: gajim/common/config.py:256
-msgid "Show a mini avatar in chat window tabs and as the window's icon."
-msgstr ""
-
-#: gajim/common/config.py:257
+#: gajim/common/config.py:233
#, fuzzy
msgid ""
"If enabled, Gajim will use the System's Keyring to store account passwords."
msgstr "如果为真, Gajim 会使用 Gnome Keyring (如果可用) 存储账户的密码。"
-#: gajim/common/config.py:258
+#: gajim/common/config.py:234
msgid "If enabled, Gajim will execute XEP-0146 Commands."
msgstr ""
-#: gajim/common/config.py:259
+#: gajim/common/config.py:235
msgid "2: System, 1: Enabled, 0: Disabled"
msgstr ""
-#: gajim/common/config.py:260
+#: gajim/common/config.py:236
msgid "Options in days which can be chosen in the sync threshold menu"
msgstr ""
-#: gajim/common/config.py:261
+#: gajim/common/config.py:237
msgid ""
"Maximum history in days we request from a public group chat archive. 0: As "
"much as possible."
msgstr ""
-#: gajim/common/config.py:262
+#: gajim/common/config.py:238
msgid ""
"Maximum history in days we request from a private group chat archive. 0: As "
"much as possible."
msgstr ""
-#: gajim/common/config.py:263
+#: gajim/common/config.py:239
msgid ""
"If enabled, Gajim shows the group chat subject in the chat window when "
"joining."
msgstr ""
-#: gajim/common/config.py:264
+#: gajim/common/config.py:240
#, fuzzy
msgid ""
"If enabled, the contact row is colored according to the current chat state "
"of the contact."
msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
-#: gajim/common/config.py:265
+#: gajim/common/config.py:241
#, fuzzy
msgid ""
"If enabled, the tab is colored according to the current chat state of the "
"contact."
msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
-#: gajim/common/config.py:266
+#: gajim/common/config.py:242
#, fuzzy
msgid ""
"Shows a text in the banner that describes the current chat state of the "
"contact."
msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
-#: gajim/common/config.py:267
+#: gajim/common/config.py:243
#, fuzzy
msgid ""
"Chat state notifications that are sent to contacts. Possible values: all, "
"composing_only, disabled"
msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
-#: gajim/common/config.py:268
+#: gajim/common/config.py:244
#, fuzzy
msgid ""
"Chat state notifications that are sent to the group chat. Possible values: "
"'all', 'composing_only', 'disabled'"
msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
-#: gajim/common/config.py:271
+#: gajim/common/config.py:247
msgid "API Preferences. Possible values: 'http', 'iq'"
msgstr ""
-#: gajim/common/config.py:272
+#: gajim/common/config.py:248
msgid "Selecting text will copy it to the clipboard"
msgstr ""
-#: gajim/common/config.py:273
+#: gajim/common/config.py:249
msgid "If enabled, Gajim will execute commands (/show, /sh, /execute, /exec)."
msgstr ""
-#: gajim/common/config.py:274
+#: gajim/common/config.py:250
msgid "Width of group chat roster in pixel"
msgstr ""
-#: gajim/common/config.py:275
+#: gajim/common/config.py:251
#, fuzzy
msgid "Force Bookmark 2 usage"
msgstr "将本聊天室加入书签(_B)"
-#: gajim/common/config.py:291
+#: gajim/common/config.py:252
+msgid "Shows an info bar with helpful hints in the Start / Join Chat dialog"
+msgstr ""
+
+#: gajim/common/config.py:269
#, fuzzy
msgid ""
"Priority will change automatically according to your status. Priorities are "
"defined in 'autopriority_*' options."
msgstr "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
-#: gajim/common/config.py:298
+#: gajim/common/config.py:276
#, fuzzy
msgid ""
"Status to be used automatically when connecting. Can be 'online', 'chat', "
@@ -3450,59 +3394,59 @@ msgstr ""
"自动连接时使用的状态。可以是\"在线\", \"聊天\", \"离开\", \"离开很久了\", "
"\"请勿打扰\", \"隐身\"。注意: 仅当 restore_last_status 被禁用时这个选项其作用"
-#: gajim/common/config.py:299
+#: gajim/common/config.py:277
#, fuzzy
msgid "If enabled, the last status will be restored."
msgstr "如果启用, 则恢复上次使用的状态。"
-#: gajim/common/config.py:300
+#: gajim/common/config.py:278
#, fuzzy
msgid ""
"If enabled, contacts requesting authorization will be accepted automatically."
msgstr "如果为真, 联系人的认证请求将被自动接受。"
-#: gajim/common/config.py:301
+#: gajim/common/config.py:279
#, fuzzy
msgid ""
"If disabled, this account will be disabled and will not appear in the "
"contact list window."
msgstr "如果为假, 这个账户将被禁用且不会出现在联系人列表窗口中。"
-#: gajim/common/config.py:305
+#: gajim/common/config.py:283
#, fuzzy
msgid "Use an unencrypted connection to the server"
msgstr "尚未连接到服务器"
-#: gajim/common/config.py:306
+#: gajim/common/config.py:284
#, fuzzy
msgid ""
"Show a warning dialog before sending password on an plaintext connection. "
"Can be 'warn', or 'none'."
msgstr "在使用明文连接发送密码前显示一个警告对话框。"
-#: gajim/common/config.py:307
+#: gajim/common/config.py:285
msgid "List of SSL errors to ignore (space separated)."
msgstr ""
-#: gajim/common/config.py:311
+#: gajim/common/config.py:289
msgid "ConnectionType: START TLS, DIRECT TLS or PLAIN"
msgstr ""
-#: gajim/common/config.py:313
+#: gajim/common/config.py:291
msgid ""
"List of XMPP Addresses (space separated) for which you do not want to store "
"chat history. You can also add the name of an account to disable storing "
"chat history for this account."
msgstr ""
-#: gajim/common/config.py:315
+#: gajim/common/config.py:293
#, fuzzy
msgid ""
"How many seconds to wait for the answer of a ping alive packet before trying "
"to reconnect."
msgstr "在重新连接前等待 ping alive packet 的回应多少秒"
-#: gajim/common/config.py:319
+#: gajim/common/config.py:297
#, fuzzy
msgid ""
"If enabled, Gajim will use your IP and proxies defined in "
@@ -3511,33 +3455,33 @@ msgstr ""
"如果选中, Gajim 会使用您在 file_transfer_proxies 选项中定义的 IP 和代理进行文"
"件传输。"
-#: gajim/common/config.py:320
+#: gajim/common/config.py:298
msgid ""
"If enabled, Gajim will test file transfer proxies on startup to be sure they "
"work. Openfire's proxies are known to fail this test even if they work."
msgstr ""
-#: gajim/common/config.py:332
+#: gajim/common/config.py:310
#, fuzzy
msgid "If enabled, Gajim will answer to message receipt requests."
msgstr "如果选中, Gajim 在您发送的消息被您的联系人接收后不会显示图标"
-#: gajim/common/config.py:341
+#: gajim/common/config.py:319
#, fuzzy
msgid ""
"Allow Gajim to send information about the operating system you are running."
msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
-#: gajim/common/config.py:342
+#: gajim/common/config.py:320
msgid "Allow Gajim to send your local time."
msgstr "允许Gajim发送您的本地时间。"
-#: gajim/common/config.py:345
+#: gajim/common/config.py:323
#, fuzzy
msgid "Message that is sent to contacts you want to add."
msgstr "向您希望添加的联系人发送的消息"
-#: gajim/common/config.py:346
+#: gajim/common/config.py:324
#, fuzzy
msgid ""
"If enabled, Gajim will send your local IP so your contact can connect to "
@@ -3546,76 +3490,72 @@ msgstr ""
"如果选中, Gajim 会使用您在 file_transfer_proxies 选项中定义的 IP 和代理进行文"
"件传输。"
-#: gajim/common/config.py:347
+#: gajim/common/config.py:325
msgid ""
"List of XMPP Addresses (space separated) for which the chat window will be "
"re-opened on next startup."
msgstr ""
-#: gajim/common/config.py:349
-msgid "HTTP File Upload: Enable HTTPS Verification."
-msgstr ""
-
-#: gajim/common/config.py:350
+#: gajim/common/config.py:327
msgid ""
"Preferred file transfer mechanism for file drag&drop on a chat window. Can "
"be 'httpupload' (default) or 'jingle'."
msgstr ""
-#: gajim/common/config.py:351
+#: gajim/common/config.py:328
#, fuzzy
msgid "Allow certificate verification with POSH."
msgstr "%s 的SSL证书验证"
-#: gajim/common/config.py:379
+#: gajim/common/config.py:356
#, fuzzy
msgid ""
"Chat state notifications that are sent to contacts. Possible values: 'all', "
"'composing_only', 'disabled'"
msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
-#: gajim/common/config.py:382
+#: gajim/common/config.py:359
#, fuzzy
msgid "The currently active encryption for that contact."
msgstr "为这个账户启用 ESession 加密。"
-#: gajim/common/config.py:386
+#: gajim/common/config.py:363
msgid ""
"If enabled, a notification is created for every message in this group chat."
msgstr ""
-#: gajim/common/config.py:387
+#: gajim/common/config.py:364
#, fuzzy
msgid ""
"Show a status message for all status changes (away, dnd, etc.) of users in a "
"group chat."
msgstr "无法加入聊天室"
-#: gajim/common/config.py:388
+#: gajim/common/config.py:365
#, fuzzy
msgid "Show a status message for every join or leave in a group chat."
msgstr "无法加入聊天室"
-#: gajim/common/config.py:389
+#: gajim/common/config.py:366
msgid ""
"If enabled, the group chat is minimized into the contact list when joining "
"automatically."
msgstr ""
-#: gajim/common/config.py:390
+#: gajim/common/config.py:367
msgid ""
"If enabled, the group chat is minimized into the contact list when closing "
"it."
msgstr ""
-#: gajim/common/config.py:391
+#: gajim/common/config.py:368
#, fuzzy
msgid ""
"Chat state notifications that are sent to the group chat. Possible values: "
"'all', 'composing_only' or 'disabled'."
msgstr "发送聊天状态通知。可以是全部, 仅正在编辑, 禁用中的一个。"
-#: gajim/common/config.py:394
+#: gajim/common/config.py:371
#, fuzzy
msgid ""
"If enabled, plugins will be activated on startup (this is saved when exiting "
@@ -3625,84 +3565,84 @@ msgstr ""
"表述在退出时是否激活插件(在 Gajim 退出时这会被保存)。这个选项不应该用于激活或"
"禁用插件。使用图形界面代替。"
-#: gajim/common/config.py:399 gajim/common/const.py:347
+#: gajim/common/config.py:376 gajim/common/const.py:380
msgid "Sleeping"
msgstr "正在睡觉"
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
msgid "Back soon"
msgstr "马上回来"
-#: gajim/common/config.py:400
+#: gajim/common/config.py:377
msgid "Back in some minutes."
msgstr "几分钟就回来。"
-#: gajim/common/config.py:401 gajim/common/const.py:313
+#: gajim/common/config.py:378 gajim/common/const.py:346
msgid "Eating"
msgstr "吃东西"
-#: gajim/common/config.py:401
+#: gajim/common/config.py:378
#, fuzzy
msgid "I'm eating."
msgstr "我正在工作。"
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
msgid "Movie"
msgstr "电影"
-#: gajim/common/config.py:402
+#: gajim/common/config.py:379
msgid "I'm watching a movie."
msgstr "我正在看电影。"
-#: gajim/common/config.py:403 gajim/common/const.py:380
+#: gajim/common/config.py:380 gajim/common/const.py:413
msgid "Working"
msgstr "工作"
-#: gajim/common/config.py:403
+#: gajim/common/config.py:380
msgid "I'm working."
msgstr "我正在工作。"
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
msgid "Phone"
msgstr "打电话"
-#: gajim/common/config.py:404
+#: gajim/common/config.py:381
msgid "I'm on the phone."
msgstr "我正在打电话"
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
msgid "Out"
msgstr "外出"
-#: gajim/common/config.py:405
+#: gajim/common/config.py:382
msgid "I'm out enjoying life."
msgstr "我正在享受户外生活。"
-#: gajim/common/config.py:415
+#: gajim/common/config.py:392
msgid "I'm available."
msgstr "我现在在线。"
-#: gajim/common/config.py:416
+#: gajim/common/config.py:393
msgid "I'm free for chat."
msgstr "和我聊天吧"
-#: gajim/common/config.py:417
+#: gajim/common/config.py:394
msgid "Be right back."
msgstr "很快回来。"
-#: gajim/common/config.py:418
+#: gajim/common/config.py:395
msgid "I'm not available."
msgstr "我现在处于禁止状态。"
-#: gajim/common/config.py:419
+#: gajim/common/config.py:396
msgid "Do not disturb."
msgstr "请勿打扰。"
-#: gajim/common/config.py:420
+#: gajim/common/config.py:397
msgid "Bye!"
msgstr "再见!"
-#: gajim/common/config.py:431
+#: gajim/common/config.py:408
#, fuzzy
msgid ""
"Sound to play when a group chat message contains one of the words in "
@@ -3710,1061 +3650,1061 @@ msgid ""
msgstr ""
"当收到的聊天室的消息包含muc_highlight_words内的词或您的昵称时播放的声音。"
-#: gajim/common/config.py:432
+#: gajim/common/config.py:409
#, fuzzy
msgid "Sound to play when any group chat message arrives."
msgstr "收到任意MUC消息时播放的声音。"
-#: gajim/common/config.py:436
+#: gajim/common/config.py:413
#, fuzzy
msgid "Tor"
msgstr "To"
-#: gajim/common/optparser.py:52
+#: gajim/common/optparser.py:54
#, python-format
msgid "Error: cannot open %s for reading"
msgstr "错误: 无法按读打开文件 %s"
-#: gajim/common/const.py:247
+#: gajim/common/const.py:280
#, fuzzy
msgid "?Group chat name:Team"
msgstr "无"
-#: gajim/common/const.py:248
+#: gajim/common/const.py:281
msgid "?Group chat description:Project discussion"
msgstr ""
-#: gajim/common/const.py:249
+#: gajim/common/const.py:282
#, fuzzy
msgid "?Group chat address:team"
msgstr "聊天室支持"
-#: gajim/common/const.py:250
+#: gajim/common/const.py:283
#, fuzzy
msgid "?Group chat name:Family"
msgstr "聊天室突出显示:"
-#: gajim/common/const.py:251
+#: gajim/common/const.py:284
msgid "?Group chat description:Spring gathering"
msgstr ""
-#: gajim/common/const.py:252
+#: gajim/common/const.py:285
msgid "?Group chat address:family"
msgstr ""
-#: gajim/common/const.py:253
+#: gajim/common/const.py:286
#, fuzzy
msgid "?Group chat name:Vacation"
msgstr "聊天室邀请"
-#: gajim/common/const.py:254
+#: gajim/common/const.py:287
msgid "?Group chat description:Trip planning"
msgstr ""
-#: gajim/common/const.py:255
+#: gajim/common/const.py:288
#, fuzzy
msgid "?Group chat address:vacation"
msgstr "聊天室邀请"
-#: gajim/common/const.py:256
+#: gajim/common/const.py:289
#, fuzzy
msgid "?Group chat name:Repairs"
msgstr "多人聊天(_G)"
-#: gajim/common/const.py:257
+#: gajim/common/const.py:290
msgid "?Group chat description:Local help group"
msgstr ""
-#: gajim/common/const.py:258
+#: gajim/common/const.py:291
#, fuzzy
msgid "?Group chat address:repairs"
msgstr "聊天室支持"
-#: gajim/common/const.py:259
+#: gajim/common/const.py:292
#, fuzzy
msgid "?Group chat name:News"
msgstr "无"
-#: gajim/common/const.py:260
+#: gajim/common/const.py:293
#, fuzzy
msgid "?Group chat description:Local news and reports"
msgstr "聊天室创建是受限的。"
-#: gajim/common/const.py:261
+#: gajim/common/const.py:294
#, fuzzy
msgid "?Group chat address:news"
msgstr "新聊天室"
-#: gajim/common/const.py:266
+#: gajim/common/const.py:299
#, fuzzy
msgid "Remote server not found"
msgstr "找不到该服务"
-#: gajim/common/const.py:267
+#: gajim/common/const.py:300
msgid "Remote server timeout"
msgstr ""
-#: gajim/common/const.py:268 gajim/common/const.py:269
-#: gajim/common/const.py:270
+#: gajim/common/const.py:301 gajim/common/const.py:302
+#: gajim/common/const.py:303
#, fuzzy
msgid "Address does not belong to a group chat server"
msgstr "%s 不是一个聊天室服务器"
-#: gajim/common/const.py:271
+#: gajim/common/const.py:304
#, fuzzy
msgid "Group chat already exists"
msgstr "帐户本地已存在。"
-#: gajim/common/const.py:272
+#: gajim/common/const.py:305
#, fuzzy
msgid "Group chat does not exist"
msgstr "聊天室 <b>%s</b> 不存在。"
-#: gajim/common/const.py:273
+#: gajim/common/const.py:306
#, fuzzy
msgid "Group chat is closed"
msgstr "多人聊天历史"
-#: gajim/common/const.py:279
+#: gajim/common/const.py:312
msgid "This message was encrypted with OTR and could not be decrypted."
msgstr ""
-#: gajim/common/const.py:282
+#: gajim/common/const.py:315
msgid ""
"This message was encrypted with Legacy OpenPGP and could not be decrypted. "
"You can install the PGP plugin to handle those messages."
msgstr ""
-#: gajim/common/const.py:286
+#: gajim/common/const.py:319
msgid ""
"This message was encrypted with OpenPGP for XMPP and could not be decrypted. "
"You can install the OpenPGP plugin to handle those messages."
msgstr ""
-#: gajim/common/const.py:290
+#: gajim/common/const.py:323
#, python-format
msgid "This message was encrypted with %s and could not be decrypted."
msgstr ""
-#: gajim/common/const.py:297
+#: gajim/common/const.py:330
msgid "Doing Chores"
msgstr "做家务"
-#: gajim/common/const.py:298
+#: gajim/common/const.py:331
msgid "Buying Groceries"
msgstr "买杂货"
-#: gajim/common/const.py:299
+#: gajim/common/const.py:332
msgid "Cleaning"
msgstr "清洁"
-#: gajim/common/const.py:300
+#: gajim/common/const.py:333
msgid "Cooking"
msgstr "做饭"
-#: gajim/common/const.py:301
+#: gajim/common/const.py:334
msgid "Doing Maintenance"
msgstr "做保养"
-#: gajim/common/const.py:302
+#: gajim/common/const.py:335
msgid "Doing the Dishes"
msgstr "洗碗"
-#: gajim/common/const.py:303
+#: gajim/common/const.py:336
msgid "Doing the Laundry"
msgstr "洗衣服"
-#: gajim/common/const.py:304
+#: gajim/common/const.py:337
msgid "Gardening"
msgstr "园艺"
-#: gajim/common/const.py:305
+#: gajim/common/const.py:338
msgid "Running an Errand"
msgstr "奔波"
-#: gajim/common/const.py:306
+#: gajim/common/const.py:339
msgid "Walking the Dog"
msgstr "遛狗"
-#: gajim/common/const.py:308
+#: gajim/common/const.py:341
msgid "Drinking"
msgstr "喝酒"
-#: gajim/common/const.py:309
+#: gajim/common/const.py:342
msgid "Having a Beer"
msgstr "喝啤酒"
-#: gajim/common/const.py:310
+#: gajim/common/const.py:343
msgid "Having Coffee"
msgstr "喝咖啡"
-#: gajim/common/const.py:311
+#: gajim/common/const.py:344
msgid "Having Tea"
msgstr "喝茶"
-#: gajim/common/const.py:314
+#: gajim/common/const.py:347
msgid "Having a Snack"
msgstr "吃点心"
-#: gajim/common/const.py:315
+#: gajim/common/const.py:348
msgid "Having Breakfast"
msgstr "吃早餐"
-#: gajim/common/const.py:316
+#: gajim/common/const.py:349
msgid "Having Dinner"
msgstr "吃晚餐"
-#: gajim/common/const.py:317
+#: gajim/common/const.py:350
msgid "Having Lunch"
msgstr "吃午餐"
-#: gajim/common/const.py:319
+#: gajim/common/const.py:352
msgid "Exercising"
msgstr "锻炼"
-#: gajim/common/const.py:320 gajim/common/const.py:371
+#: gajim/common/const.py:353 gajim/common/const.py:404
msgid "Cycling"
msgstr "骑车"
-#: gajim/common/const.py:321
+#: gajim/common/const.py:354
msgid "Dancing"
msgstr "跳舞"
-#: gajim/common/const.py:322
+#: gajim/common/const.py:355
msgid "Hiking"
msgstr "步行"
-#: gajim/common/const.py:323
+#: gajim/common/const.py:356
msgid "Jogging"
msgstr "慢跑"
-#: gajim/common/const.py:324
+#: gajim/common/const.py:357
msgid "Playing Sports"
msgstr "运动"
-#: gajim/common/const.py:325
+#: gajim/common/const.py:358
msgid "Running"
msgstr "跑步"
-#: gajim/common/const.py:326
+#: gajim/common/const.py:359
msgid "Skiing"
msgstr "滑雪"
-#: gajim/common/const.py:327
+#: gajim/common/const.py:360
msgid "Swimming"
msgstr "游泳"
-#: gajim/common/const.py:328
+#: gajim/common/const.py:361
msgid "Working out"
msgstr "锻炼"
-#: gajim/common/const.py:330
+#: gajim/common/const.py:363
msgid "Grooming"
msgstr "打扮"
-#: gajim/common/const.py:331
+#: gajim/common/const.py:364
msgid "At the Spa"
msgstr "泡温泉"
-#: gajim/common/const.py:332
+#: gajim/common/const.py:365
msgid "Brushing Teeth"
msgstr "刷牙"
-#: gajim/common/const.py:333
+#: gajim/common/const.py:366
msgid "Getting a Haircut"
msgstr "剪头发"
-#: gajim/common/const.py:334
+#: gajim/common/const.py:367
msgid "Shaving"
msgstr "刮胡子"
-#: gajim/common/const.py:335
+#: gajim/common/const.py:368
msgid "Taking a Bath"
msgstr "洗澡"
-#: gajim/common/const.py:336
+#: gajim/common/const.py:369
msgid "Taking a Shower"
msgstr "洗澡"
-#: gajim/common/const.py:338
+#: gajim/common/const.py:371
msgid "Having an Appointment"
msgstr "赴约"
-#: gajim/common/const.py:340
+#: gajim/common/const.py:373
msgid "Inactive"
msgstr "未活动的"
-#: gajim/common/const.py:341
+#: gajim/common/const.py:374
msgid "Day Off"
msgstr "休息日"
-#: gajim/common/const.py:342
+#: gajim/common/const.py:375
msgid "Hanging out"
msgstr "溜达"
-#: gajim/common/const.py:343
+#: gajim/common/const.py:376
msgid "Hiding"
msgstr "藏起来"
-#: gajim/common/const.py:344
+#: gajim/common/const.py:377
msgid "On Vacation"
msgstr "渡假"
-#: gajim/common/const.py:345
+#: gajim/common/const.py:378
msgid "Praying"
msgstr "祈祷"
-#: gajim/common/const.py:346
+#: gajim/common/const.py:379
msgid "Scheduled Holiday"
msgstr "规划假期"
-#: gajim/common/const.py:348
+#: gajim/common/const.py:381
msgid "Thinking"
msgstr "思考"
-#: gajim/common/const.py:350
+#: gajim/common/const.py:383
msgid "Relaxing"
msgstr "放松"
-#: gajim/common/const.py:351
+#: gajim/common/const.py:384
msgid "Fishing"
msgstr "钓鱼"
-#: gajim/common/const.py:352
+#: gajim/common/const.py:385
msgid "Gaming"
msgstr "游戏"
-#: gajim/common/const.py:353
+#: gajim/common/const.py:386
msgid "Going out"
msgstr "外出"
-#: gajim/common/const.py:354
+#: gajim/common/const.py:387
msgid "Partying"
msgstr "聚会"
-#: gajim/common/const.py:355
+#: gajim/common/const.py:388
msgid "Reading"
msgstr "读书"
-#: gajim/common/const.py:356
+#: gajim/common/const.py:389
msgid "Rehearsing"
msgstr "排练"
-#: gajim/common/const.py:357
+#: gajim/common/const.py:390
msgid "Shopping"
msgstr "购物"
-#: gajim/common/const.py:358
+#: gajim/common/const.py:391
msgid "Smoking"
msgstr "抽烟"
-#: gajim/common/const.py:359
+#: gajim/common/const.py:392
msgid "Socializing"
msgstr "社交"
-#: gajim/common/const.py:360
+#: gajim/common/const.py:393
msgid "Sunbathing"
msgstr "日光浴"
-#: gajim/common/const.py:361
+#: gajim/common/const.py:394
msgid "Watching TV"
msgstr "看电视"
-#: gajim/common/const.py:362
+#: gajim/common/const.py:395
msgid "Watching a Movie"
msgstr "看电影"
-#: gajim/common/const.py:364
+#: gajim/common/const.py:397
msgid "Talking"
msgstr "谈话"
-#: gajim/common/const.py:365
+#: gajim/common/const.py:398
msgid "In Real Life"
msgstr "在现实世界中"
-#: gajim/common/const.py:366
+#: gajim/common/const.py:399
msgid "On the Phone"
msgstr "打电话"
-#: gajim/common/const.py:367
+#: gajim/common/const.py:400
msgid "On Video Phone"
msgstr "视频电话"
-#: gajim/common/const.py:369
+#: gajim/common/const.py:402
msgid "Traveling"
msgstr "旅行"
-#: gajim/common/const.py:370
+#: gajim/common/const.py:403
msgid "Commuting"
msgstr "上下班"
-#: gajim/common/const.py:372
+#: gajim/common/const.py:405
msgid "Driving"
msgstr "开车"
-#: gajim/common/const.py:373
+#: gajim/common/const.py:406
msgid "In a Car"
msgstr "坐车"
-#: gajim/common/const.py:374
+#: gajim/common/const.py:407
msgid "On a Bus"
msgstr "坐公交车"
-#: gajim/common/const.py:375
+#: gajim/common/const.py:408
msgid "On a Plane"
msgstr "坐飞机"
-#: gajim/common/const.py:376
+#: gajim/common/const.py:409
msgid "On a Train"
msgstr "坐火车"
-#: gajim/common/const.py:377
+#: gajim/common/const.py:410
msgid "On a Trip"
msgstr "旅途"
-#: gajim/common/const.py:378
+#: gajim/common/const.py:411
msgid "Walking"
msgstr "走路"
-#: gajim/common/const.py:381
+#: gajim/common/const.py:414
msgid "Coding"
msgstr "编写代码"
-#: gajim/common/const.py:382
+#: gajim/common/const.py:415
msgid "In a Meeting"
msgstr "开会"
-#: gajim/common/const.py:383
+#: gajim/common/const.py:416
msgid "Studying"
msgstr "学习"
-#: gajim/common/const.py:384
+#: gajim/common/const.py:417
msgid "Writing"
msgstr "写作"
-#: gajim/common/const.py:387
+#: gajim/common/const.py:420
msgid "Afraid"
msgstr "害怕"
-#: gajim/common/const.py:388
+#: gajim/common/const.py:421
msgid "Amazed"
msgstr "大为惊奇"
-#: gajim/common/const.py:389
+#: gajim/common/const.py:422
msgid "Amorous"
msgstr "含情脉脉"
-#: gajim/common/const.py:390
+#: gajim/common/const.py:423
msgid "Angry"
msgstr "生气"
-#: gajim/common/const.py:391
+#: gajim/common/const.py:424
msgid "Annoyed"
msgstr "恼怒"
-#: gajim/common/const.py:392
+#: gajim/common/const.py:425
msgid "Anxious"
msgstr "焦虑"
-#: gajim/common/const.py:393
+#: gajim/common/const.py:426
msgid "Aroused"
msgstr "激情澎湃"
-#: gajim/common/const.py:394
+#: gajim/common/const.py:427
msgid "Ashamed"
msgstr "羞愧"
-#: gajim/common/const.py:395
+#: gajim/common/const.py:428
msgid "Bored"
msgstr "厌倦"
-#: gajim/common/const.py:396
+#: gajim/common/const.py:429
msgid "Brave"
msgstr "勇敢"
-#: gajim/common/const.py:397
+#: gajim/common/const.py:430
msgid "Calm"
msgstr "冷静"
-#: gajim/common/const.py:398
+#: gajim/common/const.py:431
msgid "Cautious"
msgstr "谨慎"
-#: gajim/common/const.py:399
+#: gajim/common/const.py:432
msgid "Cold"
msgstr "冰冷"
-#: gajim/common/const.py:400
+#: gajim/common/const.py:433
msgid "Confident"
msgstr "自信"
-#: gajim/common/const.py:401
+#: gajim/common/const.py:434
msgid "Confused"
msgstr "困惑"
-#: gajim/common/const.py:402
+#: gajim/common/const.py:435
msgid "Contemplative"
msgstr "沉思, 冥想"
-#: gajim/common/const.py:403
+#: gajim/common/const.py:436
msgid "Contented"
msgstr "争辩"
-#: gajim/common/const.py:404
+#: gajim/common/const.py:437
msgid "Cranky"
msgstr "古怪"
-#: gajim/common/const.py:405
+#: gajim/common/const.py:438
msgid "Crazy"
msgstr "疯狂"
-#: gajim/common/const.py:406
+#: gajim/common/const.py:439
msgid "Creative"
msgstr "创造"
-#: gajim/common/const.py:407
+#: gajim/common/const.py:440
msgid "Curious"
msgstr "好奇"
-#: gajim/common/const.py:408
+#: gajim/common/const.py:441
msgid "Dejected"
msgstr "沮丧"
-#: gajim/common/const.py:409
+#: gajim/common/const.py:442
msgid "Depressed"
msgstr "消沉"
-#: gajim/common/const.py:410
+#: gajim/common/const.py:443
msgid "Disappointed"
msgstr "失望"
-#: gajim/common/const.py:411
+#: gajim/common/const.py:444
msgid "Disgusted"
msgstr "厌恶"
-#: gajim/common/const.py:412
+#: gajim/common/const.py:445
msgid "Dismayed"
msgstr "诧异"
-#: gajim/common/const.py:413
+#: gajim/common/const.py:446
msgid "Distracted"
msgstr "心烦意乱"
-#: gajim/common/const.py:414
+#: gajim/common/const.py:447
msgid "Embarrassed"
msgstr "尴尬"
-#: gajim/common/const.py:415
+#: gajim/common/const.py:448
msgid "Envious"
msgstr "羡慕"
-#: gajim/common/const.py:416
+#: gajim/common/const.py:449
msgid "Excited"
msgstr "兴奋"
-#: gajim/common/const.py:417
+#: gajim/common/const.py:450
msgid "Flirtatious"
msgstr "卖弄风情"
-#: gajim/common/const.py:418
+#: gajim/common/const.py:451
msgid "Frustrated"
msgstr "懊丧"
-#: gajim/common/const.py:419
+#: gajim/common/const.py:452
msgid "Grateful"
msgstr "感激"
-#: gajim/common/const.py:420
+#: gajim/common/const.py:453
msgid "Grieving"
msgstr "悲伤"
-#: gajim/common/const.py:421
+#: gajim/common/const.py:454
msgid "Grumpy"
msgstr "暴躁"
-#: gajim/common/const.py:422
+#: gajim/common/const.py:455
msgid "Guilty"
msgstr "内疚"
-#: gajim/common/const.py:423
+#: gajim/common/const.py:456
msgid "Happy"
msgstr "快乐"
-#: gajim/common/const.py:424
+#: gajim/common/const.py:457
msgid "Hopeful"
msgstr "满怀希望"
-#: gajim/common/const.py:425
+#: gajim/common/const.py:458
msgid "Hot"
msgstr "活跃"
-#: gajim/common/const.py:426
+#: gajim/common/const.py:459
msgid "Humbled"
msgstr "谦逊"
-#: gajim/common/const.py:427
+#: gajim/common/const.py:460
msgid "Humiliated"
msgstr "丢脸"
-#: gajim/common/const.py:428
+#: gajim/common/const.py:461
msgid "Hungry"
msgstr "饿"
-#: gajim/common/const.py:429
+#: gajim/common/const.py:462
msgid "Hurt"
msgstr "受伤"
-#: gajim/common/const.py:430
+#: gajim/common/const.py:463
msgid "Impressed"
msgstr "印象深刻"
-#: gajim/common/const.py:431
+#: gajim/common/const.py:464
msgid "In Awe"
msgstr "敬畏"
-#: gajim/common/const.py:432
+#: gajim/common/const.py:465
msgid "In Love"
msgstr "恋爱"
-#: gajim/common/const.py:433
+#: gajim/common/const.py:466
msgid "Indignant"
msgstr "愤慨"
-#: gajim/common/const.py:434
+#: gajim/common/const.py:467
msgid "Interested"
msgstr "感兴趣"
-#: gajim/common/const.py:435
+#: gajim/common/const.py:468
msgid "Intoxicated"
msgstr "麻醉"
-#: gajim/common/const.py:436
+#: gajim/common/const.py:469
msgid "Invincible"
msgstr "无敌的"
-#: gajim/common/const.py:437
+#: gajim/common/const.py:470
msgid "Jealous"
msgstr "吃醋"
-#: gajim/common/const.py:438
+#: gajim/common/const.py:471
msgid "Lonely"
msgstr "寂寞"
-#: gajim/common/const.py:439
+#: gajim/common/const.py:472
msgid "Lost"
msgstr "迷惘"
-#: gajim/common/const.py:440
+#: gajim/common/const.py:473
msgid "Lucky"
msgstr "幸运"
-#: gajim/common/const.py:441
+#: gajim/common/const.py:474
msgid "Mean"
msgstr "小气"
-#: gajim/common/const.py:442
+#: gajim/common/const.py:475
msgid "Moody"
msgstr "喜怒无常"
-#: gajim/common/const.py:443
+#: gajim/common/const.py:476
msgid "Nervous"
msgstr "紧张"
-#: gajim/common/const.py:444
+#: gajim/common/const.py:477
msgid "Neutral"
msgstr "中立"
-#: gajim/common/const.py:445
+#: gajim/common/const.py:478
msgid "Offended"
msgstr "生气"
-#: gajim/common/const.py:446
+#: gajim/common/const.py:479
msgid "Outraged"
msgstr "义愤填膺"
-#: gajim/common/const.py:447
+#: gajim/common/const.py:480
msgid "Playful"
msgstr "有趣"
-#: gajim/common/const.py:448
+#: gajim/common/const.py:481
msgid "Proud"
msgstr "骄傲"
-#: gajim/common/const.py:449
+#: gajim/common/const.py:482
msgid "Relaxed"
msgstr "放松"
-#: gajim/common/const.py:450
+#: gajim/common/const.py:483
msgid "Relieved"
msgstr "宽慰"
-#: gajim/common/const.py:451
+#: gajim/common/const.py:484
msgid "Remorseful"
msgstr "后悔"
-#: gajim/common/const.py:452
+#: gajim/common/const.py:485
msgid "Restless"
msgstr "坐立不安"
-#: gajim/common/const.py:453
+#: gajim/common/const.py:486
msgid "Sad"
msgstr "伤心"
-#: gajim/common/const.py:454
+#: gajim/common/const.py:487
msgid "Sarcastic"
msgstr "讽刺"
-#: gajim/common/const.py:455
+#: gajim/common/const.py:488
msgid "Satisfied"
msgstr "满意"
-#: gajim/common/const.py:456
+#: gajim/common/const.py:489
msgid "Serious"
msgstr "严肃"
-#: gajim/common/const.py:457
+#: gajim/common/const.py:490
msgid "Shocked"
msgstr "震惊"
-#: gajim/common/const.py:458
+#: gajim/common/const.py:491
msgid "Shy"
msgstr "害羞"
-#: gajim/common/const.py:459
+#: gajim/common/const.py:492
msgid "Sick"
msgstr "不舒服"
-#: gajim/common/const.py:460
+#: gajim/common/const.py:493
msgid "Sleepy"
msgstr "瞌睡"
-#: gajim/common/const.py:461
+#: gajim/common/const.py:494
msgid "Spontaneous"
msgstr "心血来潮"
-#: gajim/common/const.py:462
+#: gajim/common/const.py:495
msgid "Stressed"
msgstr "压力很大"
-#: gajim/common/const.py:463
+#: gajim/common/const.py:496
msgid "Strong"
msgstr "强壮"
-#: gajim/common/const.py:464
+#: gajim/common/const.py:497
msgid "Surprised"
msgstr "惊讶"
-#: gajim/common/const.py:465
+#: gajim/common/const.py:498
msgid "Thankful"
msgstr "感激"
-#: gajim/common/const.py:466
+#: gajim/common/const.py:499
msgid "Thirsty"
msgstr "渴"
-#: gajim/common/const.py:467
+#: gajim/common/const.py:500
msgid "Tired"
msgstr "累"
-#: gajim/common/const.py:468
+#: gajim/common/const.py:501
msgid "Undefined"
msgstr "未定义"
-#: gajim/common/const.py:469
+#: gajim/common/const.py:502
msgid "Weak"
msgstr "虚弱"
-#: gajim/common/const.py:470
+#: gajim/common/const.py:503
msgid "Worried"
msgstr "担忧"
-#: gajim/common/const.py:474
+#: gajim/common/const.py:507
msgid "accuracy"
msgstr ""
-#: gajim/common/const.py:475
+#: gajim/common/const.py:508
#, fuzzy
msgid "alt"
msgstr "默认"
-#: gajim/common/const.py:476
+#: gajim/common/const.py:509
msgid "area"
msgstr ""
-#: gajim/common/const.py:477
+#: gajim/common/const.py:510
#, fuzzy
msgid "bearing"
msgstr "海洋"
-#: gajim/common/const.py:478
+#: gajim/common/const.py:511
#, fuzzy
msgid "building"
msgstr "藏起来"
-#: gajim/common/const.py:479
+#: gajim/common/const.py:512
#, fuzzy
msgid "country"
msgstr "账号"
-#: gajim/common/const.py:480
+#: gajim/common/const.py:513
#, fuzzy
msgid "countrycode"
msgstr "账户"
-#: gajim/common/const.py:481
+#: gajim/common/const.py:514
msgid "datum"
msgstr ""
-#: gajim/common/const.py:482
+#: gajim/common/const.py:515
#, fuzzy
msgid "description"
msgstr "描述"
-#: gajim/common/const.py:483
+#: gajim/common/const.py:516
#, fuzzy
msgid "error"
msgstr "错误"
-#: gajim/common/const.py:484
+#: gajim/common/const.py:517
msgid "floor"
msgstr ""
-#: gajim/common/const.py:485
+#: gajim/common/const.py:518
msgid "lat"
msgstr ""
-#: gajim/common/const.py:486
+#: gajim/common/const.py:519
msgid "locality"
msgstr ""
-#: gajim/common/const.py:487
+#: gajim/common/const.py:520
#, fuzzy
msgid "lon"
msgstr "一"
-#: gajim/common/const.py:488
+#: gajim/common/const.py:521
msgid "postalcode"
msgstr ""
-#: gajim/common/const.py:489
+#: gajim/common/const.py:522
msgid "region"
msgstr ""
-#: gajim/common/const.py:490
+#: gajim/common/const.py:523
msgid "room"
msgstr "聊天室"
-#: gajim/common/const.py:491
+#: gajim/common/const.py:524
msgid "speed"
msgstr ""
-#: gajim/common/const.py:492
+#: gajim/common/const.py:525
#, fuzzy
msgid "street"
msgstr "stream"
-#: gajim/common/const.py:493
+#: gajim/common/const.py:526
msgid "text"
msgstr ""
-#: gajim/common/const.py:494
+#: gajim/common/const.py:527
msgid "timestamp"
msgstr ""
-#: gajim/common/const.py:495
+#: gajim/common/const.py:528
msgid "URI"
msgstr ""
-#: gajim/common/const.py:500
+#: gajim/common/const.py:533
msgid "Unable to get issuer certificate"
msgstr "无法获得发行者的证书"
-#: gajim/common/const.py:501
+#: gajim/common/const.py:534
msgid "Unable to get certificate CRL"
msgstr "无法获得证书吊销列表"
-#: gajim/common/const.py:502
+#: gajim/common/const.py:535
msgid "Unable to decrypt certificate's signature"
msgstr "无法解密证书签名"
-#: gajim/common/const.py:503
+#: gajim/common/const.py:536
msgid "Unable to decrypt CRL's signature"
msgstr "无法解密证书吊销列表的签名"
-#: gajim/common/const.py:504
+#: gajim/common/const.py:537
msgid "Unable to decode issuer public key"
msgstr "无法解码发行者的公钥"
-#: gajim/common/const.py:505
+#: gajim/common/const.py:538
msgid "Certificate signature failure"
msgstr "证书签名失败"
-#: gajim/common/const.py:506
+#: gajim/common/const.py:539
msgid "CRL signature failure"
msgstr "吊销证书列表签名失败"
-#: gajim/common/const.py:507
+#: gajim/common/const.py:540
msgid "Certificate is not yet valid"
msgstr "证书还未生效"
-#: gajim/common/const.py:508
+#: gajim/common/const.py:541
msgid "Certificate has expired"
msgstr "证书已过期"
-#: gajim/common/const.py:509
+#: gajim/common/const.py:542
msgid "CRL is not yet valid"
msgstr "证书吊销列表还未生效"
-#: gajim/common/const.py:510
+#: gajim/common/const.py:543
msgid "CRL has expired"
msgstr "证书吊销列表已过期"
-#: gajim/common/const.py:511
+#: gajim/common/const.py:544
msgid "Format error in certificate's notBefore field"
msgstr "格式错误, 在证书的'不早于'字段"
-#: gajim/common/const.py:512
+#: gajim/common/const.py:545
msgid "Format error in certificate's notAfter field"
msgstr "格式错误, 在证书的'不迟于'字段"
-#: gajim/common/const.py:513
+#: gajim/common/const.py:546
msgid "Format error in CRL's lastUpdate field"
msgstr "格式错误, 在证书吊销列表的'最后更新'字段"
-#: gajim/common/const.py:514
+#: gajim/common/const.py:547
msgid "Format error in CRL's nextUpdate field"
msgstr "格式错误, 在证书吊销列表的'下次更新'字段"
-#: gajim/common/const.py:515
+#: gajim/common/const.py:548
msgid "Out of memory"
msgstr "内存耗尽"
-#: gajim/common/const.py:516
+#: gajim/common/const.py:549
msgid "Self signed certificate"
msgstr "自签名的证书"
-#: gajim/common/const.py:517
+#: gajim/common/const.py:550
msgid "Self signed certificate in certificate chain"
msgstr "自签名的证书, 在证书链中"
-#: gajim/common/const.py:518
+#: gajim/common/const.py:551
msgid "Unable to get local issuer certificate"
msgstr "无法获得本地发行者证书"
-#: gajim/common/const.py:519
+#: gajim/common/const.py:552
msgid "Unable to verify the first certificate"
msgstr "无法验证第一个证书"
-#: gajim/common/const.py:520
+#: gajim/common/const.py:553
msgid "Certificate chain too long"
msgstr "证书链太长"
-#: gajim/common/const.py:521
+#: gajim/common/const.py:554
msgid "Certificate revoked"
msgstr "证书已被吊销"
-#: gajim/common/const.py:522
+#: gajim/common/const.py:555
msgid "Invalid CA certificate"
msgstr "无效的 CA 证书"
-#: gajim/common/const.py:523
+#: gajim/common/const.py:556
msgid "Path length constraint exceeded"
msgstr "超过了路径长度限制"
-#: gajim/common/const.py:524
+#: gajim/common/const.py:557
msgid "Unsupported certificate purpose"
msgstr "不支持的证书用途"
-#: gajim/common/const.py:525
+#: gajim/common/const.py:558
msgid "Certificate not trusted"
msgstr "不被信任的证书"
-#: gajim/common/const.py:526
+#: gajim/common/const.py:559
msgid "Certificate rejected"
msgstr "证书被拒绝"
-#: gajim/common/const.py:527
+#: gajim/common/const.py:560
msgid "Subject issuer mismatch"
msgstr "Subject 与 发行者 不匹配"
-#: gajim/common/const.py:528
+#: gajim/common/const.py:561
msgid "Authority and subject key identifier mismatch"
msgstr "Authority 与 subject key identifier 不匹配"
-#: gajim/common/const.py:529
+#: gajim/common/const.py:562
msgid "Authority and issuer serial number mismatch"
msgstr "Authority 与 发行者序列号 不匹配"
-#: gajim/common/const.py:530
+#: gajim/common/const.py:563
msgid "Key usage does not include certificate signing"
msgstr "密钥用途中不包含证书签名"
-#: gajim/common/const.py:531
+#: gajim/common/const.py:564
msgid "Application verification failure"
msgstr "应用程序验证失败"
-#: gajim/common/const.py:851
+#: gajim/common/const.py:884
msgid "The signing certificate authority is not known"
msgstr ""
-#: gajim/common/const.py:852
+#: gajim/common/const.py:885
#, fuzzy
msgid "The certificate has been revoked"
msgstr "证书已被吊销"
-#: gajim/common/const.py:853
+#: gajim/common/const.py:886
msgid "The certificate does not match the expected identity of the site"
msgstr ""
-#: gajim/common/const.py:854
+#: gajim/common/const.py:887
msgid "The certificate’s algorithm is insecure"
msgstr ""
-#: gajim/common/const.py:855
+#: gajim/common/const.py:888
msgid "The certificate’s activation time is in the future"
msgstr ""
-#: gajim/common/const.py:856
+#: gajim/common/const.py:889
#, fuzzy
msgid "Unknown validation error"
msgstr "未知的 SSL 错误: %d"
-#: gajim/common/const.py:857
+#: gajim/common/const.py:890
#, fuzzy
msgid "The certificate has expired"
msgstr "证书已过期"
-#: gajim/common/const.py:901
+#: gajim/common/const.py:934
#, fuzzy
msgid "Authentication aborted"
msgstr "授权被接受"
-#: gajim/common/const.py:902
+#: gajim/common/const.py:935
#, fuzzy
msgid "Account disabled"
msgstr "账户被禁用"
-#: gajim/common/const.py:903
+#: gajim/common/const.py:936
#, fuzzy
msgid "Credentials expired"
msgstr "证书已过期"
-#: gajim/common/const.py:904
+#: gajim/common/const.py:937
#, fuzzy
msgid "Encryption required"
msgstr "认证请求"
-#: gajim/common/const.py:908
+#: gajim/common/const.py:941
#, fuzzy
msgid "Authentication mechanism not supported"
msgstr "不支持扩展"
-#: gajim/common/const.py:909
+#: gajim/common/const.py:942
#, fuzzy
msgid "Authentication mechanism too weak"
msgstr "\"%s\"登录验证失败"
-#: gajim/common/const.py:911
+#: gajim/common/const.py:944
msgid "Authentication currently not possible"
msgstr ""
@@ -4826,12 +4766,12 @@ msgstr ""
msgid "macOS"
msgstr ""
-#: gajim/common/jingle_rtp.py:127
+#: gajim/common/jingle_rtp.py:128
#, python-format
msgid "%s configuration error"
msgstr "%s 设置错误"
-#: gajim/common/jingle_rtp.py:128
+#: gajim/common/jingle_rtp.py:129
#, fuzzy, python-format
msgid ""
"Couldn’t set up %(text)s. Check your configuration.\n"
@@ -4850,293 +4790,249 @@ msgstr ""
"错误: \n"
"%s"
-#: gajim/common/jingle_rtp.py:399
+#: gajim/common/jingle_rtp.py:400
msgid "audio input"
msgstr "音频输入"
-#: gajim/common/jingle_rtp.py:403
+#: gajim/common/jingle_rtp.py:404
msgid "audio output"
msgstr "音频输出"
-#: gajim/common/jingle_rtp.py:440
+#: gajim/common/jingle_rtp.py:441
msgid "video input"
msgstr "视频输入"
-#: gajim/common/helpers.py:226
-#, fuzzy
-msgid "Server must be between 1 and 1023 bytes"
-msgstr "服务器名必须在 1 到 1023 个字符之间"
-
-#: gajim/common/helpers.py:230
-msgid "Invalid character in hostname."
-msgstr "主机名中有无效的字符。"
-
-#: gajim/common/helpers.py:232
-msgid "Server address required."
-msgstr "服务器的地址是必须的。"
-
-#: gajim/common/helpers.py:236
-#, fuzzy
-msgid "Username must be between 1 and 1023 bytes"
-msgstr "用户名必须在 1 到 1023 个字符之间"
-
-#: gajim/common/helpers.py:240
-msgid "Invalid character in username."
-msgstr "在用户名中有无效的字符。"
-
-#: gajim/common/helpers.py:246
-#, fuzzy
-msgid "Resource must be between 1 and 1023 bytes"
-msgstr "资源必须在 1 到 1023 个字符之间"
-
-#: gajim/common/helpers.py:250
-msgid "Invalid character in resource."
-msgstr "资源中含有无效字符。"
-
-#: gajim/common/helpers.py:290
+#: gajim/common/helpers.py:181
msgid "_Busy"
msgstr "忙碌(_B)"
-#: gajim/common/helpers.py:292 gajim/gtk/tooltips.py:641
+#: gajim/common/helpers.py:183
msgid "Busy"
msgstr "忙碌"
-#: gajim/common/helpers.py:295
+#: gajim/common/helpers.py:186
msgid "_Not Available"
msgstr "禁止(_N)"
-#: gajim/common/helpers.py:297 gajim/gtk/tooltips.py:643
+#: gajim/common/helpers.py:188
msgid "Not Available"
msgstr "禁止"
-#: gajim/common/helpers.py:300
+#: gajim/common/helpers.py:191
msgid "_Free for Chat"
msgstr "和我聊天吧(_F)"
-#: gajim/common/helpers.py:302 gajim/gtk/tooltips.py:637
+#: gajim/common/helpers.py:193
msgid "Free for Chat"
msgstr "和我聊天吧"
-#: gajim/common/helpers.py:305
+#: gajim/common/helpers.py:196
msgid "?user status:_Available"
msgstr "在线(_A)"
-#: gajim/common/helpers.py:307 gajim/gtk/tooltips.py:635
+#: gajim/common/helpers.py:198
msgid "?user status:Available"
msgstr "在线"
-#: gajim/common/helpers.py:309
+#: gajim/common/helpers.py:200
msgid "Connecting"
msgstr "正在连接"
-#: gajim/common/helpers.py:312 gajim/data/gui/preferences_window.ui:1306
+#: gajim/common/helpers.py:203 gajim/data/gui/preferences_window.ui:1304
msgid "A_way"
msgstr "离开(_A)"
-#: gajim/common/helpers.py:314 gajim/common/modules/adhoc_commands.py:121
+#: gajim/common/helpers.py:205 gajim/common/modules/adhoc_commands.py:122
#: gajim/command_system/implementation/standard.py:148
-#: gajim/gtk/tooltips.py:639
msgid "Away"
msgstr "离开"
-#: gajim/common/helpers.py:317
+#: gajim/common/helpers.py:208
msgid "_Offline"
msgstr "离线(_O)"
-#: gajim/common/helpers.py:319 gajim/gtk/tooltips.py:645
+#: gajim/common/helpers.py:210
msgid "Offline"
msgstr "离线"
-#: gajim/common/helpers.py:323
+#: gajim/common/helpers.py:214
msgid "?contact has status:Unknown"
msgstr "未知"
-#: gajim/common/helpers.py:325
+#: gajim/common/helpers.py:216
msgid "?contact has status:Has errors"
msgstr "有错误"
-#: gajim/common/helpers.py:340
+#: gajim/common/helpers.py:221
msgid "?Subscription we already have:None"
msgstr "无"
-#: gajim/common/helpers.py:342
+#: gajim/common/helpers.py:223
msgid "To"
msgstr "To"
-#: gajim/common/helpers.py:344 gajim/data/gui/groups_post_window.ui:33
+#: gajim/common/helpers.py:225 gajim/data/gui/groups_post_window.ui:33
msgid "From"
msgstr "From"
-#: gajim/common/helpers.py:346
+#: gajim/common/helpers.py:227
msgid "Both"
msgstr "Both"
-#: gajim/common/helpers.py:348 gajim/gtk/server_info.py:233
+#: gajim/common/helpers.py:229 gajim/gtk/server_info.py:224
#, fuzzy
msgid "Unknown"
msgstr "未知"
-#: gajim/common/helpers.py:354
+#: gajim/common/helpers.py:235
msgid "?Ask (for Subscription):None"
msgstr "无"
-#: gajim/common/helpers.py:356
+#: gajim/common/helpers.py:237
msgid "Subscribe"
msgstr "认证"
-#: gajim/common/helpers.py:368
+#: gajim/common/helpers.py:249
msgid "?Group Chat Contact Role:None"
msgstr "无"
-#: gajim/common/helpers.py:371
+#: gajim/common/helpers.py:252
msgid "Moderators"
msgstr "主持人"
-#: gajim/common/helpers.py:373
+#: gajim/common/helpers.py:254
msgid "Moderator"
msgstr "主持人"
-#: gajim/common/helpers.py:376 gajim/data/gui/groupchat_info_scrolled.ui:213
+#: gajim/common/helpers.py:257 gajim/data/gui/groupchat_info_scrolled.ui:213
msgid "Participants"
msgstr "参与者"
-#: gajim/common/helpers.py:378
+#: gajim/common/helpers.py:259
msgid "Participant"
msgstr "参与者"
-#: gajim/common/helpers.py:381
+#: gajim/common/helpers.py:262
msgid "Visitors"
msgstr "访客"
-#: gajim/common/helpers.py:383
+#: gajim/common/helpers.py:264
msgid "Visitor"
msgstr "访客"
-#: gajim/common/helpers.py:392 gajim/gtk/tooltips.py:249
+#: gajim/common/helpers.py:273
msgid "?Group Chat Contact Affiliation:None"
msgstr "?聊天室联系人阶级:None"
-#: gajim/common/helpers.py:395
+#: gajim/common/helpers.py:276
#, fuzzy
msgid "Owners"
msgstr "所有者"
-#: gajim/common/helpers.py:397 gajim/data/gui/groupchat_config.ui:32
-#: gajim/gtk/tooltips.py:255
+#: gajim/common/helpers.py:278 gajim/data/gui/groupchat_config.ui:32
msgid "Owner"
msgstr "所有者"
-#: gajim/common/helpers.py:400
+#: gajim/common/helpers.py:281
#, fuzzy
msgid "Administrators"
msgstr "管理员"
-#: gajim/common/helpers.py:402 gajim/gtk/tooltips.py:253
+#: gajim/common/helpers.py:283
msgid "Administrator"
msgstr "管理员"
-#: gajim/common/helpers.py:405
+#: gajim/common/helpers.py:286
#, fuzzy
msgid "Members"
msgstr "成员"
-#: gajim/common/helpers.py:407 gajim/data/gui/groupchat_config.ui:40
-#: gajim/gtk/tooltips.py:251 gajim/gtk/groupchat_config.py:105
+#: gajim/common/helpers.py:288 gajim/data/gui/groupchat_config.ui:40
+#: gajim/gtk/groupchat_config.py:105
msgid "Member"
msgstr "成员"
-#: gajim/common/helpers.py:444
+#: gajim/common/helpers.py:325
msgid "is paying attention to the conversation"
msgstr "注意着与您的对话"
-#: gajim/common/helpers.py:446
+#: gajim/common/helpers.py:327
msgid "is doing something else"
msgstr "在做其他事情"
-#: gajim/common/helpers.py:448
+#: gajim/common/helpers.py:329
#, fuzzy
msgid "is composing a message…"
msgstr "正在输入消息..."
-#: gajim/common/helpers.py:451
+#: gajim/common/helpers.py:332
msgid "paused composing a message"
msgstr "暂停输入消息"
-#: gajim/common/helpers.py:453
+#: gajim/common/helpers.py:334
msgid "has closed the chat window or tab"
msgstr "关闭了聊天窗口或标签"
-#: gajim/common/helpers.py:915 gajim/common/helpers.py:922
+#: gajim/common/helpers.py:732 gajim/common/helpers.py:740
#, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
msgstr[0] "%d 条消息未处理"
-#: gajim/common/helpers.py:929
+#: gajim/common/helpers.py:749
#, fuzzy, python-format
msgid "from group chat %s"
msgstr "在聊天室中(_G)"
-#: gajim/common/helpers.py:932 gajim/common/helpers.py:949
+#: gajim/common/helpers.py:752 gajim/common/helpers.py:773
#, python-format
msgid "from user %s"
msgstr "来自用户 %s"
-#: gajim/common/helpers.py:934
+#: gajim/common/helpers.py:754
#, python-format
msgid "from %s"
msgstr "来自 %s"
-#: gajim/common/helpers.py:941 gajim/common/helpers.py:947
+#: gajim/common/helpers.py:760 gajim/common/helpers.py:768
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
msgstr[0] "%d 个未处理事件"
-#: gajim/common/helpers.py:965 gajim/common/helpers.py:977
-#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
-#: data/org.gajim.Gajim.appdata.xml.in:10
-msgid "Gajim"
-msgstr "Gajim"
-
-#: gajim/common/helpers.py:979
-#, python-format
-msgid "Gajim - %s"
-msgstr "Gajim - %s"
-
-#: gajim/common/helpers.py:1087 gajim/data/gui/add_new_contact_window.ui:25
+#: gajim/common/helpers.py:849 gajim/data/gui/add_new_contact_window.ui:25
msgid "I would like to add you to my contact list."
msgstr "我想添加您到我的联系人列表"
-#: gajim/common/helpers.py:1089
+#: gajim/common/helpers.py:851
msgid "Hello, I am $name."
msgstr "您好, 我是$name"
-#: gajim/common/helpers.py:1179 gajim/common/helpers.py:1188
-#: gajim/common/helpers.py:1246
+#: gajim/common/helpers.py:929 gajim/common/helpers.py:938
+#: gajim/common/helpers.py:998
msgid "Timeout loading image"
msgstr "读取文件超时"
-#: gajim/common/helpers.py:1198 gajim/common/helpers.py:1244
+#: gajim/common/helpers.py:948 gajim/common/helpers.py:996
msgid "Image is too big"
msgstr "图片太大"
-#: gajim/common/helpers.py:1209
+#: gajim/common/helpers.py:959
#, fuzzy
msgid "PyCURL is not installed"
msgstr "证书吊销列表还未生效"
-#: gajim/common/helpers.py:1248
+#: gajim/common/helpers.py:1000
#, fuzzy
msgid "Error loading image"
msgstr "读取文件超时"
-#: gajim/common/configpaths.py:85
+#: gajim/common/configpaths.py:87
#, python-format
msgid "%s is a file but it should be a directory"
msgstr "%s 是一个文件但它应该是一个目录"
-#: gajim/common/configpaths.py:86
+#: gajim/common/configpaths.py:88
msgid "Gajim will now exit"
msgstr "Gajim 即将退出"
@@ -5236,83 +5132,83 @@ msgstr ""
msgid "Disconnect from the network"
msgstr ""
-#: gajim/common/modules/presence.py:267
+#: gajim/common/modules/presence.py:264
msgid "I would like to add you to my roster."
msgstr "我想将您添加到我的联系人列表。"
-#: gajim/common/modules/httpupload.py:98
+#: gajim/common/modules/httpupload.py:99
msgid "File is empty"
msgstr "文件为空"
-#: gajim/common/modules/httpupload.py:101
+#: gajim/common/modules/httpupload.py:102
msgid "File does not exist"
msgstr "文件不存在"
-#: gajim/common/modules/httpupload.py:108
-#: gajim/common/modules/httpupload.py:172
+#: gajim/common/modules/httpupload.py:109
+#: gajim/common/modules/httpupload.py:173
#, python-format
msgid "File is too large, maximum allowed file size is: %s"
msgstr ""
-#: gajim/common/modules/httpupload.py:293
+#: gajim/common/modules/httpupload.py:292
#, fuzzy
msgid "Encrypting file…"
msgstr "E2E 加密被禁用"
-#: gajim/common/modules/httpupload.py:294
+#: gajim/common/modules/httpupload.py:293
msgid "Requesting HTTP File Upload Slot…"
msgstr ""
-#: gajim/common/modules/httpupload.py:295
+#: gajim/common/modules/httpupload.py:294
msgid "Uploading via HTTP File Upload…"
msgstr ""
-#: gajim/common/modules/adhoc_commands.py:87
+#: gajim/common/modules/adhoc_commands.py:88
msgid "Change status information"
msgstr "改变状态信息"
-#: gajim/common/modules/adhoc_commands.py:111
+#: gajim/common/modules/adhoc_commands.py:112
msgid "Change status"
msgstr "改变状态"
-#: gajim/common/modules/adhoc_commands.py:112
+#: gajim/common/modules/adhoc_commands.py:113
msgid "Set the presence type and description"
msgstr "设置状态类型与描述"
-#: gajim/common/modules/adhoc_commands.py:119
+#: gajim/common/modules/adhoc_commands.py:120
msgid "Free for chat"
msgstr "和我聊天吧"
-#: gajim/common/modules/adhoc_commands.py:120
+#: gajim/common/modules/adhoc_commands.py:121
msgid "Online"
msgstr "在线"
-#: gajim/common/modules/adhoc_commands.py:122
+#: gajim/common/modules/adhoc_commands.py:123
msgid "Extended away"
msgstr "离开很久了"
-#: gajim/common/modules/adhoc_commands.py:123
+#: gajim/common/modules/adhoc_commands.py:124
msgid "Do not disturb"
msgstr "请无打扰"
-#: gajim/common/modules/adhoc_commands.py:124
+#: gajim/common/modules/adhoc_commands.py:125
msgid "Offline - disconnect"
msgstr "离线 - 未连接"
-#: gajim/common/modules/adhoc_commands.py:130
+#: gajim/common/modules/adhoc_commands.py:131
msgid "Presence description:"
msgstr "状态描述: "
-#: gajim/common/modules/adhoc_commands.py:169
+#: gajim/common/modules/adhoc_commands.py:170
msgid "The status has been changed."
msgstr "状态发生了变化。"
-#: gajim/common/modules/roster_item_exchange.py:102
+#: gajim/common/modules/roster_item_exchange.py:103
#, fuzzy, python-format
msgid "Sent contact: \"%(jid)s\" (%(name)s)"
msgstr "已发送联系人: \"%s\" (%s)"
-#: gajim/common/modules/roster_item_exchange.py:106
+#: gajim/common/modules/roster_item_exchange.py:107
msgid "Sent contacts:"
msgstr "已发送联系人: "
@@ -5335,7 +5231,7 @@ msgid "Join Automatically"
msgstr ""
#: gajim/data/gui/join_groupchat_window.ui:131
-#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:281
+#: gajim/data/gui/profile_window.ui:233 gajim/gtk/xml_console.py:282
msgid "Account"
msgstr "账号"
@@ -5346,7 +5242,7 @@ msgstr "聊天室"
#: gajim/data/gui/join_groupchat_window.ui:180
#: gajim/data/gui/account_wizard.ui:255 gajim/data/gui/bookmarks.ui:158
-#: gajim/gtk/accounts.py:812
+#: gajim/gtk/accounts.py:831
#, fuzzy
msgid "Password"
msgstr "密码: "
@@ -5370,7 +5266,7 @@ msgstr "在聊天室中(_G)"
msgid "Search group chats on selected server"
msgstr ""
-#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1270
+#: gajim/data/gui/join_groupchat_window.ui:437 gajim/gtk/discovery.py:1271
#, fuzzy
msgid "Join"
msgstr "加入(_J)"
@@ -5388,17 +5284,17 @@ msgid "Time remaining"
msgstr ""
#: gajim/data/gui/filetransfer_progress.ui:172
-#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:555
-#: gajim/data/gui/groupchat_control.ui:647
-#: gajim/data/gui/groupchat_control.ui:759
-#: gajim/data/gui/groupchat_control.ui:851
-#: gajim/data/gui/groupchat_control.ui:1252
-#: gajim/data/gui/groupchat_control.ui:1378
-#: gajim/data/gui/groupchat_control.ui:1504
-#: gajim/data/gui/groupchat_control.ui:1675
-#: gajim/data/gui/groupchat_control.ui:1753
+#: gajim/data/gui/filetransfers.ui:30 gajim/data/gui/groupchat_control.ui:600
+#: gajim/data/gui/groupchat_control.ui:692
+#: gajim/data/gui/groupchat_control.ui:804
+#: gajim/data/gui/groupchat_control.ui:896
+#: gajim/data/gui/groupchat_control.ui:1297
+#: gajim/data/gui/groupchat_control.ui:1423
+#: gajim/data/gui/groupchat_control.ui:1549
+#: gajim/data/gui/groupchat_control.ui:1720
+#: gajim/data/gui/groupchat_control.ui:1798
#: gajim/data/gui/passphrase_dialog.ui:29 gajim/gtk/dialogs.py:53
-#: gajim/gtk/filechoosers.py:178
+#: gajim/gtk/filechoosers.py:179
msgid "_Cancel"
msgstr "取消(_C)"
@@ -5544,7 +5440,7 @@ msgstr "联系人信息"
#: gajim/data/gui/filetransfers_send_file_dialog.ui:15
#: gajim/data/gui/advanced_configuration.ui:143
-#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1663
+#: gajim/data/gui/groupchat_info_scrolled.ui:33 gajim/gtk/discovery.py:1664
msgid "Description"
msgstr "描述"
@@ -5742,40 +5638,45 @@ msgstr "工作"
#. "About" is the text of a tab of vcard window
#: gajim/data/gui/profile_window.ui:1297
#: gajim/data/gui/vcard_information_window.ui:1484
-#: gajim/data/gui/application_menu.ui:93
msgid "About"
msgstr "关于"
-#: gajim/data/gui/start_chat_dialog.ui:53
+#: gajim/data/gui/start_chat_dialog.ui:66
+msgid ""
+"Start a new chat, join a group chat or search for new group chats globally. "
+"You can also enter an XMPP address."
+msgstr ""
+
+#: gajim/data/gui/start_chat_dialog.ui:125
#, fuzzy
msgid "Global Group Chat Search"
msgstr "加入聊天室"
-#: gajim/data/gui/start_chat_dialog.ui:189
-#: gajim/data/gui/start_chat_dialog.ui:229
-#: gajim/data/gui/start_chat_dialog.ui:364
+#: gajim/data/gui/start_chat_dialog.ui:268
+#: gajim/data/gui/start_chat_dialog.ui:308
+#: gajim/data/gui/start_chat_dialog.ui:443
#, fuzzy
msgid "_Back"
msgstr "马上回来"
-#: gajim/data/gui/start_chat_dialog.ui:245
-#: gajim/data/gui/groupchat_control.ui:776
-#: gajim/data/gui/groupchat_control.ui:868 gajim/gtk/discovery.py:1701
+#: gajim/data/gui/start_chat_dialog.ui:324
+#: gajim/data/gui/groupchat_control.ui:821
+#: gajim/data/gui/groupchat_control.ui:913 gajim/gtk/discovery.py:1702
#: gajim/gtk/groupchat_join.py:65
msgid "_Join"
msgstr "加入(_J)"
-#: gajim/data/gui/start_chat_dialog.ui:289
+#: gajim/data/gui/start_chat_dialog.ui:368
#, fuzzy
msgid "Select Account"
msgstr "移除账户 %s"
-#: gajim/data/gui/start_chat_dialog.ui:380
+#: gajim/data/gui/start_chat_dialog.ui:459
#, fuzzy
msgid "_Select"
msgstr "清洁"
-#: gajim/data/gui/start_chat_dialog.ui:442
+#: gajim/data/gui/start_chat_dialog.ui:521
msgid ""
"No contacts found\n"
"You can also type an XMPP address"
@@ -5845,6 +5746,7 @@ msgid "Strike"
msgstr "划去"
#: gajim/data/gui/groupchat_control.ui:54 gajim/data/gui/chat_control.ui:318
+#: gajim/gtk/accounts.py:610
msgid "Color"
msgstr "Color"
@@ -5857,136 +5759,133 @@ msgstr "字体"
msgid "Clear formatting"
msgstr "清楚格式"
-#: gajim/data/gui/groupchat_control.ui:291 gajim/data/gui/chat_control.ui:876
+#: gajim/data/gui/groupchat_control.ui:336 gajim/data/gui/chat_control.ui:889
#, fuzzy
msgid "Choose encryption"
msgstr "选择客户端证书"
-#: gajim/data/gui/groupchat_control.ui:337 gajim/data/gui/chat_control.ui:635
+#: gajim/data/gui/groupchat_control.ui:382 gajim/data/gui/chat_control.ui:648
#, fuzzy
msgid "Show a list of emojis (Alt+M)"
msgstr "显示表情列表(Alt+M)"
-#: gajim/data/gui/groupchat_control.ui:464
+#: gajim/data/gui/groupchat_control.ui:509
#, fuzzy
msgid "Joining…"
msgstr "封禁..."
-#: gajim/data/gui/groupchat_control.ui:522
+#: gajim/data/gui/groupchat_control.ui:567
#, fuzzy
msgid "Enter new nickname"
msgstr "为联系人 %s 输入新的昵称"
-#: gajim/data/gui/groupchat_control.ui:572
-#: gajim/data/gui/groupchat_control.ui:664
+#: gajim/data/gui/groupchat_control.ui:617
+#: gajim/data/gui/groupchat_control.ui:709
#, fuzzy
msgid "Ch_ange"
msgstr "更改昵称(_N)"
-#: gajim/data/gui/groupchat_control.ui:741
+#: gajim/data/gui/groupchat_control.ui:674
+#, fuzzy
+msgid "Change Subject"
+msgstr "更改主题(_S)"
+
+#: gajim/data/gui/groupchat_control.ui:786
#, fuzzy
msgid "Enter password"
msgstr "输入新密码"
-#: gajim/data/gui/groupchat_control.ui:958
+#: gajim/data/gui/groupchat_control.ui:1003
#, fuzzy
msgid "_Leave Group Chat"
msgstr "离开聊天室"
-#: gajim/data/gui/groupchat_control.ui:962
+#: gajim/data/gui/groupchat_control.ui:1007
#, fuzzy
msgid "Gajim will not try to join this group chat again"
msgstr "如果选定, Gajim 会在启动时加入此聊天室"
-#: gajim/data/gui/groupchat_control.ui:1018
+#: gajim/data/gui/groupchat_control.ui:1063
#, fuzzy
-msgid "An error occured"
+msgid "An error occurred"
msgstr "<b>发生了一个错误: </b>"
-#: gajim/data/gui/groupchat_control.ui:1083
+#: gajim/data/gui/groupchat_control.ui:1128
#, fuzzy
msgid "_Try again"
msgstr "重新验证"
-#: gajim/data/gui/groupchat_control.ui:1231
+#: gajim/data/gui/groupchat_control.ui:1276
#, fuzzy
msgid "Kick participant"
msgstr "参与者"
-#: gajim/data/gui/groupchat_control.ui:1269
+#: gajim/data/gui/groupchat_control.ui:1314
msgid "_Kick"
msgstr "踢除(_K)"
-#: gajim/data/gui/groupchat_control.ui:1302
-#: gajim/data/gui/groupchat_control.ui:1428
-#: gajim/data/gui/groupchat_control.ui:1554
-#: gajim/data/gui/groupchat_control.ui:1571
-#: gajim/data/gui/groupchat_control.ui:1660
-#: gajim/data/gui/groupchat_control.ui:1661
+#: gajim/data/gui/groupchat_control.ui:1347
+#: gajim/data/gui/groupchat_control.ui:1473
+#: gajim/data/gui/groupchat_control.ui:1599
+#: gajim/data/gui/groupchat_control.ui:1616
+#: gajim/data/gui/groupchat_control.ui:1705
+#: gajim/data/gui/groupchat_control.ui:1706
msgid "Insert Emoji"
msgstr ""
-#: gajim/data/gui/groupchat_control.ui:1315
-#: gajim/data/gui/groupchat_control.ui:1441
+#: gajim/data/gui/groupchat_control.ui:1360
+#: gajim/data/gui/groupchat_control.ui:1486
#, fuzzy
msgid "Reason (optional)"
msgstr "您也可以输入一个可选的替代地点: "
-#: gajim/data/gui/groupchat_control.ui:1357
+#: gajim/data/gui/groupchat_control.ui:1402
#, fuzzy
msgid "Ban participant"
msgstr "参与者"
-#: gajim/data/gui/groupchat_control.ui:1395
+#: gajim/data/gui/groupchat_control.ui:1440
msgid "_Ban"
msgstr "封禁(_B)"
-#: gajim/data/gui/groupchat_control.ui:1483
+#: gajim/data/gui/groupchat_control.ui:1528
#, fuzzy
msgid "Destroy group chat"
msgstr "新聊天室"
-#: gajim/data/gui/groupchat_control.ui:1521
+#: gajim/data/gui/groupchat_control.ui:1566
#, fuzzy
msgid "_Destroy"
msgstr "正在销毁 %s"
-#: gajim/data/gui/groupchat_control.ui:1555
+#: gajim/data/gui/groupchat_control.ui:1600
#, fuzzy
msgid "Alternate venue (optional)..."
msgstr "您也可以输入一个可选的替代地点: "
-#: gajim/data/gui/groupchat_control.ui:1572
+#: gajim/data/gui/groupchat_control.ui:1617
#, fuzzy
msgid "Reason (optional)..."
msgstr "原因"
-#: gajim/data/gui/groupchat_control.ui:1585
+#: gajim/data/gui/groupchat_control.ui:1630
msgid "Reason for destruction"
msgstr ""
-#: gajim/data/gui/groupchat_control.ui:1600
+#: gajim/data/gui/groupchat_control.ui:1645
msgid "Where participants should go"
msgstr ""
-#: gajim/data/gui/groupchat_control.ui:1641
+#: gajim/data/gui/groupchat_control.ui:1686
#, fuzzy
msgid "Enter a new name for this group chat"
msgstr "为群组 %s 输入新的名称"
-#: gajim/data/gui/groupchat_control.ui:1768
+#: gajim/data/gui/groupchat_control.ui:1813
#, fuzzy
msgid "_Invite"
msgstr "邀请(_V)"
-#: gajim/data/gui/popup_notification_window.ui:42
-msgid "Event Type"
-msgstr "事件类型"
-
-#: gajim/data/gui/popup_notification_window.ui:88
-msgid "Event desc"
-msgstr "事件"
-
#: gajim/data/gui/chat_control.ui:35
msgid "<b>1</b>"
msgstr "<b>1</b>"
@@ -6074,20 +5973,20 @@ msgid "Add"
msgstr "添加"
#: gajim/data/gui/mam_preferences.ui:194 gajim/data/gui/groupchat_config.ui:151
-#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:334
+#: gajim/gtk/remove_account.py:43 gajim/gtk/accounts.py:340
#, fuzzy
msgid "Remove"
msgstr "移除(_R)"
-#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:672
+#: gajim/data/gui/vcard_information_window.ui:72 gajim/gtk/accounts.py:691
#, fuzzy
msgid "Resource"
msgstr "资源: "
#: gajim/data/gui/vcard_information_window.ui:89
-#: gajim/data/gui/preferences_window.ui:1413
-#: gajim/data/gui/preferences_window.ui:1569
-#: gajim/data/gui/preferences_window.ui:1773
+#: gajim/data/gui/preferences_window.ui:1411
+#: gajim/data/gui/preferences_window.ui:1567
+#: gajim/data/gui/preferences_window.ui:1781
msgid "Status"
msgstr "状态"
@@ -6096,7 +5995,7 @@ msgid "Client"
msgstr "客户端"
#: gajim/data/gui/vcard_information_window.ui:123
-#: gajim/data/gui/preferences_window.ui:1876
+#: gajim/data/gui/preferences_window.ui:1884
msgid "System"
msgstr "系统"
@@ -6236,50 +6135,51 @@ msgstr "窗口行为(_W)"
msgid "_Show contact list on startup"
msgstr "Gajim 启动时连接(_O)"
-#: gajim/data/gui/preferences_window.ui:311
-msgid "Show _avatar in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:315
-msgid "If checked, the contact's avatar will be shown in chat tabs"
-msgstr ""
-
-#: gajim/data/gui/preferences_window.ui:349
+#: gajim/data/gui/preferences_window.ui:332
msgid "_Tabs placement"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:363
+#: gajim/data/gui/preferences_window.ui:346
msgid "_Quit Gajim when closing contact list"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:367
+#: gajim/data/gui/preferences_window.ui:350
msgid ""
"If enabled, Gajim will quit when closing the contact list window instead of "
"minimizing to the system's notification area"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:391
+#: gajim/data/gui/preferences_window.ui:371
msgid "Behavior of Windows and Tabs"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:423
+#: gajim/data/gui/preferences_window.ui:403
+#, fuzzy
+msgid "Me_rge accounts"
+msgstr "合并帐户(_G)"
+
+#: gajim/data/gui/preferences_window.ui:407
+msgid "Displays all your accounts merged into a single one"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:421
#, fuzzy
msgid "Show a_vatars of contacts in contact list"
msgstr "在联系人列表显示中联系人的头像(_V)"
-#: gajim/data/gui/preferences_window.ui:427
+#: gajim/data/gui/preferences_window.ui:425
#, fuzzy
msgid ""
"If checked, avatars of contacts will be shown in the contact list window and "
"in group chats"
msgstr "如果选定, Gajim 会在联系人列表和聊天室窗口中显示所有联系人的头像"
-#: gajim/data/gui/preferences_window.ui:441
+#: gajim/data/gui/preferences_window.ui:439
#, fuzzy
msgid "Show status _messages of contacts in contact list"
msgstr "在联系人列表中显示联系人的状态信息(_M)"
-#: gajim/data/gui/preferences_window.ui:445
+#: gajim/data/gui/preferences_window.ui:443
#, fuzzy
msgid ""
"If checked, status messages of contacts will be shown under the contact's "
@@ -6287,53 +6187,53 @@ msgid ""
msgstr ""
"如果选定, Gajim 会在联系人列表和聊天室窗口中联系人名称下方显示联系人状态信息"
-#: gajim/data/gui/preferences_window.ui:459
+#: gajim/data/gui/preferences_window.ui:457
#, fuzzy
msgid ""
"Show e_xtra information of contacts in contact list (mood, activity, ...)"
msgstr "在联系人列表中显示联系人的位置信息(_L)"
-#: gajim/data/gui/preferences_window.ui:463
+#: gajim/data/gui/preferences_window.ui:461
msgid ""
"If checked, additional info published by the contact will be shown in the "
"contact list. Additional infos (published via PEP) may include e.g. mood, "
"activity, tune, location, ..."
msgstr ""
-#: gajim/data/gui/preferences_window.ui:484
+#: gajim/data/gui/preferences_window.ui:482
msgid "Sort contacts by status"
msgstr "将联系人按状态排序"
-#: gajim/data/gui/preferences_window.ui:494
+#: gajim/data/gui/preferences_window.ui:492
#, fuzzy
msgid "in _contact list"
msgstr "已发送联系人: "
-#: gajim/data/gui/preferences_window.ui:511
+#: gajim/data/gui/preferences_window.ui:509
msgid "in _group chats"
msgstr "在聊天室中(_G)"
-#: gajim/data/gui/preferences_window.ui:540
+#: gajim/data/gui/preferences_window.ui:538
#, fuzzy
msgid "Contact List Appearance"
msgstr "联系人列表项交换"
-#: gajim/data/gui/preferences_window.ui:587
+#: gajim/data/gui/preferences_window.ui:585
msgid "Enable auto copy"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:590
+#: gajim/data/gui/preferences_window.ui:588
msgid ""
"If enabled, selecting Text will be copied to the clipboard, otherwise you "
"can copy text with CTRL + SHIFT + C"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:641
+#: gajim/data/gui/preferences_window.ui:639
#, fuzzy
msgid "Enable spell _checking"
msgstr "拼写检查工具"
-#: gajim/data/gui/preferences_window.ui:644
+#: gajim/data/gui/preferences_window.ui:642
msgid ""
"If checked, spelling errors in input fields of chat windows will be "
"highlighted. If no language is explicitly set via right click on the input "
@@ -6343,212 +6243,213 @@ msgstr ""
"如果选定, Gajim 会在聊天窗口中将编辑框中的拼写错误高亮显示。如果没有通过在编"
"辑框点击右键的方式显式设定语言, 联系人或聊天室的默认语言将被使用。"
-#: gajim/data/gui/preferences_window.ui:658
+#: gajim/data/gui/preferences_window.ui:656
#, fuzzy
msgid "Show message recei_pts (✔)"
msgstr "消息内容"
-#: gajim/data/gui/preferences_window.ui:662
+#: gajim/data/gui/preferences_window.ui:660
msgid ""
"If checked, a small checkmark will be shown after each message when it was "
"received. Note that this is not supported by all clients and therefore could "
"be misleading."
msgstr ""
-#: gajim/data/gui/preferences_window.ui:676
+#: gajim/data/gui/preferences_window.ui:674
#, fuzzy
msgid "_Show XHTML formatting"
msgstr "显示格式列表(Alt+M)"
-#: gajim/data/gui/preferences_window.ui:693
+#: gajim/data/gui/preferences_window.ui:691
#, fuzzy
msgid "Display status messages in _single chats"
msgstr "在联系人列表中显示联系人的状态信息(_M)"
-#: gajim/data/gui/preferences_window.ui:697
+#: gajim/data/gui/preferences_window.ui:695
msgid ""
"If checked, status lines will be shown in 1 on 1 chats when a contact "
"changes their status or status message"
msgstr ""
"如果选中, 在1对1聊天时,当有一方更改状态时,在聊天窗口的状态栏显示状态信息"
-#: gajim/data/gui/preferences_window.ui:711
+#: gajim/data/gui/preferences_window.ui:709
#, fuzzy
msgid "Show subject after _joining a group chat"
msgstr "无法加入聊天室"
-#: gajim/data/gui/preferences_window.ui:715
+#: gajim/data/gui/preferences_window.ui:713
#, fuzzy
msgid "If checked, the subject will be shown when joining a group chat"
msgstr "无法加入聊天室"
-#: gajim/data/gui/preferences_window.ui:737
+#: gajim/data/gui/preferences_window.ui:735
#, fuzzy
msgid "Group Chat Settings"
msgstr "插件"
-#: gajim/data/gui/preferences_window.ui:752
+#: gajim/data/gui/preferences_window.ui:750
msgid "Show join/leave (Default)"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:756
+#: gajim/data/gui/preferences_window.ui:754
msgid ""
"If join/leave status messages are shown in the group chat. This setting can "
"be overridden in the group chat menu."
msgstr ""
-#: gajim/data/gui/preferences_window.ui:775
+#: gajim/data/gui/preferences_window.ui:773
msgid ""
"The default sync threshold for new public group chats. This setting can be "
"overridden in the group chat menu."
msgstr ""
-#: gajim/data/gui/preferences_window.ui:777
+#: gajim/data/gui/preferences_window.ui:775
msgid "Default Sync Threshold"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:819
+#: gajim/data/gui/preferences_window.ui:817
#, fuzzy
msgid "Show status changes (Default)"
msgstr "记录联系人状态变化(_L)"
-#: gajim/data/gui/preferences_window.ui:823
+#: gajim/data/gui/preferences_window.ui:821
msgid ""
"If status change messages are shown in the group chat. This setting can be "
"overridden in the group chat menu."
msgstr ""
-#: gajim/data/gui/preferences_window.ui:880
+#: gajim/data/gui/preferences_window.ui:878
#, fuzzy
msgid "Show chatstate in tabs"
msgstr "在标签上显示关闭按钮?"
-#: gajim/data/gui/preferences_window.ui:884
+#: gajim/data/gui/preferences_window.ui:882
#, fuzzy
msgid ""
"If checked, the tab will be colored according to the current chatstate of "
"the contact"
msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
-#: gajim/data/gui/preferences_window.ui:898
+#: gajim/data/gui/preferences_window.ui:896
#, fuzzy
msgid "Show chatstate in contact list"
msgstr "在标签上显示关闭按钮?"
-#: gajim/data/gui/preferences_window.ui:902
+#: gajim/data/gui/preferences_window.ui:900
msgid ""
"If checked, the contact row will be colored according to the current "
"chatstate of the contact"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:916
+#: gajim/data/gui/preferences_window.ui:914
msgid "Show chatstate in banner"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:920
+#: gajim/data/gui/preferences_window.ui:918
+#, fuzzy
msgid ""
-"If checked, a desciption of the contacts current chatstate is shown in the "
+"If checked, a description of the contacts current chatstate is shown in the "
"banner"
-msgstr ""
+msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
-#: gajim/data/gui/preferences_window.ui:940
+#: gajim/data/gui/preferences_window.ui:938
#, fuzzy
msgid "Chatstate"
msgstr "最后状态"
-#: gajim/data/gui/preferences_window.ui:957
+#: gajim/data/gui/preferences_window.ui:955
#: gajim/data/gui/history_window.ui:303
#, fuzzy
msgid "Chat"
msgstr "聊天"
-#: gajim/data/gui/preferences_window.ui:1011
+#: gajim/data/gui/preferences_window.ui:1009
#, fuzzy
msgid "Show _notification area icon"
msgstr "在通知区域显示图标: "
-#: gajim/data/gui/preferences_window.ui:1030
+#: gajim/data/gui/preferences_window.ui:1028
#, fuzzy
msgid "_When new event is received"
msgstr "当收到新的事件: "
-#: gajim/data/gui/preferences_window.ui:1071
+#: gajim/data/gui/preferences_window.ui:1069
#, fuzzy
msgid "Show popups/notifications when a chat window is already _open"
msgstr "允许弹出提示, 当我离开/不可用/忙/隐身(_A)"
-#: gajim/data/gui/preferences_window.ui:1088
+#: gajim/data/gui/preferences_window.ui:1086
#, fuzzy
msgid "Allow popups/notifications when I'm _away, not available or busy"
msgstr "允许弹出提示, 当我离开/不可用/忙/隐身(_A)"
-#: gajim/data/gui/preferences_window.ui:1105
+#: gajim/data/gui/preferences_window.ui:1103
msgid "Notify me about contacts that sign _in"
msgstr "提醒我联系人登录(_I)"
-#: gajim/data/gui/preferences_window.ui:1110
+#: gajim/data/gui/preferences_window.ui:1108
msgid ""
"A popup window about contacts that just signed in will be shown in the "
"bottom right of the screen "
msgstr ""
-#: gajim/data/gui/preferences_window.ui:1124
+#: gajim/data/gui/preferences_window.ui:1122
msgid "Notify me about contacts that sign _out"
msgstr "提醒我联系人登出(_O)"
-#: gajim/data/gui/preferences_window.ui:1128
+#: gajim/data/gui/preferences_window.ui:1126
msgid ""
"A popup window about contacts that just signed out will be shown in the "
"bottom right of the screen "
msgstr ""
-#: gajim/data/gui/preferences_window.ui:1146
+#: gajim/data/gui/preferences_window.ui:1144
msgid "Visual Notifications"
msgstr "可视化提示"
-#: gajim/data/gui/preferences_window.ui:1182
+#: gajim/data/gui/preferences_window.ui:1180
msgid "Play _sounds"
msgstr "播放声音(_S)"
-#: gajim/data/gui/preferences_window.ui:1199
-#: gajim/data/gui/preferences_window.ui:1839
+#: gajim/data/gui/preferences_window.ui:1197
+#: gajim/data/gui/preferences_window.ui:1847
msgid "Ma_nage..."
msgstr "管理...(_N)"
-#: gajim/data/gui/preferences_window.ui:1222
+#: gajim/data/gui/preferences_window.ui:1220
#, fuzzy
msgid "Allow playing sounds when I'm _busy"
msgstr "在我忙碌时允许播放声音(_B)"
-#: gajim/data/gui/preferences_window.ui:1244
+#: gajim/data/gui/preferences_window.ui:1242
#, fuzzy
msgid "Sounds"
msgstr "Wav声音"
-#: gajim/data/gui/preferences_window.ui:1262
+#: gajim/data/gui/preferences_window.ui:1260
msgid "Notifications"
msgstr "通知"
-#: gajim/data/gui/preferences_window.ui:1289
+#: gajim/data/gui/preferences_window.ui:1287
#, fuzzy
msgid "No_t Available"
msgstr "禁止"
-#: gajim/data/gui/preferences_window.ui:1293
+#: gajim/data/gui/preferences_window.ui:1291
#, fuzzy
msgid ""
"If checked, the status will be changed to Not Available when the computer "
"has not been used for the specified time"
msgstr "如果选定, Gajim 会在计算机空闲更长时间后将您的状态设置为禁止。"
-#: gajim/data/gui/preferences_window.ui:1310
+#: gajim/data/gui/preferences_window.ui:1308
#, fuzzy
msgid ""
"If checked, the status will be changed to Away when the computer has not "
"been used for the specified time"
msgstr "如果选定, Gajim 会在计算机空闲更长时间后将您的状态设置为禁止。"
-#: gajim/data/gui/preferences_window.ui:1356
+#: gajim/data/gui/preferences_window.ui:1354
#, fuzzy
msgid ""
"The automatic away status message. If empty, the current status message will "
@@ -6560,7 +6461,7 @@ msgstr ""
"$S会被上个状态信息替换\n"
"$T会被自动离开的超时时间替换"
-#: gajim/data/gui/preferences_window.ui:1371
+#: gajim/data/gui/preferences_window.ui:1369
#, fuzzy
msgid ""
"The automatic not available status message. If empty, the current status "
@@ -6572,104 +6473,104 @@ msgstr ""
"$S会被上个状态信息替换\n"
"$T会被自动禁止的超时时间替换"
-#: gajim/data/gui/preferences_window.ui:1385
+#: gajim/data/gui/preferences_window.ui:1383
#, fuzzy
msgid "Minutes"
msgstr "分钟"
-#: gajim/data/gui/preferences_window.ui:1429 gajim/gtk/features.py:108
+#: gajim/data/gui/preferences_window.ui:1427 gajim/gtk/features.py:97
#, fuzzy
msgid "Automatic Status"
msgstr "自动调整状态"
-#: gajim/data/gui/preferences_window.ui:1460
+#: gajim/data/gui/preferences_window.ui:1458
msgid "_Remember and restore status of the last session"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:1464
+#: gajim/data/gui/preferences_window.ui:1462
msgid ""
"If checked, the status and status message used in the last session will be "
"restored"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:1486
+#: gajim/data/gui/preferences_window.ui:1484
#, fuzzy
msgid "Ask for status message when I"
msgstr "询问状态信息, 当我: "
-#: gajim/data/gui/preferences_window.ui:1502
+#: gajim/data/gui/preferences_window.ui:1500
msgid "Sign _in"
msgstr "登录(I)"
-#: gajim/data/gui/preferences_window.ui:1519
+#: gajim/data/gui/preferences_window.ui:1517
msgid "Sign _out"
msgstr "退出登录(_O)"
-#: gajim/data/gui/preferences_window.ui:1553
+#: gajim/data/gui/preferences_window.ui:1551
msgid ""
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
msgstr "如果选中, Gajim 不会询问状态信息, 而使用特定的默认信息。"
-#: gajim/data/gui/preferences_window.ui:1581
+#: gajim/data/gui/preferences_window.ui:1579
msgid "Default Message"
msgstr "默认消息"
-#: gajim/data/gui/preferences_window.ui:1596
-#: gajim/data/gui/preferences_window.ui:1877
+#: gajim/data/gui/preferences_window.ui:1594
+#: gajim/data/gui/preferences_window.ui:1885
msgid "Enabled"
msgstr "启用"
-#: gajim/data/gui/preferences_window.ui:1622
+#: gajim/data/gui/preferences_window.ui:1620
#, fuzzy
msgid "Status Messages"
msgstr "状态信息"
-#: gajim/data/gui/preferences_window.ui:1755
+#: gajim/data/gui/preferences_window.ui:1763
msgid "Preset Status Messages"
msgstr "预设状态信息"
-#: gajim/data/gui/preferences_window.ui:1796 gajim/data/gui/themes_window.ui:85
+#: gajim/data/gui/preferences_window.ui:1804 gajim/data/gui/themes_window.ui:85
#, fuzzy
msgid "Themes"
msgstr "主题"
-#: gajim/data/gui/preferences_window.ui:1813
+#: gajim/data/gui/preferences_window.ui:1821
#, fuzzy
msgid "_Theme"
msgstr "主题"
-#: gajim/data/gui/preferences_window.ui:1844
+#: gajim/data/gui/preferences_window.ui:1852
msgid "Configure color and font of the interface"
msgstr "配置界面颜色与字体"
-#: gajim/data/gui/preferences_window.ui:1858
+#: gajim/data/gui/preferences_window.ui:1866
msgid "_Dark Theme"
msgstr "暗黑主题(_D)"
-#: gajim/data/gui/preferences_window.ui:1892
+#: gajim/data/gui/preferences_window.ui:1900
msgid "Emojis"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:1909
+#: gajim/data/gui/preferences_window.ui:1917
msgid "_Emoji Theme"
msgstr "Emoji 主题(_E)"
-#: gajim/data/gui/preferences_window.ui:1938
+#: gajim/data/gui/preferences_window.ui:1946
msgid "Icons"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:1955
+#: gajim/data/gui/preferences_window.ui:1963
#, fuzzy
msgid "_Status iconset"
msgstr "状态图标集(_I): "
-#: gajim/data/gui/preferences_window.ui:1981
+#: gajim/data/gui/preferences_window.ui:1989
#, fuzzy
msgid "Use transports _icons"
msgstr "使用代理的图标设定(_T)"
-#: gajim/data/gui/preferences_window.ui:1985
+#: gajim/data/gui/preferences_window.ui:1993
msgid ""
"If checked, protocol-specific status icons will be used (e.g. a contact from "
"ICQ will have the equivalent ICQ icon for status online, away, busy, etc...)"
@@ -6677,74 +6578,74 @@ msgstr ""
"如果选中, Gajim 会以协议特定的方式显示状态图标。(例如, MSN 联系人会以同MSN 相"
"同的图标显示在线, 离开, 忙, 等等状态...)"
-#: gajim/data/gui/preferences_window.ui:2012
+#: gajim/data/gui/preferences_window.ui:2020
msgid "_Convert ASCII Emojis"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:2090
+#: gajim/data/gui/preferences_window.ui:2098
msgid "Style"
msgstr "风格"
-#: gajim/data/gui/preferences_window.ui:2117
+#: gajim/data/gui/preferences_window.ui:2125
#, fuzzy
msgid "Show _Features"
msgstr "特性"
-#: gajim/data/gui/preferences_window.ui:2195
+#: gajim/data/gui/preferences_window.ui:2203
#, fuzzy
msgid "A_udio output device"
msgstr "音频输出设备"
-#: gajim/data/gui/preferences_window.ui:2236
+#: gajim/data/gui/preferences_window.ui:2244
#, fuzzy
msgid "_Audio input device"
msgstr "音频输入设备"
-#: gajim/data/gui/preferences_window.ui:2253
+#: gajim/data/gui/preferences_window.ui:2261
#, fuzzy
msgid "Audio"
msgstr "音频测试"
-#: gajim/data/gui/preferences_window.ui:2270
+#: gajim/data/gui/preferences_window.ui:2278
#, fuzzy
msgid "Video"
msgstr "视频测试"
-#: gajim/data/gui/preferences_window.ui:2287
+#: gajim/data/gui/preferences_window.ui:2295
#, fuzzy
msgid "_Video input device"
msgstr "视频输入设备"
-#: gajim/data/gui/preferences_window.ui:2315
+#: gajim/data/gui/preferences_window.ui:2323
#, fuzzy
msgid "Video output"
msgstr "视频输出"
-#: gajim/data/gui/preferences_window.ui:2343
+#: gajim/data/gui/preferences_window.ui:2351
#, fuzzy
msgid "Video _framerate"
msgstr "视频帧速率"
-#: gajim/data/gui/preferences_window.ui:2372
+#: gajim/data/gui/preferences_window.ui:2380
#, fuzzy
msgid "Video si_ze"
msgstr "视频尺寸"
-#: gajim/data/gui/preferences_window.ui:2397
+#: gajim/data/gui/preferences_window.ui:2405
msgid "Vi_ew own video source"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:2416 gajim/data/gui/server_info.ui:298
-#: gajim/gtk/accounts.py:305
+#: gajim/data/gui/preferences_window.ui:2424 gajim/data/gui/server_info.ui:298
+#: gajim/gtk/accounts.py:311
msgid "Connection"
msgstr "连接"
-#: gajim/data/gui/preferences_window.ui:2430
+#: gajim/data/gui/preferences_window.ui:2438
#, fuzzy
msgid "STU_N server"
msgstr "STUN 服务器: "
-#: gajim/data/gui/preferences_window.ui:2448
+#: gajim/data/gui/preferences_window.ui:2456
msgid ""
"STUN server hostname. If no hostname was given, Gajim will try\n"
"to discover one from the server. (Example: stun.iptel.org)"
@@ -6752,50 +6653,60 @@ msgstr ""
"STUN 服务器的主机名。如果没有给出, Gajim 会\n"
"尝试从服务器上发现一个。"
-#: gajim/data/gui/preferences_window.ui:2487
+#: gajim/data/gui/preferences_window.ui:2495
#, fuzzy
msgid "Audio/Video"
msgstr "音频/视频"
-#: gajim/data/gui/preferences_window.ui:2520
+#: gajim/data/gui/preferences_window.ui:2528
msgid "_Global proxy"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:2557
+#: gajim/data/gui/preferences_window.ui:2564
msgid "_Manage..."
msgstr "管理..."
-#: gajim/data/gui/preferences_window.ui:2580
+#: gajim/data/gui/preferences_window.ui:2587
#, fuzzy
msgid "_Store status changes of contacts in history"
msgstr "记录联系人状态变化(_L)"
-#: gajim/data/gui/preferences_window.ui:2602
+#: gajim/data/gui/preferences_window.ui:2609
msgid "Enable _debug logging (restart required)"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:2606
+#: gajim/data/gui/preferences_window.ui:2613
#, fuzzy
msgid "If checked, Gajim will store a log file for debugging"
msgstr "如果选定, Gajim 会记录本账户的密码"
-#: gajim/data/gui/preferences_window.ui:2623
+#: gajim/data/gui/preferences_window.ui:2630
msgid "Opens folder containing debug logs"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:2653
+#: gajim/data/gui/preferences_window.ui:2656
+msgid "_Reset Hints"
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2660
+msgid ""
+"In order to introduce you to features, Gajim displays some hints. This "
+"button will reset all these hints."
+msgstr ""
+
+#: gajim/data/gui/preferences_window.ui:2677
msgid "Miscellaneous"
msgstr "杂项"
-#: gajim/data/gui/preferences_window.ui:2686
+#: gajim/data/gui/preferences_window.ui:2710
msgid "Attention: Please use these options with caution!"
msgstr ""
-#: gajim/data/gui/preferences_window.ui:2699
+#: gajim/data/gui/preferences_window.ui:2723
msgid "_Open..."
msgstr "打开...(_O)"
-#: gajim/data/gui/preferences_window.ui:2721 gajim/gtk/advanced_config.py:84
+#: gajim/data/gui/preferences_window.ui:2745 gajim/gtk/advanced_config.py:84
#, fuzzy
msgid "Advanced Configuration Editor (ACE)"
msgstr "高级设置编辑器"
@@ -6977,12 +6888,12 @@ msgstr ""
msgid "Your password"
msgstr "输入新密码"
-#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:720
+#: gajim/data/gui/account_wizard.ui:266 gajim/data/gui/account_wizard.ui:719
#, fuzzy
msgid "_Advanced Settings"
msgstr "高级动作"
-#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:724
+#: gajim/data/gui/account_wizard.ui:270 gajim/data/gui/account_wizard.ui:723
#, fuzzy
msgid "Proxy, custom hostname and port"
msgstr "使用自定义的主机名/端口"
@@ -7068,7 +6979,7 @@ msgid ""
"a>"
msgstr ""
-#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:59
+#: gajim/data/gui/account_wizard.ui:631 gajim/gtk/account_wizard.py:60
#, fuzzy
msgid "Sign Up"
msgstr "登录(I)"
@@ -7082,7 +6993,7 @@ msgstr "请选择一个昵称"
msgid "Sign up Anonymously"
msgstr ""
-#: gajim/data/gui/account_wizard.ui:707
+#: gajim/data/gui/account_wizard.ui:706
msgid "Note: Anonymous accounts are not possible on all servers"
msgstr ""
@@ -7109,8 +7020,8 @@ msgstr "恢复为默认颜色设置(_R)"
msgid "Resets value to default"
msgstr "恢复为默认颜色设置(_R)"
-#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:668
-#: gajim/gtk/accounts.py:774
+#: gajim/data/gui/server_info.ui:20 gajim/gtk/accounts.py:687
+#: gajim/gtk/accounts.py:793
#, fuzzy
msgid "Hostname"
msgstr "主机名(_H): "
@@ -7152,7 +7063,7 @@ msgstr "查看证书…"
msgid "Proxy Host"
msgstr "代理服务器地址(_H): "
-#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:782
+#: gajim/data/gui/server_info.ui:261 gajim/gtk/accounts.py:801
msgid "Type"
msgstr "类型"
@@ -7166,8 +7077,7 @@ msgstr "协议(_P): "
msgid "Copy info to clipboard"
msgstr "复制链接位置(_C)"
-#: gajim/data/gui/server_info.ui:359 gajim/data/gui/application_menu.ui:89
-#: gajim/gtk/features.py:41 gajim/gtk/features.py:52
+#: gajim/data/gui/server_info.ui:359 gajim/gtk/features.py:40
msgid "Features"
msgstr "特性"
@@ -7349,6 +7259,11 @@ msgstr ""
msgid "Change Status Message…"
msgstr "更改状态信息…"
+#: gajim/data/gui/roster_window.ui:79 data/org.gajim.Gajim.desktop.in:4
+#: data/org.gajim.Gajim.appdata.xml.in:7
+msgid "Gajim"
+msgstr "Gajim"
+
#: gajim/data/gui/change_mood_dialog.ui:73
msgid "<b>Mood:</b>"
msgstr "<b>心情: </b>"
@@ -7425,9 +7340,10 @@ msgid "Installed"
msgstr "已安装"
#: gajim/data/gui/plugins_window.ui:363
+#, fuzzy
msgid ""
-"Plug-in decription should be displayed here. This text will be erased during "
-"PluginsWindow initialization."
+"Plug-in description should be displayed here. This text will be erased "
+"during PluginsWindow initialization."
msgstr "插件的描述会被显示在这里。这些文字在插件窗口初始化时将被去除"
#: gajim/data/gui/privacy_list_window.ui:18
@@ -7613,79 +7529,106 @@ msgstr "插件"
msgid "_Name"
msgstr "名称(_N): "
-#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:665
+#: gajim/data/gui/manage_proxies.ui:337 gajim/gtk/accounts.py:684
#, fuzzy
msgid "Proxy"
msgstr "代理服务器(_Y): "
+#: gajim/data/gui/application_menu.ui:8
+#, fuzzy
+msgid "_Start / Join Chat…"
+msgstr "开始聊天"
+
#: gajim/data/gui/application_menu.ui:13
-#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
#, fuzzy
-msgid "Create Group Chat"
+msgid "Create _Group Chat…"
msgstr "离开聊天室"
-#: gajim/data/gui/application_menu.ui:22 gajim/data/gui/shortcuts_window.ui:217
-#: gajim/plugins/gui.py:68
-msgid "Plugins"
+#: gajim/data/gui/application_menu.ui:18
+#, fuzzy
+msgid "_History Manager"
+msgstr "历史记录管理器"
+
+#: gajim/data/gui/application_menu.ui:22
+#, fuzzy
+msgid "Pl_ugins"
msgstr "插件"
-#: gajim/data/gui/application_menu.ui:26 gajim/data/gui/shortcuts_window.ui:210
-#: gajim/gtk/preferences.py:64
-msgid "Preferences"
+#: gajim/data/gui/application_menu.ui:26
+#: gajim/data/gui/systray_context_menu.ui:68
+#, fuzzy
+msgid "_Preferences"
msgstr "参数"
-#: gajim/data/gui/application_menu.ui:30
-msgid "Quit"
-msgstr ""
+#: gajim/data/gui/application_menu.ui:36
+#, fuzzy
+msgid "_Accounts"
+msgstr "账户"
#: gajim/data/gui/application_menu.ui:39
#, fuzzy
-msgid "View"
+msgid "_View"
msgstr "视图(_V)"
-#: gajim/data/gui/application_menu.ui:42
+#: gajim/data/gui/application_menu.ui:42 gajim/gtk/statusicon.py:270
#, fuzzy
-msgid "Show Contact List"
+msgid "Show _Contact List"
msgstr "只显示活动的联系人(_A)"
#: gajim/data/gui/application_menu.ui:46
#, fuzzy
-msgid "Show Offline Contacts"
+msgid "Show _Offline Contacts"
msgstr "显示离线联系人"
#: gajim/data/gui/application_menu.ui:50
#, fuzzy
-msgid "Show Active Contacts"
+msgid "Show _Active Contacts"
msgstr "只显示活动的联系人(_A)"
#: gajim/data/gui/application_menu.ui:54
#, fuzzy
-msgid "Show Transports"
+msgid "Show _Transports"
msgstr "显示代理(_P)"
-#: gajim/data/gui/application_menu.ui:60 gajim/data/gui/xml_console.ui:8
-msgid "XML Console"
+#: gajim/data/gui/application_menu.ui:60
+#, fuzzy
+msgid "_XML Console"
msgstr "XML 控制台"
+#: gajim/data/gui/application_menu.ui:64
+#, fuzzy
+msgid "_File Transfer"
+msgstr "文件传输"
+
#: gajim/data/gui/application_menu.ui:74
#, fuzzy
-msgid "Help"
+msgid "_Help"
msgstr "帮助(_H)"
#: gajim/data/gui/application_menu.ui:77
#, fuzzy
-msgid "Wiki (Online)"
+msgid "_Wiki (Online)"
msgstr "在线"
#: gajim/data/gui/application_menu.ui:81
#, fuzzy
-msgid "FAQ (Online)"
+msgid "FA_Q (Online)"
msgstr "在线"
#: gajim/data/gui/application_menu.ui:85
-msgid "Keyboard Shortcuts"
+msgid "_Keyboard Shortcuts"
msgstr ""
+#: gajim/data/gui/application_menu.ui:89
+#, fuzzy
+msgid "_Features"
+msgstr "特性"
+
+#: gajim/data/gui/application_menu.ui:93
+#, fuzzy
+msgid "_About"
+msgstr "关于"
+
#: gajim/data/gui/groupchat_creation.ui:27
msgid "Public or Private?"
msgstr ""
@@ -7700,6 +7643,11 @@ msgstr ""
msgid "<b>Public:</b> Anyone who knows the address can join."
msgstr ""
+#: gajim/data/gui/groupchat_creation.ui:81 gajim/gtk/groupchat_creation.py:45
+#, fuzzy
+msgid "Create Group Chat"
+msgstr "离开聊天室"
+
#: gajim/data/gui/groupchat_creation.ui:122
#, fuzzy
msgid "_Description"
@@ -7983,58 +7931,66 @@ msgstr "联系人列表项交换"
msgid "Create new group chat"
msgstr "离开聊天室"
-#: gajim/data/gui/shortcuts_window.ui:224
+#: gajim/data/gui/shortcuts_window.ui:203 gajim/gtk/preferences.py:63
+msgid "Preferences"
+msgstr "参数"
+
+#: gajim/data/gui/shortcuts_window.ui:210 gajim/plugins/gui.py:68
+msgid "Plugins"
+msgstr "插件"
+
+#: gajim/data/gui/shortcuts_window.ui:217
#, fuzzy
msgid "File transfers"
msgstr "文件传输"
-#: gajim/data/gui/shortcuts_window.ui:231
+#: gajim/data/gui/shortcuts_window.ui:224
msgid "Set the status message"
msgstr "设置状态信息"
-#: gajim/data/gui/shortcuts_window.ui:238
+#: gajim/data/gui/shortcuts_window.ui:231
#, fuzzy
msgid "Show XML console"
msgstr "显示 XML 控制台(_X)"
-#: gajim/data/gui/shortcuts_window.ui:253
+#: gajim/data/gui/shortcuts_window.ui:246
msgid "Appearance"
msgstr "聊天窗口外观"
-#: gajim/data/gui/shortcuts_window.ui:258
+#: gajim/data/gui/shortcuts_window.ui:251
#, fuzzy
msgid "Show offline contacts"
msgstr "显示离线联系人"
-#: gajim/data/gui/shortcuts_window.ui:265
+#: gajim/data/gui/shortcuts_window.ui:258
#, fuzzy
msgid "Show only active contacts"
msgstr "只显示活动的联系人(_A)"
-#: gajim/data/gui/shortcuts_window.ui:272
+#: gajim/data/gui/shortcuts_window.ui:265
msgid "Enable contact list filtering"
msgstr ""
-#: gajim/data/gui/shortcuts_window.ui:279
+#: gajim/data/gui/shortcuts_window.ui:272
#, fuzzy
msgid "Show / hide contact list"
msgstr "只显示活动的联系人(_A)"
-#: gajim/data/gui/shortcuts_window.ui:287 gajim/data/gui/groupchat_invite.ui:83
+#: gajim/data/gui/shortcuts_window.ui:280 gajim/data/gui/groupchat_invite.ui:83
msgid "Contacts"
msgstr "联系人"
-#: gajim/data/gui/shortcuts_window.ui:292
+#: gajim/data/gui/shortcuts_window.ui:285
#, fuzzy
msgid "Contact information"
msgstr "联系人信息"
-#: gajim/data/gui/shortcuts_window.ui:299
+#: gajim/data/gui/shortcuts_window.ui:292
#, fuzzy
msgid "Rename contact"
msgstr "重命名联系人"
-#: gajim/data/gui/shortcuts_window.ui:306
+#: gajim/data/gui/shortcuts_window.ui:299
#, fuzzy
msgid "Delete contact"
msgstr "已发送联系人: "
@@ -8110,12 +8066,16 @@ msgstr "请填写表格。"
msgid "Group Chat Configuration"
msgstr "聊天室邀请"
+#: gajim/data/gui/xml_console.ui:8
+msgid "XML Console"
+msgstr "XML 控制台"
+
#: gajim/data/gui/xml_console.ui:131
#, fuzzy
msgid "Start Search..."
msgstr "开始聊天(_S)"
-#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:308
+#: gajim/data/gui/xml_console.ui:241 gajim/gtk/xml_console.py:309
#, fuzzy
msgid "Filter"
msgstr "过滤器: "
@@ -8161,11 +8121,6 @@ msgstr "显示所有未处理事件(_E)"
msgid "Mute Sounds"
msgstr "静音"
-#: gajim/data/gui/systray_context_menu.ui:68
-#, fuzzy
-msgid "_Preferences"
-msgstr "参数"
-
#: gajim/data/gui/single_message_window.ui:42
#, fuzzy
msgid "_To"
@@ -8490,124 +8445,124 @@ msgstr "已收到 %(max)s 中的 %(received)s"
msgid "%(minutes)s min %(seconds)s sec"
msgstr ""
-#: gajim/gtk/groupchat_info.py:38
+#: gajim/gtk/groupchat_info.py:37
#, fuzzy
msgid "?Group chat feature:Open"
msgstr "无"
-#: gajim/gtk/groupchat_info.py:39
+#: gajim/gtk/groupchat_info.py:38
#, fuzzy
msgid "Anyone can join this group chat"
msgstr "%s 加入聊天室"
-#: gajim/gtk/groupchat_info.py:42
+#: gajim/gtk/groupchat_info.py:41
#, fuzzy
msgid "?Group chat feature:Members Only"
msgstr "聊天室突出显示:"
-#: gajim/gtk/groupchat_info.py:43
+#: gajim/gtk/groupchat_info.py:42
msgid "This group chat is restricted to members only"
msgstr ""
-#: gajim/gtk/groupchat_info.py:47
+#: gajim/gtk/groupchat_info.py:46
#, fuzzy
msgid "?Group chat feature:Not Anonymous"
msgstr "聊天室支持"
-#: gajim/gtk/groupchat_info.py:48
+#: gajim/gtk/groupchat_info.py:47
msgid "All other group chat participants can see your XMPP address"
msgstr ""
-#: gajim/gtk/groupchat_info.py:52
+#: gajim/gtk/groupchat_info.py:51
#, fuzzy
msgid "?Group chat feature:Semi-Anonymous"
msgstr "聊天室突出显示:"
-#: gajim/gtk/groupchat_info.py:53
+#: gajim/gtk/groupchat_info.py:52
msgid "Only moderators can see your XMPP address"
msgstr ""
-#: gajim/gtk/groupchat_info.py:56
+#: gajim/gtk/groupchat_info.py:55
#, fuzzy
msgid "?Group chat feature:Moderated"
msgstr "无"
-#: gajim/gtk/groupchat_info.py:57
+#: gajim/gtk/groupchat_info.py:56
msgid ""
"Participants entering this group chat need to request permission to send "
"messages"
msgstr ""
-#: gajim/gtk/groupchat_info.py:61
+#: gajim/gtk/groupchat_info.py:60
#, fuzzy
msgid "?Group chat feature:Not Moderated"
msgstr "聊天室支持"
-#: gajim/gtk/groupchat_info.py:62
+#: gajim/gtk/groupchat_info.py:61
msgid "Participants entering this group chat are allowed to send messages"
msgstr ""
-#: gajim/gtk/groupchat_info.py:66
+#: gajim/gtk/groupchat_info.py:65
#, fuzzy
msgid "?Group chat feature:Public"
msgstr "聊天室突出显示:"
-#: gajim/gtk/groupchat_info.py:67
+#: gajim/gtk/groupchat_info.py:66
msgid "Group chat can be found via search"
msgstr ""
-#: gajim/gtk/groupchat_info.py:70
+#: gajim/gtk/groupchat_info.py:69
#, fuzzy
msgid "?Group chat feature:Hidden"
msgstr "无"
-#: gajim/gtk/groupchat_info.py:71
+#: gajim/gtk/groupchat_info.py:70
#, fuzzy
msgid "This group chat can not be found via search"
msgstr "该操作无法撤销。"
-#: gajim/gtk/groupchat_info.py:74
+#: gajim/gtk/groupchat_info.py:73
#, fuzzy
msgid "?Group chat feature:Password Required"
msgstr "聊天室支持"
-#: gajim/gtk/groupchat_info.py:75
+#: gajim/gtk/groupchat_info.py:74
msgid "This group chat does require a password upon entry"
msgstr ""
-#: gajim/gtk/groupchat_info.py:79
+#: gajim/gtk/groupchat_info.py:78
#, fuzzy
msgid "?Group chat feature:No Password Required"
msgstr "聊天室支持"
-#: gajim/gtk/groupchat_info.py:80
+#: gajim/gtk/groupchat_info.py:79
msgid "This group chat does not require a password upon entry"
msgstr ""
-#: gajim/gtk/groupchat_info.py:84
+#: gajim/gtk/groupchat_info.py:83
#, fuzzy
msgid "?Group chat feature:Persistent"
msgstr "聊天室支持"
-#: gajim/gtk/groupchat_info.py:85
+#: gajim/gtk/groupchat_info.py:84
msgid "This group chat persists even if there are no participants"
msgstr ""
-#: gajim/gtk/groupchat_info.py:89
+#: gajim/gtk/groupchat_info.py:88
#, fuzzy
msgid "?Group chat feature:Temporary"
msgstr "无"
-#: gajim/gtk/groupchat_info.py:90
+#: gajim/gtk/groupchat_info.py:89
msgid "This group chat will be destroyed once the last participant left"
msgstr ""
-#: gajim/gtk/groupchat_info.py:94
+#: gajim/gtk/groupchat_info.py:93
#, fuzzy
msgid "?Group chat feature:Archiving"
msgstr "聊天室邀请"
-#: gajim/gtk/groupchat_info.py:95
+#: gajim/gtk/groupchat_info.py:94
#, fuzzy
msgid "Messages are archived on the server"
msgstr "本次会话将在服务器上被存档"
@@ -8636,7 +8591,7 @@ msgid "Sender: %s"
msgstr "发送者: %s"
#: gajim/gtk/filetransfer.py:240 gajim/gtk/filetransfer.py:749
-#: gajim/gtk/tooltips.py:571
+#: gajim/gtk/tooltips.py:550
msgid "Recipient: "
msgstr "接收者:"
@@ -8787,7 +8742,7 @@ msgstr "文件: "
msgid "It is not possible to send empty files"
msgstr "无法发送空文件"
-#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:565
+#: gajim/gtk/filetransfer.py:747 gajim/gtk/tooltips.py:544
msgid "Sender: "
msgstr "发送者: "
@@ -8801,7 +8756,7 @@ msgid "Change"
msgstr "更改昵称(_N)"
#: gajim/gtk/change_password.py:45 gajim/gtk/remove_account.py:45
-#: gajim/gtk/account_wizard.py:64 gajim/gtk/accounts.py:377
+#: gajim/gtk/account_wizard.py:65 gajim/gtk/accounts.py:383
#, fuzzy
msgid "Back"
msgstr "马上回来"
@@ -8832,11 +8787,12 @@ msgid "Password Change Failed"
msgstr "需要密码"
#: gajim/gtk/change_password.py:63
-msgid "An error occured while trying to change your password."
-msgstr ""
+#, fuzzy
+msgid "An error occurred while trying to change your password."
+msgstr "创建帐户过程中发生错误"
#: gajim/gtk/change_password.py:142 gajim/gtk/change_password.py:144
-#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:819
+#: gajim/gtk/change_password.py:221 gajim/gtk/accounts.py:838
msgid "Change Password"
msgstr "更改密码"
@@ -8873,40 +8829,35 @@ msgstr ""
msgid "Unknown SSL error '%s'"
msgstr "未知的 SSL 错误: %d"
-#: gajim/gtk/start_chat.py:54
+#: gajim/gtk/start_chat.py:55
#, fuzzy
-msgid "Start New Conversation"
-msgstr "开始新对话"
+msgid "Start / Join Chat"
+msgstr "开始聊天"
-#: gajim/gtk/start_chat.py:271 gajim/gtk/start_chat.py:350
+#: gajim/gtk/start_chat.py:279 gajim/gtk/start_chat.py:358
msgid "You can not join a group chat unless you are connected."
msgstr "您必须连接才能加入聊天室。"
-#: gajim/gtk/start_chat.py:617 gajim/gtk/groupchat_join.py:40
+#: gajim/gtk/start_chat.py:628 gajim/gtk/groupchat_join.py:40
msgid "Join Group Chat"
msgstr "加入聊天室"
-#: gajim/gtk/start_chat.py:619 gajim/gtk/add_contact.py:42
-#, fuzzy
-msgid "Add Contact"
-msgstr "添加联系人(_A)..."
-
-#: gajim/gtk/start_chat.py:697
+#: gajim/gtk/start_chat.py:709
msgid ""
"Search for group chats globally\n"
"(press Return to start search)"
msgstr ""
-#: gajim/gtk/start_chat.py:790
+#: gajim/gtk/start_chat.py:802
#, fuzzy, python-format
msgid "%s group chats found"
msgstr "%s 未找到"
-#: gajim/gtk/discovery.py:69
+#: gajim/gtk/discovery.py:70
msgid "This service has not yet responded with detailed information"
msgstr "服务还没有详细的信息应答"
-#: gajim/gtk/discovery.py:70
+#: gajim/gtk/discovery.py:71
#, fuzzy
msgid ""
"This service could not respond with detailed information.\n"
@@ -8915,174 +8866,174 @@ msgstr ""
"这个服务无法应答详细的信息。\n"
"这很可能是服务器的遗留问题, 或者服务器被损坏了"
-#: gajim/gtk/discovery.py:126
+#: gajim/gtk/discovery.py:127
msgid "Others"
msgstr "其他"
-#: gajim/gtk/discovery.py:129
+#: gajim/gtk/discovery.py:130
#, fuzzy
msgid "Group Chat"
msgstr "聊天室"
-#: gajim/gtk/discovery.py:518
+#: gajim/gtk/discovery.py:519
msgid "Without a connection, you can not browse available services"
msgstr "连接后才可浏览可用服务"
-#: gajim/gtk/discovery.py:605
+#: gajim/gtk/discovery.py:606
#, python-format
msgid "Service Discovery using account %s"
msgstr "正在使用账户 %s 来发掘服务"
-#: gajim/gtk/discovery.py:607
+#: gajim/gtk/discovery.py:608
msgid "Service Discovery"
msgstr "搜索服务"
-#: gajim/gtk/discovery.py:690
+#: gajim/gtk/discovery.py:691
msgid "The service could not be found"
msgstr "找不到该服务"
-#: gajim/gtk/discovery.py:691
+#: gajim/gtk/discovery.py:692
msgid ""
"There is no service at the address you entered, or it is not responding. "
"Check the address and try again."
msgstr "此地址没有服务或无应答。请检查地址后重试。"
-#: gajim/gtk/discovery.py:698 gajim/gtk/discovery.py:1041
+#: gajim/gtk/discovery.py:699 gajim/gtk/discovery.py:1042
msgid "The service is not browsable"
msgstr "该服务无法浏览"
-#: gajim/gtk/discovery.py:699
+#: gajim/gtk/discovery.py:700
msgid "This type of service does not contain any items to browse."
msgstr "此服务没有项目可浏览。"
-#: gajim/gtk/discovery.py:737 gajim/gtk/discovery.py:746
+#: gajim/gtk/discovery.py:738 gajim/gtk/discovery.py:747
msgid "Invalid Server Name"
msgstr "无效的服务器名"
-#: gajim/gtk/discovery.py:805
+#: gajim/gtk/discovery.py:806
#, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "用账户 %(account)s 浏览地址 %(address)s"
-#: gajim/gtk/discovery.py:850
+#: gajim/gtk/discovery.py:851
#, fuzzy
msgid "Browse"
msgstr "浏览(_B)"
-#: gajim/gtk/discovery.py:1042
+#: gajim/gtk/discovery.py:1043
msgid "This service does not contain any items to browse."
msgstr "此服务不包含任何项目可浏览。"
-#: gajim/gtk/discovery.py:1254
+#: gajim/gtk/discovery.py:1255
#, fuzzy
msgid "_Command"
msgstr "命令"
-#: gajim/gtk/discovery.py:1263 gajim/gtk/discovery.py:1420
+#: gajim/gtk/discovery.py:1264 gajim/gtk/discovery.py:1421
msgid "Re_gister"
msgstr "注册(_G)"
-#: gajim/gtk/discovery.py:1276
+#: gajim/gtk/discovery.py:1277
msgid "_Search"
msgstr "查找(_S)"
-#: gajim/gtk/discovery.py:1418
+#: gajim/gtk/discovery.py:1419
msgid "_Edit"
msgstr "编辑(_E)"
-#: gajim/gtk/discovery.py:1456
+#: gajim/gtk/discovery.py:1457
#, fuzzy, python-format
msgid "Scanning %(current)d / %(total)d ..."
msgstr "已扫描 %(current)d / %(total)d.."
-#: gajim/gtk/discovery.py:1655
+#: gajim/gtk/discovery.py:1656
msgid "Users"
msgstr "用户"
-#: gajim/gtk/discovery.py:1671
+#: gajim/gtk/discovery.py:1672
msgid "Id"
msgstr "Id"
-#: gajim/gtk/discovery.py:1900
+#: gajim/gtk/discovery.py:1901
msgid "Subscribed"
msgstr "订阅"
-#: gajim/gtk/discovery.py:1909
+#: gajim/gtk/discovery.py:1910
msgid "Node"
msgstr "节点"
-#: gajim/gtk/discovery.py:1978
+#: gajim/gtk/discovery.py:1979
#, fuzzy
msgid "_New post"
msgstr "新发表"
-#: gajim/gtk/discovery.py:1987
+#: gajim/gtk/discovery.py:1988
msgid "_Subscribe"
msgstr "订阅(_S)"
-#: gajim/gtk/discovery.py:1995
+#: gajim/gtk/discovery.py:1996
msgid "_Unsubscribe"
msgstr "退订(_S)"
-#: gajim/gtk/single_message.py:52
+#: gajim/gtk/single_message.py:51
msgid "Send Single Message"
msgstr "发送单条消息(_S)"
-#: gajim/gtk/single_message.py:103
+#: gajim/gtk/single_message.py:101
#, fuzzy
msgid "(No subject)"
msgstr "主题"
-#: gajim/gtk/single_message.py:159
+#: gajim/gtk/single_message.py:157
#, python-format
msgid "Single Message using account %s"
msgstr "单条消息, 使用账户 %s"
-#: gajim/gtk/single_message.py:161
+#: gajim/gtk/single_message.py:159
#, python-format
msgid "Single Message in account %s"
msgstr "单条消息, 在账户 %s"
-#: gajim/gtk/single_message.py:163
+#: gajim/gtk/single_message.py:161
msgid "Single Message"
msgstr "单条消息"
-#: gajim/gtk/single_message.py:166
+#: gajim/gtk/single_message.py:164
#, python-format
msgid "Send %s"
msgstr "发送 %s"
-#: gajim/gtk/single_message.py:185
+#: gajim/gtk/single_message.py:183
#, python-format
msgid "Received %s"
msgstr "已接收 %s"
-#: gajim/gtk/single_message.py:207
+#: gajim/gtk/single_message.py:205
#, fuzzy, python-format
msgid "Characters typed: %s"
msgstr "不允许的字符"
-#: gajim/gtk/single_message.py:212 gajim/gtk/xml_console.py:169
+#: gajim/gtk/single_message.py:210 gajim/gtk/xml_console.py:169
msgid "Connection not available"
msgstr "连接不可用"
-#: gajim/gtk/single_message.py:213
+#: gajim/gtk/single_message.py:211
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "请确认您已经连接到 \"%s\"。"
-#: gajim/gtk/single_message.py:241
+#: gajim/gtk/single_message.py:239
#, fuzzy, python-format
msgid ""
"It is not possible to send a message to %s, this XMPP Address is not valid."
msgstr "不能向 %s 发送消息, 无效的 JID。"
-#: gajim/gtk/single_message.py:318
+#: gajim/gtk/single_message.py:316
#, python-format
msgid "RE: %s"
msgstr "回复: %s"
-#: gajim/gtk/single_message.py:319
+#: gajim/gtk/single_message.py:317
#, python-format
msgid "%s wrote:\n"
msgstr "%s 写道: \n"
@@ -9128,94 +9079,76 @@ msgstr "注册成功"
msgid "Registration failed"
msgstr "注册失败"
-#: gajim/gtk/dialogs.py:148
-#, python-format
-msgid "Dictionary for language \"%s\" not available"
-msgstr "语言“%s”的词典不可用"
-
-#: gajim/gtk/dialogs.py:149
-#, python-format
-msgid ""
-"You have to install the dictionary \"%s\" to use spellchecking, or choose "
-"another language by setting the speller_language option.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"您必须安装“%s”词典才能使用拼写检查,或者您可以在 speller_language 选项中选择"
-"另一种语言。\n"
-"\n"
-"高亮拼写错误功能将不会被启用"
-
-#: gajim/gtk/dialogs.py:224
+#: gajim/gtk/dialogs.py:214
#, fuzzy
msgid "Certificate"
msgstr "客户端证书"
-#: gajim/gtk/dialogs.py:238
+#: gajim/gtk/dialogs.py:228
#, fuzzy, python-format
msgid ""
"Certificate for \n"
"%s"
msgstr "帐户 %s"
-#: gajim/gtk/dialogs.py:287
+#: gajim/gtk/dialogs.py:277
msgid "Issued to\n"
msgstr ""
-#: gajim/gtk/dialogs.py:288 gajim/gtk/dialogs.py:293
+#: gajim/gtk/dialogs.py:278 gajim/gtk/dialogs.py:283
msgid "Common Name (CN): "
msgstr ""
-#: gajim/gtk/dialogs.py:289 gajim/gtk/dialogs.py:294
+#: gajim/gtk/dialogs.py:279 gajim/gtk/dialogs.py:284
msgid "Organization (O): "
msgstr ""
-#: gajim/gtk/dialogs.py:290 gajim/gtk/dialogs.py:295
+#: gajim/gtk/dialogs.py:280 gajim/gtk/dialogs.py:285
msgid "Organizational Unit (OU): "
msgstr ""
-#: gajim/gtk/dialogs.py:291
+#: gajim/gtk/dialogs.py:281
#, fuzzy
msgid "Serial Number: "
msgstr "GG 号码: "
-#: gajim/gtk/dialogs.py:292
+#: gajim/gtk/dialogs.py:282
msgid "Issued by\n"
msgstr ""
-#: gajim/gtk/dialogs.py:296
+#: gajim/gtk/dialogs.py:286
msgid "Validity\n"
msgstr ""
-#: gajim/gtk/dialogs.py:297
+#: gajim/gtk/dialogs.py:287
msgid "Issued on: "
msgstr ""
-#: gajim/gtk/dialogs.py:298
+#: gajim/gtk/dialogs.py:288
#, fuzzy
msgid "Expires on: "
msgstr "expire"
-#: gajim/gtk/dialogs.py:299
+#: gajim/gtk/dialogs.py:289
msgid "SHA-1:"
msgstr ""
-#: gajim/gtk/dialogs.py:301
+#: gajim/gtk/dialogs.py:291
msgid "SHA-256:"
msgstr ""
-#: gajim/gtk/dialogs.py:314
+#: gajim/gtk/dialogs.py:304
#, fuzzy
msgid "Group Chat Invitation "
msgstr "聊天室邀请"
-#: gajim/gtk/dialogs.py:336
+#: gajim/gtk/dialogs.py:326
#, fuzzy, python-format
msgid ""
"<b>%(contact)s</b> has invited you to the group chat <b>%(room_jid)s</b>"
msgstr "$Contact 邀请您参加聊天室 %(room_jid)s"
-#: gajim/gtk/dialogs.py:344
+#: gajim/gtk/dialogs.py:334
#, python-format
msgid "Comment: %s"
msgstr "注释: %s"
@@ -9230,6 +9163,11 @@ msgstr "GG 号码: "
msgid "ICQ Number"
msgstr "ICQ 号码: "
+#: gajim/gtk/add_contact.py:42
+#, fuzzy
+msgid "Add Contact"
+msgstr "添加联系人(_A)..."
+
#: gajim/gtk/add_contact.py:260
#, fuzzy, python-format
msgid "%s Missing"
@@ -9282,9 +9220,9 @@ msgid "Error while adding transport contact"
msgstr "添加传输联系人出错"
#: gajim/gtk/add_contact.py:486
-#, python-format
+#, fuzzy, python-format
msgid ""
-"This error occured while adding a contact for transport %(transport)s:\n"
+"This error occurred while adding a contact for transport %(transport)s:\n"
"\n"
"%(error)s"
msgstr ""
@@ -9447,42 +9385,62 @@ msgstr "联系人已断开连接"
msgid "Contact Connected Background "
msgstr "已连接的联系人"
-#: gajim/gtk/themes.py:175
+#: gajim/gtk/themes.py:164
+#, fuzzy
+msgid "Status Online Color"
+msgstr "状态信息"
+
+#: gajim/gtk/themes.py:167
+#, fuzzy
+msgid "Status Away Color"
+msgstr "状态信息"
+
+#: gajim/gtk/themes.py:170
+#, fuzzy
+msgid "Status DND Color"
+msgstr "状态信息"
+
+#: gajim/gtk/themes.py:173
+#, fuzzy
+msgid "Status Offline Color"
+msgstr "状态信息"
+
+#: gajim/gtk/themes.py:187
msgid "Gajim Themes"
msgstr "Gajim 主题"
-#: gajim/gtk/themes.py:205 gajim/gtk/themes.py:212
+#: gajim/gtk/themes.py:217 gajim/gtk/themes.py:224
#, fuzzy
msgid "Invalid Name"
msgstr "不合法的昵称"
-#: gajim/gtk/themes.py:206
+#: gajim/gtk/themes.py:218
msgid "Name <b>default</b> is not allowed"
msgstr ""
-#: gajim/gtk/themes.py:213
+#: gajim/gtk/themes.py:225
#, fuzzy
msgid "Spaces are not allowed"
msgstr "不允许的字符"
-#: gajim/gtk/themes.py:334
+#: gajim/gtk/themes.py:346
#, fuzzy
msgid "Do you want to delete this theme?"
msgstr "您确定要删除所选定的消息?"
-#: gajim/gtk/themes.py:336
+#: gajim/gtk/themes.py:348
#, fuzzy
msgid ""
"This is the theme you are currently using.\n"
"Do you want to delete this theme?"
msgstr "这个名称已被使用。您想要覆盖这个状态信息吗?"
-#: gajim/gtk/themes.py:341
+#: gajim/gtk/themes.py:353
#, fuzzy
msgid "Delete Theme"
msgstr "活动"
-#: gajim/gtk/themes.py:374
+#: gajim/gtk/themes.py:386
#, fuzzy
msgid "Remove Setting"
msgstr "插件"
@@ -9506,10 +9464,9 @@ msgid "Error: %s"
msgstr "错误: %s"
#: gajim/gtk/history.py:591 gajim/gtk/groupchat_config.py:133
-#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:328
-#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
-#: gajim/gtk/account_wizard.py:426 gajim/gtk/account_wizard.py:427
-#: gajim/gtk/search.py:336
+#: gajim/gtk/groupchat_config.py:398 gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:427 gajim/gtk/account_wizard.py:428
+#: gajim/gtk/account_wizard.py:493 gajim/gtk/search.py:336
msgid "Error"
msgstr "错误"
@@ -9523,45 +9480,45 @@ msgstr "现在状态: %(status)s: %(status_msg)s"
msgid "Status is now: %(status)s"
msgstr "现在状态: %(status)s"
-#: gajim/gtk/notification.py:199
+#: gajim/gtk/notification.py:200
#, fuzzy
msgid "Open"
msgstr "OpenPGP: "
-#: gajim/gtk/notification.py:285
+#: gajim/gtk/notification.py:275
msgid "New E-mail"
msgstr "新电子邮件"
-#: gajim/gtk/settings.py:437 gajim/gtk/filechoosers.py:88
-#: gajim/gtk/filechoosers.py:139 gajim/gtk/filechoosers.py:146
+#: gajim/gtk/settings.py:469 gajim/gtk/filechoosers.py:89
+#: gajim/gtk/filechoosers.py:140 gajim/gtk/filechoosers.py:147
#: gajim/gtk/sounds.py:35
msgid "All files"
msgstr "所有文件"
-#: gajim/gtk/settings.py:446
+#: gajim/gtk/settings.py:478
msgid "Clear File"
msgstr "清除文件"
-#: gajim/gtk/settings.py:571 gajim/gtk/proxies.py:33
+#: gajim/gtk/settings.py:603 gajim/gtk/proxies.py:33
msgid "Manage Proxies"
msgstr "管理代理服务器设置"
-#: gajim/gtk/settings.py:592 gajim/gtk/account_wizard.py:683
-#: gajim/gtk/preferences.py:1037 gajim/gtk/preferences.py:1047
-#: gajim/gtk/preferences.py:1051
+#: gajim/gtk/settings.py:624 gajim/gtk/account_wizard.py:748
+#: gajim/gtk/preferences.py:1029 gajim/gtk/preferences.py:1039
+#: gajim/gtk/preferences.py:1043
#, fuzzy
msgid "No Proxy"
msgstr "代理服务器(_Y): "
-#: gajim/gtk/settings.py:618
+#: gajim/gtk/settings.py:650
msgid "Adjust to Status"
msgstr "依据状态调整"
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
msgid "On"
msgstr ""
-#: gajim/gtk/settings.py:630
+#: gajim/gtk/settings.py:662
msgid "Off"
msgstr "关闭"
@@ -9581,7 +9538,7 @@ msgstr "账户"
#: gajim/gtk/remove_account.py:57
#, fuzzy
-msgid "Your account has has been unregistered successfully."
+msgid "Your account has has been removed successfully."
msgstr "注册新账户成功"
#: gajim/gtk/remove_account.py:60 gajim/gtk/remove_account.py:61
@@ -9613,43 +9570,48 @@ msgstr ""
msgid "Account has to be connected"
msgstr "账户 \"%s\" 已连接到服务器"
-#: gajim/gtk/history_sync.py:194
+#: gajim/gtk/history_sync.py:110 gajim/gtk/history_sync.py:191
+#, fuzzy
+msgid "Synchronise History"
+msgstr "同步"
+
+#: gajim/gtk/history_sync.py:203
#, fuzzy
msgid "How far back should the chat history be synchronised?"
msgstr "您想要同步多久的记录?"
-#: gajim/gtk/history_sync.py:199
+#: gajim/gtk/history_sync.py:208
msgid "One Month"
msgstr "一个月"
-#: gajim/gtk/history_sync.py:200
+#: gajim/gtk/history_sync.py:209
msgid "Three Months"
msgstr "三个月"
-#: gajim/gtk/history_sync.py:201
+#: gajim/gtk/history_sync.py:210
msgid "One Year"
msgstr "一年"
-#: gajim/gtk/history_sync.py:202
+#: gajim/gtk/history_sync.py:211
msgid "Everything"
msgstr "全部"
-#: gajim/gtk/history_sync.py:230 gajim/gtk/account_wizard.py:248
-#: gajim/gtk/account_wizard.py:267
+#: gajim/gtk/history_sync.py:239 gajim/gtk/account_wizard.py:274
+#: gajim/gtk/account_wizard.py:293 gajim/gtk/account_wizard.py:309
msgid "Connecting..."
msgstr "正在连接…"
-#: gajim/gtk/history_sync.py:242
+#: gajim/gtk/history_sync.py:251
#, python-format
msgid "%(received)s of %(max)s"
msgstr "已收到 %(max)s 中的 %(received)s"
-#: gajim/gtk/history_sync.py:246
+#: gajim/gtk/history_sync.py:255
#, fuzzy, python-format
msgid "Downloaded %s messages"
msgstr "已下载 %s 条信息"
-#: gajim/gtk/history_sync.py:266
+#: gajim/gtk/history_sync.py:275
#, fuzzy, python-format
msgid ""
"Finished synchronising chat history:\n"
@@ -9660,16 +9622,16 @@ msgstr ""
" {received} 条信息已下载。\n"
" "
-#: gajim/gtk/history_sync.py:270
+#: gajim/gtk/history_sync.py:279
msgid "Gajim is fully synchronised with the archive."
msgstr ""
-#: gajim/gtk/history_sync.py:273
+#: gajim/gtk/history_sync.py:282
msgid "There is already a synchronisation in progress. Please try again later."
msgstr ""
#: gajim/gtk/about.py:51 data/org.gajim.Gajim.desktop.in:6
-#: data/org.gajim.Gajim.appdata.xml.in:11
+#: data/org.gajim.Gajim.appdata.xml.in:8
#, fuzzy
msgid "A GTK XMPP client"
msgstr "一个 GTK+ 的 XMPP 客户端"
@@ -9722,126 +9684,126 @@ msgstr "感谢"
msgid "translator-credits"
msgstr "翻译者-贡献"
-#: gajim/gtk/filechoosers.py:87
+#: gajim/gtk/filechoosers.py:88
#, fuzzy
msgid "Choose File to Send…"
msgstr "选择要发送的文件..."
-#: gajim/gtk/filechoosers.py:93
+#: gajim/gtk/filechoosers.py:94
#, fuzzy
msgid "Choose Avatar…"
msgstr "选择归档文件"
-#: gajim/gtk/filechoosers.py:97
+#: gajim/gtk/filechoosers.py:98
#, fuzzy
msgid "PNG files"
msgstr "所有文件"
-#: gajim/gtk/filechoosers.py:98
+#: gajim/gtk/filechoosers.py:99
#, fuzzy
msgid "JPEG files"
msgstr "所有文件"
-#: gajim/gtk/filechoosers.py:99
+#: gajim/gtk/filechoosers.py:100
#, fuzzy
msgid "SVG files"
msgstr "发送文件(_F)"
-#: gajim/gtk/filechoosers.py:101
+#: gajim/gtk/filechoosers.py:102
msgid "Images"
msgstr "图像"
-#: gajim/gtk/filechoosers.py:138
+#: gajim/gtk/filechoosers.py:139
msgid "Choose Archive"
msgstr "选择归档文件"
-#: gajim/gtk/filechoosers.py:140
+#: gajim/gtk/filechoosers.py:141
#, fuzzy
msgid "ZIP files"
msgstr "Zip 文件"
-#: gajim/gtk/filechoosers.py:145
+#: gajim/gtk/filechoosers.py:146
#, fuzzy
msgid "Save File as…"
msgstr "另存为..."
-#: gajim/gtk/filechoosers.py:179
+#: gajim/gtk/filechoosers.py:180
#, fuzzy
msgid "_Open"
msgstr "OpenPGP: "
-#: gajim/gtk/tooltips.py:221
+#: gajim/gtk/tooltips.py:225
#, python-format
msgid "%(owner_or_admin_or_member)s of this group chat"
msgstr "此聊天室的 %(owner_or_admin_or_member)s"
-#: gajim/gtk/tooltips.py:506
+#: gajim/gtk/tooltips.py:484
msgid "Connected"
msgstr "已连接"
-#: gajim/gtk/tooltips.py:508
+#: gajim/gtk/tooltips.py:486
msgid "Disconnected"
msgstr "已断开连接"
-#: gajim/gtk/tooltips.py:561
+#: gajim/gtk/tooltips.py:540
#, fuzzy
msgid "File Name: "
msgstr "文件名: %s"
-#: gajim/gtk/tooltips.py:564
+#: gajim/gtk/tooltips.py:543
#, fuzzy
msgid "?Noun:Download"
msgstr "下载"
-#: gajim/gtk/tooltips.py:570
+#: gajim/gtk/tooltips.py:549
#, fuzzy
msgid "?Noun:Upload"
msgstr "上传"
-#: gajim/gtk/tooltips.py:577
+#: gajim/gtk/tooltips.py:556
#, fuzzy
msgid "?transfer type:Type: "
msgstr "文件传输已停止"
-#: gajim/gtk/tooltips.py:583
+#: gajim/gtk/tooltips.py:562
#, fuzzy
msgid "?transfer status:Transferred: "
msgstr "?transfer status:暂停"
-#: gajim/gtk/tooltips.py:586
+#: gajim/gtk/tooltips.py:565
#, fuzzy
msgid "?transfer status:Status: "
msgstr "?transfer status:暂停"
-#: gajim/gtk/tooltips.py:588
+#: gajim/gtk/tooltips.py:567
msgid "Description: "
msgstr "描述: "
-#: gajim/gtk/tooltips.py:612
+#: gajim/gtk/tooltips.py:591
#, fuzzy
msgid "?transfer status:Aborted"
msgstr "?transfer status:暂停"
-#: gajim/gtk/tooltips.py:614
+#: gajim/gtk/tooltips.py:593
#, fuzzy
msgid "?transfer status:Completed"
msgstr "?transfer status:暂停"
-#: gajim/gtk/tooltips.py:616
+#: gajim/gtk/tooltips.py:595
msgid "?transfer status:Paused"
msgstr "?transfer status:暂停"
-#: gajim/gtk/tooltips.py:619
+#: gajim/gtk/tooltips.py:598
#, fuzzy
msgid "?transfer status:Stalled"
msgstr "?transfer status:暂停"
-#: gajim/gtk/tooltips.py:623
+#: gajim/gtk/tooltips.py:602
#, fuzzy
msgid "?transfer status:Transferring"
msgstr "?transfer status:暂停"
-#: gajim/gtk/tooltips.py:624 gajim/gtk/tooltips.py:625
+#: gajim/gtk/tooltips.py:603 gajim/gtk/tooltips.py:604
#, fuzzy
msgid "?transfer status:Not started"
msgstr "?transfer status:暂停"
@@ -9850,7 +9812,7 @@ msgstr "?transfer status:暂停"
msgid " (optional)..."
msgstr ""
-#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:539
+#: gajim/gtk/groupchat_creation.py:138 gajim/gtk/account_wizard.py:604
#, fuzzy
msgid "Invalid Address"
msgstr "无效文件"
@@ -9906,25 +9868,25 @@ msgstr "聊天室消息突出显示"
msgid "Group Chat Message Received"
msgstr "收到的聊天室消息"
-#: gajim/gtk/dataform.py:240 gajim/gtk/dataform.py:278
+#: gajim/gtk/dataform.py:252 gajim/gtk/dataform.py:290
#, fuzzy
msgid "Required"
msgstr "require"
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
msgid "Yes"
msgstr "Yes"
-#: gajim/gtk/dataform.py:303
+#: gajim/gtk/dataform.py:315
msgid "No"
msgstr "No"
-#: gajim/gtk/dataform.py:678 gajim/gtk/adhoc.py:86
+#: gajim/gtk/dataform.py:690 gajim/gtk/adhoc.py:86
#, fuzzy
msgid "Cancel"
msgstr "取消(_C)"
-#: gajim/gtk/dataform.py:680
+#: gajim/gtk/dataform.py:692
msgid "Submit"
msgstr ""
@@ -9942,11 +9904,6 @@ msgstr "使用账户 %s"
msgid "Hide _Contact List"
msgstr "邀请联系人(_C)"
-#: gajim/gtk/statusicon.py:270
-#, fuzzy
-msgid "Show _Contact List"
-msgstr "只显示活动的联系人(_A)"
-
#: gajim/gtk/statusicon.py:278
msgid "Hide this menu"
msgstr "隐藏本菜单"
@@ -9990,35 +9947,30 @@ msgid ""
"later."
msgstr "发布您的个人信息时发生错误, 请稍后重试。"
-#: gajim/gtk/mam_preferences.py:40
+#: gajim/gtk/mam_preferences.py:42
#, python-format
msgid "Archiving Preferences for %s"
msgstr "%s 的存档首选项"
-#: gajim/gtk/mam_preferences.py:89
+#: gajim/gtk/mam_preferences.py:99
#, fuzzy
msgid "Archiving Preferences Saved"
msgstr "编辑存档首选项(_V)"
-#: gajim/gtk/mam_preferences.py:90
+#: gajim/gtk/mam_preferences.py:100
#, fuzzy
msgid "Your archiving preferences have successfully been saved."
msgstr "您的存档首选项已成功保存!"
-#: gajim/gtk/mam_preferences.py:101
+#: gajim/gtk/mam_preferences.py:107
#, fuzzy
-msgid "No response from the Server"
-msgstr "尚未连接到服务器"
+msgid "Archiving Preferences Error"
+msgstr "编辑存档首选项(_V)"
-#: gajim/gtk/mam_preferences.py:103
+#: gajim/gtk/mam_preferences.py:108
msgid "Error received: {}"
msgstr "收到错误:{}"
-#: gajim/gtk/mam_preferences.py:105
-#, fuzzy
-msgid "Archiving Preferences Error"
-msgstr "编辑存档首选项(_V)"
-
#: gajim/gtk/advanced_config.py:95
msgid "Activated"
msgstr "激活的"
@@ -10067,181 +10019,181 @@ msgstr "无"
msgid "?password:Hidden"
msgstr "密码: "
-#: gajim/gtk/server_info.py:138
+#: gajim/gtk/server_info.py:129
msgid "Support"
msgstr ""
-#: gajim/gtk/server_info.py:139
+#: gajim/gtk/server_info.py:130
msgid "Security"
msgstr ""
-#: gajim/gtk/server_info.py:140
+#: gajim/gtk/server_info.py:131
msgid "Feedback"
msgstr ""
-#: gajim/gtk/server_info.py:141
+#: gajim/gtk/server_info.py:132
msgid "Abuse"
msgstr ""
-#: gajim/gtk/server_info.py:142
+#: gajim/gtk/server_info.py:133
msgid "Sales"
msgstr ""
-#: gajim/gtk/server_info.py:226
+#: gajim/gtk/server_info.py:217
#, python-format
msgid "%(days)s days, %(hours)s hours"
msgstr ""
-#: gajim/gtk/server_info.py:350
+#: gajim/gtk/server_info.py:340
#, fuzzy
msgid ""
"\n"
"Disabled in preferences"
msgstr "编辑存档首选项(_V)"
-#: gajim/gtk/features.py:101
+#: gajim/gtk/features.py:90
msgid "Audio / Video"
msgstr "音频/视频"
-#: gajim/gtk/features.py:103
+#: gajim/gtk/features.py:92
#, fuzzy
msgid "Enables Gajim to provide Audio and Video chats"
msgstr "开始进行语音视频通话的能力。"
-#: gajim/gtk/features.py:104
+#: gajim/gtk/features.py:93
msgid ""
"Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, gstreamer1.0-libav, "
"gstreamer1.0-plugins-ugly"
msgstr ""
-#: gajim/gtk/features.py:106 gajim/gtk/features.py:157
-#: gajim/gtk/preferences.py:364
+#: gajim/gtk/features.py:95 gajim/gtk/features.py:145
+#: gajim/gtk/preferences.py:363
#, fuzzy
msgid "Feature not available under Windows"
msgstr "特性在 Windows 下不可用。"
-#: gajim/gtk/features.py:110
+#: gajim/gtk/features.py:99
#, fuzzy
msgid ""
"Enables Gajim to measure your computer's idle time in order to set your "
"Status automatically"
msgstr "测算空闲时间以自动调整状态的能力。"
-#: gajim/gtk/features.py:112
+#: gajim/gtk/features.py:101
#, fuzzy
msgid "Requires: libxss"
msgstr "需要 libxss 库。"
-#: gajim/gtk/features.py:113 gajim/gtk/features.py:134
+#: gajim/gtk/features.py:102 gajim/gtk/features.py:123
msgid "No additional requirements"
msgstr ""
-#: gajim/gtk/features.py:115
+#: gajim/gtk/features.py:104
#, fuzzy
msgid "Bonjour / Zeroconf (Serverless Chat)"
msgstr "Bonjour / Zeroconf"
-#: gajim/gtk/features.py:117
+#: gajim/gtk/features.py:106
#, fuzzy
msgid ""
"Enables Gajim to automatically detected clients in a local network for "
"serverless chats"
msgstr "无需服务器自动侦测本地网络中其他客户端进行聊天"
-#: gajim/gtk/features.py:119
+#: gajim/gtk/features.py:108
#, fuzzy
msgid "Requires: gir1.2-avahi-0.6"
msgstr "需要: gir1.2-gupnpigd-1.0"
-#: gajim/gtk/features.py:120
+#: gajim/gtk/features.py:109
#, fuzzy, python-format
msgid "Requires: pybonjour and bonjour SDK running (%(url)s)"
msgstr "需要pybonjour和bonjour的SDK运行 (%(url)s)"
-#: gajim/gtk/features.py:123
+#: gajim/gtk/features.py:112
#, fuzzy
msgid "Location detection"
msgstr "连接"
-#: gajim/gtk/features.py:125
+#: gajim/gtk/features.py:114
msgid ""
"Enables Gajim to be location-aware, if the user decides to publish the "
"device’s location"
msgstr ""
-#: gajim/gtk/features.py:127
+#: gajim/gtk/features.py:116
#, fuzzy
msgid "Requires: geoclue"
msgstr "需要 Gspell。"
-#: gajim/gtk/features.py:128
+#: gajim/gtk/features.py:117
#, fuzzy
msgid "Feature is not available under Windows"
msgstr "特性在 Windows 下不可用。"
-#: gajim/gtk/features.py:130
+#: gajim/gtk/features.py:119
#, fuzzy
msgid "Notification Sounds"
msgstr "通知"
-#: gajim/gtk/features.py:132
+#: gajim/gtk/features.py:121
#, fuzzy
msgid "Enables Gajim to play sounds for various notifications"
msgstr "开始进行语音视频通话的能力。"
-#: gajim/gtk/features.py:133
+#: gajim/gtk/features.py:122
#, fuzzy
msgid "Requires: gsound"
msgstr "需要 python-dbus。"
-#: gajim/gtk/features.py:136
+#: gajim/gtk/features.py:125
#, fuzzy
msgid "Secure Password Storage"
msgstr "保存密码"
-#: gajim/gtk/features.py:138
+#: gajim/gtk/features.py:127
#, fuzzy
msgid ""
"Enables Gajim to store Passwords securely instead of storing them in "
"plaintext"
msgstr "密码可以被安全地存储, 而不只是以纯文本方式。"
-#: gajim/gtk/features.py:140
-msgid ""
-"Requires: libsecret and a provider (such as GNOME Keyring and KSecretService)"
-msgstr ""
+#: gajim/gtk/features.py:129
+#, fuzzy
+msgid "Requires: gnome-keyring or kwallet"
+msgstr "需要 gnome-keyring 和 python-gnome2-desktop, 或 kwalletcli。"
-#: gajim/gtk/features.py:142
+#: gajim/gtk/features.py:130
msgid "Windows Credential Vault is used for secure password storage"
msgstr ""
-#: gajim/gtk/features.py:145
+#: gajim/gtk/features.py:133
msgid "Spell Checker"
msgstr "拼写检查工具"
-#: gajim/gtk/features.py:147
+#: gajim/gtk/features.py:135
msgid "Enables Gajim to spell check your messages while composing"
msgstr ""
-#: gajim/gtk/features.py:149 gajim/gtk/features.py:150
+#: gajim/gtk/features.py:137 gajim/gtk/features.py:138
#, fuzzy
msgid "Requires: Gspell"
msgstr "需要 Gspell。"
-#: gajim/gtk/features.py:152
+#: gajim/gtk/features.py:140
msgid "UPnP-IGD Port Forwarding"
msgstr ""
-#: gajim/gtk/features.py:154
+#: gajim/gtk/features.py:142
msgid ""
"Enables Gajim to request your router to forward ports for file transfers"
msgstr ""
-#: gajim/gtk/features.py:156
+#: gajim/gtk/features.py:144
msgid "Requires: gir1.2-gupnpigd-1.0"
msgstr "需要: gir1.2-gupnpigd-1.0"
-#: gajim/gtk/features.py:217
+#: gajim/gtk/features.py:200
#, fuzzy
msgid "Disabled in Preferences"
msgstr "编辑存档首选项(_V)"
@@ -10287,7 +10239,7 @@ msgstr "不合法的列表名"
msgid "You must enter a name to create a privacy list."
msgstr "您必须输入一个名称以创建一个隐私策略列表。"
-#: gajim/gtk/groupchat_invite.py:305
+#: gajim/gtk/groupchat_invite.py:304
#, fuzzy
msgid "Invite New Contact"
msgstr "邀请联系人(_C)"
@@ -10315,7 +10267,7 @@ msgstr "完成(_F)"
msgid "Commands"
msgstr "命令"
-#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:62
+#: gajim/gtk/adhoc.py:104 gajim/gtk/account_wizard.py:63
msgid "Next"
msgstr ""
@@ -10388,119 +10340,133 @@ msgstr "%s 的认证请求"
msgid "Loading"
msgstr "编写代码"
-#: gajim/gtk/account_wizard.py:61
+#: gajim/gtk/account_wizard.py:62
#, fuzzy
msgid "Connect"
msgstr "已连接"
-#: gajim/gtk/account_wizard.py:63
+#: gajim/gtk/account_wizard.py:64
msgid "Log In"
msgstr ""
-#: gajim/gtk/account_wizard.py:77
+#: gajim/gtk/account_wizard.py:78
msgid "An error occurred during account creation"
msgstr "创建帐户过程中发生错误"
-#: gajim/gtk/account_wizard.py:151
+#: gajim/gtk/account_wizard.py:164
#, fuzzy
msgid "Creating Account..."
msgstr "移除账户 %s"
-#: gajim/gtk/account_wizard.py:152
+#: gajim/gtk/account_wizard.py:165
#, fuzzy
msgid "Trying to create account..."
msgstr "点击以改变该账户的密码"
-#: gajim/gtk/account_wizard.py:249 gajim/gtk/account_wizard.py:268
+#: gajim/gtk/account_wizard.py:275 gajim/gtk/account_wizard.py:294
+#: gajim/gtk/account_wizard.py:310
#, fuzzy
msgid "Connecting to server..."
msgstr "正在连接…"
-#: gajim/gtk/account_wizard.py:317 gajim/gtk/account_wizard.py:318
+#: gajim/gtk/account_wizard.py:364 gajim/gtk/account_wizard.py:365
+msgid "Anonymous login not supported"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:366
+#, fuzzy
+msgid "This server does not support anonymous"
+msgstr "您的服务器不支持 Vcard"
+
+#: gajim/gtk/account_wizard.py:380 gajim/gtk/account_wizard.py:381
#, fuzzy
msgid "Signup not allowed"
msgstr "不允许的字符"
-#: gajim/gtk/account_wizard.py:319
+#: gajim/gtk/account_wizard.py:382
#, fuzzy
msgid "This server does not allow signup."
msgstr "您的服务器不支持 Vcard"
-#: gajim/gtk/account_wizard.py:335 gajim/gtk/account_wizard.py:336
+#: gajim/gtk/account_wizard.py:398 gajim/gtk/account_wizard.py:399
#, fuzzy
msgid "Connection failed"
msgstr "连接失败"
-#: gajim/gtk/account_wizard.py:337
+#: gajim/gtk/account_wizard.py:400
msgid ""
"Gajim was not able to reach the server. Make sure your XMPP address is "
"correct."
msgstr ""
-#: gajim/gtk/account_wizard.py:391
+#: gajim/gtk/account_wizard.py:454
#, fuzzy
msgid "Account is being created"
msgstr "账户 \"%s\" 已连接到服务器"
-#: gajim/gtk/account_wizard.py:456 gajim/gtk/accounts.py:544
+#: gajim/gtk/account_wizard.py:491
+msgid "The server rejected the registration without an error message"
+msgstr ""
+
+#: gajim/gtk/account_wizard.py:521 gajim/gtk/accounts.py:557
#, fuzzy
msgid "Add Account"
msgstr "添加联系人(_A)..."
-#: gajim/gtk/account_wizard.py:563
+#: gajim/gtk/account_wizard.py:628
#, fuzzy
msgid "Create New Account"
msgstr "创建新消息"
-#: gajim/gtk/account_wizard.py:622
+#: gajim/gtk/account_wizard.py:687
#, fuzzy
msgid "Must be a port number"
msgstr "自定义端口必须为端口号。"
-#: gajim/gtk/account_wizard.py:629
+#: gajim/gtk/account_wizard.py:694
#, fuzzy
msgid "Port must be a number between 0 and 65535"
msgstr "资源必须在 1 到 1023 个字符之间"
-#: gajim/gtk/account_wizard.py:666
+#: gajim/gtk/account_wizard.py:731
#, fuzzy
msgid "Advanced settings"
msgstr "高级动作"
-#: gajim/gtk/account_wizard.py:708
+#: gajim/gtk/account_wizard.py:777
#, fuzzy
msgid "Security Warning"
msgstr "将封禁 %s"
-#: gajim/gtk/account_wizard.py:727
+#: gajim/gtk/account_wizard.py:796
#, fuzzy, python-format
msgid "Unknown TLS error '%s'"
msgstr "未知的 SSL 错误: %d"
-#: gajim/gtk/account_wizard.py:762 gajim/gtk/account_wizard.py:765
+#: gajim/gtk/account_wizard.py:831 gajim/gtk/account_wizard.py:834
#, fuzzy
msgid "Create Account"
msgstr "移除账户 %s"
-#: gajim/gtk/account_wizard.py:813
+#: gajim/gtk/account_wizard.py:885
msgid "Redirect"
msgstr ""
-#: gajim/gtk/account_wizard.py:823
+#: gajim/gtk/account_wizard.py:895
#, fuzzy
msgid "Register on the Website"
msgstr "注册到 %s"
-#: gajim/gtk/account_wizard.py:834
+#: gajim/gtk/account_wizard.py:906
#, fuzzy
msgid "Account Added"
msgstr "账户"
-#: gajim/gtk/account_wizard.py:835
+#: gajim/gtk/account_wizard.py:907
msgid "Account has been added successfully"
msgstr "账户已成功添加"
-#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:278
+#: gajim/gtk/xml_console.py:95 gajim/gtk/xml_console.py:279
#, fuzzy
msgid "All Accounts"
msgstr "账户"
@@ -10543,249 +10509,253 @@ msgstr "查找"
msgid "No results found"
msgstr "无结果"
-#: gajim/gtk/preferences.py:367
+#: gajim/gtk/preferences.py:366
msgid "Missing dependencies for Audio/Video"
msgstr ""
-#: gajim/gtk/preferences.py:379 gajim/gtk/preferences.py:388
+#: gajim/gtk/preferences.py:378 gajim/gtk/preferences.py:387
msgid "Default"
msgstr "默认"
-#: gajim/gtk/preferences.py:405
+#: gajim/gtk/preferences.py:404
msgid ""
"<span color=\"red\" font-weight=\"bold\">Unavailable</span>, video support "
"will be disabled"
msgstr ""
-#: gajim/gtk/preferences.py:411
+#: gajim/gtk/preferences.py:410
msgid "<span color=\"green\" font-weight=\"bold\">OpenGL</span> accelerated"
msgstr ""
-#: gajim/gtk/preferences.py:414
+#: gajim/gtk/preferences.py:413
msgid "<span color=\"yellow\" font-weight=\"bold\">Unaccelerated</span>"
msgstr ""
-#: gajim/gtk/preferences.py:886
+#: gajim/gtk/preferences.py:878
msgid "status message title"
msgstr "状态信息标题"
-#: gajim/gtk/preferences.py:887
+#: gajim/gtk/preferences.py:879
msgid "status message text"
msgstr "状态信息文本"
-#: gajim/gtk/accounts.py:119
+#: gajim/gtk/accounts.py:122
#, fuzzy
msgid "Re-Login"
msgstr "现在重新登录?"
-#: gajim/gtk/accounts.py:120
+#: gajim/gtk/accounts.py:123
#, fuzzy
msgid "Re-Login now?"
msgstr "现在重新登录?"
-#: gajim/gtk/accounts.py:121
+#: gajim/gtk/accounts.py:124
#, fuzzy
msgid "To apply all changes instantly, you have to re-login."
msgstr "如果想使所有调整立即生效, 您必须重新登录。"
-#: gajim/gtk/accounts.py:123
+#: gajim/gtk/accounts.py:126
msgid "_Later"
msgstr ""
-#: gajim/gtk/accounts.py:125
+#: gajim/gtk/accounts.py:128
msgid "_Re-Login"
msgstr ""
-#: gajim/gtk/accounts.py:483
+#: gajim/gtk/accounts.py:492
#, fuzzy
msgid "Please check if Bonjour is installed."
msgstr "请检查 Avahi 或者 Bonjour 是否已经安装。"
-#: gajim/gtk/accounts.py:485
+#: gajim/gtk/accounts.py:494
#, fuzzy
msgid "Please check if Avahi is installed."
msgstr "请检查 Avahi 或者 Bonjour 是否已经安装。"
-#: gajim/gtk/accounts.py:520
+#: gajim/gtk/accounts.py:533
#, fuzzy
msgid "Disable Account"
msgstr "无效的账户"
-#: gajim/gtk/accounts.py:521
+#: gajim/gtk/accounts.py:534
#, fuzzy, python-format
msgid "Account %s is still connected"
msgstr "账户 \"%s\" 已连接到服务器"
-#: gajim/gtk/accounts.py:522
+#: gajim/gtk/accounts.py:535
#, fuzzy
msgid "All chat and group chat windows will be closed."
msgstr "所有的聊天和聊天室窗口将会关闭。您想继续吗?"
-#: gajim/gtk/accounts.py:526
+#: gajim/gtk/accounts.py:539
#, fuzzy
msgid "_Disable Account"
msgstr "无效的账户"
-#: gajim/gtk/accounts.py:593
+#: gajim/gtk/accounts.py:606
#, fuzzy
msgid "Label"
msgstr "标签"
-#: gajim/gtk/accounts.py:597
+#: gajim/gtk/accounts.py:612
+msgid "Recognize your account by color"
+msgstr ""
+
+#: gajim/gtk/accounts.py:614
msgid "Login"
msgstr ""
-#: gajim/gtk/accounts.py:600
+#: gajim/gtk/accounts.py:617
#, fuzzy
msgid "Import Contacts"
msgstr "邀请联系人(_C)"
-#: gajim/gtk/accounts.py:604 gajim/gtk/accounts.py:796
-#, fuzzy
-msgid "Client Certificate"
-msgstr "客户端证书"
-
-#: gajim/gtk/accounts.py:607 gajim/gtk/accounts.py:693
+#: gajim/gtk/accounts.py:626 gajim/gtk/accounts.py:712
#, fuzzy
msgid "Connect on startup"
msgstr "Gajim 启动时连接(_O)"
-#: gajim/gtk/accounts.py:611 gajim/gtk/accounts.py:698
+#: gajim/gtk/accounts.py:630 gajim/gtk/accounts.py:717
#, fuzzy
msgid "Save conversations for all contacts"
msgstr "保存与所有联系人的聊天记录(_L)"
-#: gajim/gtk/accounts.py:613 gajim/gtk/accounts.py:700
+#: gajim/gtk/accounts.py:632 gajim/gtk/accounts.py:719
msgid "Store conversations on the harddrive"
msgstr ""
-#: gajim/gtk/accounts.py:615 gajim/gtk/accounts.py:702
+#: gajim/gtk/accounts.py:634 gajim/gtk/accounts.py:721
#, fuzzy
msgid "Global Status"
msgstr "所有状态"
-#: gajim/gtk/accounts.py:617
+#: gajim/gtk/accounts.py:636
#, fuzzy
msgid "Synchronise the status of all accounts"
msgstr "改变一个或多个账户状态"
-#: gajim/gtk/accounts.py:619
+#: gajim/gtk/accounts.py:638
msgid "Use file transfer proxies"
msgstr "使用文件传输代理服务器"
-#: gajim/gtk/accounts.py:635
+#: gajim/gtk/accounts.py:654
#, fuzzy
msgid "Idle Time"
msgstr "空闲开始时间:"
-#: gajim/gtk/accounts.py:637
+#: gajim/gtk/accounts.py:656
msgid "Disclose the time of your last activity"
msgstr ""
-#: gajim/gtk/accounts.py:639
+#: gajim/gtk/accounts.py:658
msgid "Local System Time"
msgstr ""
-#: gajim/gtk/accounts.py:641
+#: gajim/gtk/accounts.py:660
msgid "Disclose the local system time of the device Gajim runs on"
msgstr ""
-#: gajim/gtk/accounts.py:644
+#: gajim/gtk/accounts.py:663
#, fuzzy
msgid "Client / Operating System"
msgstr "客户端证书"
-#: gajim/gtk/accounts.py:646
+#: gajim/gtk/accounts.py:665
#, fuzzy
msgid ""
-"Disclose informations about the client and operating system you currently use"
+"Disclose information about the client and operating system you currently use"
msgstr "如果选定, Gajim 会允许他人侦测到您所使用的操作系统"
-#: gajim/gtk/accounts.py:649
+#: gajim/gtk/accounts.py:668
#, fuzzy
msgid "Ignore Unknown Contacts"
msgstr "邀请联系人(_C)"
-#: gajim/gtk/accounts.py:651
+#: gajim/gtk/accounts.py:670
#, fuzzy
msgid "Ignore everything from contacts not in your Roster"
msgstr "忽略联系人列表以外的联系人触发的事件(_I)"
-#: gajim/gtk/accounts.py:669
+#: gajim/gtk/accounts.py:688
msgid "Manually set the hostname for the server"
msgstr ""
-#: gajim/gtk/accounts.py:675 gajim/gtk/accounts.py:745
-#: gajim/gtk/accounts.py:750
+#: gajim/gtk/accounts.py:694 gajim/gtk/accounts.py:764
+#: gajim/gtk/accounts.py:769
#, fuzzy
msgid "Priority"
msgstr "优先级(_T):"
-#: gajim/gtk/accounts.py:695
+#: gajim/gtk/accounts.py:714
#, fuzzy
msgid "Use environment variable"
msgstr "使用 HTTP__PROXY 环境变量(_U)"
-#: gajim/gtk/accounts.py:704
+#: gajim/gtk/accounts.py:723
#, fuzzy
msgid "Synchronize the status of all accounts"
msgstr "改变一个或多个账户状态"
-#: gajim/gtk/accounts.py:714
+#: gajim/gtk/accounts.py:733
#, fuzzy
msgid "First Name"
msgstr "名: "
-#: gajim/gtk/accounts.py:717
+#: gajim/gtk/accounts.py:736
#, fuzzy
msgid "Last Name"
msgstr "姓: "
-#: gajim/gtk/accounts.py:723
+#: gajim/gtk/accounts.py:742
#, fuzzy
msgid "Email"
msgstr "新电子邮件"
-#: gajim/gtk/accounts.py:741
+#: gajim/gtk/accounts.py:760
#, fuzzy
msgid "Adjust to status"
msgstr "依据状态调整(_A)"
-#: gajim/gtk/accounts.py:770
+#: gajim/gtk/accounts.py:789
#, fuzzy
msgid "Enable"
msgstr "启用"
-#: gajim/gtk/accounts.py:778
+#: gajim/gtk/accounts.py:797
#, fuzzy
msgid "Port"
msgstr "端口(_P)"
-#: gajim/gtk/accounts.py:788
+#: gajim/gtk/accounts.py:807
#, fuzzy
msgid "Connection Settings"
msgstr "连接"
-#: gajim/gtk/accounts.py:798
+#: gajim/gtk/accounts.py:815
+#, fuzzy
+msgid "Client Certificate"
+msgstr "客户端证书"
+
+#: gajim/gtk/accounts.py:817
msgid "PKCS12 Files"
msgstr "PKCS12 文件"
-#: gajim/gtk/accounts.py:800
+#: gajim/gtk/accounts.py:819
#, fuzzy
msgid "Encrypted Certificate"
msgstr "客户端证书"
-#: gajim/gtk/accounts.py:804
+#: gajim/gtk/accounts.py:823
#, fuzzy
msgid "Certificate Settings"
msgstr "客户端证书"
-#: gajim/gtk/accounts.py:816
+#: gajim/gtk/accounts.py:835
#, fuzzy
msgid "Save Password"
msgstr "保存密码"
-#: gajim/gtk/accounts.py:824
+#: gajim/gtk/accounts.py:843
#, fuzzy
msgid "Login Settings"
msgstr "插件"
@@ -10834,19 +10804,19 @@ msgid "Removed %d contact"
msgid_plural "Removed %d contacts"
msgstr[0] "删除了%d个联系人"
-#: gajim/gtk/util.py:565
+#: gajim/gtk/util.py:573
msgid "Unknown Artist"
msgstr "未知艺术家"
-#: gajim/gtk/util.py:566
+#: gajim/gtk/util.py:574
msgid "Unknown Title"
msgstr "未知标题"
-#: gajim/gtk/util.py:567
+#: gajim/gtk/util.py:575
msgid "Unknown Source"
msgstr "未知来源"
-#: gajim/gtk/util.py:569
+#: gajim/gtk/util.py:577
#, python-format
msgid ""
"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -10860,22 +10830,22 @@ msgstr ""
msgid "Bookmarks for %s"
msgstr "将本聊天室加入书签(_B)"
-#: gajim/plugins/pluginmanager.py:727 gajim/plugins/pluginmanager.py:733
+#: gajim/plugins/pluginmanager.py:717 gajim/plugins/pluginmanager.py:723
msgid "Archive corrupted"
msgstr ""
-#: gajim/plugins/pluginmanager.py:729
+#: gajim/plugins/pluginmanager.py:719
#, fuzzy
msgid "Archive empty"
msgstr "文件为空"
-#: gajim/plugins/pluginmanager.py:741 gajim/plugins/pluginmanager.py:749
+#: gajim/plugins/pluginmanager.py:731 gajim/plugins/pluginmanager.py:739
#: gajim/plugins/gui.py:273
#, fuzzy
msgid "Archive is malformed"
msgstr "服务发送了畸形的数据"
-#: gajim/plugins/pluginmanager.py:757 gajim/plugins/gui.py:288
+#: gajim/plugins/pluginmanager.py:747 gajim/plugins/gui.py:288
#: gajim/plugins/gui.py:301
#, fuzzy
msgid "Plugin already exists"
@@ -10933,125 +10903,241 @@ msgstr ""
msgid "Show next pending event"
msgstr "显示所有未处理事件(_E)"
-#: data/org.gajim.Gajim.appdata.xml.in:13
+#: data/org.gajim.Gajim.appdata.xml.in:10
msgid ""
"Gajim aims to be an easy to use and fully-featured XMPP client. With Gajim "
"you can chat through various XMPP services of your choice (e.g. Jabber.org) "
"as well as transports (e.g. Facebook, IRC)."
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:17
+#: data/org.gajim.Gajim.appdata.xml.in:14
msgid ""
"Just chat with your friends or family, easily share pictures and thoughts or "
"discuss the news with your groups."
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:20
+#: data/org.gajim.Gajim.appdata.xml.in:17
msgid ""
"Gajim integrates well with your other devices: just chat and see what's been "
"said on your mobile device."
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:23
+#: data/org.gajim.Gajim.appdata.xml.in:20
#, fuzzy
msgid "Features:"
msgstr "特性"
-#: data/org.gajim.Gajim.appdata.xml.in:25
+#: data/org.gajim.Gajim.appdata.xml.in:22
msgid "Never miss a message, keep all your chat clients synchronized"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:26
+#: data/org.gajim.Gajim.appdata.xml.in:23
msgid "Invite friends to group chats or join one"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:27
+#: data/org.gajim.Gajim.appdata.xml.in:24
msgid "Easily send pictures, videos or other files to friends and groups"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:28
+#: data/org.gajim.Gajim.appdata.xml.in:25
msgid "Chat securely with End-to-End encryption via OMEMO or OpenPGP"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:29
+#: data/org.gajim.Gajim.appdata.xml.in:26
msgid "Use your favorite emoticons, set your own profile picture"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:30
+#: data/org.gajim.Gajim.appdata.xml.in:27
msgid "Keep and manage all your chat history"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:31
+#: data/org.gajim.Gajim.appdata.xml.in:28
msgid "Organize your chats with tabs"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:32
+#: data/org.gajim.Gajim.appdata.xml.in:29
#, fuzzy
msgid "Automatic spell-checking for your messages"
msgstr "对正在编辑的消息进行拼写检查。"
-#: data/org.gajim.Gajim.appdata.xml.in:33
+#: data/org.gajim.Gajim.appdata.xml.in:30
msgid "Connect to other Messengers via Transports (Facebook, IRC, ...)"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:34
+#: data/org.gajim.Gajim.appdata.xml.in:31
msgid ""
"Lookup things on Wikipedia, dictionaries or other search engines directly "
"from the chat window"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:35
+#: data/org.gajim.Gajim.appdata.xml.in:32
msgid ""
"Set your activity, tune, and mood to show your friends how you are feeling"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:36
+#: data/org.gajim.Gajim.appdata.xml.in:33
msgid "Support for multiple accounts"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:37
+#: data/org.gajim.Gajim.appdata.xml.in:34
msgid "Group multiple contacts from one friend to a single Meta-Contact"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:38
+#: data/org.gajim.Gajim.appdata.xml.in:35
msgid "XML console to see what's happening on the protocol layer"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:39
+#: data/org.gajim.Gajim.appdata.xml.in:36
msgid "Serverless messaging (Bonjour/Zeroconf)"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:40
+#: data/org.gajim.Gajim.appdata.xml.in:37
msgid "Support for service discovery including nodes and search for users"
msgstr "支持包括用户搜索和节点在内的服务发现功能"
-#: data/org.gajim.Gajim.appdata.xml.in:41
+#: data/org.gajim.Gajim.appdata.xml.in:38
msgid "Even more features via plugins"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:52
+#: data/org.gajim.Gajim.appdata.xml.in:44
#, fuzzy
msgid "Contact list"
msgstr "联系人"
-#: data/org.gajim.Gajim.appdata.xml.in:56
+#: data/org.gajim.Gajim.appdata.xml.in:48
msgid "Tabbed chat window"
msgstr ""
-#: data/org.gajim.Gajim.appdata.xml.in:60
+#: data/org.gajim.Gajim.appdata.xml.in:52
msgid "Group chat support"
msgstr "聊天室支持"
-#: data/org.gajim.Gajim.appdata.xml.in:64
+#: data/org.gajim.Gajim.appdata.xml.in:56
#, fuzzy
msgid "Chat history"
msgstr "最近: "
-#: data/org.gajim.Gajim.appdata.xml.in:68
+#: data/org.gajim.Gajim.appdata.xml.in:60
#, fuzzy
msgid "Plugin manager"
msgstr "注册失败"
+#, fuzzy
+#~ msgid "Start New Conversation"
+#~ msgstr "开始新对话"
+
+#~ msgid "Unknown SSL error: %d"
+#~ msgstr "未知的 SSL 错误: %d"
+
+#~ msgid "Gajim - %s"
+#~ msgstr "Gajim - %s"
+
+#~ msgid "Choose interval between 2 checks of idleness."
+#~ msgstr "2次检查闲置之间的时间间隔。"
+
+#~ msgid "Dictionary for language \"%s\" not available"
+#~ msgstr "语言“%s”的词典不可用"
+
+#~ msgid ""
+#~ "You have to install the dictionary \"%s\" to use spellchecking, or choose "
+#~ "another language by setting the speller_language option.\n"
+#~ "\n"
+#~ "Highlighting misspelled words feature will not be used"
+#~ msgstr ""
+#~ "您必须安装“%s”词典才能使用拼写检查,或者您可以在 speller_language 选项中选"
+#~ "择另一种语言。\n"
+#~ "\n"
+#~ "高亮拼写错误功能将不会被启用"
+
+#~ msgid "_Reconnect"
+#~ msgstr "重新连接(_R)"
+
+#, fuzzy
+#~ msgid "Show Contact List"
+#~ msgstr "只显示活动的联系人(_A)"
+
+#, fuzzy
+#~ msgid "Add to Contact List"
+#~ msgstr "添加联系人(_A)..."
+
+#, fuzzy
+#~ msgid "Invite Contact"
+#~ msgstr "邀请联系人(_C)"
+
+#, fuzzy
+#~ msgid "Configure Group Chat"
+#~ msgstr "离开聊天室"
+
+#, fuzzy
+#~ msgid "Destroy Group Chat"
+#~ msgstr "新聊天室"
+
+#, fuzzy
+#~ msgid ""
+#~ "If enabled, Gajim will display an icon on each tab containing unread "
+#~ "messages. Depending on the theme, this icon may be animated."
+#~ msgstr ""
+#~ "如果为真, Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题, 该图标"
+#~ "可能是动态的。"
+
+#, fuzzy
+#~ msgid "Server must be between 1 and 1023 bytes"
+#~ msgstr "服务器名必须在 1 到 1023 个字符之间"
+
+#~ msgid "Invalid character in hostname."
+#~ msgstr "主机名中有无效的字符。"
+
+#~ msgid "Server address required."
+#~ msgstr "服务器的地址是必须的。"
+
+#, fuzzy
+#~ msgid "Username must be between 1 and 1023 bytes"
+#~ msgstr "用户名必须在 1 到 1023 个字符之间"
+
+#~ msgid "Invalid character in username."
+#~ msgstr "在用户名中有无效的字符。"
+
+#, fuzzy
+#~ msgid "Resource must be between 1 and 1023 bytes"
+#~ msgstr "资源必须在 1 到 1023 个字符之间"
+
+#~ msgid "Invalid character in resource."
+#~ msgstr "资源中含有无效字符。"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing in."
+#~ msgstr "提醒我联系人登录(_I)"
+
+#, fuzzy
+#~ msgid "Notification color for contacts signing out."
+#~ msgstr "提醒我联系人登出(_O)"
+
+#, fuzzy
+#~ msgid "Notification color for new message notification."
+#~ msgstr "在弹出提示中预览消息?"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer request."
+#~ msgstr "文件传输完成时提醒我(_N)"
+
+#, fuzzy
+#~ msgid "Notification color for file transfer errors."
+#~ msgstr "文件传输完成时提醒我(_N)"
+
+#, fuzzy
+#~ msgid "Notification background color for changed status."
+#~ msgstr "状态变更通知的背景色"
+
+#~ msgid "Event Type"
+#~ msgstr "事件类型"
+
+#~ msgid "Event desc"
+#~ msgstr "事件"
+
+#, fuzzy
+#~ msgid "No response from the Server"
+#~ msgstr "尚未连接到服务器"
+
#~ msgid "Resource Conflict"
#~ msgstr "资源冲突"
@@ -11681,9 +11767,6 @@ msgstr "注册失败"
#~ msgid "_Send Private Message"
#~ msgstr "发送私聊消息(_S)"
-#~ msgid "Send _File"
-#~ msgstr "发送文件(_F)"
-
#, fuzzy
#~ msgid "Participant Actions"
#~ msgstr "参与者"
@@ -14284,9 +14367,6 @@ msgstr "注册失败"
#~ "如果用于接收消息的默认端口不合适, 您可以在这里选择另外一个。\n"
#~ "您可能需要改变防火墙设置。"
-#~ msgid "Mer_ge accounts"
-#~ msgstr "合并帐户(_G)"
-
#~ msgid "OpenPGP is not usable on this computer"
#~ msgstr "OpenPGP 在这台计算机上不可用"
@@ -14824,9 +14904,6 @@ msgstr "注册失败"
#~ 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"