#
# Translators:
-# Daniel Albers <daniel@lbers.com>, 2011.
-# 冯超 <rainofchaos@gmail.com>, 2010.
+# Daniel Albers <daniel@lbers.com>, 2011
+# leonfeng <chaofeng111@gmail.com>, 2010
+# leonfeng <chaofeng111@gmail.com>, 2010
msgid ""
msgstr ""
"Project-Id-Version: Quassel IRC\n"
"Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
-"PO-Revision-Date: 2012-02-13 10:36+0000\n"
+"PO-Revision-Date: 2015-03-25 12:13+0000\n"
"Last-Translator: Daniel Albers <daniel@lbe.rs>\n"
-"Language-Team: \n"
+"Language-Team: Chinese (China) (http://www.transifex.com/ald/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/uisupport/aboutdata.cpp:136
+msgctxt "AboutData|"
+msgid "Quassel IRC"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:141
+msgctxt "AboutData|"
+msgid "A modern, distributed IRC client"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:174
+msgctxt "AboutData|"
+msgid "Project Founder, Lead Developer"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:175
+msgctxt "AboutData|"
+msgid "Project Motivator, Lead Developer"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:176
+msgctxt "AboutData|"
+msgid "Former Lead Developer"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:177
+msgctxt "AboutData|"
+msgid "Master of Translation, many fixes and enhancements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:178
+msgctxt "AboutData|"
+msgid "Many features, fixes and improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:179
+msgctxt "AboutData|"
+msgid "Many fixes and improvements, bug and patch triaging, community support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:183 ../src/uisupport/aboutdata.cpp:192
+msgctxt "AboutData|"
+msgid "Chatview improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:184
+msgctxt "AboutData|"
+msgid "Early beta tester and bughunter, Danish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:185 ../src/uisupport/aboutdata.cpp:261
+#: ../src/uisupport/aboutdata.cpp:284
+msgctxt "AboutData|"
+msgid "Spanish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:186
+msgctxt "AboutData|"
+msgid "Tray icon fix"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:187
+msgctxt "AboutData|"
+msgid "Language improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:188
+msgctxt "AboutData|"
+msgid "Documentation improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:189 ../src/uisupport/aboutdata.cpp:285
+msgctxt "AboutData|"
+msgid "Romanian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:190 ../src/uisupport/aboutdata.cpp:235
+#: ../src/uisupport/aboutdata.cpp:246 ../src/uisupport/aboutdata.cpp:247
+msgctxt "AboutData|"
+msgid "Finnish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:191
+msgctxt "AboutData|"
+msgid "Message indicator support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:193
+msgctxt "AboutData|"
+msgid "Windows build system fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:194
+msgctxt "AboutData|"
+msgid "Crash fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:215
+#: ../src/uisupport/aboutdata.cpp:271
+msgctxt "AboutData|"
+msgid "French translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:196
+msgctxt "AboutData|"
+msgid "Usability review"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:197
+msgctxt "AboutData|"
+msgid "SASL support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:198
+msgctxt "AboutData|"
+msgid "Various improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:199 ../src/uisupport/aboutdata.cpp:200
+#: ../src/uisupport/aboutdata.cpp:204
+msgctxt "AboutData|"
+msgid "Various fixes and improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:201
+msgctxt "AboutData|"
+msgid "Galician translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:202
+msgctxt "AboutData|"
+msgid "Esperanto translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:203
+msgctxt "AboutData|"
+msgid "Japanese translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:205 ../src/uisupport/aboutdata.cpp:263
+msgctxt "AboutData|"
+msgid "Gentoo maintainer"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:206
+msgctxt "AboutData|"
+msgid "Early beta tester and bughunter (on Vista™!)"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:207
+msgctxt "AboutData|"
+msgid "Translation system fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:208
+msgctxt "AboutData|"
+msgid "OSX Notification Center support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:209 ../src/uisupport/aboutdata.cpp:257
+msgctxt "AboutData|"
+msgid "Fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:210 ../src/uisupport/aboutdata.cpp:259
+msgctxt "AboutData|"
+msgid "Mac fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:211
+msgctxt "AboutData|"
+msgid "D-Bus notifications"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:212
+msgctxt "AboutData|"
+msgid "Polish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:213
+msgctxt "AboutData|"
+msgid "Build system improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:214
+msgctxt "AboutData|"
+msgid "Formatting support and other input line improvements, many other fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:216
+msgctxt "AboutData|"
+msgid "BluesTheme stylesheet"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:251
+#: ../src/uisupport/aboutdata.cpp:279
+msgctxt "AboutData|"
+msgid "Russian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:218 ../src/uisupport/aboutdata.cpp:253
+msgctxt "AboutData|"
+msgid "Italian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:219
+msgctxt "AboutData|"
+msgid "Certificate handling improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:220
+msgctxt "AboutData|"
+msgid "Sanitize topic handling"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:221
+msgctxt "AboutData|"
+msgid "Norwegian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:222
+msgctxt "AboutData|"
+msgid "Hungarian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:223
+msgctxt "AboutData|"
+msgid "IRC parser improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:224 ../src/uisupport/aboutdata.cpp:296
+#: ../src/uisupport/aboutdata.cpp:300
+msgctxt "AboutData|"
+msgid "Turkish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:225
+msgctxt "AboutData|"
+msgid "Initial Qt5 support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:226
+msgctxt "AboutData|"
+msgid "{Ku|U}buntu packager, motivator, promoter"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:227
+msgctxt "AboutData|"
+msgid "Various features"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:228 ../src/uisupport/aboutdata.cpp:229
+#: ../src/uisupport/aboutdata.cpp:234 ../src/uisupport/aboutdata.cpp:239
+msgctxt "AboutData|"
+msgid "Various fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:230 ../src/uisupport/aboutdata.cpp:231
+#: ../src/uisupport/aboutdata.cpp:270 ../src/uisupport/aboutdata.cpp:273
+#: ../src/uisupport/aboutdata.cpp:277 ../src/uisupport/aboutdata.cpp:281
+msgctxt "AboutData|"
+msgid "Bugfixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:232
+msgctxt "AboutData|"
+msgid "Postgres migration fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:233
+msgctxt "AboutData|"
+msgid "Context menu fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:236
+msgctxt "AboutData|"
+msgid "Many fixes and improvements, bug triaging"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:237
+msgctxt "AboutData|"
+msgid "Original \"All-Seeing Eye\" logo"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:238
+msgctxt "AboutData|"
+msgid "Project founder, various improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:240
+msgctxt "AboutData|"
+msgid "Serbian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:241
+msgctxt "AboutData|"
+msgid "Slovenian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:242
+msgctxt "AboutData|"
+msgid ""
+"Tireless tester, {Ku|U}buntu tester and lobbyist, liters of delicious "
+"Finnish alcohol"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:243
+msgctxt "AboutData|"
+msgid "Qt5 porting help, Travis CI setup"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:244 ../src/uisupport/aboutdata.cpp:254
+#: ../src/uisupport/aboutdata.cpp:256 ../src/uisupport/aboutdata.cpp:293
+msgctxt "AboutData|"
+msgid "German translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:245
+msgctxt "AboutData|"
+msgid "Buffer merge improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:248
+msgctxt "AboutData|"
+msgid "OSX improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:249
+msgctxt "AboutData|"
+msgid "Lithuanian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:250
+msgctxt "AboutData|"
+msgid "Documentation fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:252
+msgctxt "AboutData|"
+msgid "Ideas, hacking, initial motivation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:255
+msgctxt "AboutData|"
+msgid "Core and other fixes, QuasselDroid"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:258
+msgctxt "AboutData|"
+msgid "German translation, fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:260
+msgctxt "AboutData|"
+msgid "Many fixes and improvements; Ubuntu live packages"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:262
+msgctxt "AboutData|"
+msgid "Tons of Oxygen icons including the Quassel logo"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:264
+msgctxt "AboutData|"
+msgid "MinGW support, SNORE backend, Windows packaging"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:265
+msgctxt "AboutData|"
+msgid "Initial design and main window layout"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:266
+msgctxt "AboutData|"
+msgid "Early beta tester and bughunter"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:267
+msgctxt "AboutData|"
+msgid "Danish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:268
+msgctxt "AboutData|"
+msgid "Linewrap for input line"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:269
+msgctxt "AboutData|"
+msgid "/print command"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:272
+msgctxt "AboutData|"
+msgid "Build system fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:274
+msgctxt "AboutData|"
+msgid "Emacs keybindings"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:275
+msgctxt "AboutData|"
+msgid "Highlight configuration improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:276
+msgctxt "AboutData|"
+msgid "Kubuntu packager, (packaging/build system) bughunter"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:278
+msgctxt "AboutData|"
+msgid "Audio backend improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:280
+msgctxt "AboutData|"
+msgid "Dutch translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:282 ../src/uisupport/aboutdata.cpp:283
+#: ../src/uisupport/aboutdata.cpp:288 ../src/uisupport/aboutdata.cpp:289
+msgctxt "AboutData|"
+msgid "Greek translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:286
+msgctxt "AboutData|"
+msgid "Korean translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:287
+msgctxt "AboutData|"
+msgid "Norwegian translation, documentation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:290
+msgctxt "AboutData|"
+msgid "Former Windows builder"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:291
+msgctxt "AboutData|"
+msgid "Fixes, Debian packaging"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:292
+msgctxt "AboutData|"
+msgid "Fixes and feedback"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:294 ../src/uisupport/aboutdata.cpp:295
+msgctxt "AboutData|"
+msgid "Czech translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:297
+msgctxt "AboutData|"
+msgid "Network detection improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:298
+msgctxt "AboutData|"
+msgid "Ukrainian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:299
+msgctxt "AboutData|"
+msgid "Portuguese translation"
+msgstr ""
+
#: ../src/qtui/ui/aboutdlg.ui:17
msgctxt "AboutDlg|"
msgid "About Quassel"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel IRC</p></body></html>"
msgstr "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel IRC</p></body></html>"
-#: ../src/qtui/ui/aboutdlg.ui:75
-msgctxt "AboutDlg|"
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Version 0.2.0-pre, Build >= 474 (2008-02-08)</p></body></html>"
-msgstr "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">版本 0.2.0-pre, Build >= 474 (2008-02-08)</p></body></html>"
-
-#: ../src/qtui/ui/aboutdlg.ui:115
+#: ../src/qtui/ui/aboutdlg.ui:112
msgctxt "AboutDlg|"
msgid "&About"
msgstr "关于(&A)"
-#: ../src/qtui/ui/aboutdlg.ui:135
+#: ../src/qtui/ui/aboutdlg.ui:132
msgctxt "AboutDlg|"
msgid "A&uthors"
msgstr "作者(&U)"
-#: ../src/qtui/ui/aboutdlg.ui:155
+#: ../src/qtui/ui/aboutdlg.ui:152
msgctxt "AboutDlg|"
msgid "&Contributors"
msgstr "贡献者(&C)"
-#: ../src/qtui/ui/aboutdlg.ui:175
+#: ../src/qtui/ui/aboutdlg.ui:172
msgctxt "AboutDlg|"
msgid "&Thanks To"
msgstr "致谢(&T)"
-#: ../src/qtui/aboutdlg.cpp:32
+#: ../src/qtui/aboutdlg.cpp:38
#, qt-format
msgctxt "AboutDlg|"
msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
msgstr "<b>版本</b> %1<br><b>协议版本：</b> %2<br><b>编译：</b> %3"
-#: ../src/qtui/aboutdlg.cpp:46
+#: ../src/qtui/aboutdlg.cpp:54
+#, qt-format
msgctxt "AboutDlg|"
msgid ""
-"<b>A modern, distributed IRC Client</b><br><br>©2005-2012 by the "
-"
Quassel Project<br><a href=\"http://quassel-irc.org\">http://quassel-"
+"<b>A modern, distributed IRC Client</b><br><br>©%1 by the Quassel "
+"Project<br><a href=\"http://quassel-irc.org\">http://quassel-"
"irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a"
" href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
"licensed under <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a>"
"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Please use "
"<a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to "
"report bugs."
-msgstr "<b>一个现代的、分布式的 IRC 客户端。</b><br><br>©2005-2012 Quassel 项目<br><a href=\"http://quassel-irc.org\">http://quassel-irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC 遵循 <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> 和 <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a> 协议。<br>绝大多数图标的版权属于 © <a href=\"http://www.oxygen-icons.org\">Oxygen 团队</a> 并按 <a href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a> 协议使用。<br><br>请使用 <a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> 报告故障。"
+msgstr ""
-#: ../src/qtui/aboutdlg.cpp:62
+#: ../src/qtui/aboutdlg.cpp:72
msgctxt "AboutDlg|"
msgid "Quassel IRC is mainly developed by:"
msgstr "Quassel IRC 主要由下人员开发："
-#: ../src/qtui/aboutdlg.cpp:77
+#: ../src/qtui/aboutdlg.cpp:87
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:91
+msgctxt "AboutDlg|"
+msgid ""
+"...and anybody else finding and reporting bugs, giving feedback, helping "
+"others and being part of the community!"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:100
msgctxt "AboutDlg|"
msgid ""
"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"
-"eye.png\"> <b>John \"nox\" Hand</b></dt><dd>for the original Quassel "
-"icon - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\"> <b><a"
-" href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for "
-"creating all the artwork you see throughout Quassel</dd><dt><img "
-"src=\":/pics/qt-logo-32.png\"> <b><a "
-"href=\"http://www.trolltech.com\">Qt Software formerly known as "
-"Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring "
-"development of QuasselTopia with Greenphones and more</dd><dt><a "
-"href=\"http://www.nokia.com\"><img "
-"src=\":/pics/nokia.png\"></a></b></dt><dd>for keeping Qt alive, and for "
-"sponsoring development of Quassel Mobile with N810s</dd>"
-msgstr "特别感谢：<br><dl><dt><img src=\":/pics/quassel-eye.png\"> <b>John \"nox\" Hand</b></dt><dd> 提供的原始 Quassel 图标 - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\"> <b><a href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd> 创作的所有 Quassel 艺术设计</dd><dt><img src=\":/pics/qt-logo-32.png\"> <b><a href=\"http://www.trolltech.com\">Qt 软件，正式名为 Trolltech</a></b></dt><dd> 所创造的 Qt 和 Qtopia，以及赞助 QuasselTopia 开发所提供的 Greenphones 及更多</dd><dt><a href=\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd>让 Qt 生机勃勃、提供 N810s 协助 Quassel Mobile 开发</dd>"
-
-#: ../src/core/abstractsqlstorage.cpp:115
+"eye.png\"> <b>John \"nox\" Hand</b></dt><dd><i>for the original Quassel"
+" icon - The All-Seeing Eye</i><br></dt><dt><img "
+"src=\":/pics/oxygen.png\"> <b><a href=\"http://www.oxygen-"
+"icons.org\">The Oxygen Team</a></b></dt><dd><i>for creating all the artwork "
+"you see throughout Quassel</i><br></dd><dt><img src=\":/pics/qt-"
+"logo-32.png\"> <b><a href=\"http://www.trolltech.com\">Qt Software "
+"formerly known as Trolltech</a></b></dt><dd><i>for creating Qt and Qtopia, "
+"and for sponsoring development of QuasselTopia with Greenphones and "
+"
more</i><br></dd><dt><a href=\"http://www.nokia.com\"><img "
+"src=\":/pics/nokia.png\"></a></b></dt><dd><i>for sponsoring development of "
+"Quassel Mobile with N810s</i></dd>"
+msgstr ""
+
+#: ../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 ""
"<b>The shortcut for the alias</b><br />It can be used as a regular slash "
"command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
msgstr ""
-#: ../src/qtui/settingspages/aliasesmodel.cpp:59
+#: ../src/qtui/settingspages/aliasesmodel.cpp:61
msgctxt "AliasesModel|"
msgid ""
"<b>The string the shortcut will be expanded to</b><br /><b>special "
"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 "扩大"
msgid "Delete"
msgstr "删除"
-#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:28
msgctxt "AliasesSettingsPage|"
msgid "IRC"
msgstr "IRC"
-#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:28
msgctxt "AliasesSettingsPage|"
msgid "Aliases"
msgstr "别名"
msgstr "<尚未翻译>"
#: ../src/qtui/settingspages/appearancesettingspage.ui:52
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:76
msgctxt "AppearanceSettingsPage|"
msgid "<System Default>"
msgstr "＜系统默认＞"
msgid "Interface"
msgstr "接口"
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:242
msgctxt "AppearanceSettingsPage|"
msgid "Please choose a stylesheet file"
msgstr "请选择一个样式表文件"
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 "显示缓冲区名称"
msgid "Backlog Fetching"
msgstr "储备取回"
-#: ../src/client/networkmodel.cpp:346
+#: ../src/client/networkmodel.cpp:401
#, qt-format
msgctxt "BufferItem|"
msgid "<p> %1 - %2 </p>"
msgstr "<p> %1 - %2 </p>"
-#: ../src/uisupport/bufferview.cpp:248
+#: ../src/uisupport/bufferview.cpp:268
msgctxt "BufferView|"
msgid "Merge buffers permanently?"
msgstr "永久合并缓冲区？"
-#: ../src/uisupport/bufferview.cpp:249
+#: ../src/uisupport/bufferview.cpp:269
#, qt-format
msgctxt "BufferView|"
msgid ""
msgid "Please enter a name for the chat list:"
msgstr "请在聊天列表中输入一个名字："
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582
msgctxt "BufferViewEditDlg|"
msgid "Add Chat List"
msgstr "增加聊天列表"
-#: ../src/uisupport/bufferviewfilter.cpp:52
+#: ../src/uisupport/bufferviewfilter.cpp:53
msgctxt "BufferViewFilter|"
msgid "Show / Hide Chats"
msgstr "显示/隐藏聊天"
msgstr "网络："
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128
msgctxt "BufferViewSettingsPage|"
msgid "All"
msgstr "所有"
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
msgctxt "BufferViewSettingsPage|"
+msgid "Hide inactive networks"
+msgstr ""
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
+msgctxt "BufferViewSettingsPage|"
msgid "Add new chats automatically"
msgstr "自动增加新聊天"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
msgctxt "BufferViewSettingsPage|"
msgid "Sort alphabetically"
msgstr "按字母顺序排序"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:163
msgctxt "BufferViewSettingsPage|"
msgid "Minimum Activity:"
msgstr "最小活动："
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:171
msgctxt "BufferViewSettingsPage|"
msgid "No Activity"
msgstr "没有活动"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:176
msgctxt "BufferViewSettingsPage|"
msgid "Other Activity"
msgstr "其他活动"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:181
msgctxt "BufferViewSettingsPage|"
msgid "New Message"
msgstr "新消息"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:179
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:186
msgctxt "BufferViewSettingsPage|"
msgid "Highlight"
msgstr "突出显示"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:212
msgctxt "BufferViewSettingsPage|"
msgid "Preview:"
msgstr "预览："
msgid "Custom Chat Lists"
msgstr "自定义聊天列表"
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:383
msgctxt "BufferViewSettingsPage|"
msgid "Delete Chat List?"
msgstr "删除聊天列表？"
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
#, qt-format
msgctxt "BufferViewSettingsPage|"
msgid "Do you really want to delete the chat list \"%1\"?"
msgid "Go to Marker Line"
msgstr "转到标记线"
-#: ../src/client/networkmodel.cpp:503
+#: ../src/client/networkmodel.cpp:583 ../src/client/networkmodel.cpp:585
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "<b>Channel %1</b>"
msgstr "<b>频道 %1</b>"
-#: ../src/client/networkmodel.cpp:506
+#: ../src/client/networkmodel.cpp:589
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "<b>Users:</b> %1"
msgstr "<b>用户：</b> %1"
-#: ../src/client/networkmodel.cpp:510
+#: ../src/client/networkmodel.cpp:593
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "<b>Mode:</b> %1"
msgstr "<b>模式：</b> %1"
-#: ../src/client/networkmodel.cpp:521
+#: ../src/client/networkmodel.cpp:608
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "<b>Topic:</b> %1"
msgstr "<b>方式：</b> %1"
-#: ../src/client/networkmodel.cpp:525
+#: ../src/client/networkmodel.cpp:613
msgctxt "ChannelBufferItem|"
msgid "Not active <br /> Double-click to join"
msgstr "非活跃 <br /> 双击加入"
-#: ../src/client/networkmodel.cpp:528
+#: ../src/client/networkmodel.cpp:616
#, qt-format
msgctxt "ChannelBufferItem|"
msgid "<p> %1 </p>"
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
msgstr "移动所选的缓冲区到右边"
#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:273
msgctxt "ChatMonitorSettingsPage|"
msgid "Show:"
msgstr "显示："
msgid "Show own messages"
msgstr "显示我的信息"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:164
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Display messages from backlog on reconnect"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:167
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Show messages from backlog"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:192
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include read messages from backlog on reconnect"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:195
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include read messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
msgctxt "ChatMonitorSettingsPage|"
msgid "Interface"
msgstr "接口"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
msgctxt "ChatMonitorSettingsPage|"
msgid "Chat Monitor"
msgstr "聊天监视器"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
msgctxt "ChatMonitorSettingsPage|"
msgid "Opt In"
msgstr "Opt In"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:61
msgctxt "ChatMonitorSettingsPage|"
msgid "Opt Out"
msgstr "Opt Out"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:276
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:826
msgctxt "ChatScene|"
msgid "Copy Selection"
msgstr "复制选择"
+#: ../src/qtui/chatscene.cpp:833
+#, qt-format
+msgctxt "ChatScene|"
+msgid "Search '%1'"
+msgstr ""
+
+#: ../src/qtui/chatscene.cpp:845
+msgctxt "ChatScene|"
+msgid "Reset Column Widths"
+msgstr ""
+
#: ../src/qtui/ui/chatviewsearchbar.ui:13
msgctxt "ChatViewSearchBar|"
msgid "Form"
msgid "Timestamp format:"
msgstr "时间戳格式："
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:32
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:29
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"<html><head/><body><p>Usage examples:</p>\n"
+"<table cellpadding=\"2\">\n"
+"<tr><td>dd.MM.yyyy</td><td>21.05.2001</td></tr>\n"
+"<tr><td>ddd MMMM d yy</td><td>Tue May 21 01</td></tr>\n"
+"<tr><td>hh:mm:ss.zzz</td><td>14:13:09.042</td></tr>\n"
+"<tr><td>h:m:s ap</td><td>2:13:9 pm</td></tr>\n"
+"</table>\n"
+"</body></html>"
+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 ""
+"Set the marker line to the bottom of the current chat window when Quassel "
+"loses focus."
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:162
+msgctxt "ChatViewSettingsPage|"
+msgid "Set marker line automatically when Quassel loses focus"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:180
+msgctxt "ChatViewSettingsPage|"
+msgid "Web Search Url:"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:187
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"<html><head/><body><p>The URL to open with the selected text as the "
+"parameter. Place <span style=\" font-weight:600;\">%s</span> where selected "
+"text should go.</p><p>Eg:</p><p>https://www.google.com/search?q=<span "
+"style=\" font-weight:600;\">%s<br/></span>https://duckduckgo.com/?q=<span "
+"style=\" font-weight:600;\">%s</span></p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+msgctxt "ChatViewSettingsPage|"
+msgid "https://www.google.com/search?q=%s"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:202
msgctxt "ChatViewSettingsPage|"
msgid "Custom Colors"
msgstr "自定义颜色"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:220
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:227
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:251
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:275
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:312
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:336
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:367
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:391
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:415
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:439
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:456
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:496
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:513
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:530
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:547
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:564
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:581
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:598
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:615
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:632
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:649
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:666
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:683
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:700
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:717
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:734
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:751
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:779
msgctxt "ChatViewSettingsPage|"
msgid "..."
msgstr "..."
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:244
msgctxt "ChatViewSettingsPage|"
msgid "Timestamp:"
msgstr "时间戳："
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:268
msgctxt "ChatViewSettingsPage|"
msgid "Channel message:"
msgstr "频道消息："
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:305
msgctxt "ChatViewSettingsPage|"
msgid "Highlight foreground:"
msgstr "突出显示前景色："
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:329
msgctxt "ChatViewSettingsPage|"
msgid "Command message:"
msgstr "命令消息："
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:353
msgctxt "ChatViewSettingsPage|"
msgid "Highlight background:"
msgstr "突出显示背景色："
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:360
msgctxt "ChatViewSettingsPage|"
msgid "Server message:"
msgstr "服务器消息："
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:384
msgctxt "ChatViewSettingsPage|"
msgid "Marker line:"
msgstr "标记线："
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:408
msgctxt "ChatViewSettingsPage|"
msgid "Error message:"
msgstr "错误信息："
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:432
msgctxt "ChatViewSettingsPage|"
msgid "Background:"
msgstr "背景色："
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:476
msgctxt "ChatViewSettingsPage|"
msgid "Use Sender Coloring"
msgstr "使用发送方的颜色"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:772
msgctxt "ChatViewSettingsPage|"
msgid "Own messages:"
msgstr "自己的消息："
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
-msgctxt "ChatViewSettingsPage|"
-msgid "Interface"
-msgstr "接口"
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgctxt "ChatViewSettingsPage|"
+msgid "Interface"
+msgstr "接口"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgctxt "ChatViewSettingsPage|"
+msgid "Chat View"
+msgstr "聊天视图"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgctxt "ChatViewSettingsPage|"
+msgid "You need at least version 0.6 of quasselcore to use this feature"
+msgstr "您至少需要有 0.6 版的 quasselcore 才能使用此功能"
+
+#: ../src/common/qt5cliparser.cpp:30
+msgctxt "CliParser|"
+msgid "Quassel IRC is a modern, distributed IRC client."
+msgstr ""
+
+#: ../src/client/client.cpp:324
+msgctxt "Client|"
+msgid "Identity already exists in client!"
+msgstr "客户端中已有该身份！"
+
+#: ../src/client/clientauthhandler.cpp:65
+#: ../src/client/clientauthhandler.cpp:472
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection canceled"
+msgstr "已取消了未加密连接"
+
+#: ../src/client/clientauthhandler.cpp:87
+#: ../src/client/clientauthhandler.cpp:103
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connecting to %1..."
+msgstr "正在连接 %1..."
+
+#: ../src/client/clientauthhandler.cpp:99
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Looking up %1..."
+msgstr "正在查找 %1..."
+
+#: ../src/client/clientauthhandler.cpp:106
+#: ../src/client/clientauthhandler.cpp:316
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connected to %1"
+msgstr "已连接到 %1"
+
+#: ../src/client/clientauthhandler.cpp:110
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Disconnecting from %1..."
+msgstr "正在从 %1 断开..."
+
+#: ../src/client/clientauthhandler.cpp:114
+msgctxt "ClientAuthHandler|"
+msgid "Disconnected"
+msgstr "连接已断开"
+
+#: ../src/client/clientauthhandler.cpp:149
+msgctxt "ClientAuthHandler|"
+msgid "Reconnecting in compatibility mode..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:237
+msgctxt "ClientAuthHandler|"
+msgid ""
+"<b>Incompatible Quassel Core!</b><br>None of the protocols this client "
+"speaks are supported by the core you are trying to connect to."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:240
+msgctxt "ClientAuthHandler|"
+msgid "Core speaks none of the protocols we support"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:255
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid ""
+"<b>The Quassel Core you are trying to connect to is too old!</b><br>We need "
+"at least protocol v%1, but the core speaks v%2 only."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:257
+msgctxt "ClientAuthHandler|"
+msgid "Incompatible protocol version, connection to core refused"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:279
+msgctxt "ClientAuthHandler|"
+msgid "Synchronizing to core..."
+msgstr "正在与核心同步..."
+
+#: ../src/client/clientauthhandler.cpp:294
+msgctxt "ClientAuthHandler|"
+msgid "The core refused connection from this client"
+msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
-msgctxt "ChatViewSettingsPage|"
-msgid "Chat View"
-msgstr "聊天视图"
+#: ../src/client/clientauthhandler.cpp:358
+msgctxt "ClientAuthHandler|"
+msgid "Logging in..."
+msgstr "正在登录..."
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
-msgctxt "ChatViewSettingsPage|"
-msgid "You need at 0.6 quasselcore to use this feature"
-msgstr "您至少需要有 0.6 版的 quasselcore 才能使用此功能"
+#: ../src/client/clientauthhandler.cpp:363
+msgctxt "ClientAuthHandler|"
+msgid "Login canceled"
+msgstr "登录已取消"
-#: ../src/client/client.cpp:270
-msgctxt "Client|"
-msgid "Identity already exists in client!"
-msgstr "客户端中已有该身份！"
+#: ../src/client/clientauthhandler.cpp:421
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection cancelled"
+msgstr ""
-#: ../src/client/clientbacklogmanager.cpp:161
+#: ../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 应给出至少一个昵称"
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:801
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/Parts/Quits"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
msgctxt "ContextMenuActionProvider|"
msgid "Joins"
msgstr "加入"
-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
msgctxt "ContextMenuActionProvider|"
msgid "Parts"
msgstr "离开"
-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
msgctxt "ContextMenuActionProvider|"
msgid "Quits"
msgstr "退出"
-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
msgctxt "ContextMenuActionProvider|"
msgid "Nick Changes"
msgstr "昵称更改"
-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
msgctxt "ContextMenuActionProvider|"
msgid "Mode Changes"
msgstr "模式更改"
-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
msgctxt "ContextMenuActionProvider|"
msgid "Day Changes"
msgstr "日期更改"
-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
msgctxt "ContextMenuActionProvider|"
msgid "Topic Changes"
msgstr "话题更改"
-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
msgctxt "ContextMenuActionProvider|"
msgid "Set as Default..."
msgstr "设为默认..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:56
msgctxt "ContextMenuActionProvider|"
msgid "Use Defaults..."
msgstr "使用默认..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:56
+#: ../src/uisupport/contextmenuactionprovider.cpp:58
msgctxt "ContextMenuActionProvider|"
msgid "Join Channel..."
msgstr "加入频道..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:58
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
msgctxt "ContextMenuActionProvider|"
msgid "Start Query"
msgstr "开始查询"
-#: ../src/uisupport/contextmenuactionprovider.cpp:59
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
msgctxt "ContextMenuActionProvider|"
msgid "Show Query"
msgstr "显示查询"
-#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/contextmenuactionprovider.cpp:62
msgctxt "ContextMenuActionProvider|"
msgid "Whois"
msgstr "Whois"
-#: ../src/uisupport/contextmenuactionprovider.cpp:62
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
msgctxt "ContextMenuActionProvider|"
msgid "Version"
msgstr "版本"
-#: ../src/uisupport/contextmenuactionprovider.cpp:63
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
msgctxt "ContextMenuActionProvider|"
msgid "Time"
msgstr "时间"
-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
msgctxt "ContextMenuActionProvider|"
msgid "Ping"
msgstr "Ping"
-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
msgctxt "ContextMenuActionProvider|"
msgid "Client info"
msgstr "客户端信息"
-#: ../src/uisupport/contextmenuactionprovider.cpp:66
+#: ../src/uisupport/contextmenuactionprovider.cpp:68
msgctxt "ContextMenuActionProvider|"
msgid "Custom..."
msgstr "自定义..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:78
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
msgctxt "ContextMenuActionProvider|"
msgid "Give Operator Status"
msgstr "给出运算符状态"
-#: ../src/uisupport/contextmenuactionprovider.cpp:79
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
msgctxt "ContextMenuActionProvider|"
msgid "Take Operator Status"
msgstr "采用运算符状态"
-#: ../src/uisupport/contextmenuactionprovider.cpp:80
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
+msgctxt "ContextMenuActionProvider|"
+msgid "Give Half-Operator Status"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
+msgctxt "ContextMenuActionProvider|"
+msgid "Take Half-Operator Status"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
msgctxt "ContextMenuActionProvider|"
msgid "Give Voice"
msgstr "给予发言权限"
-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
msgctxt "ContextMenuActionProvider|"
msgid "Take Voice"
msgstr "撤除发言权限"
-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
msgctxt "ContextMenuActionProvider|"
msgid "Kick From Channel"
msgstr "踢出频道"
-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
msgctxt "ContextMenuActionProvider|"
msgid "Ban From Channel"
msgstr "禁止参与频道"
-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:88
msgctxt "ContextMenuActionProvider|"
msgid "Kick && Ban"
msgstr "踢出和禁止"
-#: ../src/uisupport/contextmenuactionprovider.cpp:86
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
msgctxt "ContextMenuActionProvider|"
msgid "Hide Chat(s) Temporarily"
msgstr "临时隐藏聊天"
-#: ../src/uisupport/contextmenuactionprovider.cpp:87
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
msgctxt "ContextMenuActionProvider|"
msgid "Hide Chat(s) Permanently"
msgstr "永久隐藏聊天"
-#: ../src/uisupport/contextmenuactionprovider.cpp:88
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
msgctxt "ContextMenuActionProvider|"
msgid "Show Channel List"
msgstr "显示频道列表"
-#: ../src/uisupport/contextmenuactionprovider.cpp:89
+#: ../src/uisupport/contextmenuactionprovider.cpp:93
msgctxt "ContextMenuActionProvider|"
msgid "Show Ignore List"
msgstr "显示忽略列表"
-#: ../src/uisupport/contextmenuactionprovider.cpp:102
+#: ../src/uisupport/contextmenuactionprovider.cpp:108
msgctxt "ContextMenuActionProvider|"
msgid "Hide Events"
msgstr "隐藏事件"
-#: ../src/uisupport/contextmenuactionprovider.cpp:110
+#: ../src/uisupport/contextmenuactionprovider.cpp:116
msgctxt "ContextMenuActionProvider|"
msgid "CTCP"
msgstr "CTCP"
-#: ../src/uisupport/contextmenuactionprovider.cpp:122
+#: ../src/uisupport/contextmenuactionprovider.cpp:131
msgctxt "ContextMenuActionProvider|"
msgid "Actions"
msgstr "动作"
-#: ../src/uisupport/contextmenuactionprovider.cpp:126
+#: ../src/uisupport/contextmenuactionprovider.cpp:135
msgctxt "ContextMenuActionProvider|"
msgid "Ignore"
msgstr "忽略"
-#: ../src/uisupport/contextmenuactionprovider.cpp:131
+#: ../src/uisupport/contextmenuactionprovider.cpp:140
msgctxt "ContextMenuActionProvider|"
msgid "Add Ignore Rule"
msgstr "添加忽略规则"
-#: ../src/uisupport/contextmenuactionprovider.cpp:132
+#: ../src/uisupport/contextmenuactionprovider.cpp:141
msgctxt "ContextMenuActionProvider|"
msgid "Existing Rules"
msgstr "现有规则"
-#: ../src/core/core.cpp:182
+#: ../src/core/core.cpp:191
msgctxt "Core|"
msgid "Could not initialize any storage backend! Exiting..."
msgstr "无法初始化任何存储后端！正在退出..."
-#: ../src/core/core.cpp:183
+#: ../src/core/core.cpp:192
msgctxt "Core|"
msgid ""
"Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
"to work."
msgstr "目前 Quassel 支持 SQLite3 和 PostgreSQL。您需要在启用\n sqlite 和 postgres 插件的条件下重新编译 Qt 库才能让 quasselcore\n正常工作。"
-#: ../src/core/core.cpp:232
+#: ../src/core/core.cpp:252
msgctxt "Core|"
msgid "Calling restoreState() even though active sessions exist!"
msgstr "尽管有活动的会话，仍然调用 restoreState()！"
-#: ../src/core/core.cpp:273
+#: ../src/core/core.cpp:286
+msgctxt "Core|"
+msgid "Core is already configured! Not configuring again..."
+msgstr ""
+
+#: ../src/core/core.cpp:289
msgctxt "Core|"
msgid "Admin user or password not set."
msgstr "管理员的用户名或密码未设置。"
-#: ../src/core/core.cpp:276
+#: ../src/core/core.cpp:292
msgctxt "Core|"
msgid "Could not setup storage!"
msgstr "无法设置存储！"
-#: ../src/core/core.cpp:280
+#: ../src/core/core.cpp:297
msgctxt "Core|"
msgid "Creating admin user..."
msgstr "正在创建管理员用户..."
-#: ../src/core/core.cpp:393
+#: ../src/core/core.cpp:447
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1"
msgstr "无效的侦听地址 %1"
-#: ../src/core/core.cpp:401
+#: ../src/core/core.cpp:456
#, 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:409
+#: ../src/core/core.cpp:465
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv6 interface %1:%2: %3"
msgstr "无法打开 IPv6 接口 %1:%2：%3"
-#: ../src/core/core.cpp:417
+#: ../src/core/core.cpp:473
#, 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:427
+#: ../src/core/core.cpp:484
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv4 interface %1:%2: %3"
msgstr "无法打开 IPv4 接口 %1:%2：%3"
-#: ../src/core/core.cpp:435
+#: ../src/core/core.cpp:492
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1, unknown network protocol"
msgstr "侦听地址 %1 无效，网络协议未知"
-#: ../src/core/core.cpp:444
+#: ../src/core/core.cpp:501
msgctxt "Core|"
msgid "Could not open any network interfaces to listen on!"
msgstr "无法打开任何可侦听的网络接口"
-#: ../src/core/core.cpp:478
+#: ../src/core/core.cpp:541
msgctxt "Core|"
msgid "Client connected from"
msgstr "客户端已连接自"
-#: ../src/core/core.cpp:481
+#: ../src/core/core.cpp:544
msgctxt "Core|"
msgid "Closing server for basic setup."
msgstr "关闭服务器以进行基本设置。"
-#: ../src/core/core.cpp:500
-msgctxt "Core|"
-msgid "Antique client trying to connect... refusing."
-msgstr "旧版的客户端正在尝试连接...拒绝。"
-
-#: ../src/core/core.cpp:512
-#, qt-format
-msgctxt "Core|"
-msgid ""
-"<b>Your Quassel Client is too old!</b><br>This core needs at least "
-"client/core protocol version %1.<br>Please consider upgrading your client."
-msgstr "<b>您的 Quassel 客户端太过时了！</b><br>此核心至少需要客户端/核心协议版本 %1。<br>请考虑更新您的客户端。"
-
-#: ../src/core/core.cpp:516 ../src/core/core.cpp:606 ../src/core/core.cpp:630
-msgctxt "Core|"
-msgid "Client"
-msgstr "客戶端"
-
-#: ../src/core/core.cpp:516
-msgctxt "Core|"
-msgid "too old, rejecting."
-msgstr "过旧，拒绝。"
-
-#: ../src/core/core.cpp:533
-#, qt-format
-msgctxt "Core|"
-msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
-msgstr "<b>Quassel 核心版本 %1</b><br>编译：%2<br>已运行 %3天%4小时%5分(始于 %6)"
-
-#: ../src/core/core.cpp:586
-msgctxt "Core|"
-msgid "Starting TLS for Client:"
-msgstr "正在启动客户端的 TLS："
-
-#: ../src/core/core.cpp:604
-msgctxt "Core|"
-msgid ""
-"<b>Client not initialized!</b><br>You need to send an init message before "
-"trying to login."
-msgstr "<b>客户端没有初始化！</b><br>您需要先发送一个 init(初始化) 消息才能尝试登录。"
-
-#: ../src/core/core.cpp:606
-msgctxt "Core|"
-msgid "did not send an init message before trying to login, rejecting."
-msgstr "在尝试登录前没有发送初始化消息，拒绝。"
-
-#: ../src/core/core.cpp:624
-msgctxt "Core|"
-msgid ""
-"<b>Invalid username or password!</b><br>The username/password combination "
-"you supplied could not be found in the database."
-msgstr "<b>用户名或密码无效！</b><br>您提供的用户名/密码组合在数据库中找不到。"
-
-#: ../src/core/core.cpp:630
-#, qt-format
-msgctxt "Core|"
-msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
-msgstr "已成功初始化并认证为“%1”(用户ID：%2)。"
-
-#: ../src/core/core.cpp:641
-msgctxt "Core|"
-msgid "Non-authed client disconnected."
-msgstr "非认证客户端已断开。"
-
-#: ../src/core/core.cpp:647
-msgctxt "Core|"
-msgid "Non-authed client disconnected. (socket allready destroyed)"
-msgstr "非认证客户端已断开。(已销毁套接字)"
-
-#: ../src/core/core.cpp:695
-msgctxt "Core|"
-msgid "Could not initialize session for client:"
-msgstr "无法初始化客户端会话："
-
-#: ../src/core/core.cpp:717
+#: ../src/core/core.cpp:556
msgctxt "Core|"
-msgid "Could not find a session for client:"
-msgstr "无法找到客户端会话："
+msgid "Non-authed client disconnected:"
+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:261
msgctxt "CoreAccountEditDlg|"
msgid "Edit Core Account"
msgstr "编辑核心账户"
msgid "HTTP"
msgstr "HTTP"
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:263
msgctxt "CoreAccountEditDlg|"
msgid "Add Core Account"
msgstr "添加核心账户"
-#: ../src/client/coreaccountmodel.cpp:64
+#: ../src/client/coreaccountmodel.cpp:68
msgctxt "CoreAccountModel|"
msgid "Internal Core"
msgstr "内部核心"
msgid "Always connect to"
msgstr "总是连接到"
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:30
msgctxt "CoreAccountSettingsPage|"
msgid "Remote Cores"
msgstr "远程核心"
+#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144
+msgctxt "CoreAuthHandler|"
+msgid "Client"
+msgstr "客戶端"
+
+#: ../src/core/coreauthhandler.cpp:132
+msgctxt "CoreAuthHandler|"
+msgid "too old, rejecting."
+msgstr "过旧，拒绝。"
+
+#: ../src/core/coreauthhandler.cpp:133
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Your Quassel Client is too old!</b><br>This core needs at least "
+"client/core protocol version %1 (got: %2).<br>Please consider upgrading your"
+" client."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:144
+msgctxt "CoreAuthHandler|"
+msgid "did not send a registration message before trying to login, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:145
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Client not initialized!</b><br>You need to send a registration message "
+"before trying to login."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:162
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>SSL is required!</b><br>You need to use SSL in order to connect to this "
+"core."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:176
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
+msgstr "<b>Quassel 核心版本 %1</b><br>编译：%2<br>已运行 %3天%4小时%5分(始于 %6)"
+
+#: ../src/core/coreauthhandler.cpp:212
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Invalid username or password!</b><br>The username/password combination "
+"you supplied could not be found in the database."
+msgstr "<b>用户名或密码无效！</b><br>您提供的用户名/密码组合在数据库中找不到。"
+
+#: ../src/core/coreauthhandler.cpp:217
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:236
+msgctxt "CoreAuthHandler|"
+msgid "Starting encryption for Client:"
+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 ""
"over."
msgstr "核心配置失败：<br><b>%1</b><br>点击 <em>下一步</em> 重新开始。"
-#: ../src/qtui/coreconfigwizard.cpp:119
+#: ../src/qtui/coreconfigwizard.cpp:126
msgctxt "CoreConfigWizard|"
msgid ""
"Your are now logged into your freshly configured Quassel Core!<br>Please "
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 "
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:182
msgctxt "CoreConnection|"
msgid "Network is down"
msgstr "网络已断"
-#: ../src/client/coreconnection.cpp:202 ../src/client/coreconnection.cpp:321
+#: ../src/client/coreconnection.cpp:263
msgctxt "CoreConnection|"
msgid "Disconnected"
msgstr "连接已断开"
-#: ../src/client/coreconnection.cpp:205
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Looking up %1..."
-msgstr "正在查找 %1..."
-
-#: ../src/client/coreconnection.cpp:208 ../src/client/coreconnection.cpp:450
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Connecting to %1..."
-msgstr "正在连接 %1..."
-
-#: ../src/client/coreconnection.cpp:211 ../src/client/coreconnection.cpp:573
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Connected to %1"
-msgstr "已连接到 %1"
-
-#: ../src/client/coreconnection.cpp:214
-#, 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:298
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 ""
-"<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at "
-"least core/client protocol v%1 to connect."
-msgstr "<b>您试图连接的 Quassel 核心过于陈旧！</b><br>至少需要核心/客户端协议 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:436
msgctxt "CoreConnection|"
msgid "Receiving session state"
msgstr "正在接收会话状态"
-#: ../src/client/coreconnection.cpp:624
+#: ../src/client/coreconnection.cpp:438
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronizing to %1..."
msgstr "正在与 %1 同步..."
-#: ../src/client/coreconnection.cpp:648
+#: ../src/client/coreconnection.cpp:474
msgctxt "CoreConnection|"
msgid "Receiving network states"
msgstr "正在接收网络状态"
-#: ../src/client/coreconnection.cpp:698
+#: ../src/client/coreconnection.cpp:525
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronized to %1"
#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
msgctxt "CoreConnectionSettingsPage|"
-msgid ""
-"Rely on KDE's hardware layer to detect if we're online. Recommended for most"
-" KDE users"
-msgstr "如果在线，依靠 KDE 的硬件层进行检测。建议多数 KDE 用户使用"
+msgid "Rely on Qt's network configuration manager to detect if we're online"
+msgstr ""
#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
msgctxt "CoreConnectionSettingsPage|"
-msgid "Use KDE's network status detection (via Solid)"
-msgstr "使用 KDE 的网络状态检测(通过 Solid)"
+msgid "Automatic"
+msgstr ""
#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
msgctxt "CoreConnectionSettingsPage|"
msgid ""
"Actively ping the remote core and disconnect if we didn't get a reply after "
msgid "Retry every"
msgstr "重试间隔"
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Interval between consecutive connection attempts"
+msgstr ""
+
#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
msgctxt "CoreConnectionSettingsPage|"
msgid "Remote Cores"
msgid "Message"
msgstr "消息"
-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67
msgctxt "CoreConnectionStatusWidget|seconds"
msgid "s"
msgstr "秒"
-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67
msgctxt "CoreConnectionStatusWidget|milliseconds"
msgid "ms"
msgstr "毫秒"
-#: ../src/qtui/coreconnectionstatuswidget.cpp:62
+#: ../src/qtui/coreconnectionstatuswidget.cpp:68
#, qt-format
msgctxt "CoreConnectionStatusWidget|"
msgid "(Lag: %1 %2)"
msgstr "(延时：%1 %2)"
-#: ../src/qtui/coreconnectionstatuswidget.cpp:75
+#: ../src/qtui/coreconnectionstatuswidget.cpp:84
msgctxt "CoreConnectionStatusWidget|"
msgid "The connection to your core is encrypted with SSL."
msgstr "与核心的连接已经使用了 SSL 加密。"
-#: ../src/qtui/coreconnectionstatuswidget.cpp:78
+#: ../src/qtui/coreconnectionstatuswidget.cpp:88
msgctxt "CoreConnectionStatusWidget|"
msgid "The connection to your core is not encrypted."
msgstr "与核心的连接没有加密。"
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:148
+#: ../src/core/corenetwork.cpp:168
msgctxt "CoreNetwork|"
msgid "Connection failed. Cycling to next Server"
msgstr "连接失败。轮转到下个服务器"
-#: ../src/core/corenetwork.cpp:156 ../src/core/corenetwork.cpp:157
+#: ../src/core/corenetwork.cpp:176 ../src/core/corenetwork.cpp:177
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connecting to %1:%2..."
msgstr "正在连接到 %1：%2..."
-#: ../src/core/corenetwork.cpp:205
+#: ../src/core/corenetwork.cpp:234
#, qt-format
msgctxt "CoreNetwork|"
msgid "Disconnecting. (%1)"
msgstr "正在断开。(%1)"
-#: ../src/core/corenetwork.cpp:205
+#: ../src/core/corenetwork.cpp:234
msgctxt "CoreNetwork|"
msgid "Core Shutdown"
msgstr "核心关闭"
-#: ../src/core/corenetwork.cpp:343
+#: ../src/core/corenetwork.cpp:442
#, qt-format
msgctxt "CoreNetwork|"
msgid "Could not connect to %1 (%2)"
msgstr "无法连接到 %1 (%2)"
-#: ../src/core/corenetwork.cpp:345
+#: ../src/core/corenetwork.cpp:444
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connection failure: %1"
msgstr "连接失败：%1"
-#: ../src/core/coresession.cpp:214
+#: ../src/core/coresession.cpp:233
msgctxt "CoreSession|"
msgid "Client"
msgstr "客戶端"
-#: ../src/core/coresession.cpp:214
+#: ../src/core/coresession.cpp:233
#, qt-format
msgctxt "CoreSession|"
msgid "disconnected (UserId: %1)."
msgstr "已断开(用户ID：%1)。"
-#: ../src/core/coresession.cpp:440
+#: ../src/core/coresession.cpp:481
#, qt-format
msgctxt "CoreSession|"
msgid ""
" create network %1!"
msgstr "CoreSession::createNetwork()：在尝试创建网络 %1 时收到来自核心的无效的网络ID！"
-#: ../src/core/coresession.cpp:472
+#: ../src/core/coresession.cpp:513
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 <othernick> 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:1052
+msgctxt "CoreSessionEventProcessor|"
+msgid "Reverse DCC SEND not supported"
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1070
+#, 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:189
+#: ../src/core/coreuserinputhandler.cpp:360
+#: ../src/core/coreuserinputhandler.cpp:622
+#: ../src/core/coreuserinputhandler.cpp:660
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"Error: QCA provider plugin not found. It is usually provided by the qca-ossl"
+" plugin."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:200
msgctxt "CoreUserInputHandler|"
msgid ""
"[usage] /delkey <nick|channel> 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:207
+#: ../src/core/coreuserinputhandler.cpp:678
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "No key has been set for %1."
msgstr "没有为 %1 设置密钥。"
-#: ../src/core/coreuserinputhandler.cpp:197
+#: ../src/core/coreuserinputhandler.cpp:212
#, 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:216
+#: ../src/core/coreuserinputhandler.cpp:686
msgctxt "CoreUserInputHandler|"
msgid ""
"Error: Setting an encryption key requires Quassel to have been built with "
"with QCA2 present."
msgstr "错误：设置加密密钥要求编译的 Quassel 内建 Qt 加密架构(QCA2)库支持。请联系您的发行商查找带 QCA2 支持的 Quassel 软件包，或者使用现有的 QCA2 重新编译 Quassel。"
-#: ../src/core/coreuserinputhandler.cpp:422
+#: ../src/core/coreuserinputhandler.cpp:370
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:377
+msgctxt "CoreUserInputHandler|"
+msgid "It is only possible to exchange keys in a query buffer."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:387
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Failed to initiate key exchange with %1."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:392
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Initiated key exchange with %1."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:396
+#: ../src/core/coreuserinputhandler.cpp:644
+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:569
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "Starting query with %1"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:469
+#: ../src/core/coreuserinputhandler.cpp:632
msgctxt "CoreUserInputHandler|"
msgid ""
"[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
"it."
msgstr "[用法] /setkey <昵称|频道> <密钥> 设置昵称或频道对应的加密密钥。在频道或查询缓冲区中时，使用 /setkey <密钥> 将设置相应于频道或缓存的密钥。"
-#: ../src/core/coreuserinputhandler.cpp:484
+#: ../src/core/coreuserinputhandler.cpp:641
#, 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:670
msgctxt "CoreUserInputHandler|"
msgid ""
"[usage] /showkey <nick|channel> 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
-#, qt-format
-msgctxt "CoreUserInputHandler|"
-msgid "The key for %1 is %2"
-msgstr "%1 的主页为 %2"
-
-#: ../src/core/coreuserinputhandler.cpp:633
+#: ../src/core/coreuserinputhandler.cpp:682
#, qt-format
msgctxt "CoreUserInputHandler|"
-msgid "[Error] Could not encrypt your message: %1"
-msgstr "[错误] 无法加密您的消息：%1"
+msgid "The key for %1 is %2:%3"
+msgstr ""
#: ../src/qtui/settingspages/createidentitydlg.ui:17
msgctxt "CreateIdentityDlg|"
msgid "Duplicate:"
msgstr "重复："
+#: ../src/common/protocols/datastream/datastreampeer.cpp:114
+msgctxt "DataStreamPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
+
+#: ../src/common/protocols/datastream/datastreampeer.cpp:161
+#, qt-format
+msgctxt "DataStreamPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
+
#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
msgctxt "DebugBufferViewOverlay|"
msgid "Debug BufferView Overlay"
msgid "Close"
msgstr "关闭"
-#: ../src/core/eventstringifier.cpp:133 ../src/core/eventstringifier.cpp:250
+#: ../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:145
+#: ../src/core/eventstringifier.cpp:239
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 invited you to channel %2"
msgstr "%1 邀请您加入频道 %2"
-#: ../src/core/eventstringifier.cpp:230
+#: ../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:237
+#: ../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:263
+#: ../src/core/eventstringifier.cpp:384
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 is away: \"%2\""
msgstr "%1 状态为离开：“%2”"
-#: ../src/core/eventstringifier.cpp:268
+#: ../src/core/eventstringifier.cpp:391
msgctxt "EventStringifier|"
msgid "You are no longer marked as being away"
msgstr ""
-#: ../src/core/eventstringifier.cpp:274
+#: ../src/core/eventstringifier.cpp:399
msgctxt "EventStringifier|"
msgid "You have been marked as being away"
msgstr ""
-#: ../src/core/eventstringifier.cpp:294
+#: ../src/core/eventstringifier.cpp:421
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is %2 (%3)"
msgstr "[Whois] %1 为 %2 (%3)"
-#: ../src/core/eventstringifier.cpp:308
+#: ../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:310
+#: ../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:318
+#: ../src/core/eventstringifier.cpp:449
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whowas] %1 was %2@%3 (%4)"
msgstr ""
-#: ../src/core/eventstringifier.cpp:325
+#: ../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:335
+#: ../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:337
+#: ../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:344
+#: ../src/core/eventstringifier.cpp:484
msgctxt "EventStringifier|"
msgid "[Whois] End of /WHOIS list"
msgstr "[Who] %1 的 /WHO 列表结尾"
-#: ../src/core/eventstringifier.cpp:365
+#: ../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:367
+#: ../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:369
+#: ../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:388
+#: ../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:394
+#: ../src/core/eventstringifier.cpp:540
msgctxt "EventStringifier|"
msgid "End of channel list"
msgstr "频道列表末尾"
-#: ../src/core/eventstringifier.cpp:408
+#: ../src/core/eventstringifier.cpp:558
#, qt-format
msgctxt "EventStringifier|"
msgid "Homepage for %1 is %2"
msgstr "%1 的主页为 %2"
-#: ../src/core/eventstringifier.cpp:423
+#: ../src/core/eventstringifier.cpp:575
#, qt-format
msgctxt "EventStringifier|"
msgid "Channel %1 created on %2"
msgstr "%1 频道创建于 %2"
-#: ../src/core/eventstringifier.cpp:431
+#: ../src/core/eventstringifier.cpp:589
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is authed as %2"
msgstr "[Whois] %1 状态为离开：“%2”"
-#: ../src/core/eventstringifier.cpp:437
+#: ../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:443
+#: ../src/core/eventstringifier.cpp:609
#, qt-format
msgctxt "EventStringifier|"
msgid "Topic for %1 is \"%2\""
msgstr "%1 的话题为“%2”"
-#: ../src/core/eventstringifier.cpp:452
+#: ../src/core/eventstringifier.cpp:621
#, qt-format
msgctxt "EventStringifier|"
msgid "Topic set by %1 on %2"
msgstr "话题由 %1 于 %2 设置"
-#: ../src/core/eventstringifier.cpp:462
+#: ../src/core/eventstringifier.cpp:634
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 has been invited to %2"
msgstr "%1 受邀加入 %2"
-#: ../src/core/eventstringifier.cpp:468
+#: ../src/core/eventstringifier.cpp:642
#, qt-format
msgctxt "EventStringifier|"
msgid "[Who] %1"
msgstr "[Who] %1"
-#: ../src/core/eventstringifier.cpp:473
+#: ../src/core/eventstringifier.cpp:649
msgctxt "EventStringifier|"
msgid "End of /WHOWAS"
msgstr ""
-#: ../src/core/eventstringifier.cpp:478
+#: ../src/core/eventstringifier.cpp:659
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick %1 contains illegal characters"
msgstr "昵称 %1 含有非法字符"
-#: ../src/core/eventstringifier.cpp:483
+#: ../src/core/eventstringifier.cpp:669
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick already in use: %1"
msgstr "昵称已经使用：%1"
-#: ../src/core/eventstringifier.cpp:488
+#: ../src/core/eventstringifier.cpp:679
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick/channel is temporarily unavailable: %1"
msgstr "昵称/频道临时不可用：%1"
-#: ../src/core/eventstringifier.cpp:509
+#: ../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:522
+#: ../src/core/eventstringifier.cpp:717
msgctxt "EventStringifier|"
msgid "unknown"
msgstr ""
-#: ../src/core/eventstringifier.cpp:523
+#: ../src/core/eventstringifier.cpp:718
#, qt-format
msgctxt "EventStringifier|"
msgid "Received %1CTCP-%2 request by %3"
msgstr ""
-#: ../src/core/eventstringifier.cpp:526
+#: ../src/core/eventstringifier.cpp:721
#, qt-format
msgctxt "EventStringifier|"
msgid "Received CTCP-%1 answer from %2: %3"
msgstr ""
-#: ../src/core/eventstringifier.cpp:537
+#: ../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 秒"
+msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time"
+msgstr ""
-#: ../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:192
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 "重命名身份"
msgid "Identities"
msgstr "身份"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:178
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:205
msgctxt "IdentitiesSettingsPage|"
msgid ""
"<b>The following problems need to be corrected before your changes can be "
"applied:</b><ul>"
msgstr "<b>在应用更改前，您需要修正收下问题：</b><ul>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:179
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:206
msgctxt "IdentitiesSettingsPage|"
msgid "<li>All identities need an identity name set</li>"
msgstr "<li>所有的身份需要一个身份名称组</li>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:180
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:207
msgctxt "IdentitiesSettingsPage|"
msgid "<li>Every identity needs at least one nickname defined</li>"
msgstr "<li>每个身份必须定义至少一个昵称</li>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:181
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:208
msgctxt "IdentitiesSettingsPage|"
msgid "<li>You need to specify a real name for every identity</li>"
msgstr "<li>您必须为每个身份指定一个真名</li>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:182
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:209
msgctxt "IdentitiesSettingsPage|"
msgid "<li>You need to specify an ident for every identity</li>"
msgstr "<li>您需要为每个身份指定一个标识(ID)</li>"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:183
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:210
msgctxt "IdentitiesSettingsPage|"
msgid "</ul>"
msgstr "</ul>"
-#: ../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 "<empty>"
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 - 随时随地畅谈。"
msgstr "空闲的分钟数"
#: ../src/qtui/settingspages/identityeditwidget.ui:399
-#: ../src/qtui/settingspages/identityeditwidget.cpp:219
+#: ../src/qtui/settingspages/identityeditwidget.cpp:244
msgctxt "IdentityEditWidget|"
msgid "Advanced"
msgstr "高级"
msgstr "密钥类型："
#: ../src/qtui/settingspages/identityeditwidget.ui:605
-#: ../src/qtui/settingspages/identityeditwidget.cpp:317
-#: ../src/qtui/settingspages/identityeditwidget.cpp:328
+#: ../src/qtui/settingspages/identityeditwidget.cpp:364
+#: ../src/qtui/settingspages/identityeditwidget.cpp:376
msgctxt "IdentityEditWidget|"
msgid "No Key loaded"
msgstr "没有加载密钥"
#: ../src/qtui/settingspages/identityeditwidget.ui:625
#: ../src/qtui/settingspages/identityeditwidget.ui:723
-#: ../src/qtui/settingspages/identityeditwidget.cpp:318
#: ../src/qtui/settingspages/identityeditwidget.cpp:365
+#: ../src/qtui/settingspages/identityeditwidget.cpp:423
msgctxt "IdentityEditWidget|"
msgid "Load"
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:421
+#: ../src/qtui/settingspages/identityeditwidget.cpp:422
msgctxt "IdentityEditWidget|"
msgid "No Certificate loaded"
msgstr "没有加载证书"
msgid "CommonName:"
msgstr "常用名："
-#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+#: ../src/qtui/settingspages/identityeditwidget.cpp:327
msgctxt "IdentityEditWidget|"
msgid "Load a Key"
msgstr "加载密钥"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:322
+#: ../src/qtui/settingspages/identityeditwidget.cpp:355
+msgctxt "IdentityEditWidget|"
+msgid "Failed to read key"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:355
+msgctxt "IdentityEditWidget|"
+msgid ""
+"Failed to read the key file. It is either incompatible or invalid. Note that"
+" the key file must not have a passphrase."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:370
msgctxt "IdentityEditWidget|"
msgid "RSA"
msgstr "RSA"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+#: ../src/qtui/settingspages/identityeditwidget.cpp:373
msgctxt "IdentityEditWidget|"
msgid "DSA"
msgstr "DSA"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:330
-#: ../src/qtui/settingspages/identityeditwidget.cpp:369
+#: ../src/qtui/settingspages/identityeditwidget.cpp:378
+#: ../src/qtui/settingspages/identityeditwidget.cpp:433
msgctxt "IdentityEditWidget|"
msgid "Clear"
msgstr "清除"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+#: ../src/qtui/settingspages/identityeditwidget.cpp:390
msgctxt "IdentityEditWidget|"
msgid "Load a Certificate"
msgstr "加载证书"
-#: ../src/qtui/ircconnectionwizard.cpp:107
+#: ../src/qtui/ircconnectionwizard.cpp:116
msgctxt "IdentityPage|"
msgid "Setup Identity"
msgstr "设置身份"
-#: ../src/qtui/ircconnectionwizard.cpp:112
+#: ../src/qtui/ircconnectionwizard.cpp:121
msgctxt "IdentityPage|"
msgid "Default Identity"
msgstr "默认身份"
msgid "Rule is enabled"
msgstr "规则已启用"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:69
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:71
msgctxt "IgnoreListModel|"
msgid ""
"<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
"dynamic rules, disabling actually shows the filtered messages again"
msgstr "<b>允许/禁止：</b><br />只有被允许的规则被过滤。<br />对于动态规则，禁止实际上将再次显示了被过滤的信息。"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:73
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:75
msgctxt "IgnoreListModel|"
msgid ""
"<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "
"host<br />"
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 "忽略规则"
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 ""
msgid "Form"
msgstr "表单"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "White"
msgstr "白色"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Black"
msgstr "黑色"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Dark blue"
msgstr "深蓝"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Dark green"
msgstr "暗绿"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Red"
msgstr "红色"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Dark red"
msgstr "深红"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Dark magenta"
msgstr "深洋红"
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75
msgctxt "InputWidget|"
msgid "Orange"
msgstr "橙色"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76
msgctxt "InputWidget|"
msgid "Yellow"
msgstr "黄色"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76
msgctxt "InputWidget|"
msgid "Green"
msgstr "绿色"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76
msgctxt "InputWidget|"
msgid "Dark cyan"
msgstr "暗青色"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76
msgctxt "InputWidget|"
msgid "Cyan"
msgstr "青色"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76
msgctxt "InputWidget|"
msgid "Blue"
msgstr "蓝色"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76
msgctxt "InputWidget|"
msgid "Magenta"
msgstr "洋红色"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76
msgctxt "InputWidget|"
msgid "Dark gray"
msgstr "深灰色"
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76
msgctxt "InputWidget|"
msgid "Light gray"
msgstr "浅灰色"
-#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85
+#: ../src/qtui/inputwidget.cpp:86 ../src/qtui/inputwidget.cpp:87
msgctxt "InputWidget|"
msgid "Clear Color"
msgstr "清除颜色"
-#: ../src/qtui/inputwidget.cpp:132
+#: ../src/qtui/inputwidget.cpp:137
msgctxt "InputWidget|"
msgid "Focus Input Line"
msgstr "聚焦输入行"
#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
msgctxt "InputWidgetSettingsPage|"
+msgid "Enables line wrapping for input."
+msgstr ""
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
+msgctxt "InputWidgetSettingsPage|"
+msgid "Line wrapping"
+msgstr ""
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:143
+msgctxt "InputWidgetSettingsPage|"
msgid "Multi-Line Editing"
msgstr "多行编辑"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:160
msgctxt "InputWidgetSettingsPage|"
msgid "Show at most"
msgstr "最多显示"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:186
msgctxt "InputWidgetSettingsPage|"
msgid "lines"
msgstr "行"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:208
msgctxt "InputWidgetSettingsPage|"
msgid "Enable scrollbars"
msgstr "启用滚动条"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:227
msgctxt "InputWidgetSettingsPage|"
msgid "Tab Completion"
msgstr "Tab 补全"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
msgctxt "InputWidgetSettingsPage|"
msgid "Completion suffix:"
msgstr "补全后缀："
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:251
msgctxt "InputWidgetSettingsPage|"
msgid ": "
msgstr "： "
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:262
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:278
msgctxt "InputWidgetSettingsPage|"
msgid "Add space after nick when completing mid-sentence"
msgstr ""
-#: ../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:50
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:953
msgctxt "IrcUserItem|"
msgid " is away"
msgstr " 状态为离开"
-#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:968
#, qt-format
msgctxt "IrcUserItem|"
msgid "idling since %1"
msgstr "空闲自从 %1"
-#: ../src/client/networkmodel.cpp:824
+#: ../src/client/networkmodel.cpp:971
#, qt-format
msgctxt "IrcUserItem|"
msgid "login time: %1"
msgstr "登录时间：%1"
-#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:974
#, qt-format
msgctxt "IrcUserItem|"
msgid "server: %1"
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:139
#, 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 ""
"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:136
+msgctxt "LegacyPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:207
+#, qt-format
+msgctxt "LegacyPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
+
+#: ../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 "Change &Password..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:366
msgctxt "MainWin|"
msgid "Core &Info..."
msgstr "核心信息(&I)..."
-#: ../src/qtui/mainwin.cpp:321
+#: ../src/qtui/mainwin.cpp:368
msgctxt "MainWin|"
msgid "Configure &Networks..."
msgstr "配置网络(&N)..."
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:371
msgctxt "MainWin|"
msgid "&Quit"
msgstr "退出(&Q)"
-#: ../src/qtui/mainwin.cpp:328
+#: ../src/qtui/mainwin.cpp:375
msgctxt "MainWin|"
msgid "&Configure Chat Lists..."
msgstr "配置聊天列表(&C)..."
-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:378
msgctxt "MainWin|"
msgid "&Lock Layout"
msgstr "锁定布局(&L)"
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:382
msgctxt "MainWin|"
msgid "Show &Search Bar"
msgstr "显示搜索栏(&S)"
-#: ../src/qtui/mainwin.cpp:337
+#: ../src/qtui/mainwin.cpp:384
msgctxt "MainWin|"
msgid "Show Away Log"
msgstr "显示离开记录"
-#: ../src/qtui/mainwin.cpp:339
+#: ../src/qtui/mainwin.cpp:386
msgctxt "MainWin|"
msgid "Show &Menubar"
msgstr "显示菜单栏(&M)"
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:389
msgctxt "MainWin|"
msgid "Show Status &Bar"
msgstr "显示状态栏(&B)"
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:395
msgctxt "MainWin|"
msgid "&Full Screen Mode"
msgstr "全屏模式(&F)"
-#: ../src/qtui/mainwin.cpp:355
+#: ../src/qtui/mainwin.cpp:402
msgctxt "MainWin|"
msgid "Configure &Shortcuts..."
msgstr "配置快捷键(&S)..."
-#: ../src/qtui/mainwin.cpp:361 ../src/qtui/mainwin.cpp:365
+#: ../src/qtui/mainwin.cpp:408 ../src/qtui/mainwin.cpp:412
msgctxt "MainWin|"
msgid "&Configure Quassel..."
msgstr "配置 Quassel(&C)..."
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:418
msgctxt "MainWin|"
msgid "&About Quassel"
msgstr "关于 Quassel(&A)"
-#: ../src/qtui/mainwin.cpp:376
+#: ../src/qtui/mainwin.cpp:423
msgctxt "MainWin|"
msgid "About &Qt"
msgstr "关于&Qt"
-#: ../src/qtui/mainwin.cpp:380
+#: ../src/qtui/mainwin.cpp:427
msgctxt "MainWin|"
msgid "Debug &NetworkModel"
msgstr "调试网络模型(&N)"
-#: ../src/qtui/mainwin.cpp:382
+#: ../src/qtui/mainwin.cpp:429
msgctxt "MainWin|"
msgid "Debug &BufferViewOverlay"
msgstr "调试缓存视图覆盖(&B)"
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:431
msgctxt "MainWin|"
msgid "Debug &MessageModel"
msgstr "调试消息模型(&M)"
-#: ../src/qtui/mainwin.cpp:386
+#: ../src/qtui/mainwin.cpp:433
msgctxt "MainWin|"
msgid "Debug &HotList"
msgstr "调试日志(&L)"
-#: ../src/qtui/mainwin.cpp:388
+#: ../src/qtui/mainwin.cpp:435
msgctxt "MainWin|"
msgid "Debug &Log"
msgstr "调试日志(&L)"
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:437
msgctxt "MainWin|"
msgid "Reload Stylesheet"
msgstr "重新加载样式表"
-#: ../src/qtui/mainwin.cpp:394
+#: ../src/qtui/mainwin.cpp:440
+msgctxt "MainWin|"
+msgid "Hide Current Buffer"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:444
msgctxt "MainWin|"
msgid "Navigation"
msgstr "导航"
-#: ../src/qtui/mainwin.cpp:396
+#: ../src/qtui/mainwin.cpp:446
msgctxt "MainWin|"
msgid "Jump to hot chat"
msgstr ""
-#: ../src/qtui/mainwin.cpp:408
+#: ../src/qtui/mainwin.cpp:458
msgctxt "MainWin|"
msgid "Set Quick Access #0"
msgstr "设置快速访问 #0"
-#: ../src/qtui/mainwin.cpp:410
+#: ../src/qtui/mainwin.cpp:460
msgctxt "MainWin|"
msgid "Set Quick Access #1"
msgstr "设置快速访问 #1"
-#: ../src/qtui/mainwin.cpp:412
+#: ../src/qtui/mainwin.cpp:462
msgctxt "MainWin|"
msgid "Set Quick Access #2"
msgstr "设置快速访问 #2"
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:464
msgctxt "MainWin|"
msgid "Set Quick Access #3"
msgstr "设置快速访问 #3"
-#: ../src/qtui/mainwin.cpp:416
+#: ../src/qtui/mainwin.cpp:466
msgctxt "MainWin|"
msgid "Set Quick Access #4"
msgstr "设置快速访问 #4"
-#: ../src/qtui/mainwin.cpp:418
+#: ../src/qtui/mainwin.cpp:468
msgctxt "MainWin|"
msgid "Set Quick Access #5"
msgstr "设置快速访问 #5"
-#: ../src/qtui/mainwin.cpp:420
+#: ../src/qtui/mainwin.cpp:470
msgctxt "MainWin|"
msgid "Set Quick Access #6"
msgstr "设置快速访问 #6"
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:472
msgctxt "MainWin|"
msgid "Set Quick Access #7"
msgstr "设置快速访问 #7"
-#: ../src/qtui/mainwin.cpp:424
+#: ../src/qtui/mainwin.cpp:474
msgctxt "MainWin|"
msgid "Set Quick Access #8"
msgstr "设置快速访问 #8"
-#: ../src/qtui/mainwin.cpp:426
+#: ../src/qtui/mainwin.cpp:476
msgctxt "MainWin|"
msgid "Set Quick Access #9"
msgstr "设置快速访问 #9"
-#: ../src/qtui/mainwin.cpp:429
+#: ../src/qtui/mainwin.cpp:479
msgctxt "MainWin|"
msgid "Quick Access #0"
msgstr "快速访问 #0"
-#: ../src/qtui/mainwin.cpp:431
+#: ../src/qtui/mainwin.cpp:481
msgctxt "MainWin|"
msgid "Quick Access #1"
msgstr "快速访问 #1"
-#: ../src/qtui/mainwin.cpp:433
+#: ../src/qtui/mainwin.cpp:483
msgctxt "MainWin|"
msgid "Quick Access #2"
msgstr "快速访问 #2"
-#: ../src/qtui/mainwin.cpp:435
+#: ../src/qtui/mainwin.cpp:485
msgctxt "MainWin|"
msgid "Quick Access #3"
msgstr "快速访问 #3"
-#: ../src/qtui/mainwin.cpp:437
+#: ../src/qtui/mainwin.cpp:487
msgctxt "MainWin|"
msgid "Quick Access #4"
msgstr "快速访问 #4"
-#: ../src/qtui/mainwin.cpp:439
+#: ../src/qtui/mainwin.cpp:489
msgctxt "MainWin|"
msgid "Quick Access #5"
msgstr "快速访问 #5"
-#: ../src/qtui/mainwin.cpp:441
+#: ../src/qtui/mainwin.cpp:491
msgctxt "MainWin|"
msgid "Quick Access #6"
msgstr "快速访问 #6"
-#: ../src/qtui/mainwin.cpp:443
+#: ../src/qtui/mainwin.cpp:493
msgctxt "MainWin|"
msgid "Quick Access #7"
msgstr "快速访问 #7"
-#: ../src/qtui/mainwin.cpp:445
+#: ../src/qtui/mainwin.cpp:495
msgctxt "MainWin|"
msgid "Quick Access #8"
msgstr "快速访问 #8"
-#: ../src/qtui/mainwin.cpp:447
+#: ../src/qtui/mainwin.cpp:497
msgctxt "MainWin|"
msgid "Quick Access #9"
msgstr "快速访问 #9"
-#: ../src/qtui/mainwin.cpp:451
+#: ../src/qtui/mainwin.cpp:501
msgctxt "MainWin|"
msgid "Activate Next Chat List"
msgstr "激活下一个聊天列表"
-#: ../src/qtui/mainwin.cpp:453
+#: ../src/qtui/mainwin.cpp:503
msgctxt "MainWin|"
msgid "Activate Previous Chat List"
msgstr "激活上一个聊天列表"
-#: ../src/qtui/mainwin.cpp:455
+#: ../src/qtui/mainwin.cpp:505
msgctxt "MainWin|"
msgid "Go to Next Chat"
msgstr "转到下个聊天"
-#: ../src/qtui/mainwin.cpp:457
+#: ../src/qtui/mainwin.cpp:507
msgctxt "MainWin|"
msgid "Go to Previous Chat"
msgstr "转到上个聊天"
-#: ../src/qtui/mainwin.cpp:464
+#: ../src/qtui/mainwin.cpp:516
msgctxt "MainWin|"
msgid "&File"
msgstr "文件(&F)"
-#: ../src/qtui/mainwin.cpp:477
+#: ../src/qtui/mainwin.cpp:529
msgctxt "MainWin|"
msgid "&Networks"
msgstr "网络(&N)"
-#: ../src/qtui/mainwin.cpp:483
+#: ../src/qtui/mainwin.cpp:535
msgctxt "MainWin|"
msgid "&View"
msgstr "查看(&V)"
-#: ../src/qtui/mainwin.cpp:484
+#: ../src/qtui/mainwin.cpp:536
msgctxt "MainWin|"
msgid "&Chat Lists"
msgstr "聊天列表(&C)"
-#: ../src/qtui/mainwin.cpp:486
+#: ../src/qtui/mainwin.cpp:538
msgctxt "MainWin|"
msgid "&Toolbars"
msgstr "工具栏(&T)"
-#: ../src/qtui/mainwin.cpp:500
+#: ../src/qtui/mainwin.cpp:552
msgctxt "MainWin|"
msgid "&Settings"
msgstr "设置(&S)"
-#: ../src/qtui/mainwin.cpp:509
+#: ../src/qtui/mainwin.cpp:562
msgctxt "MainWin|"
msgid "&Help"
msgstr "帮助(&H)"
-#: ../src/qtui/mainwin.cpp:517
+#: ../src/qtui/mainwin.cpp:571
msgctxt "MainWin|"
msgid "Debug"
msgstr "调试"
-#: ../src/qtui/mainwin.cpp:746
+#: ../src/qtui/mainwin.cpp:747
+msgctxt "MainWin|"
+msgid "Feature Not Supported"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:748
+msgctxt "MainWin|"
+msgid "<b>Your Quassel Core does not support this feature</b>"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:750
+msgctxt "MainWin|"
+msgid ""
+"You need a Quassel Core v0.12.0 or newer in order to be able to remotely "
+"change your password."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:863
msgctxt "MainWin|"
msgid "Nicks"
msgstr "昵称"
-#: ../src/qtui/mainwin.cpp:755
+#: ../src/qtui/mainwin.cpp:872
msgctxt "MainWin|"
msgid "Show Nick List"
msgstr "显示昵称列表"
-#: ../src/qtui/mainwin.cpp:766
+#: ../src/qtui/mainwin.cpp:885
msgctxt "MainWin|"
msgid "Chat Monitor"
msgstr "聊天监视器"
-#: ../src/qtui/mainwin.cpp:778
+#: ../src/qtui/mainwin.cpp:897
msgctxt "MainWin|"
msgid "Show Chat Monitor"
msgstr "显示聊天监视器"
-#: ../src/qtui/mainwin.cpp:782
+#: ../src/qtui/mainwin.cpp:903
msgctxt "MainWin|"
msgid "Inputline"
msgstr "输入行"
-#: ../src/qtui/mainwin.cpp:791
+#: ../src/qtui/mainwin.cpp:912
msgctxt "MainWin|"
msgid "Show Input Line"
msgstr "显示输入行"
-#: ../src/qtui/mainwin.cpp:804
+#: ../src/qtui/mainwin.cpp:927
msgctxt "MainWin|"
msgid "Topic"
msgstr "主题"
-#: ../src/qtui/mainwin.cpp:816
+#: ../src/qtui/mainwin.cpp:939
msgctxt "MainWin|"
msgid "Show Topic Line"
msgstr "显示话题行"
-#: ../src/qtui/mainwin.cpp:894
+#: ../src/qtui/mainwin.cpp:1033
msgctxt "MainWin|"
msgid "Main Toolbar"
msgstr "主工具栏"
-#: ../src/qtui/mainwin.cpp:933
+#: ../src/qtui/mainwin.cpp:1097
msgctxt "MainWin|"
msgid "Connected to core."
msgstr "已连接到核心。"
-#: ../src/qtui/mainwin.cpp:1024
+#: ../src/qtui/mainwin.cpp:1197
msgctxt "MainWin|"
msgid "Not connected to core."
msgstr "未连接到核心。"
-#: ../src/qtui/mainwin.cpp:1038 ../src/qtui/mainwin.cpp:1046
+#: ../src/qtui/mainwin.cpp:1215 ../src/qtui/mainwin.cpp:1225
msgctxt "MainWin|"
msgid "Unencrypted Connection"
msgstr "未加密的连接"
-#: ../src/qtui/mainwin.cpp:1038
+#: ../src/qtui/mainwin.cpp:1215
msgctxt "MainWin|"
msgid "<b>Your client does not support SSL encryption</b>"
msgstr "<b>您的客户端不支持 SSL 加密</b>"
-#: ../src/qtui/mainwin.cpp:1040 ../src/qtui/mainwin.cpp:1048
+#: ../src/qtui/mainwin.cpp:1217 ../src/qtui/mainwin.cpp:1227
msgctxt "MainWin|"
msgid ""
"Sensitive data, like passwords, will be transmitted unencrypted to your "
"Quassel core."
msgstr "像密码这样的敏感信息将以未加密的形式转送到您的 Quassel 核心。"
-#: ../src/qtui/mainwin.cpp:1046
+#: ../src/qtui/mainwin.cpp:1225
msgctxt "MainWin|"
msgid "<b>Your core does not support SSL encryption</b>"
msgstr "<b>您的核心不支持 SSL 加密</b>"
-#: ../src/qtui/mainwin.cpp:1063 ../src/qtui/mainwin.cpp:1083
+#: ../src/qtui/mainwin.cpp:1243 ../src/qtui/mainwin.cpp:1264
msgctxt "MainWin|"
msgid "Untrusted Security Certificate"
msgstr "不信任的安全证书"
-#: ../src/qtui/mainwin.cpp:1064
+#: ../src/qtui/mainwin.cpp:1244
#, qt-format
msgctxt "MainWin|"
msgid ""
"following reasons:</b>"
msgstr "<b>核心于 %1 提供的 SSL 证书不可信，原因如下：</b>"
-#: ../src/qtui/mainwin.cpp:1067
+#: ../src/qtui/mainwin.cpp:1247
msgctxt "MainWin|"
msgid "Continue"
msgstr "继续"
-#: ../src/qtui/mainwin.cpp:1068
+#: ../src/qtui/mainwin.cpp:1248
msgctxt "MainWin|"
msgid "Show Certificate"
msgstr "显示证书"
-#: ../src/qtui/mainwin.cpp:1084
+#: ../src/qtui/mainwin.cpp:1265
msgctxt "MainWin|"
msgid ""
"Would you like to accept this certificate forever without being prompted?"
msgstr "您想要永远接受此证书而不再提醒吗？"
-#: ../src/qtui/mainwin.cpp:1086
+#: ../src/qtui/mainwin.cpp:1267
msgctxt "MainWin|"
msgid "Current Session Only"
msgstr "只对当前会话"
-#: ../src/qtui/mainwin.cpp:1087
+#: ../src/qtui/mainwin.cpp:1268
msgctxt "MainWin|"
msgid "Forever"
msgstr "永远"
-#: ../src/qtui/mainwin.cpp:1096
+#: ../src/qtui/mainwin.cpp:1279
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"
msgid "Receiving Backlog"
msgstr "正在接收储备"
-#: ../src/uisupport/multilineedit.cpp:661
+#: ../src/uisupport/multilineedit.cpp:701
#, 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:714
msgctxt "MultiLineEdit|"
msgid "Paste Protection"
msgstr "粘贴保护"
msgid "Please enter a network name:"
msgstr "请输入一个网络名："
-#: ../src/qtui/settingspages/networkssettingspage.cpp:705
+#: ../src/qtui/settingspages/networkssettingspage.cpp:841
msgctxt "NetworkEditDlg|"
msgid "Add Network"
msgstr "添加网络"
-#: ../src/client/networkmodel.cpp:196
+#: ../src/client/networkmodel.cpp:216 ../src/client/networkmodel.cpp:219
#, qt-format
msgctxt "NetworkItem|"
msgid "Server: %1"
msgstr "服务器：%1"
-#: ../src/client/networkmodel.cpp:197
+#: ../src/client/networkmodel.cpp:221
#, qt-format
msgctxt "NetworkItem|"
msgid "Users: %1"
msgstr "用户：%1"
-#: ../src/client/networkmodel.cpp:200
+#: ../src/client/networkmodel.cpp:224
#, qt-format
msgctxt "NetworkItem|"
msgid "Lag: %1 msecs"
msgstr "延迟：%1 毫秒"
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:1002
msgctxt "NetworkModel|"
msgid "Chat"
msgstr "聊天"
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:1002
msgctxt "NetworkModel|"
msgid "Topic"
msgstr "主题"
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:1002
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 <b>%1</b> more<br><br>"
msgstr ""
-#: ../src/uisupport/networkmodelcontroller.cpp:168
+#: ../src/uisupport/networkmodelcontroller.cpp:191
msgctxt "NetworkModelController|"
msgid ""
"<b>Note:</b> This will delete all related data, including all backlog data, "
"from the core's database and cannot be undone."
msgstr "<b>注意：</b>这将从核心的数据库中删除所有相关的数据，包括所有储备数据，无法撤消。"
-#: ../src/uisupport/networkmodelcontroller.cpp:170
+#: ../src/uisupport/networkmodelcontroller.cpp:193
msgctxt "NetworkModelController|"
msgid ""
"<br>Active channel buffers cannot be deleted, please part the channel first."
msgstr "<br>活动的频道缓冲区不能删除，请先离开该频道。"
-#: ../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:544
msgctxt "NetworkModelController::JoinDlg|"
msgid "Join Channel"
msgstr "加入频道"
-#: ../src/uisupport/networkmodelcontroller.cpp:487
+#: ../src/uisupport/networkmodelcontroller.cpp:547
msgctxt "NetworkModelController::JoinDlg|"
msgid "Network:"
msgstr "网络："
-#: ../src/uisupport/networkmodelcontroller.cpp:489
+#: ../src/uisupport/networkmodelcontroller.cpp:549
msgctxt "NetworkModelController::JoinDlg|"
msgid "Channel:"
msgstr "频道："
-#: ../src/uisupport/networkmodelcontroller.cpp:491
+#: ../src/uisupport/networkmodelcontroller.cpp:551
msgctxt "NetworkModelController::JoinDlg|"
msgid "Password:"
msgstr "密码："
-#: ../src/qtui/ircconnectionwizard.cpp:148
+#: ../src/qtui/ircconnectionwizard.cpp:159
msgctxt "NetworkPage|"
msgid "Setup Network Connection"
msgstr "设置网络连接"
msgid "Account:"
msgstr "账户："
-#: ../src/qtui/settingspages/networkssettingspage.ui:649
+#: ../src/qtui/settingspages/networkssettingspage.ui:635
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because"
+" the identity has an ssl certificate set, SASL EXTERNAL will be "
+"used.</p></body></html>"
+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 "服务器编码："
-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+#: ../src/qtui/settingspages/networkssettingspage.cpp:38
msgctxt "NetworksSettingsPage|"
msgid "IRC"
msgstr "IRC"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+#: ../src/qtui/settingspages/networkssettingspage.cpp:38
msgctxt "NetworksSettingsPage|"
msgid "Networks"
msgstr "网络"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:167
+#: ../src/qtui/settingspages/networkssettingspage.cpp:185
msgctxt "NetworksSettingsPage|"
msgid ""
"<b>The following problems need to be corrected before your changes can be "
"applied:</b><ul>"
msgstr "<b>在应用更改前，您需要修正收下问题：</b><ul>"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:168
+#: ../src/qtui/settingspages/networkssettingspage.cpp:186
msgctxt "NetworksSettingsPage|"
msgid "<li>All networks need at least one server defined</li>"
msgstr "<li>所有的网络至少需要指定一个服务器</li>"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:169
+#: ../src/qtui/settingspages/networkssettingspage.cpp:187
msgctxt "NetworksSettingsPage|"
msgid "</ul>"
msgstr "</ul>"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:170
+#: ../src/qtui/settingspages/networkssettingspage.cpp:188
msgctxt "NetworksSettingsPage|"
msgid "Invalid Network Settings"
msgstr "无效的网络设置"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:542
+#: ../src/qtui/settingspages/networkssettingspage.cpp:651
msgctxt "NetworksSettingsPage|"
msgid "Delete Network?"
msgstr "删除网络？"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:543
+#: ../src/qtui/settingspages/networkssettingspage.cpp:652
#, qt-format
msgctxt "NetworksSettingsPage|"
msgid ""
"the special characters {, }, [, ], \\, |, `, ^, _ and -."
msgstr "有效的昵称可以包含英文字母、数字和{、}、[、]、\\、|、`、^、_ 和 - 这几个特殊字符。"
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:480
msgctxt "NickEditDlg|"
msgid "Add Nickname"
msgstr "添加昵称"
msgid "Notifications"
msgstr "通知"
-#: ../src/qtui/phononnotificationbackend.cpp:143
+#: ../src/qtui/ui/passwordchangedlg.ui:14
+msgctxt "PasswordChangeDlg|"
+msgid "Change Password"
+msgstr ""
+
+#: ../src/qtui/ui/passwordchangedlg.ui:37
+msgctxt "PasswordChangeDlg|"
+msgid "Old password:"
+msgstr ""
+
+#: ../src/qtui/ui/passwordchangedlg.ui:51
+msgctxt "PasswordChangeDlg|"
+msgid "New Password:"
+msgstr ""
+
+#: ../src/qtui/ui/passwordchangedlg.ui:65
+msgctxt "PasswordChangeDlg|"
+msgid "Confirm password:"
+msgstr ""
+
+#: ../src/qtui/passwordchangedlg.cpp:33
+#, qt-format
+msgctxt "PasswordChangeDlg|"
+msgid ""
+"This changes the password for your username <b>%1</b> on the Quassel Core "
+"running at <b>%2</b>."
+msgstr ""
+
+#: ../src/qtui/passwordchangedlg.cpp:66
+msgctxt "PasswordChangeDlg|"
+msgid "Password Not Changed"
+msgstr ""
+
+#: ../src/qtui/passwordchangedlg.cpp:67
+msgctxt "PasswordChangeDlg|"
+msgid "<b>Password change failed</b>"
+msgstr ""
+
+#: ../src/qtui/passwordchangedlg.cpp:69
+msgctxt "PasswordChangeDlg|"
+msgid ""
+"The core reported an error when trying to change your password. Make sure "
+"you entered your old password correctly!"
+msgstr ""
+
+#: ../src/qtui/phononnotificationbackend.cpp:188
msgctxt "PhononNotificationBackend::ConfigWidget|"
msgid "Select Audio File"
msgstr "选择音频文件"
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"
msgstr "正在请求 %2 缓冲区的总共最多 %1 条未读储备消息"
-#: ../src/qtui/ircconnectionwizard.cpp:56
+#: ../src/qtui/ircconnectionwizard.cpp:57
msgctxt "QObject|"
msgid "Welcome to Quassel IRC"
msgstr "欢迎使用 Quassel IRC"
-#: ../src/qtui/ircconnectionwizard.cpp:58
+#: ../src/qtui/ircconnectionwizard.cpp:59
msgctxt "QObject|"
msgid ""
"This wizard will help you to set up your default identity and your IRC "
"wizard any time and use the settings dialog for more detailed changes."
msgstr "此向导将帮助您设置自己的默认身份和您的 IRC 网络连接。<br>这里只包括基本的设置。您可以随时取消此向导，使用设置对话框来进行更详细的更改。"
-#: ../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:497
#, qt-format
msgctxt "QueryBufferItem|"
msgid "<b>Query with %1</b>"
msgstr "<b>通过 %1 查询</b>"
-#: ../src/client/networkmodel.cpp:447
+#: ../src/client/networkmodel.cpp:515
#, qt-format
msgctxt "QueryBufferItem|"
msgid "idling since %1"
msgstr "空闲自从 %1"
-#: ../src/client/networkmodel.cpp:450
+#: ../src/client/networkmodel.cpp:518
#, qt-format
msgctxt "QueryBufferItem|"
msgid "login time: %1"
msgstr "登录时间：%1"
-#: ../src/client/networkmodel.cpp:453
+#: ../src/client/networkmodel.cpp:521
#, 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 "<b>%1</b> wants to send you a file:<br>%2 (%3 bytes)"
+msgstr ""
+
+#: ../src/common/remotepeer.cpp:69
+msgctxt "RemotePeer|"
+msgid "Disconnecting..."
+msgstr ""
+
#: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
msgctxt "SaveIdentitiesDlg|"
msgid "Sync With Core"
#: ../src/qtui/settingspages/servereditdlg.ui:147
msgctxt "ServerEditDlg|"
-msgid ""
-"Do not change unless you're going to connect to a server not supporting "
-"SSLv3!"
-msgstr "除非您要连接一个不支持 SSLv3 的服务器，否则不要改动！"
+msgid "Use only TLSv1 unless you know what you are doing!"
+msgstr ""
#: ../src/qtui/settingspages/servereditdlg.ui:151
msgctxt "ServerEditDlg|"
-msgid "SSLv3 (default)"
-msgstr "SSLv3 (默认)"
+msgid "SSLv3 (insecure)"
+msgstr ""
#: ../src/qtui/settingspages/servereditdlg.ui:156
msgctxt "ServerEditDlg|"
-msgid "SSLv2"
-msgstr "SSLv2"
+msgid "SSLv2 (insecure)"
+msgstr ""
#: ../src/qtui/settingspages/servereditdlg.ui:161
msgctxt "ServerEditDlg|"
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 "您想恢复此页的默认设置吗？"
msgid "Settings"
msgstr "设置"
-#: ../src/qtui/settingspagedlg.cpp:36
+#: ../src/qtui/settingspagedlg.cpp:38
#, qt-format
msgctxt "SettingsPageDlg|"
msgid "Configure %1"
msgstr "配置 %1"
-#: ../src/qtui/settingspagedlg.cpp:104
+#: ../src/qtui/settingspagedlg.cpp:119
msgctxt "SettingsPageDlg|"
msgid "Reload Settings"
msgstr "重新加载设置"
-#: ../src/qtui/settingspagedlg.cpp:104
+#: ../src/qtui/settingspagedlg.cpp:119
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:130
msgctxt "SettingsPageDlg|"
msgid "Restore Defaults"
msgstr "恢复默认值"
-#: ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingspagedlg.cpp:130
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 "快捷键"
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 "无"
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:775
msgctxt "SignalProxy|"
msgid "Disconnecting"
msgstr "正在断开"
"network"
msgstr "要在连接网络后自动加入的一组 IRC 频道"
-#: ../src/core/sqlitestorage.cpp:52
+#: ../src/qtui/snorenotificationbackend.cpp:59
+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 "
msgid "<b>Trusted:</b>"
msgstr "<b>信任：</b>"
-#: ../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:<ul>"
msgstr "否，原因如下：<ul>"
-#: ../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:151
msgctxt "StatusBufferItem|"
msgid "Status Buffer"
msgstr "状态缓存"
-#: ../src/qtui/systemtray.cpp:61 ../src/qtui/systemtray.cpp:92
+#: ../src/qtui/systemtray.cpp:67 ../src/qtui/systemtray.cpp:100
msgctxt "SystemTray|"
msgid "&Minimize"
msgstr "最小化(&M)"
-#: ../src/qtui/systemtray.cpp:94
+#: ../src/qtui/systemtray.cpp:102
msgctxt "SystemTray|"
msgid "&Restore"
msgstr "还原(&R)"
-#: ../src/qtui/systraynotificationbackend.cpp:125
+#: ../src/qtui/systraynotificationbackend.cpp:141
#, 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:155
msgctxt "SystrayNotificationBackend::ConfigWidget|"
msgid "Show a message in a popup"
msgstr "以弹出方式显示消息"
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 " 秒"
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:30
msgctxt "ToolBarActionProvider|"
msgid "Connect"
msgstr "连接"
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:30
msgctxt "ToolBarActionProvider|"
msgid "Connect to IRC"
msgstr "连接到 IRC"
-#: ../src/uisupport/toolbaractionprovider.cpp:32
+#: ../src/uisupport/toolbaractionprovider.cpp:31
msgctxt "ToolBarActionProvider|"
msgid "Disconnect"
msgstr "断开"
-#: ../src/uisupport/toolbaractionprovider.cpp:32
+#: ../src/uisupport/toolbaractionprovider.cpp:31
msgctxt "ToolBarActionProvider|"
msgid "Disconnect from IRC"
msgstr "从 IRC 断开"
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:33
msgctxt "ToolBarActionProvider|"
msgid "Part"
msgstr "离开"
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:33
msgctxt "ToolBarActionProvider|"
msgid "Leave currently selected channel"
msgstr "离开当前选择的频道"
-#: ../src/uisupport/toolbaractionprovider.cpp:35
+#: ../src/uisupport/toolbaractionprovider.cpp:34
msgctxt "ToolBarActionProvider|"
msgid "Join"
msgstr "加入"
-#: ../src/uisupport/toolbaractionprovider.cpp:35
+#: ../src/uisupport/toolbaractionprovider.cpp:34
msgctxt "ToolBarActionProvider|"
msgid "Join a channel"
msgstr "加入一个频道"
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:36
msgctxt "ToolBarActionProvider|"
msgid "Query"
msgstr "查询"
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:36
msgctxt "ToolBarActionProvider|"
msgid "Start a private conversation"
msgstr "开始私人对话"
-#: ../src/uisupport/toolbaractionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:37
msgctxt "ToolBarActionProvider|"
msgid "Whois"
msgstr "Whois"
-#: ../src/uisupport/toolbaractionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:37
msgctxt "ToolBarActionProvider|"
msgid "Request user information"
msgstr "请求用户信息"
-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:39
msgctxt "ToolBarActionProvider|"
msgid "Op"
msgstr "管理"
-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:39
msgctxt "ToolBarActionProvider|"
msgid "Give operator privileges to user"
msgstr "给予用户管理员权限"
-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:40
msgctxt "ToolBarActionProvider|"
msgid "Deop"
msgstr "取消管理"
-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:40
msgctxt "ToolBarActionProvider|"
msgid "Take operator privileges from user"
msgstr "收回用户的管理员权限"
-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:41
msgctxt "ToolBarActionProvider|"
msgid "Voice"
msgstr "发言"
-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:41
msgctxt "ToolBarActionProvider|"
msgid "Give voice to user"
msgstr "给用户发言权"
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:42
msgctxt "ToolBarActionProvider|"
msgid "Devoice"
msgstr "取消发言"
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:42
msgctxt "ToolBarActionProvider|"
msgid "Take voice from user"
msgstr "收回用户发言权"
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:43
msgctxt "ToolBarActionProvider|"
msgid "Kick"
msgstr "踢出"
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:43
msgctxt "ToolBarActionProvider|"
msgid "Remove user from channel"
msgstr "将用户移出频道"
-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:44
msgctxt "ToolBarActionProvider|"
msgid "Ban"
msgstr "禁止"
-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:44
msgctxt "ToolBarActionProvider|"
msgid "Ban user from channel"
msgstr "禁止用户参与频道"
-#: ../src/uisupport/toolbaractionprovider.cpp:46
+#: ../src/uisupport/toolbaractionprovider.cpp:45
msgctxt "ToolBarActionProvider|"
msgid "Kick/Ban"
msgstr "踢出/禁止"
-#: ../src/uisupport/toolbaractionprovider.cpp:46
+#: ../src/uisupport/toolbaractionprovider.cpp:45
msgctxt "ToolBarActionProvider|"
msgid "Remove and ban user from channel"
msgstr "移除用户并禁止其参与频道"
-#: ../src/uisupport/toolbaractionprovider.cpp:51
+#: ../src/uisupport/toolbaractionprovider.cpp:50
msgctxt "ToolBarActionProvider|"
msgid "Connect to all"
msgstr "连接到所有"
-#: ../src/uisupport/toolbaractionprovider.cpp:58
+#: ../src/uisupport/toolbaractionprovider.cpp:57
msgctxt "ToolBarActionProvider|"
msgid "Disconnect from all"
msgstr "从所有断开"
msgid "..."
msgstr "..."
-#: ../src/qtui/topicwidget.cpp:106
+#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128
#, qt-format
msgctxt "TopicWidget|"
msgid "Users: %1"
msgstr "用户：%1"
-#: ../src/qtui/topicwidget.cpp:107
+#: ../src/qtui/topicwidget.cpp:123 ../src/qtui/topicwidget.cpp:129
#, qt-format
msgctxt "TopicWidget|"
msgid "Lag: %1 msecs"
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 "话题组件"
-#. Plain Message
-#. ----------
-#. Notice Message
-#. ----------
-#. Server Message
-#. ----------
-#. Info Message
-#. ----------
-#. Error Message
-#. ----------
-#. 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
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "%1"
-msgstr "%1"
-
-#. Action Message
-#: ../src/uisupport/uistyle.cpp:583
-#, 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:690
#, 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:691
#, 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:695
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "User mode: %DM%1%DM"
msgstr "用户模式：%DM%1%DM"
-#: ../src/uisupport/uistyle.cpp:593
+#: ../src/uisupport/uistyle.cpp:696
#, 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:700
#, 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:703
#, 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:708
#, 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:716
#, 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:731
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "{Day changed to %1}"
msgstr "{日期更改为 %1}"
-#: ../src/uisupport/uistyle.cpp:641
+#: ../src/uisupport/uistyle.cpp:744
#, 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:748 ../src/uisupport/uistyle.cpp:764
#, 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:759
#, 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
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "[%1]"
-msgstr "[%1]"
-
-#: ../src/uisupport/uistyle.cpp:703
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "<%1>"
-msgstr "<%1>"
-
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:825
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Owner(s)"
msgid_plural "%n Owner(s)"
msgstr[0] "%n 位用户"
-#: ../src/client/networkmodel.cpp:698
+#: ../src/client/networkmodel.cpp:827
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Admin(s)"
msgid_plural "%n Admin(s)"
msgstr[0] "%n 位管理员"
-#: ../src/client/networkmodel.cpp:699
+#: ../src/client/networkmodel.cpp:829
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Operator(s)"
msgid_plural "%n Operator(s)"
msgstr[0] "%n 位用户"
-#: ../src/client/networkmodel.cpp:700
+#: ../src/client/networkmodel.cpp:831
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Half-Op(s)"
msgid_plural "%n Half-Op(s)"
msgstr[0] ""
-#: ../src/client/networkmodel.cpp:701
+#: ../src/client/networkmodel.cpp:833
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Voiced"
msgid_plural "%n Voiced"
msgstr[0] "发言"
-#: ../src/client/networkmodel.cpp:702
+#: ../src/client/networkmodel.cpp:835
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n User(s)"
projects / quassel.git / blobdiff