Update Icons

[quassel.git] / po / ru.po

diff --git a/po/ru.po b/po/ru.po
index 424ab61..8dcb3a6 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,20 +1,495 @@
 # 
 # Translators:
 # 
 # Translators:

-# Daniel Albers <daniel@lbers.com>, 2011.
+# Daniel Albers <daniel@lbers.com>, 2011
+# sfionov <fionov@gmail.com>, 2012
+# sfionov <fionov@gmail.com>, 2012

 msgid ""
 msgstr ""
 "Project-Id-Version: Quassel IRC\n"
 "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: Quassel IRC\n"
 "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"

-"PO-Revision-Date: 2012-01-23 18:06+0000\n"
-"Last-Translator: Daniel Albers <daniel@lbers.com>\n"
-"Language-Team: \n"
+"PO-Revision-Date: 2015-03-25 12:13+0000\n"
+"Last-Translator: Daniel Albers <daniel@lbe.rs>\n"
+"Language-Team: Russian (http://www.transifex.com/ald/quassel/language/ru/)\n"

 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru\n"

-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"

 "X-Qt-Contexts: true\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"
 #: ../src/qtui/ui/aboutdlg.ui:17
 msgctxt "AboutDlg|"
 msgid "About Quassel"


@@ -27,61 +502,40 @@ msgid ""
 "p, 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>"
 "p, 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>"

-msgstr ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body "
-"style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-"
-"style:normal;\"><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\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;\"><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 &gt;= 474 (2008-02-08)</p></body></html>"
-msgstr ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body "
-"style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-"
-"style:normal;\"><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 &gt;= 474 (2008-02-08)</p></body></html>"
-
-#: ../src/qtui/ui/aboutdlg.ui:115
+#: ../src/qtui/ui/aboutdlg.ui:112

 msgctxt "AboutDlg|"
 msgid "&About"
 msgstr "&О программе"
 
 msgctxt "AboutDlg|"
 msgid "&About"
 msgstr "&О программе"
 

-#: ../src/qtui/ui/aboutdlg.ui:135
+#: ../src/qtui/ui/aboutdlg.ui:132

 msgctxt "AboutDlg|"
 msgid "A&uthors"
 msgstr "&Авторы"
 
 msgctxt "AboutDlg|"
 msgid "A&uthors"
 msgstr "&Авторы"
 

-#: ../src/qtui/ui/aboutdlg.ui:155
+#: ../src/qtui/ui/aboutdlg.ui:152

 msgctxt "AboutDlg|"
 msgid "&Contributors"
 msgstr "&Помощники"
 
 msgctxt "AboutDlg|"
 msgid "&Contributors"
 msgstr "&Помощники"
 

-#: ../src/qtui/ui/aboutdlg.ui:175
+#: ../src/qtui/ui/aboutdlg.ui:172

 msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr "&Благодарности"
 
 msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr "&Благодарности"
 

-#: ../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"
 #, 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"
+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 ""
 msgctxt "AboutDlg|"
 msgid ""

-"<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2010 by the "
-"Quassel Project<br><a href=\"http://quassel-irc.org\">http://quassel-"
+"<b>A modern, distributed IRC Client</b><br><br>&copy;%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>"
 "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>"


@@ -92,83 +546,63 @@ msgid ""
 "<a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to "
 "report bugs."
 msgstr ""
 "<a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to "
 "report bugs."
 msgstr ""

-"<b>Современный, распределённый клиент IRC</b><br><br>&copy;2005-2009 Quassel"
-" Project<br><a href=\"http://quassel-irc.org\">http://quassel-"
-"irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> в "
-"сети <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 "
-"Team</a> &copy; и используются по лицензии <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>."
-
-#: ../src/qtui/aboutdlg.cpp:62
+
+#: ../src/qtui/aboutdlg.cpp:72

 msgctxt "AboutDlg|"
 msgid "Quassel IRC is mainly developed by:"
 msgstr "Quassel IRC разрабатывается в основном:"
 
 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:"
 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:91
+msgctxt "AboutDlg|"
+msgid ""
+"...and anybody else finding and reporting bugs, giving feedback, helping "
+"others and being part of the community!"

 msgstr ""
 msgstr ""

-"Мы хотим выразить благодарность следующим людям, внесшим свой вклад (в "
-"алфавитном порядке), а также всем, кого мы забыли здесь упомянуть:"

 
 

-#: ../src/qtui/aboutdlg.cpp:135
+#: ../src/qtui/aboutdlg.cpp:100

 msgctxt "AboutDlg|"
 msgid ""
 "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"
 msgctxt "AboutDlg|"
 msgid ""
 "Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"

-"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>for the original Quassel "
-"icon - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<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\">&nbsp;<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\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>за оригинальный значок "
-"Quassel - Всевидящее Око</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<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\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software, "
-"ранее известная как 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, и за "
-"спонсорство разработки Quassel Mobile с помощью N810</dd>"
-
-#: ../src/core/abstractsqlstorage.cpp:115
+"eye.png\">&nbsp;<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\">&nbsp;<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\">&nbsp;<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..."
 
 #, 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 "Обновление не удалось..."
 
 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"
 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 ""
-"<b>Ссылка к псевдониму</b><br />Она может использоваться как обыкновенный "
-"слэш.<br /><br /><b>Пример:</b> \"foo\"  может использоваться для /foo"
+msgstr "<b>Ссылка к псевдониму</b><br />Она может использоваться как обыкновенный слэш.<br /><br /><b>Пример:</b> \"foo\"  может использоваться для /foo"

 
 

-#: ../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 "
 msgctxt "AliasesModel|"
 msgid ""
 "<b>The string the shortcut will be expanded to</b><br /><b>special "


@@ -182,25 +616,14 @@ msgid ""
 "semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will"
 " be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test "
 "All 1 2 3\" when called like /test 1 2 3"
 "semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will"
 " be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test "
 "All 1 2 3\" when called like /test 1 2 3"

-msgstr ""
-"<b>Строка в будет расширена за счет </b><br /><b>специальных переменных: "
-"</b><br /> - <b>$i</b> представляет i-тый парамер.<br /> - <b>$i..j</b> "
-"представляет с i-того по j-тый параметры, разделенные пробелами.<br /> - "
-"<b>$i..</b> представляет все параметры начиная с i-того, разделенные "
-"пробелами.<br /> - <b>$i:hostname</b>представляет имя системы (hostname) "
-"пользователя, определяемое по i-тому параметру или * если он неизвестен. <br"
-" /> - <b>$0</b> вся строка.<br /> - <b>$nick</b> Ваш текущий ник<br /> - "
-"<b>$channel</b> имя выбранного канала<br /><br />Несколько команд могут быть"
-" разделены точкой с запятой <br /><br /><b>Пример:</b> \"Test $1; Test $2; "
-"Test All $0\"  будет расширена до трех отдельных сообщений \"Test 1\", "
-"\"Test 2\" и \"Test All 1 2 3\" когда вызывается как /test 1 2 3"
-
-#: ../src/qtui/settingspages/aliasesmodel.cpp:170
+msgstr "<b>Строка в будет расширена за счет </b><br /><b>специальных переменных: </b><br /> - <b>$i</b> представляет i-тый парамер.<br /> - <b>$i..j</b> представляет с i-того по j-тый параметры, разделенные пробелами.<br /> - <b>$i..</b> представляет все параметры начиная с i-того, разделенные пробелами.<br /> - <b>$i:hostname</b>представляет имя системы (hostname) пользователя, определяемое по i-тому параметру или * если он неизвестен. <br /> - <b>$0</b> вся строка.<br /> - <b>$nick</b> Ваш текущий ник<br /> - <b>$channel</b> имя выбранного канала<br /><br />Несколько команд могут быть разделены точкой с запятой <br /><br /><b>Пример:</b> \"Test $1; Test $2; Test All $0\"  будет расширена до трех отдельных сообщений \"Test 1\", \"Test 2\" и \"Test All 1 2 3\" когда вызывается как /test 1 2 3"
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:185

 msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr "Псевдоним"
 
 msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr "Псевдоним"
 

-#: ../src/qtui/settingspages/aliasesmodel.cpp:171
+#: ../src/qtui/settingspages/aliasesmodel.cpp:186

 msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr "Расширение"
 msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr "Расширение"


@@ -220,12 +643,12 @@ msgctxt "AliasesSettingsPage|"
 msgid "Delete"
 msgstr "Удалить"
 
 msgid "Delete"
 msgstr "Удалить"
 

-#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:28

 msgctxt "AliasesSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
 msgctxt "AliasesSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 

-#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:28

 msgctxt "AliasesSettingsPage|"
 msgid "Aliases"
 msgstr "Псевдонимы"
 msgctxt "AliasesSettingsPage|"
 msgid "Aliases"
 msgstr "Псевдонимы"


@@ -261,7 +684,7 @@ msgid "<Untranslated>"
 msgstr "<Untranslated>"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:52
 msgstr "<Untranslated>"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:52

-#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:76

 msgctxt "AppearanceSettingsPage|"
 msgid "<System Default>"
 msgstr "<По умолчанию>"
 msgctxt "AppearanceSettingsPage|"
 msgid "<System Default>"
 msgstr "<По умолчанию>"


@@ -336,7 +759,7 @@ msgctxt "AppearanceSettingsPage|"
 msgid "Interface"
 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 "Выберите пожалуйста файл стилей"
 msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
 msgstr "Выберите пожалуйста файл стилей"


@@ -346,12 +769,12 @@ msgctxt "AwayLogView|"
 msgid "Away Log"
 msgstr "Журнал отсутствия"
 
 msgid "Away Log"
 msgstr "Журнал отсутствия"
 

-#: ../src/qtui/awaylogview.cpp:44
+#: ../src/qtui/awaylogview.cpp:46

 msgctxt "AwayLogView|"
 msgid "Show Network Name"
 msgstr "Показывать название сети"
 
 msgctxt "AwayLogView|"
 msgid "Show Network Name"
 msgstr "Показывать название сети"
 

-#: ../src/qtui/awaylogview.cpp:49
+#: ../src/qtui/awaylogview.cpp:51

 msgctxt "AwayLogView|"
 msgid "Show Buffer Name"
 msgstr "Показывать название буфера"
 msgctxt "AwayLogView|"
 msgid "Show Buffer Name"
 msgstr "Показывать название буфера"


@@ -366,8 +789,7 @@ msgctxt "BacklogSettingsPage|"
 msgid ""
 "Number of messages to be requested from the core when using scrolling up in "
 "the buffer view."
 msgid ""
 "Number of messages to be requested from the core when using scrolling up in "
 "the buffer view."

-msgstr ""
-"Количество запрашиваемых у ядра сообщений при прокрутке журнала вверх."
+msgstr "Количество запрашиваемых у ядра сообщений при прокрутке журнала вверх."

 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:25
 msgctxt "BacklogSettingsPage|"
 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:25
 msgctxt "BacklogSettingsPage|"


@@ -399,18 +821,14 @@ msgctxt "BacklogSettingsPage|"
 msgid ""
 "The simplest requester. It fetches a fixed amount of lines for each chat "
 "window from the backlog."
 msgid ""
 "The simplest requester. It fetches a fixed amount of lines for each chat "
 "window from the backlog."

-msgstr ""
-"Самый простой запросчик. Он получает фиксированное количество строк из "
-"журнала для каждого окна чата."
+msgstr "Самый простой запросчик. Он получает фиксированное количество строк из журнала для каждого окна чата."

 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:138
 msgctxt "BacklogSettingsPage|"
 msgid ""
 "amount of messages per buffer that are requested after the core connection "
 "has been established."
 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:138
 msgctxt "BacklogSettingsPage|"
 msgid ""
 "amount of messages per buffer that are requested after the core connection "
 "has been established."

-msgstr ""
-"количество сообщений из каждого буфера, которые запрашиваются у ядра после "
-"установления соединения."
+msgstr "количество сообщений из каждого буфера, которые запрашиваются у ядра после установления соединения."

 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:141
 msgctxt "BacklogSettingsPage|"
 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:141
 msgctxt "BacklogSettingsPage|"


@@ -423,10 +841,7 @@ msgid ""
 "This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat.\n"
 "\n"
 "You can also choose to fetch additional older chatlines to provide a better context."
 "This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat.\n"
 "\n"
 "You can also choose to fetch additional older chatlines to provide a better context."

-msgstr ""
-"Этот запрос индивидуально извлекает непрочитанные сообщения для каждого окна чата. Количество полученных из журнала строк может быть ограничено.\n"
-"\n"
-"Также вы можете выбрать дополнительное количество строк, для извлечения, что-бы лучше понять тему разговора."
+msgstr "Этот запрос индивидуально извлекает непрочитанные сообщения для каждого окна чата. Количество полученных из журнала строк может быть ограничено.\n\nТакже вы можете выбрать дополнительное количество строк, для извлечения, что-бы лучше понять тему разговора."

 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:222
 #: ../src/qtui/settingspages/backlogsettingspage.ui:232
 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:222
 #: ../src/qtui/settingspages/backlogsettingspage.ui:232


@@ -455,9 +870,7 @@ msgctxt "BacklogSettingsPage|"
 msgid ""
 "Amount of messages to be fetched in addition to the unread messages. The "
 "Limit does not apply here."
 msgid ""
 "Amount of messages to be fetched in addition to the unread messages. The "
 "Limit does not apply here."

-msgstr ""
-"Количество сообщений, запрашиваемых в дополнение к непрочитанным. Здесь не "
-"применяется ограничение."
+msgstr "Количество сообщений, запрашиваемых в дополнение к непрочитанным. Здесь не применяется ограничение."

 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:263
 #: ../src/qtui/settingspages/backlogsettingspage.ui:385
 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:263
 #: ../src/qtui/settingspages/backlogsettingspage.ui:385


@@ -474,11 +887,7 @@ msgid ""
 "It is useful to limit the total amount of the backlog and is probably the fastest.\n"
 "\n"
 "You can also chose to fetch additional older chatlines to provide a better context."
 "It is useful to limit the total amount of the backlog and is probably the fastest.\n"
 "\n"
 "You can also chose to fetch additional older chatlines to provide a better context."

-msgstr ""
-"Эта программа запрашивает все сообщения, моложе самого старого непрочитанного сообщения для всех чатов.\n"
-"Примечание: Этот запросчик не рекомендуется использовать если вы используете скрытые окна чата или есть неактивные чаты (т. е.: нет устаревших запросов или каналов).\n"
-"Лучше всего, и вероятно - быстрее, задать ограничение максимального размера журнала.\n"
-"В дополнение ко всему, вы также можете запросить более старые разговорные каналы, чтобы лучше вникнуть в контекст."
+msgstr "Эта программа запрашивает все сообщения, моложе самого старого непрочитанного сообщения для всех чатов.\nПримечание: Этот запросчик не рекомендуется использовать если вы используете скрытые окна чата или есть неактивные чаты (т. е.: нет устаревших запросов или каналов).\nЛучше всего, и вероятно - быстрее, задать ограничение максимального размера журнала.\nВ дополнение ко всему, вы также можете запросить более старые разговорные каналы, чтобы лучше вникнуть в контекст."

 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:344
 msgctxt "BacklogSettingsPage|"
 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:344
 msgctxt "BacklogSettingsPage|"


@@ -495,26 +904,24 @@ msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 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>"
 
 #, 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 "Произвести необратимое слияние буферов?"
 
 msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr "Произвести необратимое слияние буферов?"
 

-#: ../src/uisupport/bufferview.cpp:249
+#: ../src/uisupport/bufferview.cpp:269

 #, qt-format
 msgctxt "BufferView|"
 msgid ""
 "Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n"
 " This cannot be reversed!"
 #, qt-format
 msgctxt "BufferView|"
 msgid ""
 "Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n"
 " This cannot be reversed!"

-msgstr ""
-"Хотите ли вы слить буфер \"%1\" с буфером \"%2\"?\n"
-" Это нельзя обратить!"
+msgstr "Хотите ли вы слить буфер \"%1\" с буфером \"%2\"?\n Это нельзя обратить!"

 
 #: ../src/qtui/settingspages/buffervieweditdlg.ui:14
 msgctxt "BufferViewEditDlg|"
 
 #: ../src/qtui/settingspages/buffervieweditdlg.ui:14
 msgctxt "BufferViewEditDlg|"


@@ -526,12 +933,12 @@ msgctxt "BufferViewEditDlg|"
 msgid "Please enter a name for the chat list:"
 msgstr "Пожалуйста, введите имя чатлиста:"
 
 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 "Добавить Чатлист"
 
 msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr "Добавить Чатлист"
 

-#: ../src/uisupport/bufferviewfilter.cpp:52
+#: ../src/uisupport/bufferviewfilter.cpp:53

 msgctxt "BufferViewFilter|"
 msgid "Show / Hide Chats"
 msgstr "Показать / Скрыть Чаты"
 msgctxt "BufferViewFilter|"
 msgid "Show / Hide Chats"
 msgstr "Показать / Скрыть Чаты"


@@ -567,7 +974,7 @@ msgid "Network:"
 msgstr "Сеть:"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
 msgstr "Сеть:"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100

-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128

 msgctxt "BufferViewSettingsPage|"
 msgid "All"
 msgstr "Все"
 msgctxt "BufferViewSettingsPage|"
 msgid "All"
 msgstr "Все"


@@ -577,9 +984,7 @@ msgctxt "BufferViewSettingsPage|"
 msgid ""
 "This option is not available when all Networks are visible.\n"
 "In this mode no separate status buffer is displayed."
 msgid ""
 "This option is not available when all Networks are visible.\n"
 "In this mode no separate status buffer is displayed."

-msgstr ""
-"Эта опция недоступна когда видны все сети.\n"
-"В этом режиме отдельные буфера состояния не отображаются."
+msgstr "Эта опция недоступна когда видны все сети.\nВ этом режиме отдельные буфера состояния не отображаются."

 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
 msgctxt "BufferViewSettingsPage|"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
 msgctxt "BufferViewSettingsPage|"


@@ -603,40 +1008,45 @@ msgstr "Скрыть неактивные чаты"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
 msgctxt "BufferViewSettingsPage|"
 
 #: ../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 "Добавлять новые чаты автоматически"
 
 msgid "Add new chats automatically"
 msgstr "Добавлять новые чаты автоматически"
 

-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156

 msgctxt "BufferViewSettingsPage|"
 msgid "Sort alphabetically"
 msgstr "Сортировать по алфавиту"
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Sort alphabetically"
 msgstr "Сортировать по алфавиту"
 

-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:163

 msgctxt "BufferViewSettingsPage|"
 msgid "Minimum Activity:"
 msgstr "Минимальная активность:"
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Minimum Activity:"
 msgstr "Минимальная активность:"
 

-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:171

 msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
 msgstr "Нет активности"
 
 msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
 msgstr "Нет активности"
 

-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:176

 msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
 msgstr "Другая активность"
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
 msgstr "Другая активность"
 

-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:181

 msgctxt "BufferViewSettingsPage|"
 msgid "New Message"
 msgstr "Новое сообщение"
 
 msgctxt "BufferViewSettingsPage|"
 msgid "New Message"
 msgstr "Новое сообщение"
 

-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:179
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:186

 msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
 msgstr "Подсветка"
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
 msgstr "Подсветка"
 

-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:212

 msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr "Предварительный просмотр:"
 msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr "Предварительный просмотр:"


@@ -651,12 +1061,12 @@ msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
 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 "Удалить Чатлист?"
 
 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\"?"
 #, qt-format
 msgctxt "BufferViewSettingsPage|"
 msgid "Do you really want to delete the chat list \"%1\"?"


@@ -692,36 +1102,36 @@ msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr "Отметка:"
 
 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>"
 #, qt-format
 msgctxt "ChannelBufferItem|"
 msgid "<b>Channel %1</b>"

-msgstr ""
+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"
 
 #, 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"
 #, qt-format
 msgctxt "ChannelBufferItem|"
 msgid "<b>Mode:</b> %1"

-msgstr ""
+msgstr "<b>Режим:</b> %1"

 
 

-#: ../src/client/networkmodel.cpp:521
+#: ../src/client/networkmodel.cpp:608

 #, qt-format
 msgctxt "ChannelBufferItem|"
 msgid "<b>Topic:</b> %1"
 #, qt-format
 msgctxt "ChannelBufferItem|"
 msgid "<b>Topic:</b> %1"

-msgstr ""
+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 /> Дважды щёлкните чтобы войти"
 
 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>"
 #, qt-format
 msgctxt "ChannelBufferItem|"
 msgid "<p> %1 </p>"


@@ -741,10 +1151,8 @@ msgstr "Шаблон поиска:"
 msgctxt "ChannelListDlg|"
 msgid ""
 "Toggle between simple and advanced mode.\n"
 msgctxt "ChannelListDlg|"
 msgid ""
 "Toggle between simple and advanced mode.\n"

-"Advanced mode allows to pass search strings to the IRC Server."
-msgstr ""
-"Переключение между простым и расширенным режимами.\n"
-"Расширенный режим позволяет передавать поисковые строки серверу IRC."
+"Advanced mode allows one to pass search strings to the IRC Server."
+msgstr "Переключение между простым и расширенным режимами.\nРасширенный режим позволяет передавать поисковые строки серверу IRC."

 
 #: ../src/qtui/ui/channellistdlg.ui:62
 msgctxt "ChannelListDlg|"
 
 #: ../src/qtui/ui/channellistdlg.ui:62
 msgctxt "ChannelListDlg|"


@@ -758,7 +1166,7 @@ msgstr "Фильтр:"
 
 #: ../src/qtui/ui/channellistdlg.ui:98
 msgctxt "ChannelListDlg|"
 
 #: ../src/qtui/ui/channellistdlg.ui:98
 msgctxt "ChannelListDlg|"

-msgid "Errors Occured:"
+msgid "Errors Occurred:"

 msgstr "Произошли ошибки:"
 
 #: ../src/qtui/ui/channellistdlg.ui:132
 msgstr "Произошли ошибки:"
 
 #: ../src/qtui/ui/channellistdlg.ui:132


@@ -770,13 +1178,7 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; 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;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</span></p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; 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;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</span></p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"

-msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<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:8pt; font-weight:400; 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;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">ПРОИЗОШЛА СЕРЬЕЗНАЯ ОШИБКА!</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
+msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<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:8pt; font-weight:400; 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;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">ПРОИЗОШЛА СЕРЬЕЗНАЯ ОШИБКА!</span></p>\n<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"

 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:14
 msgctxt "ChatMonitorSettingsPage|"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:14
 msgctxt "ChatMonitorSettingsPage|"


@@ -798,23 +1200,7 @@ msgid ""
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Operation modes:</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span style=\" font-weight:400;\">Only buffers on the right side are shown in chatmonitor</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" text-decoration: underline;\">Opt-Out:</span> Buffers on the right side will be ignored in chatmonitor</p></body></html>"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Operation modes:</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span style=\" font-weight:400;\">Only buffers on the right side are shown in chatmonitor</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" text-decoration: underline;\">Opt-Out:</span> Buffers on the right side will be ignored in chatmonitor</p></body></html>"

-msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR"
-"/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" "
-"/><style type=\"text/css\">p, li { white-space: pre-wrap; "
-"}</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; "
-"font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-"
-"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"><span style=\" font-weight:600;\">Режимы:</span></p><p "
-"style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span "
-"style=\" font-weight:400; text-decoration: underline;\">Белый список:</span>"
-" <span style=\" font-weight:400;\">В мониторе чата отображаются только "
-"буферы из списка справа.</span></p><p style=\" margin-top:0px; margin-"
-"bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-"
-"indent:0px;\"><span style=\" text-decoration: underline;\">Opt-"
-"Out:</span>Буферы из списка справа монитором чата "
-"игнорируются.</p></body></html>"
+msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Режимы:</span></p><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Белый список:</span> <span style=\" font-weight:400;\">В мониторе чата отображаются только буферы из списка справа.</span></p><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" text-decoration: underline;\">Opt-Out:</span>Буферы из списка справа монитором чата игнорируются.</p></body></html>"

 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
 msgctxt "ChatMonitorSettingsPage|"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
 msgctxt "ChatMonitorSettingsPage|"


@@ -832,7 +1218,7 @@ msgid "Move selected buffers to the right"
 msgstr "Переместить выбранные буферы вправо"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
 msgstr "Переместить выбранные буферы вправо"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133

-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:273

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr "Показывать:"
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr "Показывать:"


@@ -853,56 +1239,87 @@ msgctxt "ChatMonitorSettingsPage|"
 msgid "Show own messages"
 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 "Интерфейс"
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 

-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr "Монитор чата"
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr "Монитор чата"
 

-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr "Белый список"
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr "Белый список"
 

-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:61

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr "Чёрный список"
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr "Чёрный список"
 

-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:276

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr "Игнорировать:"
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr "Игнорировать:"
 

-#: ../src/qtui/chatmonitorview.cpp:52
+#: ../src/qtui/chatmonitorview.cpp:54

 msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
 msgstr "Показывать свои сообщения"
 
 msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
 msgstr "Показывать свои сообщения"
 

-#: ../src/qtui/chatmonitorview.cpp:59
+#: ../src/qtui/chatmonitorview.cpp:61

 msgctxt "ChatMonitorView|"
 msgid "Show Network Name"
 msgstr "Показывать название сети"
 
 msgctxt "ChatMonitorView|"
 msgid "Show Network Name"
 msgstr "Показывать название сети"
 

-#: ../src/qtui/chatmonitorview.cpp:64
+#: ../src/qtui/chatmonitorview.cpp:66

 msgctxt "ChatMonitorView|"
 msgid "Show Buffer Name"
 msgstr "Показывать название буфера"
 
 msgctxt "ChatMonitorView|"
 msgid "Show Buffer Name"
 msgstr "Показывать название буфера"
 

-#: ../src/qtui/chatmonitorview.cpp:71
+#: ../src/qtui/chatmonitorview.cpp:73

 msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr "Настроить..."
 
 msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr "Настроить..."
 

-#: ../src/qtui/chatscene.cpp:743
+#: ../src/qtui/chatscene.cpp:826

 msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr "Скопировать выделение"
 
 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"
 #: ../src/qtui/ui/chatviewsearchbar.ui:13
 msgctxt "ChatViewSearchBar|"
 msgid "Form"


@@ -945,142 +1362,186 @@ msgctxt "ChatViewSettingsPage|"
 msgid "Timestamp format:"
 msgstr "Формат датировки:"
 
 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 "[hh:mm:ss]"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "[hh:mm:ss]"
 msgstr "[hh:mm:ss]"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:59
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:69

 msgctxt "ChatViewSettingsPage|"
 msgid "Custom chat window font:"
 msgstr "Пользовательский шрифт окна чата:"
 
 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 "Показать цветной текст в окне чата"
 
 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 color codes)"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Allow colored text (mIRC color codes)"
 msgstr "Разрешить вывод цветного текста (mIRC color codes)"
 

-#: ../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"
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Show a website preview window when hovering the mouse over a web address"

-msgstr ""
-"Показывать предварительный просмотр вебсайта при наведении мышью на адрес"
+msgstr "Показывать предварительный просмотр вебсайта при наведении мышью на адрес"

 
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:124

 msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr "Показывать эскиз вебсайта при наведении на URL"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr "Показывать эскиз вебсайта при наведении на URL"
 

-#: ../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 ""
 
 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 ""
 
 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 "Пользовательские цвета"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Custom Colors"
 msgstr "Пользовательские цвета"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:220

 msgctxt "ChatViewSettingsPage|"
 msgid "Action:"
 msgstr "Действие:"
 
 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 "..."
 
 msgctxt "ChatViewSettingsPage|"
 msgid "..."
 msgstr "..."
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:244

 msgctxt "ChatViewSettingsPage|"
 msgid "Timestamp:"
 msgstr "Время:"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Timestamp:"
 msgstr "Время:"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:268

 msgctxt "ChatViewSettingsPage|"
 msgid "Channel message:"
 msgstr "Сообщение канала:"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Channel message:"
 msgstr "Сообщение канала:"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:305

 msgctxt "ChatViewSettingsPage|"
 msgid "Highlight foreground:"
 msgstr "Подсветка:"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Highlight foreground:"
 msgstr "Подсветка:"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:329

 msgctxt "ChatViewSettingsPage|"
 msgid "Command message:"
 msgstr "Сообщение команды:"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Command message:"
 msgstr "Сообщение команды:"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:353

 msgctxt "ChatViewSettingsPage|"
 msgid "Highlight background:"
 msgstr "Подсвечивать ники"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Highlight background:"
 msgstr "Подсвечивать ники"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:360

 msgctxt "ChatViewSettingsPage|"
 msgid "Server message:"
 msgstr "Сообщение сервера:"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Server message:"
 msgstr "Сообщение сервера:"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:384

 msgctxt "ChatViewSettingsPage|"
 msgid "Marker line:"
 msgstr "Отметка:"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Marker line:"
 msgstr "Отметка:"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:408

 msgctxt "ChatViewSettingsPage|"
 msgid "Error message:"
 msgstr "Сообщение об ошибке:"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Error message:"
 msgstr "Сообщение об ошибке:"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:432

 msgctxt "ChatViewSettingsPage|"
 msgid "Background:"
 msgstr "Фон"
 
 msgctxt "ChatViewSettingsPage|"
 msgid "Background:"
 msgstr "Фон"
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:476

 msgctxt "ChatViewSettingsPage|"
 msgid "Use Sender Coloring"
 msgstr "Использовать Цветовую Палитру Отправителя"
 
 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 "Собственные сообщения:"
 msgctxt "ChatViewSettingsPage|"
 msgid "Own messages:"
 msgstr "Собственные сообщения:"


@@ -1097,31 +1558,128 @@ msgstr "Вид Окна Чата"
 
 #: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
 msgctxt "ChatViewSettingsPage|"
 
 #: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
 msgctxt "ChatViewSettingsPage|"

-msgid "You need at 0.6 quasselcore to use this feature"
+msgid "You need at least version 0.6 of quasselcore to use this feature"

 msgstr "Для использования этой функции вам нужно иметь quasselcore версии 0.6"
 
 msgstr "Для использования этой функции вам нужно иметь quasselcore версии 0.6"
 

-#: ../src/client/client.cpp:270
+#: ../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 "Личность уже есть в клиенте!"
 
 msgctxt "Client|"
 msgid "Identity already exists in client!"
 msgstr "Личность уже есть в клиенте!"
 

-#: ../src/client/clientbacklogmanager.cpp:161
+#: ../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/client/clientauthhandler.cpp:358
+msgctxt "ClientAuthHandler|"
+msgid "Logging in..."
+msgstr "Авторизуюсь..."
+
+#: ../src/client/clientauthhandler.cpp:363
+msgctxt "ClientAuthHandler|"
+msgid "Login canceled"
+msgstr "Вход в систему отменен"
+
+#: ../src/client/clientauthhandler.cpp:421
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection cancelled"
+msgstr ""
+
+#: ../src/client/clientbacklogmanager.cpp:178

 #, qt-format
 msgctxt "ClientBacklogManager|"
 msgid "Processed %1 messages in %2 seconds."
 msgstr "Обработано сообщений: %1. Затрачено секунд: %2."
 
 #, 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 "Все Чаты"
 
 msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr "Все Чаты"
 

-#: ../src/client/clientuserinputhandler.cpp:88
+#: ../src/client/clientuserinputhandler.cpp:98

 msgctxt "ClientUserInputHandler|"
 msgid "/JOIN expects a channel"
 msgstr ""
 
 msgctxt "ClientUserInputHandler|"
 msgid "/JOIN expects a channel"
 msgstr ""
 

-#: ../src/client/clientuserinputhandler.cpp:98
+#: ../src/client/clientuserinputhandler.cpp:110

 msgctxt "ClientUserInputHandler|"
 msgid "/QUERY expects at least a nick"
 msgstr "/QUERY предполагает наличие хотя бы ника"
 msgctxt "ClientUserInputHandler|"
 msgid "/QUERY expects at least a nick"
 msgstr "/QUERY предполагает наличие хотя бы ника"


@@ -1163,10 +1721,7 @@ msgctxt "ConnectionSettingsPage|"
 msgid ""
 "This enables periodic polling of user information using /WHO. This is mostly"
 " interesting for tracking users' away status."
 msgid ""
 "This enables periodic polling of user information using /WHO. This is mostly"
 " interesting for tracking users' away status."

-msgstr ""
-"Данный параметр периодически обновляет информацию о  пользователях, "
-"используя IRC команду /WHO. В основном, это нужно для отслеживания статуса "
-"отсутствия пользователя (Away)."
+msgstr "Данный параметр периодически обновляет информацию о  пользователях, используя IRC команду /WHO. В основном, это нужно для отслеживания статуса отсутствия пользователя (Away)."

 
 #: ../src/qtui/settingspages/connectionsettingspage.ui:131
 msgctxt "ConnectionSettingsPage|"
 
 #: ../src/qtui/settingspages/connectionsettingspage.ui:131
 msgctxt "ConnectionSettingsPage|"


@@ -1193,406 +1748,342 @@ msgctxt "ConnectionSettingsPage|"
 msgid "Minimum delay between requests:"
 msgstr "Минимальное время задержки между запросами:"
 
 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/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 "Скопировать адрес ссылки"
 
 msgctxt "ContentsChatItem|"
 msgid "Copy Link Address"
 msgstr "Скопировать адрес ссылки"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:38
+#: ../src/uisupport/contextmenuactionprovider.cpp:39

 msgctxt "ContextMenuActionProvider|"
 msgid "Connect"
 msgstr "Соединиться"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Connect"
 msgstr "Соединиться"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/contextmenuactionprovider.cpp:40

 msgctxt "ContextMenuActionProvider|"
 msgid "Disconnect"
 msgstr "Отсоединиться"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Disconnect"
 msgstr "Отсоединиться"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:41
+#: ../src/uisupport/contextmenuactionprovider.cpp:42

 msgctxt "ContextMenuActionProvider|"
 msgid "Join"
 msgstr "Зайти"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Join"
 msgstr "Зайти"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/contextmenuactionprovider.cpp:43

 msgctxt "ContextMenuActionProvider|"
 msgid "Part"
 msgstr "Выйти"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Part"
 msgstr "Выйти"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:43
+#: ../src/uisupport/contextmenuactionprovider.cpp:44

 msgctxt "ContextMenuActionProvider|"
 msgid "Delete Chat(s)..."
 msgstr "Удалить Чат(ы)..."
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Delete Chat(s)..."
 msgstr "Удалить Чат(ы)..."
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:44
+#: ../src/uisupport/contextmenuactionprovider.cpp:45

 msgctxt "ContextMenuActionProvider|"
 msgid "Go to Chat"
 msgstr "Войти в Чат"
 
 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 "Входы"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Joins"
 msgstr "Входы"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:49

 msgctxt "ContextMenuActionProvider|"
 msgid "Parts"
 msgstr "Выходы из канала"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Parts"
 msgstr "Выходы из канала"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:50

 msgctxt "ContextMenuActionProvider|"
 msgid "Quits"
 msgstr "Выходы из сети"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Quits"
 msgstr "Выходы из сети"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:51

 msgctxt "ContextMenuActionProvider|"
 msgid "Nick Changes"
 msgstr "Смены ника"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Nick Changes"
 msgstr "Смены ника"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:52

 msgctxt "ContextMenuActionProvider|"
 msgid "Mode Changes"
 msgstr "Смены режимов"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Mode Changes"
 msgstr "Смены режимов"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:53

 msgctxt "ContextMenuActionProvider|"
 msgid "Day Changes"
 msgstr "Смены дня"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Day Changes"
 msgstr "Смены дня"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:54

 msgctxt "ContextMenuActionProvider|"
 msgid "Topic Changes"
 msgstr "Смены ника"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Topic Changes"
 msgstr "Смены ника"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:55

 msgctxt "ContextMenuActionProvider|"
 msgid "Set as Default..."
 msgstr "Задать буфер по умолчанию..."
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Set as Default..."
 msgstr "Задать буфер по умолчанию..."
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:56

 msgctxt "ContextMenuActionProvider|"
 msgid "Use Defaults..."
 msgstr "Использовать по умолчанию..."
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Use Defaults..."
 msgstr "Использовать по умолчанию..."
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:56
+#: ../src/uisupport/contextmenuactionprovider.cpp:58

 msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr "Зайти на канал..."
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr "Зайти на канал..."
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:58
+#: ../src/uisupport/contextmenuactionprovider.cpp:60

 msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
 msgstr "Начать диалог"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
 msgstr "Начать диалог"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:59
+#: ../src/uisupport/contextmenuactionprovider.cpp:61

 msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr "Показать диалог"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr "Показать диалог"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/contextmenuactionprovider.cpp:62

 msgctxt "ContextMenuActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:62
+#: ../src/uisupport/contextmenuactionprovider.cpp:64

 msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr "Версия"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr "Версия"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:63
+#: ../src/uisupport/contextmenuactionprovider.cpp:65

 msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr "Время"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr "Время"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:66

 msgctxt "ContextMenuActionProvider|"
 msgid "Ping"
 msgstr "Ping"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Ping"
 msgstr "Ping"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:67

 msgctxt "ContextMenuActionProvider|"
 msgid "Client info"
 msgstr "Информация о IRC клиенте"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Client info"
 msgstr "Информация о IRC клиенте"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:66
+#: ../src/uisupport/contextmenuactionprovider.cpp:68

 msgctxt "ContextMenuActionProvider|"
 msgid "Custom..."
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Custom..."
 msgstr ""
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:78
+#: ../src/uisupport/contextmenuactionprovider.cpp:80

 msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr "Дать оператора"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr "Дать оператора"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:79
+#: ../src/uisupport/contextmenuactionprovider.cpp:81

 msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr "Снять оператора"
 
 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 "Дать голос"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
 msgstr "Дать голос"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:85

 msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr "Снять голос"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr "Снять голос"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:86

 msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr "Выгнать с канала"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr "Выгнать с канала"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:87

 msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr "Забанить на канале"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr "Забанить на канале"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:88

 msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr "Выгнать и забанить"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr "Выгнать и забанить"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:86
+#: ../src/uisupport/contextmenuactionprovider.cpp:90

 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Temporarily"
 msgstr "Скрыть чат(ы), временно"
 
 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 "Скрыть чат(ы), Постоянно"
 
 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 "Показать список каналов"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
 msgstr "Показать список каналов"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:89
+#: ../src/uisupport/contextmenuactionprovider.cpp:93

 msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
 msgstr "Показать список игнорируемых"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
 msgstr "Показать список игнорируемых"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:102
+#: ../src/uisupport/contextmenuactionprovider.cpp:108

 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Events"
 msgstr "Спрятать события"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Events"
 msgstr "Спрятать события"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:110
+#: ../src/uisupport/contextmenuactionprovider.cpp:116

 msgctxt "ContextMenuActionProvider|"
 msgid "CTCP"
 msgstr "CTCP"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "CTCP"
 msgstr "CTCP"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:122
+#: ../src/uisupport/contextmenuactionprovider.cpp:131

 msgctxt "ContextMenuActionProvider|"
 msgid "Actions"
 msgstr "Действия"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Actions"
 msgstr "Действия"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:126
+#: ../src/uisupport/contextmenuactionprovider.cpp:135

 msgctxt "ContextMenuActionProvider|"
 msgid "Ignore"
 msgstr "Игнорировать"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Ignore"
 msgstr "Игнорировать"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:131
+#: ../src/uisupport/contextmenuactionprovider.cpp:140

 msgctxt "ContextMenuActionProvider|"
 msgid "Add Ignore Rule"
 msgstr "Добавить правило игнорирования"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Add Ignore Rule"
 msgstr "Добавить правило игнорирования"
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:132
+#: ../src/uisupport/contextmenuactionprovider.cpp:141

 msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr "Имеющиеся правила"
 
 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 "Не могу инициализировать ни одно хранилище! Выхожу..."
 
 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"
 "Qt library with the sqlite or postgres plugin enabled in order for quasselcore\n"
 "to work."
 msgctxt "Core|"
 msgid ""
 "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
 "Qt library with the sqlite or postgres plugin enabled in order for quasselcore\n"
 "to work."

-msgstr ""
-"Сейчас, Quassel поддерживает SQLite3 и PostgreSQL. вам нужно создать свою\n"
-"библиотеку Qt с разрешенными в ядре Quassel плагинами sqlite или postgres\n"
-"для работы."
+msgstr "Сейчас, Quassel поддерживает SQLite3 и PostgreSQL. вам нужно создать свою\nбиблиотеку Qt с разрешенными в ядре Quassel плагинами sqlite или postgres\nдля работы."

 
 

-#: ../src/core/core.cpp:232
+#: ../src/core/core.cpp:252

 msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr "Вызываю restoreState(), несмотря на существующие активные сессии!"
 
 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 "Нет пользователя-администратора или пароля."
 
 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 "Не могу настроить хранилище!"
 
 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 "Создаю пользователя-администратора..."
 
 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"
 
 #, 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"
 #, qt-format
 msgctxt "Core|"
 msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"

-msgstr ""
-"Ожидаю графических клиентов по адресу IPv6 %1 порт %2, использую протокол "
-"версии %3"
-
-#: ../src/core/core.cpp:409
-#, qt-format
-msgctxt "Core|"
-msgid "Could not open IPv6 interface %1:%2: %3"
-msgstr "Не могу открыть интерфейс IPv6 %1:%2: %3"
+msgstr "Ожидаю графических клиентов по адресу IPv6 %1 порт %2, использую протокол версии %3"

 
 

-#: ../src/core/core.cpp:417
+#: ../src/core/core.cpp:465

 #, qt-format
 msgctxt "Core|"
 #, qt-format
 msgctxt "Core|"

-msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
-msgstr ""
-"Ожидаю графических клиентов по адресу IPv4 %1 порт %2, использую протокол "
-"версии %3"
-
-#: ../src/core/core.cpp:427
-#, qt-format
-msgctxt "Core|"
-msgid "Could not open IPv4 interface %1:%2: %3"
-msgstr "Не могу открыть интерфейс IPv4 %1:%2: %3"
-
-#: ../src/core/core.cpp:435
-#, qt-format
-msgctxt "Core|"
-msgid "Invalid listen address %1, unknown network protocol"
-msgstr "Некорректный адрес для прослушивания %1, неизвестный сетевой протокол"
-
-#: ../src/core/core.cpp:444
-msgctxt "Core|"
-msgid "Could not open any network interfaces to listen on!"
-msgstr "Не могу открыть ни один сетевой интерфейс для прослушивания!"
-
-#: ../src/core/core.cpp:478
-msgctxt "Core|"
-msgid "Client connected from"
-msgstr "Клиент соединился с"
-
-#: ../src/core/core.cpp:481
-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>Вам нужно отправить инициализационное "
-"сообщение перед попыткой входа."
+msgid "Could not open IPv6 interface %1:%2: %3"
+msgstr "Не могу открыть интерфейс IPv6 %1:%2: %3"

 
 

-#: ../src/core/core.cpp:606
+#: ../src/core/core.cpp:473
+#, qt-format

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "did not send an init message before trying to login, rejecting."
-msgstr ""
-"не отправил инициализационное сообщение перед попыткой входа, отказываю."
+msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
+msgstr "Ожидаю графических клиентов по адресу IPv4 %1 порт %2, использую протокол версии %3"

 
 

-#: ../src/core/core.cpp:624
+#: ../src/core/core.cpp:484
+#, qt-format

 msgctxt "Core|"
 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>Предоставленные вами имя "
-"пользователя и пароль не найдены в базе."
+msgid "Could not open IPv4 interface %1:%2: %3"
+msgstr "Не могу открыть интерфейс IPv4 %1:%2: %3"

 
 

-#: ../src/core/core.cpp:630
+#: ../src/core/core.cpp:492

 #, qt-format
 msgctxt "Core|"
 #, qt-format
 msgctxt "Core|"

-msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
-msgstr "иниÑ\86иализиÑ\80ован и аÑ\83Ñ\82енÑ\82иÑ\84иÑ\86иÑ\80ован Ñ\83Ñ\81пеÑ\88но как \"%1\" (UserId: %2)."
+msgid "Invalid listen address %1, unknown network protocol"
+msgstr "Ð\9dекоÑ\80Ñ\80екÑ\82нÑ\8bй адÑ\80еÑ\81 длÑ\8f пÑ\80оÑ\81лÑ\83Ñ\88иваниÑ\8f %1, неизвеÑ\81Ñ\82нÑ\8bй Ñ\81еÑ\82евой пÑ\80оÑ\82окол"

 
 

-#: ../src/core/core.cpp:641
+#: ../src/core/core.cpp:501

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Non-authed client disconnected."
-msgstr "Неавторизованный клиент отсоединён."
+msgid "Could not open any network interfaces to listen on!"
+msgstr "Не могу открыть ни один сетевой интерфейс для прослушивания!"

 
 

-#: ../src/core/core.cpp:647
+#: ../src/core/core.cpp:541

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Non-authed client disconnected. (socket allready destroyed)"
-msgstr "Ð\9dеавÑ\82оÑ\80изованнÑ\8bй клиенÑ\82 оÑ\82Ñ\81оединÑ\91н. (Ñ\81океÑ\82 Ñ\83же Ñ\83ниÑ\87Ñ\82ожен)"
+msgid "Client connected from"
+msgstr "Ð\9aлиенÑ\82 Ñ\81оединилÑ\81Ñ\8f Ñ\81"

 
 

-#: ../src/core/core.cpp:695
+#: ../src/core/core.cpp:544

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Could not initialize session for client:"
-msgstr "Ð\9dе могÑ\83 иниÑ\86иализиÑ\80оваÑ\82Ñ\8c Ñ\81еÑ\81Ñ\81иÑ\8e длÑ\8f клиенÑ\82а:"
+msgid "Closing server for basic setup."
+msgstr "Ð\97акÑ\80Ñ\8bваÑ\8e Ñ\81еÑ\80веÑ\80 длÑ\8f базовой наÑ\81Ñ\82Ñ\80ойки."

 
 

-#: ../src/core/core.cpp:717
+#: ../src/core/core.cpp:556

 msgctxt "Core|"
 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
 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 "Редактировать аккаунт в ядре"
 msgctxt "CoreAccountEditDlg|"
 msgid "Edit Core Account"
 msgstr "Редактировать аккаунт в ядре"


@@ -1667,12 +2158,12 @@ msgctxt "CoreAccountEditDlg|"
 msgid "HTTP"
 msgstr "HTTP"
 
 msgid "HTTP"
 msgstr "HTTP"
 

-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:263

 msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr "Добавить аккаунт в ядре"
 
 msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr "Добавить аккаунт в ядре"
 

-#: ../src/client/coreaccountmodel.cpp:64
+#: ../src/client/coreaccountmodel.cpp:68

 msgctxt "CoreAccountModel|"
 msgid "Internal Core"
 msgstr "Встроенное ядро"
 msgctxt "CoreAccountModel|"
 msgid "Internal Core"
 msgstr "Встроенное ядро"


@@ -1717,39 +2208,98 @@ msgctxt "CoreAccountSettingsPage|"
 msgid "Always connect to"
 msgstr "Всегда подключаться к"
 
 msgid "Always connect to"
 msgstr "Всегда подключаться к"
 

-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:30

 msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
 msgstr "Удаленные Quassel Core сервера"
 
 msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
 msgstr "Удаленные Quassel Core сервера"
 

+#: ../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: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 "Ваше ядро сконфигурировано успешно. Выполняю вход в..."
 
 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 ""
 "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start "
 "over."
 #, qt-format
 msgctxt "CoreConfigWizard|"
 msgid ""
 "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start "
 "over."

-msgstr ""
-"Ошибка конфигурации ядра:<br><b>%1</b><br>Нажмите <em>Далее</em> чтобы "
-"начать сначала."
+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 "
 "remember to configure your identities and networks now."
 msgctxt "CoreConfigWizard|"
 msgid ""
 "Your are now logged into your freshly configured Quassel Core!<br>Please "
 "remember to configure your identities and networks now."

-msgstr ""
-"Вы вошли в свежесконфигурированное ядро Quassel!<br>Теперь, пожалуйста, не "
-"забудьте настроить ваши личности и сети."
+msgstr "Вы вошли в свежесконфигурированное ядро Quassel!<br>Теперь, пожалуйста, не забудьте настроить ваши личности и сети."

 
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
 msgctxt "CoreConfigWizardAdminUserPage|"
 
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
 msgctxt "CoreConfigWizardAdminUserPage|"


@@ -1781,9 +2331,7 @@ msgctxt "CoreConfigWizardAdminUserPage|"
 msgid ""
 "<b>Note:</b> Adding more users and changing your username/password is not possible via Quassel's client interface yet.\n"
 "If you need to do these things, please run \"<tt><nobr>quasselcore --help</nobr></tt>\"."
 msgid ""
 "<b>Note:</b> Adding more users and changing your username/password is not possible via Quassel's client interface yet.\n"
 "If you need to do these things, please run \"<tt><nobr>quasselcore --help</nobr></tt>\"."

-msgstr ""
-"<b>Примечание:</b> В данной версии программы, добавление пользователей и изменение имени пользователя и пароля не возможно через интерфейс клиента Quassel.\n"
-"Если Вы хотите это сделать, выполните команду \"<tt><nobr>quasselcore --help</nobr></tt>\"."
+msgstr "<b>Примечание:</b> В данной версии программы, добавление пользователей и изменение имени пользователя и пароля не возможно через интерфейс клиента Quassel.\nЕсли Вы хотите это сделать, выполните команду \"<tt><nobr>quasselcore --help</nobr></tt>\"."

 
 #: ../src/qtui/ui/coreconfigwizardintropage.ui:13
 msgctxt "CoreConfigWizardIntroPage|"
 
 #: ../src/qtui/ui/coreconfigwizardintropage.ui:13
 msgctxt "CoreConfigWizardIntroPage|"


@@ -1795,57 +2343,51 @@ msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr "Этот мастер поможет вам настроить ядро Quassel."
 
 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 "Создание пользователя-администратора"
 
 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."
 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid ""
 "First, we will create a user on the core. This first user will have "
 "administrator privileges."

-msgstr ""
-"Для начала мы создадим пользователя в ядре. У этого первого пользователя "
-"будут привилегии администратора."
+msgstr "Для начала мы создадим пользователя в ядре. У этого первого пользователя будут привилегии администратора."

 
 

-#: ../src/qtui/coreconfigwizard.cpp:135
+#: ../src/qtui/coreconfigwizard.cpp:145

 msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr "Введение"
 
 msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr "Введение"
 

-#: ../src/qtui/coreconfigwizard.cpp:182
+#: ../src/qtui/coreconfigwizard.cpp:198

 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
 msgstr "Выбор средства хранения"
 
 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."
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid ""
 "Please select a database backend for the Quassel Core storage to store the "
 "backlog and other data in."

-msgstr ""
-"Пожалуйста выберите движок базы данных, с помощью которого ядро Quassel "
-"будет хранить журнал и прочие данные."
+msgstr "Пожалуйста выберите движок базы данных, с помощью которого ядро Quassel будет хранить журнал и прочие данные."

 
 

-#: ../src/qtui/coreconfigwizard.cpp:277
+#: ../src/qtui/coreconfigwizard.cpp:300

 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Connection Properties"
 msgstr "Свойства соединения"
 
 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 "Сохранение настроек"
 
 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 "
 "automatically."
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid ""
 "Your settings are now stored in the core, and you will be logged in "
 "automatically."

-msgstr ""
-"Ваши настройки сохраняются в ядре, вы будете подсоединены к ядру "
-"автоматически."
+msgstr "Ваши настройки сохраняются в ядре, вы будете подсоединены к ядру автоматически."

 
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 
 #: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
 msgctxt "CoreConfigWizardStorageSelectionPage|"


@@ -1927,119 +2469,49 @@ msgctxt "CoreConnectAuthDlg|"
 msgid "Remember password"
 msgstr "Запомнить пароль"
 
 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:"
 #, qt-format
 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your credentials for %1:"

-msgstr ""
+msgstr "Пожалуйста, введите учетные данные для %1:"

 
 

-#: ../src/qtui/coreconnectdlg.cpp:40
+#: ../src/qtui/coreconnectdlg.cpp:41

 msgctxt "CoreConnectDlg|"
 msgid "Connect to Core"
 msgstr "Подключение к ядру"
 
 msgctxt "CoreConnectDlg|"
 msgid "Connect to Core"
 msgstr "Подключение к ядру"
 

-#: ../src/client/coreconnection.cpp:168
+#: ../src/client/coreconnection.cpp:182

 msgctxt "CoreConnection|"
 msgid "Network is down"
 msgstr "Сеть недоступна"
 
 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 "Отключено"
 
 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 "&Отключиться от ядра"
 
 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>Для "
-"соединения необходима поддержка клиент-серверного протокола по крайней мере "
-"версии %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 "Получение состояния сетей"
 
 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..."
 
 #, 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 "Получение состояния сетей"
 
 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"
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronized to %1"


@@ -2057,28 +2529,21 @@ msgstr "Определение состояния сети"
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
 msgctxt "CoreConnectionSettingsPage|"
 
 #: ../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"
+msgid "Rely on Qt's network configuration manager to detect if we're online"

 msgstr ""
 msgstr ""

-"Полагаться на аппаратный уровень KDE, чтобы определить, онлайн ли мы. "
-"Рекомендуется для большинства пользователей KDE"

 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
 msgctxt "CoreConnectionSettingsPage|"
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
 msgctxt "CoreConnectionSettingsPage|"

-msgid "Use KDE's network status detection (via Solid)"
-msgstr "Используйте сетевое обнаружение состояния KDE (via Solid)"
+msgid "Automatic"
+msgstr ""

 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
 
 #: ../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 "
 "a certain time"
 msgctxt "CoreConnectionSettingsPage|"
 msgid ""
 "Actively ping the remote core and disconnect if we didn't get a reply after "
 "a certain time"

-msgstr ""
-"Периодически запрашивать удаленное ядро, и отключаться, если от него нет "
-"отклика"
+msgstr "Периодически запрашивать удаленное ядро, и отключаться, если от него нет отклика"

 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
 msgctxt "CoreConnectionSettingsPage|"
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
 msgctxt "CoreConnectionSettingsPage|"


@@ -2096,9 +2561,7 @@ msgctxt "CoreConnectionSettingsPage|"
 msgid ""
 "Only disconnect if the network socket gets closed by the operating system. "
 "This may take a long time after actually losing connectivity"
 msgid ""
 "Only disconnect if the network socket gets closed by the operating system. "
 "This may take a long time after actually losing connectivity"

-msgstr ""
-"Отключаться только после закрытия соединения системой. Обнаружение "
-"отключения может пройти занять много времени"
+msgstr "Отключаться только после закрытия соединения системой. Обнаружение отключения может пройти занять много времени"

 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
 msgctxt "CoreConnectionSettingsPage|"
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
 msgctxt "CoreConnectionSettingsPage|"


@@ -2115,6 +2578,11 @@ msgctxt "CoreConnectionSettingsPage|"
 msgid "Retry every"
 msgstr "Повтор каждые"
 
 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"
 #: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
 msgctxt "CoreConnectionSettingsPage|"
 msgid "Remote Cores"


@@ -2135,28 +2603,28 @@ msgctxt "CoreConnectionStatusWidget|"
 msgid "Message"
 msgstr "Сообщение"
 
 msgid "Message"
 msgstr "Сообщение"
 

-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67

 msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
 msgstr " сек"
 
 msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
 msgstr " сек"
 

-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67

 msgctxt "CoreConnectionStatusWidget|milliseconds"
 msgid "ms"
 msgstr "мс"
 
 msgctxt "CoreConnectionStatusWidget|milliseconds"
 msgid "ms"
 msgstr "мс"
 

-#: ../src/qtui/coreconnectionstatuswidget.cpp:62
+#: ../src/qtui/coreconnectionstatuswidget.cpp:68

 #, qt-format
 msgctxt "CoreConnectionStatusWidget|"
 msgid "(Lag: %1 %2)"
 #, qt-format
 msgctxt "CoreConnectionStatusWidget|"
 msgid "(Lag: %1 %2)"

-msgstr ""
+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-шифрование."
 
 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 "Соединение с ядром не использует шифрование."
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr "Соединение с ядром не использует шифрование."


@@ -2211,7 +2679,7 @@ msgctxt "CoreInfoDlg|"
 msgid "Close"
 msgstr "Закрыть"
 
 msgid "Close"
 msgstr "Закрыть"
 

-#: ../src/qtui/coreinfodlg.cpp:53
+#: ../src/qtui/coreinfodlg.cpp:57

 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid "%n Day(s)"
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid "%n Day(s)"


@@ -2219,119 +2687,182 @@ msgid_plural "%n Day(s)"
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

+msgstr[3] ""

 
 

-#: ../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)"
 
 #, 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 "Сбой соединения. Пробую следующий сервер"
 
 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 ""
 
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connecting to %1:%2..."
 msgstr ""
 

-#: ../src/core/corenetwork.cpp:205
+#: ../src/core/corenetwork.cpp:234

 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Disconnecting. (%1)"
 msgstr ""
 
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Disconnecting. (%1)"
 msgstr ""
 

-#: ../src/core/corenetwork.cpp:205
+#: ../src/core/corenetwork.cpp:234

 msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr "Ядро завершает работу"
 
 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)"
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"

-msgstr ""
+msgstr "Не могу подсоединиться к %1 (%2)"

 
 

-#: ../src/core/corenetwork.cpp:345
+#: ../src/core/corenetwork.cpp:444

 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
 msgstr "Сбой соединения: %1"
 
 #, 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 "Клиент"
 
 msgctxt "CoreSession|"
 msgid "Client"
 msgstr "Клиент"
 

-#: ../src/core/coresession.cpp:214
+#: ../src/core/coresession.cpp:233

 #, qt-format
 msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."
 #, qt-format
 msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."

-msgstr ""
+msgstr "отсоединён (UserId: %1)."

 
 

-#: ../src/core/coresession.cpp:440
+#: ../src/core/coresession.cpp:481

 #, qt-format
 msgctxt "CoreSession|"
 msgid ""
 "CoreSession::createNetwork(): Got invalid networkId from Core when trying to"
 " create network %1!"
 #, qt-format
 msgctxt "CoreSession|"
 msgid ""
 "CoreSession::createNetwork(): Got invalid networkId from Core when trying to"
 " create network %1!"

-msgstr ""
-"CoreSession::createNetwork(): Получен неверный networkId от ядра, пытаясь "
-"создать сеть %1!"
+msgstr "CoreSession::createNetwork(): Получен неверный networkId от ядра, пытаясь создать сеть %1!"

 
 

-#: ../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!"
 msgctxt "CoreSession|"
 msgid ""
 "CoreSession::createNetwork(): Trying to create a network that already "
 "exists, updating instead!"

-msgstr ""
-"CoreSession::createNetwork(): Попытался создать уже существующую сеть, "
-"вместо этого обновляю!"
+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"
 msgctxt "CoreSessionEventProcessor|"
 msgid ""
 "No free and valid nicks in nicklist found. use: /nick <othernick> to "
 "continue"

+msgstr "Среди ников в списке не найдено свободного и корректного. Используйте /nick <другой ник> для продолжения"
+
+#: ../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 ""
 msgstr ""

-"Среди ников в списке не найдено свободного и корректного. Используйте /nick "
-"<другой ник> для продолжения"

 
 

-#: ../src/core/coreuserinputhandler.cpp:81
+#: ../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 "отсутствует"
 
 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 ""
 
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 

-#: ../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 ""
 
 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 ""
 

-#: ../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 не установлена."
 
 #, 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 ""
 
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been deleted."
 msgstr ""
 

-#: ../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 "
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "


@@ -2340,27 +2871,31 @@ msgid ""
 "with QCA2 present."
 msgstr ""
 
 "with QCA2 present."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:422
-#, qt-format
+#: ../src/core/coreuserinputhandler.cpp:370

 msgctxt "CoreUserInputHandler|"
 msgctxt "CoreUserInputHandler|"

-msgid "Starting query with %1"
+msgid ""
+"[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:469
+#: ../src/core/coreuserinputhandler.cpp:377

 msgctxt "CoreUserInputHandler|"
 msgctxt "CoreUserInputHandler|"

-msgid ""
-"[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
-"channel. /setkey <key> when in a channel or query buffer sets the key for "
-"it."
+msgid "It is only possible to exchange keys in a query buffer."

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:484
+#: ../src/core/coreuserinputhandler.cpp:387

 #, qt-format
 msgctxt "CoreUserInputHandler|"
 #, qt-format
 msgctxt "CoreUserInputHandler|"

-msgid "The key for %1 has been set."
+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 ""
 
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:487
+#: ../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 "
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "


@@ -2369,23 +2904,37 @@ msgid ""
 "with QCA present."
 msgstr ""
 
 "with QCA present."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:509
+#: ../src/core/coreuserinputhandler.cpp:569
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Starting query with %1"
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:632

 msgctxt "CoreUserInputHandler|"
 msgid ""
 msgctxt "CoreUserInputHandler|"
 msgid ""

-"[usage] /showkey <nick|channel> shows the encryption key for nick or channel"
-" or just /showkey when in a channel or query."
+"[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
+"channel. /setkey <key> when in a channel or query buffer sets the key for "
+"it."

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:521
+#: ../src/core/coreuserinputhandler.cpp:641

 #, qt-format
 msgctxt "CoreUserInputHandler|"
 #, qt-format
 msgctxt "CoreUserInputHandler|"

-msgid "The key for %1 is %2"
-msgstr "Домашняя страница для %1 %2"
+msgid "The key for %1 has been set."
+msgstr ""
+
+#: ../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 ""

 
 

-#: ../src/core/coreuserinputhandler.cpp:633
+#: ../src/core/coreuserinputhandler.cpp:682

 #, qt-format
 msgctxt "CoreUserInputHandler|"
 #, qt-format
 msgctxt "CoreUserInputHandler|"

-msgid "[Error] Could not encrypt your message: %1"
+msgid "The key for %1 is %2:%3"

 msgstr ""
 
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgstr ""
 
 #: ../src/qtui/settingspages/createidentitydlg.ui:17


@@ -2408,6 +2957,17 @@ msgctxt "CreateIdentityDlg|"
 msgid "Duplicate:"
 msgstr "Дублировать:"
 
 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"
 #: ../src/qtui/ui/debugbufferviewoverlay.ui:13
 msgctxt "DebugBufferViewOverlay|"
 msgid "Debug BufferView Overlay"


@@ -2498,347 +3058,368 @@ msgctxt "DebugLogWidget|"
 msgid "Close"
 msgstr "Закрыть"
 
 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"
 
 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 ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 invited you to channel %2"
 msgstr ""
 

-#: ../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\""
 
 #, 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 "Получен нестандартный RPL_ISUPPORT: может случиться всё что угодно!"
 
 msgctxt "EventStringifier|"
 msgid ""
 "Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
 "behavior!"
 msgstr "Получен нестандартный RPL_ISUPPORT: может случиться всё что угодно!"
 

-#: ../src/core/eventstringifier.cpp:263
+#: ../src/core/eventstringifier.cpp:384

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 is away: \"%2\""
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 is away: \"%2\""

-msgstr "%1 отсутствует: \"%2\""
+msgstr ""

 
 

-#: ../src/core/eventstringifier.cpp:268
+#: ../src/core/eventstringifier.cpp:391

 msgctxt "EventStringifier|"
 msgid "You are no longer marked as being away"
 msgstr ""
 
 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 ""
 
 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)"
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is %2 (%3)"

-msgstr "[Whois] %1 это %2 (%3)"
+msgstr ""

 
 

-#: ../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)"
 
 #, 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)"
 
 #, 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 ""
 
 #, 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] Конец списка /WHO для %1"
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] Конец списка /WHO для %1"
 

-#: ../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"
 
 #, 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)"
 
 #, 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] Конец списка /WHO для %1"
 
 msgctxt "EventStringifier|"
 msgid "[Whois] End of /WHOIS list"
 msgstr "[Who] Конец списка /WHO для %1"
 

-#: ../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"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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 "Конец списка каналов"
 
 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"
 
 #, 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"
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 created on %2"

-msgstr ""
+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\""
 
 #, 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 не установлена."
 
 #, 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\""
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic for %1 is \"%2\""

-msgstr "Тема канала %1 \"%2\""
+msgstr ""

 
 

-#: ../src/core/eventstringifier.cpp:452
+#: ../src/core/eventstringifier.cpp:621

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic set by %1 on %2"
 msgstr "Тема установлена %1 %2"
 
 #, 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 ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has been invited to %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:468
+#: ../src/core/eventstringifier.cpp:642

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
 #, 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 ""
 
 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 содержит недопустимые символы"
 
 #, 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"
 
 #, 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"
 
 #, 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 ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 

-#. 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 ""
 
 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 ""
 
 #, 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 ""
 
 #, 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|"
 #, qt-format
 msgctxt "EventStringifier|"

-msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time"
-msgstr "Получен ответ на CTCP от %1 с временем полного пути %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"
 
 #, 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\" недопустимо: ../ или ..\\ не допускаются!"
 
 #, 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 ""
 
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Could not find script \"%1\""
 msgstr ""
 

-#: ../src/client/execwrapper.cpp:82
+#: ../src/client/execwrapper.cpp:93

 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" crashed with exit code %2."
 msgstr ""
 
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" crashed with exit code %2."
 msgstr ""
 

-#: ../src/client/execwrapper.cpp:98
+#: ../src/client/execwrapper.cpp:111

 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" could not start."
 msgstr "Не удалось запустить сценарий \"%1\""
 
 #, 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 ""
 
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" caused error %2."
 msgstr ""
 

-#: ../src/uisupport/fontselector.cpp:31
+#: ../src/uisupport/fontselector.cpp:32

 msgctxt "FontSelector|"
 msgid "Choose..."
 msgstr "Выбрать..."
 
 msgctxt "FontSelector|"
 msgid "Choose..."
 msgstr "Выбрать..."
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:13
+#: ../src/qtui/settingspages/highlightsettingspage.ui:14

 msgctxt "HighlightSettingsPage|"
 msgid "Form"
 msgstr "Форма"
 
 msgctxt "HighlightSettingsPage|"
 msgid "Form"
 msgstr "Форма"
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:19
+#: ../src/qtui/settingspages/highlightsettingspage.ui:20

 msgctxt "HighlightSettingsPage|"
 msgid "Custom Highlights"
 msgstr "Произвольные подсветки"
 
 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 "Подсветка"
 
 msgctxt "HighlightSettingsPage|"
 msgid "Highlight"
 msgstr "Подсветка"
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:37
+#: ../src/qtui/settingspages/highlightsettingspage.ui:38

 msgctxt "HighlightSettingsPage|"
 msgid "RegEx"
 msgstr "Регэксп"
 
 msgctxt "HighlightSettingsPage|"
 msgid "RegEx"
 msgstr "Регэксп"
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:42
+#: ../src/qtui/settingspages/highlightsettingspage.ui:43

 msgctxt "HighlightSettingsPage|"
 msgid "CS"
 msgstr "Регистр"
 
 msgctxt "HighlightSettingsPage|"
 msgid "CS"
 msgstr "Регистр"
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:47
+#: ../src/qtui/settingspages/highlightsettingspage.ui:48

 msgctxt "HighlightSettingsPage|"
 msgid "Enable"
 msgstr "Включено"
 
 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 "Добавить"
 
 msgctxt "HighlightSettingsPage|"
 msgid "Add"
 msgstr "Добавить"
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:62
+#: ../src/qtui/settingspages/highlightsettingspage.ui:76

 msgctxt "HighlightSettingsPage|"
 msgid "Remove"
 msgstr "Удалить"
 
 msgctxt "HighlightSettingsPage|"
 msgid "Remove"
 msgstr "Удалить"
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:85
+#: ../src/qtui/settingspages/highlightsettingspage.ui:101

 msgctxt "HighlightSettingsPage|"
 msgid "Highlight Nicks"
 msgstr "Подсвечивать ники"
 
 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 "Все ники личности"
 
 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 "Текущий ник"
 
 msgctxt "HighlightSettingsPage|"
 msgid "Current nick"
 msgstr "Текущий ник"
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/highlightsettingspage.ui:124

 msgctxt "HighlightSettingsPage|"
 msgid "None"
 msgstr "Нет"
 
 msgctxt "HighlightSettingsPage|"
 msgid "None"
 msgstr "Нет"
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:115
+#: ../src/qtui/settingspages/highlightsettingspage.ui:131

 msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr "Учитывать регистр"
 
 msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr "Учитывать регистр"
 

-#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:29

 msgctxt "HighlightSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 
 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 "это не должно быть пусто"
 
 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
 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 "Переименовать личность"
 msgctxt "IdentitiesSettingsPage|"
 msgid "Rename Identity"
 msgstr "Переименовать личность"


@@ -2847,7 +3428,7 @@ msgstr "Переименовать личность"
 #: ../src/qtui/settingspages/identitiessettingspage.ui:77
 msgctxt "IdentitiesSettingsPage|"
 msgid "..."
 #: ../src/qtui/settingspages/identitiessettingspage.ui:77
 msgctxt "IdentitiesSettingsPage|"
 msgid "..."

-msgstr "..."
+msgstr ""

 
 #: ../src/qtui/settingspages/identitiessettingspage.ui:51
 msgctxt "IdentitiesSettingsPage|"
 
 #: ../src/qtui/settingspages/identitiessettingspage.ui:51
 msgctxt "IdentitiesSettingsPage|"


@@ -2874,93 +3455,91 @@ msgctxt "IdentitiesSettingsPage|"
 msgid "Identities"
 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>"
 msgctxt "IdentitiesSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"

-msgstr ""
-"<b>Прежде чем сохранить настройки, необходимо устранить следующие "
-"проблемы:</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>"
 
 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>"
 
 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>"
 
 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>Вам нужно указать идент для каждой личности</li>"
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr "<li>Вам нужно указать идент для каждой личности</li>"
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:183
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:210

 msgctxt "IdentitiesSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
 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 "Одна или несколько личностей некорректны"
 
 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 "Удалить личность?"
 
 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\"?"
 
 #, 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\"!"
 #, qt-format
 msgctxt "IdentitiesSettingsPage|"
 msgid "Please enter a new name for the identity \"%1\"!"

-msgstr ""
+msgstr "Пожалуйста введите новое название личности \"%1\"!"

 
 

-#: ../src/common/identity.cpp:134
+#: ../src/common/identity.cpp:147

 msgctxt "Identity|"
 msgid "Quassel IRC User"
 msgstr "Пользователь Quassel IRC"
 
 msgctxt "Identity|"
 msgid "Quassel IRC User"
 msgstr "Пользователь Quassel IRC"
 

-#: ../src/common/identity.cpp:162
+#: ../src/common/identity.cpp:177

 msgctxt "Identity|"
 msgid "<empty>"
 msgstr "<пусто>"
 
 msgctxt "Identity|"
 msgid "<empty>"
 msgstr "<пусто>"
 

-#: ../src/common/identity.cpp:168
+#: ../src/common/identity.cpp:183

 msgctxt "Identity|"
 msgid "Gone fishing."
 msgstr "Ловлю рыбу."
 
 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 "Нет меня. Не, честно, нет меня!"
 
 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 стёрты с лица земли..."
 
 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 "Детский сад в другом месте!"
 
 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 - Разговаривать удобно. Везде."
 msgctxt "Identity|"
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr "http://quassel-irc.org - Разговаривать удобно. Везде."


@@ -3013,7 +3592,7 @@ msgstr "Переименовать личность"
 #: ../src/qtui/settingspages/identityeditwidget.ui:139
 msgctxt "IdentityEditWidget|"
 msgid "Re&name..."
 #: ../src/qtui/settingspages/identityeditwidget.ui:139
 msgctxt "IdentityEditWidget|"
 msgid "Re&name..."

-msgstr "Пере&именовать..."
+msgstr ""

 
 #: ../src/qtui/settingspages/identityeditwidget.ui:165
 msgctxt "IdentityEditWidget|"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:165
 msgctxt "IdentityEditWidget|"


@@ -3024,7 +3603,7 @@ msgstr "Передвинуть вверх в списке"
 #: ../src/qtui/settingspages/identityeditwidget.ui:182
 msgctxt "IdentityEditWidget|"
 msgid "..."
 #: ../src/qtui/settingspages/identityeditwidget.ui:182
 msgctxt "IdentityEditWidget|"
 msgid "..."

-msgstr "..."
+msgstr ""

 
 #: ../src/qtui/settingspages/identityeditwidget.ui:179
 msgctxt "IdentityEditWidget|"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:179
 msgctxt "IdentityEditWidget|"


@@ -3034,7 +3613,7 @@ msgstr "Передвинуть вниз в списке"
 #: ../src/qtui/settingspages/identityeditwidget.ui:227
 msgctxt "IdentityEditWidget|"
 msgid "A&way"
 #: ../src/qtui/settingspages/identityeditwidget.ui:227
 msgctxt "IdentityEditWidget|"
 msgid "A&way"

-msgstr "&Отсутствую"
+msgstr ""

 
 #: ../src/qtui/settingspages/identityeditwidget.ui:233
 msgctxt "IdentityEditWidget|"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:233
 msgctxt "IdentityEditWidget|"


@@ -3066,8 +3645,7 @@ msgstr "Причина отсутствия:"
 #: ../src/qtui/settingspages/identityeditwidget.ui:280
 msgctxt "IdentityEditWidget|"
 msgid "Set away when all clients have detached from the core"
 #: ../src/qtui/settingspages/identityeditwidget.ui:280
 msgctxt "IdentityEditWidget|"
 msgid "Set away when all clients have detached from the core"

-msgstr ""
-"Устанавливать состояние \"отсутствую\" когда все клиенты отсоединены от ядра"
+msgstr "Устанавливать состояние \"отсутствую\" когда все клиенты отсоединены от ядра"

 
 #: ../src/qtui/settingspages/identityeditwidget.ui:283
 msgctxt "IdentityEditWidget|"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:283
 msgctxt "IdentityEditWidget|"


@@ -3095,7 +3673,7 @@ msgid "minutes of being idle"
 msgstr "минут неактивности"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:399
 msgstr "минут неактивности"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:399

-#: ../src/qtui/settingspages/identityeditwidget.cpp:219
+#: ../src/qtui/settingspages/identityeditwidget.cpp:244

 msgctxt "IdentityEditWidget|"
 msgid "Advanced"
 msgstr "Дополнительно"
 msgctxt "IdentityEditWidget|"
 msgid "Advanced"
 msgstr "Дополнительно"


@@ -3110,9 +3688,7 @@ msgctxt "IdentityEditWidget|"
 msgid ""
 "The \"ident\" is part of your hostmask and, together with your host, "
 "uniquely identifies you within the IRC network."
 msgid ""
 "The \"ident\" is part of your hostmask and, together with your host, "
 "uniquely identifies you within the IRC network."

-msgstr ""
-"\"Идент\" является частью хостмаски и вместе с хостом является однозначным "
-"идентификатором пользователя сети IRC."
+msgstr "\"Идент\" является частью хостмаски и вместе с хостом является однозначным идентификатором пользователя сети IRC."

 
 #: ../src/qtui/settingspages/identityeditwidget.ui:423
 msgctxt "IdentityEditWidget|"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:423
 msgctxt "IdentityEditWidget|"


@@ -3138,18 +3714,14 @@ msgstr "Причина изгнания:"
 msgctxt "IdentityEditWidget|"
 msgid ""
 "You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
 msgctxt "IdentityEditWidget|"
 msgid ""
 "You need an SSL Capable Client to edit your Cores SSL Key and Certificate"

-msgstr ""
-"Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и "
-"сертификата SSL"
+msgstr "Вам нужен клиент, умеющий работать с SSL, для редактирования ключа и сертификата SSL"

 
 #: ../src/qtui/settingspages/identityeditwidget.ui:517
 msgctxt "IdentityEditWidget|"
 msgid ""
 "Warning: you are not connected with a secured connection to the Quassel Core!\n"
 "Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:517
 msgctxt "IdentityEditWidget|"
 msgid ""
 "Warning: you are not connected with a secured connection to the Quassel Core!\n"
 "Proceeding will cause an unencrypted transfer of your SSL Key and SSL Certificate!"

-msgstr ""
-"Предупреждение: вы не используете безопасное соединение с ядром Quassel!\n"
-"В случае продолжения передача вашего ключа и сертификата будет небезопасной!"
+msgstr "Предупреждение: вы не используете безопасное соединение с ядром Quassel!\nВ случае продолжения передача вашего ключа и сертификата будет небезопасной!"

 
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
 msgctxt "IdentityEditWidget|"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:546
 msgctxt "IdentityEditWidget|"


@@ -3167,16 +3739,16 @@ msgid "Key Type:"
 msgstr "Тип ключа:"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:605
 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
 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:365

+#: ../src/qtui/settingspages/identityeditwidget.cpp:423

 msgctxt "IdentityEditWidget|"
 msgid "Load"
 msgstr "Загрузить"
 msgctxt "IdentityEditWidget|"
 msgid "Load"
 msgstr "Загрузить"


@@ -3193,8 +3765,8 @@ msgstr "Организация:"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:663
 #: ../src/qtui/settingspages/identityeditwidget.ui:697
 
 #: ../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 "Сертификат не загружен"
 msgctxt "IdentityEditWidget|"
 msgid "No Certificate loaded"
 msgstr "Сертификат не загружен"


@@ -3204,38 +3776,50 @@ msgctxt "IdentityEditWidget|"
 msgid "CommonName:"
 msgstr "ОбщееИмя:"
 
 msgid "CommonName:"
 msgstr "ОбщееИмя:"
 

-#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+#: ../src/qtui/settingspages/identityeditwidget.cpp:327

 msgctxt "IdentityEditWidget|"
 msgid "Load a Key"
 msgstr "Загрузить ключ"
 
 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"
 
 msgctxt "IdentityEditWidget|"
 msgid "RSA"
 msgstr "RSA"
 

-#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+#: ../src/qtui/settingspages/identityeditwidget.cpp:373

 msgctxt "IdentityEditWidget|"
 msgid "DSA"
 msgstr "DSA"
 
 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 "Очистить"
 
 msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr "Очистить"
 

-#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+#: ../src/qtui/settingspages/identityeditwidget.cpp:390

 msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr "Загрузить сертификат"
 
 msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr "Загрузить сертификат"
 

-#: ../src/qtui/ircconnectionwizard.cpp:107
+#: ../src/qtui/ircconnectionwizard.cpp:116

 msgctxt "IdentityPage|"
 msgid "Setup Identity"
 msgstr "Настроить личность"
 
 msgctxt "IdentityPage|"
 msgid "Setup Identity"
 msgstr "Настроить личность"
 

-#: ../src/qtui/ircconnectionwizard.cpp:112
+#: ../src/qtui/ircconnectionwizard.cpp:121

 msgctxt "IdentityPage|"
 msgid "Default Identity"
 msgstr "Личность по умолчанию"
 msgctxt "IdentityPage|"
 msgid "Default Identity"
 msgstr "Личность по умолчанию"


@@ -3398,14 +3982,14 @@ msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 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 ""
 
 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 ""
 

-#: ../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 "
 msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "


@@ -3418,27 +4002,27 @@ msgid ""
 "host<br />"
 msgstr ""
 
 "host<br />"
 msgstr ""
 

-#: ../src/qtui/settingspages/ignorelistmodel.cpp:89
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:91

 msgctxt "IgnoreListModel|"
 msgid "By Sender"
 msgstr "Отправитель"
 
 msgctxt "IgnoreListModel|"
 msgid "By Sender"
 msgstr "Отправитель"
 

-#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:93

 msgctxt "IgnoreListModel|"
 msgid "By Message"
 msgstr "Сообщение"
 
 msgctxt "IgnoreListModel|"
 msgid "By Message"
 msgstr "Сообщение"
 

-#: ../src/qtui/settingspages/ignorelistmodel.cpp:193
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:208

 msgctxt "IgnoreListModel|"
 msgid "Enabled"
 msgstr "Включено"
 
 msgctxt "IgnoreListModel|"
 msgid "Enabled"
 msgstr "Включено"
 

-#: ../src/qtui/settingspages/ignorelistmodel.cpp:194
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:209

 msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr "Вид"
 
 msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr "Вид"
 

-#: ../src/qtui/settingspages/ignorelistmodel.cpp:195
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:210

 msgctxt "IgnoreListModel|"
 msgid "Ignore Rule"
 msgstr "Добавить правило игнорирования"
 msgctxt "IgnoreListModel|"
 msgid "Ignore Rule"
 msgstr "Добавить правило игнорирования"


@@ -3473,22 +4057,19 @@ msgctxt "IgnoreListSettingsPage|"
 msgid "Ignore List"
 msgstr "Список Игнорирования"
 
 msgid "Ignore List"
 msgstr "Список Игнорирования"
 

-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144

 msgctxt "IgnoreListSettingsPage|"
 msgid "Rule already exists"
 msgstr "Правило уже существует"
 
 msgctxt "IgnoreListSettingsPage|"
 msgid "Rule already exists"
 msgstr "Правило уже существует"
 

-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145

 #, qt-format
 msgctxt "IgnoreListSettingsPage|"
 msgid ""
 "There is already a rule\n"
 "\"%1\"\n"
 "Please choose another rule."
 #, qt-format
 msgctxt "IgnoreListSettingsPage|"
 msgid ""
 "There is already a rule\n"
 "\"%1\"\n"
 "Please choose another rule."

-msgstr ""
-"Уже есть правило\n"
-"\"%1\"\n"
-"Пожалуйста выберите другое правило."
+msgstr "Уже есть правило\n\"%1\"\nПожалуйста выберите другое правило."

 
 #: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
 msgctxt "IndicatorNotificationConfigWidget|"
 
 #: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
 msgctxt "IndicatorNotificationConfigWidget|"


@@ -3500,9 +4081,7 @@ msgctxt "IndicatorNotificationConfigWidget|"
 msgid ""
 "This enables support for the Ayatana Project's application indicator "
 "(libindicate)."
 msgid ""
 "This enables support for the Ayatana Project's application indicator "
 "(libindicate)."

-msgstr ""
-"Это включает поддержку индикатора приложения Ayatana Project's "
-"(libindicate)."
+msgstr "Это включает поддержку индикатора приложения Ayatana Project's (libindicate)."

 
 #: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
 msgctxt "IndicatorNotificationConfigWidget|"
 
 #: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
 msgctxt "IndicatorNotificationConfigWidget|"


@@ -3514,92 +4093,92 @@ msgctxt "InputWidget|"
 msgid "Form"
 msgstr "Форма"
 
 msgid "Form"
 msgstr "Форма"
 

-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75

 msgctxt "InputWidget|"
 msgid "White"
 msgstr "Белый"
 
 msgctxt "InputWidget|"
 msgid "White"
 msgstr "Белый"
 

-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75

 msgctxt "InputWidget|"
 msgid "Black"
 msgstr "Черный"
 
 msgctxt "InputWidget|"
 msgid "Black"
 msgstr "Черный"
 

-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75

 msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr "Темно-синий"
 
 msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr "Темно-синий"
 

-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75

 msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr "Темно-зеленый"
 
 msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr "Темно-зеленый"
 

-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75

 msgctxt "InputWidget|"
 msgid "Red"
 msgstr "Красный"
 
 msgctxt "InputWidget|"
 msgid "Red"
 msgstr "Красный"
 

-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75

 msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr "Темно-красный"
 
 msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr "Темно-красный"
 

-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75

 msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr "Фиолетовый"
 
 msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr "Фиолетовый"
 

-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:75

 msgctxt "InputWidget|"
 msgid "Orange"
 msgstr "Оранжевый"
 
 msgctxt "InputWidget|"
 msgid "Orange"
 msgstr "Оранжевый"
 

-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76

 msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr "Жёлтый"
 
 msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr "Жёлтый"
 

-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76

 msgctxt "InputWidget|"
 msgid "Green"
 msgstr "Зелёный"
 
 msgctxt "InputWidget|"
 msgid "Green"
 msgstr "Зелёный"
 

-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76

 msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr "Сине-зеленый"
 
 msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr "Сине-зеленый"
 

-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76

 msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr ""
 

-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76

 msgctxt "InputWidget|"
 msgid "Blue"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Blue"
 msgstr ""
 

-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76

 msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr "Фиолетовый"
 
 msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr "Фиолетовый"
 

-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76

 msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr "Темно-зеленый"
 
 msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr "Темно-зеленый"
 

-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:76

 msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr "Светло-серый"
 
 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 "Очистить цвет"
 
 msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr "Очистить цвет"
 

-#: ../src/qtui/inputwidget.cpp:132
+#: ../src/qtui/inputwidget.cpp:137

 msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr "Активировать строку ввода"
 msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr "Активировать строку ввода"


@@ -3646,92 +4225,107 @@ msgstr ""
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
 msgctxt "InputWidgetSettingsPage|"
 
 #: ../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"
 msgid "Multi-Line Editing"

-msgstr "Многострочное поле текста"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:160

 msgctxt "InputWidgetSettingsPage|"
 msgid "Show at most"
 msgstr "Показывать не более"
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show at most"
 msgstr "Показывать не более"
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:186

 msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
 msgstr "строк"
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
 msgstr "строк"
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:208

 msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
 msgstr "Включить прокрутку"
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
 msgstr "Включить прокрутку"
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:227

 msgctxt "InputWidgetSettingsPage|"
 msgid "Tab Completion"
 msgstr "Скопировать выделение"
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Tab Completion"
 msgstr "Скопировать выделение"
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235

 msgctxt "InputWidgetSettingsPage|"
 msgid "Completion suffix:"
 msgstr "Суффикс автодополнения:"
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Completion suffix:"
 msgstr "Суффикс автодополнения:"
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:251

 msgctxt "InputWidgetSettingsPage|"
 msgid ": "
 msgctxt "InputWidgetSettingsPage|"
 msgid ": "

-msgstr ": "
+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 ""
 
 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 "Интерфейс"
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24

 msgctxt "InputWidgetSettingsPage|"
 msgid "Input Widget"
 msgstr "Строкаввода"
 
 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 "Сохранить и соединиться"
 
 msgctxt "IrcConnectionWizard|"
 msgid "Save && Connect"
 msgstr "Сохранить и соединиться"
 

-#: ../src/client/irclistmodel.cpp:59
+#: ../src/client/irclistmodel.cpp:65

 msgctxt "IrcListModel|"
 msgid "Channel"
 msgstr "Канал"
 
 msgctxt "IrcListModel|"
 msgid "Channel"
 msgstr "Канал"
 

-#: ../src/client/irclistmodel.cpp:60
+#: ../src/client/irclistmodel.cpp:66

 msgctxt "IrcListModel|"
 msgid "Users"
 msgstr "Пользователи"
 
 msgctxt "IrcListModel|"
 msgid "Users"
 msgstr "Пользователи"
 

-#: ../src/client/irclistmodel.cpp:61
+#: ../src/client/irclistmodel.cpp:67

 msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr "Тема"
 
 msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr "Тема"
 

-#: ../src/client/networkmodel.cpp:806
+#: ../src/client/networkmodel.cpp:953

 msgctxt "IrcUserItem|"
 msgid " is away"
 msgstr "%1 отсутствует: \"%2\""
 
 msgctxt "IrcUserItem|"
 msgid " is away"
 msgstr "%1 отсутствует: \"%2\""
 

-#: ../src/client/networkmodel.cpp:821
+#: ../src/client/networkmodel.cpp:968

 #, qt-format
 msgctxt "IrcUserItem|"
 msgid "idling since %1"
 msgstr "неактивен с %1"
 
 #, 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"
 
 #, 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"
 #, qt-format
 msgctxt "IrcUserItem|"
 msgid "server: %1"


@@ -3786,7 +4380,7 @@ msgstr ""
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:345
 msgctxt "ItemViewSettingsPage|"
 msgid "..."
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:345
 msgctxt "ItemViewSettingsPage|"
 msgid "..."

-msgstr "..."
+msgstr ""

 
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:142
 msgctxt "ItemViewSettingsPage|"
 
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:142
 msgctxt "ItemViewSettingsPage|"


@@ -3808,11 +4402,6 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
 msgstr "Другая активность:"
 
 msgid "Other activity:"
 msgstr "Другая активность:"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:272
-msgctxt "ItemViewSettingsPage|"
-msgid "1"
-msgstr "1"
-

 #: ../src/qtui/settingspages/itemviewsettingspage.ui:286
 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:286
 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"


@@ -3828,505 +4417,541 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr "Отсутствует:"
 
 msgid "Away:"
 msgstr "Отсутствует:"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29

 msgctxt "ItemViewSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29

 msgctxt "ItemViewSettingsPage|"
 msgid "Chat & Nick Lists"
 msgstr "Чат & Ник Списки"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Chat & Nick Lists"
 msgstr "Чат & Ник Списки"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:34

 msgctxt "ItemViewSettingsPage|"
 msgid "Network"
 msgstr "Сеть:"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Network"
 msgstr "Сеть:"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37

 msgctxt "ItemViewSettingsPage|"
 msgid "Inactive"
 msgstr "Неактивно:"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Inactive"
 msgstr "Неактивно:"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38

 msgctxt "ItemViewSettingsPage|"
 msgid "Normal"
 msgstr ""
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Normal"
 msgstr ""
 

-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39

 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages"
 msgstr "Непрочитанные сообщения в чате"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages"
 msgstr "Непрочитанные сообщения в чате"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40

 msgctxt "ItemViewSettingsPage|"
 msgid "Highlight"
 msgstr "Подсветка"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Highlight"
 msgstr "Подсветка"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:41

 msgctxt "ItemViewSettingsPage|"
 msgid "Other activity"
 msgstr "Другая активность"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Other activity"
 msgstr "Другая активность"
 

-#: ../src/qtui/knotificationbackend.cpp:115
+#: ../src/qtui/knotificationbackend.cpp:139

 #, qt-format
 msgctxt "KNotificationBackend|"
 #, qt-format
 msgctxt "KNotificationBackend|"

-msgid "%n pending highlights"
-msgid_plural "%n pending highlights"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"

 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

+msgstr[3] ""

 
 

-#: ../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 ""
 
 msgctxt "KeySequenceButton|"
 msgid "The key you just pressed is not supported by Qt."
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+#: ../src/qtui/settingspages/keysequencewidget.cpp:81

 msgctxt "KeySequenceButton|"
 msgid "Unsupported Key"
 msgstr ""
 
 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 ""
 
 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 ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+#: ../src/qtui/settingspages/keysequencewidget.cpp:274

 msgctxt "KeySequenceWidget|Meta key"
 msgid "Meta"
 msgstr ""
 
 msgctxt "KeySequenceWidget|Meta key"
 msgid "Meta"
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+#: ../src/qtui/settingspages/keysequencewidget.cpp:275

 msgctxt "KeySequenceWidget|Ctrl key"
 msgid "Ctrl"
 msgstr ""
 
 msgctxt "KeySequenceWidget|Ctrl key"
 msgid "Ctrl"
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#: ../src/qtui/settingspages/keysequencewidget.cpp:276

 msgctxt "KeySequenceWidget|Alt key"
 msgid "Alt"
 msgstr "Все"
 
 msgctxt "KeySequenceWidget|Alt key"
 msgid "Alt"
 msgstr "Все"
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+#: ../src/qtui/settingspages/keysequencewidget.cpp:277

 msgctxt "KeySequenceWidget|Shift key"
 msgid "Shift"
 msgstr ""
 
 msgctxt "KeySequenceWidget|Shift key"
 msgid "Shift"
 msgstr ""
 

-#: ../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 "Строкаввода"
 
 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 "Нет"
 
 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 ""
 
 msgctxt "KeySequenceWidget|"
 msgid "Shortcut Conflict"
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+#: ../src/qtui/settingspages/keysequencewidget.cpp:384

 #, qt-format
 msgctxt "KeySequenceWidget|"
 msgid ""
 "The \"%1\" shortcut is already in use, and cannot be configured.\n"
 "Please choose another one."
 #, qt-format
 msgctxt "KeySequenceWidget|"
 msgid ""
 "The \"%1\" shortcut is already in use, and cannot be configured.\n"
 "Please choose another one."

-msgstr ""
-"Уже есть правило\n"
-"\"%1\"\n"
-"Пожалуйста выберите другое правило."
+msgstr "Уже есть правило\n\"%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 ""
 
 #, qt-format
 msgctxt "KeySequenceWidget|"
 msgid ""
 "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
 msgstr ""
 

-#: ../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 ""
 
 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 ""
 
 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 "Общие"
 
 msgctxt "MainWin|"
 msgid "General"
 msgstr "Общие"
 

-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:360

 msgctxt "MainWin|"
 msgid "&Connect to Core..."
 msgstr "&Подключиться к ядру..."
 
 msgctxt "MainWin|"
 msgid "&Connect to Core..."
 msgstr "&Подключиться к ядру..."
 

-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:362

 msgctxt "MainWin|"
 msgid "&Disconnect from Core"
 msgstr "&Отключиться от ядра"
 
 msgctxt "MainWin|"
 msgid "&Disconnect from Core"
 msgstr "&Отключиться от ядра"
 

-#: ../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 "&Инфромация ядра..."
 
 msgctxt "MainWin|"
 msgid "Core &Info..."
 msgstr "&Инфромация ядра..."
 

-#: ../src/qtui/mainwin.cpp:321
+#: ../src/qtui/mainwin.cpp:368

 msgctxt "MainWin|"
 msgid "Configure &Networks..."
 msgstr "Настроить &сети..."
 
 msgctxt "MainWin|"
 msgid "Configure &Networks..."
 msgstr "Настроить &сети..."
 

-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:371

 msgctxt "MainWin|"
 msgid "&Quit"
 msgstr "В&ыход"
 
 msgctxt "MainWin|"
 msgid "&Quit"
 msgstr "В&ыход"
 

-#: ../src/qtui/mainwin.cpp:328
+#: ../src/qtui/mainwin.cpp:375

 msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
 msgstr "&Настройка Списка Чата"
 
 msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
 msgstr "&Настройка Списка Чата"
 

-#: ../src/qtui/mainwin.cpp:331
+#: ../src/qtui/mainwin.cpp:378

 msgctxt "MainWin|"
 msgid "&Lock Layout"
 msgstr "&Блокировать расположение"
 
 msgctxt "MainWin|"
 msgid "&Lock Layout"
 msgstr "&Блокировать расположение"
 

-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:382

 msgctxt "MainWin|"
 msgid "Show &Search Bar"
 msgstr "Показать строку &поиска"
 
 msgctxt "MainWin|"
 msgid "Show &Search Bar"
 msgstr "Показать строку &поиска"
 

-#: ../src/qtui/mainwin.cpp:337
+#: ../src/qtui/mainwin.cpp:384

 msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr "Показать журнал отсутствия"
 
 msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr "Показать журнал отсутствия"
 

-#: ../src/qtui/mainwin.cpp:339
+#: ../src/qtui/mainwin.cpp:386

 msgctxt "MainWin|"
 msgid "Show &Menubar"
 msgstr "Показать строку &поиска"
 
 msgctxt "MainWin|"
 msgid "Show &Menubar"
 msgstr "Показать строку &поиска"
 

-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:389

 msgctxt "MainWin|"
 msgid "Show Status &Bar"
 msgstr "Показать строку &статуса"
 
 msgctxt "MainWin|"
 msgid "Show Status &Bar"
 msgstr "Показать строку &статуса"
 

-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:395

 msgctxt "MainWin|"
 msgid "&Full Screen Mode"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&Full Screen Mode"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:355
+#: ../src/qtui/mainwin.cpp:402

 msgctxt "MainWin|"
 msgid "Configure &Shortcuts..."
 msgstr "Настроить &сети..."
 
 msgctxt "MainWin|"
 msgid "Configure &Shortcuts..."
 msgstr "Настроить &сети..."
 

-#: ../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..."
 
 msgctxt "MainWin|"
 msgid "&Configure Quassel..."
 msgstr "&Настройки Quassel..."
 

-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:418

 msgctxt "MainWin|"
 msgid "&About Quassel"
 msgstr "&О Quassel"
 
 msgctxt "MainWin|"
 msgid "&About Quassel"
 msgstr "&О Quassel"
 

-#: ../src/qtui/mainwin.cpp:376
+#: ../src/qtui/mainwin.cpp:423

 msgctxt "MainWin|"
 msgid "About &Qt"
 msgstr "О &Qt"
 
 msgctxt "MainWin|"
 msgid "About &Qt"
 msgstr "О &Qt"
 

-#: ../src/qtui/mainwin.cpp:380
+#: ../src/qtui/mainwin.cpp:427

 msgctxt "MainWin|"
 msgid "Debug &NetworkModel"
 msgstr "Отладить &NetworkModel"
 
 msgctxt "MainWin|"
 msgid "Debug &NetworkModel"
 msgstr "Отладить &NetworkModel"
 

-#: ../src/qtui/mainwin.cpp:382
+#: ../src/qtui/mainwin.cpp:429

 msgctxt "MainWin|"
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:431

 msgctxt "MainWin|"
 msgid "Debug &MessageModel"
 msgstr "Отладить &MessageModel"
 
 msgctxt "MainWin|"
 msgid "Debug &MessageModel"
 msgstr "Отладить &MessageModel"
 

-#: ../src/qtui/mainwin.cpp:386
+#: ../src/qtui/mainwin.cpp:433

 msgctxt "MainWin|"
 msgid "Debug &HotList"
 msgstr "&Журнал отладки"
 
 msgctxt "MainWin|"
 msgid "Debug &HotList"
 msgstr "&Журнал отладки"
 

-#: ../src/qtui/mainwin.cpp:388
+#: ../src/qtui/mainwin.cpp:435

 msgctxt "MainWin|"
 msgid "Debug &Log"
 msgstr "&Журнал отладки"
 
 msgctxt "MainWin|"
 msgid "Debug &Log"
 msgstr "&Журнал отладки"
 

-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:437

 msgctxt "MainWin|"
 msgid "Reload Stylesheet"
 msgstr "Использовать свою таблицу стилей"
 
 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 "Организация:"
 
 msgctxt "MainWin|"
 msgid "Navigation"
 msgstr "Организация:"
 

-#: ../src/qtui/mainwin.cpp:396
+#: ../src/qtui/mainwin.cpp:446

 msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr ""
 
 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 ""
 
 msgctxt "MainWin|"
 msgid "Set Quick Access #0"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:410
+#: ../src/qtui/mainwin.cpp:460

 msgctxt "MainWin|"
 msgid "Set Quick Access #1"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Set Quick Access #1"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:412
+#: ../src/qtui/mainwin.cpp:462

 msgctxt "MainWin|"
 msgid "Set Quick Access #2"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Set Quick Access #2"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:464

 msgctxt "MainWin|"
 msgid "Set Quick Access #3"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Set Quick Access #3"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:416
+#: ../src/qtui/mainwin.cpp:466

 msgctxt "MainWin|"
 msgid "Set Quick Access #4"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Set Quick Access #4"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:418
+#: ../src/qtui/mainwin.cpp:468

 msgctxt "MainWin|"
 msgid "Set Quick Access #5"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Set Quick Access #5"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:420
+#: ../src/qtui/mainwin.cpp:470

 msgctxt "MainWin|"
 msgid "Set Quick Access #6"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Set Quick Access #6"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:472

 msgctxt "MainWin|"
 msgid "Set Quick Access #7"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Set Quick Access #7"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:424
+#: ../src/qtui/mainwin.cpp:474

 msgctxt "MainWin|"
 msgid "Set Quick Access #8"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Set Quick Access #8"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:426
+#: ../src/qtui/mainwin.cpp:476

 msgctxt "MainWin|"
 msgid "Set Quick Access #9"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Set Quick Access #9"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:429
+#: ../src/qtui/mainwin.cpp:479

 msgctxt "MainWin|"
 msgid "Quick Access #0"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Quick Access #0"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:431
+#: ../src/qtui/mainwin.cpp:481

 msgctxt "MainWin|"
 msgid "Quick Access #1"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Quick Access #1"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:433
+#: ../src/qtui/mainwin.cpp:483

 msgctxt "MainWin|"
 msgid "Quick Access #2"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Quick Access #2"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:435
+#: ../src/qtui/mainwin.cpp:485

 msgctxt "MainWin|"
 msgid "Quick Access #3"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Quick Access #3"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:437
+#: ../src/qtui/mainwin.cpp:487

 msgctxt "MainWin|"
 msgid "Quick Access #4"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Quick Access #4"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:439
+#: ../src/qtui/mainwin.cpp:489

 msgctxt "MainWin|"
 msgid "Quick Access #5"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Quick Access #5"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:441
+#: ../src/qtui/mainwin.cpp:491

 msgctxt "MainWin|"
 msgid "Quick Access #6"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Quick Access #6"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:443
+#: ../src/qtui/mainwin.cpp:493

 msgctxt "MainWin|"
 msgid "Quick Access #7"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Quick Access #7"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:445
+#: ../src/qtui/mainwin.cpp:495

 msgctxt "MainWin|"
 msgid "Quick Access #8"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Quick Access #8"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:447
+#: ../src/qtui/mainwin.cpp:497

 msgctxt "MainWin|"
 msgid "Quick Access #9"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Quick Access #9"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:451
+#: ../src/qtui/mainwin.cpp:501

 msgctxt "MainWin|"
 msgid "Activate Next Chat List"
 msgstr "Удалить Чатлист?"
 
 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 ""
 
 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 "Войти в Чат"
 
 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 "Войти в Чат"
 
 msgctxt "MainWin|"
 msgid "Go to Previous Chat"
 msgstr "Войти в Чат"
 

-#: ../src/qtui/mainwin.cpp:464
+#: ../src/qtui/mainwin.cpp:516

 msgctxt "MainWin|"
 msgid "&File"
 msgstr "&Файл"
 
 msgctxt "MainWin|"
 msgid "&File"
 msgstr "&Файл"
 

-#: ../src/qtui/mainwin.cpp:477
+#: ../src/qtui/mainwin.cpp:529

 msgctxt "MainWin|"
 msgid "&Networks"
 msgstr "&Сети"
 
 msgctxt "MainWin|"
 msgid "&Networks"
 msgstr "&Сети"
 

-#: ../src/qtui/mainwin.cpp:483
+#: ../src/qtui/mainwin.cpp:535

 msgctxt "MainWin|"
 msgid "&View"
 msgstr "&Вид"
 
 msgctxt "MainWin|"
 msgid "&View"
 msgstr "&Вид"
 

-#: ../src/qtui/mainwin.cpp:484
+#: ../src/qtui/mainwin.cpp:536

 msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr "&Список Чатов"
 
 msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr "&Список Чатов"
 

-#: ../src/qtui/mainwin.cpp:486
+#: ../src/qtui/mainwin.cpp:538

 msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr "Па&нели"
 
 msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr "Па&нели"
 

-#: ../src/qtui/mainwin.cpp:500
+#: ../src/qtui/mainwin.cpp:552

 msgctxt "MainWin|"
 msgid "&Settings"
 msgstr "&Настройки"
 
 msgctxt "MainWin|"
 msgid "&Settings"
 msgstr "&Настройки"
 

-#: ../src/qtui/mainwin.cpp:509
+#: ../src/qtui/mainwin.cpp:562

 msgctxt "MainWin|"
 msgid "&Help"
 msgstr "&Помощь"
 
 msgctxt "MainWin|"
 msgid "&Help"
 msgstr "&Помощь"
 

-#: ../src/qtui/mainwin.cpp:517
+#: ../src/qtui/mainwin.cpp:571

 msgctxt "MainWin|"
 msgid "Debug"
 msgstr "Отладка"
 
 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 "Ники"
 
 msgctxt "MainWin|"
 msgid "Nicks"
 msgstr "Ники"
 

-#: ../src/qtui/mainwin.cpp:755
+#: ../src/qtui/mainwin.cpp:872

 msgctxt "MainWin|"
 msgid "Show Nick List"
 msgstr "Показать список ников"
 
 msgctxt "MainWin|"
 msgid "Show Nick List"
 msgstr "Показать список ников"
 

-#: ../src/qtui/mainwin.cpp:766
+#: ../src/qtui/mainwin.cpp:885

 msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr "Монитор чата"
 
 msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr "Монитор чата"
 

-#: ../src/qtui/mainwin.cpp:778
+#: ../src/qtui/mainwin.cpp:897

 msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr "Показать монитор чата"
 
 msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr "Показать монитор чата"
 

-#: ../src/qtui/mainwin.cpp:782
+#: ../src/qtui/mainwin.cpp:903

 msgctxt "MainWin|"
 msgid "Inputline"
 msgstr "Строкаввода"
 
 msgctxt "MainWin|"
 msgid "Inputline"
 msgstr "Строкаввода"
 

-#: ../src/qtui/mainwin.cpp:791
+#: ../src/qtui/mainwin.cpp:912

 msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr "Показать строку ввода"
 
 msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr "Показать строку ввода"
 

-#: ../src/qtui/mainwin.cpp:804
+#: ../src/qtui/mainwin.cpp:927

 msgctxt "MainWin|"
 msgid "Topic"
 msgstr "Тема"
 
 msgctxt "MainWin|"
 msgid "Topic"
 msgstr "Тема"
 

-#: ../src/qtui/mainwin.cpp:816
+#: ../src/qtui/mainwin.cpp:939

 msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr "Показать строку темы"
 
 msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr "Показать строку темы"
 

-#: ../src/qtui/mainwin.cpp:894
+#: ../src/qtui/mainwin.cpp:1033

 msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr "Па&нели"
 
 msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr "Па&нели"
 

-#: ../src/qtui/mainwin.cpp:933
+#: ../src/qtui/mainwin.cpp:1097

 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr "Соединение с ядром установлено."
 
 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 "Нет соединения с ядром."
 
 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 "Незашифрованное Подключение"
 
 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>"
 
 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 ""
 
 msgctxt "MainWin|"
 msgid ""
 "Sensitive data, like passwords, will be transmitted unencrypted to your "
 "Quassel core."
 msgstr ""
 

-#: ../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>"
 
 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 "Недоверяемый Сертификат Безопасности"
 
 msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr "Недоверяемый Сертификат Безопасности"
 

-#: ../src/qtui/mainwin.cpp:1064
+#: ../src/qtui/mainwin.cpp:1244

 #, qt-format
 msgctxt "MainWin|"
 msgid ""
 #, qt-format
 msgctxt "MainWin|"
 msgid ""


@@ -4334,38 +4959,38 @@ msgid ""
 "following reasons:</b>"
 msgstr ""
 
 "following reasons:</b>"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1067
+#: ../src/qtui/mainwin.cpp:1247

 msgctxt "MainWin|"
 msgid "Continue"
 msgstr "Продолжить"
 
 msgctxt "MainWin|"
 msgid "Continue"
 msgstr "Продолжить"
 

-#: ../src/qtui/mainwin.cpp:1068
+#: ../src/qtui/mainwin.cpp:1248

 msgctxt "MainWin|"
 msgid "Show Certificate"
 msgstr "Показать Сертификаты"
 
 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 ""
 
 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 "Только Текущий Сеанс"
 
 msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr "Только Текущий Сеанс"
 

-#: ../src/qtui/mainwin.cpp:1087
+#: ../src/qtui/mainwin.cpp:1268

 msgctxt "MainWin|"
 msgid "Forever"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Forever"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1096
+#: ../src/qtui/mainwin.cpp:1279

 msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr "Основная Ошибка Подключения"
 
 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"
 #, qt-format
 msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"


@@ -4381,16 +5006,17 @@ msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr "Получаю журнал"
 
 msgid "Receiving Backlog"
 msgstr "Получаю журнал"
 

-#: ../src/uisupport/multilineedit.cpp:661
+#: ../src/uisupport/multilineedit.cpp:701

 #, qt-format
 msgctxt "MultiLineEdit|"
 #, qt-format
 msgctxt "MultiLineEdit|"

-msgid "Do you really want to paste %n lines?"
-msgid_plural "Do you really want to paste %n lines?"
+msgid "Do you really want to paste %n line(s)?"
+msgid_plural "Do you really want to paste %n line(s)?"

 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

+msgstr[3] ""

 
 

-#: ../src/uisupport/multilineedit.cpp:670
+#: ../src/uisupport/multilineedit.cpp:714

 msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr "Защита при вставке"
 msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr "Защита при вставке"


@@ -4450,101 +5076,98 @@ msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
 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 "Добавить сеть"
 
 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"
 #, qt-format
 msgctxt "NetworkItem|"
 msgid "Server: %1"

-msgstr "Сервер: %1"
+msgstr ""

 
 

-#: ../src/client/networkmodel.cpp:197
+#: ../src/client/networkmodel.cpp:221

 #, qt-format
 msgctxt "NetworkItem|"
 msgid "Users: %1"
 #, qt-format
 msgctxt "NetworkItem|"
 msgid "Users: %1"

-msgstr "Пользователи: %1"
+msgstr ""

 
 

-#: ../src/client/networkmodel.cpp:200
+#: ../src/client/networkmodel.cpp:224

 #, qt-format
 msgctxt "NetworkItem|"
 msgid "Lag: %1 msecs"
 #, qt-format
 msgctxt "NetworkItem|"
 msgid "Lag: %1 msecs"

-msgstr ""
+msgstr "Лаг: %1 мс"

 
 

-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:1002

 msgctxt "NetworkModel|"
 msgid "Chat"
 msgstr "Вид Окна Чата"
 
 msgctxt "NetworkModel|"
 msgid "Chat"
 msgstr "Вид Окна Чата"
 

-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:1002

 msgctxt "NetworkModel|"
 msgid "Topic"
 msgstr "Тема"
 
 msgctxt "NetworkModel|"
 msgid "Topic"
 msgstr "Тема"
 

-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:1002

 msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr "Ников"
 
 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] ""
 msgstr[1] ""
 msgstr[2] ""
 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] ""
 msgstr[1] ""
 msgstr[2] ""

+msgstr[3] ""

 
 

-#: ../src/uisupport/networkmodelcontroller.cpp:167
+#: ../src/uisupport/networkmodelcontroller.cpp:190

 #, qt-format
 msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr "... и <b> %1 </b> больше <br> <br>"
 
 #, qt-format
 msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr "... и <b> %1 </b> больше <br> <br>"
 

-#: ../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."
 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> Это удалит все соответствующие данные, включае весь "
-"журнал, из базы данных ядра без возможности отмены."
+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."
 msgctxt "NetworkModelController|"
 msgid ""
 "<br>Active channel buffers cannot be deleted, please part the channel first."

-msgstr ""
-"<br>Нельзя удалить буферы активных каналов. Пожалуйста, сначала покиньте "
-"канал."
+msgstr "<br>Нельзя удалить буферы активных каналов. Пожалуйста, сначала покиньте канал."

 
 

-#: ../src/uisupport/networkmodelcontroller.cpp:172
+#: ../src/uisupport/networkmodelcontroller.cpp:195

 msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr "Удалить буфера навсегда?"
 
 msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr "Удалить буфера навсегда?"
 

-#: ../src/uisupport/networkmodelcontroller.cpp:484
+#: ../src/uisupport/networkmodelcontroller.cpp:544

 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr "Зайти на канал"
 
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr "Зайти на канал"
 

-#: ../src/uisupport/networkmodelcontroller.cpp:487
+#: ../src/uisupport/networkmodelcontroller.cpp:547

 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Network:"
 msgstr "Сеть:"
 
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Network:"
 msgstr "Сеть:"
 

-#: ../src/uisupport/networkmodelcontroller.cpp:489
+#: ../src/uisupport/networkmodelcontroller.cpp:549

 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr "Канал:"
 
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr "Канал:"
 

-#: ../src/uisupport/networkmodelcontroller.cpp:491
+#: ../src/uisupport/networkmodelcontroller.cpp:551

 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Password:"
 msgstr "Пароль:"
 
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Password:"
 msgstr "Пароль:"
 

-#: ../src/qtui/ircconnectionwizard.cpp:148
+#: ../src/qtui/ircconnectionwizard.cpp:159

 msgctxt "NetworkPage|"
 msgid "Setup Network Connection"
 msgstr "Настройка сетевого соединения"
 msgctxt "NetworkPage|"
 msgid "Setup Network Connection"
 msgstr "Настройка сетевого соединения"


@@ -4557,7 +5180,7 @@ msgstr "Форма"
 #: ../src/qtui/settingspages/networkssettingspage.ui:48
 msgctxt "NetworksSettingsPage|"
 msgid "Re&name..."
 #: ../src/qtui/settingspages/networkssettingspage.ui:48
 msgctxt "NetworksSettingsPage|"
 msgid "Re&name..."

-msgstr "Пере&именовать..."
+msgstr ""

 
 #: ../src/qtui/settingspages/networkssettingspage.ui:65
 #: ../src/qtui/settingspages/networkssettingspage.ui:235
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:65
 #: ../src/qtui/settingspages/networkssettingspage.ui:235


@@ -4569,7 +5192,7 @@ msgstr "Доб&авить..."
 #: ../src/qtui/settingspages/networkssettingspage.ui:252
 msgctxt "NetworksSettingsPage|"
 msgid "De&lete"
 #: ../src/qtui/settingspages/networkssettingspage.ui:252
 msgctxt "NetworksSettingsPage|"
 msgid "De&lete"

-msgstr "У&далить"
+msgstr ""

 
 #: ../src/qtui/settingspages/networkssettingspage.ui:124
 msgctxt "NetworksSettingsPage|"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:124
 msgctxt "NetworksSettingsPage|"


@@ -4586,7 +5209,7 @@ msgstr "Личность:"
 #: ../src/qtui/settingspages/networkssettingspage.ui:295
 msgctxt "NetworksSettingsPage|"
 msgid "..."
 #: ../src/qtui/settingspages/networkssettingspage.ui:295
 msgctxt "NetworksSettingsPage|"
 msgid "..."

-msgstr "..."
+msgstr ""

 
 #: ../src/qtui/settingspages/networkssettingspage.ui:190
 msgctxt "NetworksSettingsPage|"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:190
 msgctxt "NetworksSettingsPage|"


@@ -4623,9 +5246,7 @@ msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"

-msgstr ""
-"Настройка автоматического выполнения идентификационных или любых других "
-"команд при подключении к серверу"
+msgstr "Настройка автоматического выполнения идентификационных или любых других команд при подключении к серверу"

 
 #: ../src/qtui/settingspages/networkssettingspage.ui:346
 msgctxt "NetworksSettingsPage|"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:346
 msgctxt "NetworksSettingsPage|"


@@ -4637,9 +5258,7 @@ msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify a list of IRC commands to be executed upon connect.\n"
 "Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"
 msgid ""
 "Specify a list of IRC commands to be executed upon connect.\n"
 "Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"

-msgstr ""
-"Укажите список команд IRC, которые будут выполнены при подключении.\n"
-"Учтите, что Quassel автоматически входит на каналы, так что /join здесь нужен редко!"
+msgstr "Укажите список команд IRC, которые будут выполнены при подключении.\nУчтите, что Quassel автоматически входит на каналы, так что /join здесь нужен редко!"

 
 #: ../src/qtui/settingspages/networkssettingspage.ui:374
 msgctxt "NetworksSettingsPage|"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:374
 msgctxt "NetworksSettingsPage|"


@@ -4718,123 +5337,119 @@ msgctxt "NetworksSettingsPage|"
 msgid "Account:"
 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 "Кодировки"
 
 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"
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure advanced settings such as message encodings and automatic "
 "reconnect"

-msgstr ""
-"Настроить дополнительные параметры, такие как кодировки сообщений и "
-"автоматическое соединение"
+msgstr "Настроить дополнительные параметры, такие как кодировки сообщений и автоматическое соединение"

 
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:661
+#: ../src/qtui/settingspages/networkssettingspage.ui:671

 msgctxt "NetworksSettingsPage|"
 msgid "Control encodings for in- and outgoing messages"
 msgstr "Управление кодировками для входящих и исходящих сообщений"
 
 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 "Использовать свои кодировки"
 
 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."
 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 должен быть разумным выбором для большинства сетей."
+msgstr "Укажите кодировки, в которых будут отправляться ваши сообщения.\nUTF-8 должен быть разумным выбором для большинства сетей."

 
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:679
+#: ../src/qtui/settingspages/networkssettingspage.ui:689

 msgctxt "NetworksSettingsPage|"
 msgid "Send messages in:"
 msgstr "Отправлять сообщения в:"
 
 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."
 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."
+msgstr "Входящие сообщения, закодированные в Utf8, всегда будут обработаны как надо.\nЭти настройки затрагивают только сообщения не в кодировке Utf8."

 
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:710
+#: ../src/qtui/settingspages/networkssettingspage.ui:720

 msgctxt "NetworksSettingsPage|"
 msgid "Receive fallback:"
 msgstr "Альтернативная входящая кодировка:"
 
 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!"
 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!"
+msgstr "Это определяет кодировку контрольных сообщений, ников и названий серверов.\nЕсли только вы *действительно* не знаете что делаете, оставьте тут ISO-8859-1!"

 
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:741
+#: ../src/qtui/settingspages/networkssettingspage.ui:751

 msgctxt "NetworksSettingsPage|"
 msgid "Server encoding:"
 msgstr "Кодировка сервера:"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Server encoding:"
 msgstr "Кодировка сервера:"
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+#: ../src/qtui/settingspages/networkssettingspage.cpp:38

 msgctxt "NetworksSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
 msgctxt "NetworksSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+#: ../src/qtui/settingspages/networkssettingspage.cpp:38

 msgctxt "NetworksSettingsPage|"
 msgid "Networks"
 msgstr "Сети"
 
 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>"
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"

-msgstr ""
-"<b>Прежде чем сохранить настройки, необходимо устранить следующие "
-"проблемы:</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>"
 
 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>"
 
 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 "Некорректные настройки сети"
 
 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 "Удалить сеть?"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Delete Network?"
 msgstr "Удалить сеть?"
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:543
+#: ../src/qtui/settingspages/networkssettingspage.cpp:652

 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Do you really want to delete the network \"%1\" and all related settings, "
 "including the backlog?"
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Do you really want to delete the network \"%1\" and all related settings, "
 "including the backlog?"

-msgstr ""
-"Действительно удалить сеть \"%1\" и все сопутствующие данные, включая "
-"журнал?"
+msgstr "Действительно удалить сеть \"%1\" и все сопутствующие данные, включая журнал?"

 
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
 msgctxt "NickEditDlg|"
 
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
 msgctxt "NickEditDlg|"


@@ -4851,11 +5466,9 @@ msgctxt "NickEditDlg|"
 msgid ""
 "A valid nickname may contain letters from the English alphabet, digits, and "
 "the special characters {, }, [, ], \\, |, `, ^, _ and -."
 msgid ""
 "A valid nickname may contain letters from the English alphabet, digits, and "
 "the special characters {, }, [, ], \\, |, `, ^, _ and -."

-msgstr ""
-"Корректный ник может содержать только буквы латинского алфавита, цифры и "
-"спецсимволы {, }, [, ], \\, |, `, ^, _ и -."
+msgstr "Корректный ник может содержать только буквы латинского алфавита, цифры и спецсимволы {, }, [, ], \\, |, `, ^, _ и -."

 
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:480

 msgctxt "NickEditDlg|"
 msgid "Add Nickname"
 msgstr "Добавить ник"
 msgctxt "NickEditDlg|"
 msgid "Add Nickname"
 msgstr "Добавить ник"


@@ -4870,7 +5483,52 @@ msgctxt "NotificationsSettingsPage|"
 msgid "Notifications"
 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 "Выбрать звуковой файл"
 msgctxt "PhononNotificationBackend::ConfigWidget|"
 msgid "Select Audio File"
 msgstr "Выбрать звуковой файл"


@@ -4896,257 +5554,266 @@ msgctxt "PhononNotificationConfigWidget|"
 msgid "Select the sound file to play"
 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 ""
 
 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 "Всего запрашиваю сообщений: %1 для буферов: %2"
 
 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
 msgstr "Всего запрашиваю сообщений: %1 для буферов: %2"
 

-#: ../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)"
 #, qt-format
 msgctxt "QObject|"
 msgid ""
 "Requesting up to %1 of all unread backlog messages (plus additional %2)"

-msgstr ""
-"Запрашиваю до %1 всех непрочитанных сообщений из журнала (и дополнительные "
-"%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"
 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"

-msgstr ""
-"Запрашиваю суммарно до %1 непрочитанных сообщений из журнала для %2 буферов"
+msgstr "Запрашиваю суммарно до %1 непрочитанных сообщений из журнала для %2 буферов"

 
 

-#: ../src/qtui/ircconnectionwizard.cpp:56
+#: ../src/qtui/ircconnectionwizard.cpp:57

 msgctxt "QObject|"
 msgid "Welcome to Quassel IRC"
 msgstr "Добро пожаловать в Quassel IRC"
 
 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 "
 "network connection.<br>This only covers basic settings. You can cancel this "
 "wizard any time and use the settings dialog for more detailed changes."
 msgctxt "QObject|"
 msgid ""
 "This wizard will help you to set up your default identity and your IRC "
 "network connection.<br>This only covers basic settings. You can cancel this "
 "wizard any time and use the settings dialog for more detailed changes."

-msgstr ""
-"Этот мастер поможет настроить личность по умолчанию и сетевое соединение с "
-"IRC.<br>Он устанавливает только базовые настройки. В любой момент можно "
-"отказаться от мастера и использовать окно настройки для более подробной "
-"конфигурации."
+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"
 
 #, 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"
 
 #, 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 ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:192
+#: ../src/uisupport/qssparser.cpp:204

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
 msgstr "Недопустимый тип сообщения в %1"
 
 #, 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 ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message type in %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:245
+#: ../src/uisupport/qssparser.cpp:257

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr "Недопустимое условие %1"
 
 #, 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"
 
 #, 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 ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:272
+#: ../src/uisupport/qssparser.cpp:285

 msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
 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"
 
 #, 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 ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:302
+#: ../src/uisupport/qssparser.cpp:318

 #, qt-format
 msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
 msgstr "Недопустимое условие %1"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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 ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:444
+#: ../src/uisupport/qssparser.cpp:468

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:451
+#: ../src/uisupport/qssparser.cpp:475

 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette color role: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette color role: %1"
 msgstr ""
 

-#: ../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"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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 ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font size specification: %1"
 msgstr ""
 

-#: ../src/common/util.cpp:145
+#: ../src/common/util.cpp:169

 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "год"
 
 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "год"
 

-#: ../src/common/util.cpp:146
+#: ../src/common/util.cpp:170

 msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr "день"
 
 msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr "день"
 

-#: ../src/common/util.cpp:147
+#: ../src/common/util.cpp:171

 msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr "ч"
 
 msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr "ч"
 

-#: ../src/common/util.cpp:148
+#: ../src/common/util.cpp:172

 msgctxt "Quassel::secondsToString()|"
 msgid "min"
 msgstr "мин"
 
 msgctxt "Quassel::secondsToString()|"
 msgid "min"
 msgstr "мин"
 

-#: ../src/common/util.cpp:149
+#: ../src/common/util.cpp:173

 msgctxt "Quassel::secondsToString()|"
 msgid "sec"
 msgstr "сек"
 
 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>"
 
 #, 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"
 
 #, 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"
 
 #, 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"
 
 #, 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/saveidentitiesdlg.ui:13
 msgctxt "SaveIdentitiesDlg|"
 msgid "Sync With Core"


@@ -5205,22 +5872,18 @@ msgstr "Версия SSL:"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:147
 msgctxt "ServerEditDlg|"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:147
 msgctxt "ServerEditDlg|"

-msgid ""
-"Do not change unless you're going to connect to a server not supporting "
-"SSLv3!"
+msgid "Use only TLSv1 unless you know what you are doing!"

 msgstr ""
 msgstr ""

-"Не меняйте, если не собираетесь подключаться к серверу, не поддерживающему "
-"SSLv3!"

 
 #: ../src/qtui/settingspages/servereditdlg.ui:151
 msgctxt "ServerEditDlg|"
 
 #: ../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|"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:156
 msgctxt "ServerEditDlg|"

-msgid "SSLv2"
-msgstr "SSLv2"
+msgid "SSLv2 (insecure)"
+msgstr ""

 
 #: ../src/qtui/settingspages/servereditdlg.ui:161
 msgctxt "ServerEditDlg|"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:161
 msgctxt "ServerEditDlg|"


@@ -5273,45 +5936,45 @@ msgid "Configure Quassel"
 msgstr "Настроить Quassel"
 
 #: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50
 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 "Настройки"
 
 msgctxt "SettingsDlg|"
 msgid "Settings"
 msgstr "Настройки"
 

-#: ../src/qtui/settingsdlg.cpp:109
+#: ../src/qtui/settingsdlg.cpp:121

 msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
 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 "В текущей вкладке есть несохранённые изменения. Применить их сейчас?"
 
 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"
 #, qt-format
 msgctxt "SettingsDlg|"
 msgid "Configure %1"

-msgstr ""
+msgstr "Настроить %1"

 
 

-#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingsdlg.cpp:220

 msgctxt "SettingsDlg|"
 msgid "Reload Settings"
 msgstr "Вернуть настройки"
 
 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 "Вернуть старый настройки, отменив все изменения на этой вкладке?"
 
 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 "Вернуть умолчания"
 
 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 "Вернуть параметры по-умолчанию для этой вкладки?"
 msgctxt "SettingsDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Вернуть параметры по-умолчанию для этой вкладки?"


@@ -5326,38 +5989,38 @@ msgctxt "SettingsPageDlg|"
 msgid "Settings"
 msgstr "Настройки"
 
 msgid "Settings"
 msgstr "Настройки"
 

-#: ../src/qtui/settingspagedlg.cpp:36
+#: ../src/qtui/settingspagedlg.cpp:38

 #, qt-format
 msgctxt "SettingsPageDlg|"
 msgid "Configure %1"
 #, qt-format
 msgctxt "SettingsPageDlg|"
 msgid "Configure %1"

-msgstr ""
+msgstr "Настроить %1"

 
 

-#: ../src/qtui/settingspagedlg.cpp:104
+#: ../src/qtui/settingspagedlg.cpp:119

 msgctxt "SettingsPageDlg|"
 msgid "Reload Settings"
 msgstr "Вернуть настройки"
 
 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 "Вернуть старый настройки, отменив все изменения на этой вкладке?"
 
 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 "Вернуть умолчания"
 
 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 "Вернуть параметры по-умолчанию для этой вкладки?"
 
 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 "Действие:"
 
 msgctxt "ShortcutsModel|"
 msgid "Action"
 msgstr "Действие:"
 

-#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:123

 msgctxt "ShortcutsModel|"
 msgid "Shortcut"
 msgstr ""
 msgctxt "ShortcutsModel|"
 msgid "Shortcut"
 msgstr ""


@@ -5383,8 +6046,8 @@ msgid "Default:"
 msgstr "По умолчанию:"
 
 #: ../src/qtui/settingspages/shortcutssettingspage.ui:75
 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 "Нет"
 msgctxt "ShortcutsSettingsPage|"
 msgid "None"
 msgstr "Нет"


@@ -5394,37 +6057,17 @@ msgctxt "ShortcutsSettingsPage|"
 msgid "Custom:"
 msgstr "Пользовательские цвета"
 
 msgid "Custom:"
 msgstr "Пользовательские цвета"
 

-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65

 msgctxt "ShortcutsSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 
 msgctxt "ShortcutsSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 

-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65

 msgctxt "ShortcutsSettingsPage|"
 msgid "Shortcuts"
 msgstr ""
 
 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 "Отсоединяюсь"
 msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr "Отсоединяюсь"


@@ -5477,7 +6120,7 @@ msgstr "Удалить этот сервер из списка"
 #: ../src/qtui/ui/simplenetworkeditor.ui:139
 msgctxt "SimpleNetworkEditor|"
 msgid "De&lete"
 #: ../src/qtui/ui/simplenetworkeditor.ui:139
 msgctxt "SimpleNetworkEditor|"
 msgid "De&lete"

-msgstr "У&далить"
+msgstr ""

 
 #: ../src/qtui/ui/simplenetworkeditor.ui:165
 msgctxt "SimpleNetworkEditor|"
 
 #: ../src/qtui/ui/simplenetworkeditor.ui:165
 msgctxt "SimpleNetworkEditor|"


@@ -5488,7 +6131,7 @@ msgstr "Передвинуть вверх в списке"
 #: ../src/qtui/ui/simplenetworkeditor.ui:182
 msgctxt "SimpleNetworkEditor|"
 msgid "..."
 #: ../src/qtui/ui/simplenetworkeditor.ui:182
 msgctxt "SimpleNetworkEditor|"
 msgid "..."

-msgstr "..."
+msgstr ""

 
 #: ../src/qtui/ui/simplenetworkeditor.ui:179
 msgctxt "SimpleNetworkEditor|"
 
 #: ../src/qtui/ui/simplenetworkeditor.ui:179
 msgctxt "SimpleNetworkEditor|"


@@ -5505,11 +6148,44 @@ msgctxt "SimpleNetworkEditor|"
 msgid ""
 "A list of IRC channels you will join automatically after connecting to the "
 "network"
 msgid ""
 "A list of IRC channels you will join automatically after connecting to the "
 "network"

+msgstr "Список каналов IRC, на которые клиент будет автоматически заходить при подключении к сети"
+
+#: ../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 ""
 msgstr ""

-"Список каналов IRC, на которые клиент будет автоматически заходить при "
-"подключении к сети"

 
 

-#: ../src/core/sqlitestorage.cpp:52
+#: ../src/core/sqlitestorage.cpp:60

 msgctxt "SqliteStorage|"
 msgid ""
 "SQLite is a file-based database engine that does not require any setup. It "
 msgctxt "SqliteStorage|"
 msgid ""
 "SQLite is a file-based database engine that does not require any setup. It "


@@ -5517,12 +6193,7 @@ msgid ""
 "via network. Use SQLite if your Quassel Core should store its data on the "
 "same machine it is running on, and if you only expect a few users to use "
 "your core."
 "via network. Use SQLite if your Quassel Core should store its data on the "
 "same machine it is running on, and if you only expect a few users to use "
 "your core."

-msgstr ""
-"SQLite -- это основанная на файлах система управления базами данных, которая"
-" не требует никаких настроек. Она подходит для маленьких и средних баз "
-"данных, для которых не нужен доступ через сеть. Используйте SQLite, если "
-"ваше ядро Quassel должно хранить данные на той же машине, на которой "
-"запущено, и если вашим ядром не будет пользоваться много народу."
+msgstr "SQLite -- это основанная на файлах система управления базами данных, которая не требует никаких настроек. Она подходит для маленьких и средних баз данных, для которых не нужен доступ через сеть. Используйте SQLite, если ваше ядро Quassel должно хранить данные на той же машине, на которой запущено, и если вашим ядром не будет пользоваться много народу."

 
 #: ../src/qtui/ui/sslinfodlg.ui:14
 msgctxt "SslInfoDlg|"
 
 #: ../src/qtui/ui/sslinfodlg.ui:14
 msgctxt "SslInfoDlg|"


@@ -5614,47 +6285,48 @@ msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
 msgstr "<b>Пользователи:</b> %1"
 
 msgid "<b>Trusted:</b>"
 msgstr "<b>Пользователи:</b> %1"
 

-#: ../src/qtui/sslinfodlg.cpp:69
+#: ../src/qtui/sslinfodlg.cpp:71

 msgctxt "SslInfoDlg|"
 msgid "Yes"
 msgstr ""
 
 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 ""
 
 msgctxt "SslInfoDlg|"
 msgid "No, for the following reasons:<ul>"
 msgstr ""
 

-#: ../src/qtui/sslinfodlg.cpp:78
+#: ../src/qtui/sslinfodlg.cpp:80

 #, qt-format
 msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr ""
 
 #, qt-format
 msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr ""
 

-#: ../src/client/networkmodel.h:144
+#: ../src/client/networkmodel.h:151

 msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
 msgstr "Буфер состояния"
 
 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 ""
 
 msgctxt "SystemTray|"
 msgid "&Minimize"
 msgstr ""
 

-#: ../src/qtui/systemtray.cpp:94
+#: ../src/qtui/systemtray.cpp:102

 msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr ""
 
 msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr ""
 

-#: ../src/qtui/systraynotificationbackend.cpp:125
+#: ../src/qtui/systraynotificationbackend.cpp:141

 #, qt-format
 msgctxt "SystrayNotificationBackend|"
 #, qt-format
 msgctxt "SystrayNotificationBackend|"

-msgid "%n pending highlights"
-msgid_plural "%n pending highlights"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"

 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""

+msgstr[3] ""

 
 

-#: ../src/qtui/systraynotificationbackend.cpp:135
+#: ../src/qtui/systraynotificationbackend.cpp:155

 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr "Показывать свои сообщения"
 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr "Показывать свои сообщения"


@@ -5664,162 +6336,162 @@ msgctxt "TabCompleter|"
 msgid "Tab completion"
 msgstr ""
 
 msgid "Tab completion"
 msgstr ""
 

-#: ../src/qtui/taskbarnotificationbackend.cpp:68
+#: ../src/qtui/taskbarnotificationbackend.cpp:83

 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Activate dock entry, timeout:"
 msgstr "Активация дока, таймаут:"
 
 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 "Отметка на панели задач, таймаут:"
 
 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 "Неограничено"
 
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Unlimited"
 msgstr "Неограничено"
 

-#: ../src/qtui/taskbarnotificationbackend.cpp:79
+#: ../src/qtui/taskbarnotificationbackend.cpp:94

 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr " сек."
 
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr " сек."
 

-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:30

 msgctxt "ToolBarActionProvider|"
 msgid "Connect"
 msgstr "Соединиться"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Connect"
 msgstr "Соединиться"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:30

 msgctxt "ToolBarActionProvider|"
 msgid "Connect to IRC"
 msgstr "Соединиться с IRC"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Connect to IRC"
 msgstr "Соединиться с IRC"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:32
+#: ../src/uisupport/toolbaractionprovider.cpp:31

 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect"
 msgstr "Отсоединиться"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect"
 msgstr "Отсоединиться"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:32
+#: ../src/uisupport/toolbaractionprovider.cpp:31

 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
 msgstr "Отсоединиться от IRC"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
 msgstr "Отсоединиться от IRC"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:33

 msgctxt "ToolBarActionProvider|"
 msgid "Part"
 msgstr "Выйти"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Part"
 msgstr "Выйти"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:33

 msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
 msgstr "Покинуть выделенный канал"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
 msgstr "Покинуть выделенный канал"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:35
+#: ../src/uisupport/toolbaractionprovider.cpp:34

 msgctxt "ToolBarActionProvider|"
 msgid "Join"
 msgstr "Зайти"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Join"
 msgstr "Зайти"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:35
+#: ../src/uisupport/toolbaractionprovider.cpp:34

 msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr "Зайти на канал"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr "Зайти на канал"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:36

 msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr "Приват"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr "Приват"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:36

 msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr "Начать личную беседу"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr "Начать личную беседу"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:37

 msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:37

 msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr "Запросить информацию о пользователе"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr "Запросить информацию о пользователе"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:39

 msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr "Оп"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr "Оп"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:39

 msgctxt "ToolBarActionProvider|"
 msgid "Give operator privileges to user"
 msgstr "Дать пользователю статус оператора"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Give operator privileges to user"
 msgstr "Дать пользователю статус оператора"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:40

 msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr "Снять оп"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr "Снять оп"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:40

 msgctxt "ToolBarActionProvider|"
 msgid "Take operator privileges from user"
 msgstr "Снять статус оператора с пользователя"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Take operator privileges from user"
 msgstr "Снять статус оператора с пользователя"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:41

 msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr "Голос"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr "Голос"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:41

 msgctxt "ToolBarActionProvider|"
 msgid "Give voice to user"
 msgstr "Дать пользователю статус \"с голосом\""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Give voice to user"
 msgstr "Дать пользователю статус \"с голосом\""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:42

 msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr "Снять голос"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr "Снять голос"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:42

 msgctxt "ToolBarActionProvider|"
 msgid "Take voice from user"
 msgstr "Снять статус \"с голосом\" с пользователя"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Take voice from user"
 msgstr "Снять статус \"с голосом\" с пользователя"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:43

 msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr "Выгнать"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr "Выгнать"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:43

 msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
 msgstr "Удалить пользователя с канала"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
 msgstr "Удалить пользователя с канала"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:44

 msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr "Забанить"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr "Забанить"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:44

 msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
 msgstr "Запретить пользователю вход на канал"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
 msgstr "Запретить пользователю вход на канал"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:46
+#: ../src/uisupport/toolbaractionprovider.cpp:45

 msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
 msgstr "Выгнать"
 
 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 "Удалить пользователя с канала и запретить ему вход"
 
 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 "Подключиться ко всем"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Connect to all"
 msgstr "Подключиться ко всем"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:58
+#: ../src/uisupport/toolbaractionprovider.cpp:57

 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from all"
 msgstr "Отключиться от всех"
 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from all"
 msgstr "Отключиться от всех"


@@ -5832,19 +6504,19 @@ msgstr "Форма"
 #: ../src/qtui/ui/topicwidget.ui:79
 msgctxt "TopicWidget|"
 msgid "..."
 #: ../src/qtui/ui/topicwidget.ui:79
 msgctxt "TopicWidget|"
 msgid "..."

-msgstr "..."
+msgstr ""

 
 

-#: ../src/qtui/topicwidget.cpp:106
+#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128

 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Users: %1"
 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Users: %1"

-msgstr "Пользователи: %1"
+msgstr ""

 
 

-#: ../src/qtui/topicwidget.cpp:107
+#: ../src/qtui/topicwidget.cpp:123 ../src/qtui/topicwidget.cpp:129

 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Lag: %1 msecs"
 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Lag: %1 msecs"

-msgstr ""
+msgstr "Лаг: %1 мс"

 
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgctxt "TopicWidgetSettingsPage|"
 
 #: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
 msgctxt "TopicWidgetSettingsPage|"


@@ -5866,250 +6538,151 @@ msgctxt "TopicWidgetSettingsPage|"
 msgid "On hover only"
 msgstr ""
 
 msgid "On hover only"
 msgstr ""
 

-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24

 msgctxt "TopicWidgetSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 
 msgctxt "TopicWidgetSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 

-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24

 msgctxt "TopicWidgetSettingsPage|"
 msgid "Topic Widget"
 msgstr ""
 
 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 ../src/uisupport/uistyle.cpp:739
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "%1"
-msgstr ""
-
-#. Action Message
-#: ../src/uisupport/uistyle.cpp:583
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "%DN%1%DN %2"
-msgstr ""
-

 #. Nick Message
 #. 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 ""
 
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 

-#: ../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 ""
 
 #. Mode Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
 #. Mode Message

-#: ../src/uisupport/uistyle.cpp:592
+#: ../src/uisupport/uistyle.cpp:695

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "User mode: %DM%1%DM"
 msgstr ""
 
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "User mode: %DM%1%DM"
 msgstr ""
 

-#: ../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 ""
 
 #. Join Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. 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 ""
 
 #. Part Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. 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 ""
 
 #. Quit Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr ""
 
 #. 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 ""
 
 #. Kick Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr ""
 
 #. 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"
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"

-msgstr "%DN%1%DN бÑ\8bл вÑ\8bкинÑ\83Ñ\82 %DN%2%DN из %DC%3%DC"
+msgstr "%DN%1%DN вÑ\8bкинÑ\83л %DN%2%DN из %DC%3%DC"

 
 #. Day Change Message
 
 #. Day Change Message

-#: ../src/uisupport/uistyle.cpp:629
+#: ../src/uisupport/uistyle.cpp:731

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"

-msgstr ""
+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: "
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "

-msgstr ""
-"Нетсплит между %DH%1%DH и %DH%2%DH закончен. Пользователей присоединилось: "
+msgstr "Нетсплит между %DH%1%DH и %DH%2%DH закончен. Пользователей присоединилось: "

 
 

-#: ../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 ""
 
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN (%2 more)"
 msgstr ""
 

-#: ../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: "
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "

-msgstr "Нетсплит между %DH%1%DH и %DH%2%DH закончен. Пользователей вышло: "
-
-#: ../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/uisupport/uistyle.cpp:707
-msgctxt "UiStyle::StyledMessage|"
-msgid "-*-"
-msgstr "-*-"
-
-#: ../src/uisupport/uistyle.cpp:709
-msgctxt "UiStyle::StyledMessage|"
-msgid "<->"
-msgstr "<->"
-
-#: ../src/uisupport/uistyle.cpp:711
-msgctxt "UiStyle::StyledMessage|"
-msgid "***"
-msgstr "***"
-
-#: ../src/uisupport/uistyle.cpp:713
-msgctxt "UiStyle::StyledMessage|"
-msgid "-->"
-msgstr "-->"
-
-#: ../src/uisupport/uistyle.cpp:715 ../src/uisupport/uistyle.cpp:717
-msgctxt "UiStyle::StyledMessage|"
-msgid "<--"
-msgstr "<--"
-
-#: ../src/uisupport/uistyle.cpp:719
-msgctxt "UiStyle::StyledMessage|"
-msgid "<-*"
-msgstr "<-*"
-
-#: ../src/uisupport/uistyle.cpp:721
-msgctxt "UiStyle::StyledMessage|"
-msgid "<-x"
-msgstr "<-x"
-
-#: ../src/uisupport/uistyle.cpp:723 ../src/uisupport/uistyle.cpp:725
-#: ../src/uisupport/uistyle.cpp:727 ../src/uisupport/uistyle.cpp:731
-msgctxt "UiStyle::StyledMessage|"
-msgid "*"
-msgstr "*"
-
-#: ../src/uisupport/uistyle.cpp:729
-msgctxt "UiStyle::StyledMessage|"
-msgid "-"
-msgstr "-"
-
-#: ../src/uisupport/uistyle.cpp:733
-msgctxt "UiStyle::StyledMessage|"
-msgid "=>"
-msgstr "=>"
-
-#: ../src/uisupport/uistyle.cpp:735
-msgctxt "UiStyle::StyledMessage|"
-msgid "<="
-msgstr "<="
-
-#: ../src/uisupport/uistyle.cpp:737
-msgctxt "UiStyle::StyledMessage|"
-msgid "->"
-msgstr "->"
+msgstr "Нетсплит между %DH%1%DH и %DH%2%DH. Пользователей вышло: "

 
 

-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:825

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"

-msgstr[0] "%n Владелец(ы)"
-msgstr[1] "%n Владелец(ы)"
-msgstr[2] "%n Владелец(ы)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""

 
 

-#: ../src/client/networkmodel.cpp:698
+#: ../src/client/networkmodel.cpp:827

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"

-msgstr[0] "%n Админ(ов)"
-msgstr[1] "%n Админ(ов)"
-msgstr[2] "%n Админ(ов)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""

 
 

-#: ../src/client/networkmodel.cpp:699
+#: ../src/client/networkmodel.cpp:829

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"

-msgstr[0] "%n Оператор(ов)"
-msgstr[1] "%n Оператор(ов)"
-msgstr[2] "%n Оператор(ов)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""

 
 

-#: ../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)"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Half-Op(s)"
 msgid_plural "%n Half-Op(s)"

-msgstr[0] "%n Half-Оп(ов)"
-msgstr[1] "%n Half-Оп(ов)"
-msgstr[2] "%n Half-Оп(ов)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""

 
 

-#: ../src/client/networkmodel.cpp:701
+#: ../src/client/networkmodel.cpp:833

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Voiced"
 msgid_plural "%n Voiced"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Voiced"
 msgid_plural "%n Voiced"

-msgstr[0] "%n Голос(ов)"
-msgstr[1] "%n Голос(ов)"
-msgstr[2] "%n Голос(ов)"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""

 
 

-#: ../src/client/networkmodel.cpp:702
+#: ../src/client/networkmodel.cpp:835

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n User(s)"
 msgid_plural "%n User(s)"

-msgstr[0] "%n Владелец(ы)"
-msgstr[1] "%n Владелец(ы)"
-msgstr[2] "%n Владелец(ы)"
-
-
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""