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:
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po3615
1 files changed, 1847 insertions, 1768 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7b41848b6..4e37f13a7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Gajim\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-28 22:17+0100\n"
+"POT-Creation-Date: 2009-11-25 22:20+0100\n"
"PO-Revision-Date: 2009-08-20 00:07+0200\n"
"Last-Translator: kangkang <kanger@gmail.com>\n"
"Language-Team: sIyU <jabber@lzusiyu.org>\n"
@@ -290,9 +290,9 @@ msgstr "编辑个人信息..."
#. No configured account
#: ../data/glade/account_modification_window.glade.h:16
#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1217
-#: ../src/common/helpers.py:1229 ../src/notify.py:547 ../src/notify.py:568
-#: ../src/notify.py:607 ../src/notify.py:619
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
+#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
+#: ../src/notify.py:620 ../src/notify.py:632
msgid "Gajim"
msgstr "Gajim"
@@ -301,9 +301,9 @@ msgstr "Gajim"
#. General group cannot be changed
#: ../data/glade/account_modification_window.glade.h:17
#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2753
-#: ../src/roster_window.py:5351
+#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
+#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
+#: ../src/roster_window.py:5268
msgid "General"
msgstr "常规"
@@ -357,21 +357,21 @@ msgid "Information about you, as stored in the server"
msgstr "服务器中保存的关于您的信息"
#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1585
-#: ../src/config.py:2131
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
+#: ../src/config.py:2196
msgid "No key selected"
msgstr "没有选择钥匙"
#. None means no proxy profile selected
#: ../data/glade/account_modification_window.glade.h:29
#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1106
-#: ../src/config.py:1209 ../src/config.py:1489 ../src/config.py:1494
-#: ../src/config.py:2038 ../src/config.py:2117 ../src/config.py:2130
-#: ../src/config.py:3317 ../src/config.py:3390 ../src/dialogs.py:293
-#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
-#: ../src/roster_window.py:2807 ../src/roster_window.py:2813
-#: ../src/roster_window.py:2818
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
+#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
+#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
+#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
+#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
+#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
+#: ../src/roster_window.py:2811
msgid "None"
msgstr "无"
@@ -527,8 +527,8 @@ msgstr ""
"您可以考虑下改变现在的防火墙设置。"
#: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1612
-#: ../src/dialogs.py:806
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
+#: ../src/dialogs.py:830
msgid "Jabber ID:"
msgstr "Jabber ID"
@@ -542,7 +542,7 @@ msgid "Mer_ge accounts"
msgstr "合并帐户(_G)"
#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5302
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
msgid "Re_name"
msgstr "重命名(_N)"
@@ -961,7 +961,7 @@ msgstr "名:"
msgid "New entry received"
msgstr "当新事件发生时"
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
msgid "You have received new entry:"
msgstr ""
@@ -1009,12 +1009,12 @@ msgstr "输入新密码"
msgid "<b>Type your new status message</b>"
msgstr "<b>键入新的状态消息</b>"
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
#, fuzzy
msgid "Activity:"
msgstr "活动"
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
#, fuzzy
msgid "Mood:"
msgstr "房间:"
@@ -1109,8 +1109,8 @@ msgstr "编辑群组"
#. Invite to
#. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5257
-#: ../src/roster_window.py:5412
+#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
+#: ../src/roster_window.py:5333
msgid "In_vite to"
msgstr "邀请到(_V)"
@@ -1125,8 +1125,8 @@ msgid "Remo_ve"
msgstr "移除(_R)"
#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5267
-#: ../src/roster_window.py:5497
+#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
+#: ../src/roster_window.py:5420
#, fuzzy
msgid "Send Cus_tom Status"
msgstr "发送自定义 XML"
@@ -1162,8 +1162,8 @@ msgid "_Allow him/her to see my status"
msgstr "允许他/她查看我的状态(_A)"
#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5330
-#: ../src/roster_window.py:5449 ../src/roster_window.py:5578
+#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
+#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
msgid "_Block"
msgstr ""
@@ -1174,7 +1174,7 @@ msgstr "禁止他/她查看我的状态(_F)"
#: ../data/glade/contact_context_menu.glade.h:20
#: ../data/glade/gc_control_popup_menu.glade.h:6
#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5647
+#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
msgid "_History"
msgstr "历史(_H)"
@@ -1197,8 +1197,8 @@ msgid "_Subscription"
msgstr "认证(_S)"
#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5324
-#: ../src/roster_window.py:5443 ../src/roster_window.py:5575
+#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
+#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
msgid "_Unblock"
msgstr ""
@@ -1289,7 +1289,7 @@ msgstr "该操作会从列表中移除文件传输。如果该传输处于活动
msgid "When a file transfer is complete show a popup notification"
msgstr "传输完成后显示弹出气泡提示"
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:792
+#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
msgid "_Continue"
msgstr "继续(_C)"
@@ -1297,7 +1297,7 @@ msgstr "继续(_C)"
msgid "_Notify me when a file transfer is complete"
msgstr "文件传输完成时提醒我(_N)"
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:200
+#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
msgid "_Open Containing Folder"
msgstr "打开文件夹(_O)"
@@ -1325,7 +1325,7 @@ msgstr ""
"联系人栏\n"
"聊天条"
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:818
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
msgid "Bold"
msgstr "粗体"
@@ -1345,11 +1345,11 @@ msgstr "Gajim 主题自定义"
msgid "Gone"
msgstr "已离开"
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
msgid "Inactive"
msgstr "未活动的"
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:819
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
msgid "Italic"
msgstr "斜体"
@@ -1400,7 +1400,7 @@ msgstr "更换主题(_S)"
msgid "Configure _Room..."
msgstr "设置房间(_R)"
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
#, fuzzy
msgid "_Bookmark"
msgstr "将本房间加入书签(_B)"
@@ -1498,8 +1498,9 @@ msgstr ""
msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
msgstr "Gajim 历史记录管理器"
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2884
-#: ../src/dialogs.py:2987
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
+#: ../src/dialogs.py:3104
msgid "Delete"
msgstr "删除"
@@ -1524,7 +1525,7 @@ msgstr ""
msgid "_Search Database"
msgstr "搜索数据库(_S)"
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:316
+#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
msgid "Conversation History"
msgstr "对话历史"
@@ -1550,7 +1551,7 @@ msgstr "记录聊天历史(_L)"
msgid "Bookmark this room"
msgstr "将本房间加入书签(_B)"
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:1972
+#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
msgid "Join Group Chat"
msgstr "加入群聊"
@@ -1578,8 +1579,8 @@ msgstr "最近:"
msgid "Room:"
msgstr "房间:"
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1201
-#: ../src/disco.py:1628
+#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
+#: ../src/disco.py:1750
msgid "_Join"
msgstr "加入(_J)"
@@ -1607,7 +1608,7 @@ msgstr ""
msgid "Print status:"
msgstr "打印状态:"
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1602
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
msgid "Server:"
msgstr "服务器:"
@@ -1731,17 +1732,26 @@ msgid "Show a list of formattings"
msgstr "点这里插入表情符 (Alt+M)"
#: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+A)"
-msgstr ""
+#, fuzzy
+msgid "Show a menu of advanced functions (Alt+D)"
+msgstr "点这里插入表情符 (Alt+M)"
#: ../data/glade/message_window.glade.h:11
msgid "Show the contact's profile (Ctrl+I)"
msgstr ""
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:12
+msgid "Toggle audio session"
+msgstr ""
+
#: ../data/glade/message_window.glade.h:13
+msgid "Toggle video session"
+msgstr ""
+
+#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
+#: ../data/glade/message_window.glade.h:15
#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:260
+#: ../src/filetransfers_window.py:266
msgid "_Send"
msgstr "发送(_S)"
@@ -1882,6 +1892,16 @@ msgid "Configure color and font of the interface"
msgstr "配置界面颜色与字体"
#: ../data/glade/preferences_window.glade.h:36
+#, fuzzy
+msgid "Contact's message:"
+msgstr "状态消息:(_S)"
+
+#: ../data/glade/preferences_window.glade.h:37
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "联系人名"
+
+#: ../data/glade/preferences_window.glade.h:38
msgid ""
"Detached roster with detached chats\n"
"Detached roster with single chat\n"
@@ -1890,34 +1910,34 @@ msgid ""
"Detached roster with chat grouped by type"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/glade/preferences_window.glade.h:43
#, fuzzy
msgid "Display _activity of contacts in roster"
msgstr "显示名单中的联系人明细(_V)"
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/glade/preferences_window.glade.h:44
msgid "Display _extra email details"
msgstr "显示扩展电子邮件详情(_E)"
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/glade/preferences_window.glade.h:45
#, fuzzy
msgid "Display _tunes of contacts in roster"
msgstr "显示名单中的联系人明细(_V)"
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/glade/preferences_window.glade.h:46
msgid "Display a_vatars of contacts in roster"
msgstr "显示名单中的联系人明细(_V)"
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/glade/preferences_window.glade.h:47
#, fuzzy
msgid "Display m_ood of contacts in roster"
msgstr "显示名单中的联系人明细(_V)"
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/glade/preferences_window.glade.h:48
msgid "Display status _messages of contacts in roster"
msgstr "显示名单中联系人的状态消息(_M)"
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/glade/preferences_window.glade.h:49
msgid ""
"Gajim can send and receive meta-information related to a conversation you "
"may have with a contact. Here you can specify which chatstates you want to "
@@ -1926,7 +1946,7 @@ msgstr ""
"Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定您想在聊天窗口中"
"显示的聊天状态。"
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/glade/preferences_window.glade.h:50
msgid ""
"Gajim can send and receive meta-information related to a conversation you "
"may have with a contact. Here you can specify which chatstates you want to "
@@ -1935,80 +1955,80 @@ msgstr ""
"Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定发给第三方的角"
"色。"
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/glade/preferences_window.glade.h:51
msgid ""
"Gajim will notify you via a popup window in the bottom right of the screen "
"about contacts that just signed out"
msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚离开的联系人"
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/glade/preferences_window.glade.h:53
#, fuzzy
msgid "Hide all buttons in chat windows"
msgstr "在群聊窗口中隐藏按钮。"
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/glade/preferences_window.glade.h:54
#, fuzzy
msgid ""
"If checked, Gajim will allow others to detect the operation system you are "
"using"
msgstr "如果选定,Gajim 会在启动时加入聊天群组"
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/glade/preferences_window.glade.h:55
msgid ""
"If checked, Gajim will also include information about the sender of the new "
"emails"
msgstr "如果选中,Gajim 将包含关于新的电子邮件发送者的信息"
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/glade/preferences_window.glade.h:56
#, fuzzy
msgid ""
"If checked, Gajim will change status to Away when the computer is unused."
msgstr "如果选定,Gajim 同样可以显示系统托盘图标"
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/glade/preferences_window.glade.h:57
msgid ""
"If checked, Gajim will change status to Not Available when the computer has "
"not been used even longer"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/glade/preferences_window.glade.h:58
msgid ""
"If checked, Gajim will display avatars of contacts in roster window and in "
"group chats"
msgstr "如果选定,Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/glade/preferences_window.glade.h:59
msgid ""
"If checked, Gajim will display status messages of contacts under the contact "
"name in roster window and in group chats"
msgstr "如果选定,Gajim 会在名单和群聊窗口中联系人名下方显示联系人状态消息"
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/glade/preferences_window.glade.h:60
#, fuzzy
msgid ""
"If checked, Gajim will display the activity of contacts in the roster window"
msgstr "如果选定,Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/glade/preferences_window.glade.h:61
#, fuzzy
msgid ""
"If checked, Gajim will display the mood of contacts in the roster window"
msgstr "如果选定,Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/glade/preferences_window.glade.h:62
#, fuzzy
msgid ""
"If checked, Gajim will display the tunes of contacts in the roster window"
msgstr "如果选定,Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/glade/preferences_window.glade.h:63
msgid ""
"If checked, Gajim will highlight spelling errors in input fields of chat "
"windows. If no language is explicitly set via right click on the input "
"field, the default language will be used for this contact or group chat."
msgstr ""
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/glade/preferences_window.glade.h:64
#, fuzzy
msgid ""
"If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2018,21 +2038,21 @@ msgstr ""
"当被不在名单中的联系人骚扰时,检查此选项。它会屏蔽所有名单之外联系人的消息,"
"请谨慎使用。"
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/glade/preferences_window.glade.h:65
msgid ""
"If checked, Gajim will keep logs for encrypted messages. Please note that "
"when using E2E encryption the remote party has to agree on logging, else the "
"messages will not be logged."
msgstr ""
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/glade/preferences_window.glade.h:66
#, fuzzy
msgid ""
"If checked, Gajim will show a notification when a new e-mail is received via "
"GMail"
msgstr "如果选中,Gajim 将包含关于新的电子邮件发送者的信息"
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/glade/preferences_window.glade.h:67
msgid ""
"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
"from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2041,91 +2061,91 @@ msgstr ""
"如果选定,Gajim 会以协议特定方式显示状态图标。(例如,MSN 联系人会以 MSN 相同"
"图标方式显示,以表示在线,离开,忙,等等...)"
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/glade/preferences_window.glade.h:68
msgid ""
"If enabled, Gajim will not ask for a status message. The specified default "
"message will be used instead."
msgstr ""
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/glade/preferences_window.glade.h:69
msgid ""
"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
"animated or static graphical emoticons"
msgstr "如果不禁用,Gajim 会用相应的图片表情符替代字符表情,例如“:)”"
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/glade/preferences_window.glade.h:70
msgid "Log _encrypted chat session"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/glade/preferences_window.glade.h:71
#, fuzzy
msgid "Ma_ke message windows compact"
msgstr "消息窗口:(_W)"
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/glade/preferences_window.glade.h:72
msgid "Ma_nage..."
msgstr "管理...(_N)"
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/glade/preferences_window.glade.h:73
msgid ""
"Never\n"
"Only when pending events\n"
"Always"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:74
+#: ../data/glade/preferences_window.glade.h:76
#, fuzzy
msgid "Notifications"
msgstr "帐户修改"
-#: ../data/glade/preferences_window.glade.h:75
+#: ../data/glade/preferences_window.glade.h:77
#, fuzzy
msgid "Notify me about contacts that sign _in"
msgstr "提醒我关于联系人:"
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/glade/preferences_window.glade.h:78
#, fuzzy
msgid "Notify me about contacts that sign _out"
msgstr "提醒我关于联系人:"
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/glade/preferences_window.glade.h:79
msgid "Notify on new _GMail email"
msgstr "新 Gmail 邮件通知"
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/glade/preferences_window.glade.h:80
#, fuzzy
msgid "Personal Events"
msgstr "个人信息"
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/glade/preferences_window.glade.h:81
msgid "Play _sounds"
msgstr "播放声音(_S)"
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/glade/preferences_window.glade.h:82
msgid ""
"Pop it up\n"
"Notify me about it\n"
"Show only in roster"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/glade/preferences_window.glade.h:85
msgid "Preferences"
msgstr "参数"
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/glade/preferences_window.glade.h:86
#, fuzzy
msgid "Show systray:"
msgstr "在系统托盘中显示事件(_S)"
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/glade/preferences_window.glade.h:87
msgid "Sign _in"
msgstr "登录(I)"
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/glade/preferences_window.glade.h:88
msgid "Sign _out"
msgstr "退出登录(_O)"
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/glade/preferences_window.glade.h:89
msgid ""
"Some messages may include rich content (formatting, colors etc). If checked, "
"Gajim will just display the raw message text."
@@ -2133,30 +2153,30 @@ msgstr ""
"一些消息会包含丰富的内容(例如 格式,颜色) 。如果选定,Gajim 将显示原本的消息"
"内容。"
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/glade/preferences_window.glade.h:90
#, fuzzy
msgid "Sort contacts by status"
msgstr "按状态分类联系人(_S)"
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:390
+#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
msgid "Status"
msgstr "状态"
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/glade/preferences_window.glade.h:92
#, fuzzy
msgid "Status _iconset:"
msgstr "默认状态图标设置:(_I)"
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/glade/preferences_window.glade.h:93
#, fuzzy
msgid "Style"
msgstr "已冻结"
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/glade/preferences_window.glade.h:94
msgid "T_heme:"
msgstr "主题:(_H)"
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/glade/preferences_window.glade.h:95
msgid ""
"The auto away status message. If empty, Gajim will not change the current "
"status message\n"
@@ -2164,7 +2184,7 @@ msgid ""
"$T will be replaced by auto-away timeout"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/glade/preferences_window.glade.h:98
msgid ""
"The auto not available status message. If empty, Gajim will not change the "
"current status message\n"
@@ -2172,113 +2192,115 @@ msgid ""
"$T will be replaced by auto-not-available timeout"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/glade/preferences_window.glade.h:101
#, fuzzy
msgid "Use _transports icons"
msgstr "使用代理的图标设定(_T)"
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/glade/preferences_window.glade.h:102
msgid "Use system _default"
msgstr "使用系统默认(_D)"
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/glade/preferences_window.glade.h:103
#, fuzzy
msgid "When new event is received:"
msgstr "当新事件发生时"
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/glade/preferences_window.glade.h:104
+#, fuzzy
+msgid "Your message:"
+msgstr "错误消息:%s"
+
+#: ../data/glade/preferences_window.glade.h:105
+#, fuzzy
+msgid "Your nickname:"
+msgstr "在昵称前:(_E)"
+
+#: ../data/glade/preferences_window.glade.h:106
#, fuzzy
msgid "_Away after:"
msgstr "自动离开(_A):"
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/glade/preferences_window.glade.h:107
msgid "_Browser:"
msgstr "浏览器(_B):"
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/glade/preferences_window.glade.h:108
#, fuzzy
msgid "_Display chat state notifications:"
msgstr "显示聊天状态信息(_F):"
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/glade/preferences_window.glade.h:109
#, fuzzy
msgid "_Emoticons:"
msgstr "表情符:"
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/glade/preferences_window.glade.h:110
msgid "_File manager:"
msgstr "文件管理器:(_F)"
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/glade/preferences_window.glade.h:111
msgid "_Highlight misspelled words"
msgstr "拼写检查(_H)"
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/glade/preferences_window.glade.h:112
msgid "_Ignore events from contacts not in the roster"
msgstr "忽略名单以外的联系人触发的事件(_I)"
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/glade/preferences_window.glade.h:113
#, fuzzy
msgid "_Ignore rich content in incoming messages"
msgstr "忽略收到的消息中的扩展内容"
-#: ../data/glade/preferences_window.glade.h:110
-msgid "_Incoming message:"
-msgstr "抵达的消息:(_I)"
-
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/glade/preferences_window.glade.h:114
msgid "_Log status changes of contacts"
msgstr "记录联系人状态变化(_L)"
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/glade/preferences_window.glade.h:115
msgid "_Mail client:"
msgstr "邮件客户端(_M):"
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/glade/preferences_window.glade.h:116
#, fuzzy
msgid "_Not available after:"
msgstr "自动不可用(_N):"
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/glade/preferences_window.glade.h:117
msgid "_Open..."
msgstr "打开...(_O)"
-#: ../data/glade/preferences_window.glade.h:115
-msgid "_Outgoing message:"
-msgstr "将要送出的消息:(_O)"
-
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/glade/preferences_window.glade.h:118
msgid "_Reset to Default Colors"
msgstr "恢复为默认颜色设置(_R)"
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/glade/preferences_window.glade.h:119
#, fuzzy
msgid "_Send chat state notifications:"
msgstr "显示聊天状态信息(_F):"
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/glade/preferences_window.glade.h:120
msgid "_Status message:"
msgstr "状态消息:(_S)"
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/glade/preferences_window.glade.h:121
msgid "_URL highlight:"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/glade/preferences_window.glade.h:122
msgid "_Window behavior:"
msgstr ""
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/glade/preferences_window.glade.h:123
#, fuzzy
msgid "in _group chats"
msgstr "加入群聊(_G)"
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/glade/preferences_window.glade.h:124
#, fuzzy
msgid "in _roster"
msgstr "不在名单中"
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/glade/preferences_window.glade.h:125
msgid "minutes"
msgstr "分钟"
@@ -2331,7 +2353,7 @@ msgstr "Jabber ID"
msgid "Order:"
msgstr "订阅:"
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3114
+#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
msgid "Privacy List"
msgstr "私人列表"
@@ -2495,7 +2517,7 @@ msgid "<b>Prefix:</b>"
msgstr "<b>属性</b>"
#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
#, fuzzy
msgid "<b>Role:</b>"
msgstr "<b>声音</b>"
@@ -2559,8 +2581,8 @@ msgstr "同时从 Gajim 和服务器移除帐户(_S)"
#. Remove group
#. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5339
-#: ../src/roster_window.py:5459 ../src/roster_window.py:5588
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
+#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
msgid "_Remove"
msgstr "移除(_R)"
@@ -2579,14 +2601,14 @@ msgid "Roster Item Exchange"
msgstr ""
#: ../data/glade/roster_item_exchange_window.glade.h:4
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "删除"
+#: ../data/glade/service_registration_window.glade.h:3
+msgid "_OK"
+msgstr "确定(_O)"
#: ../data/glade/roster_item_exchange_window.glade.h:5
#, fuzzy
-msgid "gtk-ok"
-msgstr "gtk+"
+msgid "gtk-cancel"
+msgstr "删除"
#: ../data/glade/roster_window.glade.h:1
#, fuzzy
@@ -2647,7 +2669,7 @@ msgstr "动作(_A)"
msgid "_Contents"
msgstr "内容(_C)"
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
msgid "_Edit"
msgstr "编辑(_E)"
@@ -2691,12 +2713,12 @@ msgid "_Add contact"
msgstr "添加联系人(_C)"
#. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5600
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
#, fuzzy
msgid "_Information"
msgstr "联系人信息"
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
msgid "_Search"
msgstr "查找(_S)"
@@ -2716,10 +2738,6 @@ msgstr "注册到"
msgid "_Cancel"
msgstr "取消(_C)"
-#: ../data/glade/service_registration_window.glade.h:3
-msgid "_OK"
-msgstr "确定(_O)"
-
#: ../data/glade/single_message_window.glade.h:1
msgid "0"
msgstr "0"
@@ -2937,338 +2955,324 @@ msgstr "资源:"
msgid "Status:"
msgstr "状态:"
-#: ../src/adhoc_commands.py:268
+#: ../src/adhoc_commands.py:295
#, fuzzy
msgid "Cancel confirmation"
msgstr "联系人信息"
-#: ../src/adhoc_commands.py:269
+#: ../src/adhoc_commands.py:296
msgid ""
"You are in process of executing command. Do you really want to cancel it?"
msgstr ""
-#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
msgid "Service sent malformed data"
msgstr ""
-#: ../src/adhoc_commands.py:310
+#: ../src/adhoc_commands.py:337
msgid "Service changed the session identifier."
msgstr ""
#. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:405
+#: ../src/adhoc_commands.py:436
msgid "Service returned an error."
msgstr ""
#. For i18n
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
#, fuzzy
msgid "Activated"
msgstr "活动"
-#: ../src/advanced_configuration_window.py:89
+#: ../src/advanced_configuration_window.py:91
#, fuzzy
msgid "Deactivated"
msgstr "未活动的"
-#: ../src/advanced_configuration_window.py:91
+#: ../src/advanced_configuration_window.py:93
msgid "Boolean"
msgstr ""
-#: ../src/advanced_configuration_window.py:92
+#: ../src/advanced_configuration_window.py:94
#, fuzzy
msgid "Integer"
msgstr "群组内"
-#: ../src/advanced_configuration_window.py:93
+#: ../src/advanced_configuration_window.py:95
msgid "Text"
msgstr "文本"
-#: ../src/advanced_configuration_window.py:94 ../src/chat_control.py:838
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
msgid "Color"
msgstr ""
-#: ../src/advanced_configuration_window.py:105
+#: ../src/advanced_configuration_window.py:107
msgid "Preference Name"
msgstr "优先名称"
-#: ../src/advanced_configuration_window.py:111
+#: ../src/advanced_configuration_window.py:113
msgid "Value"
msgstr "值"
-#: ../src/advanced_configuration_window.py:119
+#: ../src/advanced_configuration_window.py:121
msgid "Type"
msgstr "类型"
#. we talk about option description in advanced configuration editor
-#: ../src/advanced_configuration_window.py:172
+#: ../src/advanced_configuration_window.py:176
msgid "(None)"
msgstr "(无)"
-#: ../src/advanced_configuration_window.py:255
+#: ../src/advanced_configuration_window.py:259
msgid "Hidden"
msgstr "隐藏"
-#: ../src/atom_window.py:110
+#: ../src/atom_window.py:119
#, python-format
-msgid "You have received new entries (and %(count)d not displayed):"
-msgstr ""
+msgid "You have received new entries (and %d not displayed):"
+msgid_plural "You have received new entries (and %d not displayed):"
+msgstr[0] ""
#. the next script, executed in the "po" directory,
#. generates the following list.
#. #!/bin/sh
#. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
#. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "English"
msgstr "English"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
#, fuzzy
msgid "Belarusian"
msgstr "Bulgarian"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Bulgarian"
msgstr "Bulgarian"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
#, fuzzy
msgid "Breton"
msgstr "Briton"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Czech"
msgstr "Czech"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "German"
msgstr "German"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Greek"
msgstr "Greek"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
#, fuzzy
msgid "British"
msgstr "Briton"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Esperanto"
msgstr "Esperanto"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Spanish"
msgstr "Spanish"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
#, fuzzy
msgid "Basque"
msgstr "Basc"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "French"
msgstr "French"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Croatian"
msgstr "Croatian"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Italian"
msgstr "Italian"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
#, fuzzy
msgid "Norwegian (b)"
msgstr "Norvegian b"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Dutch"
msgstr "Dutch"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
#, fuzzy
msgid "Norwegian"
msgstr "Norvegian"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Polish"
msgstr "Polish"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Portuguese"
msgstr "Portuguese"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Brazilian Portuguese"
msgstr "Brazilian Portuguese"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Russian"
msgstr "Russian"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
#, fuzzy
msgid "Serbian"
msgstr "German"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Slovak"
msgstr "Slovak"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Swedish"
msgstr "Swedish"
-#: ../src/chat_control.py:74
+#: ../src/chat_control.py:75
msgid "Chinese (Ch)"
msgstr "中文"
-#: ../src/chat_control.py:426
+#: ../src/chat_control.py:446
msgid "Spelling language"
msgstr "拼写检查"
#. we are not connected
-#: ../src/chat_control.py:454 ../src/chat_control.py:642
+#: ../src/chat_control.py:478 ../src/chat_control.py:670
msgid "A connection is not available"
msgstr "连接不可用"
-#: ../src/chat_control.py:455 ../src/chat_control.py:643
+#: ../src/chat_control.py:479 ../src/chat_control.py:671
msgid "Your message can not be sent until you are connected."
msgstr "连接之后您的消息才能发送"
-#: ../src/chat_control.py:820
+#: ../src/chat_control.py:861
#, fuzzy
msgid "Underline"
msgstr "下划线"
-#: ../src/chat_control.py:821
+#: ../src/chat_control.py:862
#, fuzzy
msgid "Strike"
msgstr "昵称"
-#: ../src/chat_control.py:844
+#: ../src/chat_control.py:885
#, fuzzy
msgid "Font"
msgstr "字号:(_F)"
-#: ../src/chat_control.py:853
+#: ../src/chat_control.py:894
#, fuzzy
msgid "Clear formating"
msgstr "联系人信息"
-#: ../src/chat_control.py:925
+#: ../src/chat_control.py:972
msgid "Really send file?"
msgstr ""
-#: ../src/chat_control.py:926
+#: ../src/chat_control.py:973
#, python-format
msgid "If you send a file to %s, he/she will know your real Jabber ID."
msgstr ""
-#: ../src/chat_control.py:1317 ../src/chat_control.py:1718
+#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
#, fuzzy
msgid "GPG encryption enabled"
msgstr "启用加密"
#. Add to roster
-#: ../src/chat_control.py:1346 ../src/common/contacts.py:113
-#: ../src/common/helpers.py:55 ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:903 ../src/dialogs.py:1031
-#: ../src/dialogs.py:1882 ../src/dialogs.py:1907 ../src/gajim.py:999
-#: ../src/gajim.py:1750 ../src/gui_menu_builder.py:243
-#: ../src/gui_menu_builder.py:385 ../src/roster_window.py:988
-#: ../src/roster_window.py:1622 ../src/roster_window.py:1624
-#: ../src/roster_window.py:1926 ../src/roster_window.py:3187
-#: ../src/roster_window.py:3213
+#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
+#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
+#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
+#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
+#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
+#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
+#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
msgid "Not in Roster"
msgstr "不在名单中"
-#: ../src/chat_control.py:1359
+#: ../src/chat_control.py:1480
#, fuzzy
msgid "This contact does not support file transfer."
msgstr "文件发送、完成和中止的清单"
-#: ../src/chat_control.py:1362
+#: ../src/chat_control.py:1483
msgid "You need to know the real JID of the contact to send him or her a file."
msgstr ""
-#: ../src/chat_control.py:1469 ../src/tooltips.py:626
-msgid "Unknown Artist"
-msgstr ""
-
-#: ../src/chat_control.py:1471 ../src/tooltips.py:631
-msgid "Unknown Title"
-msgstr ""
-
-#: ../src/chat_control.py:1473 ../src/tooltips.py:636
-msgid "Unknown Source"
-msgstr ""
-
-#: ../src/chat_control.py:1476 ../src/tooltips.py:638
+#: ../src/chat_control.py:1555
#, python-format
-msgid ""
-"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
-"from <i>%(source)s</i>"
+msgid "%(type)s state : %(state)s, reason: %(reason)s"
msgstr ""
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1720
#, python-format
msgid "%(nickname)s from group chat %(room_name)s"
msgstr "群聊 %(room_name)s 的 %(nickname)s"
#. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1698 ../src/dialogs.py:4484
+#: ../src/chat_control.py:1844 ../src/dialogs.py:4627
msgid "No GPG key assigned"
msgstr ""
-#: ../src/chat_control.py:1699
+#: ../src/chat_control.py:1845
msgid ""
"No GPG key is assigned to this contact. So you cannot encrypt messages with "
"GPG."
msgstr ""
-#: ../src/chat_control.py:1708
+#: ../src/chat_control.py:1854
#, fuzzy
msgid "GPG encryption disabled"
msgstr "禁用加密"
-#: ../src/chat_control.py:1734
+#: ../src/chat_control.py:1880
msgid "Session WILL be logged"
msgstr ""
-#: ../src/chat_control.py:1736
+#: ../src/chat_control.py:1882
msgid "Session WILL NOT be logged"
msgstr ""
#. encryption %s active
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
msgid "is"
msgstr ""
-#: ../src/chat_control.py:1750
+#: ../src/chat_control.py:1899
msgid "is NOT"
msgstr ""
#. chat session %s be logged
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
msgid "will"
msgstr ""
-#: ../src/chat_control.py:1752
+#: ../src/chat_control.py:1901
msgid "will NOT"
msgstr ""
#. About encrypted chat session
-#: ../src/chat_control.py:1756
+#: ../src/chat_control.py:1905
#, fuzzy
msgid "and authenticated"
msgstr "使用验证"
#. About encrypted chat session
-#: ../src/chat_control.py:1760
+#: ../src/chat_control.py:1909
#, fuzzy
msgid "and NOT authenticated"
msgstr "使用验证"
@@ -3276,79 +3280,79 @@ msgstr "使用验证"
#. status will become 'is' or 'is not', authentificaed will become
#. 'and authentificated' or 'and not authentificated', logged will become
#. 'will' or 'will not'
-#: ../src/chat_control.py:1766
+#: ../src/chat_control.py:1915
#, python-format
msgid ""
"%(type)s encryption %(status)s active %(authenticated)s.\n"
"Your chat session %(logged)s be logged."
msgstr ""
-#: ../src/chat_control.py:1906
+#: ../src/chat_control.py:2055
msgid "Session negotiation cancelled"
msgstr ""
-#: ../src/chat_control.py:1913
+#: ../src/chat_control.py:2064
#, fuzzy
msgid "This session is encrypted"
msgstr "[本条消息已加密]"
-#: ../src/chat_control.py:1916
+#: ../src/chat_control.py:2067
msgid " and WILL be logged"
msgstr ""
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:2069
msgid " and WILL NOT be logged"
msgstr ""
-#: ../src/chat_control.py:1923
+#: ../src/chat_control.py:2074
msgid ""
"Remote contact's identity not verified. Click the shield button for more "
"details."
msgstr ""
-#: ../src/chat_control.py:1925
+#: ../src/chat_control.py:2076
#, fuzzy
msgid "E2E encryption disabled"
msgstr "禁用加密"
-#: ../src/chat_control.py:1959 ../src/chat_control.py:1972
+#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
#, fuzzy
msgid "The following message was NOT encrypted"
msgstr "[本条消息已加密]"
-#: ../src/chat_control.py:1965
+#: ../src/chat_control.py:2119
#, fuzzy
msgid "The following message was encrypted"
msgstr "[本条消息已加密]"
#. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2235
+#: ../src/chat_control.py:2388
#, python-format
msgid "You just received a new message from \"%s\""
msgstr "收到一条来自 “%s” 的消息"
-#: ../src/chat_control.py:2236
+#: ../src/chat_control.py:2389
msgid ""
"If you close this tab and you have history disabled, this message will be "
"lost."
msgstr "如果您关闭此标签并且禁用历史,此消息会丢失。"
-#: ../src/chat_control.py:2391 ../src/common/connection_handlers.py:2073
-#: ../src/common/connection_handlers.py:2119
-#: ../src/common/connection_handlers.py:2347
-#: ../src/common/connection_handlers.py:2489 ../src/common/connection.py:1368
-#: ../src/gajim.py:154 ../src/session.py:130
+#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
+#: ../src/common/connection_handlers.py:2146
+#: ../src/common/connection_handlers.py:2338
+#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
+#: ../src/gajim.py:154 ../src/session.py:134
msgid "Database Error"
msgstr ""
-#: ../src/chat_control.py:2392
+#: ../src/chat_control.py:2543
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it or remove it (all "
"history will be lost)."
msgstr ""
-#: ../src/chat_control.py:2622
+#: ../src/chat_control.py:2784
#, fuzzy, python-format
msgid "%(name)s is now %(status)s"
msgstr "%(nick)s 的状态是 %(status)s"
@@ -3357,23 +3361,23 @@ msgstr "%(nick)s 的状态是 %(status)s"
msgid "creating logs database"
msgstr "建立日志数据库"
-#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
-#: ../src/common/check_paths.py:146
+#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:147
#, fuzzy, python-format
msgid "%s is a file but it should be a directory"
msgstr "%s 应为文件但它应为一个目录"
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147 ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
+#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
msgid "Gajim will now exit"
msgstr "Gajim 即将退出"
-#: ../src/common/check_paths.py:154
+#: ../src/common/check_paths.py:155
#, fuzzy, python-format
msgid "%s is a directory but should be a file"
msgstr "%s 应为文件但它是一个目录"
-#: ../src/common/check_paths.py:170
+#: ../src/common/check_paths.py:171
#, python-format
msgid "creating %s directory"
msgstr "正在建立 %s 目录"
@@ -3444,10 +3448,10 @@ msgid "Choose the groupchats you want to leave"
msgstr ""
#. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:55 ../src/roster_window.py:812
-#: ../src/roster_window.py:1626 ../src/roster_window.py:1628
-#: ../src/roster_window.py:5227
+#: ../src/common/commands.py:205 ../src/common/contacts.py:131
+#: ../src/common/helpers.py:55 ../src/roster_window.py:809
+#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
+#: ../src/roster_window.py:5144
#, fuzzy
msgid "Groupchats"
msgstr "群聊"
@@ -3559,9 +3563,9 @@ msgid ""
msgstr "折叠的列(账户和组)的列表(空格分隔)。"
#. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:483
-#: ../src/common/optparser.py:245 ../src/common/optparser.py:463
-#: ../src/common/optparser.py:497 ../src/gajim.py:3471
+#: ../src/common/config.py:106 ../src/common/config.py:482
+#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
+#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
#, fuzzy
msgid "default"
msgstr "默认"
@@ -4142,7 +4146,7 @@ msgstr ""
msgid "Jabberd2 workaround"
msgstr "Jabberd2 工作区"
-#: ../src/common/config.py:331
+#: ../src/common/config.py:330
msgid ""
"If checked, Gajim will use your IP and proxies defined in "
"file_transfer_proxies option for file transfer."
@@ -4150,231 +4154,230 @@ msgstr ""
"如果选定, Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设"
"置(_P)"
-#: ../src/common/config.py:345
+#: ../src/common/config.py:344
msgid "Answer to receipt requests"
msgstr ""
-#: ../src/common/config.py:346
+#: ../src/common/config.py:345
msgid "Sent receipt requests"
msgstr ""
-#: ../src/common/config.py:354
+#: ../src/common/config.py:353
msgid ""
"When negotiating an encrypted session, should Gajim assume you want your "
"messages to be logged?"
msgstr ""
-#: ../src/common/config.py:417
+#: ../src/common/config.py:416
msgid "Is OpenPGP enabled for this contact?"
msgstr "是否为此联系人使用 OpenPGP?"
-#: ../src/common/config.py:418
+#: ../src/common/config.py:417
msgid ""
"Should Gajim automatically start an encrypted session with this contact when "
"possible?"
msgstr ""
-#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:418 ../src/common/config.py:421
msgid "Language for which we want to check misspelled words"
msgstr "想要检查拼写的语言"
-#: ../src/common/config.py:428
+#: ../src/common/config.py:427
msgid "all or space separated status"
msgstr "全部或空格分隔的状态"
-#: ../src/common/config.py:429
+#: ../src/common/config.py:428
msgid "'yes', 'no', or 'both'"
msgstr "'是','否'或'两者'"
-#: ../src/common/config.py:430 ../src/common/config.py:432
-#: ../src/common/config.py:433 ../src/common/config.py:436
-#: ../src/common/config.py:437
+#: ../src/common/config.py:429 ../src/common/config.py:431
+#: ../src/common/config.py:432 ../src/common/config.py:435
+#: ../src/common/config.py:436
msgid "'yes', 'no' or ''"
msgstr "'是','否'或''"
-#: ../src/common/config.py:443 ../src/common/pep.py:160
+#: ../src/common/config.py:442 ../src/common/pep.py:157
msgid "Sleeping"
msgstr "正在睡觉"
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
msgid "Back soon"
msgstr "马上回来"
-#: ../src/common/config.py:444
+#: ../src/common/config.py:443
msgid "Back in some minutes."
msgstr "很快回来"
-#: ../src/common/config.py:445 ../src/common/pep.py:130
+#: ../src/common/config.py:444 ../src/common/pep.py:127
msgid "Eating"
msgstr "吃饭"
-#: ../src/common/config.py:445
+#: ../src/common/config.py:444
msgid "I'm eating, so leave me a message."
msgstr "正在吃饭,请留言"
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
msgid "Movie"
msgstr "电影"
-#: ../src/common/config.py:446
+#: ../src/common/config.py:445
msgid "I'm watching a movie."
msgstr "正在看电影"
-#: ../src/common/config.py:447 ../src/common/pep.py:189
+#: ../src/common/config.py:446 ../src/common/pep.py:186
msgid "Working"
msgstr "工作"
-#: ../src/common/config.py:447
+#: ../src/common/config.py:446
msgid "I'm working."
msgstr "工作中"
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
msgid "Phone"
msgstr "电话"
-#: ../src/common/config.py:448
+#: ../src/common/config.py:447
msgid "I'm on the phone."
msgstr "我在打电话"
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
msgid "Out"
msgstr "外出"
-#: ../src/common/config.py:449
+#: ../src/common/config.py:448
msgid "I'm out enjoying life."
msgstr "我正在享受户外生活。"
-#: ../src/common/config.py:460
+#: ../src/common/config.py:459
msgid "I'm available."
msgstr "我现在在线。"
-#: ../src/common/config.py:461
+#: ../src/common/config.py:460
msgid "I'm free for chat."
msgstr "自由聊天。"
-#: ../src/common/config.py:462 ../src/config.py:1419
+#: ../src/common/config.py:461 ../src/config.py:1478
msgid "Be right back."
msgstr "很快回来。"
-#: ../src/common/config.py:463
+#: ../src/common/config.py:462
msgid "I'm not available."
msgstr "我现在不可用。"
-#: ../src/common/config.py:464
+#: ../src/common/config.py:463
msgid "Do not disturb."
msgstr "不分发。"
-#: ../src/common/config.py:465 ../src/common/config.py:466
+#: ../src/common/config.py:464 ../src/common/config.py:465
msgid "Bye!"
msgstr "再见!"
-#: ../src/common/config.py:476
+#: ../src/common/config.py:475
msgid ""
"Sound to play when a group chat message contains one of the words in "
"muc_highlight_words, or when a group chat message contains your nickname."
msgstr "当收到的群聊消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
-#: ../src/common/config.py:477
+#: ../src/common/config.py:476
msgid "Sound to play when any MUC message arrives."
msgstr "当 MUC 信息到达时的声音"
-#: ../src/common/config.py:486 ../src/common/optparser.py:259
+#: ../src/common/config.py:485 ../src/common/optparser.py:302
msgid "green"
msgstr "绿色"
-#: ../src/common/config.py:490 ../src/common/optparser.py:245
+#: ../src/common/config.py:489 ../src/common/optparser.py:288
msgid "grocery"
msgstr "杂货店"
-#: ../src/common/config.py:494
+#: ../src/common/config.py:493
msgid "human"
msgstr "人类"
-#: ../src/common/config.py:498
+#: ../src/common/config.py:497
msgid "marine"
msgstr "海洋"
-#: ../src/common/connection_handlers.py:76
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:52
+#: ../src/common/connection_handlers.py:83
+#: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
msgid "Unable to load idle module"
msgstr "无法加载发呆模块"
-#: ../src/common/connection_handlers.py:244
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
+#: ../src/common/connection_handlers.py:251
msgid "Wrong host"
msgstr "错误主机"
-#: ../src/common/connection_handlers.py:245
+#: ../src/common/connection_handlers.py:252
msgid "Invalid local address? :-O"
msgstr ""
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:696
#, python-format
msgid "Registration information for transport %s has not arrived in time"
msgstr "代理 %s 所需的注册信息未按时抵达"
-#: ../src/common/connection_handlers.py:685
+#: ../src/common/connection_handlers.py:703
#, fuzzy
msgid "Registration succeeded"
msgstr " vCard 发布成功"
-#: ../src/common/connection_handlers.py:686
+#: ../src/common/connection_handlers.py:704
#, python-format
msgid "Registration with agent %s succeeded"
msgstr ""
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
#, fuzzy
msgid "Registration failed"
msgstr "vCard 发布失败"
-#: ../src/common/connection_handlers.py:688
+#: ../src/common/connection_handlers.py:706
#, python-format
msgid ""
"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
msgstr ""
-#: ../src/common/connection_handlers.py:990
-#: ../src/common/connection_handlers.py:2071
-#: ../src/common/connection_handlers.py:2117
-#: ../src/common/connection_handlers.py:2345
-#: ../src/common/connection_handlers.py:2487 ../src/common/connection.py:1366
-#: ../src/gajim.py:380
+#: ../src/common/connection_handlers.py:1008
+#: ../src/common/connection_handlers.py:2098
+#: ../src/common/connection_handlers.py:2144
+#: ../src/common/connection_handlers.py:2336
+#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
+#: ../src/gajim.py:354
msgid "Disk Write Error"
msgstr ""
-#: ../src/common/connection_handlers.py:1207 ../src/common/connection.py:935
+#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
#, fuzzy
msgid "Invisibility not supported"
msgstr "不支持扩展"
-#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:936
+#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
#, python-format
msgid "Account %s doesn't support invisibility."
msgstr ""
-#: ../src/common/connection_handlers.py:1892 ../src/common/connection.py:1181
-#: ../src/config.py:1875 ../src/config.py:1884 ../src/config.py:1943
-#: ../src/config.py:3281 ../src/dataforms_widget.py:555 ../src/dialogs.py:2665
+#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
+#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
+#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
msgid "Invalid Jabber ID"
msgstr "无效的 Jabber ID"
-#: ../src/common/connection_handlers.py:1893
+#: ../src/common/connection_handlers.py:1920
msgid "A message from a non-valid JID arrived, it has been ignored."
msgstr ""
-#: ../src/common/connection_handlers.py:2074
-#: ../src/common/connection_handlers.py:2120
-#: ../src/common/connection_handlers.py:2348
-#: ../src/common/connection_handlers.py:2490 ../src/common/connection.py:1369
-#: ../src/gajim.py:155 ../src/session.py:131
+#: ../src/common/connection_handlers.py:2101
+#: ../src/common/connection_handlers.py:2147
+#: ../src/common/connection_handlers.py:2339
+#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
+#: ../src/gajim.py:155 ../src/session.py:135
#, python-format
msgid ""
"The database file (%s) cannot be read. Try to repair it (see http://trac."
"gajim.org/wiki/DatabaseBackup) or remove it (all history will be lost)."
msgstr ""
-#: ../src/common/connection_handlers.py:2200
+#: ../src/common/connection_handlers.py:2191
#, python-format
msgid "Nickname not allowed: %s"
msgstr "昵称不允许: %s "
@@ -4382,77 +4385,77 @@ msgstr "昵称不允许: %s "
#. maximum user number reached
#. we are banned
#. group chat does not exist
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:2286
+#: ../src/common/connection_handlers.py:2294
+#: ../src/common/connection_handlers.py:2300
#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2309
-#: ../src/common/connection_handlers.py:2312
-#: ../src/common/connection_handlers.py:2315
-#: ../src/common/connection_handlers.py:2319 ../src/gajim.py:523
+#: ../src/common/connection_handlers.py:2306
+#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
msgid "Unable to join group chat"
msgstr "无法加入群聊"
-#: ../src/common/connection_handlers.py:2296
+#: ../src/common/connection_handlers.py:2287
#, python-format
msgid "Maximum number of users for %s has been reached"
msgstr ""
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:2295
#, fuzzy, python-format
msgid "You are banned from group chat %s."
msgstr "您被该群聊封禁。"
-#: ../src/common/connection_handlers.py:2310
+#: ../src/common/connection_handlers.py:2301
#, fuzzy, python-format
msgid "Group chat %s does not exist."
msgstr "不存在这样的群聊"
-#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2304
msgid "Group chat creation is restricted."
msgstr "群聊创建受限。"
-#: ../src/common/connection_handlers.py:2316
+#: ../src/common/connection_handlers.py:2307
#, fuzzy, python-format
msgid "Your registered nickname must be used in group chat %s."
msgstr "您注册的昵称已被使用"
-#: ../src/common/connection_handlers.py:2320
+#: ../src/common/connection_handlers.py:2311
#, fuzzy, python-format
msgid "You are not in the members list in groupchat %s."
msgstr "您不在成员名单中。"
#. Room has been destroyed. see
#. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2363
+#: ../src/common/connection_handlers.py:2354
#, fuzzy
msgid "Room has been destroyed"
msgstr "授权被移除"
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:2362
#, python-format
msgid "You can join this room instead: %s"
msgstr ""
-#: ../src/common/connection_handlers.py:2402
+#: ../src/common/connection_handlers.py:2393
msgid "I would like to add you to my roster."
msgstr "我申请添加您到联系人名单"
#. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2423
+#: ../src/common/connection_handlers.py:2414
#, python-format
msgid "we are now subscribed to %s"
msgstr " %s 请求认证"
-#: ../src/common/connection_handlers.py:2425
+#: ../src/common/connection_handlers.py:2416
#, python-format
msgid "unsubscribe request from %s"
msgstr " %s 请求解除认证"
-#: ../src/common/connection_handlers.py:2427
+#: ../src/common/connection_handlers.py:2418
#, python-format
msgid "we are now unsubscribed from %s"
msgstr "%s 解除了认证"
-#: ../src/common/connection_handlers.py:2619
+#: ../src/common/connection_handlers.py:2613
#, python-format
msgid ""
"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4591,187 +4594,184 @@ msgstr ""
msgid "Application verification failure"
msgstr ""
-#: ../src/common/connection.py:278
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#, fuzzy, python-format
+msgid "It is not possible to send a message to %s, this JID is not valid."
+msgstr "无法发送空文件"
+
+#: ../src/common/connection.py:256
+msgid "Neither the remote presence is signed, nor a key was assigned."
+msgstr ""
+
+#: ../src/common/connection.py:259
+#, python-format
+msgid "The contact's key (%s) does not match the key assigned in Gajim."
+msgstr ""
+
+#. we're not english
+#. one in locale and one en
+#: ../src/common/connection.py:307
+#, fuzzy
+msgid "[This message is *encrypted* (See :XEP:`27`]"
+msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
+
+#: ../src/common/connection.py:408
+#, fuzzy, python-format
+msgid ""
+"Subject: %(subject)s\n"
+"%(message)s"
+msgstr ""
+"主题:%s\n"
+"%s"
+
+#: ../src/common/connection.py:721
#, python-format
msgid "Connection with account \"%s\" has been lost"
msgstr "帐户“%s”的连接丢失"
-#: ../src/common/connection.py:279
+#: ../src/common/connection.py:722
msgid "Reconnect manually."
msgstr "手动重连。"
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:734
#, fuzzy, python-format
msgid "Server %(name)s answered wrongly to register request: %(error)s"
msgstr "服务代理 %s 对注册请求响应错误:%s"
-#: ../src/common/connection.py:324
+#: ../src/common/connection.py:768
#, python-format
msgid "Server %s provided a different registration form"
msgstr ""
-#: ../src/common/connection.py:337
+#: ../src/common/connection.py:781
#, fuzzy, python-format
msgid "Unknown SSL error: %d"
msgstr "未知的 D-Bus 版本: %s"
#. wrong answer
-#: ../src/common/connection.py:352
+#: ../src/common/connection.py:796
msgid "Invalid answer"
msgstr "无效答案"
-#: ../src/common/connection.py:353
+#: ../src/common/connection.py:797
#, fuzzy, python-format
msgid "Transport %(name)s answered wrongly to register request: %(error)s"
msgstr "服务代理 %s 对注册请求响应错误:%s"
-#: ../src/common/connection.py:636 ../src/common/connection.py:765
-#: ../src/common/connection.py:1526
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
+#: ../src/common/connection.py:1673
+#: ../src/common/zeroconf/connection_zeroconf.py:189
#, python-format
msgid "Could not connect to \"%s\""
msgstr "尚未连接到“%s”"
-#: ../src/common/connection.py:637 ../src/gajim.py:1094
+#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
msgid "Check your connection or try again later."
msgstr "检查连接并稍后重试。"
-#: ../src/common/connection.py:642
+#: ../src/common/connection.py:1081
#, fuzzy, python-format
msgid "Server replied: %s"
msgstr "保存在: %s"
-#: ../src/common/connection.py:655
+#: ../src/common/connection.py:1094
#, fuzzy
msgid "Connection to proxy failed"
msgstr "连接失败"
-#: ../src/common/connection.py:686 ../src/common/connection.py:745
+#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
#, fuzzy, python-format
msgid "Could not connect to account %s"
msgstr "尚未连接到“%s”"
-#: ../src/common/connection.py:687 ../src/common/connection.py:746
+#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
#, fuzzy, python-format
msgid "Connection with account %s has been lost. Retry connecting."
msgstr "帐户“%s”的连接丢失"
-#: ../src/common/connection.py:712
+#: ../src/common/connection.py:1151
#, python-format
msgid "The authenticity of the %s certificate could be invalid."
msgstr ""
-#: ../src/common/connection.py:715
+#: ../src/common/connection.py:1154
#, python-format
msgid ""
"\n"
"SSL Error: <b>%s</b>"
msgstr ""
-#: ../src/common/connection.py:717
+#: ../src/common/connection.py:1156
#, fuzzy, python-format
msgid ""
"\n"
"Unknown SSL error: %d"
msgstr "未知的 D-Bus 版本: %s"
-#: ../src/common/connection.py:766
+#: ../src/common/connection.py:1205
msgid "Check your connection or try again later"
msgstr "检查连接并稍后重试"
-#: ../src/common/connection.py:794
+#: ../src/common/connection.py:1236
#, python-format
msgid "Authentication failed with \"%s\""
msgstr "“%s”登录验证失败"
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:1238
msgid "Please check your login and password for correctness."
msgstr "请检查登录信息和密码的正确性"
-#: ../src/common/connection.py:862
+#: ../src/common/connection.py:1300
#, fuzzy
msgid "Error while removing privacy list"
msgstr "添加服务错误。 %s"
-#: ../src/common/connection.py:863
+#: ../src/common/connection.py:1301
#, python-format
msgid ""
"Privacy list %s has not been removed. It is maybe active in one of your "
"connected resources. Deactivate it and try again."
msgstr ""
-#: ../src/common/connection.py:1182 ../src/dialogs.py:2666
-#, fuzzy, python-format
-msgid "It is not possible to send a message to %s, this JID is not valid."
-msgstr "无法发送空文件"
-
-#: ../src/common/connection.py:1204
-#: ../src/common/zeroconf/connection_zeroconf.py:389
-msgid "Neither the remote presence is signed, nor a key was assigned."
-msgstr ""
-
-#: ../src/common/connection.py:1206
-#: ../src/common/zeroconf/connection_zeroconf.py:391
-#, python-format
-msgid "The contact's key (%s) does not match the key assigned in Gajim."
-msgstr ""
-
-#. we're not english
-#. one in locale and one en
-#: ../src/common/connection.py:1254
-#, fuzzy
-msgid "[This message is *encrypted* (See :XEP:`27`]"
-msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
-
-#: ../src/common/connection.py:1356
-#: ../src/common/zeroconf/connection_zeroconf.py:468
-#, fuzzy, python-format
-msgid ""
-"Subject: %(subject)s\n"
-"%(message)s"
-msgstr ""
-"主题:%s\n"
-"%s"
-
-#: ../src/common/connection.py:1383
+#: ../src/common/connection.py:1541
#, python-format
msgid "Sent contact: \"%s\" (%s)"
msgstr ""
-#: ../src/common/connection.py:1386
+#: ../src/common/connection.py:1544
#, fuzzy
msgid "Sent contacts:"
msgstr "联系人"
-#: ../src/common/connection.py:1559 ../src/common/connection.py:1580
+#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
msgid "Not fetched because of invisible status"
msgstr "由于隐身状态不获取"
-#: ../src/common/connection.py:1982
+#: ../src/common/connection.py:2106
#, fuzzy
msgid "Unregister failed"
msgstr "vCard 发布失败"
-#: ../src/common/connection.py:1983
+#: ../src/common/connection.py:2107
#, python-format
msgid "Unregistration with server %(server)s failed: %(error)s"
msgstr ""
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
+#: ../src/gui_interface.py:610
msgid "Observers"
msgstr "旁观者"
-#: ../src/common/contacts.py:96 ../src/common/contacts.py:348
+#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1354 ../src/gajim.py:802 ../src/roster_window.py:847
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1618
-#: ../src/roster_window.py:1620 ../src/roster_window.py:1773
+#: ../src/disco.py:1464 ../src/gui_interface.py:413
+#: ../src/roster_window.py:848 ../src/roster_window.py:1501
+#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
+#: ../src/roster_window.py:1732
msgid "Transports"
msgstr "代理"
-#: ../src/common/contacts.py:356
+#: ../src/common/contacts.py:343
#, fuzzy
msgid "Not in roster"
msgstr "不在名单中"
@@ -5018,7 +5018,7 @@ msgstr "自由聊天"
msgid "_Available"
msgstr "在线(_A)"
-#: ../src/common/helpers.py:212 ../src/features_window.py:116
+#: ../src/common/helpers.py:212 ../src/features_window.py:118
msgid "Available"
msgstr "在线"
@@ -5136,75 +5136,75 @@ msgid "has closed the chat window or tab"
msgstr "关闭了聊天窗口或标签"
#. GiB means gibibyte
-#: ../src/common/helpers.py:658
+#: ../src/common/helpers.py:588
#, python-format
msgid "%s GiB"
msgstr "%s GiB"
#. GB means gigabyte
-#: ../src/common/helpers.py:661
+#: ../src/common/helpers.py:591
#, python-format
msgid "%s GB"
msgstr "%s GB"
#. MiB means mibibyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:595
#, python-format
msgid "%s MiB"
msgstr "%s MiB"
#. MB means megabyte
-#: ../src/common/helpers.py:668
+#: ../src/common/helpers.py:598
#, python-format
msgid "%s MB"
msgstr "%s MB"
#. KiB means kibibyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:602
#, python-format
msgid "%s KiB"
msgstr "%s KiB"
#. KB means kilo bytes
-#: ../src/common/helpers.py:675
+#: ../src/common/helpers.py:605
#, python-format
msgid "%s KB"
msgstr "%s KB"
#. B means bytes
-#: ../src/common/helpers.py:678
+#: ../src/common/helpers.py:608
#, python-format
msgid "%s B"
msgstr "%s B"
-#: ../src/common/helpers.py:1166 ../src/common/helpers.py:1173
+#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
#, fuzzy, python-format
msgid "%d message pending"
msgid_plural "%d messages pending"
msgstr[0] "发送消息"
-#: ../src/common/helpers.py:1179
+#: ../src/common/helpers.py:1062
#, fuzzy, python-format
msgid " from room %s"
msgstr "来自 %s"
-#: ../src/common/helpers.py:1182 ../src/common/helpers.py:1201
+#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
#, fuzzy, python-format
msgid " from user %s"
msgstr "来自 %s"
-#: ../src/common/helpers.py:1184
+#: ../src/common/helpers.py:1067
#, fuzzy, python-format
msgid " from %s"
msgstr "来自 %s"
-#: ../src/common/helpers.py:1191 ../src/common/helpers.py:1198
+#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
#, python-format
msgid "%d event pending"
msgid_plural "%d events pending"
msgstr[0] ""
-#: ../src/common/helpers.py:1231
+#: ../src/common/helpers.py:1114
#, python-format
msgid "Gajim - %s"
msgstr "Gajim - %s"
@@ -5220,16 +5220,16 @@ msgid "%s is not a valid loglevel"
msgstr ""
#. we talk about a file
-#: ../src/common/optparser.py:57
+#: ../src/common/optparser.py:59
#, python-format
msgid "error: cannot open %s for reading"
msgstr "错误:无法按读打开文件 %s"
-#: ../src/common/optparser.py:254 ../src/common/optparser.py:255
+#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
msgid "cyan"
msgstr "青色"
-#: ../src/common/optparser.py:371
+#: ../src/common/optparser.py:373
#, fuzzy
msgid "migrating logs database to indices"
msgstr "合并日志数据库"
@@ -5239,701 +5239,720 @@ msgstr "合并日志数据库"
msgid "XMPP account %s@%s"
msgstr "帐户 %s 的"
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:27
msgid "Afraid"
msgstr ""
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:28
msgid "Amazed"
msgstr ""
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:29
msgid "Amorous"
msgstr ""
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:30
msgid "Angry"
msgstr ""
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:31
msgid "Annoyed"
msgstr ""
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:32
msgid "Anxious"
msgstr ""
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:33
#, fuzzy
msgid "Aroused"
msgstr "已暂停"
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:34
msgid "Ashamed"
msgstr ""
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:35
#, fuzzy
msgid "Bored"
msgstr "粗体"
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:36
#, fuzzy
msgid "Brave"
msgstr "有"
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:37
msgid "Calm"
msgstr ""
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:38
#, fuzzy
msgid "Cautious"
msgstr "聊天"
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:39
#, fuzzy
msgid "Cold"
msgstr "粗体"
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:40
#, fuzzy
msgid "Confident"
msgstr "内容(_C)"
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:41
msgid "Confused"
msgstr ""
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:42
#, fuzzy
msgid "Contemplative"
msgstr "已完成"
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:43
#, fuzzy
msgid "Contented"
msgstr "内容(_C)"
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:44
msgid "Cranky"
msgstr ""
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:45
msgid "Crazy"
msgstr ""
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:46
#, fuzzy
msgid "Creative"
msgstr "未活动的"
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:47
msgid "Curious"
msgstr ""
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:48
#, fuzzy
msgid "Dejected"
msgstr "删除"
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:49
msgid "Depressed"
msgstr ""
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:50
#, fuzzy
msgid "Disappointed"
msgstr "禁用"
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:51
msgid "Disgusted"
msgstr ""
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:52
#, fuzzy
msgid "Dismayed"
msgstr "禁用"
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:53
#, fuzzy
msgid "Distracted"
msgstr "禁用"
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:54
msgid "Embarrassed"
msgstr ""
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:55
msgid "Envious"
msgstr ""
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:56
msgid "Excited"
msgstr ""
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:57
msgid "Flirtatious"
msgstr ""
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:58
msgid "Frustrated"
msgstr ""
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:59
msgid "Grateful"
msgstr ""
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:60
msgid "Grieving"
msgstr ""
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:61
#, fuzzy
msgid "Grumpy"
msgstr "群组"
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:62
msgid "Guilty"
msgstr ""
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:63
msgid "Happy"
msgstr ""
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:64
msgid "Hopeful"
msgstr ""
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:65
#, fuzzy
msgid "Hot"
msgstr "主机(_H):"
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:66
msgid "Humbled"
msgstr ""
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:67
msgid "Humiliated"
msgstr ""
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:68
msgid "Hungry"
msgstr ""
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:69
msgid "Hurt"
msgstr ""
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:70
#, fuzzy
msgid "Impressed"
msgstr "消息"
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:71
msgid "In Awe"
msgstr ""
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:72
msgid "In Love"
msgstr ""
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:73
msgid "Indignant"
msgstr ""
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:74
msgid "Interested"
msgstr ""
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:75
msgid "Intoxicated"
msgstr ""
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:76
#, fuzzy
msgid "Invincible"
msgstr "隐身"
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:77
msgid "Jealous"
msgstr ""
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:78
#, fuzzy
msgid "Lonely"
msgstr "一"
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:79
#, fuzzy
msgid "Lost"
msgstr "主机(_H):"
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:80
msgid "Lucky"
msgstr ""
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:81
#, fuzzy
msgid "Mean"
msgstr "German"
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:82
#, fuzzy
msgid "Moody"
msgstr "修改(_M)"
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:83
msgid "Nervous"
msgstr ""
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:84
msgid "Neutral"
msgstr ""
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:85
#, fuzzy
msgid "Offended"
msgstr "离线"
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:86
msgid "Outraged"
msgstr ""
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:87
msgid "Playful"
msgstr ""
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:88
#, fuzzy
msgid "Proud"
msgstr "群组"
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:89
msgid "Relaxed"
msgstr ""
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:90
#, fuzzy
msgid "Relieved"
msgstr "十一"
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:91
msgid "Remorseful"
msgstr ""
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:92
msgid "Restless"
msgstr ""
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:93
#, fuzzy
msgid "Sad"
msgstr "已冻结"
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:94
msgid "Sarcastic"
msgstr ""
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:95
#, fuzzy
msgid "Satisfied"
msgstr "名:"
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:96
msgid "Serious"
msgstr ""
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:97
msgid "Shocked"
msgstr ""
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:98
msgid "Shy"
msgstr ""
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:99
#, fuzzy
msgid "Sick"
msgstr "昵称"
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:100
#, fuzzy
msgid "Sleepy"
msgstr "正在睡觉"
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:101
msgid "Spontaneous"
msgstr ""
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:102
#, fuzzy
msgid "Stressed"
msgstr "街道:"
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:103
msgid "Strong"
msgstr ""
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:104
#, fuzzy
msgid "Surprised"
msgstr "订阅"
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:105
msgid "Thankful"
msgstr ""
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:106
msgid "Thirsty"
msgstr ""
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:107
#, fuzzy
msgid "Tired"
msgstr "时间"
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:108
#, fuzzy
msgid "Undefined"
msgstr "下划线"
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:109
msgid "Weak"
msgstr ""
-#: ../src/common/pep.py:113
+#: ../src/common/pep.py:110
msgid "Worried"
msgstr ""
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:113
#, fuzzy
msgid "Doing Chores"
msgstr "错误主机"
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:114
msgid "Buying Groceries"
msgstr ""
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:115
#, fuzzy
msgid "Cleaning"
msgstr "晚上"
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:116
#, fuzzy
msgid "Cooking"
msgstr "正在编写"
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:117
msgid "Doing Maintenance"
msgstr ""
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:118
msgid "Doing the Dishes"
msgstr ""
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:119
msgid "Doing the Laundry"
msgstr ""
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:120
#, fuzzy
msgid "Gardening"
msgstr "早晨"
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:121
msgid "Running an Errand"
msgstr ""
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:122
#, fuzzy
msgid "Walking the Dog"
msgstr "群组内所有"
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:123
#, fuzzy
msgid "Drinking"
msgstr "工作"
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:124
msgid "Having a Beer"
msgstr ""
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:125
msgid "Having Coffee"
msgstr ""
-#: ../src/common/pep.py:129
+#: ../src/common/pep.py:126
msgid "Having Tea"
msgstr ""
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:128
msgid "Having a Snack"
msgstr ""
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:129
msgid "Having Breakfast"
msgstr ""
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:130
msgid "Having Dinner"
msgstr ""
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:131
msgid "Having Lunch"
msgstr ""
-#: ../src/common/pep.py:135
+#: ../src/common/pep.py:132
msgid "Exercising"
msgstr ""
-#: ../src/common/pep.py:136 ../src/common/pep.py:181
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
msgid "Cycling"
msgstr ""
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:134
#, fuzzy
msgid "Dancing"
msgstr "晚上"
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:135
#, fuzzy
msgid "Hiking"
msgstr "踢出 %s"
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:136
#, fuzzy
msgid "Jogging"
msgstr "加入(_J)"
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:137
msgid "Playing Sports"
msgstr ""
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:138
msgid "Running"
msgstr ""
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:139
#, fuzzy
msgid "Skiing"
msgstr "工作"
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:140
msgid "Swimming"
msgstr ""
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:141
#, fuzzy
msgid "Working out"
msgstr "工作"
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:142
msgid "Grooming"
msgstr ""
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:143
msgid "At the Spa"
msgstr ""
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:144
msgid "Brushing Teeth"
msgstr ""
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:145
msgid "Getting a Haircut"
msgstr ""
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:146
#, fuzzy
msgid "Shaving"
msgstr "吃饭"
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:147
msgid "Taking a Bath"
msgstr ""
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:148
msgid "Taking a Shower"
msgstr ""
-#: ../src/common/pep.py:152
+#: ../src/common/pep.py:149
msgid "Having an Appointment"
msgstr ""
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:151
msgid "Day Off"
msgstr ""
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:152
#, fuzzy
msgid "Hanging out"
msgstr "正在更换话题"
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:153
#, fuzzy
msgid "Hiding"
msgstr "踢出 %s"
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:154
msgid "On Vacation"
msgstr ""
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:155
#, fuzzy
msgid "Praying"
msgstr "吃饭"
-#: ../src/common/pep.py:159
+#: ../src/common/pep.py:156
msgid "Scheduled Holiday"
msgstr ""
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:158
#, fuzzy
msgid "Thinking"
msgstr "工作"
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:159
#, fuzzy
msgid "Relaxing"
msgstr "高原"
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:160
#, fuzzy
msgid "Fishing"
msgstr "踢出 %s"
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:161
#, fuzzy
msgid "Gaming"
msgstr "吃饭"
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:162
#, fuzzy
msgid "Going out"
msgstr "退出登录(_O)"
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:163
#, fuzzy
msgid "Partying"
msgstr "吃饭"
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:164
#, fuzzy
msgid "Reading"
msgstr "原因"
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:165
#, fuzzy
msgid "Rehearsing"
msgstr "原因"
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:166
#, fuzzy
msgid "Shopping"
msgstr "正在睡觉"
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:167
#, fuzzy
msgid "Smoking"
msgstr "工作"
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:168
msgid "Socializing"
msgstr ""
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:169
#, fuzzy
msgid "Sunbathing"
msgstr "吃饭"
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:170
msgid "Watching TV"
msgstr ""
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:171
#, fuzzy
msgid "Watching a Movie"
msgstr "正在看电影"
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:172
#, fuzzy
msgid "Talking"
msgstr "吃饭"
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:173
msgid "In Real Life"
msgstr ""
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:174
#, fuzzy
msgid "On the Phone"
msgstr "我在打电话"
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:175
msgid "On Video Phone"
msgstr ""
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:176
#, fuzzy
msgid "Traveling"
msgstr "传输中"
-#: ../src/common/pep.py:180
+#: ../src/common/pep.py:177
#, fuzzy
msgid "Commuting"
msgstr "正在编写"
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:179
msgid "Driving"
msgstr ""
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:180
msgid "In a Car"
msgstr ""
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:181
msgid "On a Bus"
msgstr ""
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:182
msgid "On a Plane"
msgstr ""
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:183
#, fuzzy
msgid "On a Train"
msgstr "作为链接打开(_L):"
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:184
msgid "On a Trip"
msgstr ""
-#: ../src/common/pep.py:188
+#: ../src/common/pep.py:185
#, fuzzy
msgid "Walking"
msgstr "工作"
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:187
#, fuzzy
msgid "Coding"
msgstr "正在编写"
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:188
msgid "In a Meeting"
msgstr ""
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:189
msgid "Studying"
msgstr ""
-#: ../src/common/pep.py:193
+#: ../src/common/pep.py:190
#, fuzzy
msgid "Writing"
msgstr "工作"
+#: ../src/common/pep.py:335
+msgid "Unknown Artist"
+msgstr ""
+
+#: ../src/common/pep.py:338
+msgid "Unknown Title"
+msgstr ""
+
+#: ../src/common/pep.py:341
+msgid "Unknown Source"
+msgstr ""
+
+#: ../src/common/pep.py:344
+#, python-format
+msgid ""
+"<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
+"from <i>%(source)s</i>"
+msgstr ""
+
#. We cannot bind port, call error callback and fail
#: ../src/common/socks5.py:86
#, python-format
@@ -5954,34 +5973,11 @@ msgid ""
"went wrong.]"
msgstr ""
-#: ../src/common/zeroconf/connection_handlers_zeroconf.py:94
-#, fuzzy, python-format
-msgid ""
-"The host %s you configured as the ft_add_hosts_to_send advanced option is "
-"not valid, so ignored."
-msgstr "您配置主机为 ft_override_host_to_send 高级选项无效,忽略。"
-
-#. We didn't set a passphrase
-#: ../src/common/zeroconf/connection_zeroconf.py:173
-msgid "OpenPGP passphrase was not given"
-msgstr "未获得 OpenPGP 密文"
-
-#. %s is the account name here
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1970
-#, python-format
-msgid "You will be connected to %s without OpenPGP."
-msgstr "您将在无 OpenPGP 情况下连接到 %s。"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:216
-msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "您需要重新连接才能继续收发消息。"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:178
msgid "Avahi error"
msgstr "Avahi 错误"
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:179
#, python-format
msgid ""
"%s\n"
@@ -5990,53 +5986,46 @@ msgstr ""
"%s\n"
"本地消息将无法正常工作。"
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:190
#, fuzzy
msgid "Please check if Avahi or Bonjour is installed."
msgstr "请检查 Avahi 是否已经安装。"
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
msgid "Could not start local service"
msgstr "无法启动本地服务"
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:200
#, python-format
msgid "Unable to bind to port %d."
msgstr "无法绑定端口 %d。"
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
msgid "Please check if avahi-daemon is running."
msgstr "请检查 avahi-daemon 是否运行。"
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
#, python-format
msgid "Could not change status of account \"%s\""
msgstr "无法改变账户“%s”的状态"
-#: ../src/common/zeroconf/connection_zeroconf.py:381
-msgid ""
-"You are not connected or not visible to others. Your message could not be "
-"sent."
-msgstr "没有连接或隐身。您的消息将不会被发送。"
-
-#. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
-msgid "[This message is encrypted]"
-msgstr "[本条消息已加密]"
-
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:324
#, fuzzy
msgid "Your message could not be sent."
msgstr "联系人离线。您的消息将不被发送。"
#. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:334
msgid "Contact is offline. Your message could not be sent."
msgstr "联系人离线。您的消息将不被发送。"
-#: ../src/common/zeroconf/connection_zeroconf.py:593
+#: ../src/common/zeroconf/connection_zeroconf.py:359
msgid ""
"Connection to host could not be established: Timeout while sending data."
msgstr "到主机的连接无法建立:发送数据超时。"
@@ -6047,26 +6036,26 @@ msgstr "到主机的连接无法建立:发送数据超时。"
msgid "Error while adding service. %s"
msgstr "添加服务错误。 %s"
-#: ../src/config.py:151 ../src/config.py:597
+#: ../src/config.py:157 ../src/config.py:586
msgid "Disabled"
msgstr "禁用"
-#: ../src/config.py:396
+#: ../src/config.py:383
#, fuzzy
msgid "Default Message"
msgstr "默认状态消息"
-#: ../src/config.py:405
+#: ../src/config.py:392
#, fuzzy
msgid "Enabled"
msgstr "启用"
-#: ../src/config.py:663 ../src/dialogs.py:1327
+#: ../src/config.py:654 ../src/dialogs.py:1365
#, python-format
msgid "Dictionary for lang %s not available"
msgstr "语言 %s 的字典不可用"
-#: ../src/config.py:664
+#: ../src/config.py:655
#, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -6074,213 +6063,213 @@ msgid ""
msgstr ""
"您需安装 %s 字典以使用拼写检查,或者设置拼写检查选项以选择另外一种语言。(_L)"
-#: ../src/config.py:1040
+#: ../src/config.py:1092
msgid "status message title"
msgstr "状态消息标题"
-#: ../src/config.py:1040
+#: ../src/config.py:1092
msgid "status message text"
msgstr "状态消息文本"
#. Name column
-#: ../src/config.py:1339 ../src/dialogs.py:2122 ../src/dialogs.py:2186
-#: ../src/dialogs.py:2891 ../src/disco.py:773 ../src/disco.py:1568
-#: ../src/disco.py:1854 ../src/history_window.py:87
+#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
+#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
+#: ../src/disco.py:1992 ../src/history_window.py:89
msgid "Name"
msgstr "名称"
-#: ../src/config.py:1428
+#: ../src/config.py:1487
msgid "Relogin now?"
msgstr "现在重新登录?"
-#: ../src/config.py:1429
+#: ../src/config.py:1488
msgid "If you want all the changes to apply instantly, you must relogin."
msgstr "如果想使所有调整立即生效,您必须重新登录。"
-#: ../src/config.py:1559 ../src/config.py:1684
+#: ../src/config.py:1620 ../src/config.py:1745
#, fuzzy
msgid "OpenPGP is not usable on this computer"
msgstr "OpenPGP 在本机不可用"
-#: ../src/config.py:1720 ../src/config.py:1764
+#: ../src/config.py:1785 ../src/config.py:1829
msgid "Unread events"
msgstr "未读取的事件"
-#: ../src/config.py:1721
+#: ../src/config.py:1786
msgid "Read all pending events before removing this account."
msgstr "移除帐号前请阅读所有未决事件。"
-#: ../src/config.py:1747
+#: ../src/config.py:1812
#, python-format
msgid "You have opened chat in account %s"
msgstr "您已在账户 %s 打开聊天"
-#: ../src/config.py:1748
+#: ../src/config.py:1813
msgid "All chat and groupchat windows will be closed. Do you want to continue?"
msgstr "所有的聊天和群聊窗口将会关闭。您想继续吗?"
-#: ../src/config.py:1760 ../src/config.py:2283 ../src/config.py:2317
+#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
msgid "You are currently connected to the server"
msgstr "正在连接到服务器"
-#: ../src/config.py:1761
+#: ../src/config.py:1826
msgid "To change the account name, you must be disconnected."
msgstr "如要改变账户名称,需断开连接。"
-#: ../src/config.py:1765
+#: ../src/config.py:1830
msgid "To change the account name, you must read all pending events."
msgstr "如要更改账户名称,需先处理所有未决事件"
-#: ../src/config.py:1771
+#: ../src/config.py:1836
msgid "Account Name Already Used"
msgstr "帐户名已经被占用"
-#: ../src/config.py:1772
+#: ../src/config.py:1837
msgid ""
"This name is already used by another of your accounts. Please choose another "
"name."
msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
-#: ../src/config.py:1776 ../src/config.py:1780
+#: ../src/config.py:1841 ../src/config.py:1845
msgid "Invalid account name"
msgstr "无效的账户名称"
-#: ../src/config.py:1777
+#: ../src/config.py:1842
msgid "Account name cannot be empty."
msgstr "账户名不能为空。"
-#: ../src/config.py:1781
+#: ../src/config.py:1846
msgid "Account name cannot contain spaces."
msgstr "账户名不能包含空格。"
-#: ../src/config.py:1856
+#: ../src/config.py:1921
#, fuzzy
msgid "Rename Account"
msgstr "帐户管理"
-#: ../src/config.py:1857
+#: ../src/config.py:1922
#, fuzzy, python-format
msgid "Enter a new name for account %s"
msgstr "为群组 %s 输入新的名称"
-#: ../src/config.py:1885
+#: ../src/config.py:1950
msgid "A Jabber ID must be in the form \"user@servername\"."
msgstr "Jabber ID 的格式为 “用户@服务器名”。"
-#: ../src/config.py:2093 ../src/config.py:3327
+#: ../src/config.py:2158 ../src/config.py:3406
msgid "Invalid entry"
msgstr "无效输入"
-#: ../src/config.py:2094 ../src/config.py:3328
+#: ../src/config.py:2159 ../src/config.py:3407
msgid "Custom port must be a port number."
msgstr "自定义端口必须为端口号。"
-#: ../src/config.py:2115
+#: ../src/config.py:2180
msgid "Failed to get secret keys"
msgstr "获取密钥失败"
-#: ../src/config.py:2116
+#: ../src/config.py:2181
#, fuzzy
msgid "There is no OpenPGP secret key available."
msgstr "在取回 OpenPGP 密钥时发生错误。"
-#: ../src/config.py:2150
+#: ../src/config.py:2215
msgid "OpenPGP Key Selection"
msgstr "OpenPGP 密钥选择"
-#: ../src/config.py:2151
+#: ../src/config.py:2216
msgid "Choose your OpenPGP key"
msgstr "选择您的 OpenPGP 钥匙"
-#: ../src/config.py:2158
+#: ../src/config.py:2223
msgid "No such account available"
msgstr "没有有效账户"
-#: ../src/config.py:2159
+#: ../src/config.py:2224
msgid "You must create your account before editing your personal information."
msgstr "您必须在编辑个人信息前创建账户。"
-#: ../src/config.py:2166 ../src/dialogs.py:1933 ../src/dialogs.py:2110
-#: ../src/dialogs.py:2289 ../src/disco.py:441 ../src/profile_window.py:317
+#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
+#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
msgid "You are not connected to the server"
msgstr "尚未连接到服务器"
-#: ../src/config.py:2167
+#: ../src/config.py:2232
msgid "Without a connection, you can not edit your personal information."
msgstr "无法脱机编辑个人信息。"
-#: ../src/config.py:2171
+#: ../src/config.py:2236
msgid "Your server doesn't support Vcard"
msgstr "您的服务器不支持 Vcard"
-#: ../src/config.py:2172
+#: ../src/config.py:2237
msgid "Your server can't save your personal information."
msgstr "您的服务器无法保存您的个人信息。"
-#: ../src/config.py:2284 ../src/config.py:2318
+#: ../src/config.py:2349 ../src/config.py:2383
#, fuzzy
msgid "To disable the account, you must be disconnected."
msgstr "如要改变账户名称,需断开连接。"
-#: ../src/config.py:2289
+#: ../src/config.py:2354
msgid "Account Local already exists."
msgstr "帐户本地已存在。"
-#: ../src/config.py:2290
+#: ../src/config.py:2355
msgid "Please rename or remove it before enabling link-local messaging."
msgstr "请在使用本地消息前重命名或移除它。"
-#: ../src/config.py:2438
+#: ../src/config.py:2510
#, python-format
msgid "Edit %s"
msgstr "编辑 %s"
-#: ../src/config.py:2440
+#: ../src/config.py:2512
#, python-format
msgid "Register to %s"
msgstr "注册到 %s"
#. list at the beginning
-#: ../src/config.py:2476
+#: ../src/config.py:2548
msgid "Ban List"
msgstr "封禁名单"
-#: ../src/config.py:2477
+#: ../src/config.py:2549
msgid "Member List"
msgstr "成员列表"
-#: ../src/config.py:2478
+#: ../src/config.py:2550
msgid "Owner List"
msgstr "房主列表"
-#: ../src/config.py:2479
+#: ../src/config.py:2551
msgid "Administrator List"
msgstr "管理员列表"
#. Address column
#. holds JID (who said this)
-#: ../src/config.py:2528 ../src/disco.py:780 ../src/history_manager.py:208
+#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
msgid "JID"
msgstr "JID"
-#: ../src/config.py:2538
+#: ../src/config.py:2610
msgid "Reason"
msgstr "原因"
-#: ../src/config.py:2545
+#: ../src/config.py:2617
msgid "Nick"
msgstr "昵称"
-#: ../src/config.py:2551
+#: ../src/config.py:2623
msgid "Role"
msgstr "角色"
-#: ../src/config.py:2578
+#: ../src/config.py:2650
msgid "Banning..."
msgstr "封禁..."
#. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2580
+#: ../src/config.py:2652
msgid ""
"<b>Whom do you want to ban?</b>\n"
"\n"
@@ -6288,11 +6277,11 @@ msgstr ""
"<b>想做封禁谁?</b>\n"
"\n"
-#: ../src/config.py:2582
+#: ../src/config.py:2654
msgid "Adding Member..."
msgstr "正在添加成员..."
-#: ../src/config.py:2583
+#: ../src/config.py:2655
msgid ""
"<b>Whom do you want to make a member?</b>\n"
"\n"
@@ -6300,11 +6289,11 @@ msgstr ""
"<b>想要将谁加为成员?</b>\n"
"\n"
-#: ../src/config.py:2585
+#: ../src/config.py:2657
msgid "Adding Owner..."
msgstr "添加房主..."
-#: ../src/config.py:2586
+#: ../src/config.py:2658
#, fuzzy
msgid ""
"<b>Whom do you want to make an owner?</b>\n"
@@ -6313,11 +6302,11 @@ msgstr ""
"<b>想要将谁加为房主?</b>\n"
"\n"
-#: ../src/config.py:2588
+#: ../src/config.py:2660
msgid "Adding Administrator..."
msgstr "添加管理员..."
-#: ../src/config.py:2589
+#: ../src/config.py:2661
msgid ""
"<b>Whom do you want to make an administrator?</b>\n"
"\n"
@@ -6325,7 +6314,7 @@ msgstr ""
"<b>想要指定谁为管理员?</b>\n"
"\n"
-#: ../src/config.py:2590
+#: ../src/config.py:2662
#, fuzzy
msgid ""
"Can be one of the following:\n"
@@ -6342,89 +6331,90 @@ msgstr ""
"4. domain (该域本身匹配, 例如任何 user@domain,\n"
"domain/resource, 或者地址包含一个子域."
-#: ../src/config.py:2687
+#: ../src/config.py:2763
#, python-format
msgid "Removing %s account"
msgstr "移除账户 %s"
-#: ../src/config.py:2709 ../src/gajim.py:1491 ../src/gajim.py:1588
+#: ../src/config.py:2785 ../src/gui_interface.py:1102
+#: ../src/gui_interface.py:1199
msgid "Password Required"
msgstr "需要密码"
-#: ../src/config.py:2710 ../src/gajim.py:1568
+#: ../src/config.py:2786 ../src/gui_interface.py:1179
#, python-format
msgid "Enter your password for account %s"
msgstr "输入帐户 %s 的密码"
-#: ../src/config.py:2711 ../src/gajim.py:1588
+#: ../src/config.py:2787 ../src/gui_interface.py:1199
msgid "Save password"
msgstr "保存密码"
-#: ../src/config.py:2720
+#: ../src/config.py:2796
#, python-format
msgid "Account \"%s\" is connected to the server"
msgstr "账户 “%s” 已连接到服务器"
-#: ../src/config.py:2721
+#: ../src/config.py:2797
msgid "If you remove it, the connection will be lost."
msgstr "如果移除,将会丢失连接"
-#: ../src/config.py:2819
+#: ../src/config.py:2895
msgid "Default"
msgstr "默认"
-#: ../src/config.py:2819
+#: ../src/config.py:2895
msgid "?print_status:All"
msgstr "?print_status:全部"
-#: ../src/config.py:2820
+#: ../src/config.py:2896
msgid "Enter and leave only"
msgstr "只是登录和离开"
-#: ../src/config.py:2821
+#: ../src/config.py:2897
#, fuzzy
msgid "?print_status:None"
msgstr "?print_status:全部"
-#: ../src/config.py:2889
+#: ../src/config.py:2967
msgid "New Group Chat"
msgstr "新群聊"
-#: ../src/config.py:2922
+#: ../src/config.py:3000
msgid "This bookmark has invalid data"
msgstr "此书签含无效数据"
-#: ../src/config.py:2923
+#: ../src/config.py:3001
msgid ""
"Please be sure to fill out server and room fields or remove this bookmark."
msgstr "请确认填写服务器与房间字段或移除此书签。"
#. invalid char
-#: ../src/config.py:3041 ../src/dialogs.py:1746
+#: ../src/config.py:3119 ../src/dialogs.py:1829
#, fuzzy
msgid "Invalid nickname"
msgstr "无效用户名"
-#: ../src/config.py:3042 ../src/config.py:3056 ../src/config.py:3070
+#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
#, fuzzy
msgid "Character not allowed"
msgstr "昵称不允许: %s "
-#: ../src/config.py:3055 ../src/config.py:3303
+#: ../src/config.py:3133 ../src/config.py:3382
#, fuzzy
msgid "Invalid server"
msgstr "无效用户名"
-#: ../src/config.py:3069
+#: ../src/config.py:3147
#, fuzzy
msgid "Invalid room"
msgstr "无效输入"
-#: ../src/config.py:3220
+#: ../src/config.py:3299
msgid "Account has been added successfully"
msgstr "成功添加账户"
-#: ../src/config.py:3221 ../src/config.py:3227
+#: ../src/config.py:3300 ../src/config.py:3306
#, fuzzy
msgid ""
"You can set advanced account options by pressing the Advanced button, or "
@@ -6434,34 +6424,34 @@ msgstr ""
"您可以通过点击高级按钮进行高级设置,或稍后点击主窗口中编辑菜单下的账户菜单"
"项。"
-#: ../src/config.py:3226
+#: ../src/config.py:3305
msgid "Your new account has been created successfully"
msgstr "注册新账户成功"
-#: ../src/config.py:3264
+#: ../src/config.py:3343
msgid "Invalid username"
msgstr "无效用户名"
-#: ../src/config.py:3266
+#: ../src/config.py:3345
msgid "You must provide a username to configure this account."
msgstr "必须提供用户名来配置此账户。"
-#: ../src/config.py:3304
+#: ../src/config.py:3383
#, fuzzy
msgid "Please provide a server on which you want to register."
msgstr "请指定您想使用的新昵称:"
-#: ../src/config.py:3360 ../src/gajim.py:2144
+#: ../src/config.py:3439 ../src/gui_interface.py:1857
#, fuzzy
msgid "Certificate Already in File"
msgstr "联系人已经在名单中"
-#: ../src/config.py:3361 ../src/gajim.py:2145
+#: ../src/config.py:3440 ../src/gui_interface.py:1858
#, python-format
msgid "This certificate is already in file %s, so it's not added again."
msgstr ""
-#: ../src/config.py:3429
+#: ../src/config.py:3510
#, python-format
msgid ""
"<b>Security Warning</b>\n"
@@ -6471,7 +6461,7 @@ msgid ""
"Do you still want to connect to this server?"
msgstr ""
-#: ../src/config.py:3435 ../src/gajim.py:2169
+#: ../src/config.py:3516 ../src/gui_interface.py:1882
#, python-format
msgid ""
"Add this certificate to the list of trusted certificates.\n"
@@ -6479,304 +6469,300 @@ msgid ""
"%s"
msgstr ""
-#: ../src/config.py:3460 ../src/config.py:3483
+#: ../src/config.py:3543 ../src/config.py:3570
#, fuzzy
msgid "An error occurred during account creation"
msgstr "创建帐户过程中发生错误"
-#: ../src/config.py:3550
+#: ../src/config.py:3637
msgid "Account name is in use"
msgstr "帐户名已经被使用"
-#: ../src/config.py:3551
+#: ../src/config.py:3638
msgid "You already have an account using this name."
msgstr "有同名账户。"
-#: ../src/config.py:3704
+#: ../src/config.py:3791
msgid "Active"
msgstr "活动"
-#: ../src/config.py:3712
+#: ../src/config.py:3799
msgid "Event"
msgstr "事件"
-#: ../src/config.py:3747
+#: ../src/config.py:3834
msgid "First Message Received"
msgstr "最初收到的消息"
-#: ../src/config.py:3748
+#: ../src/config.py:3835
#, fuzzy
msgid "Next Message Received Focused"
msgstr "收到的下一条消息"
-#: ../src/config.py:3750
+#: ../src/config.py:3837
#, fuzzy
msgid "Next Message Received Unfocused"
msgstr "收到的下一条消息"
-#: ../src/config.py:3751
+#: ../src/config.py:3838
msgid "Contact Connected"
msgstr "已连接的联系人"
-#: ../src/config.py:3752
+#: ../src/config.py:3839
msgid "Contact Disconnected"
msgstr "联系人已断开连接"
-#: ../src/config.py:3753
+#: ../src/config.py:3840
msgid "Message Sent"
msgstr "消息已发送"
-#: ../src/config.py:3754
+#: ../src/config.py:3841
msgid "Group Chat Message Highlight"
msgstr "群聊消息突出显示"
-#: ../src/config.py:3755
+#: ../src/config.py:3842
msgid "Group Chat Message Received"
msgstr "收到的群聊消息"
-#: ../src/config.py:3756
+#: ../src/config.py:3843
msgid "GMail Email Received"
msgstr "收到 GMail 邮件"
-#: ../src/conversation_textview.py:592
+#: ../src/conversation_textview.py:599
msgid ""
"This icon indicates that this message has not yet\n"
"been received by the remote end. If this icon stays\n"
"for a long time, it's likely the message got lost."
msgstr ""
-#: ../src/conversation_textview.py:611
+#: ../src/conversation_textview.py:618
#, fuzzy
msgid ""
"Text below this line is what has been said since the\n"
"last time you paid attention to this group chat"
msgstr "以下文字是您上次发言至今的群聊内容"
-#: ../src/conversation_textview.py:724
+#: ../src/conversation_textview.py:737
#, fuzzy
msgid "_Quote"
msgstr "退出(_Q)"
-#: ../src/conversation_textview.py:731
+#: ../src/conversation_textview.py:744
#, python-format
msgid "_Actions for \"%s\""
msgstr "“%s”的动作(_A)"
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:756
msgid "Read _Wikipedia Article"
msgstr "读取 Wikipedia 文章(_W)"
-#: ../src/conversation_textview.py:748
+#: ../src/conversation_textview.py:761
msgid "Look it up in _Dictionary"
msgstr "从字典(_D)中搜索"
-#: ../src/conversation_textview.py:765
+#: ../src/conversation_textview.py:778
#, python-format
msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
msgstr "字典地址缺少 “%s” 并且它不是 WIKTIONARY"
#. we must have %s in the url
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:791
#, python-format
msgid "Web Search URL is missing an \"%s\""
msgstr "网站搜索地址缺少 “%s”"
-#: ../src/conversation_textview.py:781
+#: ../src/conversation_textview.py:794
msgid "Web _Search for it"
msgstr "用网页搜索(_S)"
-#: ../src/conversation_textview.py:787
+#: ../src/conversation_textview.py:800
msgid "Open as _Link"
msgstr "作为链接打开(_L):"
-#: ../src/conversation_textview.py:1274
+#. %i is day in year (1-365)
+#: ../src/conversation_textview.py:1295
+#, fuzzy, python-format
msgid "Yesterday"
-msgstr "昨天"
-
-#. the number is >= 2
-#. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1278
-#, python-format
-msgid "%i days ago"
-msgstr "%i 天前"
+msgid_plural "%i days ago"
+msgstr[0] "昨天"
#. if we have subject, show it too!
-#: ../src/conversation_textview.py:1312 ../src/history_window.py:464
+#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
#, python-format
msgid "Subject: %s\n"
msgstr "主题:%s\n"
-#: ../src/dataforms_widget.py:559
+#: ../src/dataforms_widget.py:581
#, fuzzy
msgid "Jabber ID already in list"
msgstr "Jabber 即时消息客户端"
-#: ../src/dataforms_widget.py:560
+#: ../src/dataforms_widget.py:582
msgid "The Jabber ID you entered is already in the list. Choose another one."
msgstr ""
#. Default jid
-#: ../src/dataforms_widget.py:571
+#: ../src/dataforms_widget.py:593
msgid "new@jabber.id"
msgstr ""
-#: ../src/dataforms_widget.py:574 ../src/dataforms_widget.py:576
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
#, python-format
msgid "new%d@jabber.id"
msgstr ""
-#: ../src/dialogs.py:75
+#: ../src/dialogs.py:81
#, python-format
msgid "Contact name: <i>%s</i>"
msgstr "联系人名称:<i>%s</i>"
-#: ../src/dialogs.py:77
+#: ../src/dialogs.py:83
#, python-format
msgid "Jabber ID: <i>%s</i>"
msgstr "Jabber ID: <i>%s</i>"
-#: ../src/dialogs.py:184
+#: ../src/dialogs.py:194
msgid "Group"
msgstr "群组"
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:201
msgid "In the group"
msgstr "群组内"
-#: ../src/dialogs.py:277
+#: ../src/dialogs.py:292
msgid "KeyID"
msgstr "KeyID"
-#: ../src/dialogs.py:282
+#: ../src/dialogs.py:297
msgid "Contact name"
msgstr "联系人名"
-#: ../src/dialogs.py:454
+#: ../src/dialogs.py:469
#, fuzzy
msgid "Set Mood"
msgstr "设定 MOTD"
-#: ../src/dialogs.py:572
+#: ../src/dialogs.py:589
#, python-format
msgid "%s Status Message"
msgstr " %s 状态消息"
-#: ../src/dialogs.py:586
+#: ../src/dialogs.py:603
msgid "Status Message"
msgstr "状态消息"
-#: ../src/dialogs.py:772
+#: ../src/dialogs.py:793
#, fuzzy
msgid "Overwrite Status Message?"
msgstr "状态消息"
-#: ../src/dialogs.py:773
+#: ../src/dialogs.py:794
#, fuzzy
msgid ""
"This name is already used. Do you want to overwrite this status message?"
msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
-#: ../src/dialogs.py:781
+#: ../src/dialogs.py:802
msgid "Save as Preset Status Message"
msgstr "<b>保存为预设状态消息</b>"
-#: ../src/dialogs.py:782
+#: ../src/dialogs.py:803
msgid "Please type a name for this status message"
msgstr "请为该状态信息键入名称:"
-#: ../src/dialogs.py:807
+#: ../src/dialogs.py:831
msgid "AIM Address:"
msgstr "AIM 地址:"
-#: ../src/dialogs.py:808
+#: ../src/dialogs.py:832
msgid "GG Number:"
msgstr "GG 号码:"
-#: ../src/dialogs.py:809
+#: ../src/dialogs.py:833
msgid "ICQ Number:"
msgstr "ICQ 号码:"
-#: ../src/dialogs.py:810
+#: ../src/dialogs.py:834
msgid "MSN Address:"
msgstr "MSN 地址:"
-#: ../src/dialogs.py:811
+#: ../src/dialogs.py:835
msgid "Yahoo! Address:"
msgstr "Yahoo! 地址:"
-#: ../src/dialogs.py:847
+#: ../src/dialogs.py:872
#, python-format
msgid "Please fill in the data of the contact you want to add in account %s"
msgstr "请为账户 %s 填入您想增加的联系人数据"
-#: ../src/dialogs.py:849
+#: ../src/dialogs.py:874
msgid "Please fill in the data of the contact you want to add"
msgstr "请填入您想增加的联系人数据"
-#: ../src/dialogs.py:1006 ../src/dialogs.py:1012 ../src/dialogs.py:1017
+#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
msgid "Invalid User ID"
msgstr "无效的用户 ID"
-#: ../src/dialogs.py:1013
+#: ../src/dialogs.py:1042
msgid "The user ID must not contain a resource."
msgstr "该用户 ID 不可包含任何源"
-#: ../src/dialogs.py:1018
+#: ../src/dialogs.py:1047
#, fuzzy
msgid "You cannot add yourself to your roster."
msgstr "我申请添加您到联系人名单"
-#: ../src/dialogs.py:1032
+#: ../src/dialogs.py:1061
msgid "Contact already in roster"
msgstr "联系人已经在名单中"
-#: ../src/dialogs.py:1033
+#: ../src/dialogs.py:1062
msgid "This contact is already listed in your roster."
msgstr "此联系人已在名单中。"
-#: ../src/dialogs.py:1069
+#: ../src/dialogs.py:1098
msgid "User ID:"
msgstr "用户 ID:"
-#: ../src/dialogs.py:1127
+#: ../src/dialogs.py:1159
msgid "A GTK+ jabber client"
msgstr "一个 GTK+ 的 Jabber 客户端"
-#: ../src/dialogs.py:1128
+#: ../src/dialogs.py:1160
msgid "GTK+ Version:"
msgstr "GTK+ 版本:"
-#: ../src/dialogs.py:1129
+#: ../src/dialogs.py:1161
msgid "PyGTK Version:"
msgstr "PyGTK 版本:"
-#: ../src/dialogs.py:1139
+#: ../src/dialogs.py:1171
msgid "Current Developers:"
msgstr "当前的开发者:"
-#: ../src/dialogs.py:1141
+#: ../src/dialogs.py:1173
msgid "Past Developers:"
msgstr "既往开发作者:"
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:1179
msgid "THANKS:"
msgstr "感谢:"
#. remove one english sentence
#. and add it manually as translatable
-#: ../src/dialogs.py:1153
+#: ../src/dialogs.py:1185
msgid "Last but not least, we would like to thank all the package maintainers."
msgstr "最后但不是最重要的,我们要特别感谢所有的软件维护人员。"
#. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1166
+#: ../src/dialogs.py:1198
msgid "translator-credits"
msgstr ""
"wwld <wwld@radio.lzusiyu.org>\n"
"kangkang <kanger@gmail.com>\n"
"jeanet <qianxiaojun604@gmail.com>"
-#: ../src/dialogs.py:1328
+#: ../src/dialogs.py:1366
#, fuzzy, python-format
msgid ""
"You have to install %s dictionary to use spellchecking, or choose another "
@@ -6786,404 +6772,437 @@ msgid ""
msgstr ""
"您需安装 %s 字典以使用拼写检查,或者设置拼写检查选项以选择另外一种语言。(_L)"
-#: ../src/dialogs.py:1747 ../src/dialogs.py:2061
+#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
#, fuzzy
msgid "The nickname has not allowed characters."
msgstr "群聊 Jabber ID 包含非法字符。"
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:1948
#, fuzzy, python-format
msgid "Subscription request for account %(account)s from %(jid)s"
msgstr "该认证要求来自帐户 %s 由 %s 发送"
-#: ../src/dialogs.py:1862
+#: ../src/dialogs.py:1951
#, python-format
msgid "Subscription request from %s"
msgstr "来自 %s 的认证请求"
-#: ../src/dialogs.py:1928 ../src/gajim.py:2827
+#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
#, python-format
msgid "You are already in group chat %s"
msgstr "您已经在群聊房间 %s 。"
-#: ../src/dialogs.py:1934
+#: ../src/dialogs.py:2032
msgid "You can not join a group chat unless you are connected."
msgstr "请在加入群聊前先连接到服务器。"
-#: ../src/dialogs.py:1970
+#: ../src/dialogs.py:2074
#, python-format
msgid "Join Group Chat with account %s"
msgstr "使用账户 %s 加入群聊"
-#: ../src/dialogs.py:2050
+#: ../src/dialogs.py:2160
#, fuzzy
msgid "Invalid Account"
msgstr "无效的账户名称"
-#: ../src/dialogs.py:2051
+#: ../src/dialogs.py:2161
#, fuzzy
msgid ""
"You have to choose an account from which you want to join the groupchat."
msgstr "您必须在与他人聊天前新建账户。"
-#: ../src/dialogs.py:2060
+#: ../src/dialogs.py:2170
#, fuzzy
msgid "Invalid Nickname"
msgstr "无效用户名"
-#: ../src/dialogs.py:2065 ../src/dialogs.py:2071
-#: ../src/groupchat_control.py:1738
+#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
+#: ../src/groupchat_control.py:1776
msgid "Invalid group chat Jabber ID"
msgstr "无效的群聊 Jabber ID"
-#: ../src/dialogs.py:2066 ../src/dialogs.py:2072
-#: ../src/groupchat_control.py:1739
+#: ../src/dialogs.py:2176
+#, fuzzy
+msgid "Please enter the group chat Jabber ID as room@server."
+msgstr "群聊 Jabber ID 包含非法字符。"
+
+#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
msgid "The group chat Jabber ID has not allowed characters."
msgstr "群聊 Jabber ID 包含非法字符。"
-#: ../src/dialogs.py:2079
+#: ../src/dialogs.py:2189
msgid "This is not a group chat"
msgstr "这不是一个群聊"
-#: ../src/dialogs.py:2080
+#: ../src/dialogs.py:2190
#, python-format
msgid "%s is not the name of a group chat."
msgstr "%s 不是群聊的名称。"
-#: ../src/dialogs.py:2111
+#: ../src/dialogs.py:2221
#, fuzzy
msgid "Without a connection, you can not synchronise your contacts."
msgstr "连接后才可更改密码。"
-#: ../src/dialogs.py:2125
+#: ../src/dialogs.py:2235
msgid "Server"
msgstr "服务器"
-#: ../src/dialogs.py:2158
+#: ../src/dialogs.py:2270
#, fuzzy
msgid "This account is not connected to the server"
msgstr "账户 “%s” 已连接到服务器"
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2271
#, fuzzy
msgid "You cannot synchronize with an account unless it is connected."
msgstr "请在加入群聊前先连接到服务器。"
-#: ../src/dialogs.py:2183
+#: ../src/dialogs.py:2295
msgid "Synchronise"
msgstr ""
-#: ../src/dialogs.py:2241
+#: ../src/dialogs.py:2355
#, python-format
msgid "Start Chat with account %s"
msgstr "使用账户 %s 加入群聊"
-#: ../src/dialogs.py:2243
+#: ../src/dialogs.py:2357
msgid "Start Chat"
msgstr "开始聊天"
-#: ../src/dialogs.py:2244
+#: ../src/dialogs.py:2358
msgid ""
"Fill in the nickname or the Jabber ID of the contact you would like\n"
"to send a chat message to:"
msgstr "填写您想发送聊天消息到的联系人 ID 或昵称:"
#. if offline or connecting
-#: ../src/dialogs.py:2268 ../src/dialogs.py:2651 ../src/dialogs.py:2813
+#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
msgid "Connection not available"
msgstr "连接不可用"
-#: ../src/dialogs.py:2269 ../src/dialogs.py:2652 ../src/dialogs.py:2814
+#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
#, python-format
msgid "Please make sure you are connected with \"%s\"."
msgstr "请确认已连接到 “%s”。"
-#: ../src/dialogs.py:2278 ../src/dialogs.py:2281
+#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
msgid "Invalid JID"
msgstr "无效的 Jabber ID"
-#: ../src/dialogs.py:2281
+#: ../src/dialogs.py:2397
#, python-format
msgid "Unable to parse \"%s\"."
msgstr "无法解析 \"%s\"。"
-#: ../src/dialogs.py:2290
+#: ../src/dialogs.py:2406
msgid "Without a connection, you can not change your password."
msgstr "连接后才可更改密码。"
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
msgid "Invalid password"
msgstr "无效密码"
-#: ../src/dialogs.py:2309
+#: ../src/dialogs.py:2425
msgid "You must enter a password."
msgstr "此处必须输入密码"
-#: ../src/dialogs.py:2313
+#: ../src/dialogs.py:2429
msgid "Passwords do not match"
msgstr "密码不符"
-#: ../src/dialogs.py:2314
+#: ../src/dialogs.py:2430
msgid "The passwords typed in both fields must be identical."
msgstr "两次密码输入不一致。"
#. img to display
#. default value
-#: ../src/dialogs.py:2353 ../src/notify.py:257 ../src/notify.py:491
+#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
msgid "Contact Signed In"
msgstr "联系人登录"
-#: ../src/dialogs.py:2355 ../src/notify.py:265 ../src/notify.py:493
+#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
msgid "Contact Signed Out"
msgstr "联系人退出登录"
#. chat message
#. img to display
-#: ../src/dialogs.py:2357 ../src/notify.py:288 ../src/notify.py:342
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
+#: ../src/notify.py:508
msgid "New Message"
msgstr "新消息"
#. single message
-#: ../src/dialogs.py:2357 ../src/notify.py:269 ../src/notify.py:343
-#: ../src/notify.py:495
+#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
+#: ../src/notify.py:508
msgid "New Single Message"
msgstr "新消息"
#. private message
-#: ../src/dialogs.py:2358 ../src/notify.py:276 ../src/notify.py:343
-#: ../src/notify.py:496
+#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
+#: ../src/notify.py:509
msgid "New Private Message"
msgstr "新的个人消息"
-#: ../src/dialogs.py:2358 ../src/gajim.py:1704 ../src/notify.py:505
+#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
msgid "New E-mail"
msgstr "新的电子邮件"
-#: ../src/dialogs.py:2360 ../src/gajim.py:1770 ../src/notify.py:498
+#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
msgid "File Transfer Request"
msgstr "文件传输请求"
-#: ../src/dialogs.py:2362 ../src/gajim.py:1670 ../src/gajim.py:1737
-#: ../src/notify.py:500
+#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
+#: ../src/gui_interface.py:1349 ../src/notify.py:513
msgid "File Transfer Error"
msgstr "文件传输错误"
-#: ../src/dialogs.py:2364 ../src/gajim.py:1815 ../src/gajim.py:1837
-#: ../src/gajim.py:1854 ../src/notify.py:502
+#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
+#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
+#: ../src/notify.py:515
msgid "File Transfer Completed"
msgstr "文件传输完成"
-#: ../src/dialogs.py:2365 ../src/gajim.py:1818 ../src/notify.py:503
+#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
msgid "File Transfer Stopped"
msgstr "文件传输已停止"
-#: ../src/dialogs.py:2367 ../src/gajim.py:1512 ../src/notify.py:507
+#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
msgid "Groupchat Invitation"
msgstr "群聊邀请"
-#: ../src/dialogs.py:2369 ../src/notify.py:249 ../src/notify.py:509
+#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
msgid "Contact Changed Status"
msgstr "联系人状态改变"
-#: ../src/dialogs.py:2570
+#: ../src/dialogs.py:2686
#, python-format
msgid "Single Message using account %s"
msgstr "账户 %s 的单条消息"
-#: ../src/dialogs.py:2572
+#: ../src/dialogs.py:2688
#, python-format
msgid "Single Message in account %s"
msgstr "账户 %s 的单条消息"
-#: ../src/dialogs.py:2574
+#: ../src/dialogs.py:2690
msgid "Single Message"
msgstr "单条消息"
#. prepare UI for Sending
-#: ../src/dialogs.py:2577
+#: ../src/dialogs.py:2693
#, python-format
msgid "Send %s"
msgstr "发送 %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2600
+#: ../src/dialogs.py:2716
#, python-format
msgid "Received %s"
msgstr "已接收 %s"
#. prepare UI for Receiving
-#: ../src/dialogs.py:2623
+#: ../src/dialogs.py:2739
#, fuzzy, python-format
msgid "Form %s"
msgstr "来自 %s"
#. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2702
+#: ../src/dialogs.py:2818
#, python-format
msgid "RE: %s"
msgstr "回复: %s"
-#: ../src/dialogs.py:2703
+#: ../src/dialogs.py:2819
#, python-format
msgid "%s wrote:\n"
msgstr "%s 写道:\n"
-#: ../src/dialogs.py:2752
+#: ../src/dialogs.py:2868
#, python-format
msgid "XML Console for %s"
msgstr "账户 %s 的 XML 控制台"
-#: ../src/dialogs.py:2754
+#: ../src/dialogs.py:2870
msgid "XML Console"
msgstr " XML 控制台"
-#. Set labels
-#. self.action can be 'add', 'modify' or 'remove'
-#: ../src/dialogs.py:2865
+#. Action that can be done with an incoming list of contacts
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "add"
+msgstr "已冻结"
+
+#: ../src/dialogs.py:2958
+#, fuzzy
+msgid "modify"
+msgstr "修改(_M)"
+
+#: ../src/dialogs.py:2959
+#, fuzzy
+msgid "remove"
+msgstr "移除(_R)"
+
+#: ../src/dialogs.py:2987
#, fuzzy, python-format
-msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
msgstr "我想添加您到我的联系人名单"
-#: ../src/dialogs.py:2880 ../src/dialogs.py:2928
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
msgid "Add"
msgstr "地址"
-#: ../src/dialogs.py:2882 ../src/dialogs.py:2961
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
#, fuzzy
msgid "Modify"
msgstr "修改(_M)"
-#: ../src/dialogs.py:2888
+#: ../src/dialogs.py:3011
#, fuzzy
msgid "Jabber ID"
msgstr "Jabber ID"
-#: ../src/dialogs.py:2894
+#: ../src/dialogs.py:3017
#, fuzzy
msgid "Groups"
msgstr "群组"
#. it is selected
-#. remote_jid = model[iter][1].decode('utf-8')
-#: ../src/dialogs.py:3008
+#. remote_jid = model[iter_][1].decode('utf-8')
+#: ../src/dialogs.py:3125
#, fuzzy, python-format
msgid "%s suggested me to add you in my roster."
msgstr "我申请添加您到联系人名单"
-#: ../src/dialogs.py:3108
+#: ../src/dialogs.py:3139
+#, fuzzy, python-format
+msgid "Added %s contacts"
+msgstr "添加联系人(_C)"
+
+#: ../src/dialogs.py:3176
+#, fuzzy, python-format
+msgid "Removed %s contacts"
+msgstr "从名单移除联系人"
+
+#: ../src/dialogs.py:3229
#, python-format
msgid "Privacy List <b><i>%s</i></b>"
msgstr "私人列表 <b><i>%s</i></b>"
-#: ../src/dialogs.py:3112
+#: ../src/dialogs.py:3233
#, python-format
msgid "Privacy List for %s"
msgstr "%s 的私人列表"
-#: ../src/dialogs.py:3168
+#: ../src/dialogs.py:3289
#, fuzzy, python-format
msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
msgstr "顺序:%s,动作:%s,类型:%s,值:%s"
-#: ../src/dialogs.py:3173
+#: ../src/dialogs.py:3294
#, fuzzy, python-format
msgid "Order: %(order)s, action: %(action)s"
msgstr "顺序: %s,动作:%s"
-#: ../src/dialogs.py:3215
+#: ../src/dialogs.py:3338
msgid "<b>Edit a rule</b>"
msgstr "<b>编辑规则</b>"
-#: ../src/dialogs.py:3326
+#: ../src/dialogs.py:3449
msgid "<b>Add a rule</b>"
msgstr "<b>添加规则</b>"
-#: ../src/dialogs.py:3423
+#: ../src/dialogs.py:3549
#, python-format
msgid "Privacy Lists for %s"
msgstr "%s 的私人列表"
-#: ../src/dialogs.py:3425
+#: ../src/dialogs.py:3551
msgid "Privacy Lists"
msgstr "私人列表"
-#: ../src/dialogs.py:3495
+#: ../src/dialogs.py:3621
msgid "Invalid List Name"
msgstr "无效列表名"
-#: ../src/dialogs.py:3496
+#: ../src/dialogs.py:3622
msgid "You must enter a name to create a privacy list."
msgstr "您必须输入一个名称以创建一个私人列表。"
-#: ../src/dialogs.py:3528
+#: ../src/dialogs.py:3654
#, fuzzy
msgid "You are invited to a groupchat"
msgstr "您被该群聊封禁。"
-#: ../src/dialogs.py:3531
+#: ../src/dialogs.py:3657
#, fuzzy
msgid "$Contact has invited you to join a discussion"
msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
-#: ../src/dialogs.py:3533
+#: ../src/dialogs.py:3659
#, fuzzy, python-format
msgid "$Contact has invited you to group chat %(room_jid)s"
msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
-#: ../src/dialogs.py:3541
+#: ../src/dialogs.py:3667
#, python-format
msgid "Comment: %s"
msgstr "注释: %s"
-#: ../src/dialogs.py:3543
+#: ../src/dialogs.py:3669
msgid "Do you want to accept the invitation?"
msgstr ""
-#: ../src/dialogs.py:3599
+#: ../src/dialogs.py:3730
msgid "Choose Sound"
msgstr "选择声音"
-#: ../src/dialogs.py:3609 ../src/dialogs.py:3663
+#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
msgid "All files"
msgstr "全部文件"
-#: ../src/dialogs.py:3614
+#: ../src/dialogs.py:3745
msgid "Wav Sounds"
msgstr "Wav声音"
-#: ../src/dialogs.py:3650
+#: ../src/dialogs.py:3783
msgid "Choose Image"
msgstr "选择形象"
-#: ../src/dialogs.py:3668
+#: ../src/dialogs.py:3801
msgid "Images"
msgstr "形象"
-#: ../src/dialogs.py:3733
+#: ../src/dialogs.py:3868
#, python-format
msgid "When %s becomes:"
msgstr "当 %s 变为:"
-#: ../src/dialogs.py:3735
+#: ../src/dialogs.py:3870
#, python-format
msgid "Adding Special Notification for %s"
msgstr "正在为 %s 添加特殊通告"
#. # means number
-#: ../src/dialogs.py:3804
+#: ../src/dialogs.py:3939
msgid "#"
msgstr "#"
-#: ../src/dialogs.py:3810
+#: ../src/dialogs.py:3945
msgid "Condition"
msgstr "条件"
-#: ../src/dialogs.py:3928
+#: ../src/dialogs.py:4065
msgid "when I am "
msgstr "当我"
-#: ../src/dialogs.py:4400
+#: ../src/dialogs.py:4541
#, python-format
msgid ""
"Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7191,38 +7210,38 @@ msgid ""
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
-#: ../src/dialogs.py:4404
+#: ../src/dialogs.py:4545
msgid "You have already verified this contact's identity."
msgstr ""
-#: ../src/dialogs.py:4410 ../src/dialogs.py:4497
+#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
msgid "Contact's identity verified"
msgstr ""
-#: ../src/dialogs.py:4418
+#: ../src/dialogs.py:4559
msgid "Verify again..."
msgstr ""
-#: ../src/dialogs.py:4423
+#: ../src/dialogs.py:4564
msgid ""
"To be certain that <b>only</b> the expected person can read your messages or "
"send you messages, you need to verify their identity by clicking the button "
"below."
msgstr ""
-#: ../src/dialogs.py:4426 ../src/dialogs.py:4478 ../src/dialogs.py:4491
+#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
msgid "Contact's identity NOT verified"
msgstr ""
-#: ../src/dialogs.py:4433
+#: ../src/dialogs.py:4574
msgid "Verify..."
msgstr ""
-#: ../src/dialogs.py:4445
+#: ../src/dialogs.py:4586
msgid "Have you verified the contact's identity?"
msgstr ""
-#: ../src/dialogs.py:4446
+#: ../src/dialogs.py:4587
#, python-format
msgid ""
"To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7232,31 +7251,50 @@ msgid ""
"This session's Short Authentication String is <b>%(sas)s</b>."
msgstr ""
-#: ../src/dialogs.py:4447
+#: ../src/dialogs.py:4588
msgid "Did you talk to the remote contact and verify the SAS?"
msgstr ""
-#: ../src/dialogs.py:4479
+#: ../src/dialogs.py:4622
#, python-format
msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
msgstr ""
-#: ../src/dialogs.py:4485
+#: ../src/dialogs.py:4628
msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
msgstr ""
-#: ../src/dialogs.py:4492
+#: ../src/dialogs.py:4635
msgid ""
"GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
"message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
msgstr ""
-#: ../src/dialogs.py:4498
+#: ../src/dialogs.py:4641
msgid ""
"GPG Key is assigned to this contact, and you trust his key, so messages will "
"be encrypted."
msgstr ""
+#: ../src/dialogs.py:4708
+msgid "an audio and video"
+msgstr ""
+
+#: ../src/dialogs.py:4710
+msgid "an audio"
+msgstr ""
+
+#: ../src/dialogs.py:4712
+msgid "a video"
+msgstr ""
+
+#: ../src/dialogs.py:4716
+#, python-format
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+
#: ../src/disco.py:118
msgid "Others"
msgstr "其他"
@@ -7266,363 +7304,358 @@ msgstr "其他"
msgid "Conference"
msgstr "会议"
-#: ../src/disco.py:442
+#: ../src/disco.py:478
msgid "Without a connection, you can not browse available services"
msgstr "连接后才可浏览可用服务"
-#: ../src/disco.py:516
+#: ../src/disco.py:554
#, python-format
msgid "Service Discovery using account %s"
msgstr "正在使用帐号 %s 来发掘服务"
-#: ../src/disco.py:518
+#: ../src/disco.py:556
msgid "Service Discovery"
msgstr "搜索服务"
-#: ../src/disco.py:659
+#: ../src/disco.py:706
msgid "The service could not be found"
msgstr "找不到该服务"
-#: ../src/disco.py:660
+#: ../src/disco.py:707
msgid ""
"There is no service at the address you entered, or it is not responding. "
"Check the address and try again."
msgstr "此地址没有服务或无应答。请检查地址后重试。"
-#: ../src/disco.py:664 ../src/disco.py:960
+#: ../src/disco.py:711 ../src/disco.py:1047
msgid "The service is not browsable"
msgstr "该服务无法浏览"
-#: ../src/disco.py:665
+#: ../src/disco.py:712
msgid "This type of service does not contain any items to browse."
msgstr "此服务没有项目可浏览。"
-#: ../src/disco.py:702 ../src/disco.py:712
+#: ../src/disco.py:751 ../src/disco.py:761
#, fuzzy
msgid "Invalid Server Name"
msgstr "无效用户名"
-#: ../src/disco.py:759
+#: ../src/disco.py:815
#, fuzzy, python-format
msgid "Browsing %(address)s using account %(account)s"
msgstr "浏览 %s 在帐户 %s 上"
-#: ../src/disco.py:799
+#: ../src/disco.py:859
msgid "_Browse"
msgstr "浏览(_B)"
-#: ../src/disco.py:961
+#: ../src/disco.py:1048
msgid "This service does not contain any items to browse."
msgstr "此服务不包含任何项目可浏览。"
-#: ../src/disco.py:1183
+#: ../src/disco.py:1288
#, fuzzy
msgid "_Execute Command"
msgstr "执行命令(_E)..."
-#: ../src/disco.py:1193 ../src/disco.py:1359
+#: ../src/disco.py:1298 ../src/disco.py:1469
msgid "Re_gister"
msgstr "注册(_G)"
-#: ../src/disco.py:1396
+#: ../src/disco.py:1510
#, fuzzy, python-format
msgid "Scanning %(current)d / %(total)d.."
msgstr "已扫描 %d / %d.."
#. Users column
-#: ../src/disco.py:1578
+#: ../src/disco.py:1700
msgid "Users"
msgstr "用户"
#. Description column
-#: ../src/disco.py:1586
+#: ../src/disco.py:1708
msgid "Description"
msgstr "描述"
#. Id column
-#: ../src/disco.py:1594
+#: ../src/disco.py:1716
msgid "Id"
msgstr "Id"
-#: ../src/disco.py:1659 ../src/gajim.py:3311
+#: ../src/disco.py:1781 ../src/gui_interface.py:3088
msgid "Bookmark already set"
msgstr "书签已设定"
-#: ../src/disco.py:1660 ../src/gajim.py:3312
+#: ../src/disco.py:1782 ../src/gui_interface.py:3089
#, python-format
msgid "Group Chat \"%s\" is already in your bookmarks."
msgstr "群聊“%s”已在您的书签中。"
-#: ../src/disco.py:1669 ../src/gajim.py:3325
+#: ../src/disco.py:1791 ../src/gui_interface.py:3102
msgid "Bookmark has been added successfully"
msgstr "书签添加成功"
-#: ../src/disco.py:1670 ../src/gajim.py:3326
+#: ../src/disco.py:1792 ../src/gui_interface.py:3103
msgid "You can manage your bookmarks via Actions menu in your roster."
msgstr "您可以通过“动作”菜单管理您的名单。"
-#: ../src/disco.py:1863
+#: ../src/disco.py:2001
msgid "Subscribed"
msgstr "订阅"
-#: ../src/disco.py:1871
+#: ../src/disco.py:2009
#, fuzzy
msgid "Node"
msgstr "无"
-#: ../src/disco.py:1933
+#: ../src/disco.py:2073
msgid "New post"
msgstr "新发表"
-#: ../src/disco.py:1939
+#: ../src/disco.py:2079
msgid "_Subscribe"
msgstr "认证(_S)"
-#: ../src/disco.py:1945
+#: ../src/disco.py:2085
msgid "_Unsubscribe"
msgstr "退订(_S)"
-#: ../src/features_window.py:46
+#: ../src/features_window.py:48
msgid "SSL certificat validation"
msgstr ""
-#: ../src/features_window.py:47
+#: ../src/features_window.py:49
msgid ""
"A library used to validate server certificates to ensure a secure connection."
msgstr ""
-#: ../src/features_window.py:48 ../src/features_window.py:49
+#: ../src/features_window.py:50 ../src/features_window.py:51
msgid "Requires python-pyopenssl."
msgstr ""
-#: ../src/features_window.py:50
+#: ../src/features_window.py:52
msgid "Bonjour / Zeroconf"
msgstr ""
-#: ../src/features_window.py:51
+#: ../src/features_window.py:53
msgid "Serverless chatting with autodetected clients in a local network."
msgstr ""
-#: ../src/features_window.py:52
+#: ../src/features_window.py:54
msgid "Requires python-avahi."
msgstr ""
-#: ../src/features_window.py:53
+#: ../src/features_window.py:55
msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
msgstr ""
-#: ../src/features_window.py:54
+#: ../src/features_window.py:56
#, fuzzy
msgid "Command line"
msgstr "命令: %s "
-#: ../src/features_window.py:55
+#: ../src/features_window.py:57
msgid "A script to control Gajim via commandline."
msgstr ""
-#: ../src/features_window.py:56
+#: ../src/features_window.py:58
msgid "Requires python-dbus."
msgstr ""
-#: ../src/features_window.py:57 ../src/features_window.py:61
-#: ../src/features_window.py:65 ../src/features_window.py:69
-#: ../src/features_window.py:73 ../src/features_window.py:81
-#: ../src/features_window.py:85
+#: ../src/features_window.py:59 ../src/features_window.py:63
+#: ../src/features_window.py:67 ../src/features_window.py:71
+#: ../src/features_window.py:75 ../src/features_window.py:83
+#: ../src/features_window.py:87 ../src/features_window.py:111
msgid "Feature not available under Windows."
msgstr ""
-#: ../src/features_window.py:58
+#: ../src/features_window.py:60
#, fuzzy
msgid "OpenGPG message encryption"
msgstr "OpenPGP 加密"
-#: ../src/features_window.py:59
+#: ../src/features_window.py:61
#, fuzzy
msgid "Encrypting chat messages with gpg keys."
msgstr "抵达的消息:(_I)"
-#: ../src/features_window.py:60
+#: ../src/features_window.py:62
msgid "Requires gpg and python-GnuPGInterface."
msgstr ""
-#: ../src/features_window.py:62
+#: ../src/features_window.py:64
#, fuzzy
msgid "Network-manager"
msgstr "历史管理器"
-#: ../src/features_window.py:63
+#: ../src/features_window.py:65
msgid "Autodetection of network status."
msgstr ""
-#: ../src/features_window.py:64
+#: ../src/features_window.py:66
msgid "Requires gnome-network-manager and python-dbus."
msgstr ""
-#: ../src/features_window.py:66
+#: ../src/features_window.py:68
#, fuzzy
msgid "Session Management"
msgstr "消息已发送"
-#: ../src/features_window.py:67
+#: ../src/features_window.py:69
msgid "Gajim session is stored on logout and restored on login."
msgstr ""
-#: ../src/features_window.py:68
+#: ../src/features_window.py:70
msgid "Requires python-gnome2."
msgstr ""
-#: ../src/features_window.py:70
+#: ../src/features_window.py:72
#, fuzzy
msgid "Password encryption"
msgstr "密码不符"
-#: ../src/features_window.py:71
+#: ../src/features_window.py:73
msgid "Passwords can be stored securely and not just in plaintext."
msgstr ""
-#: ../src/features_window.py:72
+#: ../src/features_window.py:74
msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
msgstr ""
-#: ../src/features_window.py:74
+#: ../src/features_window.py:76
msgid "SRV"
msgstr ""
-#: ../src/features_window.py:75
+#: ../src/features_window.py:77
msgid "Ability to connect to servers which are using SRV records."
msgstr ""
-#: ../src/features_window.py:76
+#: ../src/features_window.py:78
msgid "Requires dnsutils."
msgstr ""
-#: ../src/features_window.py:77
+#: ../src/features_window.py:79
msgid "Requires nslookup to use SRV records."
msgstr ""
-#: ../src/features_window.py:78
+#: ../src/features_window.py:80
msgid "Spell Checker"
msgstr ""
-#: ../src/features_window.py:79
+#: ../src/features_window.py:81
msgid "Spellchecking of composed messages."
msgstr ""
-#: ../src/features_window.py:80
+#: ../src/features_window.py:82
msgid "Requires libgtkspell."
msgstr ""
-#: ../src/features_window.py:82
+#: ../src/features_window.py:84
#, fuzzy
msgid "Notification"
msgstr "帐户修改"
-#: ../src/features_window.py:83
+#: ../src/features_window.py:85
msgid "Passive popups notifying for new events."
msgstr ""
-#: ../src/features_window.py:84
+#: ../src/features_window.py:86
msgid ""
"Requires python-notify or instead python-dbus in conjunction with "
"notification-daemon."
msgstr ""
-#: ../src/features_window.py:86
-msgid "Trayicon"
-msgstr ""
-
-#: ../src/features_window.py:87
-msgid "A icon in systemtray reflecting the current presence."
-msgstr ""
-
#: ../src/features_window.py:88
-msgid ""
-"Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
-msgstr ""
-
-#: ../src/features_window.py:89
-msgid "Requires PyGTK >= 2.10."
-msgstr ""
-
-#: ../src/features_window.py:90
#, fuzzy
msgid "Automatic status"
msgstr "调整状态(_A)"
-#: ../src/features_window.py:91
+#: ../src/features_window.py:89
msgid "Ability to measure idle time, in order to set auto status."
msgstr ""
-#: ../src/features_window.py:92
+#: ../src/features_window.py:90
msgid "Requires libxss library."
msgstr ""
-#: ../src/features_window.py:93
+#: ../src/features_window.py:91
msgid "Requires python2.5."
msgstr ""
-#: ../src/features_window.py:94
+#: ../src/features_window.py:92
msgid "LaTeX"
msgstr ""
-#: ../src/features_window.py:95
+#: ../src/features_window.py:93
msgid "Transform LaTeX expressions between $$ $$."
msgstr ""
-#: ../src/features_window.py:96
+#: ../src/features_window.py:94
msgid ""
"Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
"in the Advanced Configuration Editor."
msgstr ""
-#: ../src/features_window.py:97
+#: ../src/features_window.py:95
msgid ""
"Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
"'use_latex' to True in the Advanced Configuration Editor."
msgstr ""
-#: ../src/features_window.py:98
+#: ../src/features_window.py:96
#, fuzzy
msgid "End to End message encryption"
msgstr "OpenPGP 加密"
-#: ../src/features_window.py:99
+#: ../src/features_window.py:97
#, fuzzy
msgid "Encrypting chat messages."
msgstr "抵达的消息:(_I)"
-#: ../src/features_window.py:100 ../src/features_window.py:101
+#: ../src/features_window.py:98 ../src/features_window.py:99
msgid "Requires python-crypto."
msgstr ""
-#: ../src/features_window.py:102
+#: ../src/features_window.py:100
#, fuzzy
msgid "RST Generator"
msgstr "常规"
-#: ../src/features_window.py:103
+#: ../src/features_window.py:101
msgid ""
"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
"docs/ref/rst/restructuredtext.html)."
msgstr ""
-#: ../src/features_window.py:104 ../src/features_window.py:105
+#: ../src/features_window.py:102 ../src/features_window.py:103
msgid "Requires python-docutils."
msgstr ""
-#: ../src/features_window.py:106
+#: ../src/features_window.py:104
msgid "Banners and clickable links"
msgstr ""
-#: ../src/features_window.py:107
+#: ../src/features_window.py:105
msgid "Ability to have clickable URLs in chat and groupchat window banners."
msgstr ""
-#: ../src/features_window.py:108 ../src/features_window.py:109
+#: ../src/features_window.py:106 ../src/features_window.py:107
msgid "Requires python-sexy."
msgstr ""
-#: ../src/features_window.py:123
+#: ../src/features_window.py:108
+msgid "Audio / Video"
+msgstr ""
+
+#: ../src/features_window.py:109
+msgid "Ability to start audio and video chat."
+msgstr ""
+
+#: ../src/features_window.py:110
+msgid "Requires python-farsight."
+msgstr ""
+
+#: ../src/features_window.py:125
#, fuzzy
msgid "Feature"
msgstr "服务器设定"
@@ -7639,141 +7672,141 @@ msgstr "时间"
msgid "Progress"
msgstr "进程"
-#: ../src/filetransfers_window.py:173 ../src/filetransfers_window.py:227
+#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
#, python-format
msgid "Filename: %s"
msgstr "文件名: %s"
-#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
#, python-format
msgid "Size: %s"
msgstr "大小: %s"
#. You is a reply of who sent a file
#. You is a reply of who received a file
-#: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
-#: ../src/history_manager.py:520
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
+#: ../src/history_manager.py:529
msgid "You"
msgstr "您"
-#: ../src/filetransfers_window.py:184
+#: ../src/filetransfers_window.py:188
#, python-format
msgid "Sender: %s"
msgstr "发送者: %s"
-#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:670
+#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:651
msgid "Recipient: "
msgstr "接收者: %s"
-#: ../src/filetransfers_window.py:196
+#: ../src/filetransfers_window.py:200
#, python-format
msgid "Saved in: %s"
msgstr "保存在: %s"
-#: ../src/filetransfers_window.py:198
+#: ../src/filetransfers_window.py:202
msgid "File transfer completed"
msgstr "文件传输已完成"
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:218
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
#, fuzzy
msgid "File transfer cancelled"
msgstr "文件传输已取消"
-#: ../src/filetransfers_window.py:212 ../src/filetransfers_window.py:219
+#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
msgid "Connection with peer cannot be established."
msgstr "无法与对方建立连接。"
-#: ../src/filetransfers_window.py:228
+#: ../src/filetransfers_window.py:234
#, python-format
msgid "Recipient: %s"
msgstr "接收者: %s"
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:236
#, python-format
msgid "Error message: %s"
msgstr "错误消息:%s"
-#: ../src/filetransfers_window.py:231
+#: ../src/filetransfers_window.py:237
#, fuzzy
msgid "File transfer stopped"
msgstr "文件传输已停止"
-#: ../src/filetransfers_window.py:251
+#: ../src/filetransfers_window.py:257
msgid "Choose File to Send..."
msgstr "选择要发送的文件..."
-#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
#, fuzzy
msgid "Description: "
msgstr "描述: %s"
-#: ../src/filetransfers_window.py:278
+#: ../src/filetransfers_window.py:286
msgid "Gajim cannot access this file"
msgstr "Gajim 无法访问此文件"
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:287
msgid "This file is being used by another process."
msgstr "此文件正在被其它程序使用。"
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:320
#, python-format
msgid "File: %s"
msgstr "文件: %s"
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:326
#, python-format
msgid "Type: %s"
msgstr "类型:%s"
-#: ../src/filetransfers_window.py:318
+#: ../src/filetransfers_window.py:328
#, python-format
msgid "Description: %s"
msgstr "描述: %s"
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:329
#, python-format
msgid "%s wants to send you a file:"
msgstr "%s 想发送给您一个文件:"
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
#, python-format
msgid "Cannot overwrite existing file \"%s\""
msgstr "无法覆盖现有文件\"%s\""
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
msgid ""
"A file with this name already exists and you do not have permission to "
"overwrite it."
msgstr "文件名已经存在且您没有权限覆盖它。"
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
msgid "This file already exists"
msgstr "文件已经存在"
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
msgid "What do you want to do?"
msgstr "想做什么?"
#. read-only bit is used to mark special folder under windows,
#. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
#, python-format
msgid "Directory \"%s\" is not writable"
msgstr "目录 \"%s\" 不可写"
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
msgid "You do not have permission to create files in this directory."
msgstr "您没有权限在这个目录里创建文件。"
-#: ../src/filetransfers_window.py:369
+#: ../src/filetransfers_window.py:379
msgid "Save File as..."
msgstr "另存为..."
#. Print remaining time in format 00:00:00
#. You can change the places of (hours), (minutes), (seconds) -
#. they are not translatable.
-#: ../src/filetransfers_window.py:435
+#: ../src/filetransfers_window.py:449
#, python-format
msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -7781,32 +7814,32 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
#. This should make the string Kb/s,
#. where 'Kb' part is taken from %s.
#. Only the 's' after / (which means second) should be translated.
-#: ../src/filetransfers_window.py:526
+#: ../src/filetransfers_window.py:542
#, python-format
msgid "(%(filesize_unit)s/s)"
msgstr "(%(filesize_unit)s/s)"
-#: ../src/filetransfers_window.py:566 ../src/filetransfers_window.py:569
+#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
msgid "Invalid File"
msgstr "无效文件"
-#: ../src/filetransfers_window.py:566
+#: ../src/filetransfers_window.py:585
msgid "File: "
msgstr "文件:"
-#: ../src/filetransfers_window.py:570
+#: ../src/filetransfers_window.py:589
msgid "It is not possible to send empty files"
msgstr "无法发送空文件"
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
msgid "Name: "
msgstr "名称:"
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
msgid "Sender: "
msgstr "发送者:"
-#: ../src/filetransfers_window.py:781
+#: ../src/filetransfers_window.py:809
msgid "Pause"
msgstr "暂停"
@@ -7872,11 +7905,11 @@ msgid ""
msgstr "请确认 Pywin32 已经安装在您的系统中。您可以从 %s取得它"
#. set the icon to all newly opened wind
-#: ../src/gajim.py:354
+#: ../src/gajim.py:328
msgid "Gajim is already running"
msgstr "Gajim 已经在运行"
-#: ../src/gajim.py:355
+#: ../src/gajim.py:329
msgid ""
"Another instance of Gajim seems to be running\n"
"Run anyway?"
@@ -7884,522 +7917,122 @@ msgstr ""
"Gajim 另一个实例似乎正在运行 \n"
"运行?"
-#: ../src/gajim.py:440
-msgid "Passphrase Required"
-msgstr "要求密文"
-
-#: ../src/gajim.py:441
-#, fuzzy, python-format
-msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
-msgstr "为账户 %s 输入 GPG 密文字段"
-
-#: ../src/gajim.py:455
-msgid "GPG key expired"
-msgstr ""
-
-#: ../src/gajim.py:456
-#, fuzzy, python-format
-msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
-msgstr "您将在无 OpenPGP 情况下连接到 %s。"
-
-#. ask again
-#: ../src/gajim.py:465
-msgid "Wrong Passphrase"
-msgstr "错误字段"
-
-#: ../src/gajim.py:466
-msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "请重新输入您的 GPG 字段或点“取消”"
-
-#: ../src/gajim.py:524
-#, fuzzy, python-format
-msgid ""
-"Your desired nickname in group chat %s is in use or registered by another "
-"occupant.\n"
-"Please specify another nickname below:"
-msgstr ""
-"您申请的昵称正在使用或被其他人占有。\n"
-"从下列昵称中另外指定一个:"
-
-#: ../src/gajim.py:527
-msgid "Always use this nickname when there is a conflict"
-msgstr ""
-
-#: ../src/gajim.py:544
-msgid "Do you accept this request?"
-msgstr "是否接受这个请求?"
-
-#: ../src/gajim.py:546
-#, fuzzy, python-format
-msgid "Do you accept this request on account %s?"
-msgstr "是否接受这个请求?"
-
-#: ../src/gajim.py:549
-#, fuzzy, python-format
-msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
-msgstr "HTTP (%s) 授权给 %s (id: %s)"
-
-#: ../src/gajim.py:600 ../src/notify.py:511
-msgid "Connection Failed"
-msgstr "连接失败"
-
-#: ../src/gajim.py:933 ../src/gajim.py:937
-#, fuzzy, python-format
-msgid "Error %(code)s: %(msg)s"
-msgstr "%(nickname)s: %(message)s"
-
-#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:947 ../src/gajim.py:961
-#, fuzzy, python-format
-msgid "error while sending %(message)s ( %(error)s )"
-msgstr "发送 %s ( %s ) 时出现错误"
-
-#: ../src/gajim.py:988 ../src/notify.py:513
-#, fuzzy
-msgid "Subscription request"
-msgstr "认证请求"
-
-#: ../src/gajim.py:1013
-msgid "Authorization accepted"
-msgstr "授权被接受"
-
-#: ../src/gajim.py:1014
-#, python-format
-msgid "The contact \"%s\" has authorized you to see his or her status."
-msgstr "联系人“%s”已授权您查看他/她的状态。"
-
-#: ../src/gajim.py:1026
-#, python-format
-msgid "Contact \"%s\" removed subscription from you"
-msgstr "联系人“%s”移除了来自您的认证"
-
-#: ../src/gajim.py:1027
-msgid ""
-"You will always see him or her as offline.\n"
-"Do you want to remove him or her from your contact list?"
-msgstr ""
-
-#: ../src/gajim.py:1052 ../src/notify.py:515
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "退订(_S)"
-
-#: ../src/gajim.py:1093
-#, python-format
-msgid "Contact with \"%s\" cannot be established"
-msgstr "无法与对方“ %s ”建立连接。"
-
-#: ../src/gajim.py:1283 ../src/groupchat_control.py:1251
-#, fuzzy, python-format
-msgid "%(nick)s is now known as %(new_nick)s"
-msgstr "%s 现在成了 %s"
-
-#: ../src/gajim.py:1308 ../src/groupchat_control.py:1436
-#: ../src/history_window.py:431 ../src/notify.py:244
-#, python-format
-msgid "%(nick)s is now %(status)s"
-msgstr "%(nick)s 的状态是 %(status)s"
-
-#: ../src/gajim.py:1375
-#, python-format
-msgid "%(jid)s has set the subject to %(subject)s"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1439 ../src/groupchat_control.py:1191
-msgid "Any occupant is allowed to see your full JID"
-msgstr ""
-
-#: ../src/gajim.py:1442
-msgid "Room now shows unavailable member"
-msgstr ""
-
-#: ../src/gajim.py:1444
-msgid "room now does not show unavailable members"
-msgstr ""
-
-#: ../src/gajim.py:1447
-msgid "A non-privacy-related room configuration change has occurred"
-msgstr ""
-
-#. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1450
-msgid "Room logging is now enabled"
-msgstr ""
-
-#: ../src/gajim.py:1452
-msgid "Room logging is now disabled"
-msgstr ""
-
-#: ../src/gajim.py:1454
-msgid "Room is now non-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1457
-msgid "Room is now semi-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1460
-msgid "Room is now fully-anonymous"
-msgstr ""
-
-#: ../src/gajim.py:1492
-#, fuzzy, python-format
-msgid "A Password is required to join the room %s. Please type it."
-msgstr "该群聊要求密码才能加入。"
-
-#: ../src/gajim.py:1526
-msgid ""
-"You configured Gajim to use GPG agent, but there is no GPG agent running or "
-"it returned a wrong passphrase.\n"
-msgstr ""
-
-#: ../src/gajim.py:1528 ../src/gajim.py:1534
-msgid "You are currently connected without your OpenPGP key."
-msgstr "已建立没有 OpenPGP 密钥的连接"
-
-#: ../src/gajim.py:1529
-msgid "Your passphrase is incorrect"
-msgstr "您的密文不正确"
-
-#: ../src/gajim.py:1533
-#, fuzzy
-msgid "OpenGPG Passphrase Incorrect"
-msgstr "您的密文不正确"
-
-#: ../src/gajim.py:1559
-msgid "GPG key not trusted"
-msgstr ""
-
-#: ../src/gajim.py:1559
-msgid ""
-"The GPG key used to encrypt this chat is not trusted. Do you really want to "
-"encrypt this message?"
-msgstr ""
-
-#: ../src/gajim.py:1561 ../src/gajim.py:2227 ../src/gajim.py:2262
-#: ../src/groupchat_control.py:1674 ../src/message_window.py:222
-#: ../src/roster_window.py:2667 ../src/roster_window.py:3292
-#: ../src/roster_window.py:3970
-msgid "Do _not ask me again"
-msgstr "不再提问此问题(_N)"
-
-#: ../src/gajim.py:1571
-msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
-msgstr ""
-
-#: ../src/gajim.py:1681
-#, python-format
-msgid "New mail on %(gmail_mail_address)s"
-msgstr " %(gmail_mail_address)s 上的新邮件"
-
-#: ../src/gajim.py:1683
-#, python-format
-msgid "You have %d new mail conversation"
-msgid_plural "You have %d new mail conversations"
-msgstr[0] "您有 %d 条新邮件会话"
-
-#: ../src/gajim.py:1696
-#, python-format
-msgid ""
-"\n"
-"\n"
-"From: %(from_address)s\n"
-"Subject: %(subject)s\n"
-"%(snippet)s"
-msgstr ""
-
-#: ../src/gajim.py:1767
-#, python-format
-msgid "%s wants to send you a file."
-msgstr "%s 想发送给您一个文件。"
-
-#: ../src/gajim.py:1805 ../src/roster_window.py:1851
-#, fuzzy
-msgid "Remote contact stopped transfer"
-msgstr "从名单移除联系人"
-
-#: ../src/gajim.py:1807 ../src/roster_window.py:1853
-#, fuzzy
-msgid "Error opening file"
-msgstr "读文件错误:"
-
-#: ../src/gajim.py:1838
-#, python-format
-msgid "You successfully received %(filename)s from %(name)s."
-msgstr "您成功的从 %(name)s 收到文件 %(filename)s。"
-
-#. ft stopped
-#: ../src/gajim.py:1842
-#, python-format
-msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
-
-#: ../src/gajim.py:1855
-#, python-format
-msgid "You successfully sent %(filename)s to %(name)s."
-msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
-
-#. ft stopped
-#: ../src/gajim.py:1859
-#, python-format
-msgid "File transfer of %(filename)s to %(name)s stopped."
-msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
-
-#: ../src/gajim.py:1961
-#, python-format
-msgid ""
-"Unable to decrypt message from %s\n"
-"It may have been tampered with."
-msgstr ""
-
-#: ../src/gajim.py:1968
-#, fuzzy
-msgid "Unable to decrypt message"
-msgstr "对于每条消息(_M)"
-
-#: ../src/gajim.py:2042
-msgid "Username Conflict"
-msgstr "用户名冲突"
-
-#: ../src/gajim.py:2043
-msgid "Please type a new username for your local account"
-msgstr "<b>请在您本地账户填写新的用户名</b>"
-
-#: ../src/gajim.py:2055
-msgid "Ping?"
-msgstr ""
-
-#: ../src/gajim.py:2068
-#, python-format
-msgid "Pong! (%s s.)"
-msgstr ""
-
-#: ../src/gajim.py:2079
-msgid "Error."
-msgstr ""
-
-#: ../src/gajim.py:2106
-#, fuzzy
-msgid "Resource Conflict"
-msgstr "用户名冲突"
-
-#: ../src/gajim.py:2107
-msgid ""
-"You are already connected to this account with the same resource. Please "
-"type a new one"
-msgstr ""
-
-#: ../src/gajim.py:2166
-msgid "Error verifying SSL certificate"
-msgstr ""
-
-#: ../src/gajim.py:2167
-#, python-format
-msgid ""
-"There was an error verifying the SSL certificate of your jabber server: %"
-"(error)s\n"
-"Do you still want to connect to this server?"
-msgstr ""
-
-#: ../src/gajim.py:2172
-msgid "Ignore this error for this certificate."
-msgstr ""
-
-#: ../src/gajim.py:2192
-msgid "SSL certificate error"
-msgstr ""
-
-#: ../src/gajim.py:2193
-#, python-format
-msgid ""
-"It seems the SSL certificate of account %(account)s has changed or your "
-"connection is being hacked.\n"
-"Old fingerprint: %(old)s\n"
-"New fingerprint: %(new)s\n"
-"\n"
-"Do you still want to connect and update the fingerprint of the certificate?"
-msgstr ""
-
-#: ../src/gajim.py:2223 ../src/gajim.py:2258
-#, fuzzy
-msgid "Insecure connection"
-msgstr "连接"
-
-#: ../src/gajim.py:2224
-#, fuzzy
-msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "您在创建一个元联系人。确定继续?"
-
-#: ../src/gajim.py:2226 ../src/gajim.py:2261
-msgid "Yes, I really want to connect insecurely"
-msgstr ""
-
-#: ../src/gajim.py:2259
-msgid ""
-"You are about to send your password on an insecure connection. You should "
-"install PyOpenSSL to prevent that. Are you sure you want to do that?"
-msgstr ""
-
-#: ../src/gajim.py:2279
-msgid "PEP node was not removed"
-msgstr ""
-
-#: ../src/gajim.py:2280
-#, python-format
-msgid "PEP node %(node)s was not removed: %(message)s"
-msgstr ""
-
-#. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2784 ../src/gajim.py:2806
-#, fuzzy
-msgid "Emoticons disabled"
-msgstr "禁用加密"
-
-#: ../src/gajim.py:2785
-msgid ""
-"Your configured emoticons theme has not been found, so emoticons have been "
-"disabled."
-msgstr ""
-
-#: ../src/gajim.py:2807
-msgid ""
-"Your configured emoticons theme cannot been loaded. You maybe need to update "
-"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
-"for more details."
-msgstr ""
-
-#: ../src/gajim.py:2833 ../src/roster_window.py:3432
-msgid "You cannot join a group chat while you are invisible"
-msgstr "隐身时无法加入群聊"
-
-#. it is good to notify the user
-#. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3202
-msgid "Could not save your settings and preferences"
-msgstr "无法保存您的设置。"
-
-#: ../src/gajim-remote.py:78
+#: ../src/gajim-remote.py:77
msgid "Shows a help on specific command"
msgstr "为特定命令显示帮助"
#. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:80
msgid "command"
msgstr "命令"
-#: ../src/gajim-remote.py:82
+#: ../src/gajim-remote.py:81
msgid "show help on command"
msgstr "为命令显示帮助"
-#: ../src/gajim-remote.py:86
+#: ../src/gajim-remote.py:85
msgid "Shows or hides the roster window"
msgstr "显示/隐藏名单窗口"
-#: ../src/gajim-remote.py:90
+#: ../src/gajim-remote.py:89
#, fuzzy
msgid "Pops up a window with the next pending event"
msgstr "为下一条未读消息弹出窗口"
-#: ../src/gajim-remote.py:94
+#: ../src/gajim-remote.py:93
#, fuzzy
msgid ""
"Prints a list of all contacts in the roster. Each contact appears on a "
"separate line"
msgstr "打印名单中所有联系人。每个联系人一行。"
-#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:132
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171 ../src/gajim-remote.py:192
-#: ../src/gajim-remote.py:222 ../src/gajim-remote.py:231
-#: ../src/gajim-remote.py:238 ../src/gajim-remote.py:245
-#: ../src/gajim-remote.py:256 ../src/gajim-remote.py:272
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:282
msgid "account"
msgstr "账户"
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:96
msgid "show only contacts of the given account"
msgstr "只显示指定帐户的联系人"
-#: ../src/gajim-remote.py:103
+#: ../src/gajim-remote.py:102
msgid "Prints a list of registered accounts"
msgstr "打印注册的账户"
-#: ../src/gajim-remote.py:107
+#: ../src/gajim-remote.py:106
msgid "Changes the status of account or accounts"
msgstr "改变一个或多个账户状态"
#. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
msgid "status"
msgstr "状态"
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:109
msgid "one of: offline, online, chat, away, xa, dnd, invisible "
msgstr "下列中的一项: 离线,在线,聊天,离开,不可用, dnd, 隐身"
-#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:134
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
msgid "message"
msgstr "消息"
-#: ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:110
msgid "status message"
msgstr "状态消息"
-#: ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:111
msgid ""
"change status of account \"account\". If not specified, try to change status "
"of all accounts that have \"sync with global status\" option set"
msgstr "改变账户的状态。如果不指明,将改变设置“与全局同步”选项的账户"
-#: ../src/gajim-remote.py:118
+#: ../src/gajim-remote.py:117
#, fuzzy
msgid "Changes the priority of account or accounts"
msgstr "改变一个或多个账户状态"
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
#, fuzzy
msgid "priority"
msgstr "优先级(_T):"
-#: ../src/gajim-remote.py:120
+#: ../src/gajim-remote.py:119
#, fuzzy
msgid "priority you want to give to the account"
msgstr "我想注册一个新帐户(_R)"
-#: ../src/gajim-remote.py:122
+#: ../src/gajim-remote.py:121
#, fuzzy
msgid ""
"change the priority of the given account. If not specified, change status of "
"all accounts that have \"sync with global status\" option set"
msgstr "改变账户的状态。如果不指明,将改变设置“与全局同步”选项的账户"
-#: ../src/gajim-remote.py:128
+#: ../src/gajim-remote.py:127
msgid "Shows the chat dialog so that you can send messages to a contact"
msgstr "显示对话框用于给联系人发送消息"
-#: ../src/gajim-remote.py:130
+#: ../src/gajim-remote.py:129
msgid "JID of the contact that you want to chat with"
msgstr "您想聊天的 JID"
-#: ../src/gajim-remote.py:132 ../src/gajim-remote.py:222
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
msgid "if specified, contact is taken from the contact list of this account"
msgstr "如指定,将从此帐户列表下移出联系人"
-#: ../src/gajim-remote.py:135
+#: ../src/gajim-remote.py:134
msgid "message content. The account must be specified or \"\""
msgstr ""
-#: ../src/gajim-remote.py:140
+#: ../src/gajim-remote.py:139
msgid ""
"Sends new chat message to a contact in the roster. Both OpenPGP key and "
"account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8408,29 +8041,29 @@ msgstr ""
"发送新聊天消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
"不需要“ OpenPGP 密钥”,只需将“ OpenPGP 密钥”置为空。"
-#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:157
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
msgid "JID of the contact that will receive the message"
msgstr "联系人的JID将收到消息"
-#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
-#: ../src/gajim-remote.py:170
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:169
msgid "message contents"
msgstr "消息内容"
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
msgid "pgp key"
msgstr "PGP 钥匙"
-#: ../src/gajim-remote.py:146 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
msgid "if specified, the message will be encrypted using this public key"
msgstr "如指定,该消息将使用本公共密钥加密"
-#: ../src/gajim-remote.py:148 ../src/gajim-remote.py:162
-#: ../src/gajim-remote.py:171
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170
msgid "if specified, the message will be sent using this account"
msgstr "如指定,消息将被用此账户发送"
-#: ../src/gajim-remote.py:153
+#: ../src/gajim-remote.py:152
msgid ""
"Sends new single message to a contact in the roster. Both OpenPGP key and "
"account are optional. If you want to set only 'account', without 'OpenPGP "
@@ -8439,215 +8072,215 @@ msgstr ""
"发送新单条消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而"
"不需要“ OpenPGP 密钥”,只需将“ OpenPGP 密钥”置为空。"
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
msgid "subject"
msgstr "主题"
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:157
msgid "message subject"
msgstr "消息主题"
-#: ../src/gajim-remote.py:167
+#: ../src/gajim-remote.py:166
msgid "Sends new message to a groupchat you've joined."
msgstr ""
-#: ../src/gajim-remote.py:169
+#: ../src/gajim-remote.py:168
#, fuzzy
msgid "JID of the room that will receive the message"
msgstr "联系人的JID将收到消息"
-#: ../src/gajim-remote.py:176
+#: ../src/gajim-remote.py:175
msgid "Gets detailed info on a contact"
msgstr "获得联系人的详细信息"
-#: ../src/gajim-remote.py:178 ../src/gajim-remote.py:191
-#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
msgid "JID of the contact"
msgstr "联系人的 JID "
-#: ../src/gajim-remote.py:182
+#: ../src/gajim-remote.py:181
msgid "Gets detailed info on a account"
msgstr "获得帐号的详细信息"
-#: ../src/gajim-remote.py:184
+#: ../src/gajim-remote.py:183
msgid "Name of the account"
msgstr "帐号名称"
-#: ../src/gajim-remote.py:188
+#: ../src/gajim-remote.py:187
msgid "Sends file to a contact"
msgstr "向联系人发送文件"
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
msgid "file"
msgstr "文件"
-#: ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:189
msgid "File path"
msgstr "文件路径"
-#: ../src/gajim-remote.py:192
+#: ../src/gajim-remote.py:191
msgid "if specified, file will be sent using this account"
msgstr "如指定,文件将被用此账户发送"
-#: ../src/gajim-remote.py:197
+#: ../src/gajim-remote.py:196
msgid "Lists all preferences and their values"
msgstr "列出所有的参数及它们的值"
-#: ../src/gajim-remote.py:201
+#: ../src/gajim-remote.py:200
msgid "Sets value of 'key' to 'value'."
msgstr "将“密钥”的值设为“值”"
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
msgid "key=value"
msgstr "键=值"
-#: ../src/gajim-remote.py:203
+#: ../src/gajim-remote.py:202
msgid "'key' is the name of the preference, 'value' is the value to set it to"
msgstr "“密钥”是参数名,而“值”是赋予参数的数值"
-#: ../src/gajim-remote.py:208
+#: ../src/gajim-remote.py:207
msgid "Deletes a preference item"
msgstr "删除一个参数项"
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
msgid "key"
msgstr "键"
-#: ../src/gajim-remote.py:210
+#: ../src/gajim-remote.py:209
msgid "name of the preference to be deleted"
msgstr "需要删除的参数名"
-#: ../src/gajim-remote.py:214
+#: ../src/gajim-remote.py:213
msgid "Writes the current state of Gajim preferences to the .config file"
msgstr "将当前Gajim的国家设置写入 .config 文件"
-#: ../src/gajim-remote.py:219
+#: ../src/gajim-remote.py:218
msgid "Removes contact from roster"
msgstr "从名单移除联系人"
-#: ../src/gajim-remote.py:228
+#: ../src/gajim-remote.py:227
msgid "Adds contact to roster"
msgstr "向名单添加联系人"
-#: ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:229
msgid "jid"
msgstr "JID"
-#: ../src/gajim-remote.py:231
+#: ../src/gajim-remote.py:230
msgid "Adds new contact to this account"
msgstr "为此账户加入新联系人"
-#: ../src/gajim-remote.py:236
+#: ../src/gajim-remote.py:235
msgid "Returns current status (the global one unless account is specified)"
msgstr "返回当前状态(如不指定账户将返回全局设置)"
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:242
msgid ""
"Returns current status message (the global one unless account is specified)"
msgstr "返回当前状态信息(如不指定账户将返回全局设置)"
-#: ../src/gajim-remote.py:250
+#: ../src/gajim-remote.py:249
#, fuzzy
msgid "Returns number of unread messages"
msgstr "未读消息的回复总数"
-#: ../src/gajim-remote.py:254
+#: ../src/gajim-remote.py:253
msgid "Opens 'Start Chat' dialog"
msgstr "打开 '开始聊天' 对话框"
-#: ../src/gajim-remote.py:256
+#: ../src/gajim-remote.py:255
msgid "Starts chat, using this account"
msgstr "开始聊天,使用这个账户"
-#: ../src/gajim-remote.py:260
+#: ../src/gajim-remote.py:259
msgid "Sends custom XML"
msgstr "发送自定义 XML"
-#: ../src/gajim-remote.py:262
+#: ../src/gajim-remote.py:261
msgid "XML to send"
msgstr "发送 XML"
-#: ../src/gajim-remote.py:263
+#: ../src/gajim-remote.py:262
msgid ""
"Account in which the xml will be sent; if not specified, xml will be sent to "
"all accounts"
msgstr "XML 将被发送的账户;如果不指定,XML 将被发送至所有账户"
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:268
msgid "Handle a xmpp:/ uri"
msgstr ""
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
msgid "uri"
msgstr ""
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:270
msgid "URI to handle"
msgstr ""
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:271
msgid "Account in which you want to handle it"
msgstr ""
-#: ../src/gajim-remote.py:274
+#: ../src/gajim-remote.py:273
#, fuzzy
msgid "Message content"
msgstr "消息内容"
-#: ../src/gajim-remote.py:278
+#: ../src/gajim-remote.py:277
#, fuzzy
msgid "Join a MUC room"
msgstr "加入新房间(_J)"
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
#, fuzzy
msgid "room"
msgstr "来自"
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:279
#, fuzzy
msgid "Room JID"
msgstr "房间:"
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
#, fuzzy
msgid "nick"
msgstr "昵称"
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:280
#, fuzzy
msgid "Nickname to use"
msgstr "昵称未找到: %s "
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
#, fuzzy
msgid "password"
msgstr "密码:"
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:281
#, fuzzy
msgid "Password to enter the room"
msgstr "密码不符"
-#: ../src/gajim-remote.py:283
+#: ../src/gajim-remote.py:282
msgid "Account from which you want to enter the room"
msgstr ""
-#: ../src/gajim-remote.py:288
+#: ../src/gajim-remote.py:287
#, fuzzy
msgid "Check if Gajim is running"
msgstr "请检查 avahi-daemon 是否运行。"
-#: ../src/gajim-remote.py:292
+#: ../src/gajim-remote.py:291
#, fuzzy
msgid "Shows or hides the ipython window"
msgstr "显示/隐藏名单窗口"
-#: ../src/gajim-remote.py:319
+#: ../src/gajim-remote.py:318
msgid "Missing argument \"contact_jid\""
msgstr "缺失的“联系人 JID”参数"
-#: ../src/gajim-remote.py:338
+#: ../src/gajim-remote.py:339
#, python-format
msgid ""
"'%s' is not in your roster.\n"
@@ -8656,31 +8289,31 @@ msgstr ""
"\"%s\" 不在您的名单中。\n"
"请为发送此消息指定账户。"
-#: ../src/gajim-remote.py:341
+#: ../src/gajim-remote.py:342
msgid "You have no active account"
msgstr "没有活动的账户"
-#: ../src/gajim-remote.py:393
+#: ../src/gajim-remote.py:395
msgid "It seems Gajim is not running. So you can't use gajim-remote."
msgstr ""
-#: ../src/gajim-remote.py:416
+#: ../src/gajim-remote.py:422
#, python-format
msgid ""
"Usage: %(basename)s %(command)s %(arguments)s \n"
"\t %(help)s"
msgstr ""
-#: ../src/gajim-remote.py:420
+#: ../src/gajim-remote.py:426
msgid "Arguments:"
msgstr "参数:"
-#: ../src/gajim-remote.py:424
+#: ../src/gajim-remote.py:430
#, python-format
msgid "%s not found"
msgstr " %s 未找到"
-#: ../src/gajim-remote.py:428
+#: ../src/gajim-remote.py:436
#, python-format
msgid ""
"Usage: %s command [arguments]\n"
@@ -8689,7 +8322,7 @@ msgstr ""
"用法:%s 命令 [参数] \n"
"命令是下列之一:\n"
-#: ../src/gajim-remote.py:493
+#: ../src/gajim-remote.py:505
#, fuzzy, python-format
msgid ""
"Too many arguments. \n"
@@ -8698,7 +8331,7 @@ msgstr ""
"参数“%s”未指定。\n"
"输入“%s help %s”以获取更多信息"
-#: ../src/gajim-remote.py:498
+#: ../src/gajim-remote.py:510
#, fuzzy, python-format
msgid ""
"Argument \"%(arg)s\" is not specified. \n"
@@ -8707,7 +8340,7 @@ msgstr ""
"参数“%s”未指定。\n"
"输入“%s help %s”以获取更多信息"
-#: ../src/gajim-remote.py:517
+#: ../src/gajim-remote.py:529
#, fuzzy
msgid "Wrong uri"
msgstr "错误主机"
@@ -8738,174 +8371,198 @@ msgstr "无法删除当前主题"
msgid "Please first choose another for your current theme."
msgstr "请先选择其他主题作为当前主题"
-#: ../src/groupchat_control.py:162
+#: ../src/groupchat_control.py:167
msgid "Sending private message failed"
msgstr "发送私有消息失败"
#. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:164
+#: ../src/groupchat_control.py:169
#, fuzzy, python-format
msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
msgstr "您不再在群聊“%s”中或“%s”已离开。"
-#: ../src/groupchat_control.py:436
+#: ../src/groupchat_control.py:439
msgid "Insert Nickname"
msgstr "插入昵称"
-#: ../src/groupchat_control.py:595
+#: ../src/groupchat_control.py:617
#, fuzzy
msgid "Conversation with "
msgstr "对话历史"
-#: ../src/groupchat_control.py:597
+#: ../src/groupchat_control.py:619
#, fuzzy
msgid "Continued conversation"
msgstr "连接"
#. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1194
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+msgid "Any occupant is allowed to see your full JID"
+msgstr ""
+
+#. Can be a message (see handle_event_gc_config_change in gajim.py)
+#: ../src/groupchat_control.py:1231
msgid "Room logging is enabled"
msgstr ""
-#: ../src/groupchat_control.py:1196
+#: ../src/groupchat_control.py:1233
#, fuzzy
msgid "A new room has been created"
msgstr "注册新账户成功"
-#: ../src/groupchat_control.py:1199
+#: ../src/groupchat_control.py:1236
msgid "The server has assigned or modified your roomnick"
msgstr ""
#. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1205
+#: ../src/groupchat_control.py:1242
#, python-format
msgid "%(nick)s has been kicked: %(reason)s"
msgstr "%(nick)s 被踢出:%(reason)s"
-#: ../src/groupchat_control.py:1209
+#: ../src/groupchat_control.py:1246
#, python-format
msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
msgstr "%(nick)s 被 %(who)s 踢出:%(reason)s"
#. do not print 'banned by None'
-#: ../src/groupchat_control.py:1219
+#: ../src/groupchat_control.py:1256
#, python-format
msgid "%(nick)s has been banned: %(reason)s"
msgstr "%(nick)s 被封禁:%(reason)s"
-#: ../src/groupchat_control.py:1223
+#: ../src/groupchat_control.py:1260
#, python-format
msgid "%(nick)s has been banned by %(who)s: %(reason)s"
msgstr "%(nick)s 被 %(who)s 封禁:%(reason)s"
-#: ../src/groupchat_control.py:1235 ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
#, python-format
msgid "You are now known as %s"
msgstr "您现在成了 %s "
-#: ../src/groupchat_control.py:1289 ../src/groupchat_control.py:1293
-#: ../src/groupchat_control.py:1298
+#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#, fuzzy, python-format
+msgid "%(nick)s is now known as %(new_nick)s"
+msgstr "%s 现在成了 %s"
+
+#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
+#: ../src/groupchat_control.py:1335
#, fuzzy, python-format
msgid "%(nick)s has been removed from the room (%(reason)s)"
msgstr "%(nick)s 被 %(who)s 踢出:%(reason)s"
-#: ../src/groupchat_control.py:1290
+#: ../src/groupchat_control.py:1327
#, fuzzy
msgid "affiliation changed"
msgstr "会籍:"
-#: ../src/groupchat_control.py:1295
+#: ../src/groupchat_control.py:1332
msgid "room configuration changed to members-only"
msgstr ""
-#: ../src/groupchat_control.py:1300
+#: ../src/groupchat_control.py:1337
msgid "system shutdown"
msgstr ""
-#: ../src/groupchat_control.py:1377
+#: ../src/groupchat_control.py:1414
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
msgstr ""
-#: ../src/groupchat_control.py:1381
+#: ../src/groupchat_control.py:1418
#, python-format
msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
msgstr ""
-#: ../src/groupchat_control.py:1396
+#: ../src/groupchat_control.py:1433
#, fuzzy, python-format
msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
msgstr "%(nick)s 被 %(who)s 踢出:%(reason)s"
-#: ../src/groupchat_control.py:1400
+#: ../src/groupchat_control.py:1437
#, fuzzy, python-format
msgid "** Role of %(nick)s has been set to %(role)s"
msgstr "%(nick)s 被踢出:%(reason)s"
-#: ../src/groupchat_control.py:1429
+#: ../src/groupchat_control.py:1466
#, python-format
msgid "%s has left"
msgstr " %s 离开了"
-#: ../src/groupchat_control.py:1434
+#: ../src/groupchat_control.py:1471
#, python-format
msgid "%s has joined the group chat"
msgstr "%s 加入群聊"
-#: ../src/groupchat_control.py:1668
+#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
+#: ../src/history_window.py:442 ../src/notify.py:250
+#, python-format
+msgid "%(nick)s is now %(status)s"
+msgstr "%(nick)s 的状态是 %(status)s"
+
+#: ../src/groupchat_control.py:1706
#, python-format
msgid "Are you sure you want to leave group chat \"%s\"?"
msgstr "确定要离开群聊“ %s ”?"
-#: ../src/groupchat_control.py:1670
+#: ../src/groupchat_control.py:1708
msgid ""
"If you close this window, you will be disconnected from this group chat."
msgstr "如果关闭此窗口,您将断开此群聊的连接。"
-#: ../src/groupchat_control.py:1707
+#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
+#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
+#: ../src/message_window.py:227 ../src/roster_window.py:2658
+#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+msgid "Do _not ask me again"
+msgstr "不再提问此问题(_N)"
+
+#: ../src/groupchat_control.py:1745
msgid "Changing Subject"
msgstr "正在更换话题"
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1746
msgid "Please specify the new subject:"
msgstr "请指定新话题:"
-#: ../src/groupchat_control.py:1715
+#: ../src/groupchat_control.py:1753
msgid "Changing Nickname"
msgstr "正在更换昵称"
-#: ../src/groupchat_control.py:1716
+#: ../src/groupchat_control.py:1754
msgid "Please specify the new nickname you want to use:"
msgstr "请指定您想使用的新昵称:"
#. Ask for a reason
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1783
#, fuzzy, python-format
msgid "Destroying %s"
msgstr "描述: %s"
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1784
msgid ""
"You are going to definitively destroy this room.\n"
"You may specify a reason below:"
msgstr ""
-#: ../src/groupchat_control.py:1748
+#: ../src/groupchat_control.py:1786
msgid "You may also enter an alternate venue:"
msgstr ""
#. ask for reason
-#: ../src/groupchat_control.py:1921
+#: ../src/groupchat_control.py:1967
#, python-format
msgid "Kicking %s"
msgstr "踢出 %s"
-#: ../src/groupchat_control.py:1922 ../src/groupchat_control.py:2227
+#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
msgid "You may specify a reason below:"
msgstr "您可以指定一个原因:"
#. ask for reason
-#: ../src/groupchat_control.py:2226
+#: ../src/groupchat_control.py:2290
#, python-format
msgid "Banning %s"
msgstr "封禁 %s"
@@ -8929,59 +8586,445 @@ msgid "Details"
msgstr "细节"
#. we talk about file
-#: ../src/gtkgui_helpers.py:166 ../src/gtkgui_helpers.py:181
+#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
#, python-format
msgid "Error: cannot open %s for reading"
msgstr "错误:无法按读打开文件 %s"
-#: ../src/gtkgui_helpers.py:351
+#: ../src/gtkgui_helpers.py:362
msgid "Error reading file:"
msgstr "读文件错误:"
-#: ../src/gtkgui_helpers.py:354
+#: ../src/gtkgui_helpers.py:365
msgid "Error parsing file:"
msgstr "分析文件错误:"
#. do not traceback (could be a permission problem)
#. we talk about a file here
-#: ../src/gtkgui_helpers.py:391
+#: ../src/gtkgui_helpers.py:406
#, python-format
msgid "Could not write to %s. Session Management support will not work"
msgstr "不能写入到 %s 。会话管理支持功能未启用"
#. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:728
+#: ../src/gtkgui_helpers.py:770
msgid "Gajim is not the default Jabber client"
msgstr ""
-#: ../src/gtkgui_helpers.py:729
+#: ../src/gtkgui_helpers.py:771
#, fuzzy
msgid "Would you like to make Gajim the default Jabber client?"
msgstr "确认覆盖该文件?"
-#: ../src/gtkgui_helpers.py:730
+#: ../src/gtkgui_helpers.py:772
msgid "Always check to see if Gajim is the default Jabber client on startup"
msgstr ""
-#: ../src/gtkgui_helpers.py:799
+#: ../src/gtkgui_helpers.py:845
msgid "Extension not supported"
msgstr "不支持扩展"
-#: ../src/gtkgui_helpers.py:800
+#: ../src/gtkgui_helpers.py:846
#, python-format
msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
msgstr "图片不能被保存为 %(type)s 格式。保存为 %(new_filename)s?"
-#: ../src/gtkgui_helpers.py:835
+#: ../src/gtkgui_helpers.py:881
msgid "Save Image as..."
msgstr "图片另存为..."
-#: ../src/gui_menu_builder.py:89
+#: ../src/gui_interface.py:129
+#, fuzzy, python-format
+msgid ""
+"Your desired nickname in group chat %s is in use or registered by another "
+"occupant.\n"
+"Please specify another nickname below:"
+msgstr ""
+"您申请的昵称正在使用或被其他人占有。\n"
+"从下列昵称中另外指定一个:"
+
+#: ../src/gui_interface.py:132
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gui_interface.py:149
+msgid "Do you accept this request?"
+msgstr "是否接受这个请求?"
+
+#: ../src/gui_interface.py:151
+#, fuzzy, python-format
+msgid "Do you accept this request on account %s?"
+msgstr "是否接受这个请求?"
+
+#: ../src/gui_interface.py:154
+#, fuzzy, python-format
+msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
+msgstr "HTTP (%s) 授权给 %s (id: %s)"
+
+#: ../src/gui_interface.py:205 ../src/notify.py:524
+msgid "Connection Failed"
+msgstr "连接失败"
+
+#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#, fuzzy, python-format
+msgid "Error %(code)s: %(msg)s"
+msgstr "%(nickname)s: %(message)s"
+
+#. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
+#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#, fuzzy, python-format
+msgid "error while sending %(message)s ( %(error)s )"
+msgstr "发送 %s ( %s ) 时出现错误"
+
+#: ../src/gui_interface.py:599 ../src/notify.py:526
+#, fuzzy
+msgid "Subscription request"
+msgstr "认证请求"
+
+#: ../src/gui_interface.py:624
+msgid "Authorization accepted"
+msgstr "授权被接受"
+
+#: ../src/gui_interface.py:625
+#, python-format
+msgid "The contact \"%s\" has authorized you to see his or her status."
+msgstr "联系人“%s”已授权您查看他/她的状态。"
+
+#: ../src/gui_interface.py:637
+#, python-format
+msgid "Contact \"%s\" removed subscription from you"
+msgstr "联系人“%s”移除了来自您的认证"
+
+#: ../src/gui_interface.py:638
+msgid ""
+"You will always see him or her as offline.\n"
+"Do you want to remove him or her from your contact list?"
+msgstr ""
+
+#: ../src/gui_interface.py:663 ../src/notify.py:528
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "退订(_S)"
+
+#: ../src/gui_interface.py:704
+#, python-format
+msgid "Contact with \"%s\" cannot be established"
+msgstr "无法与对方“ %s ”建立连接。"
+
+#: ../src/gui_interface.py:986
+#, python-format
+msgid "%(jid)s has set the subject to %(subject)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1053
+msgid "Room now shows unavailable member"
+msgstr ""
+
+#: ../src/gui_interface.py:1055
+msgid "room now does not show unavailable members"
+msgstr ""
+
+#: ../src/gui_interface.py:1058
+msgid "A non-privacy-related room configuration change has occurred"
+msgstr ""
+
+#. Can be a presence (see chg_contact_status in groupchat_control.py)
+#: ../src/gui_interface.py:1061
+msgid "Room logging is now enabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1063
+msgid "Room logging is now disabled"
+msgstr ""
+
+#: ../src/gui_interface.py:1065
+msgid "Room is now non-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1068
+msgid "Room is now semi-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1071
+msgid "Room is now fully-anonymous"
+msgstr ""
+
+#: ../src/gui_interface.py:1103
+#, fuzzy, python-format
+msgid "A Password is required to join the room %s. Please type it."
+msgstr "该群聊要求密码才能加入。"
+
+#: ../src/gui_interface.py:1137
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG agent running or "
+"it returned a wrong passphrase.\n"
+msgstr ""
+
+#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+msgid "You are currently connected without your OpenPGP key."
+msgstr "已建立没有 OpenPGP 密钥的连接"
+
+#: ../src/gui_interface.py:1140
+msgid "Your passphrase is incorrect"
+msgstr "您的密文不正确"
+
+#: ../src/gui_interface.py:1144
+#, fuzzy
+msgid "OpenGPG Passphrase Incorrect"
+msgstr "您的密文不正确"
+
+#: ../src/gui_interface.py:1170
+msgid "GPG key not trusted"
+msgstr ""
+
+#: ../src/gui_interface.py:1170
+msgid ""
+"The GPG key used to encrypt this chat is not trusted. Do you really want to "
+"encrypt this message?"
+msgstr ""
+
+#: ../src/gui_interface.py:1182
+msgid ""
+"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
+"variable probably not \t\t\t\tcorrectly set)"
+msgstr ""
+
+#: ../src/gui_interface.py:1292
+#, python-format
+msgid "New mail on %(gmail_mail_address)s"
+msgstr " %(gmail_mail_address)s 上的新邮件"
+
+#: ../src/gui_interface.py:1294
+#, python-format
+msgid "You have %d new mail conversation"
+msgid_plural "You have %d new mail conversations"
+msgstr[0] "您有 %d 条新邮件会话"
+
+#: ../src/gui_interface.py:1307
+#, python-format
+msgid ""
+"\n"
+"\n"
+"From: %(from_address)s\n"
+"Subject: %(subject)s\n"
+"%(snippet)s"
+msgstr ""
+
+#: ../src/gui_interface.py:1379
+#, python-format
+msgid "%s wants to send you a file."
+msgstr "%s 想发送给您一个文件。"
+
+#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "从名单移除联系人"
+
+#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#, fuzzy
+msgid "Error opening file"
+msgstr "读文件错误:"
+
+#: ../src/gui_interface.py:1450
+#, python-format
+msgid "You successfully received %(filename)s from %(name)s."
+msgstr "您成功的从 %(name)s 收到文件 %(filename)s。"
+
+#. ft stopped
+#: ../src/gui_interface.py:1454
+#, python-format
+msgid "File transfer of %(filename)s from %(name)s stopped."
+msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
+
+#: ../src/gui_interface.py:1467
+#, python-format
+msgid "You successfully sent %(filename)s to %(name)s."
+msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
+
+#. ft stopped
+#: ../src/gui_interface.py:1471
+#, python-format
+msgid "File transfer of %(filename)s to %(name)s stopped."
+msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
+
+#: ../src/gui_interface.py:1576
+#, python-format
+msgid ""
+"Unable to decrypt message from %s\n"
+"It may have been tampered with."
+msgstr ""
+
+#: ../src/gui_interface.py:1583
+#, fuzzy
+msgid "Unable to decrypt message"
+msgstr "对于每条消息(_M)"
+
+#: ../src/gui_interface.py:1657
+msgid "Username Conflict"
+msgstr "用户名冲突"
+
+#: ../src/gui_interface.py:1658
+msgid "Please type a new username for your local account"
+msgstr "<b>请在您本地账户填写新的用户名</b>"
+
+#: ../src/gui_interface.py:1670
+msgid "Ping?"
+msgstr ""
+
+#: ../src/gui_interface.py:1683
+#, python-format
+msgid "Pong! (%s s.)"
+msgstr ""
+
+#: ../src/gui_interface.py:1694
+msgid "Error."
+msgstr ""
+
+#: ../src/gui_interface.py:1721
+#, fuzzy
+msgid "Resource Conflict"
+msgstr "用户名冲突"
+
+#: ../src/gui_interface.py:1722
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+
+#: ../src/gui_interface.py:1771
+#, fuzzy, python-format
+msgid "%s wants to start a voice chat."
+msgstr "%s 想发送给您一个文件。"
+
+#: ../src/gui_interface.py:1774
+#, fuzzy
+msgid "Voice Chat Request"
+msgstr "文件传输请求"
+
+#: ../src/gui_interface.py:1879
+msgid "Error verifying SSL certificate"
+msgstr ""
+
+#: ../src/gui_interface.py:1880
+#, python-format
+msgid ""
+"There was an error verifying the SSL certificate of your jabber server: %"
+"(error)s\n"
+"Do you still want to connect to this server?"
+msgstr ""
+
+#: ../src/gui_interface.py:1885
+msgid "Ignore this error for this certificate."
+msgstr ""
+
+#: ../src/gui_interface.py:1905
+msgid "SSL certificate error"
+msgstr ""
+
+#: ../src/gui_interface.py:1906
+#, python-format
+msgid ""
+"It seems the SSL certificate of account %(account)s has changed or your "
+"connection is being hacked.\n"
+"Old fingerprint: %(old)s\n"
+"New fingerprint: %(new)s\n"
+"\n"
+"Do you still want to connect and update the fingerprint of the certificate?"
+msgstr ""
+
+#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#, fuzzy
+msgid "Insecure connection"
+msgstr "连接"
+
+#: ../src/gui_interface.py:1937
+#, fuzzy
+msgid ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+msgstr "您在创建一个元联系人。确定继续?"
+
+#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+msgid "Yes, I really want to connect insecurely"
+msgstr ""
+
+#: ../src/gui_interface.py:1972
+msgid ""
+"You are about to send your password on an insecure connection. You should "
+"install PyOpenSSL to prevent that. Are you sure you want to do that?"
+msgstr ""
+
+#: ../src/gui_interface.py:1992
+msgid "PEP node was not removed"
+msgstr ""
+
+#: ../src/gui_interface.py:1993
+#, python-format
+msgid "PEP node %(node)s was not removed: %(message)s"
+msgstr ""
+
+#. theme doesn't exist, disable emoticons
+#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#, fuzzy
+msgid "Emoticons disabled"
+msgstr "禁用加密"
+
+#: ../src/gui_interface.py:2548
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+
+#: ../src/gui_interface.py:2570
+msgid ""
+"Your configured emoticons theme cannot been loaded. You maybe need to update "
+"the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
+"for more details."
+msgstr ""
+
+#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+msgid "You cannot join a group chat while you are invisible"
+msgstr "隐身时无法加入群聊"
+
+#. it is good to notify the user
+#. in case he or she cannot see the output of the console
+#: ../src/gui_interface.py:2969
+msgid "Could not save your settings and preferences"
+msgstr "无法保存您的设置。"
+
+#: ../src/gui_interface.py:3462
+msgid "Passphrase Required"
+msgstr "要求密文"
+
+#: ../src/gui_interface.py:3463
+#, fuzzy, python-format
+msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
+msgstr "为账户 %s 输入 GPG 密文字段"
+
+#: ../src/gui_interface.py:3477
+msgid "GPG key expired"
+msgstr ""
+
+#: ../src/gui_interface.py:3478
+#, fuzzy, python-format
+msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
+msgstr "您将在无 OpenPGP 情况下连接到 %s。"
+
+#. ask again
+#: ../src/gui_interface.py:3487
+msgid "Wrong Passphrase"
+msgstr "错误字段"
+
+#: ../src/gui_interface.py:3488
+msgid "Please retype your GPG passphrase or press Cancel."
+msgstr "请重新输入您的 GPG 字段或点“取消”"
+
+#: ../src/gui_menu_builder.py:93
#, fuzzy
msgid "_New Group Chat"
msgstr "新群聊"
-#: ../src/gui_menu_builder.py:400
+#: ../src/gui_menu_builder.py:413
msgid "I would like to add you to my roster"
msgstr "我想加您为好友"
@@ -8996,7 +9039,7 @@ msgstr "联系人"
#. holds time
#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:95
+#: ../src/history_window.py:97
msgid "Date"
msgstr "日期"
@@ -9007,7 +9050,7 @@ msgstr "昵称"
#. holds message
#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:103
+#: ../src/history_window.py:105
msgid "Message"
msgstr "消息"
@@ -9030,387 +9073,392 @@ msgstr ""
"\n"
"如果您点击“是”,请等待..."
-#: ../src/history_manager.py:458
+#: ../src/history_manager.py:467
msgid "Exporting History Logs..."
msgstr "输出历史记录..."
-#: ../src/history_manager.py:533
+#: ../src/history_manager.py:542
#, python-format
msgid "%(who)s on %(time)s said: %(message)s\n"
msgstr "%(who)s 在 %(time)s 时说: %(message)s\n"
-#: ../src/history_manager.py:570
+#: ../src/history_manager.py:579
msgid "Do you really want to delete logs of the selected contact?"
msgid_plural "Do you really want to delete logs of the selected contacts?"
msgstr[0] "您确定要删除所选定联系人的历史记录?"
-#: ../src/history_manager.py:574 ../src/history_manager.py:609
+#: ../src/history_manager.py:583 ../src/history_manager.py:618
msgid "This is an irreversible operation."
msgstr "该操作是不可撤消的。"
-#: ../src/history_manager.py:606
+#: ../src/history_manager.py:615
msgid "Do you really want to delete the selected message?"
msgid_plural "Do you really want to delete the selected messages?"
msgstr[0] "您确定要删除所选定的消息?"
-#: ../src/history_window.py:298
+#: ../src/history_window.py:305
#, python-format
msgid "Conversation History with %s"
msgstr "与 %s 的聊天历史"
-#: ../src/history_window.py:343
+#: ../src/history_window.py:350
msgid "Disk Error"
msgstr ""
-#: ../src/history_window.py:427
+#: ../src/history_window.py:438
#, python-format
msgid "%(nick)s is now %(status)s: %(status_msg)s"
msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
-#: ../src/history_window.py:438
+#: ../src/history_window.py:449
#, fuzzy, python-format
msgid "Error: %s"
msgstr "错误消息:%s"
-#: ../src/history_window.py:440
+#: ../src/history_window.py:451
msgid "Error"
msgstr ""
-#: ../src/history_window.py:442
+#: ../src/history_window.py:453
#, python-format
msgid "Status is now: %(status)s: %(status_msg)s"
msgstr "现在状态:%(status)s:%(status_msg)s"
-#: ../src/history_window.py:445
+#: ../src/history_window.py:456
#, python-format
msgid "Status is now: %(status)s"
msgstr "现在状态: %(status)s "
-#: ../src/htmltextview.py:512 ../src/htmltextview.py:522
+#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
#, fuzzy
msgid "Timeout loading image"
msgstr "无法读取图片"
-#: ../src/htmltextview.py:532
+#: ../src/htmltextview.py:533
msgid "Image is too big"
msgstr ""
-#: ../src/message_window.py:220
+#: ../src/message_window.py:225
#, fuzzy
msgid "You are going to close several tabs"
msgstr "尚未连接到服务器"
-#: ../src/message_window.py:221
+#: ../src/message_window.py:226
#, fuzzy
msgid "Do you really want to close them all?"
msgstr "您确定要删除所选定的消息?"
-#: ../src/message_window.py:481
+#: ../src/message_window.py:490
msgid "Chats"
msgstr "聊天"
-#: ../src/message_window.py:483
+#: ../src/message_window.py:492
msgid "Group Chats"
msgstr "群聊"
-#: ../src/message_window.py:485
+#: ../src/message_window.py:494
msgid "Private Chats"
msgstr "私聊"
-#: ../src/message_window.py:491
+#: ../src/message_window.py:500
msgid "Messages"
msgstr "消息"
-#: ../src/negotiation.py:32
+#: ../src/negotiation.py:34
msgid "- messages will be logged"
msgstr ""
-#: ../src/negotiation.py:34
+#: ../src/negotiation.py:36
msgid "- messages will not be logged"
msgstr ""
-#: ../src/notify.py:242
+#: ../src/notify.py:248
#, python-format
msgid "%(nick)s Changed Status"
msgstr "%(nick)s 状态改变"
-#: ../src/notify.py:252
+#: ../src/notify.py:258
#, python-format
msgid "%(nickname)s Signed In"
msgstr "%(nickname)s 上线了"
-#: ../src/notify.py:260
+#: ../src/notify.py:266
#, python-format
msgid "%(nickname)s Signed Out"
msgstr "%(nickname)s 离开了"
-#: ../src/notify.py:272
+#: ../src/notify.py:278
#, python-format
msgid "New Single Message from %(nickname)s"
msgstr " %(nickname)s 发来的新消息"
-#: ../src/notify.py:280
+#: ../src/notify.py:286
#, python-format
msgid "New Private Message from group chat %s"
msgstr "来自群聊 %s 的私人消息"
-#: ../src/notify.py:282
+#: ../src/notify.py:288
#, python-format
msgid "%(nickname)s: %(message)s"
msgstr "%(nickname)s: %(message)s"
-#: ../src/notify.py:285
+#: ../src/notify.py:291
#, fuzzy, python-format
msgid "Messaged by %(nickname)s"
msgstr "来自 %(nickname)s 的新消息"
-#: ../src/notify.py:291
+#: ../src/notify.py:297
#, python-format
msgid "New Message from %(nickname)s"
msgstr "来自 %(nickname)s 的新消息"
-#: ../src/notify.py:555
+#: ../src/notify.py:568
#, fuzzy
msgid "Ignore"
msgstr "九"
-#: ../src/profile_window.py:55
+#: ../src/profile_window.py:57
msgid "Retrieving profile..."
msgstr "取回概况..."
-#: ../src/profile_window.py:108 ../src/roster_window.py:2852
+#: ../src/profile_window.py:110 ../src/roster_window.py:2845
#, fuzzy
msgid "File is empty"
msgstr "文件路径"
-#: ../src/profile_window.py:111 ../src/roster_window.py:2855
+#: ../src/profile_window.py:113 ../src/roster_window.py:2848
#, fuzzy
msgid "File does not exist"
msgstr "不存在这样的群聊"
#. keep identation
#. unknown format
-#: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2857 ../src/roster_window.py:2868
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
msgid "Could not load image"
msgstr "无法读取图片"
-#: ../src/profile_window.py:251
+#: ../src/profile_window.py:255
msgid "Information received"
msgstr "收到信息"
-#: ../src/profile_window.py:318
+#: ../src/profile_window.py:326
msgid "Without a connection you can not publish your contact information."
msgstr "无法脱机发布个人信息。"
-#: ../src/profile_window.py:332
+#: ../src/profile_window.py:339
msgid "Sending profile..."
msgstr "发送概况..."
-#: ../src/profile_window.py:347
+#: ../src/profile_window.py:354
msgid "Information NOT published"
msgstr "信息没有发布"
-#: ../src/profile_window.py:354
+#: ../src/profile_window.py:361
msgid "vCard publication failed"
msgstr "vCard 发布失败"
-#: ../src/profile_window.py:355
+#: ../src/profile_window.py:362
msgid ""
"There was an error while publishing your personal information, try again "
"later."
msgstr "发布您的个人信息时发生错误,请稍后重试。"
-#: ../src/roster_window.py:280 ../src/roster_window.py:1017
+#: ../src/roster_window.py:280 ../src/roster_window.py:1019
msgid "Merged accounts"
msgstr "已合并的帐户"
-#: ../src/roster_window.py:1906
+#: ../src/roster_window.py:1871
msgid "Authorization has been sent"
msgstr "授权发送成功"
-#: ../src/roster_window.py:1907
+#: ../src/roster_window.py:1872
#, python-format
msgid "Now \"%s\" will know your status."
msgstr "现在“%s”将知道您的状态。"
-#: ../src/roster_window.py:1927
+#: ../src/roster_window.py:1894
msgid "Subscription request has been sent"
msgstr "认证请求已发出"
-#: ../src/roster_window.py:1928
+#: ../src/roster_window.py:1895
#, python-format
msgid "If \"%s\" accepts this request you will know his or her status."
msgstr "如果“%s”接受此请求,您将知道他/她的状态。"
-#: ../src/roster_window.py:1940
+#: ../src/roster_window.py:1909
msgid "Authorization has been removed"
msgstr "授权被移除"
-#: ../src/roster_window.py:1941
+#: ../src/roster_window.py:1910
#, python-format
msgid "Now \"%s\" will always see you as offline."
msgstr "“%s” 将一直看到您的状态为离线。"
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1938
msgid "GPG is not usable"
msgstr ""
-#: ../src/roster_window.py:2174 ../src/roster_window.py:3383
+#: ../src/roster_window.py:1939
+#, python-format
+msgid "You will be connected to %s without OpenPGP."
+msgstr "您将在无 OpenPGP 情况下连接到 %s。"
+
+#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
msgid "You are participating in one or more group chats"
msgstr "您在一或多个群聊中"
-#: ../src/roster_window.py:2175 ../src/roster_window.py:3384
+#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
msgid ""
"Changing your status to invisible will result in disconnection from those "
"group chats. Are you sure you want to go invisible?"
msgstr "隐身将从所有群聊中断开。确定隐身?"
-#: ../src/roster_window.py:2201
+#: ../src/roster_window.py:2175
msgid "desync'ed"
msgstr ""
-#: ../src/roster_window.py:2257
+#: ../src/roster_window.py:2236
msgid "Really quit Gajim?"
msgstr ""
-#: ../src/roster_window.py:2258
+#: ../src/roster_window.py:2237
#, fuzzy
msgid "Are you sure you want to quit Gajim?"
msgstr "确定要离开房间“ %s ”?"
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2238
msgid "Always close Gajim"
msgstr ""
-#: ../src/roster_window.py:2350 ../src/roster_window.py:2587
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
msgid "You have unread messages"
msgstr "您有未读消息"
-#: ../src/roster_window.py:2351
+#: ../src/roster_window.py:2334
#, fuzzy
msgid ""
"Messages will only be available for reading them later if you have history "
"enabled and contact is in your roster."
msgstr "启用历史后才能再次重读消息"
-#: ../src/roster_window.py:2588
+#: ../src/roster_window.py:2577
msgid "You must read them before removing this transport."
msgstr "移除代理前请阅读所有未决事件。"
-#: ../src/roster_window.py:2591
+#: ../src/roster_window.py:2580
#, python-format
msgid "Transport \"%s\" will be removed"
msgstr "代理“%s”将被移除"
-#: ../src/roster_window.py:2592
+#: ../src/roster_window.py:2581
#, fuzzy
msgid ""
"You will no longer be able to send and receive messages from contacts using "
"this transport."
msgstr "您将无法从此代理收发消息。"
-#: ../src/roster_window.py:2595
+#: ../src/roster_window.py:2584
msgid "Transports will be removed"
msgstr "代理将被移除"
-#: ../src/roster_window.py:2600
+#: ../src/roster_window.py:2589
#, fuzzy, python-format
msgid ""
"You will no longer be able to send and receive messages to contacts from "
"these transports: %s"
msgstr "您将无法从这些代理的联系人收发消息:%s"
-#: ../src/roster_window.py:2662
+#: ../src/roster_window.py:2653
#, fuzzy
msgid "You are about to block a contact. Are you sure you want to continue?"
msgstr "您在创建一个元联系人。确定继续?"
-#: ../src/roster_window.py:2664
+#: ../src/roster_window.py:2655
msgid ""
"This contact will see you offline and you will not receive messages he will "
"send you."
msgstr ""
#. it's jid
-#: ../src/roster_window.py:2748
+#: ../src/roster_window.py:2741
msgid "Rename Contact"
msgstr "重命名联系人"
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2742
#, python-format
msgid "Enter a new nickname for contact %s"
msgstr "为联系人 %s 输入新的昵称"
-#: ../src/roster_window.py:2756
+#: ../src/roster_window.py:2749
msgid "Rename Group"
msgstr "重命名群组"
-#: ../src/roster_window.py:2757
+#: ../src/roster_window.py:2750
#, python-format
msgid "Enter a new name for group %s"
msgstr "为群组 %s 输入新的名称"
-#: ../src/roster_window.py:2798
+#: ../src/roster_window.py:2791
msgid "Remove Group"
msgstr "移除群组"
-#: ../src/roster_window.py:2799
+#: ../src/roster_window.py:2792
#, python-format
msgid "Do you want to remove group %s from the roster?"
msgstr "您想从名单中删除组 %s ?"
-#: ../src/roster_window.py:2800
+#: ../src/roster_window.py:2793
#, fuzzy
msgid "Also remove all contacts in this group from your roster"
msgstr "同时从名单移除这个群组的所有联系人"
-#: ../src/roster_window.py:2839
+#: ../src/roster_window.py:2832
msgid "Assign OpenPGP Key"
msgstr "指定您的 OpenPGP 钥匙"
-#: ../src/roster_window.py:2840
+#: ../src/roster_window.py:2833
msgid "Select a key to apply to the contact"
msgstr "选择一个键应用于联系人。"
-#: ../src/roster_window.py:3203
+#: ../src/roster_window.py:3210
#, python-format
msgid "Contact \"%s\" will be removed from your roster"
msgstr "联系人“%s”将从您的名单中移除"
-#: ../src/roster_window.py:3205
+#: ../src/roster_window.py:3212
#, python-format
msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
msgstr ""
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3217
msgid ""
"By removing this contact you also remove authorization resulting in him or "
"her always seeing you as offline."
msgstr "移除此联系人的同时将移除认证,导致他/她将一直看到您为离线。"
#. Contact is not in roster
-#: ../src/roster_window.py:3216
+#: ../src/roster_window.py:3223
#, fuzzy
msgid "Do you want to continue?"
msgstr "想做什么?"
-#: ../src/roster_window.py:3219
+#: ../src/roster_window.py:3226
msgid ""
"By removing this contact you also by default remove authorization resulting "
"in him or her always seeing you as offline."
msgstr "移除此联系人的同时将默认移除认证,导致他/她将一直看到您为离线。"
-#: ../src/roster_window.py:3222
+#: ../src/roster_window.py:3229
msgid "I want this contact to know my status after removal"
msgstr "我想让此联系人在被移除之后仍然知道我的状态"
#. several contact to remove at the same time
-#: ../src/roster_window.py:3226
+#: ../src/roster_window.py:3233
msgid "Contacts will be removed from your roster"
msgstr "联系人将从您的名单中移除"
-#: ../src/roster_window.py:3231
+#: ../src/roster_window.py:3238
#, python-format
msgid ""
"By removing these contacts:%s\n"
@@ -9419,32 +9467,32 @@ msgstr ""
"移除这些联系人:%s 的同时\n"
"将移除认证导致他们将一直看到您为离线。"
-#: ../src/roster_window.py:3286
+#: ../src/roster_window.py:3295
#, fuzzy
msgid ""
"You are about to send a custom status. Are you sure you want to continue?"
msgstr "您在创建一个元联系人。确定继续?"
-#: ../src/roster_window.py:3288
+#: ../src/roster_window.py:3297
#, python-format
msgid ""
"This contact will temporarily see you as %(status)s, but only until you "
"change your status. Then he will see your global status."
msgstr ""
-#: ../src/roster_window.py:3305
+#: ../src/roster_window.py:3316
msgid "No account available"
msgstr "没有有效账户"
-#: ../src/roster_window.py:3306
+#: ../src/roster_window.py:3317
msgid "You must create an account before you can chat with other contacts."
msgstr "您必须在与他人聊天前新建账户。"
-#: ../src/roster_window.py:3877
+#: ../src/roster_window.py:3897
msgid "Metacontacts storage not supported by your server"
msgstr "您的服务器不支持元联系人存储"
-#: ../src/roster_window.py:3879
+#: ../src/roster_window.py:3899
#, fuzzy
msgid ""
"Your server does not support storing metacontacts information. So those "
@@ -9452,12 +9500,12 @@ msgid ""
msgstr ""
"您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时将不被保存。"
-#: ../src/roster_window.py:3964
+#: ../src/roster_window.py:3984
msgid ""
"You are about to create a metacontact. Are you sure you want to continue?"
msgstr "您在创建一个元联系人。确定继续?"
-#: ../src/roster_window.py:3966
+#: ../src/roster_window.py:3986
#, fuzzy
msgid ""
"Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9467,23 +9515,23 @@ msgstr ""
"元联系人是一种分组若干联系人的方法。一般而言这用在当一个人有若干 Jabber 账户"
"或代理账户时。"
-#: ../src/roster_window.py:4081
+#: ../src/roster_window.py:4101
#, fuzzy
msgid "Invalid file URI:"
msgstr "无效文件"
-#: ../src/roster_window.py:4092
+#: ../src/roster_window.py:4112
#, fuzzy, python-format
msgid "Do you want to send this file to %s:"
msgid_plural "Do you want to send these files to %s:"
msgstr[0] "%s 想发送给您一个文件:"
-#: ../src/roster_window.py:4207
+#: ../src/roster_window.py:4227
#, fuzzy, python-format
msgid "Send %s to %s"
msgstr "发送 %s"
-#: ../src/roster_window.py:4213
+#: ../src/roster_window.py:4233
#, python-format
msgid "Make %s and %s metacontacts"
msgstr "创建 %s 和 %s 元联系人"
@@ -9493,164 +9541,164 @@ msgstr "创建 %s 和 %s 元联系人"
#. for chat_with
#. for single message
#. join gc
-#: ../src/roster_window.py:4794 ../src/roster_window.py:4865
-#: ../src/roster_window.py:4874 ../src/systray.py:216 ../src/systray.py:263
-#: ../src/systray.py:269
+#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
+#: ../src/roster_window.py:4798 ../src/statusicon.py:248
+#: ../src/statusicon.py:295 ../src/statusicon.py:301
#, python-format
msgid "using account %s"
msgstr "使用账户 %s"
#. add
-#: ../src/roster_window.py:4881
+#: ../src/roster_window.py:4805
#, python-format
msgid "to %s account"
msgstr "至帐户 %s"
#. disco
-#: ../src/roster_window.py:4886
+#: ../src/roster_window.py:4810
#, python-format
msgid "using %s account"
msgstr "使用账户 %s"
-#: ../src/roster_window.py:4923 ../src/systray.py:279
+#: ../src/roster_window.py:4847 ../src/statusicon.py:311
msgid "_Manage Bookmarks..."
msgstr "书签管理(_M)..."
#. profile, avatar
-#: ../src/roster_window.py:4943
+#: ../src/roster_window.py:4867
#, python-format
msgid "of account %s"
msgstr "帐户 %s 的"
-#: ../src/roster_window.py:4983
+#: ../src/roster_window.py:4907
#, python-format
msgid "for account %s"
msgstr "为帐户 %s"
-#: ../src/roster_window.py:5039 ../src/roster_window.py:5140
+#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
msgid "_Change Status Message"
msgstr "更改状态消息(_C)"
-#: ../src/roster_window.py:5066
+#: ../src/roster_window.py:4990
#, fuzzy
msgid "Publish Tune"
msgstr "发布(_P)"
-#: ../src/roster_window.py:5074
+#: ../src/roster_window.py:4998
#, fuzzy
msgid "Configure Services..."
msgstr "发掘服务(_D)..."
-#: ../src/roster_window.py:5228
+#: ../src/roster_window.py:5145
msgid "_Maximize All"
msgstr ""
#. Send Group Message
-#: ../src/roster_window.py:5236 ../src/roster_window.py:5404
+#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
msgid "Send Group M_essage"
msgstr "发送群组消息(_E)"
-#: ../src/roster_window.py:5244
+#: ../src/roster_window.py:5161
msgid "To all users"
msgstr "向所有的用户"
-#: ../src/roster_window.py:5248
+#: ../src/roster_window.py:5165
msgid "To all online users"
msgstr "向所有在线用户"
#. Manage Transport submenu
-#: ../src/roster_window.py:5424
+#: ../src/roster_window.py:5345
#, fuzzy
msgid "_Manage Contacts"
msgstr "重命名联系人"
#. Edit Groups
-#: ../src/roster_window.py:5432
+#: ../src/roster_window.py:5353
msgid "Edit _Groups"
msgstr "编辑群组"
#. Send single message
-#: ../src/roster_window.py:5485
+#: ../src/roster_window.py:5408
#, fuzzy
msgid "Send Single Message"
msgstr "发送单条消息(_S)"
#. Execute Command
-#: ../src/roster_window.py:5531
+#: ../src/roster_window.py:5454
msgid "Execute Command..."
msgstr "运行命令..."
#. Manage Transport submenu
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5464
#, fuzzy
msgid "_Manage Transport"
msgstr "代理"
#. Modify Transport
-#: ../src/roster_window.py:5549
+#: ../src/roster_window.py:5472
#, fuzzy
msgid "_Modify Transport"
msgstr "显示代理(_P)"
#. Rename
-#: ../src/roster_window.py:5558
+#: ../src/roster_window.py:5481
msgid "_Rename"
msgstr "重命名(_R)"
-#: ../src/roster_window.py:5623
+#: ../src/roster_window.py:5546
msgid "_Maximize"
msgstr ""
-#: ../src/roster_window.py:5631
+#: ../src/roster_window.py:5554
#, fuzzy
msgid "_Reconnect"
msgstr "联系人已断开连接"
-#: ../src/roster_window.py:5637
+#: ../src/roster_window.py:5560
#, fuzzy
msgid "_Disconnect"
msgstr "联系人已断开连接"
#. History manager
-#: ../src/roster_window.py:5716
+#: ../src/roster_window.py:5642
msgid "History Manager"
msgstr "历史管理器"
-#: ../src/roster_window.py:5725
+#: ../src/roster_window.py:5653
msgid "_Join New Group Chat"
msgstr "加入新群聊(_J)"
-#: ../src/roster_window.py:5881
+#: ../src/roster_window.py:5809
msgid "Change Status Message..."
msgstr "更改状态消息..."
-#: ../src/search_window.py:93
+#: ../src/search_window.py:94
msgid "Waiting for results"
msgstr ""
-#: ../src/search_window.py:133 ../src/search_window.py:211
+#: ../src/search_window.py:132 ../src/search_window.py:210
msgid "Error in received dataform"
msgstr ""
#. No result
-#: ../src/search_window.py:167 ../src/search_window.py:203
+#: ../src/search_window.py:166 ../src/search_window.py:202
msgid "No result"
msgstr ""
-#: ../src/session.py:128
+#: ../src/session.py:132
msgid "Disk WriteError"
msgstr ""
-#: ../src/session.py:249
+#: ../src/session.py:254
#, python-format
msgid "Subject: %s"
msgstr "主题:%s"
-#: ../src/session.py:422 ../src/session.py:457
+#: ../src/session.py:429 ../src/session.py:464
msgid "Confirm these session options"
msgstr ""
-#: ../src/session.py:424
+#: ../src/session.py:431
#, python-format
msgid ""
"The remote client wants to negotiate an session with these features:\n"
@@ -9660,7 +9708,7 @@ msgid ""
"\tAre these options acceptable?"
msgstr ""
-#: ../src/session.py:458
+#: ../src/session.py:465
#, python-format
msgid ""
"The remote client selected these options:\n"
@@ -9670,119 +9718,119 @@ msgid ""
"Continue with the session?"
msgstr ""
-#: ../src/systray.py:177
+#: ../src/statusicon.py:209
msgid "_Change Status Message..."
msgstr "更改状态消息_(C)..."
-#: ../src/systray.py:293
+#: ../src/statusicon.py:325
msgid "Hide this menu"
msgstr "隐藏本菜单"
-#: ../src/tooltips.py:326 ../src/tooltips.py:520
+#: ../src/tooltips.py:347 ../src/tooltips.py:544
msgid "Jabber ID: "
msgstr "Jabber ID:"
-#: ../src/tooltips.py:329 ../src/tooltips.py:524
+#: ../src/tooltips.py:350 ../src/tooltips.py:548
msgid "Resource: "
msgstr "资源:"
-#: ../src/tooltips.py:334
+#: ../src/tooltips.py:355
#, python-format
msgid "%(owner_or_admin_or_member)s of this group chat"
msgstr "此群聊的 %(owner_or_admin_or_member)s"
-#: ../src/tooltips.py:431
+#: ../src/tooltips.py:455
msgid " [blocked]"
msgstr ""
-#: ../src/tooltips.py:435
+#: ../src/tooltips.py:459
msgid " [minimized]"
msgstr ""
-#: ../src/tooltips.py:450 ../src/tooltips.py:705
+#: ../src/tooltips.py:474 ../src/tooltips.py:686
msgid "Status: "
msgstr "状态"
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:504
#, python-format
msgid "Last status: %s"
msgstr "最后状态:%s"
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:506
#, python-format
msgid " since %s"
msgstr "自从 %s"
-#: ../src/tooltips.py:500
+#: ../src/tooltips.py:524
#, fuzzy
msgid "Connected"
msgstr "连接"
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:526
#, fuzzy
msgid "Disconnected"
msgstr "联系人已断开连接"
#. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:555
msgid "Subscription: "
msgstr "认证:"
-#: ../src/tooltips.py:541
+#: ../src/tooltips.py:565
msgid "OpenPGP: "
msgstr "OpenPGP: "
-#: ../src/tooltips.py:637
+#: ../src/tooltips.py:618
#, fuzzy
msgid "Tune:"
msgstr "类型:"
-#: ../src/tooltips.py:663
+#: ../src/tooltips.py:644
msgid "Download"
msgstr "下载"
-#: ../src/tooltips.py:669
+#: ../src/tooltips.py:650
msgid "Upload"
msgstr "上传"
-#: ../src/tooltips.py:676
+#: ../src/tooltips.py:657
msgid "Type: "
msgstr "类型"
-#: ../src/tooltips.py:680
+#: ../src/tooltips.py:661
msgid "Transferred: "
msgstr "已传输:"
-#: ../src/tooltips.py:683 ../src/tooltips.py:704
+#: ../src/tooltips.py:664 ../src/tooltips.py:685
msgid "Not started"
msgstr "未开始"
-#: ../src/tooltips.py:687
+#: ../src/tooltips.py:668
msgid "Stopped"
msgstr "已停止"
-#: ../src/tooltips.py:689 ../src/tooltips.py:692
+#: ../src/tooltips.py:670 ../src/tooltips.py:673
msgid "Completed"
msgstr "已完成"
-#: ../src/tooltips.py:696
+#: ../src/tooltips.py:677
msgid "?transfer status:Paused"
msgstr "?transfer status:暂停"
#. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:700
+#: ../src/tooltips.py:681
msgid "Stalled"
msgstr "已冻结"
-#: ../src/tooltips.py:702
+#: ../src/tooltips.py:683
msgid "Transferring"
msgstr "传输中"
-#: ../src/tooltips.py:738
+#: ../src/tooltips.py:721
msgid "This service has not yet responded with detailed information"
msgstr "服务无详细信息应答"
-#: ../src/tooltips.py:741
+#: ../src/tooltips.py:724
msgid ""
"This service could not respond with detailed information.\n"
"It is most likely legacy or broken"
@@ -9790,64 +9838,98 @@ msgstr ""
"此服务无法返回详细信息。\n"
"它可能是继承或损坏的"
-#: ../src/vcard.py:245
+#: ../src/vcard.py:252
msgid "?Client:Unknown"
msgstr "?Client: 未知"
-#: ../src/vcard.py:247
+#: ../src/vcard.py:254
msgid "?OS:Unknown"
msgstr "?OS: 未知"
-#: ../src/vcard.py:268
+#: ../src/vcard.py:275
#, fuzzy
msgid "?Time:Unknown"
msgstr "?Client: 未知"
-#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
+#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
#, python-format
msgid "since %s"
msgstr "自 %s"
-#: ../src/vcard.py:331
+#: ../src/vcard.py:336
#, fuzzy
msgid "<b>Affiliation:</b>"
msgstr "<b>应用</b>"
-#: ../src/vcard.py:339
+#: ../src/vcard.py:344
msgid ""
"This contact is interested in your presence information, but you are not "
"interested in his/her presence"
msgstr "此联系人对您的状态信息感兴趣,但您不关心他/她的状态"
-#: ../src/vcard.py:341
+#: ../src/vcard.py:346
msgid ""
"You are interested in the contact's presence information, but he/she is not "
"interested in yours"
msgstr "您对此联系人的状态信息感兴趣,但他/她不关心您的状态"
-#: ../src/vcard.py:343
+#: ../src/vcard.py:348
msgid "You and the contact are interested in each other's presence information"
msgstr "您与此联系人同时对对方的状态信息感兴趣"
#. None
-#: ../src/vcard.py:345
+#: ../src/vcard.py:350
msgid ""
"You are not interested in the contact's presence, and neither he/she is "
"interested in yours"
msgstr "您与他/她互不关心对方的状态信息"
-#: ../src/vcard.py:352
+#: ../src/vcard.py:357
msgid "You are waiting contact's answer about your subscription request"
msgstr "等待联系人回应您的认证请求"
-#: ../src/vcard.py:354
+#: ../src/vcard.py:359
msgid "There is no pending subscription request."
msgstr ""
-#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
+#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
msgid " resource with priority "
msgstr "带有优先级的资源"
+#~ msgid "_Incoming message:"
+#~ msgstr "抵达的消息:(_I)"
+
+#~ msgid "_Outgoing message:"
+#~ msgstr "将要送出的消息:(_O)"
+
+#, fuzzy
+#~ msgid "gtk-ok"
+#~ msgstr "gtk+"
+
+#, fuzzy
+#~ msgid ""
+#~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
+#~ "not valid, so ignored."
+#~ msgstr "您配置主机为 ft_override_host_to_send 高级选项无效,忽略。"
+
+#~ msgid "OpenPGP passphrase was not given"
+#~ msgstr "未获得 OpenPGP 密文"
+
+#~ msgid ""
+#~ "To continue sending and receiving messages, you will need to reconnect."
+#~ msgstr "您需要重新连接才能继续收发消息。"
+
+#~ msgid ""
+#~ "You are not connected or not visible to others. Your message could not be "
+#~ "sent."
+#~ msgstr "没有连接或隐身。您的消息将不会被发送。"
+
+#~ msgid "[This message is encrypted]"
+#~ msgstr "[本条消息已加密]"
+
+#~ msgid "%i days ago"
+#~ msgstr "%i 天前"
+
#~ msgid "Add Special _Notification"
#~ msgstr "添加特殊提示(_N)"
@@ -10106,9 +10188,6 @@ msgstr "带有优先级的资源"
#~ "例如:当您允许离开的状态消息,当您改变状态至离开时 Gajim 将不再询问您状态"
#~ "消息;将会使用默认设置的消息"
-#~ msgid "B_efore nickname:"
-#~ msgstr "在昵称前:(_E)"
-
#~ msgid "Chat"
#~ msgstr "聊天"