X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fzh_CN.po;h=05f1f38bfec8c175a451d3e0d765c5da04089f32;hp=cac8f04b2e4706ef36a3e454b9e1f21de78348c8;hb=6ad9ac524aabfefc5050f89a53db501c9784738a;hpb=681a6fe918b075f6f7bfa88f5c33f5da1529f8d1 diff --git a/po/zh_CN.po b/po/zh_CN.po index cac8f04b..05f1f38b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: Quassel IRC\n" "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n" -"PO-Revision-Date: 2014-02-22 09:00+0000\n" +"PO-Revision-Date: 2015-02-11 21:00+0000\n" "Last-Translator: Daniel Albers \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/quassel/language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -31,31 +31,22 @@ msgid "" "

Quassel IRC

" msgstr "\n

Quassel IRC

" -#: ../src/qtui/ui/aboutdlg.ui:75 -msgctxt "AboutDlg|" -msgid "" -"\n" -"

Version 0.2.0-pre, Build >= 474 (2008-02-08)

" -msgstr "\n

版本 0.2.0-pre, Build >= 474 (2008-02-08)

" - -#: ../src/qtui/ui/aboutdlg.ui:115 +#: ../src/qtui/ui/aboutdlg.ui:112 msgctxt "AboutDlg|" msgid "&About" msgstr "关于(&A)" -#: ../src/qtui/ui/aboutdlg.ui:135 +#: ../src/qtui/ui/aboutdlg.ui:132 msgctxt "AboutDlg|" msgid "A&uthors" msgstr "作者(&U)" -#: ../src/qtui/ui/aboutdlg.ui:155 +#: ../src/qtui/ui/aboutdlg.ui:152 msgctxt "AboutDlg|" msgid "&Contributors" msgstr "贡献者(&C)" -#: ../src/qtui/ui/aboutdlg.ui:175 +#: ../src/qtui/ui/aboutdlg.ui:172 msgctxt "AboutDlg|" msgid "&Thanks To" msgstr "致谢(&T)" @@ -67,10 +58,11 @@ msgid "Version: %1
Protocol version: %2
Built: %3" msgstr "版本 %1
协议版本： %2
编译： %3" #: ../src/qtui/aboutdlg.cpp:49 +#, qt-format msgctxt "AboutDlg|" msgid "" -"A modern, distributed IRC Client

©%1 by the " -"Quassel Project
http://quassel-" +"A modern, distributed IRC Client

©%1 by the Quassel " +"Project
http://quassel-" "irc.org
#quassel on Freenode

Quassel IRC is dual-" "licensed under GPLv2" @@ -80,7 +72,7 @@ msgid "" "href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL.

Please use " "http://bugs.quassel-irc.org to " "report bugs." -msgstr "一个现代的、分布式的 IRC 客户端。

©%1 Quassel 项目
http://quassel-irc.org
#quassel on Freenode

Quassel IRC 遵循 GPLv2 和 GPLv3 协议。
绝大多数图标的版权属于 © Oxygen 团队 并按 LGPL 协议使用。

请使用 http://bugs.quassel-irc.org 报告故障。" +msgstr "" #: ../src/qtui/aboutdlg.cpp:67 msgctxt "AboutDlg|" @@ -94,7 +86,7 @@ msgid "" "and everybody we forgot to mention here:" msgstr "我们感谢下列贡献者(按字母顺序排列)和所有我们忘记在这里提及的人们：" -#: ../src/qtui/aboutdlg.cpp:201 +#: ../src/qtui/aboutdlg.cpp:206 msgctxt "AboutDlg|" msgid "" "Special thanks goes to:
%1 - %2

" @@ -461,7 +453,7 @@ msgctxt "BufferViewEditDlg|" msgid "Please enter a name for the chat list:" msgstr "请在聊天列表中输入一个名字：" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:575 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582 msgctxt "BufferViewEditDlg|" msgid "Add Chat List" msgstr "增加聊天列表" @@ -502,7 +494,7 @@ msgid "Network:" msgstr "网络：" #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100 -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:123 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128 msgctxt "BufferViewSettingsPage|" msgid "All" msgstr "所有" @@ -536,40 +528,45 @@ msgstr "隐藏不活动的聊天" #: ../src/qtui/settingspages/bufferviewsettingspage.ui:142 msgctxt "BufferViewSettingsPage|" +msgid "Hide inactive networks" +msgstr "" + +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149 +msgctxt "BufferViewSettingsPage|" msgid "Add new chats automatically" msgstr "自动增加新聊天" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156 msgctxt "BufferViewSettingsPage|" msgid "Sort alphabetically" msgstr "按字母顺序排序" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:163 msgctxt "BufferViewSettingsPage|" msgid "Minimum Activity:" msgstr "最小活动：" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:171 msgctxt "BufferViewSettingsPage|" msgid "No Activity" msgstr "没有活动" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:176 msgctxt "BufferViewSettingsPage|" msgid "Other Activity" msgstr "其他活动" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:181 msgctxt "BufferViewSettingsPage|" msgid "New Message" msgstr "新消息" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:179 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:186 msgctxt "BufferViewSettingsPage|" msgid "Highlight" msgstr "突出显示" -#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205 +#: ../src/qtui/settingspages/bufferviewsettingspage.ui:212 msgctxt "BufferViewSettingsPage|" msgid "Preview:" msgstr "预览：" @@ -584,12 +581,12 @@ msgctxt "BufferViewSettingsPage|" msgid "Custom Chat Lists" msgstr "自定义聊天列表" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:378 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:383 msgctxt "BufferViewSettingsPage|" msgid "Delete Chat List?" msgstr "删除聊天列表？" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:379 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384 #, qt-format msgctxt "BufferViewSettingsPage|" msgid "Do you really want to delete the chat list \"%1\"?" @@ -600,61 +597,61 @@ msgctxt "BufferViewWidget|" msgid "BufferView" msgstr "缓冲区查看" -#: ../src/qtui/bufferwidget.cpp:78 +#: ../src/qtui/bufferwidget.cpp:79 msgctxt "BufferWidget|" msgid "Zoom In" msgstr "放大" -#: ../src/qtui/bufferwidget.cpp:84 +#: ../src/qtui/bufferwidget.cpp:85 msgctxt "BufferWidget|" msgid "Zoom Out" msgstr "缩小" -#: ../src/qtui/bufferwidget.cpp:89 +#: ../src/qtui/bufferwidget.cpp:90 msgctxt "BufferWidget|" msgid "Actual Size" msgstr "实际尺寸" -#: ../src/qtui/bufferwidget.cpp:93 +#: ../src/qtui/bufferwidget.cpp:94 msgctxt "BufferWidget|" msgid "Set Marker Line" msgstr "设置标记线" -#: ../src/qtui/bufferwidget.cpp:97 +#: ../src/qtui/bufferwidget.cpp:98 msgctxt "BufferWidget|" msgid "Go to Marker Line" msgstr "转到标记线" -#: ../src/client/networkmodel.cpp:566 +#: ../src/client/networkmodel.cpp:583 ../src/client/networkmodel.cpp:585 #, qt-format msgctxt "ChannelBufferItem|" msgid "Channel %1" msgstr "频道 %1" -#: ../src/client/networkmodel.cpp:569 +#: ../src/client/networkmodel.cpp:589 #, qt-format msgctxt "ChannelBufferItem|" msgid "Users: %1" msgstr "用户： %1" -#: ../src/client/networkmodel.cpp:573 +#: ../src/client/networkmodel.cpp:593 #, qt-format msgctxt "ChannelBufferItem|" msgid "Mode: %1" msgstr "模式： %1" -#: ../src/client/networkmodel.cpp:584 +#: ../src/client/networkmodel.cpp:608 #, qt-format msgctxt "ChannelBufferItem|" msgid "Topic: %1" msgstr "方式： %1" -#: ../src/client/networkmodel.cpp:589 +#: ../src/client/networkmodel.cpp:613 msgctxt "ChannelBufferItem|" msgid "Not active
Double-click to join" msgstr "非活跃
双击加入" -#: ../src/client/networkmodel.cpp:592 +#: ../src/client/networkmodel.cpp:616 #, qt-format msgctxt "ChannelBufferItem|" msgid "

%1

" @@ -741,7 +738,7 @@ msgid "Move selected buffers to the right" msgstr "移动所选的缓冲区到右边" #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133 -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:258 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:272 msgctxt "ChatMonitorSettingsPage|" msgid "Show:" msgstr "显示：" @@ -762,6 +759,26 @@ msgctxt "ChatMonitorSettingsPage|" msgid "Show own messages" msgstr "显示我的信息" +#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:164 +msgctxt "ChatMonitorSettingsPage|" +msgid "Display messages from backlog on reconnect" +msgstr "" + +#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:167 +msgctxt "ChatMonitorSettingsPage|" +msgid "Show messages from backlog" +msgstr "" + +#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:192 +msgctxt "ChatMonitorSettingsPage|" +msgid "Include read messages from backlog on reconnect" +msgstr "" + +#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:195 +msgctxt "ChatMonitorSettingsPage|" +msgid "Include read messages" +msgstr "" + #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35 msgctxt "ChatMonitorSettingsPage|" msgid "Interface" @@ -782,7 +799,7 @@ msgctxt "ChatMonitorSettingsPage|" msgid "Opt Out" msgstr "Opt Out" -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:261 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:275 msgctxt "ChatMonitorSettingsPage|" msgid "Ignore:" msgstr "忽略：" @@ -807,11 +824,22 @@ msgctxt "ChatMonitorView|" msgid "Configure..." msgstr "配置..." -#: ../src/qtui/chatscene.cpp:813 +#: ../src/qtui/chatscene.cpp:826 msgctxt "ChatScene|" msgid "Copy Selection" msgstr "复制选择" +#: ../src/qtui/chatscene.cpp:833 +#, qt-format +msgctxt "ChatScene|" +msgid "Search '%1'" +msgstr "" + +#: ../src/qtui/chatscene.cpp:844 +msgctxt "ChatScene|" +msgid "Reset Column Widths" +msgstr "" + #: ../src/qtui/ui/chatviewsearchbar.ui:13 msgctxt "ChatViewSearchBar|" msgid "Form" @@ -912,96 +940,128 @@ msgstr "在切换聊天时自动设置标记线" #: ../src/qtui/settingspages/chatviewsettingspage.ui:159 msgctxt "ChatViewSettingsPage|" +msgid "" +"Set the marker line to the bottom of the current chat window when Quassel " +"loses focus." +msgstr "" + +#: ../src/qtui/settingspages/chatviewsettingspage.ui:162 +msgctxt "ChatViewSettingsPage|" +msgid "Set marker line automatically when Quassel loses focus" +msgstr "" + +#: ../src/qtui/settingspages/chatviewsettingspage.ui:180 +msgctxt "ChatViewSettingsPage|" +msgid "Web Search Url:" +msgstr "" + +#: ../src/qtui/settingspages/chatviewsettingspage.ui:187 +msgctxt "ChatViewSettingsPage|" +msgid "" +"

The URL to open with the selected text as the " +"parameter. Place %s where selected " +"text should go.

Eg:

https://www.google.com/search?q=%s
https://duckduckgo.com/?q=%s

" +msgstr "" + +#: ../src/qtui/settingspages/chatviewsettingspage.ui:193 +msgctxt "ChatViewSettingsPage|" +msgid "https://www.google.com/search?q=%s" +msgstr "" + +#: ../src/qtui/settingspages/chatviewsettingspage.ui:202 +msgctxt "ChatViewSettingsPage|" msgid "Custom Colors" msgstr "自定义颜色" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:177 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:220 msgctxt "ChatViewSettingsPage|" msgid "Action:" msgstr "动作：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:184 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:208 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:232 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:269 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:293 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:324 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:348 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:372 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:396 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:413 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:453 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:470 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:487 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:504 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:521 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:538 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:555 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:572 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:589 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:606 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:623 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:640 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:657 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:674 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:691 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:708 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:736 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:227 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:251 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:275 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:312 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:336 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:367 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:391 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:415 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:439 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:456 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:496 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:513 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:530 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:547 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:564 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:581 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:598 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:615 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:632 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:649 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:666 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:683 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:700 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:717 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:734 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:751 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:779 msgctxt "ChatViewSettingsPage|" msgid "..." msgstr "..." -#: ../src/qtui/settingspages/chatviewsettingspage.ui:201 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:244 msgctxt "ChatViewSettingsPage|" msgid "Timestamp:" msgstr "时间戳：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:225 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:268 msgctxt "ChatViewSettingsPage|" msgid "Channel message:" msgstr "频道消息：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:262 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:305 msgctxt "ChatViewSettingsPage|" msgid "Highlight foreground:" msgstr "突出显示前景色：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:286 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:329 msgctxt "ChatViewSettingsPage|" msgid "Command message:" msgstr "命令消息：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:310 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:353 msgctxt "ChatViewSettingsPage|" msgid "Highlight background:" msgstr "突出显示背景色：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:317 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:360 msgctxt "ChatViewSettingsPage|" msgid "Server message:" msgstr "服务器消息：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:341 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:384 msgctxt "ChatViewSettingsPage|" msgid "Marker line:" msgstr "标记线：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:365 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:408 msgctxt "ChatViewSettingsPage|" msgid "Error message:" msgstr "错误信息：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:389 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:432 msgctxt "ChatViewSettingsPage|" msgid "Background:" msgstr "背景色：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:433 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:476 msgctxt "ChatViewSettingsPage|" msgid "Use Sender Coloring" msgstr "使用发送方的颜色" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:729 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:772 msgctxt "ChatViewSettingsPage|" msgid "Own messages:" msgstr "自己的消息：" @@ -1026,62 +1086,98 @@ msgctxt "Client|" msgid "Identity already exists in client!" msgstr "客户端中已有该身份！" -#: ../src/client/clientauthhandler.cpp:61 -#: ../src/client/clientauthhandler.cpp:256 +#: ../src/client/clientauthhandler.cpp:65 +#: ../src/client/clientauthhandler.cpp:471 msgctxt "ClientAuthHandler|" msgid "Unencrypted connection canceled" msgstr "已取消了未加密连接" -#: ../src/client/clientauthhandler.cpp:84 +#: ../src/client/clientauthhandler.cpp:87 +#: ../src/client/clientauthhandler.cpp:103 #, qt-format msgctxt "ClientAuthHandler|" msgid "Connecting to %1..." msgstr "正在连接 %1..." -#: ../src/client/clientauthhandler.cpp:154 +#: ../src/client/clientauthhandler.cpp:99 +#, qt-format msgctxt "ClientAuthHandler|" -msgid "Synchronizing to core..." -msgstr "正在与核心同步..." +msgid "Looking up %1..." +msgstr "正在查找 %1..." + +#: ../src/client/clientauthhandler.cpp:106 +#: ../src/client/clientauthhandler.cpp:315 +#, qt-format +msgctxt "ClientAuthHandler|" +msgid "Connected to %1" +msgstr "已连接到 %1" -#: ../src/client/clientauthhandler.cpp:167 +#: ../src/client/clientauthhandler.cpp:110 #, qt-format msgctxt "ClientAuthHandler|" +msgid "Disconnecting from %1..." +msgstr "正在从 %1 断开..." + +#: ../src/client/clientauthhandler.cpp:114 +msgctxt "ClientAuthHandler|" +msgid "Disconnected" +msgstr "连接已断开" + +#: ../src/client/clientauthhandler.cpp:149 +msgctxt "ClientAuthHandler|" +msgid "Reconnecting in compatibility mode..." +msgstr "" + +#: ../src/client/clientauthhandler.cpp:236 +msgctxt "ClientAuthHandler|" msgid "" -"The Quassel Core you are trying to connect to is too old!
We need " -"at least protocol v%1, but the core speaks v%2 only." +"Incompatible Quassel Core!
None of the protocols this client " +"speaks are supported by the core you are trying to connect to." msgstr "" -#: ../src/client/clientauthhandler.cpp:169 +#: ../src/client/clientauthhandler.cpp:239 msgctxt "ClientAuthHandler|" -msgid "Incompatible protocol version, connection to core refused" +msgid "Core speaks none of the protocols we support" msgstr "" -#: ../src/client/clientauthhandler.cpp:176 +#: ../src/client/clientauthhandler.cpp:254 +#, qt-format msgctxt "ClientAuthHandler|" -msgid "The core refused connection from this client" +msgid "" +"The Quassel Core you are trying to connect to is too old!
We need " +"at least protocol v%1, but the core speaks v%2 only." msgstr "" -#: ../src/client/clientauthhandler.cpp:207 +#: ../src/client/clientauthhandler.cpp:256 msgctxt "ClientAuthHandler|" -msgid "Unencrypted connection cancelled" +msgid "Incompatible protocol version, connection to core refused" msgstr "" -#: ../src/client/clientauthhandler.cpp:275 -#, qt-format +#: ../src/client/clientauthhandler.cpp:278 msgctxt "ClientAuthHandler|" -msgid "Connected to %1" -msgstr "已连接到 %1" +msgid "Synchronizing to core..." +msgstr "正在与核心同步..." -#: ../src/client/clientauthhandler.cpp:317 +#: ../src/client/clientauthhandler.cpp:293 +msgctxt "ClientAuthHandler|" +msgid "The core refused connection from this client" +msgstr "" + +#: ../src/client/clientauthhandler.cpp:357 msgctxt "ClientAuthHandler|" msgid "Logging in..." msgstr "正在登录..." -#: ../src/client/clientauthhandler.cpp:322 +#: ../src/client/clientauthhandler.cpp:362 msgctxt "ClientAuthHandler|" msgid "Login canceled" msgstr "登录已取消" +#: ../src/client/clientauthhandler.cpp:420 +msgctxt "ClientAuthHandler|" +msgid "Unencrypted connection cancelled" +msgstr "" + #: ../src/client/clientbacklogmanager.cpp:178 #, qt-format msgctxt "ClientBacklogManager|" @@ -1177,7 +1273,7 @@ msgctxt "ConnectionSettingsPage|" msgid "IRC" msgstr "IRC" -#: ../src/qtui/chatitem.cpp:803 +#: ../src/qtui/chatitem.cpp:800 msgctxt "ContentsChatItem|" msgid "Copy Link Address" msgstr "复制链接地址" @@ -1397,12 +1493,12 @@ msgctxt "ContextMenuActionProvider|" msgid "Existing Rules" msgstr "现有规则" -#: ../src/core/core.cpp:193 +#: ../src/core/core.cpp:191 msgctxt "Core|" msgid "Could not initialize any storage backend! Exiting..." msgstr "无法初始化任何存储后端！正在退出..." -#: ../src/core/core.cpp:194 +#: ../src/core/core.cpp:192 msgctxt "Core|" msgid "" "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n" @@ -1410,93 +1506,93 @@ msgid "" "to work." msgstr "目前 Quassel 支持 SQLite3 和 PostgreSQL。您需要在启用\n sqlite 和 postgres 插件的条件下重新编译 Qt 库才能让 quasselcore\n正常工作。" -#: ../src/core/core.cpp:253 +#: ../src/core/core.cpp:251 msgctxt "Core|" msgid "Calling restoreState() even though active sessions exist!" msgstr "尽管有活动的会话，仍然调用 restoreState()！" -#: ../src/core/core.cpp:287 +#: ../src/core/core.cpp:285 msgctxt "Core|" msgid "Core is already configured! Not configuring again..." msgstr "" -#: ../src/core/core.cpp:290 +#: ../src/core/core.cpp:288 msgctxt "Core|" msgid "Admin user or password not set." msgstr "管理员的用户名或密码未设置。" -#: ../src/core/core.cpp:293 +#: ../src/core/core.cpp:291 msgctxt "Core|" msgid "Could not setup storage!" msgstr "无法设置存储！" -#: ../src/core/core.cpp:298 +#: ../src/core/core.cpp:296 msgctxt "Core|" msgid "Creating admin user..." msgstr "正在创建管理员用户..." -#: ../src/core/core.cpp:451 +#: ../src/core/core.cpp:449 #, qt-format msgctxt "Core|" msgid "Invalid listen address %1" msgstr "无效的侦听地址 %1" -#: ../src/core/core.cpp:460 +#: ../src/core/core.cpp:458 #, qt-format msgctxt "Core|" msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3" msgstr "正在 IPv6 %1 端口 %2 上进行 GUI 客户端侦听，使用 %3 版本协议" -#: ../src/core/core.cpp:469 +#: ../src/core/core.cpp:467 #, qt-format msgctxt "Core|" msgid "Could not open IPv6 interface %1:%2: %3" msgstr "无法打开 IPv6 接口 %1:%2：%3" -#: ../src/core/core.cpp:477 +#: ../src/core/core.cpp:475 #, qt-format msgctxt "Core|" msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3" msgstr "正在 IPv4 %1 端口 %2 上进行 GUI 客户端侦听，使用 %3 版本协议" -#: ../src/core/core.cpp:488 +#: ../src/core/core.cpp:486 #, qt-format msgctxt "Core|" msgid "Could not open IPv4 interface %1:%2: %3" msgstr "无法打开 IPv4 接口 %1:%2：%3" -#: ../src/core/core.cpp:496 +#: ../src/core/core.cpp:494 #, qt-format msgctxt "Core|" msgid "Invalid listen address %1, unknown network protocol" msgstr "侦听地址 %1 无效，网络协议未知" -#: ../src/core/core.cpp:505 +#: ../src/core/core.cpp:503 msgctxt "Core|" msgid "Could not open any network interfaces to listen on!" msgstr "无法打开任何可侦听的网络接口" -#: ../src/core/core.cpp:545 +#: ../src/core/core.cpp:543 msgctxt "Core|" msgid "Client connected from" msgstr "客户端已连接自" -#: ../src/core/core.cpp:548 +#: ../src/core/core.cpp:546 msgctxt "Core|" msgid "Closing server for basic setup." msgstr "关闭服务器以进行基本设置。" -#: ../src/core/core.cpp:560 +#: ../src/core/core.cpp:558 msgctxt "Core|" msgid "Non-authed client disconnected:" msgstr "" -#: ../src/core/core.cpp:592 +#: ../src/core/core.cpp:590 msgctxt "Core|" msgid "Could not initialize session for client:" msgstr "无法初始化客户端会话：" -#: ../src/core/core.cpp:619 +#: ../src/core/core.cpp:617 msgctxt "Core|" msgid "Could not find a session for client:" msgstr "无法找到客户端会话：" @@ -1637,17 +1733,17 @@ msgctxt "CoreAccountSettingsPage|" msgid "Remote Cores" msgstr "远程核心" -#: ../src/core/coreauthhandler.cpp:54 ../src/core/coreauthhandler.cpp:90 +#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144 msgctxt "CoreAuthHandler|" msgid "Client" msgstr "客戶端" -#: ../src/core/coreauthhandler.cpp:54 +#: ../src/core/coreauthhandler.cpp:132 msgctxt "CoreAuthHandler|" msgid "too old, rejecting." msgstr "过旧，拒绝。" -#: ../src/core/coreauthhandler.cpp:55 +#: ../src/core/coreauthhandler.cpp:133 #, qt-format msgctxt "CoreAuthHandler|" msgid "" @@ -1656,44 +1752,44 @@ msgid "" " client." msgstr "" -#: ../src/core/coreauthhandler.cpp:69 +#: ../src/core/coreauthhandler.cpp:144 msgctxt "CoreAuthHandler|" -msgid "Starting encryption for Client:" +msgid "did not send a registration message before trying to login, rejecting." msgstr "" -#: ../src/core/coreauthhandler.cpp:90 -msgctxt "CoreAuthHandler|" -msgid "did not send an init message before trying to login, rejecting." -msgstr "在尝试登录前没有发送初始化消息，拒绝。" - -#: ../src/core/coreauthhandler.cpp:91 +#: ../src/core/coreauthhandler.cpp:145 msgctxt "CoreAuthHandler|" msgid "" -"Client not initialized!
You need to send an init message before " -"trying to login." -msgstr "客户端没有初始化！
您需要先发送一个 init(初始化) 消息才能尝试登录。" +"Client not initialized!
You need to send a registration message " +"before trying to login." +msgstr "" -#: ../src/core/coreauthhandler.cpp:105 +#: ../src/core/coreauthhandler.cpp:162 msgctxt "CoreAuthHandler|" msgid "" "SSL is required!
You need to use SSL in order to connect to this " "core." msgstr "" -#: ../src/core/coreauthhandler.cpp:146 +#: ../src/core/coreauthhandler.cpp:202 msgctxt "CoreAuthHandler|" msgid "" "Invalid username or password!
The username/password combination " "you supplied could not be found in the database." msgstr "用户名或密码无效！
您提供的用户名/密码组合在数据库中找不到。" -#: ../src/core/coreauthhandler.cpp:151 +#: ../src/core/coreauthhandler.cpp:207 #, qt-format msgctxt "CoreAuthHandler|" msgid "" "Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)." msgstr "" +#: ../src/core/coreauthhandler.cpp:226 +msgctxt "CoreAuthHandler|" +msgid "Starting encryption for Client:" +msgstr "" + #: ../src/qtui/coreconfigwizard.cpp:69 msgctxt "CoreConfigWizard|" msgid "Core Configuration Wizard" @@ -1903,57 +1999,33 @@ msgctxt "CoreConnection|" msgid "Network is down" msgstr "网络已断" -#: ../src/client/coreconnection.cpp:227 ../src/client/coreconnection.cpp:328 +#: ../src/client/coreconnection.cpp:276 msgctxt "CoreConnection|" msgid "Disconnected" msgstr "连接已断开" -#: ../src/client/coreconnection.cpp:230 -#, qt-format -msgctxt "CoreConnection|" -msgid "Looking up %1..." -msgstr "正在查找 %1..." - -#: ../src/client/coreconnection.cpp:233 -#, qt-format -msgctxt "CoreConnection|" -msgid "Connecting to %1..." -msgstr "正在连接 %1..." - -#: ../src/client/coreconnection.cpp:236 -#, qt-format -msgctxt "CoreConnection|" -msgid "Connected to %1" -msgstr "已连接到 %1" - -#: ../src/client/coreconnection.cpp:239 -#, qt-format -msgctxt "CoreConnection|" -msgid "Disconnecting from %1..." -msgstr "正在从 %1 断开..." - -#: ../src/client/coreconnection.cpp:363 +#: ../src/client/coreconnection.cpp:311 msgctxt "CoreConnection|" msgid "Disconnected from core." msgstr "已从核心断开。" -#: ../src/client/coreconnection.cpp:501 +#: ../src/client/coreconnection.cpp:449 msgctxt "CoreConnection|" msgid "Receiving session state" msgstr "正在接收会话状态" -#: ../src/client/coreconnection.cpp:503 +#: ../src/client/coreconnection.cpp:451 #, qt-format msgctxt "CoreConnection|" msgid "Synchronizing to %1..." msgstr "正在与 %1 同步..." -#: ../src/client/coreconnection.cpp:539 +#: ../src/client/coreconnection.cpp:487 msgctxt "CoreConnection|" msgid "Receiving network states" msgstr "正在接收网络状态" -#: ../src/client/coreconnection.cpp:590 +#: ../src/client/coreconnection.cpp:538 #, qt-format msgctxt "CoreConnection|" msgid "Synchronized to %1" @@ -2132,35 +2204,35 @@ msgctxt "CoreInfoDlg|" msgid " %1:%2:%3 (since %4)" msgstr " %1:%2:%3 (始于 %4)" -#: ../src/core/corenetwork.cpp:167 +#: ../src/core/corenetwork.cpp:168 msgctxt "CoreNetwork|" msgid "Connection failed. Cycling to next Server" msgstr "连接失败。轮转到下个服务器" -#: ../src/core/corenetwork.cpp:175 ../src/core/corenetwork.cpp:176 +#: ../src/core/corenetwork.cpp:176 ../src/core/corenetwork.cpp:177 #, qt-format msgctxt "CoreNetwork|" msgid "Connecting to %1:%2..." msgstr "正在连接到 %1：%2..." -#: ../src/core/corenetwork.cpp:228 +#: ../src/core/corenetwork.cpp:234 #, qt-format msgctxt "CoreNetwork|" msgid "Disconnecting. (%1)" msgstr "正在断开。(%1)" -#: ../src/core/corenetwork.cpp:228 +#: ../src/core/corenetwork.cpp:234 msgctxt "CoreNetwork|" msgid "Core Shutdown" msgstr "核心关闭" -#: ../src/core/corenetwork.cpp:423 +#: ../src/core/corenetwork.cpp:432 #, qt-format msgctxt "CoreNetwork|" msgid "Could not connect to %1 (%2)" msgstr "无法连接到 %1 (%2)" -#: ../src/core/corenetwork.cpp:425 +#: ../src/core/corenetwork.cpp:434 #, qt-format msgctxt "CoreNetwork|" msgid "Connection failure: %1" @@ -2268,38 +2340,38 @@ msgctxt "CoreUserInputHandler|" msgid "sending CTCP-%1 request to %2" msgstr "正在向 %2 发送 CTCP-%1 请求" -#: ../src/core/coreuserinputhandler.cpp:190 -#: ../src/core/coreuserinputhandler.cpp:361 -#: ../src/core/coreuserinputhandler.cpp:606 -#: ../src/core/coreuserinputhandler.cpp:644 +#: ../src/core/coreuserinputhandler.cpp:193 +#: ../src/core/coreuserinputhandler.cpp:364 +#: ../src/core/coreuserinputhandler.cpp:609 +#: ../src/core/coreuserinputhandler.cpp:647 msgctxt "CoreUserInputHandler|" msgid "" "Error: QCA provider plugin not found. It is usually provided by the qca-ossl" " plugin." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:201 +#: ../src/core/coreuserinputhandler.cpp:204 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /delkey deletes the encryption key for nick or " "channel or just /delkey when in a channel or query." msgstr "[用法] /delkey <昵称|频道> 删除昵称或频道对应的加密密钥，在频道或查询中，只用 /delkey 即可。" -#: ../src/core/coreuserinputhandler.cpp:208 -#: ../src/core/coreuserinputhandler.cpp:662 +#: ../src/core/coreuserinputhandler.cpp:211 +#: ../src/core/coreuserinputhandler.cpp:665 #, qt-format msgctxt "CoreUserInputHandler|" msgid "No key has been set for %1." msgstr "没有为 %1 设置密钥。" -#: ../src/core/coreuserinputhandler.cpp:213 +#: ../src/core/coreuserinputhandler.cpp:216 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 has been deleted." msgstr "%1 的密钥已经删除。" -#: ../src/core/coreuserinputhandler.cpp:217 -#: ../src/core/coreuserinputhandler.cpp:670 +#: ../src/core/coreuserinputhandler.cpp:220 +#: ../src/core/coreuserinputhandler.cpp:673 msgctxt "CoreUserInputHandler|" msgid "" "Error: Setting an encryption key requires Quassel to have been built with " @@ -2308,31 +2380,31 @@ msgid "" "with QCA2 present." msgstr "错误：设置加密密钥要求编译的 Quassel 内建 Qt 加密架构(QCA2)库支持。请联系您的发行商查找带 QCA2 支持的 Quassel 软件包，或者使用现有的 QCA2 重新编译 Quassel。" -#: ../src/core/coreuserinputhandler.cpp:371 +#: ../src/core/coreuserinputhandler.cpp:374 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /keyx [] Initiates a DH1080 key exchange with the target." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:378 +#: ../src/core/coreuserinputhandler.cpp:381 msgctxt "CoreUserInputHandler|" msgid "It is only possible to exchange keys in a query buffer." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:388 +#: ../src/core/coreuserinputhandler.cpp:391 #, qt-format msgctxt "CoreUserInputHandler|" msgid "Failed to initiate key exchange with %1." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:393 +#: ../src/core/coreuserinputhandler.cpp:396 #, qt-format msgctxt "CoreUserInputHandler|" msgid "Initiated key exchange with %1." msgstr "" -#: ../src/core/coreuserinputhandler.cpp:397 -#: ../src/core/coreuserinputhandler.cpp:628 +#: ../src/core/coreuserinputhandler.cpp:400 +#: ../src/core/coreuserinputhandler.cpp:631 msgctxt "CoreUserInputHandler|" msgid "" "Error: Setting an encryption key requires Quassel to have been built with " @@ -2341,13 +2413,13 @@ msgid "" "with QCA present." msgstr "错误：设置加密密钥要求编译的 Quassel 内建 Qt 加密架构(QCA)库支持。联系您的发行商查找带 QCA 支持的 Quassel 软件包，或者用现有的 QCA 重新编译 Quassel。" -#: ../src/core/coreuserinputhandler.cpp:556 +#: ../src/core/coreuserinputhandler.cpp:559 #, qt-format msgctxt "CoreUserInputHandler|" msgid "Starting query with %1" msgstr "" -#: ../src/core/coreuserinputhandler.cpp:616 +#: ../src/core/coreuserinputhandler.cpp:619 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /setkey sets the encryption key for nick or " @@ -2355,26 +2427,26 @@ msgid "" "it." msgstr "[用法] /setkey <昵称|频道> <密钥> 设置昵称或频道对应的加密密钥。在频道或查询缓冲区中时，使用 /setkey <密钥> 将设置相应于频道或缓存的密钥。" -#: ../src/core/coreuserinputhandler.cpp:625 +#: ../src/core/coreuserinputhandler.cpp:628 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 has been set." msgstr "%1 的密钥已经设置。" -#: ../src/core/coreuserinputhandler.cpp:654 +#: ../src/core/coreuserinputhandler.cpp:657 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /showkey shows the encryption key for nick or channel" " or just /showkey when in a channel or query." msgstr "[用法] /delkey <昵称|频道> 删除昵称或频道对应的加密密钥，在频道或查询中，只用 /delkey 即可。" -#: ../src/core/coreuserinputhandler.cpp:666 +#: ../src/core/coreuserinputhandler.cpp:669 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 is %2:%3" msgstr "" -#: ../src/core/coreuserinputhandler.cpp:794 +#: ../src/core/coreuserinputhandler.cpp:797 #, qt-format msgctxt "CoreUserInputHandler|" msgid "[Error] Could not encrypt your message: %1" @@ -2400,6 +2472,17 @@ msgctxt "CreateIdentityDlg|" msgid "Duplicate:" msgstr "重复：" +#: ../src/common/protocols/datastream/datastreampeer.cpp:115 +msgctxt "DataStreamPeer|" +msgid "Invalid handshake message!" +msgstr "" + +#: ../src/common/protocols/datastream/datastreampeer.cpp:162 +#, qt-format +msgctxt "DataStreamPeer|" +msgid "Unknown protocol message of type %1" +msgstr "" + #: ../src/qtui/ui/debugbufferviewoverlay.ui:13 msgctxt "DebugBufferViewOverlay|" msgid "Debug BufferView Overlay" @@ -2717,7 +2800,13 @@ msgctxt "EventStringifier|" msgid "Received CTCP-%1 answer from %2: %3" msgstr "" -#: ../src/core/eventstringifier.cpp:736 +#: ../src/core/eventstringifier.cpp:737 +#, qt-format +msgctxt "EventStringifier|" +msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time" +msgstr "" + +#: ../src/core/eventstringifier.cpp:740 #, qt-format msgctxt "EventStringifier|" msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time" @@ -2840,7 +2929,7 @@ msgctxt "HighlightSettingsPage|" msgid "Interface" msgstr "接口" -#: ../src/qtui/settingspages/highlightsettingspage.cpp:184 +#: ../src/qtui/settingspages/highlightsettingspage.cpp:192 msgctxt "HighlightSettingsPage|" msgid "this shouldn't be empty" msgstr "这项不能为空" @@ -3105,7 +3194,7 @@ msgid "minutes of being idle" msgstr "空闲的分钟数" #: ../src/qtui/settingspages/identityeditwidget.ui:399 -#: ../src/qtui/settingspages/identityeditwidget.cpp:238 +#: ../src/qtui/settingspages/identityeditwidget.cpp:244 msgctxt "IdentityEditWidget|" msgid "Advanced" msgstr "高级" @@ -3171,16 +3260,16 @@ msgid "Key Type:" msgstr "密钥类型：" #: ../src/qtui/settingspages/identityeditwidget.ui:605 -#: ../src/qtui/settingspages/identityeditwidget.cpp:353 -#: ../src/qtui/settingspages/identityeditwidget.cpp:365 +#: ../src/qtui/settingspages/identityeditwidget.cpp:364 +#: ../src/qtui/settingspages/identityeditwidget.cpp:376 msgctxt "IdentityEditWidget|" msgid "No Key loaded" msgstr "没有加载密钥" #: ../src/qtui/settingspages/identityeditwidget.ui:625 #: ../src/qtui/settingspages/identityeditwidget.ui:723 -#: ../src/qtui/settingspages/identityeditwidget.cpp:354 -#: ../src/qtui/settingspages/identityeditwidget.cpp:408 +#: ../src/qtui/settingspages/identityeditwidget.cpp:365 +#: ../src/qtui/settingspages/identityeditwidget.cpp:423 msgctxt "IdentityEditWidget|" msgid "Load" msgstr "加载" @@ -3197,8 +3286,8 @@ msgstr "组织：" #: ../src/qtui/settingspages/identityeditwidget.ui:663 #: ../src/qtui/settingspages/identityeditwidget.ui:697 -#: ../src/qtui/settingspages/identityeditwidget.cpp:406 -#: ../src/qtui/settingspages/identityeditwidget.cpp:407 +#: ../src/qtui/settingspages/identityeditwidget.cpp:421 +#: ../src/qtui/settingspages/identityeditwidget.cpp:422 msgctxt "IdentityEditWidget|" msgid "No Certificate loaded" msgstr "没有加载证书" @@ -3208,40 +3297,40 @@ msgctxt "IdentityEditWidget|" msgid "CommonName:" msgstr "常用名：" -#: ../src/qtui/settingspages/identityeditwidget.cpp:321 +#: ../src/qtui/settingspages/identityeditwidget.cpp:327 msgctxt "IdentityEditWidget|" msgid "Load a Key" msgstr "加载密钥" -#: ../src/qtui/settingspages/identityeditwidget.cpp:344 +#: ../src/qtui/settingspages/identityeditwidget.cpp:355 msgctxt "IdentityEditWidget|" msgid "Failed to read key" msgstr "" -#: ../src/qtui/settingspages/identityeditwidget.cpp:344 +#: ../src/qtui/settingspages/identityeditwidget.cpp:355 msgctxt "IdentityEditWidget|" msgid "" "Failed to read the key file. It is either incompatible or invalid. Note that" " the key file must not have a passphrase." msgstr "" -#: ../src/qtui/settingspages/identityeditwidget.cpp:359 +#: ../src/qtui/settingspages/identityeditwidget.cpp:370 msgctxt "IdentityEditWidget|" msgid "RSA" msgstr "RSA" -#: ../src/qtui/settingspages/identityeditwidget.cpp:362 +#: ../src/qtui/settingspages/identityeditwidget.cpp:373 msgctxt "IdentityEditWidget|" msgid "DSA" msgstr "DSA" -#: ../src/qtui/settingspages/identityeditwidget.cpp:367 -#: ../src/qtui/settingspages/identityeditwidget.cpp:413 +#: ../src/qtui/settingspages/identityeditwidget.cpp:378 +#: ../src/qtui/settingspages/identityeditwidget.cpp:433 msgctxt "IdentityEditWidget|" msgid "Clear" msgstr "清除" -#: ../src/qtui/settingspages/identityeditwidget.cpp:379 +#: ../src/qtui/settingspages/identityeditwidget.cpp:390 msgctxt "IdentityEditWidget|" msgid "Load a Certificate" msgstr "加载证书" @@ -3610,7 +3699,7 @@ msgctxt "InputWidget|" msgid "Clear Color" msgstr "清除颜色" -#: ../src/qtui/inputwidget.cpp:133 +#: ../src/qtui/inputwidget.cpp:136 msgctxt "InputWidget|" msgid "Focus Input Line" msgstr "聚焦输入行" @@ -3657,40 +3746,50 @@ msgstr "Emacs 按键绑定" #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127 msgctxt "InputWidgetSettingsPage|" +msgid "Enables line wrapping for input." +msgstr "" + +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130 +msgctxt "InputWidgetSettingsPage|" +msgid "Line wrapping" +msgstr "" + +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:143 +msgctxt "InputWidgetSettingsPage|" msgid "Multi-Line Editing" msgstr "多行编辑" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:160 msgctxt "InputWidgetSettingsPage|" msgid "Show at most" msgstr "最多显示" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:186 msgctxt "InputWidgetSettingsPage|" msgid "lines" msgstr "行" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:208 msgctxt "InputWidgetSettingsPage|" msgid "Enable scrollbars" msgstr "启用滚动条" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:227 msgctxt "InputWidgetSettingsPage|" msgid "Tab Completion" msgstr "Tab 补全" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235 msgctxt "InputWidgetSettingsPage|" msgid "Completion suffix:" msgstr "补全后缀：" -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:251 msgctxt "InputWidgetSettingsPage|" msgid ": " msgstr "： " -#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:262 +#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:278 msgctxt "InputWidgetSettingsPage|" msgid "Add space after nick when completing mid-sentence" msgstr "" @@ -3730,24 +3829,24 @@ msgctxt "IrcListModel|" msgid "Topic" msgstr "主题" -#: ../src/client/networkmodel.cpp:914 +#: ../src/client/networkmodel.cpp:953 msgctxt "IrcUserItem|" msgid " is away" msgstr " 状态为离开" -#: ../src/client/networkmodel.cpp:929 +#: ../src/client/networkmodel.cpp:968 #, qt-format msgctxt "IrcUserItem|" msgid "idling since %1" msgstr "空闲自从 %1" -#: ../src/client/networkmodel.cpp:932 +#: ../src/client/networkmodel.cpp:971 #, qt-format msgctxt "IrcUserItem|" msgid "login time: %1" msgstr "登录时间：%1" -#: ../src/client/networkmodel.cpp:935 +#: ../src/client/networkmodel.cpp:974 #, qt-format msgctxt "IrcUserItem|" msgid "server: %1" @@ -3879,7 +3978,7 @@ msgctxt "ItemViewSettingsPage|" msgid "Other activity" msgstr "其他活动" -#: ../src/qtui/knotificationbackend.cpp:130 +#: ../src/qtui/knotificationbackend.cpp:134 #, qt-format msgctxt "KNotificationBackend|" msgid "%n pending highlight(s)" @@ -3965,18 +4064,18 @@ msgctxt "KeySequenceWidget|" msgid "Reassign" msgstr "重新指派" -#: ../src/common/protocols/legacy/legacypeer.cpp:175 +#: ../src/common/protocols/legacy/legacypeer.cpp:136 msgctxt "LegacyPeer|" msgid "Invalid handshake message!" msgstr "" -#: ../src/common/protocols/legacy/legacypeer.cpp:246 +#: ../src/common/protocols/legacy/legacypeer.cpp:207 #, qt-format msgctxt "LegacyPeer|" msgid "Unknown protocol message of type %1" msgstr "" -#: ../src/common/protocols/legacy/legacypeer.cpp:295 +#: ../src/common/protocols/legacy/legacypeer.cpp:256 #, qt-format msgctxt "LegacyPeer|" msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)" @@ -4317,44 +4416,44 @@ msgctxt "MainWin|" msgid "Main Toolbar" msgstr "主工具栏" -#: ../src/qtui/mainwin.cpp:1058 +#: ../src/qtui/mainwin.cpp:1074 msgctxt "MainWin|" msgid "Connected to core." msgstr "已连接到核心。" -#: ../src/qtui/mainwin.cpp:1157 +#: ../src/qtui/mainwin.cpp:1173 msgctxt "MainWin|" msgid "Not connected to core." msgstr "未连接到核心。" -#: ../src/qtui/mainwin.cpp:1175 ../src/qtui/mainwin.cpp:1185 +#: ../src/qtui/mainwin.cpp:1191 ../src/qtui/mainwin.cpp:1201 msgctxt "MainWin|" msgid "Unencrypted Connection" msgstr "未加密的连接" -#: ../src/qtui/mainwin.cpp:1175 +#: ../src/qtui/mainwin.cpp:1191 msgctxt "MainWin|" msgid "Your client does not support SSL encryption" msgstr "您的客户端不支持 SSL 加密" -#: ../src/qtui/mainwin.cpp:1177 ../src/qtui/mainwin.cpp:1187 +#: ../src/qtui/mainwin.cpp:1193 ../src/qtui/mainwin.cpp:1203 msgctxt "MainWin|" msgid "" "Sensitive data, like passwords, will be transmitted unencrypted to your " "Quassel core." msgstr "像密码这样的敏感信息将以未加密的形式转送到您的 Quassel 核心。" -#: ../src/qtui/mainwin.cpp:1185 +#: ../src/qtui/mainwin.cpp:1201 msgctxt "MainWin|" msgid "Your core does not support SSL encryption" msgstr "您的核心不支持 SSL 加密" -#: ../src/qtui/mainwin.cpp:1203 ../src/qtui/mainwin.cpp:1224 +#: ../src/qtui/mainwin.cpp:1219 ../src/qtui/mainwin.cpp:1240 msgctxt "MainWin|" msgid "Untrusted Security Certificate" msgstr "不信任的安全证书" -#: ../src/qtui/mainwin.cpp:1204 +#: ../src/qtui/mainwin.cpp:1220 #, qt-format msgctxt "MainWin|" msgid "" @@ -4362,33 +4461,33 @@ msgid "" "following reasons:" msgstr "核心于 %1 提供的 SSL 证书不可信，原因如下：" -#: ../src/qtui/mainwin.cpp:1207 +#: ../src/qtui/mainwin.cpp:1223 msgctxt "MainWin|" msgid "Continue" msgstr "继续" -#: ../src/qtui/mainwin.cpp:1208 +#: ../src/qtui/mainwin.cpp:1224 msgctxt "MainWin|" msgid "Show Certificate" msgstr "显示证书" -#: ../src/qtui/mainwin.cpp:1225 +#: ../src/qtui/mainwin.cpp:1241 msgctxt "MainWin|" msgid "" "Would you like to accept this certificate forever without being prompted?" msgstr "您想要永远接受此证书而不再提醒吗？" -#: ../src/qtui/mainwin.cpp:1227 +#: ../src/qtui/mainwin.cpp:1243 msgctxt "MainWin|" msgid "Current Session Only" msgstr "只对当前会话" -#: ../src/qtui/mainwin.cpp:1228 +#: ../src/qtui/mainwin.cpp:1244 msgctxt "MainWin|" msgid "Forever" msgstr "永远" -#: ../src/qtui/mainwin.cpp:1239 +#: ../src/qtui/mainwin.cpp:1255 msgctxt "MainWin|" msgid "Core Connection Error" msgstr "核心连接错误" @@ -4416,7 +4515,7 @@ msgid "Do you really want to paste %n line(s)?" msgid_plural "Do you really want to paste %n line(s)?" msgstr[0] "您真的想粘贴 %n 行吗？" -#: ../src/uisupport/multilineedit.cpp:727 +#: ../src/uisupport/multilineedit.cpp:731 msgctxt "MultiLineEdit|" msgid "Paste Protection" msgstr "粘贴保护" @@ -4481,35 +4580,35 @@ msgctxt "NetworkEditDlg|" msgid "Add Network" msgstr "添加网络" -#: ../src/client/networkmodel.cpp:213 +#: ../src/client/networkmodel.cpp:216 ../src/client/networkmodel.cpp:219 #, qt-format msgctxt "NetworkItem|" msgid "Server: %1" msgstr "服务器：%1" -#: ../src/client/networkmodel.cpp:214 +#: ../src/client/networkmodel.cpp:221 #, qt-format msgctxt "NetworkItem|" msgid "Users: %1" msgstr "用户：%1" -#: ../src/client/networkmodel.cpp:217 +#: ../src/client/networkmodel.cpp:224 #, qt-format msgctxt "NetworkItem|" msgid "Lag: %1 msecs" msgstr "延迟：%1 毫秒" -#: ../src/client/networkmodel.cpp:963 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Chat" msgstr "聊天" -#: ../src/client/networkmodel.cpp:963 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Topic" msgstr "主题" -#: ../src/client/networkmodel.cpp:963 +#: ../src/client/networkmodel.cpp:1002 msgctxt "NetworkModel|" msgid "Nick Count" msgstr "昵称账户" @@ -5126,25 +5225,25 @@ msgctxt "Quassel::secondsToString()|" msgid "sec" msgstr "秒" -#: ../src/client/networkmodel.cpp:482 +#: ../src/client/networkmodel.cpp:497 #, qt-format msgctxt "QueryBufferItem|" msgid "Query with %1" msgstr "通过 %1 查询" -#: ../src/client/networkmodel.cpp:500 +#: ../src/client/networkmodel.cpp:515 #, qt-format msgctxt "QueryBufferItem|" msgid "idling since %1" msgstr "空闲自从 %1" -#: ../src/client/networkmodel.cpp:503 +#: ../src/client/networkmodel.cpp:518 #, qt-format msgctxt "QueryBufferItem|" msgid "login time: %1" msgstr "登录时间：%1" -#: ../src/client/networkmodel.cpp:506 +#: ../src/client/networkmodel.cpp:521 #, qt-format msgctxt "QueryBufferItem|" msgid "server: %1" @@ -5161,6 +5260,11 @@ msgctxt "ReceiveFileDlg|" msgid "%1 wants to send you a file:
%2 (%3 bytes)" msgstr "" +#: ../src/common/remotepeer.cpp:69 +msgctxt "RemotePeer|" +msgid "Disconnecting..." +msgstr "" + #: ../src/qtui/settingspages/saveidentitiesdlg.ui:13 msgctxt "SaveIdentitiesDlg|" msgid "Sync With Core" @@ -5192,7 +5296,7 @@ msgid "Server address:" msgstr "服务器地址：" #: ../src/qtui/settingspages/servereditdlg.ui:45 -#: ../src/qtui/settingspages/servereditdlg.ui:227 +#: ../src/qtui/settingspages/servereditdlg.ui:181 msgctxt "ServerEditDlg|" msgid "Port:" msgstr "端口：" @@ -5212,69 +5316,42 @@ msgctxt "ServerEditDlg|" msgid "Advanced" msgstr "高级" -#: ../src/qtui/settingspages/servereditdlg.ui:140 -msgctxt "ServerEditDlg|" -msgid "SSL Version:" -msgstr "SSL 版本：" - -#: ../src/qtui/settingspages/servereditdlg.ui:147 -msgctxt "ServerEditDlg|" -msgid "" -"Do not change unless you're going to connect to a server not supporting " -"SSLv3!" -msgstr "除非您要连接一个不支持 SSLv3 的服务器，否则不要改动！" - -#: ../src/qtui/settingspages/servereditdlg.ui:151 -msgctxt "ServerEditDlg|" -msgid "SSLv3 (default)" -msgstr "SSLv3 (默认)" - -#: ../src/qtui/settingspages/servereditdlg.ui:156 -msgctxt "ServerEditDlg|" -msgid "SSLv2" -msgstr "SSLv2" - -#: ../src/qtui/settingspages/servereditdlg.ui:161 -msgctxt "ServerEditDlg|" -msgid "TLSv1" -msgstr "TLSv1" - -#: ../src/qtui/settingspages/servereditdlg.ui:171 +#: ../src/qtui/settingspages/servereditdlg.ui:125 msgctxt "ServerEditDlg|" msgid "Use a Proxy" msgstr "使用代理" -#: ../src/qtui/settingspages/servereditdlg.ui:188 +#: ../src/qtui/settingspages/servereditdlg.ui:142 msgctxt "ServerEditDlg|" msgid "Proxy Type:" msgstr "代理类型：" -#: ../src/qtui/settingspages/servereditdlg.ui:196 +#: ../src/qtui/settingspages/servereditdlg.ui:150 msgctxt "ServerEditDlg|" msgid "Socks 5" msgstr "Socks 5" -#: ../src/qtui/settingspages/servereditdlg.ui:201 +#: ../src/qtui/settingspages/servereditdlg.ui:155 msgctxt "ServerEditDlg|" msgid "HTTP" msgstr "HTTP" -#: ../src/qtui/settingspages/servereditdlg.ui:213 +#: ../src/qtui/settingspages/servereditdlg.ui:167 msgctxt "ServerEditDlg|" msgid "Proxy Host:" msgstr "代理主机：" -#: ../src/qtui/settingspages/servereditdlg.ui:220 +#: ../src/qtui/settingspages/servereditdlg.ui:174 msgctxt "ServerEditDlg|" msgid "localhost" msgstr "localhost" -#: ../src/qtui/settingspages/servereditdlg.ui:251 +#: ../src/qtui/settingspages/servereditdlg.ui:205 msgctxt "ServerEditDlg|" msgid "Proxy Username:" msgstr "代理用户名：" -#: ../src/qtui/settingspages/servereditdlg.ui:261 +#: ../src/qtui/settingspages/servereditdlg.ui:215 msgctxt "ServerEditDlg|" msgid "Proxy Password:" msgstr "代理密码：" @@ -5416,7 +5493,7 @@ msgctxt "ShortcutsSettingsPage|" msgid "Shortcuts" msgstr "快捷键" -#: ../src/common/signalproxy.cpp:758 +#: ../src/common/signalproxy.cpp:770 msgctxt "SignalProxy|" msgid "Disconnecting" msgstr "正在断开" @@ -5500,7 +5577,6 @@ msgid "" msgstr "要在连接网络后自动加入的一组 IRC 频道" #: ../src/qtui/snorenotificationbackend.cpp:60 -#: ../src/qtui/snorenotificationbackend.cpp:104 msgctxt "SnoreNotificationBackend|" msgid "Private Message" msgstr "" @@ -5651,7 +5727,7 @@ msgctxt "SslInfoDlg|" msgid "%1 to %2" msgstr "%1 到 %2" -#: ../src/client/networkmodel.h:150 +#: ../src/client/networkmodel.h:151 msgctxt "StatusBufferItem|" msgid "Status Buffer" msgstr "状态缓存" @@ -5853,13 +5929,13 @@ msgctxt "TopicWidget|" msgid "..." msgstr "..." -#: ../src/qtui/topicwidget.cpp:120 +#: ../src/qtui/topicwidget.cpp:121 ../src/qtui/topicwidget.cpp:127 #, qt-format msgctxt "TopicWidget|" msgid "Users: %1" msgstr "用户：%1" -#: ../src/qtui/topicwidget.cpp:121 +#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128 #, qt-format msgctxt "TopicWidget|" msgid "Lag: %1 msecs" @@ -5908,149 +5984,149 @@ msgstr "话题组件" #. Topic Message #. ---------- #. Invite Message -#: ../src/uisupport/uistyle.cpp:665 ../src/uisupport/uistyle.cpp:668 -#: ../src/uisupport/uistyle.cpp:709 ../src/uisupport/uistyle.cpp:712 -#: ../src/uisupport/uistyle.cpp:715 ../src/uisupport/uistyle.cpp:724 -#: ../src/uisupport/uistyle.cpp:758 +#: ../src/uisupport/uistyle.cpp:669 ../src/uisupport/uistyle.cpp:672 +#: ../src/uisupport/uistyle.cpp:713 ../src/uisupport/uistyle.cpp:716 +#: ../src/uisupport/uistyle.cpp:719 ../src/uisupport/uistyle.cpp:728 +#: ../src/uisupport/uistyle.cpp:762 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%1" msgstr "%1" #. Action Message -#: ../src/uisupport/uistyle.cpp:671 +#: ../src/uisupport/uistyle.cpp:675 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN %2" msgstr "%DN%1%DN %2" #. Nick Message -#: ../src/uisupport/uistyle.cpp:675 +#: ../src/uisupport/uistyle.cpp:679 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "You are now known as %DN%1%DN" msgstr "您现在叫做 %DN%1%DN" -#: ../src/uisupport/uistyle.cpp:676 +#: ../src/uisupport/uistyle.cpp:680 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN is now known as %DN%2%DN" msgstr "%DN%1%DN 现在叫 %DN%2%DN" #. Mode Message -#: ../src/uisupport/uistyle.cpp:680 +#: ../src/uisupport/uistyle.cpp:684 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "User mode: %DM%1%DM" msgstr "用户模式：%DM%1%DM" -#: ../src/uisupport/uistyle.cpp:681 +#: ../src/uisupport/uistyle.cpp:685 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "Mode %DM%1%DM by %DN%2%DN" msgstr "由 %DN%2%DN 设定模式 %DM%1%DM" #. Join Message -#: ../src/uisupport/uistyle.cpp:685 +#: ../src/uisupport/uistyle.cpp:689 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC" msgstr "%DN%1%DN %DH(%2@%3)%DH 已加入 %DC%4%DC" #. Part Message -#: ../src/uisupport/uistyle.cpp:688 +#: ../src/uisupport/uistyle.cpp:692 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC" msgstr "%DN%1%DN %DH(%2@%3)%DH 已离开 %DC%4%DC" #. Quit Message -#: ../src/uisupport/uistyle.cpp:693 +#: ../src/uisupport/uistyle.cpp:697 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN %DH(%2@%3)%DH has quit" msgstr "%DN%1%DN %DH(%2@%3)%DH 已退出" #. Kick Message -#: ../src/uisupport/uistyle.cpp:701 +#: ../src/uisupport/uistyle.cpp:705 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC" msgstr "%DN%1%DN 已将 %DN%2%DN 踢出 %DC%3%DC" #. Day Change Message -#: ../src/uisupport/uistyle.cpp:719 +#: ../src/uisupport/uistyle.cpp:723 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "{Day changed to %1}" msgstr "{日期更改为 %1}" -#: ../src/uisupport/uistyle.cpp:733 +#: ../src/uisupport/uistyle.cpp:737 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: " msgstr "" -#: ../src/uisupport/uistyle.cpp:737 ../src/uisupport/uistyle.cpp:753 +#: ../src/uisupport/uistyle.cpp:741 ../src/uisupport/uistyle.cpp:757 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN (%2 more)" msgstr "%DN%1%DN (还有 %2)" -#: ../src/uisupport/uistyle.cpp:748 +#: ../src/uisupport/uistyle.cpp:752 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: " msgstr "" -#: ../src/uisupport/uistyle.cpp:760 ../src/uisupport/uistyle.cpp:808 +#: ../src/uisupport/uistyle.cpp:764 ../src/uisupport/uistyle.cpp:812 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "[%1]" msgstr "[%1]" -#: ../src/uisupport/uistyle.cpp:806 +#: ../src/uisupport/uistyle.cpp:810 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "<%1>" msgstr "<%1>" -#: ../src/client/networkmodel.cpp:786 +#: ../src/client/networkmodel.cpp:825 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Owner(s)" msgid_plural "%n Owner(s)" msgstr[0] "%n 位用户" -#: ../src/client/networkmodel.cpp:788 +#: ../src/client/networkmodel.cpp:827 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Admin(s)" msgid_plural "%n Admin(s)" msgstr[0] "%n 位管理员" -#: ../src/client/networkmodel.cpp:790 +#: ../src/client/networkmodel.cpp:829 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Operator(s)" msgid_plural "%n Operator(s)" msgstr[0] "%n 位用户" -#: ../src/client/networkmodel.cpp:792 +#: ../src/client/networkmodel.cpp:831 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Half-Op(s)" msgid_plural "%n Half-Op(s)" msgstr[0] "" -#: ../src/client/networkmodel.cpp:794 +#: ../src/client/networkmodel.cpp:833 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Voiced" msgid_plural "%n Voiced" msgstr[0] "发言" -#: ../src/client/networkmodel.cpp:796 +#: ../src/client/networkmodel.cpp:835 #, qt-format msgctxt "UserCategoryItem|" msgid "%n User(s)"