X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fzh_CN.po;h=cac8f04b2e4706ef36a3e454b9e1f21de78348c8;hp=e2a11567696c1949fd9489ab159e0d3ef6127bec;hb=ec86ead09bc7a03e0f264dfc4e68c385d8bec7e3;hpb=ef4982a251970f8e7ca6a431de70c1ed3ef81788 diff --git a/po/zh_CN.po b/po/zh_CN.po index e2a11567..cac8f04b 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,19 +1,20 @@ # # Translators: -# Daniel Albers , 2011. -# 冯超 , 2010. +# Daniel Albers , 2011 +# leonfeng , 2010 +# leonfeng , 2010 msgid "" msgstr "" "Project-Id-Version: Quassel IRC\n" "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n" -"PO-Revision-Date: 2012-02-14 23:41+0000\n" +"PO-Revision-Date: 2014-02-22 09:00+0000\n" "Last-Translator: Daniel Albers \n" -"Language-Team: \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/quassel/language/zh_CN/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0\n" +"Plural-Forms: nplurals=1; plural=0;\n" "X-Qt-Contexts: true\n" #: ../src/qtui/ui/aboutdlg.ui:17 @@ -59,16 +60,16 @@ msgctxt "AboutDlg|" msgid "&Thanks To" msgstr "致谢(&T)" -#: ../src/qtui/aboutdlg.cpp:32 +#: ../src/qtui/aboutdlg.cpp:33 #, qt-format msgctxt "AboutDlg|" msgid "Version: %1
Protocol version: %2
Built: %3" msgstr "版本 %1
协议版本： %2
编译： %3" -#: ../src/qtui/aboutdlg.cpp:46 +#: ../src/qtui/aboutdlg.cpp:49 msgctxt "AboutDlg|" msgid "" -"A modern, distributed IRC Client

©2005-2012 by the " +"A modern, distributed IRC Client

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

Quassel IRC is dual-" @@ -79,21 +80,21 @@ msgid "" "href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL.

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

©2005-2012 Quassel 项目
http://quassel-irc.org
#quassel on Freenode

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

请使用 http://bugs.quassel-irc.org 报告故障。" +msgstr "一个现代的、分布式的 IRC 客户端。

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

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

请使用 http://bugs.quassel-irc.org 报告故障。" -#: ../src/qtui/aboutdlg.cpp:62 +#: ../src/qtui/aboutdlg.cpp:67 msgctxt "AboutDlg|" msgid "Quassel IRC is mainly developed by:" msgstr "Quassel IRC 主要由下人员开发：" -#: ../src/qtui/aboutdlg.cpp:77 +#: ../src/qtui/aboutdlg.cpp:84 msgctxt "AboutDlg|" msgid "" "We would like to thank the following contributors (in alphabetical order) " "and everybody we forgot to mention here:" msgstr "我们感谢下列贡献者(按字母顺序排列)和所有我们忘记在这里提及的人们：" -#: ../src/qtui/aboutdlg.cpp:135 +#: ../src/qtui/aboutdlg.cpp:201 msgctxt "AboutDlg|" msgid "" "Special thanks goes to:
" msgstr "特别感谢：
 John \"nox\" Hand
提供的原始 Quassel 图标 - The All-Seeing Eye
 The Oxygen Team
创作的所有 Quassel 艺术设计
 Qt 软件，正式名为 Trolltech
所创造的 Qt 和 Qtopia，以及赞助 QuasselTopia 开发所提供的 Greenphones 及更多
让 Qt 生机勃勃、提供 N810s 协助 Quassel Mobile 开发
" -#: ../src/core/abstractsqlstorage.cpp:115 +#: ../src/core/abstractsqlstorage.cpp:127 #, qt-format msgctxt "AbstractSqlStorage|" msgid "" "Installed Schema (version %1) is not up to date. Upgrading to version %2..." msgstr "安装的方案过时(版本为 %1)。正在升级为 %2 版本..." -#: ../src/core/abstractsqlstorage.cpp:117 +#: ../src/core/abstractsqlstorage.cpp:129 msgctxt "AbstractSqlStorage|" msgid "Upgrade failed..." msgstr "升级失败…" -#: ../src/qtui/settingspages/aliasesmodel.cpp:55 +#: ../src/qtui/settingspages/aliasesmodel.cpp:57 msgctxt "AliasesModel|" msgid "" "The shortcut for the alias
It can be used as a regular slash " "command.

Example: \"foo\" can be used per /foo" msgstr "" -#: ../src/qtui/settingspages/aliasesmodel.cpp:59 +#: ../src/qtui/settingspages/aliasesmodel.cpp:61 msgctxt "AliasesModel|" msgid "" "The string the shortcut will be expanded to
special " @@ -145,12 +146,12 @@ msgid "" "All 1 2 3\" when called like /test 1 2 3" msgstr "" -#: ../src/qtui/settingspages/aliasesmodel.cpp:170 +#: ../src/qtui/settingspages/aliasesmodel.cpp:185 msgctxt "AliasesModel|" msgid "Alias" msgstr "别名" -#: ../src/qtui/settingspages/aliasesmodel.cpp:171 +#: ../src/qtui/settingspages/aliasesmodel.cpp:186 msgctxt "AliasesModel|" msgid "Expansion" msgstr "扩大" @@ -211,7 +212,7 @@ msgid "" msgstr "<尚未翻译>" #: ../src/qtui/settingspages/appearancesettingspage.ui:52 -#: ../src/qtui/settingspages/appearancesettingspage.cpp:74 +#: ../src/qtui/settingspages/appearancesettingspage.cpp:76 msgctxt "AppearanceSettingsPage|" msgid "" msgstr "＜系统默认＞" @@ -286,7 +287,7 @@ msgctxt "AppearanceSettingsPage|" msgid "Interface" msgstr "接口" -#: ../src/qtui/settingspages/appearancesettingspage.cpp:225 +#: ../src/qtui/settingspages/appearancesettingspage.cpp:242 msgctxt "AppearanceSettingsPage|" msgid "Please choose a stylesheet file" msgstr "请选择一个样式表文件" @@ -296,12 +297,12 @@ msgctxt "AwayLogView|" msgid "Away Log" msgstr "离开日志" -#: ../src/qtui/awaylogview.cpp:44 +#: ../src/qtui/awaylogview.cpp:46 msgctxt "AwayLogView|" msgid "Show Network Name" msgstr "显示网络名称" -#: ../src/qtui/awaylogview.cpp:49 +#: ../src/qtui/awaylogview.cpp:51 msgctxt "AwayLogView|" msgid "Show Buffer Name" msgstr "显示缓冲区名称" @@ -431,18 +432,18 @@ msgctxt "BacklogSettingsPage|" msgid "Backlog Fetching" msgstr "储备取回" -#: ../src/client/networkmodel.cpp:346 +#: ../src/client/networkmodel.cpp:386 #, qt-format msgctxt "BufferItem|" msgid "

%1 - %2

" msgstr "

%1 - %2

" -#: ../src/uisupport/bufferview.cpp:251 +#: ../src/uisupport/bufferview.cpp:272 msgctxt "BufferView|" msgid "Merge buffers permanently?" msgstr "永久合并缓冲区？" -#: ../src/uisupport/bufferview.cpp:252 +#: ../src/uisupport/bufferview.cpp:273 #, qt-format msgctxt "BufferView|" msgid "" @@ -460,12 +461,12 @@ msgctxt "BufferViewEditDlg|" msgid "Please enter a name for the chat list:" msgstr "请在聊天列表中输入一个名字：" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:575 msgctxt "BufferViewEditDlg|" msgid "Add Chat List" msgstr "增加聊天列表" -#: ../src/uisupport/bufferviewfilter.cpp:52 +#: ../src/uisupport/bufferviewfilter.cpp:54 msgctxt "BufferViewFilter|" msgid "Show / Hide Chats" msgstr "显示/隐藏聊天" @@ -501,7 +502,7 @@ msgid "Network:" msgstr "网络：" #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100 -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:123 msgctxt "BufferViewSettingsPage|" msgid "All" msgstr "所有" @@ -583,12 +584,12 @@ msgctxt "BufferViewSettingsPage|" msgid "Custom Chat Lists" msgstr "自定义聊天列表" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:378 msgctxt "BufferViewSettingsPage|" msgid "Delete Chat List?" msgstr "删除聊天列表？" -#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343 +#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:379 #, qt-format msgctxt "BufferViewSettingsPage|" msgid "Do you really want to delete the chat list \"%1\"?" @@ -599,61 +600,61 @@ msgctxt "BufferViewWidget|" msgid "BufferView" msgstr "缓冲区查看" -#: ../src/qtui/bufferwidget.cpp:79 +#: ../src/qtui/bufferwidget.cpp:78 msgctxt "BufferWidget|" msgid "Zoom In" msgstr "放大" -#: ../src/qtui/bufferwidget.cpp:85 +#: ../src/qtui/bufferwidget.cpp:84 msgctxt "BufferWidget|" msgid "Zoom Out" msgstr "缩小" -#: ../src/qtui/bufferwidget.cpp:90 +#: ../src/qtui/bufferwidget.cpp:89 msgctxt "BufferWidget|" msgid "Actual Size" msgstr "实际尺寸" -#: ../src/qtui/bufferwidget.cpp:94 +#: ../src/qtui/bufferwidget.cpp:93 msgctxt "BufferWidget|" msgid "Set Marker Line" msgstr "设置标记线" -#: ../src/qtui/bufferwidget.cpp:98 +#: ../src/qtui/bufferwidget.cpp:97 msgctxt "BufferWidget|" msgid "Go to Marker Line" msgstr "转到标记线" -#: ../src/client/networkmodel.cpp:503 +#: ../src/client/networkmodel.cpp:566 #, qt-format msgctxt "ChannelBufferItem|" msgid "Channel %1" msgstr "频道 %1" -#: ../src/client/networkmodel.cpp:506 +#: ../src/client/networkmodel.cpp:569 #, qt-format msgctxt "ChannelBufferItem|" msgid "Users: %1" msgstr "用户： %1" -#: ../src/client/networkmodel.cpp:510 +#: ../src/client/networkmodel.cpp:573 #, qt-format msgctxt "ChannelBufferItem|" msgid "Mode: %1" msgstr "模式： %1" -#: ../src/client/networkmodel.cpp:521 +#: ../src/client/networkmodel.cpp:584 #, qt-format msgctxt "ChannelBufferItem|" msgid "Topic: %1" msgstr "方式： %1" -#: ../src/client/networkmodel.cpp:525 +#: ../src/client/networkmodel.cpp:589 msgctxt "ChannelBufferItem|" msgid "Not active
Double-click to join" msgstr "非活跃
双击加入" -#: ../src/client/networkmodel.cpp:528 +#: ../src/client/networkmodel.cpp:592 #, qt-format msgctxt "ChannelBufferItem|" msgid "

%1

" @@ -673,7 +674,7 @@ msgstr "搜索模式：" msgctxt "ChannelListDlg|" msgid "" "Toggle between simple and advanced mode.\n" -"Advanced mode allows to pass search strings to the IRC Server." +"Advanced mode allows one to pass search strings to the IRC Server." msgstr "在简单和高级模式之间切换。\n高级模式允许发送搜索字符串到IRC服务器。" #: ../src/qtui/ui/channellistdlg.ui:62 @@ -740,7 +741,7 @@ msgid "Move selected buffers to the right" msgstr "移动所选的缓冲区到右边" #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133 -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:258 msgctxt "ChatMonitorSettingsPage|" msgid "Show:" msgstr "显示：" @@ -771,42 +772,42 @@ msgctxt "ChatMonitorSettingsPage|" msgid "Chat Monitor" msgstr "聊天监视器" -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59 msgctxt "ChatMonitorSettingsPage|" msgid "Opt In" msgstr "Opt In" -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60 msgctxt "ChatMonitorSettingsPage|" msgid "Opt Out" msgstr "Opt Out" -#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239 +#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:261 msgctxt "ChatMonitorSettingsPage|" msgid "Ignore:" msgstr "忽略：" -#: ../src/qtui/chatmonitorview.cpp:52 +#: ../src/qtui/chatmonitorview.cpp:54 msgctxt "ChatMonitorView|" msgid "Show Own Messages" msgstr "显示我的信息" -#: ../src/qtui/chatmonitorview.cpp:59 +#: ../src/qtui/chatmonitorview.cpp:61 msgctxt "ChatMonitorView|" msgid "Show Network Name" msgstr "显示网络名称" -#: ../src/qtui/chatmonitorview.cpp:64 +#: ../src/qtui/chatmonitorview.cpp:66 msgctxt "ChatMonitorView|" msgid "Show Buffer Name" msgstr "显示缓冲区名称" -#: ../src/qtui/chatmonitorview.cpp:71 +#: ../src/qtui/chatmonitorview.cpp:73 msgctxt "ChatMonitorView|" msgid "Configure..." msgstr "配置..." -#: ../src/qtui/chatscene.cpp:743 +#: ../src/qtui/chatscene.cpp:813 msgctxt "ChatScene|" msgid "Copy Selection" msgstr "复制选择" @@ -853,141 +854,154 @@ msgctxt "ChatViewSettingsPage|" msgid "Timestamp format:" msgstr "时间戳格式：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:32 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:29 +msgctxt "ChatViewSettingsPage|" +msgid "" +"

Usage examples:

\n" +"\n" +"\n" +"\n" +"\n" +"\n" +"
dd.MM.yyyy21.05.2001
ddd MMMM d yyTue May 21 01
hh:mm:ss.zzz14:13:09.042
h:m:s ap2:13:9 pm
\n" +"" +msgstr "" + +#: ../src/qtui/settingspages/chatviewsettingspage.ui:42 msgctxt "ChatViewSettingsPage|" msgid "[hh:mm:ss]" msgstr "［时：分：秒］" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:59 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:69 msgctxt "ChatViewSettingsPage|" msgid "Custom chat window font:" msgstr "自定义聊天窗口字体：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:92 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:102 msgctxt "ChatViewSettingsPage|" msgid "Show colored text in the chat window" msgstr "在聊天窗口中显示彩色的文本" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:95 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:105 msgctxt "ChatViewSettingsPage|" msgid "Allow colored text (mIRC color codes)" msgstr "允许彩色文本（mIRC的颜色代码）" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:111 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:121 msgctxt "ChatViewSettingsPage|" msgid "" "Show a website preview window when hovering the mouse over a web address" msgstr "当鼠标停留在网页地址上时显示预览窗口" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:114 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:124 msgctxt "ChatViewSettingsPage|" msgid "Show previews of webpages on URL hover" msgstr "当鼠标停留在网页地址上时显示预览窗口" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:130 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:140 msgctxt "ChatViewSettingsPage|" msgid "" "Set the marker line to the bottom of the current chat window when selecting " "another channel" msgstr "在选择另一个频道时，在当前聊天窗口的底部设置标记线" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:133 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:143 msgctxt "ChatViewSettingsPage|" msgid "Set marker line automatically when switching chats" msgstr "在切换聊天时自动设置标记线" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:149 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:159 msgctxt "ChatViewSettingsPage|" msgid "Custom Colors" msgstr "自定义颜色" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:167 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:177 msgctxt "ChatViewSettingsPage|" msgid "Action:" msgstr "动作：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:174 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:198 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:222 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:259 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:283 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:314 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:338 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:362 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:386 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:403 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:443 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:460 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:477 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:494 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:511 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:528 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:545 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:562 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:579 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:596 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:613 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:630 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:647 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:664 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:681 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:698 -#: ../src/qtui/settingspages/chatviewsettingspage.ui:726 +#: ../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 msgctxt "ChatViewSettingsPage|" msgid "..." msgstr "..." -#: ../src/qtui/settingspages/chatviewsettingspage.ui:191 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:201 msgctxt "ChatViewSettingsPage|" msgid "Timestamp:" msgstr "时间戳：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:215 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:225 msgctxt "ChatViewSettingsPage|" msgid "Channel message:" msgstr "频道消息：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:252 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:262 msgctxt "ChatViewSettingsPage|" msgid "Highlight foreground:" msgstr "突出显示前景色：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:276 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:286 msgctxt "ChatViewSettingsPage|" msgid "Command message:" msgstr "命令消息：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:300 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:310 msgctxt "ChatViewSettingsPage|" msgid "Highlight background:" msgstr "突出显示背景色：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:307 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:317 msgctxt "ChatViewSettingsPage|" msgid "Server message:" msgstr "服务器消息：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:331 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:341 msgctxt "ChatViewSettingsPage|" msgid "Marker line:" msgstr "标记线：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:355 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:365 msgctxt "ChatViewSettingsPage|" msgid "Error message:" msgstr "错误信息：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:379 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:389 msgctxt "ChatViewSettingsPage|" msgid "Background:" msgstr "背景色：" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:423 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:433 msgctxt "ChatViewSettingsPage|" msgid "Use Sender Coloring" msgstr "使用发送方的颜色" -#: ../src/qtui/settingspages/chatviewsettingspage.ui:719 +#: ../src/qtui/settingspages/chatviewsettingspage.ui:729 msgctxt "ChatViewSettingsPage|" msgid "Own messages:" msgstr "自己的消息：" @@ -1004,31 +1018,87 @@ msgstr "聊天视图" #: ../src/qtui/settingspages/chatviewsettingspage.cpp:41 msgctxt "ChatViewSettingsPage|" -msgid "You need at 0.6 quasselcore to use this feature" +msgid "You need at least version 0.6 of quasselcore to use this feature" msgstr "您至少需要有 0.6 版的 quasselcore 才能使用此功能" -#: ../src/client/client.cpp:270 +#: ../src/client/client.cpp:320 msgctxt "Client|" msgid "Identity already exists in client!" msgstr "客户端中已有该身份！" -#: ../src/client/clientbacklogmanager.cpp:161 +#: ../src/client/clientauthhandler.cpp:61 +#: ../src/client/clientauthhandler.cpp:256 +msgctxt "ClientAuthHandler|" +msgid "Unencrypted connection canceled" +msgstr "已取消了未加密连接" + +#: ../src/client/clientauthhandler.cpp:84 +#, qt-format +msgctxt "ClientAuthHandler|" +msgid "Connecting to %1..." +msgstr "正在连接 %1..." + +#: ../src/client/clientauthhandler.cpp:154 +msgctxt "ClientAuthHandler|" +msgid "Synchronizing to core..." +msgstr "正在与核心同步..." + +#: ../src/client/clientauthhandler.cpp:167 +#, qt-format +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." +msgstr "" + +#: ../src/client/clientauthhandler.cpp:169 +msgctxt "ClientAuthHandler|" +msgid "Incompatible protocol version, connection to core refused" +msgstr "" + +#: ../src/client/clientauthhandler.cpp:176 +msgctxt "ClientAuthHandler|" +msgid "The core refused connection from this client" +msgstr "" + +#: ../src/client/clientauthhandler.cpp:207 +msgctxt "ClientAuthHandler|" +msgid "Unencrypted connection cancelled" +msgstr "" + +#: ../src/client/clientauthhandler.cpp:275 +#, qt-format +msgctxt "ClientAuthHandler|" +msgid "Connected to %1" +msgstr "已连接到 %1" + +#: ../src/client/clientauthhandler.cpp:317 +msgctxt "ClientAuthHandler|" +msgid "Logging in..." +msgstr "正在登录..." + +#: ../src/client/clientauthhandler.cpp:322 +msgctxt "ClientAuthHandler|" +msgid "Login canceled" +msgstr "登录已取消" + +#: ../src/client/clientbacklogmanager.cpp:178 #, qt-format msgctxt "ClientBacklogManager|" msgid "Processed %1 messages in %2 seconds." msgstr "已处理 %1 条消息，用时 %2 秒。" -#: ../src/client/clientbufferviewmanager.cpp:52 +#: ../src/client/clientbufferviewmanager.cpp:60 msgctxt "ClientBufferViewManager|" msgid "All Chats" msgstr "所有聊天" -#: ../src/client/clientuserinputhandler.cpp:88 +#: ../src/client/clientuserinputhandler.cpp:98 msgctxt "ClientUserInputHandler|" msgid "/JOIN expects a channel" msgstr "/JOIN 应给出一个频道" -#: ../src/client/clientuserinputhandler.cpp:98 +#: ../src/client/clientuserinputhandler.cpp:110 msgctxt "ClientUserInputHandler|" msgid "/QUERY expects at least a nick" msgstr "/QUERY 应给出至少一个昵称" @@ -1097,227 +1167,242 @@ msgctxt "ConnectionSettingsPage|" msgid "Minimum delay between requests:" msgstr "请求之间的最小延时：" +#: ../src/qtui/settingspages/connectionsettingspage.ui:250 +msgctxt "ConnectionSettingsPage|" +msgid "Enable standard-compliant CTCP behavior" +msgstr "" + #: ../src/qtui/settingspages/connectionsettingspage.cpp:27 msgctxt "ConnectionSettingsPage|" msgid "IRC" msgstr "IRC" -#: ../src/qtui/chatitem.cpp:683 +#: ../src/qtui/chatitem.cpp:803 msgctxt "ContentsChatItem|" msgid "Copy Link Address" msgstr "复制链接地址" -#: ../src/uisupport/contextmenuactionprovider.cpp:38 +#: ../src/uisupport/contextmenuactionprovider.cpp:39 msgctxt "ContextMenuActionProvider|" msgid "Connect" msgstr "连接" -#: ../src/uisupport/contextmenuactionprovider.cpp:39 +#: ../src/uisupport/contextmenuactionprovider.cpp:40 msgctxt "ContextMenuActionProvider|" msgid "Disconnect" msgstr "断开" -#: ../src/uisupport/contextmenuactionprovider.cpp:41 +#: ../src/uisupport/contextmenuactionprovider.cpp:42 msgctxt "ContextMenuActionProvider|" msgid "Join" msgstr "加入" -#: ../src/uisupport/contextmenuactionprovider.cpp:42 +#: ../src/uisupport/contextmenuactionprovider.cpp:43 msgctxt "ContextMenuActionProvider|" msgid "Part" msgstr "离开" -#: ../src/uisupport/contextmenuactionprovider.cpp:43 +#: ../src/uisupport/contextmenuactionprovider.cpp:44 msgctxt "ContextMenuActionProvider|" msgid "Delete Chat(s)..." msgstr "删除聊天..." -#: ../src/uisupport/contextmenuactionprovider.cpp:44 +#: ../src/uisupport/contextmenuactionprovider.cpp:45 msgctxt "ContextMenuActionProvider|" msgid "Go to Chat" msgstr "转到聊天" -#: ../src/uisupport/contextmenuactionprovider.cpp:46 +#: ../src/uisupport/contextmenuactionprovider.cpp:47 msgctxt "ContextMenuActionProvider|" msgid "Joins" msgstr "加入" -#: ../src/uisupport/contextmenuactionprovider.cpp:47 +#: ../src/uisupport/contextmenuactionprovider.cpp:48 msgctxt "ContextMenuActionProvider|" msgid "Parts" msgstr "离开" -#: ../src/uisupport/contextmenuactionprovider.cpp:48 +#: ../src/uisupport/contextmenuactionprovider.cpp:49 msgctxt "ContextMenuActionProvider|" msgid "Quits" msgstr "退出" -#: ../src/uisupport/contextmenuactionprovider.cpp:49 +#: ../src/uisupport/contextmenuactionprovider.cpp:50 msgctxt "ContextMenuActionProvider|" msgid "Nick Changes" msgstr "昵称更改" -#: ../src/uisupport/contextmenuactionprovider.cpp:50 +#: ../src/uisupport/contextmenuactionprovider.cpp:51 msgctxt "ContextMenuActionProvider|" msgid "Mode Changes" msgstr "模式更改" -#: ../src/uisupport/contextmenuactionprovider.cpp:51 +#: ../src/uisupport/contextmenuactionprovider.cpp:52 msgctxt "ContextMenuActionProvider|" msgid "Day Changes" msgstr "日期更改" -#: ../src/uisupport/contextmenuactionprovider.cpp:52 +#: ../src/uisupport/contextmenuactionprovider.cpp:53 msgctxt "ContextMenuActionProvider|" msgid "Topic Changes" msgstr "话题更改" -#: ../src/uisupport/contextmenuactionprovider.cpp:53 +#: ../src/uisupport/contextmenuactionprovider.cpp:54 msgctxt "ContextMenuActionProvider|" msgid "Set as Default..." msgstr "设为默认..." -#: ../src/uisupport/contextmenuactionprovider.cpp:54 +#: ../src/uisupport/contextmenuactionprovider.cpp:55 msgctxt "ContextMenuActionProvider|" msgid "Use Defaults..." msgstr "使用默认..." -#: ../src/uisupport/contextmenuactionprovider.cpp:56 +#: ../src/uisupport/contextmenuactionprovider.cpp:57 msgctxt "ContextMenuActionProvider|" msgid "Join Channel..." msgstr "加入频道..." -#: ../src/uisupport/contextmenuactionprovider.cpp:58 +#: ../src/uisupport/contextmenuactionprovider.cpp:59 msgctxt "ContextMenuActionProvider|" msgid "Start Query" msgstr "开始查询" -#: ../src/uisupport/contextmenuactionprovider.cpp:59 +#: ../src/uisupport/contextmenuactionprovider.cpp:60 msgctxt "ContextMenuActionProvider|" msgid "Show Query" msgstr "显示查询" -#: ../src/uisupport/contextmenuactionprovider.cpp:60 +#: ../src/uisupport/contextmenuactionprovider.cpp:61 msgctxt "ContextMenuActionProvider|" msgid "Whois" msgstr "Whois" -#: ../src/uisupport/contextmenuactionprovider.cpp:62 +#: ../src/uisupport/contextmenuactionprovider.cpp:63 msgctxt "ContextMenuActionProvider|" msgid "Version" msgstr "版本" -#: ../src/uisupport/contextmenuactionprovider.cpp:63 +#: ../src/uisupport/contextmenuactionprovider.cpp:64 msgctxt "ContextMenuActionProvider|" msgid "Time" msgstr "时间" -#: ../src/uisupport/contextmenuactionprovider.cpp:64 +#: ../src/uisupport/contextmenuactionprovider.cpp:65 msgctxt "ContextMenuActionProvider|" msgid "Ping" msgstr "Ping" -#: ../src/uisupport/contextmenuactionprovider.cpp:65 +#: ../src/uisupport/contextmenuactionprovider.cpp:66 msgctxt "ContextMenuActionProvider|" msgid "Client info" msgstr "客户端信息" -#: ../src/uisupport/contextmenuactionprovider.cpp:66 +#: ../src/uisupport/contextmenuactionprovider.cpp:67 msgctxt "ContextMenuActionProvider|" msgid "Custom..." msgstr "自定义..." -#: ../src/uisupport/contextmenuactionprovider.cpp:78 +#: ../src/uisupport/contextmenuactionprovider.cpp:79 msgctxt "ContextMenuActionProvider|" msgid "Give Operator Status" msgstr "给出运算符状态" -#: ../src/uisupport/contextmenuactionprovider.cpp:79 +#: ../src/uisupport/contextmenuactionprovider.cpp:80 msgctxt "ContextMenuActionProvider|" msgid "Take Operator Status" msgstr "采用运算符状态" -#: ../src/uisupport/contextmenuactionprovider.cpp:80 +#: ../src/uisupport/contextmenuactionprovider.cpp:81 +msgctxt "ContextMenuActionProvider|" +msgid "Give Half-Operator Status" +msgstr "" + +#: ../src/uisupport/contextmenuactionprovider.cpp:82 +msgctxt "ContextMenuActionProvider|" +msgid "Take Half-Operator Status" +msgstr "" + +#: ../src/uisupport/contextmenuactionprovider.cpp:83 msgctxt "ContextMenuActionProvider|" msgid "Give Voice" msgstr "给予发言权限" -#: ../src/uisupport/contextmenuactionprovider.cpp:81 +#: ../src/uisupport/contextmenuactionprovider.cpp:84 msgctxt "ContextMenuActionProvider|" msgid "Take Voice" msgstr "撤除发言权限" -#: ../src/uisupport/contextmenuactionprovider.cpp:82 +#: ../src/uisupport/contextmenuactionprovider.cpp:85 msgctxt "ContextMenuActionProvider|" msgid "Kick From Channel" msgstr "踢出频道" -#: ../src/uisupport/contextmenuactionprovider.cpp:83 +#: ../src/uisupport/contextmenuactionprovider.cpp:86 msgctxt "ContextMenuActionProvider|" msgid "Ban From Channel" msgstr "禁止参与频道" -#: ../src/uisupport/contextmenuactionprovider.cpp:84 +#: ../src/uisupport/contextmenuactionprovider.cpp:87 msgctxt "ContextMenuActionProvider|" msgid "Kick && Ban" msgstr "踢出和禁止" -#: ../src/uisupport/contextmenuactionprovider.cpp:86 +#: ../src/uisupport/contextmenuactionprovider.cpp:89 msgctxt "ContextMenuActionProvider|" msgid "Hide Chat(s) Temporarily" msgstr "临时隐藏聊天" -#: ../src/uisupport/contextmenuactionprovider.cpp:87 +#: ../src/uisupport/contextmenuactionprovider.cpp:90 msgctxt "ContextMenuActionProvider|" msgid "Hide Chat(s) Permanently" msgstr "永久隐藏聊天" -#: ../src/uisupport/contextmenuactionprovider.cpp:88 +#: ../src/uisupport/contextmenuactionprovider.cpp:91 msgctxt "ContextMenuActionProvider|" msgid "Show Channel List" msgstr "显示频道列表" -#: ../src/uisupport/contextmenuactionprovider.cpp:89 +#: ../src/uisupport/contextmenuactionprovider.cpp:92 msgctxt "ContextMenuActionProvider|" msgid "Show Ignore List" msgstr "显示忽略列表" -#: ../src/uisupport/contextmenuactionprovider.cpp:102 +#: ../src/uisupport/contextmenuactionprovider.cpp:105 msgctxt "ContextMenuActionProvider|" msgid "Hide Events" msgstr "隐藏事件" -#: ../src/uisupport/contextmenuactionprovider.cpp:110 +#: ../src/uisupport/contextmenuactionprovider.cpp:113 msgctxt "ContextMenuActionProvider|" msgid "CTCP" msgstr "CTCP" -#: ../src/uisupport/contextmenuactionprovider.cpp:122 +#: ../src/uisupport/contextmenuactionprovider.cpp:128 msgctxt "ContextMenuActionProvider|" msgid "Actions" msgstr "动作" -#: ../src/uisupport/contextmenuactionprovider.cpp:126 +#: ../src/uisupport/contextmenuactionprovider.cpp:132 msgctxt "ContextMenuActionProvider|" msgid "Ignore" msgstr "忽略" -#: ../src/uisupport/contextmenuactionprovider.cpp:131 +#: ../src/uisupport/contextmenuactionprovider.cpp:137 msgctxt "ContextMenuActionProvider|" msgid "Add Ignore Rule" msgstr "添加忽略规则" -#: ../src/uisupport/contextmenuactionprovider.cpp:132 +#: ../src/uisupport/contextmenuactionprovider.cpp:138 msgctxt "ContextMenuActionProvider|" msgid "Existing Rules" msgstr "现有规则" -#: ../src/core/core.cpp:182 +#: ../src/core/core.cpp:193 msgctxt "Core|" msgid "Could not initialize any storage backend! Exiting..." msgstr "无法初始化任何存储后端！正在退出..." -#: ../src/core/core.cpp:183 +#: ../src/core/core.cpp:194 msgctxt "Core|" msgid "" "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n" @@ -1325,163 +1410,104 @@ msgid "" "to work." msgstr "目前 Quassel 支持 SQLite3 和 PostgreSQL。您需要在启用\n sqlite 和 postgres 插件的条件下重新编译 Qt 库才能让 quasselcore\n正常工作。" -#: ../src/core/core.cpp:235 +#: ../src/core/core.cpp:253 msgctxt "Core|" msgid "Calling restoreState() even though active sessions exist!" msgstr "尽管有活动的会话，仍然调用 restoreState()！" -#: ../src/core/core.cpp:277 +#: ../src/core/core.cpp:287 +msgctxt "Core|" +msgid "Core is already configured! Not configuring again..." +msgstr "" + +#: ../src/core/core.cpp:290 msgctxt "Core|" msgid "Admin user or password not set." msgstr "管理员的用户名或密码未设置。" -#: ../src/core/core.cpp:280 +#: ../src/core/core.cpp:293 msgctxt "Core|" msgid "Could not setup storage!" msgstr "无法设置存储！" -#: ../src/core/core.cpp:284 +#: ../src/core/core.cpp:298 msgctxt "Core|" msgid "Creating admin user..." msgstr "正在创建管理员用户..." -#: ../src/core/core.cpp:397 +#: ../src/core/core.cpp:451 #, qt-format msgctxt "Core|" msgid "Invalid listen address %1" msgstr "无效的侦听地址 %1" -#: ../src/core/core.cpp:405 +#: ../src/core/core.cpp:460 #, 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:413 +#: ../src/core/core.cpp:469 #, qt-format msgctxt "Core|" msgid "Could not open IPv6 interface %1:%2: %3" msgstr "无法打开 IPv6 接口 %1:%2：%3" -#: ../src/core/core.cpp:421 +#: ../src/core/core.cpp:477 #, 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:431 +#: ../src/core/core.cpp:488 #, qt-format msgctxt "Core|" msgid "Could not open IPv4 interface %1:%2: %3" msgstr "无法打开 IPv4 接口 %1:%2：%3" -#: ../src/core/core.cpp:439 +#: ../src/core/core.cpp:496 #, qt-format msgctxt "Core|" msgid "Invalid listen address %1, unknown network protocol" msgstr "侦听地址 %1 无效，网络协议未知" -#: ../src/core/core.cpp:448 +#: ../src/core/core.cpp:505 msgctxt "Core|" msgid "Could not open any network interfaces to listen on!" msgstr "无法打开任何可侦听的网络接口" -#: ../src/core/core.cpp:482 +#: ../src/core/core.cpp:545 msgctxt "Core|" msgid "Client connected from" msgstr "客户端已连接自" -#: ../src/core/core.cpp:485 +#: ../src/core/core.cpp:548 msgctxt "Core|" msgid "Closing server for basic setup." msgstr "关闭服务器以进行基本设置。" -#: ../src/core/core.cpp:504 -msgctxt "Core|" -msgid "Antique client trying to connect... refusing." -msgstr "旧版的客户端正在尝试连接...拒绝。" - -#: ../src/core/core.cpp:516 -#, qt-format -msgctxt "Core|" -msgid "" -"Your Quassel Client is too old!
This core needs at least " -"client/core protocol version %1.
Please consider upgrading your client." -msgstr "您的 Quassel 客户端太过时了！
此核心至少需要客户端/核心协议版本 %1。
请考虑更新您的客户端。" - -#: ../src/core/core.cpp:520 ../src/core/core.cpp:610 ../src/core/core.cpp:634 +#: ../src/core/core.cpp:560 msgctxt "Core|" -msgid "Client" -msgstr "客戶端" - -#: ../src/core/core.cpp:520 -msgctxt "Core|" -msgid "too old, rejecting." -msgstr "过旧，拒绝。" - -#: ../src/core/core.cpp:537 -#, qt-format -msgctxt "Core|" -msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)" -msgstr "Quassel 核心版本 %1
编译：%2
已运行 %3天%4小时%5分(始于 %6)" - -#: ../src/core/core.cpp:590 -msgctxt "Core|" -msgid "Starting TLS for Client:" -msgstr "正在启动客户端的 TLS：" - -#: ../src/core/core.cpp:608 -msgctxt "Core|" -msgid "" -"Client not initialized!
You need to send an init message before " -"trying to login." -msgstr "客户端没有初始化！
您需要先发送一个 init(初始化) 消息才能尝试登录。" - -#: ../src/core/core.cpp:610 -msgctxt "Core|" -msgid "did not send an init message before trying to login, rejecting." -msgstr "在尝试登录前没有发送初始化消息，拒绝。" - -#: ../src/core/core.cpp:628 -msgctxt "Core|" -msgid "" -"Invalid username or password!
The username/password combination " -"you supplied could not be found in the database." -msgstr "用户名或密码无效！
您提供的用户名/密码组合在数据库中找不到。" - -#: ../src/core/core.cpp:634 -#, qt-format -msgctxt "Core|" -msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)." -msgstr "已成功初始化并认证为“%1”(用户ID：%2)。" - -#: ../src/core/core.cpp:645 -msgctxt "Core|" -msgid "Non-authed client disconnected." -msgstr "非认证客户端已断开。" - -#: ../src/core/core.cpp:651 -msgctxt "Core|" -msgid "Non-authed client disconnected. (socket allready destroyed)" -msgstr "非认证客户端已断开。(已销毁套接字)" +msgid "Non-authed client disconnected:" +msgstr "" -#: ../src/core/core.cpp:699 +#: ../src/core/core.cpp:592 msgctxt "Core|" msgid "Could not initialize session for client:" msgstr "无法初始化客户端会话：" -#: ../src/core/core.cpp:721 +#: ../src/core/core.cpp:619 msgctxt "Core|" msgid "Could not find a session for client:" msgstr "无法找到客户端会话：" -#: ../src/client/coreaccount.h:39 +#: ../src/client/coreaccount.h:40 msgctxt "CoreAccount|" msgid "Internal Core" msgstr "内部核心" #: ../src/qtui/settingspages/coreaccounteditdlg.ui:14 -#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229 +#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:260 msgctxt "CoreAccountEditDlg|" msgid "Edit Core Account" msgstr "编辑核心账户" @@ -1556,12 +1582,12 @@ msgctxt "CoreAccountEditDlg|" msgid "HTTP" msgstr "HTTP" -#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231 +#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:262 msgctxt "CoreAccountEditDlg|" msgid "Add Core Account" msgstr "添加核心账户" -#: ../src/client/coreaccountmodel.cpp:64 +#: ../src/client/coreaccountmodel.cpp:68 msgctxt "CoreAccountModel|" msgid "Internal Core" msgstr "内部核心" @@ -1611,17 +1637,74 @@ msgctxt "CoreAccountSettingsPage|" msgid "Remote Cores" msgstr "远程核心" +#: ../src/core/coreauthhandler.cpp:54 ../src/core/coreauthhandler.cpp:90 +msgctxt "CoreAuthHandler|" +msgid "Client" +msgstr "客戶端" + +#: ../src/core/coreauthhandler.cpp:54 +msgctxt "CoreAuthHandler|" +msgid "too old, rejecting." +msgstr "过旧，拒绝。" + +#: ../src/core/coreauthhandler.cpp:55 +#, qt-format +msgctxt "CoreAuthHandler|" +msgid "" +"Your Quassel Client is too old!
This core needs at least " +"client/core protocol version %1 (got: %2).
Please consider upgrading your" +" client." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:69 +msgctxt "CoreAuthHandler|" +msgid "Starting encryption for Client:" +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 +msgctxt "CoreAuthHandler|" +msgid "" +"Client not initialized!
You need to send an init message before " +"trying to login." +msgstr "客户端没有初始化！
您需要先发送一个 init(初始化) 消息才能尝试登录。" + +#: ../src/core/coreauthhandler.cpp:105 +msgctxt "CoreAuthHandler|" +msgid "" +"SSL is required!
You need to use SSL in order to connect to this " +"core." +msgstr "" + +#: ../src/core/coreauthhandler.cpp:146 +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 +#, qt-format +msgctxt "CoreAuthHandler|" +msgid "" +"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)." +msgstr "" + #: ../src/qtui/coreconfigwizard.cpp:69 msgctxt "CoreConfigWizard|" msgid "Core Configuration Wizard" msgstr "核心配置向导" -#: ../src/qtui/coreconfigwizard.cpp:97 +#: ../src/qtui/coreconfigwizard.cpp:98 msgctxt "CoreConfigWizard|" msgid "Your core has been successfully configured. Logging you in..." msgstr "您的核心已经配置成功。正在为您登录..." -#: ../src/qtui/coreconfigwizard.cpp:104 +#: ../src/qtui/coreconfigwizard.cpp:107 #, qt-format msgctxt "CoreConfigWizard|" msgid "" @@ -1629,7 +1712,7 @@ msgid "" "over." msgstr "核心配置失败：
%1
点击 下一步 重新开始。" -#: ../src/qtui/coreconfigwizard.cpp:119 +#: ../src/qtui/coreconfigwizard.cpp:126 msgctxt "CoreConfigWizard|" msgid "" "Your are now logged into your freshly configured Quassel Core!
Please " @@ -1678,46 +1761,46 @@ msgctxt "CoreConfigWizardIntroPage|" msgid "This wizard will guide you through the setup of your Quassel Core." msgstr "此向导将指引您完成 Quassel 核心的设置。" -#: ../src/qtui/coreconfigwizard.cpp:150 +#: ../src/qtui/coreconfigwizard.cpp:162 msgctxt "CoreConfigWizardPages::AdminUserPage|" msgid "Create Admin User" msgstr "创建管理员用户" -#: ../src/qtui/coreconfigwizard.cpp:151 +#: ../src/qtui/coreconfigwizard.cpp:163 msgctxt "CoreConfigWizardPages::AdminUserPage|" msgid "" "First, we will create a user on the core. This first user will have " "administrator privileges." msgstr "首先，我们将在核心上创建一位用户。第一位用户将拥有管理员权限。" -#: ../src/qtui/coreconfigwizard.cpp:135 +#: ../src/qtui/coreconfigwizard.cpp:145 msgctxt "CoreConfigWizardPages::IntroPage|" msgid "Introduction" msgstr "介绍" -#: ../src/qtui/coreconfigwizard.cpp:182 +#: ../src/qtui/coreconfigwizard.cpp:198 msgctxt "CoreConfigWizardPages::StorageSelectionPage|" msgid "Select Storage Backend" msgstr "选择存储后端" -#: ../src/qtui/coreconfigwizard.cpp:183 +#: ../src/qtui/coreconfigwizard.cpp:199 msgctxt "CoreConfigWizardPages::StorageSelectionPage|" msgid "" "Please select a database backend for the Quassel Core storage to store the " "backlog and other data in." msgstr "请选择一个用于 Quassel 核心存储的储备和其他数据用的数据库后端。" -#: ../src/qtui/coreconfigwizard.cpp:277 +#: ../src/qtui/coreconfigwizard.cpp:300 msgctxt "CoreConfigWizardPages::StorageSelectionPage|" msgid "Connection Properties" msgstr "连接属性" -#: ../src/qtui/coreconfigwizard.cpp:317 +#: ../src/qtui/coreconfigwizard.cpp:342 msgctxt "CoreConfigWizardPages::SyncPage|" msgid "Storing Your Settings" msgstr "正在保存您的设置" -#: ../src/qtui/coreconfigwizard.cpp:318 +#: ../src/qtui/coreconfigwizard.cpp:343 msgctxt "CoreConfigWizardPages::SyncPage|" msgid "" "Your settings are now stored in the core, and you will be logged in " @@ -1804,114 +1887,73 @@ msgctxt "CoreConnectAuthDlg|" msgid "Remember password" msgstr "记住密码" -#: ../src/qtui/coreconnectdlg.cpp:75 +#: ../src/qtui/coreconnectdlg.cpp:81 #, qt-format msgctxt "CoreConnectAuthDlg|" msgid "Please enter your credentials for %1:" msgstr "请输入您的 %1 证书：" -#: ../src/qtui/coreconnectdlg.cpp:40 +#: ../src/qtui/coreconnectdlg.cpp:41 msgctxt "CoreConnectDlg|" msgid "Connect to Core" msgstr "连接到核心" -#: ../src/client/coreconnection.cpp:168 +#: ../src/client/coreconnection.cpp:193 msgctxt "CoreConnection|" msgid "Network is down" msgstr "网络已断" -#: ../src/client/coreconnection.cpp:202 ../src/client/coreconnection.cpp:321 +#: ../src/client/coreconnection.cpp:227 ../src/client/coreconnection.cpp:328 msgctxt "CoreConnection|" msgid "Disconnected" msgstr "连接已断开" -#: ../src/client/coreconnection.cpp:205 +#: ../src/client/coreconnection.cpp:230 #, qt-format msgctxt "CoreConnection|" msgid "Looking up %1..." msgstr "正在查找 %1..." -#: ../src/client/coreconnection.cpp:208 ../src/client/coreconnection.cpp:450 +#: ../src/client/coreconnection.cpp:233 #, qt-format msgctxt "CoreConnection|" msgid "Connecting to %1..." msgstr "正在连接 %1..." -#: ../src/client/coreconnection.cpp:211 ../src/client/coreconnection.cpp:573 +#: ../src/client/coreconnection.cpp:236 #, qt-format msgctxt "CoreConnection|" msgid "Connected to %1" msgstr "已连接到 %1" -#: ../src/client/coreconnection.cpp:214 +#: ../src/client/coreconnection.cpp:239 #, qt-format msgctxt "CoreConnection|" msgid "Disconnecting from %1..." msgstr "正在从 %1 断开..." -#: ../src/client/coreconnection.cpp:272 -msgctxt "CoreConnection|" -msgid "" -"The Quassel Core you try to connect to is too old! Please consider " -"upgrading." -msgstr "您试图连接的 Quassel 核心过于陈旧！请考虑升级。" - -#: ../src/client/coreconnection.cpp:300 -msgctxt "CoreConnection|" -msgid "Invalid data received from core" -msgstr "从核心接收的数据无效" - -#: ../src/client/coreconnection.cpp:349 +#: ../src/client/coreconnection.cpp:363 msgctxt "CoreConnection|" msgid "Disconnected from core." msgstr "已从核心断开。" -#: ../src/client/coreconnection.cpp:427 ../src/client/coreconnection.cpp:511 -#: ../src/client/coreconnection.cpp:556 -msgctxt "CoreConnection|" -msgid "Unencrypted connection canceled" -msgstr "已取消了未加密连接" - -#: ../src/client/coreconnection.cpp:457 -msgctxt "CoreConnection|" -msgid "Synchronizing to core..." -msgstr "正在与核心同步..." - -#: ../src/client/coreconnection.cpp:478 -#, qt-format -msgctxt "CoreConnection|" -msgid "" -"The Quassel Core you are trying to connect to is too old!
Need at " -"least core/client protocol v%1 to connect." -msgstr "您试图连接的 Quassel 核心过于陈旧！
至少需要核心/客户端协议 v%1 才能连接。" - -#: ../src/client/coreconnection.cpp:592 -msgctxt "CoreConnection|" -msgid "Logging in..." -msgstr "正在登录..." - -#: ../src/client/coreconnection.cpp:597 -msgctxt "CoreConnection|" -msgid "Login canceled" -msgstr "登录已取消" - -#: ../src/client/coreconnection.cpp:622 +#: ../src/client/coreconnection.cpp:501 msgctxt "CoreConnection|" msgid "Receiving session state" msgstr "正在接收会话状态" -#: ../src/client/coreconnection.cpp:624 +#: ../src/client/coreconnection.cpp:503 #, qt-format msgctxt "CoreConnection|" msgid "Synchronizing to %1..." msgstr "正在与 %1 同步..." -#: ../src/client/coreconnection.cpp:648 +#: ../src/client/coreconnection.cpp:539 msgctxt "CoreConnection|" msgid "Receiving network states" msgstr "正在接收网络状态" -#: ../src/client/coreconnection.cpp:698 +#: ../src/client/coreconnection.cpp:590 #, qt-format msgctxt "CoreConnection|" msgid "Synchronized to %1" @@ -2001,28 +2043,28 @@ msgctxt "CoreConnectionStatusWidget|" msgid "Message" msgstr "消息" -#: ../src/qtui/coreconnectionstatuswidget.cpp:61 +#: ../src/qtui/coreconnectionstatuswidget.cpp:66 msgctxt "CoreConnectionStatusWidget|seconds" msgid "s" msgstr "秒" -#: ../src/qtui/coreconnectionstatuswidget.cpp:61 +#: ../src/qtui/coreconnectionstatuswidget.cpp:66 msgctxt "CoreConnectionStatusWidget|milliseconds" msgid "ms" msgstr "毫秒" -#: ../src/qtui/coreconnectionstatuswidget.cpp:62 +#: ../src/qtui/coreconnectionstatuswidget.cpp:67 #, qt-format msgctxt "CoreConnectionStatusWidget|" msgid "(Lag: %1 %2)" msgstr "(延时：%1 %2)" -#: ../src/qtui/coreconnectionstatuswidget.cpp:75 +#: ../src/qtui/coreconnectionstatuswidget.cpp:83 msgctxt "CoreConnectionStatusWidget|" msgid "The connection to your core is encrypted with SSL." msgstr "与核心的连接已经使用了 SSL 加密。" -#: ../src/qtui/coreconnectionstatuswidget.cpp:78 +#: ../src/qtui/coreconnectionstatuswidget.cpp:87 msgctxt "CoreConnectionStatusWidget|" msgid "The connection to your core is not encrypted." msgstr "与核心的连接没有加密。" @@ -2077,65 +2119,65 @@ msgctxt "CoreInfoDlg|" msgid "Close" msgstr "关闭" -#: ../src/qtui/coreinfodlg.cpp:53 +#: ../src/qtui/coreinfodlg.cpp:57 #, qt-format msgctxt "CoreInfoDlg|" msgid "%n Day(s)" msgid_plural "%n Day(s)" msgstr[0] "%n 天" -#: ../src/qtui/coreinfodlg.cpp:54 +#: ../src/qtui/coreinfodlg.cpp:58 #, qt-format msgctxt "CoreInfoDlg|" msgid " %1:%2:%3 (since %4)" msgstr " %1:%2:%3 (始于 %4)" -#: ../src/core/corenetwork.cpp:153 +#: ../src/core/corenetwork.cpp:167 msgctxt "CoreNetwork|" msgid "Connection failed. Cycling to next Server" msgstr "连接失败。轮转到下个服务器" -#: ../src/core/corenetwork.cpp:161 ../src/core/corenetwork.cpp:162 +#: ../src/core/corenetwork.cpp:175 ../src/core/corenetwork.cpp:176 #, qt-format msgctxt "CoreNetwork|" msgid "Connecting to %1:%2..." msgstr "正在连接到 %1：%2..." -#: ../src/core/corenetwork.cpp:210 +#: ../src/core/corenetwork.cpp:228 #, qt-format msgctxt "CoreNetwork|" msgid "Disconnecting. (%1)" msgstr "正在断开。(%1)" -#: ../src/core/corenetwork.cpp:210 +#: ../src/core/corenetwork.cpp:228 msgctxt "CoreNetwork|" msgid "Core Shutdown" msgstr "核心关闭" -#: ../src/core/corenetwork.cpp:348 +#: ../src/core/corenetwork.cpp:423 #, qt-format msgctxt "CoreNetwork|" msgid "Could not connect to %1 (%2)" msgstr "无法连接到 %1 (%2)" -#: ../src/core/corenetwork.cpp:350 +#: ../src/core/corenetwork.cpp:425 #, qt-format msgctxt "CoreNetwork|" msgid "Connection failure: %1" msgstr "连接失败：%1" -#: ../src/core/coresession.cpp:214 +#: ../src/core/coresession.cpp:230 msgctxt "CoreSession|" msgid "Client" msgstr "客戶端" -#: ../src/core/coresession.cpp:214 +#: ../src/core/coresession.cpp:230 #, qt-format msgctxt "CoreSession|" msgid "disconnected (UserId: %1)." msgstr "已断开(用户ID：%1)。" -#: ../src/core/coresession.cpp:440 +#: ../src/core/coresession.cpp:477 #, qt-format msgctxt "CoreSession|" msgid "" @@ -2143,53 +2185,121 @@ msgid "" " create network %1!" msgstr "CoreSession::createNetwork()：在尝试创建网络 %1 时收到来自核心的无效的网络ID！" -#: ../src/core/coresession.cpp:472 +#: ../src/core/coresession.cpp:509 msgctxt "CoreSession|" msgid "" "CoreSession::createNetwork(): Trying to create a network that already " "exists, updating instead!" msgstr "CoreSession::createNetwork()：尝试创建已存在的网络，请换为更新！" -#: ../src/core/coresessioneventprocessor.cpp:65 +#: ../src/core/coresessioneventprocessor.cpp:78 msgctxt "CoreSessionEventProcessor|" msgid "" "No free and valid nicks in nicklist found. use: /nick to " "continue" msgstr "昵称列表中没有空闲和有效的昵称。使用：/nick <其他昵称> 继续" -#: ../src/core/coreuserinputhandler.cpp:81 +#: ../src/core/coresessioneventprocessor.cpp:450 +msgctxt "CoreSessionEventProcessor|" +msgid "Unable to perform key exchange, missing qca-ossl plugin." +msgstr "" + +#: ../src/core/coresessioneventprocessor.cpp:461 +msgctxt "CoreSessionEventProcessor|" +msgid "Unable to parse the DH1080_INIT. Key exchange failed." +msgstr "" + +#: ../src/core/coresessioneventprocessor.cpp:465 +#: ../src/core/coresessioneventprocessor.cpp:473 +msgctxt "CoreSessionEventProcessor|" +msgid "Your key is set and messages will be encrypted." +msgstr "" + +#: ../src/core/coresessioneventprocessor.cpp:475 +msgctxt "CoreSessionEventProcessor|" +msgid "Failed to parse DH1080_FINISH. Key exchange failed." +msgstr "" + +#: ../src/core/coresessioneventprocessor.cpp:1056 +msgctxt "CoreSessionEventProcessor|" +msgid "Reverse DCC SEND not supported" +msgstr "" + +#: ../src/core/coresessioneventprocessor.cpp:1074 +#, qt-format +msgctxt "CoreSessionEventProcessor|" +msgid "DCC %1 not supported" +msgstr "" + +#: ../src/core/coretransfer.cpp:58 +msgctxt "CoreTransfer|" +msgid "Socket closed while still transferring!" +msgstr "" + +#: ../src/core/coretransfer.cpp:70 +#, qt-format +msgctxt "CoreTransfer|" +msgid "DCC connection error: %1" +msgstr "" + +#: ../src/core/coretransfer.cpp:114 +msgctxt "CoreTransfer|" +msgid "Reverse DCC not supported yet!" +msgstr "" + +#: ../src/core/coretransfer.cpp:160 +msgctxt "CoreTransfer|" +msgid "DCC Receive: Got more data than expected!" +msgstr "" + +#: ../src/core/coretransfer.cpp:176 +msgctxt "CoreTransfer|" +msgid "DCC Receive: Quassel Client disconnected during transfer!" +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:88 msgctxt "CoreUserInputHandler|" msgid "away" msgstr "离开" -#: ../src/core/coreuserinputhandler.cpp:150 +#: ../src/core/coreuserinputhandler.cpp:169 #, qt-format msgctxt "CoreUserInputHandler|" msgid "sending CTCP-%1 request to %2" msgstr "正在向 %2 发送 CTCP-%1 请求" -#: ../src/core/coreuserinputhandler.cpp:177 +#: ../src/core/coreuserinputhandler.cpp:190 +#: ../src/core/coreuserinputhandler.cpp:361 +#: ../src/core/coreuserinputhandler.cpp:606 +#: ../src/core/coreuserinputhandler.cpp:644 +msgctxt "CoreUserInputHandler|" +msgid "" +"Error: QCA provider plugin not found. It is usually provided by the qca-ossl" +" plugin." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:201 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:184 -#: ../src/core/coreuserinputhandler.cpp:517 +#: ../src/core/coreuserinputhandler.cpp:208 +#: ../src/core/coreuserinputhandler.cpp:662 #, qt-format msgctxt "CoreUserInputHandler|" msgid "No key has been set for %1." msgstr "没有为 %1 设置密钥。" -#: ../src/core/coreuserinputhandler.cpp:197 +#: ../src/core/coreuserinputhandler.cpp:213 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 has been deleted." msgstr "%1 的密钥已经删除。" -#: ../src/core/coreuserinputhandler.cpp:201 -#: ../src/core/coreuserinputhandler.cpp:525 +#: ../src/core/coreuserinputhandler.cpp:217 +#: ../src/core/coreuserinputhandler.cpp:670 msgctxt "CoreUserInputHandler|" msgid "" "Error: Setting an encryption key requires Quassel to have been built with " @@ -2198,13 +2308,46 @@ msgid "" "with QCA2 present." msgstr "错误：设置加密密钥要求编译的 Quassel 内建 Qt 加密架构(QCA2)库支持。请联系您的发行商查找带 QCA2 支持的 Quassel 软件包，或者使用现有的 QCA2 重新编译 Quassel。" -#: ../src/core/coreuserinputhandler.cpp:422 +#: ../src/core/coreuserinputhandler.cpp:371 +msgctxt "CoreUserInputHandler|" +msgid "" +"[usage] /keyx [] Initiates a DH1080 key exchange with the target." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:378 +msgctxt "CoreUserInputHandler|" +msgid "It is only possible to exchange keys in a query buffer." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:388 +#, qt-format +msgctxt "CoreUserInputHandler|" +msgid "Failed to initiate key exchange with %1." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:393 +#, qt-format +msgctxt "CoreUserInputHandler|" +msgid "Initiated key exchange with %1." +msgstr "" + +#: ../src/core/coreuserinputhandler.cpp:397 +#: ../src/core/coreuserinputhandler.cpp:628 +msgctxt "CoreUserInputHandler|" +msgid "" +"Error: Setting an encryption key requires Quassel to have been built with " +"support for the Qt Cryptographic Architecture (QCA) library. Contact your " +"distributor about a Quassel package with QCA support, or rebuild Quassel " +"with QCA present." +msgstr "错误：设置加密密钥要求编译的 Quassel 内建 Qt 加密架构(QCA)库支持。联系您的发行商查找带 QCA 支持的 Quassel 软件包，或者用现有的 QCA 重新编译 Quassel。" + +#: ../src/core/coreuserinputhandler.cpp:556 #, qt-format msgctxt "CoreUserInputHandler|" msgid "Starting query with %1" msgstr "" -#: ../src/core/coreuserinputhandler.cpp:469 +#: ../src/core/coreuserinputhandler.cpp:616 msgctxt "CoreUserInputHandler|" msgid "" "[usage] /setkey sets the encryption key for nick or " @@ -2212,35 +2355,26 @@ msgid "" "it." msgstr "[用法] /setkey <昵称|频道> <密钥> 设置昵称或频道对应的加密密钥。在频道或查询缓冲区中时，使用 /setkey <密钥> 将设置相应于频道或缓存的密钥。" -#: ../src/core/coreuserinputhandler.cpp:484 +#: ../src/core/coreuserinputhandler.cpp:625 #, qt-format msgctxt "CoreUserInputHandler|" msgid "The key for %1 has been set." msgstr "%1 的密钥已经设置。" -#: ../src/core/coreuserinputhandler.cpp:487 -msgctxt "CoreUserInputHandler|" -msgid "" -"Error: Setting an encryption key requires Quassel to have been built with " -"support for the Qt Cryptographic Architecture (QCA) library. Contact your " -"distributor about a Quassel package with QCA support, or rebuild Quassel " -"with QCA present." -msgstr "错误：设置加密密钥要求编译的 Quassel 内建 Qt 加密架构(QCA)库支持。联系您的发行商查找带 QCA 支持的 Quassel 软件包，或者用现有的 QCA 重新编译 Quassel。" - -#: ../src/core/coreuserinputhandler.cpp:509 +#: ../src/core/coreuserinputhandler.cpp:654 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:521 +#: ../src/core/coreuserinputhandler.cpp:666 #, qt-format msgctxt "CoreUserInputHandler|" -msgid "The key for %1 is %2" -msgstr "%1 的主页为 %2" +msgid "The key for %1 is %2:%3" +msgstr "" -#: ../src/core/coreuserinputhandler.cpp:633 +#: ../src/core/coreuserinputhandler.cpp:794 #, qt-format msgctxt "CoreUserInputHandler|" msgid "[Error] Could not encrypt your message: %1" @@ -2356,347 +2490,368 @@ msgctxt "DebugLogWidget|" msgid "Close" msgstr "关闭" -#: ../src/core/eventstringifier.cpp:142 ../src/core/eventstringifier.cpp:259 +#: ../src/qtui/dockmanagernotificationbackend.cpp:184 +msgctxt "DockManagerNotificationBackend::ConfigWidget|" +msgid "Mark dockmanager entry" +msgstr "" + +#: ../src/core/eventstringifier.cpp:224 ../src/core/eventstringifier.cpp:370 msgctxt "EventStringifier|" msgid "[Whois] " msgstr "[Whois] %1" -#: ../src/core/eventstringifier.cpp:154 +#: ../src/core/eventstringifier.cpp:239 #, qt-format msgctxt "EventStringifier|" msgid "%1 invited you to channel %2" msgstr "%1 邀请您加入频道 %2" -#: ../src/core/eventstringifier.cpp:239 +#: ../src/core/eventstringifier.cpp:341 #, qt-format msgctxt "EventStringifier|" msgid "%1 has changed topic for %2 to: \"%3\"" msgstr "%1 已将 %2 的话题更改为：“%3”" -#: ../src/core/eventstringifier.cpp:246 +#: ../src/core/eventstringifier.cpp:347 +#, qt-format +msgctxt "EventStringifier|" +msgid "[Operwall] %1: %2" +msgstr "" + +#: ../src/core/eventstringifier.cpp:355 msgctxt "EventStringifier|" msgid "" "Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected " "behavior!" msgstr "收到了与 RFC 不兼容的 RPL_ISUPPORT：这可能导致意外的行为！" -#: ../src/core/eventstringifier.cpp:272 +#: ../src/core/eventstringifier.cpp:384 #, qt-format msgctxt "EventStringifier|" msgid "%1 is away: \"%2\"" msgstr "%1 状态为离开：“%2”" -#: ../src/core/eventstringifier.cpp:277 +#: ../src/core/eventstringifier.cpp:391 msgctxt "EventStringifier|" msgid "You are no longer marked as being away" msgstr "" -#: ../src/core/eventstringifier.cpp:283 +#: ../src/core/eventstringifier.cpp:399 msgctxt "EventStringifier|" msgid "You have been marked as being away" msgstr "" -#: ../src/core/eventstringifier.cpp:303 +#: ../src/core/eventstringifier.cpp:421 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is %2 (%3)" msgstr "[Whois] %1 为 %2 (%3)" -#: ../src/core/eventstringifier.cpp:317 +#: ../src/core/eventstringifier.cpp:437 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is online via %2 (%3)" msgstr "%1 已在 %2 上线 (%3)" -#: ../src/core/eventstringifier.cpp:319 +#: ../src/core/eventstringifier.cpp:439 #, qt-format msgctxt "EventStringifier|" msgid "[Whowas] %1 was online via %2 (%3)" msgstr "[Whowas] %1 曾是 %2 (%3)" -#: ../src/core/eventstringifier.cpp:327 +#: ../src/core/eventstringifier.cpp:449 #, qt-format msgctxt "EventStringifier|" msgid "[Whowas] %1 was %2@%3 (%4)" msgstr "" -#: ../src/core/eventstringifier.cpp:334 +#: ../src/core/eventstringifier.cpp:458 #, qt-format msgctxt "EventStringifier|" msgid "[Who] End of /WHO list for %1" msgstr "[Who] %1 的 /WHO 列表结尾" -#: ../src/core/eventstringifier.cpp:344 +#: ../src/core/eventstringifier.cpp:470 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is logged in since %2" msgstr "[Whois] %1 已登录，始于 %2" -#: ../src/core/eventstringifier.cpp:346 +#: ../src/core/eventstringifier.cpp:474 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is idling for %2 (since %3)" msgstr "[Whois] %1 已空闲 %2 (%3)" -#: ../src/core/eventstringifier.cpp:353 +#: ../src/core/eventstringifier.cpp:484 msgctxt "EventStringifier|" msgid "[Whois] End of /WHOIS list" msgstr "[Who] %1 的 /WHO 列表结尾" -#: ../src/core/eventstringifier.cpp:374 +#: ../src/core/eventstringifier.cpp:507 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is a user on channels: %2" msgstr "[Whois] %1 是以下频道上的用户：%2" -#: ../src/core/eventstringifier.cpp:376 +#: ../src/core/eventstringifier.cpp:509 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 has voice on channels: %2" msgstr "[Whois] %1 是以下频道上的用户：%2" -#: ../src/core/eventstringifier.cpp:378 +#: ../src/core/eventstringifier.cpp:511 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is an operator on channels: %2" msgstr "[Whois] %1 是以下频道的管理员：%2" -#: ../src/core/eventstringifier.cpp:397 +#: ../src/core/eventstringifier.cpp:532 #, qt-format msgctxt "EventStringifier|" msgid "Channel %1 has %2 users. Topic is: \"%3\"" msgstr "频道 %1 有 %2 位用户。话题为：%3" -#: ../src/core/eventstringifier.cpp:403 +#: ../src/core/eventstringifier.cpp:540 msgctxt "EventStringifier|" msgid "End of channel list" msgstr "频道列表末尾" -#: ../src/core/eventstringifier.cpp:417 +#: ../src/core/eventstringifier.cpp:558 #, qt-format msgctxt "EventStringifier|" msgid "Homepage for %1 is %2" msgstr "%1 的主页为 %2" -#: ../src/core/eventstringifier.cpp:432 +#: ../src/core/eventstringifier.cpp:575 #, qt-format msgctxt "EventStringifier|" msgid "Channel %1 created on %2" msgstr "%1 频道创建于 %2" -#: ../src/core/eventstringifier.cpp:440 +#: ../src/core/eventstringifier.cpp:589 #, qt-format msgctxt "EventStringifier|" msgid "[Whois] %1 is authed as %2" msgstr "[Whois] %1 状态为离开：“%2”" -#: ../src/core/eventstringifier.cpp:446 +#: ../src/core/eventstringifier.cpp:592 +#, qt-format +msgctxt "EventStringifier|" +msgid "[Whowas] %1 was authed as %2" +msgstr "" + +#: ../src/core/eventstringifier.cpp:601 #, qt-format msgctxt "EventStringifier|" msgid "No topic is set for %1." msgstr "%1 没有设定主题。" -#: ../src/core/eventstringifier.cpp:452 +#: ../src/core/eventstringifier.cpp:609 #, qt-format msgctxt "EventStringifier|" msgid "Topic for %1 is \"%2\"" msgstr "%1 的话题为“%2”" -#: ../src/core/eventstringifier.cpp:461 +#: ../src/core/eventstringifier.cpp:621 #, qt-format msgctxt "EventStringifier|" msgid "Topic set by %1 on %2" msgstr "话题由 %1 于 %2 设置" -#: ../src/core/eventstringifier.cpp:471 +#: ../src/core/eventstringifier.cpp:634 #, qt-format msgctxt "EventStringifier|" msgid "%1 has been invited to %2" msgstr "%1 受邀加入 %2" -#: ../src/core/eventstringifier.cpp:477 +#: ../src/core/eventstringifier.cpp:642 #, qt-format msgctxt "EventStringifier|" msgid "[Who] %1" msgstr "[Who] %1" -#: ../src/core/eventstringifier.cpp:482 +#: ../src/core/eventstringifier.cpp:649 msgctxt "EventStringifier|" msgid "End of /WHOWAS" msgstr "" -#: ../src/core/eventstringifier.cpp:490 +#: ../src/core/eventstringifier.cpp:659 #, qt-format msgctxt "EventStringifier|" msgid "Nick %1 contains illegal characters" msgstr "昵称 %1 含有非法字符" -#: ../src/core/eventstringifier.cpp:498 +#: ../src/core/eventstringifier.cpp:669 #, qt-format msgctxt "EventStringifier|" msgid "Nick already in use: %1" msgstr "昵称已经使用：%1" -#: ../src/core/eventstringifier.cpp:506 +#: ../src/core/eventstringifier.cpp:679 #, qt-format msgctxt "EventStringifier|" msgid "Nick/channel is temporarily unavailable: %1" msgstr "昵称/频道临时不可用：%1" -#: ../src/core/eventstringifier.cpp:527 +#: ../src/core/eventstringifier.cpp:702 #, qt-format msgctxt "EventStringifier|" msgid "sending CTCP-%1 request to %2" msgstr "正在向 %2 发送 CTCP-%1 请求" -#. Optional "unknown" in "Received unknown CTCP-FOO request by bar" -#: ../src/core/eventstringifier.cpp:540 +#: ../src/core/eventstringifier.cpp:717 msgctxt "EventStringifier|" msgid "unknown" msgstr "" -#: ../src/core/eventstringifier.cpp:541 +#: ../src/core/eventstringifier.cpp:718 #, qt-format msgctxt "EventStringifier|" msgid "Received %1CTCP-%2 request by %3" msgstr "" -#: ../src/core/eventstringifier.cpp:544 +#: ../src/core/eventstringifier.cpp:721 #, qt-format msgctxt "EventStringifier|" msgid "Received CTCP-%1 answer from %2: %3" msgstr "" -#: ../src/core/eventstringifier.cpp:555 +#: ../src/core/eventstringifier.cpp:736 #, qt-format msgctxt "EventStringifier|" msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time" msgstr "收到了来自 %1 的 CTCP PING 回应，往返时间为 %2 秒" -#: ../src/client/execwrapper.cpp:45 +#: ../src/client/execwrapper.cpp:49 #, qt-format msgctxt "ExecWrapper|" msgid "Invalid command string for /exec: %1" msgstr "/exec 的命令字符串无效：%1" -#: ../src/client/execwrapper.cpp:53 +#: ../src/client/execwrapper.cpp:58 #, qt-format msgctxt "ExecWrapper|" msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!" msgstr "名称“%1”无效：不允许使用 ../ 或 ..\\！" -#: ../src/client/execwrapper.cpp:64 +#: ../src/client/execwrapper.cpp:69 #, qt-format msgctxt "ExecWrapper|" msgid "Could not find script \"%1\"" msgstr "找不到脚本“%1”" -#: ../src/client/execwrapper.cpp:82 +#: ../src/client/execwrapper.cpp:93 #, qt-format msgctxt "ExecWrapper|" msgid "Script \"%1\" crashed with exit code %2." msgstr "脚本“%1”已崩溃，退出码为 %2。" -#: ../src/client/execwrapper.cpp:98 +#: ../src/client/execwrapper.cpp:111 #, qt-format msgctxt "ExecWrapper|" msgid "Script \"%1\" could not start." msgstr "脚本“%1”无法启动。" -#: ../src/client/execwrapper.cpp:100 +#: ../src/client/execwrapper.cpp:113 #, qt-format msgctxt "ExecWrapper|" msgid "Script \"%1\" caused error %2." msgstr "脚本“%1”导致了错误 %2。" -#: ../src/uisupport/fontselector.cpp:31 +#: ../src/uisupport/fontselector.cpp:32 msgctxt "FontSelector|" msgid "Choose..." msgstr "选择..." -#: ../src/qtui/settingspages/highlightsettingspage.ui:13 +#: ../src/qtui/settingspages/highlightsettingspage.ui:14 msgctxt "HighlightSettingsPage|" msgid "Form" msgstr "表单" -#: ../src/qtui/settingspages/highlightsettingspage.ui:19 +#: ../src/qtui/settingspages/highlightsettingspage.ui:20 msgctxt "HighlightSettingsPage|" msgid "Custom Highlights" msgstr "自定义突出显示" -#: ../src/qtui/settingspages/highlightsettingspage.ui:32 -#: ../src/qtui/settingspages/highlightsettingspage.cpp:30 +#: ../src/qtui/settingspages/highlightsettingspage.ui:33 +#: ../src/qtui/settingspages/highlightsettingspage.cpp:29 msgctxt "HighlightSettingsPage|" msgid "Highlight" msgstr "突出显示" -#: ../src/qtui/settingspages/highlightsettingspage.ui:37 +#: ../src/qtui/settingspages/highlightsettingspage.ui:38 msgctxt "HighlightSettingsPage|" msgid "RegEx" msgstr "匹配表达式" -#: ../src/qtui/settingspages/highlightsettingspage.ui:42 +#: ../src/qtui/settingspages/highlightsettingspage.ui:43 msgctxt "HighlightSettingsPage|" msgid "CS" msgstr "CS" -#: ../src/qtui/settingspages/highlightsettingspage.ui:47 +#: ../src/qtui/settingspages/highlightsettingspage.ui:48 msgctxt "HighlightSettingsPage|" msgid "Enable" msgstr "启用" -#: ../src/qtui/settingspages/highlightsettingspage.ui:55 +#: ../src/qtui/settingspages/highlightsettingspage.ui:53 +msgctxt "HighlightSettingsPage|" +msgid "Channel" +msgstr "频道" + +#: ../src/qtui/settingspages/highlightsettingspage.ui:69 msgctxt "HighlightSettingsPage|" msgid "Add" msgstr "添加" -#: ../src/qtui/settingspages/highlightsettingspage.ui:62 +#: ../src/qtui/settingspages/highlightsettingspage.ui:76 msgctxt "HighlightSettingsPage|" msgid "Remove" msgstr "移除" -#: ../src/qtui/settingspages/highlightsettingspage.ui:85 +#: ../src/qtui/settingspages/highlightsettingspage.ui:101 msgctxt "HighlightSettingsPage|" msgid "Highlight Nicks" msgstr "突出显示昵称" -#: ../src/qtui/settingspages/highlightsettingspage.ui:91 +#: ../src/qtui/settingspages/highlightsettingspage.ui:107 msgctxt "HighlightSettingsPage|" msgid "All nicks from identity" msgstr "对应身份的所有昵称" -#: ../src/qtui/settingspages/highlightsettingspage.ui:98 +#: ../src/qtui/settingspages/highlightsettingspage.ui:114 msgctxt "HighlightSettingsPage|" msgid "Current nick" msgstr "当前昵称" -#: ../src/qtui/settingspages/highlightsettingspage.ui:108 +#: ../src/qtui/settingspages/highlightsettingspage.ui:124 msgctxt "HighlightSettingsPage|" msgid "None" msgstr "无" -#: ../src/qtui/settingspages/highlightsettingspage.ui:115 +#: ../src/qtui/settingspages/highlightsettingspage.ui:131 msgctxt "HighlightSettingsPage|" msgid "Case sensitive" msgstr "区分太小写" -#: ../src/qtui/settingspages/highlightsettingspage.cpp:30 +#: ../src/qtui/settingspages/highlightsettingspage.cpp:29 msgctxt "HighlightSettingsPage|" msgid "Interface" msgstr "接口" -#: ../src/qtui/settingspages/highlightsettingspage.cpp:159 +#: ../src/qtui/settingspages/highlightsettingspage.cpp:184 msgctxt "HighlightSettingsPage|" msgid "this shouldn't be empty" msgstr "这项不能为空" -#: ../src/qtui/settingspages/highlightsettingspage.h:45 +#: ../src/qtui/settingspages/highlightsettingspage.h:46 msgctxt "HighlightSettingsPage|" msgid "highlight rule" msgstr "高亮规则" #: ../src/qtui/settingspages/identitiessettingspage.ui:31 -#: ../src/qtui/settingspages/identitiessettingspage.cpp:322 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:370 msgctxt "IdentitiesSettingsPage|" msgid "Rename Identity" msgstr "重命名身份" @@ -2732,91 +2887,91 @@ msgctxt "IdentitiesSettingsPage|" msgid "Identities" msgstr "身份" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:178 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:205 msgctxt "IdentitiesSettingsPage|" msgid "" "The following problems need to be corrected before your changes can be " "applied:
    " msgstr "在应用更改前，您需要修正收下问题：
      " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:179 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:206 msgctxt "IdentitiesSettingsPage|" msgid "
    • All identities need an identity name set
      • " msgstr "
    • 所有的身份需要一个身份名称组
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:180 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:207 msgctxt "IdentitiesSettingsPage|" msgid "
    • Every identity needs at least one nickname defined
      • " msgstr "
    • 每个身份必须定义至少一个昵称
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:181 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:208 msgctxt "IdentitiesSettingsPage|" msgid "
    • You need to specify a real name for every identity
      • " msgstr "
    • 您必须为每个身份指定一个真名
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:182 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:209 msgctxt "IdentitiesSettingsPage|" msgid "
    • You need to specify an ident for every identity
      • " msgstr "
    • 您需要为每个身份指定一个标识(ID)
      • " -#: ../src/qtui/settingspages/identitiessettingspage.cpp:183 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:210 msgctxt "IdentitiesSettingsPage|" msgid "
    " msgstr "
" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:184 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:211 msgctxt "IdentitiesSettingsPage|" msgid "One or more identities are invalid" msgstr "一个或多个身份无效" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:310 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:356 msgctxt "IdentitiesSettingsPage|" msgid "Delete Identity?" msgstr "删除身份？" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:311 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:357 #, qt-format msgctxt "IdentitiesSettingsPage|" msgid "Do you really want to delete identity \"%1\"?" msgstr "您真的要删除身份“%1”？" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:323 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:371 #, qt-format msgctxt "IdentitiesSettingsPage|" msgid "Please enter a new name for the identity \"%1\"!" msgstr "请为“%1”这个身份输入一个新名称！" -#: ../src/common/identity.cpp:134 +#: ../src/common/identity.cpp:147 msgctxt "Identity|" msgid "Quassel IRC User" msgstr "Quassel IRC 用户" -#: ../src/common/identity.cpp:162 +#: ../src/common/identity.cpp:177 msgctxt "Identity|" msgid "" msgstr "<空>" -#: ../src/common/identity.cpp:168 +#: ../src/common/identity.cpp:183 msgctxt "Identity|" msgid "Gone fishing." msgstr "去钓鱼了。" -#: ../src/common/identity.cpp:172 +#: ../src/common/identity.cpp:187 msgctxt "Identity|" msgid "Not here. No, really. not here!" msgstr "不在。真的，真不在！" -#: ../src/common/identity.cpp:175 +#: ../src/common/identity.cpp:190 msgctxt "Identity|" msgid "All Quassel clients vanished from the face of the earth..." msgstr "所有的 Quassel 客户端从地球表面消失了..." -#: ../src/common/identity.cpp:178 +#: ../src/common/identity.cpp:193 msgctxt "Identity|" msgid "Kindergarten is elsewhere!" msgstr "这儿不欢迎小朋友！" -#: ../src/common/identity.cpp:179 ../src/common/identity.cpp:180 +#: ../src/common/identity.cpp:194 ../src/common/identity.cpp:195 msgctxt "Identity|" msgid "http://quassel-irc.org - Chat comfortably. Anywhere." msgstr "http://quassel-irc.org - 随时随地畅谈。" @@ -2950,7 +3105,7 @@ msgid "minutes of being idle" msgstr "空闲的分钟数" #: ../src/qtui/settingspages/identityeditwidget.ui:399 -#: ../src/qtui/settingspages/identityeditwidget.cpp:219 +#: ../src/qtui/settingspages/identityeditwidget.cpp:238 msgctxt "IdentityEditWidget|" msgid "Advanced" msgstr "高级" @@ -3016,16 +3171,16 @@ msgid "Key Type:" msgstr "密钥类型：" #: ../src/qtui/settingspages/identityeditwidget.ui:605 -#: ../src/qtui/settingspages/identityeditwidget.cpp:317 -#: ../src/qtui/settingspages/identityeditwidget.cpp:328 +#: ../src/qtui/settingspages/identityeditwidget.cpp:353 +#: ../src/qtui/settingspages/identityeditwidget.cpp:365 msgctxt "IdentityEditWidget|" msgid "No Key loaded" msgstr "没有加载密钥" #: ../src/qtui/settingspages/identityeditwidget.ui:625 #: ../src/qtui/settingspages/identityeditwidget.ui:723 -#: ../src/qtui/settingspages/identityeditwidget.cpp:318 -#: ../src/qtui/settingspages/identityeditwidget.cpp:365 +#: ../src/qtui/settingspages/identityeditwidget.cpp:354 +#: ../src/qtui/settingspages/identityeditwidget.cpp:408 msgctxt "IdentityEditWidget|" msgid "Load" msgstr "加载" @@ -3042,8 +3197,8 @@ msgstr "组织：" #: ../src/qtui/settingspages/identityeditwidget.ui:663 #: ../src/qtui/settingspages/identityeditwidget.ui:697 -#: ../src/qtui/settingspages/identityeditwidget.cpp:363 -#: ../src/qtui/settingspages/identityeditwidget.cpp:364 +#: ../src/qtui/settingspages/identityeditwidget.cpp:406 +#: ../src/qtui/settingspages/identityeditwidget.cpp:407 msgctxt "IdentityEditWidget|" msgid "No Certificate loaded" msgstr "没有加载证书" @@ -3053,38 +3208,50 @@ msgctxt "IdentityEditWidget|" msgid "CommonName:" msgstr "常用名：" -#: ../src/qtui/settingspages/identityeditwidget.cpp:290 +#: ../src/qtui/settingspages/identityeditwidget.cpp:321 msgctxt "IdentityEditWidget|" msgid "Load a Key" msgstr "加载密钥" -#: ../src/qtui/settingspages/identityeditwidget.cpp:322 +#: ../src/qtui/settingspages/identityeditwidget.cpp:344 +msgctxt "IdentityEditWidget|" +msgid "Failed to read key" +msgstr "" + +#: ../src/qtui/settingspages/identityeditwidget.cpp:344 +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 msgctxt "IdentityEditWidget|" msgid "RSA" msgstr "RSA" -#: ../src/qtui/settingspages/identityeditwidget.cpp:325 +#: ../src/qtui/settingspages/identityeditwidget.cpp:362 msgctxt "IdentityEditWidget|" msgid "DSA" msgstr "DSA" -#: ../src/qtui/settingspages/identityeditwidget.cpp:330 -#: ../src/qtui/settingspages/identityeditwidget.cpp:369 +#: ../src/qtui/settingspages/identityeditwidget.cpp:367 +#: ../src/qtui/settingspages/identityeditwidget.cpp:413 msgctxt "IdentityEditWidget|" msgid "Clear" msgstr "清除" -#: ../src/qtui/settingspages/identityeditwidget.cpp:340 +#: ../src/qtui/settingspages/identityeditwidget.cpp:379 msgctxt "IdentityEditWidget|" msgid "Load a Certificate" msgstr "加载证书" -#: ../src/qtui/ircconnectionwizard.cpp:107 +#: ../src/qtui/ircconnectionwizard.cpp:115 msgctxt "IdentityPage|" msgid "Setup Identity" msgstr "设置身份" -#: ../src/qtui/ircconnectionwizard.cpp:112 +#: ../src/qtui/ircconnectionwizard.cpp:120 msgctxt "IdentityPage|" msgid "Default Identity" msgstr "默认身份" @@ -3247,14 +3414,14 @@ msgctxt "IgnoreListEditDlg|" msgid "Rule is enabled" msgstr "规则已启用" -#: ../src/qtui/settingspages/ignorelistmodel.cpp:69 +#: ../src/qtui/settingspages/ignorelistmodel.cpp:71 msgctxt "IgnoreListModel|" msgid "" "Enable / Disable:
Only enabled rules are filtered.
For " "dynamic rules, disabling actually shows the filtered messages again" msgstr "允许/禁止：
只有被允许的规则被过滤。
对于动态规则，禁止实际上将再次显示了被过滤的信息。" -#: ../src/qtui/settingspages/ignorelistmodel.cpp:73 +#: ../src/qtui/settingspages/ignorelistmodel.cpp:75 msgctxt "IgnoreListModel|" msgid "" "Ignore rule:
Depending on the type of the rule, the text is " @@ -3267,27 +3434,27 @@ msgid "" "host
" msgstr "" -#: ../src/qtui/settingspages/ignorelistmodel.cpp:89 +#: ../src/qtui/settingspages/ignorelistmodel.cpp:91 msgctxt "IgnoreListModel|" msgid "By Sender" msgstr "按发送方" -#: ../src/qtui/settingspages/ignorelistmodel.cpp:91 +#: ../src/qtui/settingspages/ignorelistmodel.cpp:93 msgctxt "IgnoreListModel|" msgid "By Message" msgstr "按消息" -#: ../src/qtui/settingspages/ignorelistmodel.cpp:193 +#: ../src/qtui/settingspages/ignorelistmodel.cpp:208 msgctxt "IgnoreListModel|" msgid "Enabled" msgstr "已启用" -#: ../src/qtui/settingspages/ignorelistmodel.cpp:194 +#: ../src/qtui/settingspages/ignorelistmodel.cpp:209 msgctxt "IgnoreListModel|" msgid "Type" msgstr "类型" -#: ../src/qtui/settingspages/ignorelistmodel.cpp:195 +#: ../src/qtui/settingspages/ignorelistmodel.cpp:210 msgctxt "IgnoreListModel|" msgid "Ignore Rule" msgstr "忽略规则" @@ -3322,12 +3489,12 @@ msgctxt "IgnoreListSettingsPage|" msgid "Ignore List" msgstr "忽略列表" -#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128 +#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144 msgctxt "IgnoreListSettingsPage|" msgid "Rule already exists" msgstr "规则已存在" -#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129 +#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145 #, qt-format msgctxt "IgnoreListSettingsPage|" msgid "" @@ -3358,92 +3525,92 @@ msgctxt "InputWidget|" msgid "Form" msgstr "表单" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "White" msgstr "白色" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Black" msgstr "黑色" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Dark blue" msgstr "深蓝" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Dark green" msgstr "暗绿" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Red" msgstr "红色" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Dark red" msgstr "深红" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Dark magenta" msgstr "深洋红" -#: ../src/qtui/inputwidget.cpp:73 +#: ../src/qtui/inputwidget.cpp:74 msgctxt "InputWidget|" msgid "Orange" msgstr "橙色" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Yellow" msgstr "黄色" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Green" msgstr "绿色" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Dark cyan" msgstr "暗青色" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Cyan" msgstr "青色" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Blue" msgstr "蓝色" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Magenta" msgstr "洋红色" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Dark gray" msgstr "深灰色" -#: ../src/qtui/inputwidget.cpp:74 +#: ../src/qtui/inputwidget.cpp:75 msgctxt "InputWidget|" msgid "Light gray" msgstr "浅灰色" -#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85 +#: ../src/qtui/inputwidget.cpp:85 ../src/qtui/inputwidget.cpp:86 msgctxt "InputWidget|" msgid "Clear Color" msgstr "清除颜色" -#: ../src/qtui/inputwidget.cpp:132 +#: ../src/qtui/inputwidget.cpp:133 msgctxt "InputWidget|" msgid "Focus Input Line" msgstr "聚焦输入行" @@ -3528,54 +3695,59 @@ msgctxt "InputWidgetSettingsPage|" msgid "Add space after nick when completing mid-sentence" msgstr "" -#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23 +#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24 msgctxt "InputWidgetSettingsPage|" msgid "Interface" msgstr "接口" -#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23 +#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24 msgctxt "InputWidgetSettingsPage|" msgid "Input Widget" msgstr "输入组件" -#: ../src/qtui/ircconnectionwizard.cpp:51 +#: ../src/common/internalpeer.cpp:58 +msgctxt "InternalPeer|" +msgid "internal connection" +msgstr "" + +#: ../src/qtui/ircconnectionwizard.cpp:49 msgctxt "IrcConnectionWizard|" msgid "Save && Connect" msgstr "保存并连接" -#: ../src/client/irclistmodel.cpp:59 +#: ../src/client/irclistmodel.cpp:65 msgctxt "IrcListModel|" msgid "Channel" msgstr "频道" -#: ../src/client/irclistmodel.cpp:60 +#: ../src/client/irclistmodel.cpp:66 msgctxt "IrcListModel|" msgid "Users" msgstr "用户" -#: ../src/client/irclistmodel.cpp:61 +#: ../src/client/irclistmodel.cpp:67 msgctxt "IrcListModel|" msgid "Topic" msgstr "主题" -#: ../src/client/networkmodel.cpp:806 +#: ../src/client/networkmodel.cpp:914 msgctxt "IrcUserItem|" msgid " is away" msgstr " 状态为离开" -#: ../src/client/networkmodel.cpp:821 +#: ../src/client/networkmodel.cpp:929 #, qt-format msgctxt "IrcUserItem|" msgid "idling since %1" msgstr "空闲自从 %1" -#: ../src/client/networkmodel.cpp:824 +#: ../src/client/networkmodel.cpp:932 #, qt-format msgctxt "IrcUserItem|" msgid "login time: %1" msgstr "登录时间：%1" -#: ../src/client/networkmodel.cpp:827 +#: ../src/client/networkmodel.cpp:935 #, qt-format msgctxt "IrcUserItem|" msgid "server: %1" @@ -3667,108 +3839,108 @@ msgctxt "ItemViewSettingsPage|" msgid "Away:" msgstr "离开：" -#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28 +#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29 msgctxt "ItemViewSettingsPage|" msgid "Interface" msgstr "接口" -#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28 +#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29 msgctxt "ItemViewSettingsPage|" msgid "Chat & Nick Lists" msgstr "聊天和昵称列表" -#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33 +#: ../src/qtui/settingspages/itemviewsettingspage.cpp:34 msgctxt "ItemViewSettingsPage|" msgid "Network" msgstr "网络" -#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36 +#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37 msgctxt "ItemViewSettingsPage|" msgid "Inactive" msgstr "未活动的" -#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37 +#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38 msgctxt "ItemViewSettingsPage|" msgid "Normal" msgstr "正常" -#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38 +#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39 msgctxt "ItemViewSettingsPage|" msgid "Unread messages" msgstr "未读消息" -#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39 +#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40 msgctxt "ItemViewSettingsPage|" msgid "Highlight" msgstr "突出显示" -#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40 +#: ../src/qtui/settingspages/itemviewsettingspage.cpp:41 msgctxt "ItemViewSettingsPage|" msgid "Other activity" msgstr "其他活动" -#: ../src/qtui/knotificationbackend.cpp:115 +#: ../src/qtui/knotificationbackend.cpp:130 #, qt-format msgctxt "KNotificationBackend|" msgid "%n pending highlight(s)" msgid_plural "%n pending highlight(s)" msgstr[0] "" -#: ../src/qtui/settingspages/keysequencewidget.cpp:77 +#: ../src/qtui/settingspages/keysequencewidget.cpp:80 msgctxt "KeySequenceButton|" msgid "The key you just pressed is not supported by Qt." msgstr "Qt 尚不支持您刚才按下的键。" -#: ../src/qtui/settingspages/keysequencewidget.cpp:78 +#: ../src/qtui/settingspages/keysequencewidget.cpp:81 msgctxt "KeySequenceButton|" msgid "Unsupported Key" msgstr "不支持的键" -#: ../src/qtui/settingspages/keysequencewidget.cpp:169 +#: ../src/qtui/settingspages/keysequencewidget.cpp:176 msgctxt "KeySequenceWidget|" msgid "" "Click on the button, then enter the shortcut like you would in the program.\n" "Example for Ctrl+a: hold the Ctrl key and press a." msgstr "单击此按钮，然后和在程序中一样输入快捷方式。\n比如 Ctrl+a 就是按住 Ctrl 键再按下 a。" -#: ../src/qtui/settingspages/keysequencewidget.cpp:259 +#: ../src/qtui/settingspages/keysequencewidget.cpp:274 msgctxt "KeySequenceWidget|Meta key" msgid "Meta" msgstr "Meta" -#: ../src/qtui/settingspages/keysequencewidget.cpp:260 +#: ../src/qtui/settingspages/keysequencewidget.cpp:275 msgctxt "KeySequenceWidget|Ctrl key" msgid "Ctrl" msgstr "Ctrl" -#: ../src/qtui/settingspages/keysequencewidget.cpp:261 +#: ../src/qtui/settingspages/keysequencewidget.cpp:276 msgctxt "KeySequenceWidget|Alt key" msgid "Alt" msgstr "Alt" -#: ../src/qtui/settingspages/keysequencewidget.cpp:262 +#: ../src/qtui/settingspages/keysequencewidget.cpp:277 msgctxt "KeySequenceWidget|Shift key" msgid "Shift" msgstr "Shift" -#: ../src/qtui/settingspages/keysequencewidget.cpp:265 +#: ../src/qtui/settingspages/keysequencewidget.cpp:281 msgctxt "" "KeySequenceWidget|What the user inputs now will be taken as the new shortcut" msgid "Input" msgstr "输入" -#: ../src/qtui/settingspages/keysequencewidget.cpp:272 +#: ../src/qtui/settingspages/keysequencewidget.cpp:288 msgctxt "KeySequenceWidget|No shortcut defined" msgid "None" msgstr "无" -#: ../src/qtui/settingspages/keysequencewidget.cpp:355 -#: ../src/qtui/settingspages/keysequencewidget.cpp:361 +#: ../src/qtui/settingspages/keysequencewidget.cpp:383 +#: ../src/qtui/settingspages/keysequencewidget.cpp:389 msgctxt "KeySequenceWidget|" msgid "Shortcut Conflict" msgstr "快捷键冲突" -#: ../src/qtui/settingspages/keysequencewidget.cpp:356 +#: ../src/qtui/settingspages/keysequencewidget.cpp:384 #, qt-format msgctxt "KeySequenceWidget|" msgid "" @@ -3776,396 +3948,413 @@ msgid "" "Please choose another one." msgstr "“%1”这个快捷键已经使用，无法配置。\n请另选一个。" -#: ../src/qtui/settingspages/keysequencewidget.cpp:362 +#: ../src/qtui/settingspages/keysequencewidget.cpp:390 #, qt-format msgctxt "KeySequenceWidget|" msgid "" "The \"%1\" shortcut is ambiguous with the shortcut for the following action:" msgstr "“%1”这个快捷键与对应以下动作的快捷键有歧义：" -#: ../src/qtui/settingspages/keysequencewidget.cpp:364 +#: ../src/qtui/settingspages/keysequencewidget.cpp:392 msgctxt "KeySequenceWidget|" msgid "Do you want to reassign this shortcut to the selected action?" msgstr "您想将这个快捷键重新指派给选择的操作吗？" -#: ../src/qtui/settingspages/keysequencewidget.cpp:367 +#: ../src/qtui/settingspages/keysequencewidget.cpp:395 msgctxt "KeySequenceWidget|" msgid "Reassign" msgstr "重新指派" -#: ../src/qtui/mainwin.cpp:313 +#: ../src/common/protocols/legacy/legacypeer.cpp:175 +msgctxt "LegacyPeer|" +msgid "Invalid handshake message!" +msgstr "" + +#: ../src/common/protocols/legacy/legacypeer.cpp:246 +#, qt-format +msgctxt "LegacyPeer|" +msgid "Unknown protocol message of type %1" +msgstr "" + +#: ../src/common/protocols/legacy/legacypeer.cpp:295 +#, qt-format +msgctxt "LegacyPeer|" +msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)" +msgstr "Quassel 核心版本 %1
编译：%2
已运行 %3天%4小时%5分(始于 %6)" + +#: ../src/qtui/mainwin.cpp:358 msgctxt "MainWin|" msgid "General" msgstr "常规" -#: ../src/qtui/mainwin.cpp:315 +#: ../src/qtui/mainwin.cpp:360 msgctxt "MainWin|" msgid "&Connect to Core..." msgstr "连接到核心(&C)..." -#: ../src/qtui/mainwin.cpp:317 +#: ../src/qtui/mainwin.cpp:362 msgctxt "MainWin|" msgid "&Disconnect from Core" msgstr "从核心断开(&D)" -#: ../src/qtui/mainwin.cpp:319 +#: ../src/qtui/mainwin.cpp:364 msgctxt "MainWin|" msgid "Core &Info..." msgstr "核心信息(&I)..." -#: ../src/qtui/mainwin.cpp:321 +#: ../src/qtui/mainwin.cpp:366 msgctxt "MainWin|" msgid "Configure &Networks..." msgstr "配置网络(&N)..." -#: ../src/qtui/mainwin.cpp:324 +#: ../src/qtui/mainwin.cpp:369 msgctxt "MainWin|" msgid "&Quit" msgstr "退出(&Q)" -#: ../src/qtui/mainwin.cpp:328 +#: ../src/qtui/mainwin.cpp:373 msgctxt "MainWin|" msgid "&Configure Chat Lists..." msgstr "配置聊天列表(&C)..." -#: ../src/qtui/mainwin.cpp:331 +#: ../src/qtui/mainwin.cpp:376 msgctxt "MainWin|" msgid "&Lock Layout" msgstr "锁定布局(&L)" -#: ../src/qtui/mainwin.cpp:335 +#: ../src/qtui/mainwin.cpp:380 msgctxt "MainWin|" msgid "Show &Search Bar" msgstr "显示搜索栏(&S)" -#: ../src/qtui/mainwin.cpp:337 +#: ../src/qtui/mainwin.cpp:382 msgctxt "MainWin|" msgid "Show Away Log" msgstr "显示离开记录" -#: ../src/qtui/mainwin.cpp:339 +#: ../src/qtui/mainwin.cpp:384 msgctxt "MainWin|" msgid "Show &Menubar" msgstr "显示菜单栏(&M)" -#: ../src/qtui/mainwin.cpp:342 +#: ../src/qtui/mainwin.cpp:387 msgctxt "MainWin|" msgid "Show Status &Bar" msgstr "显示状态栏(&B)" -#: ../src/qtui/mainwin.cpp:348 +#: ../src/qtui/mainwin.cpp:393 msgctxt "MainWin|" msgid "&Full Screen Mode" msgstr "全屏模式(&F)" -#: ../src/qtui/mainwin.cpp:355 +#: ../src/qtui/mainwin.cpp:400 msgctxt "MainWin|" msgid "Configure &Shortcuts..." msgstr "配置快捷键(&S)..." -#: ../src/qtui/mainwin.cpp:361 ../src/qtui/mainwin.cpp:365 +#: ../src/qtui/mainwin.cpp:406 ../src/qtui/mainwin.cpp:410 msgctxt "MainWin|" msgid "&Configure Quassel..." msgstr "配置 Quassel(&C)..." -#: ../src/qtui/mainwin.cpp:371 +#: ../src/qtui/mainwin.cpp:416 msgctxt "MainWin|" msgid "&About Quassel" msgstr "关于 Quassel(&A)" -#: ../src/qtui/mainwin.cpp:376 +#: ../src/qtui/mainwin.cpp:421 msgctxt "MainWin|" msgid "About &Qt" msgstr "关于&Qt" -#: ../src/qtui/mainwin.cpp:380 +#: ../src/qtui/mainwin.cpp:425 msgctxt "MainWin|" msgid "Debug &NetworkModel" msgstr "调试网络模型(&N)" -#: ../src/qtui/mainwin.cpp:382 +#: ../src/qtui/mainwin.cpp:427 msgctxt "MainWin|" msgid "Debug &BufferViewOverlay" msgstr "调试缓存视图覆盖(&B)" -#: ../src/qtui/mainwin.cpp:384 +#: ../src/qtui/mainwin.cpp:429 msgctxt "MainWin|" msgid "Debug &MessageModel" msgstr "调试消息模型(&M)" -#: ../src/qtui/mainwin.cpp:386 +#: ../src/qtui/mainwin.cpp:431 msgctxt "MainWin|" msgid "Debug &HotList" msgstr "调试日志(&L)" -#: ../src/qtui/mainwin.cpp:388 +#: ../src/qtui/mainwin.cpp:433 msgctxt "MainWin|" msgid "Debug &Log" msgstr "调试日志(&L)" -#: ../src/qtui/mainwin.cpp:390 +#: ../src/qtui/mainwin.cpp:435 msgctxt "MainWin|" msgid "Reload Stylesheet" msgstr "重新加载样式表" -#: ../src/qtui/mainwin.cpp:393 +#: ../src/qtui/mainwin.cpp:438 msgctxt "MainWin|" msgid "Hide Current Buffer" msgstr "" -#: ../src/qtui/mainwin.cpp:397 +#: ../src/qtui/mainwin.cpp:442 msgctxt "MainWin|" msgid "Navigation" msgstr "导航" -#: ../src/qtui/mainwin.cpp:399 +#: ../src/qtui/mainwin.cpp:444 msgctxt "MainWin|" msgid "Jump to hot chat" msgstr "" -#: ../src/qtui/mainwin.cpp:411 +#: ../src/qtui/mainwin.cpp:456 msgctxt "MainWin|" msgid "Set Quick Access #0" msgstr "设置快速访问 #0" -#: ../src/qtui/mainwin.cpp:413 +#: ../src/qtui/mainwin.cpp:458 msgctxt "MainWin|" msgid "Set Quick Access #1" msgstr "设置快速访问 #1" -#: ../src/qtui/mainwin.cpp:415 +#: ../src/qtui/mainwin.cpp:460 msgctxt "MainWin|" msgid "Set Quick Access #2" msgstr "设置快速访问 #2" -#: ../src/qtui/mainwin.cpp:417 +#: ../src/qtui/mainwin.cpp:462 msgctxt "MainWin|" msgid "Set Quick Access #3" msgstr "设置快速访问 #3" -#: ../src/qtui/mainwin.cpp:419 +#: ../src/qtui/mainwin.cpp:464 msgctxt "MainWin|" msgid "Set Quick Access #4" msgstr "设置快速访问 #4" -#: ../src/qtui/mainwin.cpp:421 +#: ../src/qtui/mainwin.cpp:466 msgctxt "MainWin|" msgid "Set Quick Access #5" msgstr "设置快速访问 #5" -#: ../src/qtui/mainwin.cpp:423 +#: ../src/qtui/mainwin.cpp:468 msgctxt "MainWin|" msgid "Set Quick Access #6" msgstr "设置快速访问 #6" -#: ../src/qtui/mainwin.cpp:425 +#: ../src/qtui/mainwin.cpp:470 msgctxt "MainWin|" msgid "Set Quick Access #7" msgstr "设置快速访问 #7" -#: ../src/qtui/mainwin.cpp:427 +#: ../src/qtui/mainwin.cpp:472 msgctxt "MainWin|" msgid "Set Quick Access #8" msgstr "设置快速访问 #8" -#: ../src/qtui/mainwin.cpp:429 +#: ../src/qtui/mainwin.cpp:474 msgctxt "MainWin|" msgid "Set Quick Access #9" msgstr "设置快速访问 #9" -#: ../src/qtui/mainwin.cpp:432 +#: ../src/qtui/mainwin.cpp:477 msgctxt "MainWin|" msgid "Quick Access #0" msgstr "快速访问 #0" -#: ../src/qtui/mainwin.cpp:434 +#: ../src/qtui/mainwin.cpp:479 msgctxt "MainWin|" msgid "Quick Access #1" msgstr "快速访问 #1" -#: ../src/qtui/mainwin.cpp:436 +#: ../src/qtui/mainwin.cpp:481 msgctxt "MainWin|" msgid "Quick Access #2" msgstr "快速访问 #2" -#: ../src/qtui/mainwin.cpp:438 +#: ../src/qtui/mainwin.cpp:483 msgctxt "MainWin|" msgid "Quick Access #3" msgstr "快速访问 #3" -#: ../src/qtui/mainwin.cpp:440 +#: ../src/qtui/mainwin.cpp:485 msgctxt "MainWin|" msgid "Quick Access #4" msgstr "快速访问 #4" -#: ../src/qtui/mainwin.cpp:442 +#: ../src/qtui/mainwin.cpp:487 msgctxt "MainWin|" msgid "Quick Access #5" msgstr "快速访问 #5" -#: ../src/qtui/mainwin.cpp:444 +#: ../src/qtui/mainwin.cpp:489 msgctxt "MainWin|" msgid "Quick Access #6" msgstr "快速访问 #6" -#: ../src/qtui/mainwin.cpp:446 +#: ../src/qtui/mainwin.cpp:491 msgctxt "MainWin|" msgid "Quick Access #7" msgstr "快速访问 #7" -#: ../src/qtui/mainwin.cpp:448 +#: ../src/qtui/mainwin.cpp:493 msgctxt "MainWin|" msgid "Quick Access #8" msgstr "快速访问 #8" -#: ../src/qtui/mainwin.cpp:450 +#: ../src/qtui/mainwin.cpp:495 msgctxt "MainWin|" msgid "Quick Access #9" msgstr "快速访问 #9" -#: ../src/qtui/mainwin.cpp:454 +#: ../src/qtui/mainwin.cpp:499 msgctxt "MainWin|" msgid "Activate Next Chat List" msgstr "激活下一个聊天列表" -#: ../src/qtui/mainwin.cpp:456 +#: ../src/qtui/mainwin.cpp:501 msgctxt "MainWin|" msgid "Activate Previous Chat List" msgstr "激活上一个聊天列表" -#: ../src/qtui/mainwin.cpp:458 +#: ../src/qtui/mainwin.cpp:503 msgctxt "MainWin|" msgid "Go to Next Chat" msgstr "转到下个聊天" -#: ../src/qtui/mainwin.cpp:460 +#: ../src/qtui/mainwin.cpp:505 msgctxt "MainWin|" msgid "Go to Previous Chat" msgstr "转到上个聊天" -#: ../src/qtui/mainwin.cpp:467 +#: ../src/qtui/mainwin.cpp:514 msgctxt "MainWin|" msgid "&File" msgstr "文件(&F)" -#: ../src/qtui/mainwin.cpp:480 +#: ../src/qtui/mainwin.cpp:527 msgctxt "MainWin|" msgid "&Networks" msgstr "网络(&N)" -#: ../src/qtui/mainwin.cpp:486 +#: ../src/qtui/mainwin.cpp:533 msgctxt "MainWin|" msgid "&View" msgstr "查看(&V)" -#: ../src/qtui/mainwin.cpp:487 +#: ../src/qtui/mainwin.cpp:534 msgctxt "MainWin|" msgid "&Chat Lists" msgstr "聊天列表(&C)" -#: ../src/qtui/mainwin.cpp:489 +#: ../src/qtui/mainwin.cpp:536 msgctxt "MainWin|" msgid "&Toolbars" msgstr "工具栏(&T)" -#: ../src/qtui/mainwin.cpp:503 +#: ../src/qtui/mainwin.cpp:550 msgctxt "MainWin|" msgid "&Settings" msgstr "设置(&S)" -#: ../src/qtui/mainwin.cpp:512 +#: ../src/qtui/mainwin.cpp:559 msgctxt "MainWin|" msgid "&Help" msgstr "帮助(&H)" -#: ../src/qtui/mainwin.cpp:520 +#: ../src/qtui/mainwin.cpp:567 msgctxt "MainWin|" msgid "Debug" msgstr "调试" -#: ../src/qtui/mainwin.cpp:755 +#: ../src/qtui/mainwin.cpp:843 msgctxt "MainWin|" msgid "Nicks" msgstr "昵称" -#: ../src/qtui/mainwin.cpp:764 +#: ../src/qtui/mainwin.cpp:852 msgctxt "MainWin|" msgid "Show Nick List" msgstr "显示昵称列表" -#: ../src/qtui/mainwin.cpp:775 +#: ../src/qtui/mainwin.cpp:865 msgctxt "MainWin|" msgid "Chat Monitor" msgstr "聊天监视器" -#: ../src/qtui/mainwin.cpp:787 +#: ../src/qtui/mainwin.cpp:877 msgctxt "MainWin|" msgid "Show Chat Monitor" msgstr "显示聊天监视器" -#: ../src/qtui/mainwin.cpp:791 +#: ../src/qtui/mainwin.cpp:883 msgctxt "MainWin|" msgid "Inputline" msgstr "输入行" -#: ../src/qtui/mainwin.cpp:800 +#: ../src/qtui/mainwin.cpp:892 msgctxt "MainWin|" msgid "Show Input Line" msgstr "显示输入行" -#: ../src/qtui/mainwin.cpp:813 +#: ../src/qtui/mainwin.cpp:907 msgctxt "MainWin|" msgid "Topic" msgstr "主题" -#: ../src/qtui/mainwin.cpp:825 +#: ../src/qtui/mainwin.cpp:919 msgctxt "MainWin|" msgid "Show Topic Line" msgstr "显示话题行" -#: ../src/qtui/mainwin.cpp:903 +#: ../src/qtui/mainwin.cpp:1013 msgctxt "MainWin|" msgid "Main Toolbar" msgstr "主工具栏" -#: ../src/qtui/mainwin.cpp:942 +#: ../src/qtui/mainwin.cpp:1058 msgctxt "MainWin|" msgid "Connected to core." msgstr "已连接到核心。" -#: ../src/qtui/mainwin.cpp:1033 +#: ../src/qtui/mainwin.cpp:1157 msgctxt "MainWin|" msgid "Not connected to core." msgstr "未连接到核心。" -#: ../src/qtui/mainwin.cpp:1047 ../src/qtui/mainwin.cpp:1055 +#: ../src/qtui/mainwin.cpp:1175 ../src/qtui/mainwin.cpp:1185 msgctxt "MainWin|" msgid "Unencrypted Connection" msgstr "未加密的连接" -#: ../src/qtui/mainwin.cpp:1047 +#: ../src/qtui/mainwin.cpp:1175 msgctxt "MainWin|" msgid "Your client does not support SSL encryption" msgstr "您的客户端不支持 SSL 加密" -#: ../src/qtui/mainwin.cpp:1049 ../src/qtui/mainwin.cpp:1057 +#: ../src/qtui/mainwin.cpp:1177 ../src/qtui/mainwin.cpp:1187 msgctxt "MainWin|" msgid "" "Sensitive data, like passwords, will be transmitted unencrypted to your " "Quassel core." msgstr "像密码这样的敏感信息将以未加密的形式转送到您的 Quassel 核心。" -#: ../src/qtui/mainwin.cpp:1055 +#: ../src/qtui/mainwin.cpp:1185 msgctxt "MainWin|" msgid "Your core does not support SSL encryption" msgstr "您的核心不支持 SSL 加密" -#: ../src/qtui/mainwin.cpp:1072 ../src/qtui/mainwin.cpp:1092 +#: ../src/qtui/mainwin.cpp:1203 ../src/qtui/mainwin.cpp:1224 msgctxt "MainWin|" msgid "Untrusted Security Certificate" msgstr "不信任的安全证书" -#: ../src/qtui/mainwin.cpp:1073 +#: ../src/qtui/mainwin.cpp:1204 #, qt-format msgctxt "MainWin|" msgid "" @@ -4173,38 +4362,38 @@ msgid "" "following reasons:" msgstr "核心于 %1 提供的 SSL 证书不可信，原因如下：" -#: ../src/qtui/mainwin.cpp:1076 +#: ../src/qtui/mainwin.cpp:1207 msgctxt "MainWin|" msgid "Continue" msgstr "继续" -#: ../src/qtui/mainwin.cpp:1077 +#: ../src/qtui/mainwin.cpp:1208 msgctxt "MainWin|" msgid "Show Certificate" msgstr "显示证书" -#: ../src/qtui/mainwin.cpp:1093 +#: ../src/qtui/mainwin.cpp:1225 msgctxt "MainWin|" msgid "" "Would you like to accept this certificate forever without being prompted?" msgstr "您想要永远接受此证书而不再提醒吗？" -#: ../src/qtui/mainwin.cpp:1095 +#: ../src/qtui/mainwin.cpp:1227 msgctxt "MainWin|" msgid "Current Session Only" msgstr "只对当前会话" -#: ../src/qtui/mainwin.cpp:1096 +#: ../src/qtui/mainwin.cpp:1228 msgctxt "MainWin|" msgid "Forever" msgstr "永远" -#: ../src/qtui/mainwin.cpp:1105 +#: ../src/qtui/mainwin.cpp:1239 msgctxt "MainWin|" msgid "Core Connection Error" msgstr "核心连接错误" -#: ../src/client/messagemodel.cpp:375 +#: ../src/client/messagemodel.cpp:404 #, qt-format msgctxt "MessageModel|" msgid "Requesting %1 messages from backlog for buffer %2:%3" @@ -4220,14 +4409,14 @@ msgctxt "MsgProcessorStatusWidget|" msgid "Receiving Backlog" msgstr "正在接收储备" -#: ../src/uisupport/multilineedit.cpp:661 +#: ../src/uisupport/multilineedit.cpp:718 #, qt-format msgctxt "MultiLineEdit|" 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:670 +#: ../src/uisupport/multilineedit.cpp:727 msgctxt "MultiLineEdit|" msgid "Paste Protection" msgstr "粘贴保护" @@ -4287,95 +4476,95 @@ msgctxt "NetworkEditDlg|" msgid "Please enter a network name:" msgstr "请输入一个网络名：" -#: ../src/qtui/settingspages/networkssettingspage.cpp:705 +#: ../src/qtui/settingspages/networkssettingspage.cpp:840 msgctxt "NetworkEditDlg|" msgid "Add Network" msgstr "添加网络" -#: ../src/client/networkmodel.cpp:196 +#: ../src/client/networkmodel.cpp:213 #, qt-format msgctxt "NetworkItem|" msgid "Server: %1" msgstr "服务器：%1" -#: ../src/client/networkmodel.cpp:197 +#: ../src/client/networkmodel.cpp:214 #, qt-format msgctxt "NetworkItem|" msgid "Users: %1" msgstr "用户：%1" -#: ../src/client/networkmodel.cpp:200 +#: ../src/client/networkmodel.cpp:217 #, qt-format msgctxt "NetworkItem|" msgid "Lag: %1 msecs" msgstr "延迟：%1 毫秒" -#: ../src/client/networkmodel.cpp:852 +#: ../src/client/networkmodel.cpp:963 msgctxt "NetworkModel|" msgid "Chat" msgstr "聊天" -#: ../src/client/networkmodel.cpp:852 +#: ../src/client/networkmodel.cpp:963 msgctxt "NetworkModel|" msgid "Topic" msgstr "主题" -#: ../src/client/networkmodel.cpp:852 +#: ../src/client/networkmodel.cpp:963 msgctxt "NetworkModel|" msgid "Nick Count" msgstr "昵称账户" -#: ../src/uisupport/networkmodelcontroller.cpp:154 +#: ../src/uisupport/networkmodelcontroller.cpp:177 msgctxt "NetworkModelController|" msgid "Do you want to delete the following buffer(s) permanently?" msgid_plural "Do you want to delete the following buffer(s) permanently?" msgstr[0] "您想永久删除以下缓冲区吗？" -#: ../src/uisupport/networkmodelcontroller.cpp:167 +#: ../src/uisupport/networkmodelcontroller.cpp:190 #, qt-format msgctxt "NetworkModelController|" msgid "...and %1 more

" msgstr "" -#: ../src/uisupport/networkmodelcontroller.cpp:168 +#: ../src/uisupport/networkmodelcontroller.cpp:191 msgctxt "NetworkModelController|" msgid "" "Note: This will delete all related data, including all backlog data, " "from the core's database and cannot be undone." msgstr "注意：这将从核心的数据库中删除所有相关的数据，包括所有储备数据，无法撤消。" -#: ../src/uisupport/networkmodelcontroller.cpp:170 +#: ../src/uisupport/networkmodelcontroller.cpp:193 msgctxt "NetworkModelController|" msgid "" "
Active channel buffers cannot be deleted, please part the channel first." msgstr "
活动的频道缓冲区不能删除，请先离开该频道。" -#: ../src/uisupport/networkmodelcontroller.cpp:172 +#: ../src/uisupport/networkmodelcontroller.cpp:195 msgctxt "NetworkModelController|" msgid "Remove buffers permanently?" msgstr "永久地移除缓冲区？" -#: ../src/uisupport/networkmodelcontroller.cpp:484 +#: ../src/uisupport/networkmodelcontroller.cpp:530 msgctxt "NetworkModelController::JoinDlg|" msgid "Join Channel" msgstr "加入频道" -#: ../src/uisupport/networkmodelcontroller.cpp:487 +#: ../src/uisupport/networkmodelcontroller.cpp:533 msgctxt "NetworkModelController::JoinDlg|" msgid "Network:" msgstr "网络：" -#: ../src/uisupport/networkmodelcontroller.cpp:489 +#: ../src/uisupport/networkmodelcontroller.cpp:535 msgctxt "NetworkModelController::JoinDlg|" msgid "Channel:" msgstr "频道：" -#: ../src/uisupport/networkmodelcontroller.cpp:491 +#: ../src/uisupport/networkmodelcontroller.cpp:537 msgctxt "NetworkModelController::JoinDlg|" msgid "Password:" msgstr "密码：" -#: ../src/qtui/ircconnectionwizard.cpp:148 +#: ../src/qtui/ircconnectionwizard.cpp:158 msgctxt "NetworkPage|" msgid "Setup Network Connection" msgstr "设置网络连接" @@ -4545,63 +4734,71 @@ msgctxt "NetworksSettingsPage|" msgid "Account:" msgstr "账户：" -#: ../src/qtui/settingspages/networkssettingspage.ui:649 +#: ../src/qtui/settingspages/networkssettingspage.ui:635 +msgctxt "NetworksSettingsPage|" +msgid "" +"

Note: because" +" the identity has an ssl certificate set, SASL EXTERNAL will be " +"used.

" +msgstr "" + +#: ../src/qtui/settingspages/networkssettingspage.ui:659 msgctxt "NetworksSettingsPage|" msgid "Encodings" msgstr "编码" -#: ../src/qtui/settingspages/networkssettingspage.ui:652 +#: ../src/qtui/settingspages/networkssettingspage.ui:662 msgctxt "NetworksSettingsPage|" msgid "" "Configure advanced settings such as message encodings and automatic " "reconnect" msgstr "配置高级设置，如消息编码和自动重连" -#: ../src/qtui/settingspages/networkssettingspage.ui:661 +#: ../src/qtui/settingspages/networkssettingspage.ui:671 msgctxt "NetworksSettingsPage|" msgid "Control encodings for in- and outgoing messages" msgstr "控制发送接收消息的编码" -#: ../src/qtui/settingspages/networkssettingspage.ui:664 +#: ../src/qtui/settingspages/networkssettingspage.ui:674 msgctxt "NetworksSettingsPage|" msgid "Use Custom Encodings" msgstr "使用自定义编码" -#: ../src/qtui/settingspages/networkssettingspage.ui:675 -#: ../src/qtui/settingspages/networkssettingspage.ui:695 +#: ../src/qtui/settingspages/networkssettingspage.ui:685 +#: ../src/qtui/settingspages/networkssettingspage.ui:705 msgctxt "NetworksSettingsPage|" msgid "" "Specify which encoding your messages will be sent in.\n" "UTF-8 should be a sane choice for most networks." msgstr "指定发送消息使用的编码。\n对所有网络来说，UTF-8 都是个明智的选择。" -#: ../src/qtui/settingspages/networkssettingspage.ui:679 +#: ../src/qtui/settingspages/networkssettingspage.ui:689 msgctxt "NetworksSettingsPage|" msgid "Send messages in:" msgstr "发送消息使用：" -#: ../src/qtui/settingspages/networkssettingspage.ui:706 -#: ../src/qtui/settingspages/networkssettingspage.ui:726 +#: ../src/qtui/settingspages/networkssettingspage.ui:716 +#: ../src/qtui/settingspages/networkssettingspage.ui:736 msgctxt "NetworksSettingsPage|" msgid "" "Incoming messages encoded in Utf8 will always be treated as such.\n" "This setting defines the encoding for messages that are not Utf8." msgstr "收到的以 Utf8 编码的消息总是会原样处理。\n此设置定义了那些不是 Utf8 的消息的编码。" -#: ../src/qtui/settingspages/networkssettingspage.ui:710 +#: ../src/qtui/settingspages/networkssettingspage.ui:720 msgctxt "NetworksSettingsPage|" msgid "Receive fallback:" msgstr "接收后备：" -#: ../src/qtui/settingspages/networkssettingspage.ui:737 -#: ../src/qtui/settingspages/networkssettingspage.ui:751 +#: ../src/qtui/settingspages/networkssettingspage.ui:747 +#: ../src/qtui/settingspages/networkssettingspage.ui:761 msgctxt "NetworksSettingsPage|" msgid "" "This specifies how control messages, nicks and servernames are encoded.\n" "Unless you *really* know what you do, leave this as ISO-8859-1!" msgstr "此项指定控制消息、昵称和服务器名称的编码。\n除非您*真的*知道这是什么意思，否则请保持默认值 ISO-8859-1！" -#: ../src/qtui/settingspages/networkssettingspage.ui:741 +#: ../src/qtui/settingspages/networkssettingspage.ui:751 msgctxt "NetworksSettingsPage|" msgid "Server encoding:" msgstr "服务器编码：" @@ -4616,34 +4813,34 @@ msgctxt "NetworksSettingsPage|" msgid "Networks" msgstr "网络" -#: ../src/qtui/settingspages/networkssettingspage.cpp:167 +#: ../src/qtui/settingspages/networkssettingspage.cpp:184 msgctxt "NetworksSettingsPage|" msgid "" "The following problems need to be corrected before your changes can be " "applied:
    " msgstr "在应用更改前，您需要修正收下问题：
      " -#: ../src/qtui/settingspages/networkssettingspage.cpp:168 +#: ../src/qtui/settingspages/networkssettingspage.cpp:185 msgctxt "NetworksSettingsPage|" msgid "
    • All networks need at least one server defined
      • " msgstr "
    • 所有的网络至少需要指定一个服务器
      • " -#: ../src/qtui/settingspages/networkssettingspage.cpp:169 +#: ../src/qtui/settingspages/networkssettingspage.cpp:186 msgctxt "NetworksSettingsPage|" msgid "
    " msgstr "
" -#: ../src/qtui/settingspages/networkssettingspage.cpp:170 +#: ../src/qtui/settingspages/networkssettingspage.cpp:187 msgctxt "NetworksSettingsPage|" msgid "Invalid Network Settings" msgstr "无效的网络设置" -#: ../src/qtui/settingspages/networkssettingspage.cpp:542 +#: ../src/qtui/settingspages/networkssettingspage.cpp:650 msgctxt "NetworksSettingsPage|" msgid "Delete Network?" msgstr "删除网络？" -#: ../src/qtui/settingspages/networkssettingspage.cpp:543 +#: ../src/qtui/settingspages/networkssettingspage.cpp:651 #, qt-format msgctxt "NetworksSettingsPage|" msgid "" @@ -4668,7 +4865,7 @@ msgid "" "the special characters {, }, [, ], \\, |, `, ^, _ and -." msgstr "有效的昵称可以包含英文字母、数字和{、}、[、]、\\、|、`、^、_ 和 - 这几个特殊字符。" -#: ../src/qtui/settingspages/identitiessettingspage.cpp:420 +#: ../src/qtui/settingspages/identitiessettingspage.cpp:480 msgctxt "NickEditDlg|" msgid "Add Nickname" msgstr "添加昵称" @@ -4683,7 +4880,7 @@ msgctxt "NotificationsSettingsPage|" msgid "Notifications" msgstr "通知" -#: ../src/qtui/phononnotificationbackend.cpp:143 +#: ../src/qtui/phononnotificationbackend.cpp:188 msgctxt "PhononNotificationBackend::ConfigWidget|" msgid "Select Audio File" msgstr "选择音频文件" @@ -4709,25 +4906,25 @@ msgctxt "PhononNotificationConfigWidget|" msgid "Select the sound file to play" msgstr "选择要播放的声音" -#: ../src/core/postgresqlstorage.cpp:62 +#: ../src/core/postgresqlstorage.cpp:72 msgctxt "PostgreSqlStorage|" msgid "PostgreSQL Turbo Bomber HD!" msgstr "" -#: ../src/client/backlogrequester.cpp:82 +#: ../src/client/backlogrequester.cpp:95 #, qt-format msgctxt "QObject|" msgid "Requesting a total of up to %1 backlog messages for %2 buffers" msgstr "正在请求 %2 缓冲区的总共最多 %1 条储备消息" -#: ../src/client/backlogrequester.cpp:106 +#: ../src/client/backlogrequester.cpp:122 #, qt-format msgctxt "QObject|" msgid "" "Requesting up to %1 of all unread backlog messages (plus additional %2)" msgstr "正在请求最多 %1 条未读储备消息(加上额外的 %2 条)" -#: ../src/client/backlogrequester.cpp:123 +#: ../src/client/backlogrequester.cpp:142 #, qt-format msgctxt "QObject|" msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers" @@ -4746,213 +4943,224 @@ msgid "" "wizard any time and use the settings dialog for more detailed changes." msgstr "此向导将帮助您设置自己的默认身份和您的 IRC 网络连接。
这里只包括基本的设置。您可以随时取消此向导，使用设置对话框来进行更详细的更改。" -#: ../src/uisupport/qssparser.cpp:121 ../src/uisupport/qssparser.cpp:166 -#: ../src/uisupport/qssparser.cpp:316 +#: ../src/uisupport/qssparser.cpp:128 ../src/uisupport/qssparser.cpp:178 +#: ../src/uisupport/qssparser.cpp:334 #, qt-format msgctxt "QssParser|" msgid "Invalid block declaration: %1" msgstr "无效的块声明：%1" -#: ../src/uisupport/qssparser.cpp:140 +#: ../src/uisupport/qssparser.cpp:147 #, qt-format msgctxt "QssParser|" msgid "Invalid palette role assignment: %1" msgstr "无效的调色板角色指派：%1" -#: ../src/uisupport/qssparser.cpp:156 +#: ../src/uisupport/qssparser.cpp:166 #, qt-format msgctxt "QssParser|" msgid "Unknown palette role name: %1" msgstr "未知的调色板角色名称：%1" -#: ../src/uisupport/qssparser.cpp:192 +#: ../src/uisupport/qssparser.cpp:204 #, qt-format msgctxt "QssParser|" msgid "Invalid subelement name in %1" msgstr "%1 中子元素名称无效" -#: ../src/uisupport/qssparser.cpp:236 +#: ../src/uisupport/qssparser.cpp:248 #, qt-format msgctxt "QssParser|" msgid "Invalid message type in %1" msgstr "%1 中消息类型无效" -#: ../src/uisupport/qssparser.cpp:245 +#: ../src/uisupport/qssparser.cpp:257 #, qt-format msgctxt "QssParser|" msgid "Invalid condition %1" msgstr "无效的条件 %1" -#: ../src/uisupport/qssparser.cpp:257 +#: ../src/uisupport/qssparser.cpp:269 #, qt-format msgctxt "QssParser|" msgid "Invalid message label: %1" msgstr "无效的消息标签：%1" -#: ../src/uisupport/qssparser.cpp:268 +#: ../src/uisupport/qssparser.cpp:281 #, qt-format msgctxt "QssParser|" msgid "Invalid senderhash specification: %1" msgstr "无效的字体指定：%1" -#: ../src/uisupport/qssparser.cpp:272 +#: ../src/uisupport/qssparser.cpp:285 msgctxt "QssParser|" msgid "Senderhash can be at most \"0x0f\"!" msgstr "" -#: ../src/uisupport/qssparser.cpp:287 +#: ../src/uisupport/qssparser.cpp:301 #, qt-format msgctxt "QssParser|" msgid "Invalid format name: %1" msgstr "无效的格式名：%1" -#: ../src/uisupport/qssparser.cpp:294 +#: ../src/uisupport/qssparser.cpp:309 #, qt-format msgctxt "QssParser|" msgid "Illegal IRC color specification (must be between 00 and 0f): %1" msgstr "非法的 IRC 颜色指定(必须在 00 和 0f 之间)：%1" -#: ../src/uisupport/qssparser.cpp:302 +#: ../src/uisupport/qssparser.cpp:318 #, qt-format msgctxt "QssParser|" msgid "Unhandled condition: %1" msgstr "不能处理的条件：%1" -#: ../src/uisupport/qssparser.cpp:331 +#: ../src/uisupport/qssparser.cpp:349 #, qt-format msgctxt "QssParser|" msgid "Invalid proplist %1" msgstr "无效的字体属性：%1" -#: ../src/uisupport/qssparser.cpp:350 +#: ../src/uisupport/qssparser.cpp:368 #, qt-format msgctxt "QssParser|" msgid "Invalid chatlist item type %1" msgstr "无效的聊天列表项类型 %1" -#: ../src/uisupport/qssparser.cpp:366 +#: ../src/uisupport/qssparser.cpp:384 #, qt-format msgctxt "QssParser|" msgid "Invalid chatlist state %1" msgstr "无效的聊天列表状态 %1" -#: ../src/uisupport/qssparser.cpp:392 +#: ../src/uisupport/qssparser.cpp:414 #, qt-format msgctxt "QssParser|" msgid "Invalid property declaration: %1" msgstr "无效的属性声明：%1" -#: ../src/uisupport/qssparser.cpp:416 +#: ../src/uisupport/qssparser.cpp:438 #, qt-format msgctxt "QssParser|" msgid "Invalid font property: %1" msgstr "无效的字体属性：%1" -#: ../src/uisupport/qssparser.cpp:422 +#: ../src/uisupport/qssparser.cpp:444 #, qt-format msgctxt "QssParser|" msgid "Unknown ChatLine property: %1" msgstr "未知的聊天行属性：%1" -#: ../src/uisupport/qssparser.cpp:444 +#: ../src/uisupport/qssparser.cpp:468 #, qt-format msgctxt "QssParser|" msgid "Invalid palette color role specification: %1" msgstr "无效的调色板颜色角色指定：%1" -#: ../src/uisupport/qssparser.cpp:451 +#: ../src/uisupport/qssparser.cpp:475 #, qt-format msgctxt "QssParser|" msgid "Unknown palette color role: %1" msgstr "未知的调色板颜色角色：%1" -#: ../src/uisupport/qssparser.cpp:458 ../src/uisupport/qssparser.cpp:481 -#: ../src/uisupport/qssparser.cpp:503 +#: ../src/uisupport/qssparser.cpp:482 ../src/uisupport/qssparser.cpp:505 +#: ../src/uisupport/qssparser.cpp:527 #, qt-format msgctxt "QssParser|" msgid "Invalid gradient declaration: %1" msgstr "无效的渐变声明：%1" -#: ../src/uisupport/qssparser.cpp:467 ../src/uisupport/qssparser.cpp:489 -#: ../src/uisupport/qssparser.cpp:513 +#: ../src/uisupport/qssparser.cpp:491 ../src/uisupport/qssparser.cpp:513 +#: ../src/uisupport/qssparser.cpp:537 #, qt-format msgctxt "QssParser|" msgid "Invalid gradient stops list: %1" msgstr "无效的渐变终点列表：%1" -#: ../src/uisupport/qssparser.cpp:610 +#: ../src/uisupport/qssparser.cpp:646 #, qt-format msgctxt "QssParser|" msgid "Invalid font specification: %1" msgstr "无效的字体指定：%1" -#: ../src/uisupport/qssparser.cpp:649 +#: ../src/uisupport/qssparser.cpp:687 #, qt-format msgctxt "QssParser|" msgid "Invalid font style specification: %1" msgstr "无效的字体样式指定：%1" -#: ../src/uisupport/qssparser.cpp:662 +#: ../src/uisupport/qssparser.cpp:702 #, qt-format msgctxt "QssParser|" msgid "Invalid font weight specification: %1" msgstr "无效的字体粗细指定：%1" -#: ../src/uisupport/qssparser.cpp:672 +#: ../src/uisupport/qssparser.cpp:714 #, qt-format msgctxt "QssParser|" msgid "Invalid font size specification: %1" msgstr "无效的字号指定：%1" -#: ../src/common/util.cpp:145 +#: ../src/common/util.cpp:169 msgctxt "Quassel::secondsToString()|" msgid "year" msgstr "年" -#: ../src/common/util.cpp:146 +#: ../src/common/util.cpp:170 msgctxt "Quassel::secondsToString()|" msgid "day" msgstr "日" -#: ../src/common/util.cpp:147 +#: ../src/common/util.cpp:171 msgctxt "Quassel::secondsToString()|" msgid "h" msgstr "小时" -#: ../src/common/util.cpp:148 +#: ../src/common/util.cpp:172 msgctxt "Quassel::secondsToString()|" msgid "min" msgstr "分钟" -#: ../src/common/util.cpp:149 +#: ../src/common/util.cpp:173 msgctxt "Quassel::secondsToString()|" msgid "sec" msgstr "秒" -#: ../src/client/networkmodel.cpp:429 +#: ../src/client/networkmodel.cpp:482 #, qt-format msgctxt "QueryBufferItem|" msgid "Query with %1" msgstr "通过 %1 查询" -#: ../src/client/networkmodel.cpp:447 +#: ../src/client/networkmodel.cpp:500 #, qt-format msgctxt "QueryBufferItem|" msgid "idling since %1" msgstr "空闲自从 %1" -#: ../src/client/networkmodel.cpp:450 +#: ../src/client/networkmodel.cpp:503 #, qt-format msgctxt "QueryBufferItem|" msgid "login time: %1" msgstr "登录时间：%1" -#: ../src/client/networkmodel.cpp:453 +#: ../src/client/networkmodel.cpp:506 #, qt-format msgctxt "QueryBufferItem|" msgid "server: %1" msgstr "服务器：%1" +#: ../src/qtui/ui/receivefiledlg.ui:14 +msgctxt "ReceiveFileDlg|" +msgid "Incoming File Transfer" +msgstr "" + +#: ../src/qtui/receivefiledlg.cpp:35 +#, qt-format +msgctxt "ReceiveFileDlg|" +msgid "%1 wants to send you a file:
%2 (%3 bytes)" +msgstr "" + #: ../src/qtui/settingspages/saveidentitiesdlg.ui:13 msgctxt "SaveIdentitiesDlg|" msgid "Sync With Core" @@ -5077,45 +5285,45 @@ msgid "Configure Quassel" msgstr "配置 Quassel" #: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50 -#: ../src/qtui/settingsdlg.cpp:99 +#: ../src/qtui/settingsdlg.cpp:111 msgctxt "SettingsDlg|" msgid "Settings" msgstr "设置" -#: ../src/qtui/settingsdlg.cpp:109 +#: ../src/qtui/settingsdlg.cpp:121 msgctxt "SettingsDlg|" msgid "Save changes" msgstr "保存更改" -#: ../src/qtui/settingsdlg.cpp:110 +#: ../src/qtui/settingsdlg.cpp:122 msgctxt "SettingsDlg|" msgid "" "There are unsaved changes on the current configuration page. Would you like " "to apply your changes now?" msgstr "当前配置页有未保存的更改。您想现在应用更改吗？" -#: ../src/qtui/settingsdlg.cpp:122 ../src/qtui/settingsdlg.cpp:126 +#: ../src/qtui/settingsdlg.cpp:136 ../src/qtui/settingsdlg.cpp:140 #, qt-format msgctxt "SettingsDlg|" msgid "Configure %1" msgstr "配置 %1" -#: ../src/qtui/settingsdlg.cpp:193 +#: ../src/qtui/settingsdlg.cpp:220 msgctxt "SettingsDlg|" msgid "Reload Settings" msgstr "重新加载设置" -#: ../src/qtui/settingsdlg.cpp:193 +#: ../src/qtui/settingsdlg.cpp:220 msgctxt "SettingsDlg|" msgid "Do you like to reload the settings, undoing your changes on this page?" msgstr "您想取消此页的设置，重新加载设置吗？" -#: ../src/qtui/settingsdlg.cpp:202 +#: ../src/qtui/settingsdlg.cpp:231 msgctxt "SettingsDlg|" msgid "Restore Defaults" msgstr "恢复默认值" -#: ../src/qtui/settingsdlg.cpp:202 +#: ../src/qtui/settingsdlg.cpp:231 msgctxt "SettingsDlg|" msgid "Do you like to restore the default values for this page?" msgstr "您想恢复此页的默认设置吗？" @@ -5130,38 +5338,38 @@ msgctxt "SettingsPageDlg|" msgid "Settings" msgstr "设置" -#: ../src/qtui/settingspagedlg.cpp:36 +#: ../src/qtui/settingspagedlg.cpp:39 #, qt-format msgctxt "SettingsPageDlg|" msgid "Configure %1" msgstr "配置 %1" -#: ../src/qtui/settingspagedlg.cpp:104 +#: ../src/qtui/settingspagedlg.cpp:120 msgctxt "SettingsPageDlg|" msgid "Reload Settings" msgstr "重新加载设置" -#: ../src/qtui/settingspagedlg.cpp:104 +#: ../src/qtui/settingspagedlg.cpp:120 msgctxt "SettingsPageDlg|" msgid "Do you like to reload the settings, undoing your changes on this page?" msgstr "您想取消此页的设置，重新加载设置吗？" -#: ../src/qtui/settingspagedlg.cpp:113 +#: ../src/qtui/settingspagedlg.cpp:131 msgctxt "SettingsPageDlg|" msgid "Restore Defaults" msgstr "恢复默认值" -#: ../src/qtui/settingspagedlg.cpp:113 +#: ../src/qtui/settingspagedlg.cpp:131 msgctxt "SettingsPageDlg|" msgid "Do you like to restore the default values for this page?" msgstr "您想恢复此页的默认设置吗？" -#: ../src/qtui/settingspages/shortcutsmodel.cpp:110 +#: ../src/qtui/settingspages/shortcutsmodel.cpp:121 msgctxt "ShortcutsModel|" msgid "Action" msgstr "动作" -#: ../src/qtui/settingspages/shortcutsmodel.cpp:112 +#: ../src/qtui/settingspages/shortcutsmodel.cpp:123 msgctxt "ShortcutsModel|" msgid "Shortcut" msgstr "快捷键" @@ -5187,8 +5395,8 @@ msgid "Default:" msgstr "默认：" #: ../src/qtui/settingspages/shortcutssettingspage.ui:75 -#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92 -#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102 +#: ../src/qtui/settingspages/shortcutssettingspage.cpp:99 +#: ../src/qtui/settingspages/shortcutssettingspage.cpp:111 msgctxt "ShortcutsSettingsPage|" msgid "None" msgstr "无" @@ -5198,37 +5406,17 @@ msgctxt "ShortcutsSettingsPage|" msgid "Custom:" msgstr "自定义：" -#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60 +#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65 msgctxt "ShortcutsSettingsPage|" msgid "Interface" msgstr "接口" -#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60 +#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65 msgctxt "ShortcutsSettingsPage|" msgid "Shortcuts" msgstr "快捷键" -#: ../src/common/signalproxy.cpp:880 -msgctxt "SignalProxy|" -msgid "Peer tried to send package larger than max package size!" -msgstr "对方尝试发送比超过最大尺寸的包！" - -#: ../src/common/signalproxy.cpp:885 -msgctxt "SignalProxy|" -msgid "Peer tried to send 0 byte package!" -msgstr "对方尝试发送 0 字节包！" - -#: ../src/common/signalproxy.cpp:902 -msgctxt "SignalProxy|" -msgid "Peer sent corrupted compressed data!" -msgstr "对方发送了损坏的压缩数据！" - -#: ../src/common/signalproxy.cpp:917 -msgctxt "SignalProxy|" -msgid "Peer sent corrupt data: unable to load QVariant!" -msgstr "对方发送了损坏的数据：无法加载 QVariant！" - -#: ../src/common/signalproxy.cpp:1050 +#: ../src/common/signalproxy.cpp:758 msgctxt "SignalProxy|" msgid "Disconnecting" msgstr "正在断开" @@ -5311,7 +5499,43 @@ msgid "" "network" msgstr "要在连接网络后自动加入的一组 IRC 频道" -#: ../src/core/sqlitestorage.cpp:52 +#: ../src/qtui/snorenotificationbackend.cpp:60 +#: ../src/qtui/snorenotificationbackend.cpp:104 +msgctxt "SnoreNotificationBackend|" +msgid "Private Message" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:20 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Form" +msgstr "表单" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:29 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Snore" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:41 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Backend:" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:64 +msgctxt "SnoreNotificationConfigWidget|" +msgid "Timeout:" +msgstr "" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:80 +msgctxt "SnoreNotificationConfigWidget|" +msgid " s" +msgstr " 秒" + +#: ../src/qtui/ui/snorentificationconfigwidget.ui:96 +msgctxt "SnoreNotificationConfigWidget|" +msgid "0 means infinite" +msgstr "" + +#: ../src/core/sqlitestorage.cpp:60 msgctxt "SqliteStorage|" msgid "" "SQLite is a file-based database engine that does not require any setup. It " @@ -5411,45 +5635,45 @@ msgctxt "SslInfoDlg|" msgid "Trusted:" msgstr "信任：" -#: ../src/qtui/sslinfodlg.cpp:69 +#: ../src/qtui/sslinfodlg.cpp:71 msgctxt "SslInfoDlg|" msgid "Yes" msgstr "是" -#: ../src/qtui/sslinfodlg.cpp:71 +#: ../src/qtui/sslinfodlg.cpp:73 msgctxt "SslInfoDlg|" msgid "No, for the following reasons:
    " msgstr "否，原因如下：
      " -#: ../src/qtui/sslinfodlg.cpp:78 +#: ../src/qtui/sslinfodlg.cpp:80 #, qt-format msgctxt "SslInfoDlg|" msgid "%1 to %2" msgstr "%1 到 %2" -#: ../src/client/networkmodel.h:144 +#: ../src/client/networkmodel.h:150 msgctxt "StatusBufferItem|" msgid "Status Buffer" msgstr "状态缓存" -#: ../src/qtui/systemtray.cpp:61 ../src/qtui/systemtray.cpp:92 +#: ../src/qtui/systemtray.cpp:68 ../src/qtui/systemtray.cpp:101 msgctxt "SystemTray|" msgid "&Minimize" msgstr "最小化(&M)" -#: ../src/qtui/systemtray.cpp:94 +#: ../src/qtui/systemtray.cpp:103 msgctxt "SystemTray|" msgid "&Restore" msgstr "还原(&R)" -#: ../src/qtui/systraynotificationbackend.cpp:125 +#: ../src/qtui/systraynotificationbackend.cpp:142 #, qt-format msgctxt "SystrayNotificationBackend|" msgid "%n pending highlight(s)" msgid_plural "%n pending highlight(s)" msgstr[0] "" -#: ../src/qtui/systraynotificationbackend.cpp:135 +#: ../src/qtui/systraynotificationbackend.cpp:156 msgctxt "SystrayNotificationBackend::ConfigWidget|" msgid "Show a message in a popup" msgstr "以弹出方式显示消息" @@ -5459,22 +5683,22 @@ msgctxt "TabCompleter|" msgid "Tab completion" msgstr "Tab 补全" -#: ../src/qtui/taskbarnotificationbackend.cpp:68 +#: ../src/qtui/taskbarnotificationbackend.cpp:83 msgctxt "TaskbarNotificationBackend::ConfigWidget|" msgid "Activate dock entry, timeout:" msgstr "标记任务栏项，超时：" -#: ../src/qtui/taskbarnotificationbackend.cpp:70 +#: ../src/qtui/taskbarnotificationbackend.cpp:85 msgctxt "TaskbarNotificationBackend::ConfigWidget|" msgid "Mark taskbar entry, timeout:" msgstr "标记任务栏项，超时：" -#: ../src/qtui/taskbarnotificationbackend.cpp:78 +#: ../src/qtui/taskbarnotificationbackend.cpp:93 msgctxt "TaskbarNotificationBackend::ConfigWidget|" msgid "Unlimited" msgstr "不限" -#: ../src/qtui/taskbarnotificationbackend.cpp:79 +#: ../src/qtui/taskbarnotificationbackend.cpp:94 msgctxt "TaskbarNotificationBackend::ConfigWidget|" msgid " seconds" msgstr " 秒" @@ -5629,13 +5853,13 @@ msgctxt "TopicWidget|" msgid "..." msgstr "..." -#: ../src/qtui/topicwidget.cpp:106 +#: ../src/qtui/topicwidget.cpp:120 #, qt-format msgctxt "TopicWidget|" msgid "Users: %1" msgstr "用户：%1" -#: ../src/qtui/topicwidget.cpp:107 +#: ../src/qtui/topicwidget.cpp:121 #, qt-format msgctxt "TopicWidget|" msgid "Lag: %1 msecs" @@ -5661,12 +5885,12 @@ msgctxt "TopicWidgetSettingsPage|" msgid "On hover only" msgstr "只在光标悬停时" -#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23 +#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24 msgctxt "TopicWidgetSettingsPage|" msgid "Interface" msgstr "接口" -#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23 +#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24 msgctxt "TopicWidgetSettingsPage|" msgid "Topic Widget" msgstr "话题组件" @@ -5684,149 +5908,149 @@ msgstr "话题组件" #. Topic Message #. ---------- #. Invite Message -#: ../src/uisupport/uistyle.cpp:577 ../src/uisupport/uistyle.cpp:580 -#: ../src/uisupport/uistyle.cpp:620 ../src/uisupport/uistyle.cpp:623 -#: ../src/uisupport/uistyle.cpp:626 ../src/uisupport/uistyle.cpp:633 -#: ../src/uisupport/uistyle.cpp:665 +#: ../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 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%1" msgstr "%1" #. Action Message -#: ../src/uisupport/uistyle.cpp:583 +#: ../src/uisupport/uistyle.cpp:671 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN %2" msgstr "%DN%1%DN %2" #. Nick Message -#: ../src/uisupport/uistyle.cpp:587 +#: ../src/uisupport/uistyle.cpp:675 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "You are now known as %DN%1%DN" msgstr "您现在叫做 %DN%1%DN" -#: ../src/uisupport/uistyle.cpp:588 +#: ../src/uisupport/uistyle.cpp:676 #, 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:592 +#: ../src/uisupport/uistyle.cpp:680 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "User mode: %DM%1%DM" msgstr "用户模式：%DM%1%DM" -#: ../src/uisupport/uistyle.cpp:593 +#: ../src/uisupport/uistyle.cpp:681 #, 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:597 +#: ../src/uisupport/uistyle.cpp:685 #, 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:600 +#: ../src/uisupport/uistyle.cpp:688 #, 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:605 +#: ../src/uisupport/uistyle.cpp:693 #, 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:612 +#: ../src/uisupport/uistyle.cpp:701 #, 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:629 +#: ../src/uisupport/uistyle.cpp:719 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "{Day changed to %1}" msgstr "{日期更改为 %1}" -#: ../src/uisupport/uistyle.cpp:641 +#: ../src/uisupport/uistyle.cpp:733 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: " msgstr "" -#: ../src/uisupport/uistyle.cpp:645 ../src/uisupport/uistyle.cpp:660 +#: ../src/uisupport/uistyle.cpp:737 ../src/uisupport/uistyle.cpp:753 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "%DN%1%DN (%2 more)" msgstr "%DN%1%DN (还有 %2)" -#: ../src/uisupport/uistyle.cpp:655 +#: ../src/uisupport/uistyle.cpp:748 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: " msgstr "" -#: ../src/uisupport/uistyle.cpp:667 ../src/uisupport/uistyle.cpp:705 +#: ../src/uisupport/uistyle.cpp:760 ../src/uisupport/uistyle.cpp:808 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "[%1]" msgstr "[%1]" -#: ../src/uisupport/uistyle.cpp:703 +#: ../src/uisupport/uistyle.cpp:806 #, qt-format msgctxt "UiStyle::StyledMessage|" msgid "<%1>" msgstr "<%1>" -#: ../src/client/networkmodel.cpp:697 +#: ../src/client/networkmodel.cpp:786 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Owner(s)" msgid_plural "%n Owner(s)" msgstr[0] "%n 位用户" -#: ../src/client/networkmodel.cpp:698 +#: ../src/client/networkmodel.cpp:788 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Admin(s)" msgid_plural "%n Admin(s)" msgstr[0] "%n 位管理员" -#: ../src/client/networkmodel.cpp:699 +#: ../src/client/networkmodel.cpp:790 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Operator(s)" msgid_plural "%n Operator(s)" msgstr[0] "%n 位用户" -#: ../src/client/networkmodel.cpp:700 +#: ../src/client/networkmodel.cpp:792 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Half-Op(s)" msgid_plural "%n Half-Op(s)" msgstr[0] "" -#: ../src/client/networkmodel.cpp:701 +#: ../src/client/networkmodel.cpp:794 #, qt-format msgctxt "UserCategoryItem|" msgid "%n Voiced" msgid_plural "%n Voiced" msgstr[0] "发言" -#: ../src/client/networkmodel.cpp:702 +#: ../src/client/networkmodel.cpp:796 #, qt-format msgctxt "UserCategoryItem|" msgid "%n User(s)"