cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / po / ru.po

diff --git a/po/ru.po b/po/ru.po
index 1995727..26c734b 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,206 +1,890 @@
 # 
 # Translators:
 # 
 # Translators:

-# Daniel Albers <daniel@lbers.com>, 2011.
+# Andrei Stepanov, 2016
+# Andrei Stepanov <adem4ik@gmail.com>, 2016
+# Daniel Albers <daniel@lbers.com>, 2011
+# sfionov <fionov@gmail.com>, 2012
+# sfionov <fionov@gmail.com>, 2012
+# Svetlana Tkachenko <svetlana@members.fsf.org>, 2018
+# Viktor Suprun <popsul1993@gmail.com>, 2016
+# Yaroslav Veremenko <yaroslav@veremenko.info>, 2018

 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: 2021-01-12 04:21+0000\n"
+"Last-Translator: Daniel Albers <daniel@lbe.rs>\n"
+"Language-Team: Russian (http://www.transifex.com/quassel/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/qtui/ui/aboutdlg.ui:17
+#: ../src/uisupport/aboutdata.cpp:117
+msgctxt "AboutData|"
+msgid "Quassel IRC"
+msgstr "Quassel IRC"
+
+#: ../src/uisupport/aboutdata.cpp:120
+msgctxt "AboutData|"
+msgid "A modern, distributed IRC client"
+msgstr "Современный, распределённый IRC-клиент"
+
+#: ../src/uisupport/aboutdata.cpp:152
+msgctxt "AboutData|"
+msgid "Project founder, lead developer"
+msgstr "Основатель проекта, ведущий разработчик"
+
+#: ../src/uisupport/aboutdata.cpp:153
+msgctxt "AboutData|"
+msgid "Project motivator, lead developer"
+msgstr "Идейный вдохновитель, ведущий разработчик"
+
+#: ../src/uisupport/aboutdata.cpp:154
+msgctxt "AboutData|"
+msgid "Former lead developer"
+msgstr "Бывший ведущий разработчик"
+
+#: ../src/uisupport/aboutdata.cpp:155
+msgctxt "AboutData|"
+msgid "Master of Translation, many fixes and enhancements, Travis support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:156
+msgctxt "AboutData|"
+msgid "Many features, fixes and improvements"
+msgstr "Много нововведений, исправлений и улучшений"
+
+#: ../src/uisupport/aboutdata.cpp:157
+msgctxt "AboutData|"
+msgid "Many fixes and improvements, bug and patch triaging, community support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:158
+msgctxt "AboutData|"
+msgid ""
+"IRCv3 support, documentation, many other improvements, testing, outstanding "
+"PRs"
+msgstr "Поддержка IRCv3, документация, много разных улучшений, тестирование, выдающиеся пулл реквесты"
+
+#: ../src/uisupport/aboutdata.cpp:159
+msgctxt "AboutData|"
+msgid ""
+"Quasseldroid, architecture, (mobile) performance, many other improvements "
+"and fixes, testing"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:163
+msgctxt "AboutData|"
+msgid "OSX UI improvements"
+msgstr "Улучшения инетерфейса для OSX"
+
+#: ../src/uisupport/aboutdata.cpp:164 ../src/uisupport/aboutdata.cpp:177
+#: ../src/uisupport/aboutdata.cpp:203 ../src/uisupport/aboutdata.cpp:206
+#: ../src/uisupport/aboutdata.cpp:224 ../src/uisupport/aboutdata.cpp:233
+#: ../src/uisupport/aboutdata.cpp:257 ../src/uisupport/aboutdata.cpp:274
+#: ../src/uisupport/aboutdata.cpp:295 ../src/uisupport/aboutdata.cpp:334
+msgctxt "AboutData|"
+msgid "Fixes"
+msgstr "Исправления"
+
+#: ../src/uisupport/aboutdata.cpp:165 ../src/uisupport/aboutdata.cpp:182
+msgctxt "AboutData|"
+msgid "Chatview improvements"
+msgstr "Улучшения интерфейса чата"
+
+#: ../src/uisupport/aboutdata.cpp:166
+msgctxt "AboutData|"
+msgid "Early beta tester and bughunter, Danish translation"
+msgstr "Тестер ранней бета версии и багхантер, датский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:167 ../src/uisupport/aboutdata.cpp:248
+#: ../src/uisupport/aboutdata.cpp:279 ../src/uisupport/aboutdata.cpp:291
+msgctxt "AboutData|"
+msgid "Spanish translation"
+msgstr "Испанский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:168
+msgctxt "AboutData|"
+msgid "Build system fixes"
+msgstr "Исправления системы сборки"
+
+#: ../src/uisupport/aboutdata.cpp:169 ../src/uisupport/aboutdata.cpp:316
+msgctxt "AboutData|"
+msgid "Database performance improvements"
+msgstr "Улучшение производительности базы данных"
+
+#: ../src/uisupport/aboutdata.cpp:170
+msgctxt "AboutData|"
+msgid "UI improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:171
+msgctxt "AboutData|"
+msgid "Tray icon fix"
+msgstr "Исправление иконки в трее"
+
+#: ../src/uisupport/aboutdata.cpp:172
+msgctxt "AboutData|"
+msgid "Language improvements"
+msgstr "Языковые улучшения"
+
+#: ../src/uisupport/aboutdata.cpp:173 ../src/uisupport/aboutdata.cpp:314
+msgctxt "AboutData|"
+msgid "Documentation improvements"
+msgstr "Улучшения документации"
+
+#: ../src/uisupport/aboutdata.cpp:174 ../src/uisupport/aboutdata.cpp:193
+msgctxt "AboutData|"
+msgid "Various improvements"
+msgstr "Различные улучшения"
+
+#: ../src/uisupport/aboutdata.cpp:175 ../src/uisupport/aboutdata.cpp:284
+msgctxt "AboutData|"
+msgid "Brazilian translation"
+msgstr "Бразильский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:176 ../src/uisupport/aboutdata.cpp:251
+msgctxt "AboutData|"
+msgid "Slovenian translation"
+msgstr "Словенский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:178 ../src/uisupport/aboutdata.cpp:307
+msgctxt "AboutData|"
+msgid "Romanian translation"
+msgstr "Румынский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:179
+msgctxt "AboutData|"
+msgid "Punjabi translation"
+msgstr "Панджабский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:180 ../src/uisupport/aboutdata.cpp:243
+#: ../src/uisupport/aboutdata.cpp:259 ../src/uisupport/aboutdata.cpp:260
+msgctxt "AboutData|"
+msgid "Finnish translation"
+msgstr "Финский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:181
+msgctxt "AboutData|"
+msgid "Message indicator support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:183 ../src/uisupport/aboutdata.cpp:184
+#: ../src/uisupport/aboutdata.cpp:333
+msgctxt "AboutData|"
+msgid "Build system fix"
+msgstr "Исправление системы сборки"
+
+#: ../src/uisupport/aboutdata.cpp:185
+msgctxt "AboutData|"
+msgid "Windows build system fixes"
+msgstr "Иправление системы сборки для Windows"
+
+#: ../src/uisupport/aboutdata.cpp:186
+msgctxt "AboutData|"
+msgid "AppData metadata, LDAP support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:187
+msgctxt "AboutData|"
+msgid "Nicer tooltips, spell check and other improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:188
+msgctxt "AboutData|"
+msgid "Crash fixes"
+msgstr "Исправление падений"
+
+#: ../src/uisupport/aboutdata.cpp:189 ../src/uisupport/aboutdata.cpp:214
+#: ../src/uisupport/aboutdata.cpp:296
+msgctxt "AboutData|"
+msgid "French translation"
+msgstr "Французский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:190
+msgctxt "AboutData|"
+msgid "Occitan translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:191
+msgctxt "AboutData|"
+msgid "Usability review"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:192
+msgctxt "AboutData|"
+msgid "SASL support"
+msgstr "Поддержка SASL"
+
+#: ../src/uisupport/aboutdata.cpp:194 ../src/uisupport/aboutdata.cpp:195
+#: ../src/uisupport/aboutdata.cpp:200
+msgctxt "AboutData|"
+msgid "Various fixes and improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:196
+msgctxt "AboutData|"
+msgid "Settings fixes"
+msgstr "Исправление окна настроек"
+
+#: ../src/uisupport/aboutdata.cpp:197 ../src/uisupport/aboutdata.cpp:278
+msgctxt "AboutData|"
+msgid "Galician translation"
+msgstr "Галицкий перевод"
+
+#: ../src/uisupport/aboutdata.cpp:198 ../src/uisupport/aboutdata.cpp:325
+msgctxt "AboutData|"
+msgid "Esperanto translation"
+msgstr "Перевод на эсперанто"
+
+#: ../src/uisupport/aboutdata.cpp:199
+msgctxt "AboutData|"
+msgid "Japanese translation"
+msgstr "Японский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:201 ../src/uisupport/aboutdata.cpp:281
+msgctxt "AboutData|"
+msgid "Gentoo maintainer"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:202 ../src/uisupport/aboutdata.cpp:218
+#: ../src/uisupport/aboutdata.cpp:328
+msgctxt "AboutData|"
+msgid "Certificate handling improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:204
+msgctxt "AboutData|"
+msgid "Early beta tester and bughunter (on Vista™!)"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:205
+msgctxt "AboutData|"
+msgid "Translation system fixes"
+msgstr "Исправления системы переводов"
+
+#: ../src/uisupport/aboutdata.cpp:207
+msgctxt "AboutData|"
+msgid "OSX Notification Center support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:208 ../src/uisupport/aboutdata.cpp:225
+#: ../src/uisupport/aboutdata.cpp:332 ../src/uisupport/aboutdata.cpp:339
+msgctxt "AboutData|"
+msgid "Turkish translation"
+msgstr "Турецкий перевод"
+
+#: ../src/uisupport/aboutdata.cpp:209 ../src/uisupport/aboutdata.cpp:276
+msgctxt "AboutData|"
+msgid "Mac fixes"
+msgstr "Исравления для Mac"
+
+#: ../src/uisupport/aboutdata.cpp:210
+msgctxt "AboutData|"
+msgid "D-Bus notifications"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:211
+msgctxt "AboutData|"
+msgid "Polish translation"
+msgstr "Польский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:212 ../src/uisupport/aboutdata.cpp:297
+msgctxt "AboutData|"
+msgid "Build system improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:213
+msgctxt "AboutData|"
+msgid "Formatting support and other input line improvements, many other fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:215
+msgctxt "AboutData|"
+msgid "BluesTheme stylesheet"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:216 ../src/uisupport/aboutdata.cpp:265
+#: ../src/uisupport/aboutdata.cpp:308 ../src/uisupport/aboutdata.cpp:329
+msgctxt "AboutData|"
+msgid "Russian translation"
+msgstr "Русский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:269
+msgctxt "AboutData|"
+msgid "Italian translation"
+msgstr "Итальянский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:219 ../src/uisupport/aboutdata.cpp:255
+#: ../src/uisupport/aboutdata.cpp:266 ../src/uisupport/aboutdata.cpp:270
+#: ../src/uisupport/aboutdata.cpp:273 ../src/uisupport/aboutdata.cpp:326
+msgctxt "AboutData|"
+msgid "German translation"
+msgstr "Немецкий перевод"
+
+#: ../src/uisupport/aboutdata.cpp:220
+msgctxt "AboutData|"
+msgid "Sanitize topic handling, twitch.tv support"
+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 "Улучшения парсера IRC"
+
+#: ../src/uisupport/aboutdata.cpp:226
+msgctxt "AboutData|"
+msgid "Windows build support and Appveyor maintenance, snorenotify backend"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:227
+msgctxt "AboutData|"
+msgid "Initial Qt5 support"
+msgstr "Начальная поддержка Qt5"
+
+#: ../src/uisupport/aboutdata.cpp:228
+msgctxt "AboutData|"
+msgid "{Ku|U}buntu packager, motivator, promoter"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:229
+msgctxt "AboutData|"
+msgid "Various features and improvements"
+msgstr "Можество улучшений и исправлений"
+
+#: ../src/uisupport/aboutdata.cpp:230 ../src/uisupport/aboutdata.cpp:231
+#: ../src/uisupport/aboutdata.cpp:242 ../src/uisupport/aboutdata.cpp:249
+#: ../src/uisupport/aboutdata.cpp:254 ../src/uisupport/aboutdata.cpp:272
+#: ../src/uisupport/aboutdata.cpp:288 ../src/uisupport/aboutdata.cpp:302
+msgctxt "AboutData|"
+msgid "Various fixes"
+msgstr "Различные исправления"
+
+#: ../src/uisupport/aboutdata.cpp:232 ../src/uisupport/aboutdata.cpp:236
+#: ../src/uisupport/aboutdata.cpp:294 ../src/uisupport/aboutdata.cpp:299
+#: ../src/uisupport/aboutdata.cpp:311
+msgctxt "AboutData|"
+msgid "Bugfixes"
+msgstr "Исправления багов"
+
+#: ../src/uisupport/aboutdata.cpp:234 ../src/uisupport/aboutdata.cpp:327
+#: ../src/uisupport/aboutdata.cpp:330
+msgctxt "AboutData|"
+msgid "Czech translation"
+msgstr "Чешский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:235
+msgctxt "AboutData|"
+msgid "Python improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:237
+msgctxt "AboutData|"
+msgid "Proxy improvements, Spanish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:238
+msgctxt "AboutData|"
+msgid "Postgres improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:239
+msgctxt "AboutData|"
+msgid "Postgres migration fixes"
+msgstr "Иправления миграции для Postgress"
+
+#: ../src/uisupport/aboutdata.cpp:240 ../src/uisupport/aboutdata.cpp:244
+#: ../src/uisupport/aboutdata.cpp:285
+msgctxt "AboutData|"
+msgid "Danish translation"
+msgstr "Датский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:241
+msgctxt "AboutData|"
+msgid "Context menu fixes"
+msgstr "Исправления контекстного меню"
+
+#: ../src/uisupport/aboutdata.cpp:245
+msgctxt "AboutData|"
+msgid "Many fixes and improvements, bug triaging"
+msgstr "Множество исправлений и улучшений, сортировка и анализ багов"
+
+#: ../src/uisupport/aboutdata.cpp:246
+msgctxt "AboutData|"
+msgid "Original \"All-Seeing Eye\" logo"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:247
+msgctxt "AboutData|"
+msgid "Project founder, various improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:250
+msgctxt "AboutData|"
+msgid "Serbian translation"
+msgstr "Сербский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:252
+msgctxt "AboutData|"
+msgid ""
+"Tireless tester, {Ku|U}buntu tester and lobbyist, liters of delicious "
+"Finnish alcohol"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:253
+msgctxt "AboutData|"
+msgid "Qt5 porting help, Travis CI setup"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:256
+msgctxt "AboutData|"
+msgid "Buffer merge improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:258 ../src/uisupport/aboutdata.cpp:312
+#: ../src/uisupport/aboutdata.cpp:313 ../src/uisupport/aboutdata.cpp:320
+#: ../src/uisupport/aboutdata.cpp:321
+msgctxt "AboutData|"
+msgid "Greek translation"
+msgstr "Греческий перевод"
+
+#: ../src/uisupport/aboutdata.cpp:261 ../src/uisupport/aboutdata.cpp:267
+#: ../src/uisupport/aboutdata.cpp:301 ../src/uisupport/aboutdata.cpp:331
+msgctxt "AboutData|"
+msgid "Improvements"
+msgstr "Улучшения"
+
+#: ../src/uisupport/aboutdata.cpp:262
+msgctxt "AboutData|"
+msgid "OSX improvements"
+msgstr "Улучшения для OSX"
+
+#: ../src/uisupport/aboutdata.cpp:263
+msgctxt "AboutData|"
+msgid "Lithuanian translation"
+msgstr "Литовский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:264
+msgctxt "AboutData|"
+msgid "Documentation fixes"
+msgstr "Исправления документации"
+
+#: ../src/uisupport/aboutdata.cpp:268
+msgctxt "AboutData|"
+msgid "Ideas, hacking, initial motivation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:271
+msgctxt "AboutData|"
+msgid "Many fixes and improvements, Sonnet support, QuasselDroid"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:275
+msgctxt "AboutData|"
+msgid "German translation, fixes"
+msgstr "Немецкий перевод, исправления"
+
+#: ../src/uisupport/aboutdata.cpp:277
+msgctxt "AboutData|"
+msgid "Many fixes and improvements; Ubuntu PPAs"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:280
+msgctxt "AboutData|"
+msgid "Tons of Oxygen icons including the Quassel logo"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:282
+msgctxt "AboutData|"
+msgid "Initial design and main window layout"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:283
+msgctxt "AboutData|"
+msgid "Early beta tester and bughunter"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:286
+msgctxt "AboutData|"
+msgid "Linewrap for input line"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:287
+msgctxt "AboutData|"
+msgid "Performance improvements and cleanups"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:289
+msgctxt "AboutData|"
+msgid "/print command"
+msgstr "Комманда /print"
+
+#: ../src/uisupport/aboutdata.cpp:290
+msgctxt "AboutData|"
+msgid "Performance improvements"
+msgstr "Улучшения производительности"
+
+#: ../src/uisupport/aboutdata.cpp:292
+msgctxt "AboutData|"
+msgid "CMake fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:293
+msgctxt "AboutData|"
+msgid "Hindi and Marathi translations"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:298
+msgctxt "AboutData|"
+msgid ""
+"Windows build support, automated OSX builds in Travis, various improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:300
+msgctxt "AboutData|"
+msgid "Emacs keybindings"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:303
+msgctxt "AboutData|"
+msgid "Highlight configuration improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:304
+msgctxt "AboutData|"
+msgid "Debian/Kubuntu packager, (packaging/build system) bughunter"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:305
+msgctxt "AboutData|"
+msgid "Bugfixes, German translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:306
+msgctxt "AboutData|"
+msgid "Audio backend improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:309
+msgctxt "AboutData|"
+msgid "Chinese translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:310
+msgctxt "AboutData|"
+msgid "Dutch translation"
+msgstr "Голландский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:315 ../src/uisupport/aboutdata.cpp:318
+msgctxt "AboutData|"
+msgid "Korean translation"
+msgstr "Корейский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:317
+msgctxt "AboutData|"
+msgid "Alias improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:319
+msgctxt "AboutData|"
+msgid "Norwegian translation, documentation"
+msgstr "Норвежский перевод, документация"
+
+#: ../src/uisupport/aboutdata.cpp:322
+msgctxt "AboutData|"
+msgid "Former Windows builder"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:323
+msgctxt "AboutData|"
+msgid "Fixes, Debian packaging"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:324
+msgctxt "AboutData|"
+msgid "Fixes and feedback"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:335
+msgctxt "AboutData|"
+msgid "Logger fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:336
+msgctxt "AboutData|"
+msgid "Network detection improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:337
+msgctxt "AboutData|"
+msgid "Ukrainian translation"
+msgstr "Украинский перевод"
+
+#: ../src/uisupport/aboutdata.cpp:338
+msgctxt "AboutData|"
+msgid "Portuguese translation"
+msgstr "Португальский перевод"
+
+#: ../src/qtui/aboutdlg.ui:17

 msgctxt "AboutDlg|"
 msgid "About Quassel"
 msgstr "О Quassel"
 
 msgctxt "AboutDlg|"
 msgid "About Quassel"
 msgstr "О Quassel"
 

-#: ../src/qtui/ui/aboutdlg.ui:59
+#: ../src/qtui/aboutdlg.ui:59

 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: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>"
 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: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/aboutdlg.ui:112

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

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

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

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

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

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

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

-#: ../src/qtui/aboutdlg.cpp:32
+#: ../src/qtui/aboutdlg.cpp:44
+msgctxt "AboutDlg|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:49

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

-msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
+msgid ""
+"<b>Version:</b> %1<br><b>Version date:</b> %2<br><b>Protocol version:</b> %3"

 msgstr ""
 msgstr ""

-"<b>Версия:</b> %1<br><b>Версия протокола:</b> %2<br><b>Дата сборки:</b> %3"

 
 

-#: ../src/qtui/aboutdlg.cpp:46
+#: ../src/qtui/aboutdlg.cpp:65
+#, 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=\"https://quassel-irc.org\">https://quassel-"

 "irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <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>"
-" and <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Most "
-"icons are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen "
-"Team</a> and used under the <a "
-"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Please use "
-"<a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to "
+" href=\"https://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
+"licensed under <a "
+"href=\"https://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> and <a "
+"href=\"https://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br><a "
+"href=\"https://api.kde.org/frameworks/breeze-icons/html\">Breeze icon "
+"theme</a> &copy; Uri Herrera and others, licensed under the <a "
+"href=\"https://github.com/KDE/breeze-icons/blob/21ffd9b/COPYING-"
+"ICONS\">LGPLv3</a>.<br><a href=\"https://api.kde.org/frameworks/oxygen-"
+"icons5/html\">Oxygen icon theme</a> &copy; Nuno Pinheiro and others, "
+"licensed under the <a href=\"https://github.com/KDE/oxygen-"
+"icons/blob/master/COPYING\">LGPLv3</a>.<br><br>Please use <a "
+"href=\"https://bugs.quassel-irc.org\">https://bugs.quassel-irc.org</a> to "

 "report bugs."
 msgstr ""
 "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:85

 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:98

 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:104
+msgctxt "AboutDlg|"
+msgid ""
+"...and anybody else finding and reporting bugs, giving feedback, helping "
+"others and being part of the community!"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:110
+msgctxt "AboutDlg|"
+msgid "Special thanks goes to:"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:116
+msgctxt "AboutDlg|"
+msgid "for the original Quassel logo - The All-Seeing Eye"

 msgstr ""
 msgstr ""

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

 
 

-#: ../src/qtui/aboutdlg.cpp:135
+#: ../src/qtui/aboutdlg.cpp:122
+msgctxt "AboutDlg|"
+msgid "for the Oxygen Quassel logo"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:128
+msgctxt "AboutDlg|"
+msgid "for the amazing Breeze and Oxygen icon themes"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:134

 msgctxt "AboutDlg|"
 msgid ""
 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
+"for creating an awesome framework, and for sponsoring development with "
+"Greenphones, N810s, N950s and more"
+msgstr ""
+
+#: ../src/core/abstractsqlstorage.cpp:136

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

-"Installed Schema (version %1) is not up to date. Upgrading to version %2..."
-msgstr "Используемая схема (версии %1) устарела. Обновляю до версии %2..."
+"Installed database schema (version %1) is not up to date. Upgrading to "
+"version %2...  This may take a while for major upgrades."
+msgstr ""

 
 

-#: ../src/core/abstractsqlstorage.cpp:117
+#: ../src/core/abstractsqlstorage.cpp:144

 msgctxt "AbstractSqlStorage|"
 msgid "Upgrade failed..."
 msgstr "Обновление не удалось..."
 
 msgctxt "AbstractSqlStorage|"
 msgid "Upgrade failed..."
 msgstr "Обновление не удалось..."
 

-#: ../src/qtui/settingspages/aliasesmodel.cpp:55
+#: ../src/core/abstractsqlstorage.cpp:149
+#, qt-format
+msgctxt "AbstractSqlStorage|"
+msgid "Installed database schema successfully upgraded to version %1."
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:54

 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"
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:75
+msgctxt "AliasesModel|"
+msgid "The string the shortcut will be expanded to"

 msgstr ""
 msgstr ""

-"<b>Ссылка к псевдониму</b><br />Она может использоваться как обыкновенный "
-"слэш.<br /><br /><b>Пример:</b> \"foo\"  может использоваться для /foo"

 
 

-#: ../src/qtui/settingspages/aliasesmodel.cpp:59
+#: ../src/qtui/settingspages/aliasesmodel.cpp:77
+msgctxt "AliasesModel|"
+msgid "Special variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:83
+msgctxt "AliasesModel|"
+msgid "Parameter variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:84
+msgctxt "AliasesModel|"
+msgid "i'th parameter"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:85
+msgctxt "AliasesModel|"
+msgid "i'th to j'th parameter separated by spaces"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:86
+msgctxt "AliasesModel|"
+msgid "all parameters from i on separated by spaces"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:89
+msgctxt "AliasesModel|"
+msgid "Nickname parameter variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:91
+msgctxt "AliasesModel|"
+msgid ""
+"account of user identified by i'th parameter, or a '*' if logged out or "
+"unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:93
+msgctxt "AliasesModel|"
+msgid "hostname of user identified by i'th parameter, or a '*' if unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:94
+msgctxt "AliasesModel|"
+msgid "ident of user identified by i'th parameter, or a '*' if unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:96

 msgctxt "AliasesModel|"
 msgid ""
 msgctxt "AliasesModel|"
 msgid ""

-"<b>The string the shortcut will be expanded to</b><br /><b>special "
-"variables:</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - "
-"<b>$i..j</b> represents the i'th to j'th parameter separated by spaces.<br "
-"/> - <b>$i..</b> represents all parameters from i on separated by spaces.<br"
-" /> - <b>$i:hostname</b> represents the hostname of the user identified by "
-"the i'th parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br"
-" /> - <b>$nick</b> your current nickname<br /> - <b>$channel</b> the name of"
-" the selected channel<br /><br />Multiple commands can be separated with "
-"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
+"ident of user identified by i'th parameter if verified, or a '*' if unknown "
+"or unverified (prefixed with '~')"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:100
+msgctxt "AliasesModel|"
+msgid "General variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:101
+msgctxt "AliasesModel|"
+msgid "the whole string"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:102
+msgctxt "AliasesModel|"
+msgid "your current nickname"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:103
+msgctxt "AliasesModel|"
+msgid "the name of the selected channel"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:109
+msgctxt "AliasesModel|"
+msgid "Multiple commands can be separated with semicolons"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
+msgctxt "AliasesModel|"
+msgid "Example:"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
+msgctxt "AliasesModel|"
+msgid "\"Test $1; Test $2; Test All $0\""
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:113
+msgctxt "AliasesModel|"
+msgid ""
+"...will be expanded to three separate messages \"Test 1\", \"Test 2\" and "
+"\"Test All 1 2 3\" when called like <i>/test 1 2 3</i>"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:228

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

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

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


@@ -237,96 +921,118 @@ msgstr "Форма"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgctxt "AppearanceSettingsPage|"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgctxt "AppearanceSettingsPage|"

-msgid "Client style:"
-msgstr "Стиль клиента:"
-
-#: ../src/qtui/settingspages/appearancesettingspage.ui:29
-msgctxt "AppearanceSettingsPage|"
-msgid "Set application style"
-msgstr "Задаёт стиль приложения"
-
-#: ../src/qtui/settingspages/appearancesettingspage.ui:36
-msgctxt "AppearanceSettingsPage|"

 msgid "Language:"
 msgstr "Язык:"
 
 msgid "Language:"
 msgstr "Язык:"
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:43
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29

 msgctxt "AppearanceSettingsPage|"
 msgid "Set the application language. Requires restart!"
 msgstr "Задаёт язык приложения. Требует перезапуска!"
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Set the application language. Requires restart!"
 msgstr "Задаёт язык приложения. Требует перезапуска!"
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+#: ../src/qtui/settingspages/appearancesettingspage.ui:33

 msgctxt "AppearanceSettingsPage|"
 msgid "<Untranslated>"
 msgstr "<Untranslated>"
 
 msgctxt "AppearanceSettingsPage|"
 msgid "<Untranslated>"
 msgstr "<Untranslated>"
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:52
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+#: ../src/qtui/settingspages/appearancesettingspage.ui:38
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:80

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

-#: ../src/qtui/settingspages/appearancesettingspage.ui:75
+#: ../src/qtui/settingspages/appearancesettingspage.ui:59

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "Use custom stylesheet"
-msgstr "Использовать свою таблицу стилей"
+msgid "Widget style:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:66
+msgctxt "AppearanceSettingsPage|"
+msgid "Set application style"
+msgstr "Задаёт стиль приложения"
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:73
+msgctxt "AppearanceSettingsPage|"
+msgid "Fallback icon theme:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:80
+msgctxt "AppearanceSettingsPage|"
+msgid ""
+"<html><head/><body><p>Icon theme to use for icons that are not found in the "
+"current system theme. Requires the selected theme to be installed either "
+"system-wide, or as part of the Quassel installation.</p><p>Supported themes "
+"are Breeze, Breeze Dark and Oxygen, all of KDE fame.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:87
+msgctxt "AppearanceSettingsPage|"
+msgid ""
+"<html><head/><body><p>If enabled, uses the selected fallback icon theme "
+"instead of the configured system theme for all icons. Recommended if you "
+"want Quassel to have a consistent look-and-feel.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:90
+msgctxt "AppearanceSettingsPage|"
+msgid "Override system theme"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:109
+#: ../src/qtui/settingspages/appearancesettingspage.ui:110

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "Path:"
-msgstr "Ð\9fÑ\83Ñ\82Ñ\8c:"
+msgid "Use custom stylesheet"
+msgstr "Ð\98Ñ\81полÑ\8cзоваÑ\82Ñ\8c Ñ\81воÑ\8e Ñ\82аблиÑ\86Ñ\83 Ñ\81Ñ\82илей"

 
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:141
+#: ../src/qtui/settingspages/appearancesettingspage.ui:148

 msgctxt "AppearanceSettingsPage|"
 msgid "..."
 msgstr "..."
 
 msgctxt "AppearanceSettingsPage|"
 msgid "..."
 msgstr "..."
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:150
+#: ../src/qtui/settingspages/appearancesettingspage.ui:172

 msgctxt "AppearanceSettingsPage|"
 msgid "Show system tray icon"
 msgstr "Показывать значок в трее"
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Show system tray icon"
 msgstr "Показывать значок в трее"
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:184
+#: ../src/qtui/settingspages/appearancesettingspage.ui:188

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "Hide to tray on close button"
-msgstr "При закрытии сворачивать в системный лоток"
+msgid "Invert brightness"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:216
+#: ../src/qtui/settingspages/appearancesettingspage.ui:233

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "Enable animations"
-msgstr "Ð\92клÑ\8eÑ\87иÑ\82Ñ\8c анимаÑ\86иÑ\8e"
+msgid "Hide to tray on close button"
+msgstr "Ð\9fÑ\80и закÑ\80Ñ\8bÑ\82ии Ñ\81воÑ\80аÑ\87иваÑ\82Ñ\8c в Ñ\81иÑ\81Ñ\82емнÑ\8bй лоÑ\82ок"

 
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:231
+#: ../src/qtui/settingspages/appearancesettingspage.ui:248

 msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
 msgstr "Перенаправление сообщений"
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
 msgstr "Перенаправление сообщений"
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:237
+#: ../src/qtui/settingspages/appearancesettingspage.ui:257

 msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr "Пользовательские сообщения:"
 
 msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr "Пользовательские сообщения:"
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:280
+#: ../src/qtui/settingspages/appearancesettingspage.ui:300

 msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
 msgstr "Серверные сообщения:"
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
 msgstr "Серверные сообщения:"
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:294
+#: ../src/qtui/settingspages/appearancesettingspage.ui:314

 msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
 msgstr "Цель по умолчанию"
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
 msgstr "Цель по умолчанию"
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:301
+#: ../src/qtui/settingspages/appearancesettingspage.ui:321

 msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr "Окно статуса"
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr "Окно статуса"
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:308
+#: ../src/qtui/settingspages/appearancesettingspage.ui:328

 msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
 msgstr "Текущий чат"
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
 msgstr "Текущий чат"
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:315
+#: ../src/qtui/settingspages/appearancesettingspage.ui:335

 msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr "Ошибки:"
 msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr "Ошибки:"


@@ -336,22 +1042,32 @@ msgctxt "AppearanceSettingsPage|"
 msgid "Interface"
 msgstr "Интерфейс"
 
 msgid "Interface"
 msgstr "Интерфейс"
 

-#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:46
+msgctxt "AppearanceSettingsPage|"
+msgid "Icon theme:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:108
+msgctxt "AppearanceSettingsPage|"
+msgid "Automatic"
+msgstr "Автоматически"
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:281

 msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
 msgstr "Выберите пожалуйста файл стилей"
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
 msgstr "Выберите пожалуйста файл стилей"
 

-#: ../src/qtui/awaylogview.cpp:33
+#: ../src/qtui/awaylogview.cpp:34

 msgctxt "AwayLogView|"
 msgid "Away Log"
 msgstr "Журнал отсутствия"
 
 msgctxt "AwayLogView|"
 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:52

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


@@ -366,106 +1082,129 @@ 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|"
 msgid "Dynamic backlog amount:"
 msgstr "Динамический размер журнала:"
 
 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:25
 msgctxt "BacklogSettingsPage|"
 msgid "Dynamic backlog amount:"
 msgstr "Динамический размер журнала:"
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:75
+#: ../src/qtui/settingspages/backlogsettingspage.ui:66
+msgctxt "BacklogSettingsPage|"
+msgid ""
+"When switching to a chat, more backlog will be fetched if no messages are "
+"shown yet or the scrollbar isn't visible.  Useful when not fetching any "
+"initial backlog."
+msgstr ""
+
+#: ../src/qtui/settingspages/backlogsettingspage.ui:69
+msgctxt "BacklogSettingsPage|"
+msgid "Fetch backlog if needed when switching chats"
+msgstr ""
+
+#: ../src/qtui/settingspages/backlogsettingspage.ui:91

 msgctxt "BacklogSettingsPage|"
 msgid "Backlog request method:"
 msgstr "Способ показа журнала:"
 
 msgctxt "BacklogSettingsPage|"
 msgid "Backlog request method:"
 msgstr "Способ показа журнала:"
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:83
+#: ../src/qtui/settingspages/backlogsettingspage.ui:102

 msgctxt "BacklogSettingsPage|"
 msgid "Fixed amount per chat"
 msgstr "Постоянное количество строк в чате"
 
 msgctxt "BacklogSettingsPage|"
 msgid "Fixed amount per chat"
 msgstr "Постоянное количество строк в чате"
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:88
+#: ../src/qtui/settingspages/backlogsettingspage.ui:107

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

-#: ../src/qtui/settingspages/backlogsettingspage.ui:93
+#: ../src/qtui/settingspages/backlogsettingspage.ui:112
+msgctxt "BacklogSettingsPage|"
+msgid "Only fetch when needed"
+msgstr ""
+
+#: ../src/qtui/settingspages/backlogsettingspage.ui:117

 msgctxt "BacklogSettingsPage|"
 msgid "Globally unread messages"
 msgstr "Общее количество непрочитанных сообщений"
 
 msgctxt "BacklogSettingsPage|"
 msgid "Globally unread messages"
 msgstr "Общее количество непрочитанных сообщений"
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:123
+#: ../src/qtui/settingspages/backlogsettingspage.ui:147

 msgctxt "BacklogSettingsPage|"
 msgid ""
 "The simplest requester. It fetches a fixed amount of lines for each chat "
 "window from the backlog."
 msgctxt "BacklogSettingsPage|"
 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
+#: ../src/qtui/settingspages/backlogsettingspage.ui:162
+#: ../src/qtui/settingspages/backlogsettingspage.ui:366

 msgctxt "BacklogSettingsPage|"
 msgid ""
 msgctxt "BacklogSettingsPage|"
 msgid ""

-"amount of messages per buffer that are requested after the core connection "
+"Amount of messages per buffer that are requested after the core connection "

 "has been established."
 msgstr ""
 "has been established."
 msgstr ""

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

 
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:141
+#: ../src/qtui/settingspages/backlogsettingspage.ui:165

 msgctxt "BacklogSettingsPage|"
 msgid "Initial backlog amount:"
 msgstr "Начальный размер журнала:"
 
 msgctxt "BacklogSettingsPage|"
 msgid "Initial backlog amount:"
 msgstr "Начальный размер журнала:"
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:205
+#: ../src/qtui/settingspages/backlogsettingspage.ui:229

 msgctxt "BacklogSettingsPage|"
 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."
 msgctxt "BacklogSettingsPage|"
 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."

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

 
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:222
-#: ../src/qtui/settingspages/backlogsettingspage.ui:232
-#: ../src/qtui/settingspages/backlogsettingspage.ui:354
+#: ../src/qtui/settingspages/backlogsettingspage.ui:246
+#: ../src/qtui/settingspages/backlogsettingspage.ui:256
+#: ../src/qtui/settingspages/backlogsettingspage.ui:463

 msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched per buffer."
 msgstr "Максимальное количество запрашиваемых сообщений для буфера."
 
 msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched per buffer."
 msgstr "Максимальное количество запрашиваемых сообщений для буфера."
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:225
-#: ../src/qtui/settingspages/backlogsettingspage.ui:347
+#: ../src/qtui/settingspages/backlogsettingspage.ui:249
+#: ../src/qtui/settingspages/backlogsettingspage.ui:456

 msgctxt "BacklogSettingsPage|"
 msgid "Limit:"
 msgstr "Предел:"
 
 msgctxt "BacklogSettingsPage|"
 msgid "Limit:"
 msgstr "Предел:"
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:235
-#: ../src/qtui/settingspages/backlogsettingspage.ui:357
+#: ../src/qtui/settingspages/backlogsettingspage.ui:259
+#: ../src/qtui/settingspages/backlogsettingspage.ui:466

 msgctxt "BacklogSettingsPage|"
 msgid "Unlimited"
 msgstr "Неограничено"
 
 msgctxt "BacklogSettingsPage|"
 msgid "Unlimited"
 msgstr "Неограничено"
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:260
-#: ../src/qtui/settingspages/backlogsettingspage.ui:270
-#: ../src/qtui/settingspages/backlogsettingspage.ui:382
-#: ../src/qtui/settingspages/backlogsettingspage.ui:392
+#: ../src/qtui/settingspages/backlogsettingspage.ui:284
+#: ../src/qtui/settingspages/backlogsettingspage.ui:294
+#: ../src/qtui/settingspages/backlogsettingspage.ui:491
+#: ../src/qtui/settingspages/backlogsettingspage.ui:501

 msgctxt "BacklogSettingsPage|"
 msgid ""
 "Amount of messages to be fetched in addition to the unread messages. The "
 "Limit does not apply here."
 msgctxt "BacklogSettingsPage|"
 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:287
+#: ../src/qtui/settingspages/backlogsettingspage.ui:494

 msgctxt "BacklogSettingsPage|"
 msgid "Additional Messages:"
 msgstr "Дополнительных сообщений:"
 
 msgctxt "BacklogSettingsPage|"
 msgid "Additional Messages:"
 msgstr "Дополнительных сообщений:"
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:324
+#: ../src/qtui/settingspages/backlogsettingspage.ui:348
+msgctxt "BacklogSettingsPage|"
+msgid ""
+"<p>On modern cores (v0.13.0 or newer), no backlog will be fetched.  The core keeps track of chat activity automatically.<br/>\n"
+"<i>Note: Chat Monitor won't show past messages.</i>\n"
+"</p>\n"
+"<p>On older cores, this requester fetches a fixed amount of lines for each chat window from the backlog.</p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/backlogsettingspage.ui:369
+msgctxt "BacklogSettingsPage|"
+msgid "For legacy cores, initial backlog amount:"
+msgstr ""
+
+#: ../src/qtui/settingspages/backlogsettingspage.ui:433

 msgctxt "BacklogSettingsPage|"
 msgid ""
 "This requester fetches all messages newer than the oldest unread message for all chats.\n"
 msgctxt "BacklogSettingsPage|"
 msgid ""
 "This requester fetches all messages newer than the oldest unread message for all chats.\n"


@@ -474,47 +1213,46 @@ 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
+#: ../src/qtui/settingspages/backlogsettingspage.ui:453

 msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr "Максимальное количество сообщений, запрашиваемых из всех буферов."
 
 msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr "Максимальное количество сообщений, запрашиваемых из всех буферов."
 

-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:29

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

-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:29

 msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 msgstr "Просмотр Журнала"
 
 msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 msgstr "Просмотр Журнала"
 

-#: ../src/client/networkmodel.cpp:346
+#: ../src/client/networkmodel.cpp:444

 #, 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:257

 msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr "Произвести необратимое слияние буферов?"
 
 msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr "Произвести необратимое слияние буферов?"
 

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

 #, 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 Это нельзя обратить!"
+
+#: ../src/uisupport/bufferview.cpp:721
+msgctxt "BufferViewDock|"
+msgid "Search..."

 msgstr ""
 msgstr ""

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

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


@@ -526,12 +1264,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:569

 msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr "Добавить Чатлист"
 
 msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr "Добавить Чатлист"
 

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

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


@@ -567,7 +1305,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 +1315,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,165 +1339,181 @@ 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 "Show search"
+msgstr ""
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:170

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

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

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

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

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

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

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

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

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

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

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

-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:39

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

-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:39

 msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
 msgstr "Пользовательские Чатлисты"
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
 msgstr "Пользовательские Чатлисты"
 

-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:373

 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:374

 #, qt-format
 msgctxt "BufferViewSettingsPage|"
 msgid "Do you really want to delete the chat list \"%1\"?"
 msgstr "Вы действительно хотите удалить чат \"%1\"?"
 
 #, qt-format
 msgctxt "BufferViewSettingsPage|"
 msgid "Do you really want to delete the chat list \"%1\"?"
 msgstr "Вы действительно хотите удалить чат \"%1\"?"
 

-#: ../src/qtui/ui/bufferviewwidget.ui:26
+#: ../src/qtui/bufferviewwidget.ui:26

 msgctxt "BufferViewWidget|"
 msgid "BufferView"
 msgstr "СписокБуферов"
 
 msgctxt "BufferViewWidget|"
 msgid "BufferView"
 msgstr "СписокБуферов"
 

-#: ../src/qtui/bufferwidget.cpp:79
+#: ../src/qtui/bufferwidget.cpp:75

 msgctxt "BufferWidget|"
 msgid "Zoom In"
 msgstr "Увеличить"
 
 msgctxt "BufferWidget|"
 msgid "Zoom In"
 msgstr "Увеличить"
 

-#: ../src/qtui/bufferwidget.cpp:85
+#: ../src/qtui/bufferwidget.cpp:76

 msgctxt "BufferWidget|"
 msgid "Zoom Out"
 msgstr "Уменьшить"
 
 msgctxt "BufferWidget|"
 msgid "Zoom Out"
 msgstr "Уменьшить"
 

-#: ../src/qtui/bufferwidget.cpp:90
+#: ../src/qtui/bufferwidget.cpp:77

 msgctxt "BufferWidget|"
 msgid "Actual Size"
 msgstr "Действительный размер"
 
 msgctxt "BufferWidget|"
 msgid "Actual Size"
 msgstr "Действительный размер"
 

-#: ../src/qtui/bufferwidget.cpp:94
+#: ../src/qtui/bufferwidget.cpp:79

 msgctxt "BufferWidget|"
 msgid "Set Marker Line"
 msgstr "Отметка:"
 
 msgctxt "BufferWidget|"
 msgid "Set Marker Line"
 msgstr "Отметка:"
 

-#: ../src/qtui/bufferwidget.cpp:98
+#: ../src/qtui/bufferwidget.cpp:82

 msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr "Отметка:"
 
 msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr "Отметка:"
 

-#: ../src/client/networkmodel.cpp:503
-#, qt-format
-msgctxt "ChannelBufferItem|"
-msgid "<b>Channel %1</b>"
+#: ../src/qtui/settingspages/capseditdlg.ui:14
+msgctxt "CapsEditDlg|"
+msgid "Edit Network Features"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:506
-#, qt-format
-msgctxt "ChannelBufferItem|"
-msgid "<b>Users:</b> %1"
-msgstr "<b>Пользователи:</b> %1"
+#: ../src/qtui/settingspages/capseditdlg.ui:20
+msgctxt "CapsEditDlg|"
+msgid "<p>Enter a space-separated list of IRCv3 capabilities to ignore:</p>"
+msgstr ""

 
 

-#: ../src/client/networkmodel.cpp:510
+#: ../src/qtui/settingspages/capseditdlg.ui:36
+msgctxt "CapsEditDlg|"
+msgid ""
+"<p>A list of capabilities may be found at <a "
+"href=\"https://ircv3.net/irc/\">https://ircv3.net/irc/</a>.</p>"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:720

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

-msgid "<b>Mode:</b> %1"
+msgid "Channel %1"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:521
-#, qt-format
+#: ../src/client/networkmodel.cpp:724

 msgctxt "ChannelBufferItem|"
 msgctxt "ChannelBufferItem|"

-msgid "<b>Topic:</b> %1"
+msgid "Users"
+msgstr "Пользователи"
+
+#: ../src/client/networkmodel.cpp:729
+msgctxt "ChannelBufferItem|"
+msgid "Mode"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:525
+#: ../src/client/networkmodel.cpp:739

 msgctxt "ChannelBufferItem|"
 msgctxt "ChannelBufferItem|"

-msgid "Not active <br /> Double-click to join"
-msgstr "Ð\9dеакÑ\82ивно <br /> Ð\94важдÑ\8b Ñ\89Ñ\91лкниÑ\82е Ñ\87Ñ\82обÑ\8b войÑ\82и"
+msgid "Topic"
+msgstr "Тема"

 
 

-#: ../src/client/networkmodel.cpp:528
-#, qt-format
+#: ../src/client/networkmodel.cpp:746

 msgctxt "ChannelBufferItem|"
 msgctxt "ChannelBufferItem|"

-msgid "<p> %1 </p>"
-msgstr "<p> %1 </p>"
+msgid "Not active, double-click to join"
+msgstr ""

 
 

-#: ../src/qtui/ui/channellistdlg.ui:14
+#: ../src/qtui/channellistdlg.ui:14

 msgctxt "ChannelListDlg|"
 msgid "Channel List"
 msgstr "Список каналов"
 
 msgctxt "ChannelListDlg|"
 msgid "Channel List"
 msgstr "Список каналов"
 

-#: ../src/qtui/ui/channellistdlg.ui:38
+#: ../src/qtui/channellistdlg.ui:38

 msgctxt "ChannelListDlg|"
 msgid "Search Pattern:"
 msgstr "Шаблон поиска:"
 
 msgctxt "ChannelListDlg|"
 msgid "Search Pattern:"
 msgstr "Шаблон поиска:"
 

-#: ../src/qtui/ui/channellistdlg.ui:48
+#: ../src/qtui/channellistdlg.ui:48

 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
+#: ../src/qtui/channellistdlg.ui:62

 msgctxt "ChannelListDlg|"
 msgid "Show Channels"
 msgstr "Показать каналы"
 
 msgctxt "ChannelListDlg|"
 msgid "Show Channels"
 msgstr "Показать каналы"
 

-#: ../src/qtui/ui/channellistdlg.ui:86
+#: ../src/qtui/channellistdlg.ui:86

 msgctxt "ChannelListDlg|"
 msgid "Filter:"
 msgstr "Фильтр:"
 
 msgctxt "ChannelListDlg|"
 msgid "Filter:"
 msgstr "Фильтр:"
 

-#: ../src/qtui/ui/channellistdlg.ui:98
+#: ../src/qtui/channellistdlg.ui:98

 msgctxt "ChannelListDlg|"
 msgctxt "ChannelListDlg|"

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

 msgstr "Произошли ошибки:"
 
 msgstr "Произошли ошибки:"
 

-#: ../src/qtui/ui/channellistdlg.ui:132
+#: ../src/qtui/channellistdlg.ui:132

 msgctxt "ChannelListDlg|"
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 msgctxt "ChannelListDlg|"
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"


@@ -770,13 +1522,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 +1544,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 +1562,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:282

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


@@ -853,84 +1583,315 @@ msgctxt "ChatMonitorSettingsPage|"
 msgid "Show own messages"
 msgstr "Показывать свои сообщения"
 
 msgid "Show own messages"
 msgstr "Показывать свои сообщения"
 

-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:182
+msgctxt "ChatMonitorSettingsPage|"
+msgid ""
+"Show own messages in chatmonitor even if the originating buffer is ignored"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:185
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include ignored buffers"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:196
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Display messages from backlog on reconnect"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:199
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:298
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Show messages from backlog"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:212
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:239
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include read messages from backlog on reconnect"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:242
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include read messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:39

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

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

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

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

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

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

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

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

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

-#: ../src/qtui/chatmonitorview.cpp:52
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:295
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Show messages from backlog (not available)"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:309
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Messages from backlog are not fetched"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:311
+#, qt-format
+msgctxt "ChatMonitorSettingsPage|"
+msgid ""
+"No initial backlog will be fetched when using the backlog request method of "
+"<i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:312
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Only fetch when needed"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:313
+#, qt-format
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Configure this in the <i>%1</i> settings page."
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:314
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Backlog Fetching"
+msgstr "Просмотр Журнала"
+
+#: ../src/qtui/chatmonitorview.cpp:58

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

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

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

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

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

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

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

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

 msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr "Скопировать выделение"
 
 msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr "Скопировать выделение"
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:13
+#: ../src/qtui/chatscene.cpp:806
+#, qt-format
+msgctxt "ChatScene|"
+msgid "Search '%1'"
+msgstr "Найти '%1'"
+
+#: ../src/qtui/chatscene.cpp:818
+msgctxt "ChatScene|"
+msgid "Reset Column Widths"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:14
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:20
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Show colored text in the chat window"
+msgstr "Показать цветной текст в окне чата"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:23
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Allow colored text (mIRC color codes)"
+msgstr "Разрешить вывод цветного текста (mIRC color codes)"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:39
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Custom Colors"
+msgstr "Пользовательские цвета"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:60
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Action:"
+msgstr "Действие:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:67
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:91
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:115
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:155
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:179
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:210
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:234
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:258
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:282
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:299
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:361
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:378
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:395
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:412
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:429
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:446
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:463
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:480
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:497
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:514
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:531
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:548
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:565
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:582
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:599
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:616
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:657
+msgctxt "ChatViewColorSettingsPage|"
+msgid "..."
+msgstr "..."
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:84
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Timestamp:"
+msgstr "Время:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:108
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Channel message:"
+msgstr "Сообщение канала:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:148
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight foreground:"
+msgstr "Подсветка:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:172
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Command message:"
+msgstr "Сообщение команды:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:196
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight background:"
+msgstr "Подсвечивать ники"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:203
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Server message:"
+msgstr "Сообщение сервера:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:227
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Marker line:"
+msgstr "Отметка:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:251
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Error message:"
+msgstr "Сообщение об ошибке:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:275
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Background:"
+msgstr "Фон"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:332
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color senders in chat based on nicknames"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:335
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Use Sender Coloring"
+msgstr "Использовать Цветовую Палитру Отправителя"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:650
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Own messages:"
+msgstr "Собственные сообщения:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:689
+msgctxt "ChatViewColorSettingsPage|"
+msgid ""
+"Color sender nicknames in action messages, e.g.<br/>-*- <span style=\" font-"
+"style:italic;\">Nick</span> does an action"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:692
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color senders in action messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:708
+msgctxt "ChatViewColorSettingsPage|"
+msgid ""
+"Color nicknames in joins, parts, quits, and other messages, e.g.<br/>--> "
+"<span style=\" font-style:italic;\">Nick</span> joined #quassel"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:711
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color nicknames in other messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Chat View Colors"
+msgstr ""
+
+#: ../src/qtui/chatviewsearchbar.ui:13

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

-#: ../src/qtui/ui/chatviewsearchbar.ui:19
-#: ../src/qtui/ui/chatviewsearchbar.ui:33
-#: ../src/qtui/ui/chatviewsearchbar.ui:44
+#: ../src/qtui/chatviewsearchbar.ui:19 ../src/qtui/chatviewsearchbar.ui:33
+#: ../src/qtui/chatviewsearchbar.ui:44

 msgctxt "ChatViewSearchBar|"
 msgid "..."
 msgstr "..."
 
 msgctxt "ChatViewSearchBar|"
 msgid "..."
 msgstr "..."
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:55
+#: ../src/qtui/chatviewsearchbar.ui:55

 msgctxt "ChatViewSearchBar|"
 msgid "case sensitive"
 msgstr "учитывать регистр"
 
 msgctxt "ChatViewSearchBar|"
 msgid "case sensitive"
 msgstr "учитывать регистр"
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:62
+#: ../src/qtui/chatviewsearchbar.ui:62

 msgctxt "ChatViewSearchBar|"
 msgid "search nick"
 msgstr "искать ник"
 
 msgctxt "ChatViewSearchBar|"
 msgid "search nick"
 msgstr "искать ник"
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:69
+#: ../src/qtui/chatviewsearchbar.ui:69

 msgctxt "ChatViewSearchBar|"
 msgid "search message"
 msgstr "искать сообщение"
 
 msgctxt "ChatViewSearchBar|"
 msgid "search message"
 msgstr "искать сообщение"
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:82
+#: ../src/qtui/chatviewsearchbar.ui:82

 msgctxt "ChatViewSearchBar|"
 msgid "ignore joins, parts, etc."
 msgstr "игнорировать входы, уходы, и т. п."
 msgctxt "ChatViewSearchBar|"
 msgid "ignore joins, parts, etc."
 msgstr "игнорировать входы, уходы, и т. п."


@@ -942,186 +1903,287 @@ msgstr "Форма"
 
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:22
 msgctxt "ChatViewSettingsPage|"
 
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:22
 msgctxt "ChatViewSettingsPage|"

-msgid "Timestamp format:"
-msgstr "Формат датировки:"
+msgid "Use a custom format for the timestamp"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:32
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:25

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "[hh:mm:ss]"
-msgstr "[hh:mm:ss]"
+msgid "Custom timestamp format:"
+msgstr ""

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Custom chat window font:"
-msgstr "Пользовательский шрифт окна чата:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+msgid ""
+"<html><head/><body>\n"
+"         <p>Accepts Qt QDateTime Format.</p>\n"
+"         <p>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:56

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Show colored text in the chat window"
-msgstr "Показать цветной текст в окне чата"
+msgid " hh:mm:ss"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:81

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Allow colored text (mIRC color codes)"
-msgstr "Разрешить вывод цветного текста (mIRC color codes)"
+msgid "Shows <brackets> around the names of senders"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:84

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid ""
-"Show a website preview window when hovering the mouse over a web address"
+msgid "Show brackets around sender names"

 msgstr ""
 msgstr ""

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

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Show previews of webpages on URL hover"
-msgstr "Показывать эскиз вебсайта при наведении на URL"
+msgid "Show sender modes before nicknames:"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:109

 msgctxt "ChatViewSettingsPage|"
 msgid ""
 msgctxt "ChatViewSettingsPage|"
 msgid ""

-"Set the marker line to the bottom of the current chat window when selecting "
-"another channel"
+"<qt><style>.bold { font-weight: bold; } .italic { font-style: italic; } .underline { text-decoration: underline; }</style>\n"
+"<p><span class=\"bold\">Sender modes:</span></p>\n"
+"<p><span class=\"underline\">No modes:</span> Don't show any modes<br/><span class=\"italic\">Example:</span> &lt;nickname&gt;</p>\n"
+"<p><span class=\"underline\">Highest mode:</span> Show only the highest active mode<br/><span class=\"italic\">Example:</span> &lt;@nickname&gt;</p>\n"
+"<p><span class=\"underline\">All modes:</span> Show all active modes<br/><span class=\"italic\">Example:</span> &lt;@+nickname&gt;</p>\n"
+"</qt>"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:144

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Set marker line automatically when switching chats"
-msgstr ""
+msgid "Custom chat window font:"
+msgstr "Пользовательский шрифт окна чата:"

 
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:177

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Custom Colors"
-msgstr "Пользовательские цвета"
+msgid ""
+"Show a website preview window when hovering the mouse over a web address"
+msgstr "Показывать предварительный просмотр вебсайта при наведении мышью на адрес"

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Action:"
-msgstr "Ð\94ейÑ\81Ñ\82вие:"
+msgid "Show previews of webpages on URL hover"
+msgstr "Ð\9fоказÑ\8bваÑ\82Ñ\8c Ñ\8dÑ\81киз вебÑ\81айÑ\82а пÑ\80и наведении на URL"

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "..."
-msgstr "..."
+msgid ""
+"Set the marker line to the bottom of the current chat window when selecting "
+"another channel"
+msgstr ""

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Timestamp:"
-msgstr "Время:"
+msgid "Set marker line automatically when switching chats"
+msgstr ""

 
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgctxt "ChatViewSettingsPage|"
 
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgctxt "ChatViewSettingsPage|"

-msgid "Channel message:"
-msgstr "Сообщение канала:"
+msgid ""
+"Set the marker line to the bottom of the current chat window when Quassel "
+"loses focus."
+msgstr ""

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Highlight foreground:"
-msgstr "Подсветка:"
+msgid "Set marker line automatically when Quassel loses focus"
+msgstr ""

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Command message:"
-msgstr "Сообщение команды:"
+msgid "Web Search URL:"
+msgstr ""

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Highlight background:"
-msgstr "Подсвечивать ники"
+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:307
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:249

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Server message:"
-msgstr "Сообщение сервера:"
+msgid "https://www.google.com/search?q=%s"
+msgstr ""

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Marker line:"
-msgstr "Ð\9eÑ\82меÑ\82ка:"
+msgid "Interface"
+msgstr "Ð\98нÑ\82еÑ\80Ñ\84ейÑ\81"

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Error message:"
-msgstr "СообÑ\89ение об оÑ\88ибке:"
+msgid "Chat View"
+msgstr "Ð\92ид Ð\9eкна ЧаÑ\82а"

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Background:"
-msgstr "Фон"
+msgid "You need at least version 0.6 of Quassel Core to use this feature"
+msgstr ""

 
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Use Sender Coloring"
-msgstr "Использовать Цветовую Палитру Отправителя"
+msgid "Your Quassel core does not support this feature"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:55

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Own messages:"
-msgstr "Собственные сообщения:"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to show sender modes "
+"before nicknames."
+msgstr ""

 
 

-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:67

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Interface"
-msgstr "Интерфейс"
+msgid "No modes"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:68

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Chat View"
-msgstr "Вид Окна Чата"
+msgid "Highest mode"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:69

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "You need at 0.6 quasselcore to use this feature"
-msgstr "Для использования этой функции вам нужно иметь quasselcore версии 0.6"
+msgid "All modes"
+msgstr ""

 
 

-#: ../src/client/client.cpp:270
+#: ../src/client/client.cpp:274

 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:77
+#: ../src/client/clientauthhandler.cpp:92
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connecting to %1..."
+msgstr "Соединяюсь с %1..."
+
+#: ../src/client/clientauthhandler.cpp:88
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Looking up %1..."
+msgstr "Ищу хост %1..."
+
+#: ../src/client/clientauthhandler.cpp:95
+#: ../src/client/clientauthhandler.cpp:302
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connected to %1"
+msgstr "Соединение с %1 установлено"
+
+#: ../src/client/clientauthhandler.cpp:99
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Disconnecting from %1..."
+msgstr "Идет отключение от %1..."
+
+#: ../src/client/clientauthhandler.cpp:103
+msgctxt "ClientAuthHandler|"
+msgid "Disconnected"
+msgstr "Отключено"
+
+#: ../src/client/clientauthhandler.cpp:137
+msgctxt "ClientAuthHandler|"
+msgid "Reconnecting in compatibility mode..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:224
+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:227
+msgctxt "ClientAuthHandler|"
+msgid "Core speaks none of the protocols we support"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:241
+#, 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:244
+msgctxt "ClientAuthHandler|"
+msgid "Incompatible protocol version, connection to core refused"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:264
+msgctxt "ClientAuthHandler|"
+msgid "Synchronizing to core..."
+msgstr "Синхронизация с ядром..."
+
+#: ../src/client/clientauthhandler.cpp:272
+msgctxt "ClientAuthHandler|"
+msgid "The core refused connection from this client"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:295
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core does not support the following features: %1"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:298
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core supports unknown features: %1"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:339
+msgctxt "ClientAuthHandler|"
+msgid "Logging in..."
+msgstr "Авторизуюсь..."
+
+#: ../src/client/clientauthhandler.cpp:344
+msgctxt "ClientAuthHandler|"
+msgid "Login canceled"
+msgstr "Вход в систему отменен"
+
+#: ../src/client/clientauthhandler.cpp:393
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection cancelled"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:460
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection canceled"
+msgstr "Незашифрованное подключение отменено"
+
+#: ../src/client/clientbacklogmanager.cpp:177

 #, 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:54

 msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr "Все Чаты"
 
 msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr "Все Чаты"
 

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

 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:106

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


@@ -1163,10 +2225,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 +2252,515 @@ 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:826

 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 "Configure"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:94

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

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

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

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

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

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

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

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

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

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

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

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr "Имеющиеся правила"
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr "Имеющиеся правила"
 

-#: ../src/core/core.cpp:182
+#: ../src/core/core.cpp:100
+msgctxt "Core|"
+msgid "Invalid core settings version!"
+msgstr ""
+
+#: ../src/core/core.cpp:167
+#, qt-format
+msgctxt "Core|"
+msgid "Cannot configure from environment: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:171

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Could not initialize any storage backend! Exiting..."
-msgstr "Не могу инициализировать ни одно хранилище! Выхожу..."
+msgid "Cannot configure from environment!"
+msgstr ""

 
 

-#: ../src/core/core.cpp:183
+#: ../src/core/core.cpp:177

 msgctxt "Core|"
 msgid ""
 msgctxt "Core|"
 msgid ""

+"Could not initialize any storage backend! Exiting...\n"

 "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 ""
 "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"
-"для работы."

 
 

-#: ../src/core/core.cpp:232
+#: ../src/core/core.cpp:184
+msgctxt "Core|"
+msgid "Cannot write quasselcore configuration; probably a permission problem."
+msgstr ""
+
+#: ../src/core/core.cpp:240
+msgctxt "Core|"
+msgid "Cannot open port for listening!"
+msgstr ""
+
+#: ../src/core/core.cpp:311
+msgctxt "Core|"
+msgid "Cannot restore a state for an unconfigured core!"
+msgstr ""
+
+#: ../src/core/core.cpp:315

 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:360
+msgctxt "Core|"
+msgid "Core is already configured! Not configuring again..."
+msgstr ""
+
+#: ../src/core/core.cpp:363

 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:367

 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:372
+msgctxt "Core|"
+msgid "Could not setup authenticator!"
+msgstr ""
+
+#: ../src/core/core.cpp:378
+msgctxt "Core|"
+msgid "Fatal failure while trying to setup, terminating"
+msgstr ""
+
+#: ../src/core/core.cpp:382
+msgctxt "Core|"
+msgid "Could not save backend settings, probably a permission problem."
+msgstr ""
+
+#: ../src/core/core.cpp:386

 msgctxt "Core|"
 msgid "Creating admin user..."
 msgstr "Создаю пользователя-администратора..."
 
 msgctxt "Core|"
 msgid "Creating admin user..."
 msgstr "Создаю пользователя-администратора..."
 

-#: ../src/core/core.cpp:393
+#: ../src/core/core.cpp:464
+#, qt-format
+msgctxt "Core|"
+msgid "Selected storage backend %1 is not available."
+msgstr ""
+
+#: ../src/core/core.cpp:557
+#, qt-format
+msgctxt "Core|"
+msgid "Selected auth backend %1 is not available."
+msgstr ""
+
+#: ../src/core/core.cpp:627

 #, 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:633

 #, 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"
+msgstr "Ожидаю графических клиентов по адресу IPv6 %1 порт %2, использую протокол версии %3"

 
 

-#: ../src/core/core.cpp:409
+#: ../src/core/core.cpp:640

 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr "Не могу открыть интерфейс IPv6 %1:%2: %3"
 
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr "Не могу открыть интерфейс IPv6 %1:%2: %3"
 

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

 #, qt-format
 msgctxt "Core|"
 msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
 #, qt-format
 msgctxt "Core|"
 msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"

-msgstr ""
-"Ожидаю графических клиентов по адресу IPv4 %1 порт %2, использую протокол "
-"версии %3"
+msgstr "Ожидаю графических клиентов по адресу IPv4 %1 порт %2, использую протокол версии %3"

 
 

-#: ../src/core/core.cpp:427
+#: ../src/core/core.cpp:653

 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr "Не могу открыть интерфейс IPv4 %1:%2: %3"
 
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr "Не могу открыть интерфейс IPv4 %1:%2: %3"
 

-#: ../src/core/core.cpp:435
+#: ../src/core/core.cpp:657

 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr "Некорректный адрес для прослушивания %1, неизвестный сетевой протокол"
 
 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr "Некорректный адрес для прослушивания %1, неизвестный сетевой протокол"
 

-#: ../src/core/core.cpp:444
+#: ../src/core/core.cpp:664

 msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr "Не могу открыть ни один сетевой интерфейс для прослушивания!"
 
 msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr "Не могу открыть ни один сетевой интерфейс для прослушивания!"
 

-#: ../src/core/core.cpp:478
+#: ../src/core/core.cpp:719

 msgctxt "Core|"
 msgid "Client connected from"
 msgstr "Клиент соединился с"
 
 msgctxt "Core|"
 msgid "Client connected from"
 msgstr "Клиент соединился с"
 

-#: ../src/core/core.cpp:481
+#: ../src/core/core.cpp:722

 msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr "Закрываю сервер для базовой настройки."
 
 msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr "Закрываю сервер для базовой настройки."
 

-#: ../src/core/core.cpp:500
+#: ../src/core/core.cpp:733
+msgctxt "Core|"
+msgid "Non-authed client disconnected:"
+msgstr ""
+
+#: ../src/core/core.cpp:807

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Antique client trying to connect... refusing."
-msgstr "Древний клиент попытался подключиться... отказываю."
+msgid "Cannot setup storage backend."
+msgstr ""

 
 

-#: ../src/core/core.cpp:512
+#: ../src/core/core.cpp:896

 #, qt-format
 msgctxt "Core|"
 #, 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."
+msgid "Unsupported storage backend: %1"

 msgstr ""
 msgstr ""

-"<b>Ваш клиент Quassel слишком старый!</b><br>Этому ядру нужна версия клиент-"
-"серверного протокола по крайней мере %1.<br>Пожалуйста обновите клиент."

 
 

-#: ../src/core/core.cpp:516 ../src/core/core.cpp:606 ../src/core/core.cpp:630
+#: ../src/core/core.cpp:897

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Client"
-msgstr "Клиент"
+msgid "Supported backends are:"
+msgstr ""

 
 

-#: ../src/core/core.cpp:516
+#: ../src/core/core.cpp:909 ../src/core/core.cpp:929
+#, qt-format

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "too old, rejecting."
-msgstr "слишком старый, отказываю."
+msgid "Switched storage backend to: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:910
+msgctxt "Core|"
+msgid "Backend already initialized. Skipping Migration..."
+msgstr ""

 
 

-#: ../src/core/core.cpp:533
+#: ../src/core/core.cpp:913

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

-msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
+msgid "Storage backend is not available: %1"

 msgstr ""
 msgstr ""

-"<b>Ядро Quassel версии %1</b><br>Собрано: %2<br>Аптайм %3д%4ч%5м (с %6)"

 
 

-#: ../src/core/core.cpp:586
+#: ../src/core/core.cpp:917
+#, qt-format

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Starting TLS for Client:"
-msgstr "Запускаю TLS для клиента:"
+msgid "Unable to setup storage backend: %1"
+msgstr ""

 
 

-#: ../src/core/core.cpp:604
+#: ../src/core/core.cpp:922
+#, qt-format

 msgctxt "Core|"
 msgctxt "Core|"

-msgid ""
-"<b>Client not initialized!</b><br>You need to send an init message before "
-"trying to login."
+msgid "Unable to initialize storage backend: %1"

 msgstr ""
 msgstr ""

-"<b>Клиент не инициализирован!</b><br>Вам нужно отправить инициализационное "
-"сообщение перед попыткой входа."

 
 

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

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "did not send an init message before trying to login, rejecting."
+msgid "Migrating storage backend %1 to %2..."

 msgstr ""
 msgstr ""

-"не отправил инициализационное сообщение перед попыткой входа, отказываю."

 
 

-#: ../src/core/core.cpp:624
+#: ../src/core/core.cpp:942

 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."
+msgid "Migration finished!"
+msgstr ""
+
+#: ../src/core/core.cpp:949
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to migrate storage backend! (No migration writer for %1)"
+msgstr ""
+
+#: ../src/core/core.cpp:955
+msgctxt "Core|"
+msgid "No currently active storage backend. Skipping migration..."

 msgstr ""
 msgstr ""

-"<b>Неверное имя пользователя или пароль!</b><br>Предоставленные вами имя "
-"пользователя и пароль не найдены в базе."

 
 

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

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

-msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
-msgstr "инициализирован и аутентифицирован успешно как \"%1\" (UserId: %2)."
+msgid "Currently active storage backend does not support migration: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:961
+#, qt-format
+msgctxt "Core|"
+msgid "New storage backend does not support migration: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:983
+#, qt-format
+msgctxt "Core|"
+msgid "Unsupported authenticator: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:984
+msgctxt "Core|"
+msgid "Supported authenticators are:"
+msgstr ""

 
 

-#: ../src/core/core.cpp:641
+#: ../src/core/core.cpp:994 ../src/core/core.cpp:1011
+#, qt-format

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Non-authed client disconnected."
-msgstr "Неавторизованный клиент отсоединён."
+msgid "Switched authenticator to: %1"
+msgstr ""

 
 

-#: ../src/core/core.cpp:647
+#: ../src/core/core.cpp:997
+#, qt-format

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Non-authed client disconnected. (socket allready destroyed)"
-msgstr "Неавторизованный клиент отсоединён. (сокет уже уничтожен)"
+msgid "Authenticator is not available: %1"
+msgstr ""

 
 

-#: ../src/core/core.cpp:695
+#: ../src/core/core.cpp:1001
+#, qt-format

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Could not initialize session for client:"
-msgstr "Не могу инициализировать сессию для клиента:"
+msgid "Unable to setup authenticator: %1"
+msgstr ""

 
 

-#: ../src/core/core.cpp:717
+#: ../src/core/core.cpp:1006
+#, qt-format

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Could not find a session for client:"
-msgstr "Не удалось найти сессии для клиента:"
+msgid "Unable to initialize authenticator: %1"
+msgstr ""

 
 

-#: ../src/client/coreaccount.h:39
+#: ../src/client/coreaccount.h:43

 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:276

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


@@ -1613,7 +2781,7 @@ msgid "Local Core"
 msgstr "Локальное ядро"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
 msgstr "Локальное ядро"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40

-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:170

 msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr "Хост:"
 msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr "Хост:"


@@ -1625,13 +2793,13 @@ msgid "localhost"
 msgstr "localhost"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:54
 msgstr "localhost"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:54

-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:187
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:133

 msgctxt "CoreAccountEditDlg|"
 msgid "Port:"
 msgstr "Порт:"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
 msgctxt "CoreAccountEditDlg|"
 msgid "Port:"
 msgstr "Порт:"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:93

-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:229

 msgctxt "CoreAccountEditDlg|"
 msgid "User:"
 msgstr "Пользователь:"
 msgctxt "CoreAccountEditDlg|"
 msgid "User:"
 msgstr "Пользователь:"


@@ -1649,25 +2817,40 @@ msgstr "Запомнить"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
 msgctxt "CoreAccountEditDlg|"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
 msgctxt "CoreAccountEditDlg|"

-msgid "Use a Proxy"
-msgstr "Использовать прокси"
+msgid "Proxy Settings"
+msgstr ""
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:144
+msgctxt "CoreAccountEditDlg|"
+msgid "SOCKS 5"
+msgstr ""
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:149
+msgctxt "CoreAccountEditDlg|"
+msgid "HTTP"
+msgstr "HTTP"

 
 

-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:279

 msgctxt "CoreAccountEditDlg|"
 msgid "Proxy Type:"
 msgstr "Тип прокси:"
 
 msgctxt "CoreAccountEditDlg|"
 msgid "Proxy Type:"
 msgstr "Тип прокси:"
 

-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:288

 msgctxt "CoreAccountEditDlg|"
 msgctxt "CoreAccountEditDlg|"

-msgid "Socks 5"
-msgstr "Socks 5"
+msgid "No pro&xy"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:298

 msgctxt "CoreAccountEditDlg|"
 msgctxt "CoreAccountEditDlg|"

-msgid "HTTP"
-msgstr "HTTP"
+msgid "S&ystem proxy"
+msgstr ""
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:311
+msgctxt "CoreAccountEditDlg|"
+msgid "&Manual proxy configuration"
+msgstr ""

 
 

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

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


@@ -1717,329 +2900,358 @@ 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/qtui/coreconfigwizard.cpp:69
+#: ../src/core/coreauthhandler.cpp:167 ../src/core/coreauthhandler.cpp:179
+#: ../src/core/coreauthhandler.cpp:253
+msgctxt "CoreAuthHandler|"
+msgid "Client"
+msgstr "Клиент"
+
+#: ../src/core/coreauthhandler.cpp:167
+msgctxt "CoreAuthHandler|"
+msgid "too old, rejecting."
+msgstr "слишком старый, отказываю."
+
+#: ../src/core/coreauthhandler.cpp:168
+#, 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:180
+msgctxt "CoreAuthHandler|"
+msgid "did not send a registration message before trying to login, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:182
+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:198
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "SSL required but non-SSL connection attempt from %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:199
+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:254
+msgctxt "CoreAuthHandler|"
+msgid "attempted to login before the core was configured, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:256
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Attempted to login before core was configured!</b><br>The core must be "
+"configured before attempting to login."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:278
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Invalid login attempt from %1 as \"%2\""
+msgstr "Неудачная попытка входа как \"%2\" из %1"
+
+#: ../src/core/coreauthhandler.cpp:279
+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:291
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:298
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support extended features."
+msgstr "Клиент не поддерживает расщиренные возможности."
+
+#: ../src/core/coreauthhandler.cpp:300
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support the following features: %1"
+msgstr "Клиент не поддерживает следующие возможности: %1"
+
+#: ../src/core/coreauthhandler.cpp:304
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client supports unknown features: %1"
+msgstr "Клиент поддерживает неопознаные возможности: %1"
+
+#: ../src/core/coreauthhandler.cpp:337
+msgctxt "CoreAuthHandler|"
+msgid "Starting encryption for Client:"
+msgstr ""
+
+#: ../src/qtui/coreconfigwizard.cpp:44
+msgctxt "CoreConfigWizard|"
+msgid "Description"
+msgstr "Описание"
+
+#: ../src/qtui/coreconfigwizard.cpp:159

 msgctxt "CoreConfigWizard|"
 msgid "Core Configuration Wizard"
 msgstr "Мастер конфигурации ядра"
 
 msgctxt "CoreConfigWizard|"
 msgid "Core Configuration Wizard"
 msgstr "Мастер конфигурации ядра"
 

-#: ../src/qtui/coreconfigwizard.cpp:97
+#: ../src/qtui/coreconfigwizard.cpp:206

 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:216

 #, 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> чтобы "
-"начать сначала."
-
-#: ../src/qtui/coreconfigwizard.cpp:119
-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 "Ошибка конфигурации ядра:<br><b>%1</b><br>Нажмите <em>Далее</em> чтобы начать сначала."

 
 

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:14

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

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:25

 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr "Имя пользователя:"
 
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr "Имя пользователя:"
 

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:35

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

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:49

 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr "Повторите пароль:"
 
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr "Повторите пароль:"
 

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:63

 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr "Запомнить пароль"
 
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr "Запомнить пароль"
 

-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:72

 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>\"."
 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>\"."

+msgstr "<b>Примечание:</b> В данной версии программы, добавление пользователей и изменение имени пользователя и пароля не возможно через интерфейс клиента Quassel.\nЕсли Вы хотите это сделать, выполните команду \"<tt><nobr>quasselcore --help</nobr></tt>\"."
+
+#: ../src/qtui/coreconfigwizardauthenticationselectionpage.ui:14
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/coreconfigwizardauthenticationselectionpage.ui:25
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Authentication Backend:"

 msgstr ""
 msgstr ""

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

 
 

-#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
+#: ../src/qtui/coreconfigwizardintropage.ui:13

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

-#: ../src/qtui/ui/coreconfigwizardintropage.ui:19
+#: ../src/qtui/coreconfigwizardintropage.ui:19

 msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr "Этот мастер поможет вам настроить ядро Quassel."
 
 msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr "Этот мастер поможет вам настроить ядро Quassel."
 

-#: ../src/qtui/coreconfigwizard.cpp:150
+#: ../src/qtui/coreconfigwizard.cpp:260

 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:261

 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 "Для начала мы создадим пользователя в ядре. У этого первого пользователя будут привилегии администратора."
+
+#: ../src/qtui/coreconfigwizard.cpp:293
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid "Select Authentication Backend"
+msgstr ""
+
+#: ../src/qtui/coreconfigwizard.cpp:294
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid ""
+"Please select a backend for Quassel Core to use for authenticating users."

 msgstr ""
 msgstr ""

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

 
 

-#: ../src/qtui/coreconfigwizard.cpp:135
+#: ../src/qtui/coreconfigwizard.cpp:314
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid "Authentication Settings"
+msgstr "Настройки аутентификации"
+
+#: ../src/qtui/coreconfigwizard.cpp:244

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

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

 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:367

 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"

-msgid ""
-"Please select a database backend for the Quassel Core storage to store the "
-"backlog and other data in."
-msgstr ""
-"Пожалуйста выберите движок базы данных, с помощью которого ядро Quassel "
-"будет хранить журнал и прочие данные."
+msgid "Please select a storage backend for Quassel Core."
+msgstr "Пожалуйста, выберете тип хранилища для Quassel Core"

 
 

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

 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"

-msgid "Connection Properties"
-msgstr "СвойÑ\81Ñ\82ва Ñ\81оединениÑ\8f"
+msgid "Storage Settings"
+msgstr "Ð\9dаÑ\81Ñ\82Ñ\80ойки Ñ\85Ñ\80анилиÑ\89а"

 
 

-#: ../src/qtui/coreconfigwizard.cpp:317
+#: ../src/qtui/coreconfigwizard.cpp:458

 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:459

 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid ""
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid ""

-"Your settings are now stored in the core, and you will be logged in "
+"Your settings are now being stored in the core, and you will be logged in "

 "automatically."
 "automatically."

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

 
 

-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
+#: ../src/qtui/coreconfigwizardstorageselectionpage.ui:14

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

-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
+#: ../src/qtui/coreconfigwizardstorageselectionpage.ui:22

 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr "Движок хранения:"
 
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr "Движок хранения:"
 

-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
-msgctxt "CoreConfigWizardStorageSelectionPage|"
-msgid "Description"
-msgstr "Описание"
-
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
-msgctxt "CoreConfigWizardStorageSelectionPage|"
-msgid "Foobar"
-msgstr "Foobar"
-
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:13
+#: ../src/qtui/coreconfigwizardsyncpage.ui:14

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

-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
+#: ../src/qtui/coreconfigwizardsyncpage.ui:20

 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr "Ваши выборы"
 
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr "Ваши выборы"
 

-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
+#: ../src/qtui/coreconfigwizardsyncpage.ui:36

 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr "Пользователь-администратор:"
 
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr "Пользователь-администратор:"
 

-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:42
-msgctxt "CoreConfigWizardSyncPage|"
-msgid "foo"
-msgstr "foo"
-
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
+#: ../src/qtui/coreconfigwizardsyncpage.ui:56

 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Storage Backend:"
 msgstr "Движок хранения:"
 
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Storage Backend:"
 msgstr "Движок хранения:"
 

-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
+#: ../src/qtui/coreconfigwizardsyncpage.ui:76

 msgctxt "CoreConfigWizardSyncPage|"
 msgctxt "CoreConfigWizardSyncPage|"

-msgid "bar"
-msgstr "bar"
+msgid "Authentication Backend:"
+msgstr ""

 
 

-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
+#: ../src/qtui/coreconfigwizardsyncpage.ui:110

 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr "Пожалуйста подождите пока ваши настройки передаются ядру..."
 
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr "Пожалуйста подождите пока ваши настройки передаются ядру..."
 

-#: ../src/qtui/ui/coreconnectauthdlg.ui:14
+#: ../src/qtui/coreconnectauthdlg.ui:14

 msgctxt "CoreConnectAuthDlg|"
 msgid "Authentication Required"
 msgstr "Требуется проверка подлинности"
 
 msgctxt "CoreConnectAuthDlg|"
 msgid "Authentication Required"
 msgstr "Требуется проверка подлинности"
 

-#: ../src/qtui/ui/coreconnectauthdlg.ui:20
+#: ../src/qtui/coreconnectauthdlg.ui:20

 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your account data:"
 msgstr "Пожалуйста, введите данные Вашей учётной записи:"
 
 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your account data:"
 msgstr "Пожалуйста, введите данные Вашей учётной записи:"
 

-#: ../src/qtui/ui/coreconnectauthdlg.ui:35
+#: ../src/qtui/coreconnectauthdlg.ui:35

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

-#: ../src/qtui/ui/coreconnectauthdlg.ui:49
+#: ../src/qtui/coreconnectauthdlg.ui:49

 msgctxt "CoreConnectAuthDlg|"
 msgid "Username:"
 msgstr "Имя пользователя:"
 
 msgctxt "CoreConnectAuthDlg|"
 msgid "Username:"
 msgstr "Имя пользователя:"
 

-#: ../src/qtui/ui/coreconnectauthdlg.ui:58
+#: ../src/qtui/coreconnectauthdlg.ui:58

 msgctxt "CoreConnectAuthDlg|"
 msgid "Remember password"
 msgstr "Запомнить пароль"
 
 msgctxt "CoreConnectAuthDlg|"
 msgid "Remember password"
 msgstr "Запомнить пароль"
 

-#: ../src/qtui/coreconnectdlg.cpp:75
+#: ../src/qtui/coreconnectdlg.cpp:79

 #, 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:42

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

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

 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:247

 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:281

 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
+#: ../src/client/coreconnection.cpp:357

 msgctxt "CoreConnection|"
 msgctxt "CoreConnection|"

-msgid "Logging in..."
-msgstr "Авторизуюсь..."
-
-#: ../src/client/coreconnection.cpp:597
-msgctxt "CoreConnection|"
-msgid "Login canceled"
-msgstr "Вход в систему отменен"
+msgid "Initializing..."
+msgstr "Инициализация..."

 
 

-#: ../src/client/coreconnection.cpp:622
+#: ../src/client/coreconnection.cpp:412

 msgctxt "CoreConnection|"
 msgid "Receiving session state"
 msgstr "Получение состояния сетей"
 
 msgctxt "CoreConnection|"
 msgid "Receiving session state"
 msgstr "Получение состояния сетей"
 

-#: ../src/client/coreconnection.cpp:624
+#: ../src/client/coreconnection.cpp:414

 #, 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:444

 msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr "Получение состояния сетей"
 
 msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr "Получение состояния сетей"
 

-#: ../src/client/coreconnection.cpp:698
+#: ../src/client/coreconnection.cpp:493

 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronized to %1"
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronized to %1"


@@ -2057,28 +3269,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 "Ð\98Ñ\81полÑ\8cзÑ\83йÑ\82е Ñ\81еÑ\82евое обнаÑ\80Ñ\83жение Ñ\81оÑ\81Ñ\82оÑ\8fниÑ\8f KDE (via Solid)"
+msgid "Automatic"
+msgstr "Ð\90вÑ\82омаÑ\82иÑ\87еÑ\81ки"

 
 #: ../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 +3301,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 +3318,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"


@@ -2125,93 +3333,355 @@ msgctxt "CoreConnectionSettingsPage|"
 msgid "Connection"
 msgstr "Соединения"
 
 msgid "Connection"
 msgstr "Соединения"
 

-#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
+#: ../src/qtui/coreconnectionstatuswidget.ui:14

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

-#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
+#: ../src/qtui/coreconnectionstatuswidget.ui:32

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

-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
-msgctxt "CoreConnectionStatusWidget|seconds"
-msgid "s"
-msgstr " сек"
+#: ../src/qtui/coreconnectionstatuswidget.cpp:64
+msgctxt "CoreConnectionStatusWidget|seconds"
+msgid "s"
+msgstr " сек"
+
+#: ../src/qtui/coreconnectionstatuswidget.cpp:64
+msgctxt "CoreConnectionStatusWidget|milliseconds"
+msgid "ms"
+msgstr "мс"
+
+#: ../src/qtui/coreconnectionstatuswidget.cpp:65
+#, qt-format
+msgctxt "CoreConnectionStatusWidget|"
+msgid "(Lag: %1 %2)"
+msgstr "(Задержка: %1 %2)"
+
+#: ../src/qtui/coreconnectionstatuswidget.cpp:80
+msgctxt "CoreConnectionStatusWidget|"
+msgid "The connection to your core is encrypted with SSL."
+msgstr "Соединение с ядром использует SSL-шифрование."
+
+#: ../src/qtui/coreconnectionstatuswidget.cpp:84
+msgctxt "CoreConnectionStatusWidget|"
+msgid "The connection to your core is not encrypted."
+msgstr "Соединение с ядром не использует шифрование."
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:14
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:57
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:677
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Your Quassel core is too old to support remote highlights"
+msgstr "Вы используете устаревшее ядро Quassel, поддержка удаленной подсведтки недоступна"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:64
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:93
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Rules"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:99
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Nicks"
+msgstr "Подсвечивать ники"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:127
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Case sensitive"
+msgstr "Учитывать регистр"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:153
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Custom Highlights"
+msgstr "Произвольные подсветки"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:166
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:269
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enabled"
+msgstr "Включено"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:171
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:274
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:176
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:279
+msgctxt "CoreHighlightSettingsPage|"
+msgid "RegEx"
+msgstr "Регэксп"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:181
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:284
+msgctxt "CoreHighlightSettingsPage|"
+msgid "CS"
+msgstr "Регистр"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:186
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:289
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Sender"
+msgstr "Отправитель"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:191
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:294
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Channel"
+msgstr "Канал"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:207
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:310
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Add"
+msgstr "Добавить"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:214
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:317
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remove"
+msgstr "Удалить"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:250
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Ignore Rules"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:256
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Never Highlight For"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:35
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:35
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:43
+msgctxt "CoreHighlightSettingsPage|"
+msgid "All Nicks from Identity"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:44
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Current Nick"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:45
+msgctxt "CoreHighlightSettingsPage|"
+msgid "None"
+msgstr "Нет"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:86
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import Legacy"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:88
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import highlight rules configured in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:88
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:674
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:696
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Legacy Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:129
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enable/disable this rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:132
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Phrase to match, leave blank to match any message"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:135
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<b>RegEx</b>: This option determines if the highlight rule, <i>Sender</i>, "
+"and <i>Channel</i> should be interpreted as <b>regular expressions</b> or "
+"just as keywords."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:140
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<b>CS</b>: This option determines if the highlight rule, <i>Sender</i>, and "
+"<i>Channel</i> should be interpreted <b>case sensitive</b>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:144
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<p><b>Sender</b>: Semicolon separated list of <i>nick!ident@host</i> names, "
+"leave blank to match any nickname.</p><p><i>Example:</i><br /><i>Alice!*; "
+"Bob!*@example.com; Carol*!*; !Caroline!*</i><br />would match on "
+"<i>Alice</i>, <i>Bob</i> with hostmask <i>example.com</i>, and any nickname "
+"starting with <i>Carol</i> except for <i>Caroline</i><br /><p>If only "
+"inverted names are specified, it will match anything except for what's "
+"specified (implicit wildcard).</p><p><i>Example:</i><br /><i>!Announce*!*; "
+"!Wheatley!aperture@*</i><br />would match anything except for "
+"<i>Wheatley</i> with ident <i>aperture</i> or any nickname starting with "
+"<i>Announce</i></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:158
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<p><b>Channel</b>: Semicolon separated list of channel/query names, leave "
+"blank to match any name.</p><p><i>Example:</i><br /><i>#quassel*; #foobar; "
+"!#quasseldroid</i><br />would match on <i>#foobar</i> and any channel "
+"starting with <i>#quassel</i> except for <i>#quasseldroid</i><br /><p>If "
+"only inverted names are specified, it will match anything except for what's "
+"specified (implicit wildcard).</p><p><i>Example:</i><br /><i>!#quassel*; "
+"!#foobar</i><br />would match anything except for <i>#foobar</i> or any "
+"channel starting with <i>#quassel</i></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:678
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer to configure remote highlights."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:680
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "You can still configure highlights for this device only in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:684
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remote Highlights unsupported"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:700
+msgctxt "CoreHighlightSettingsPage|"
+msgid "No highlights to import"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:700
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "No highlight rules in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:705
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import highlights?"
+msgstr ""

 
 

-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
-msgctxt "CoreConnectionStatusWidget|milliseconds"
-msgid "ms"
-msgstr "мс"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:706
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import all highlight rules from <i>%1</i>?"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:756
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Imported highlights"
+msgstr ""

 
 

-#: ../src/qtui/coreconnectionstatuswidget.cpp:62
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:758

 #, qt-format
 #, qt-format

-msgctxt "CoreConnectionStatusWidget|"
-msgid "(Lag: %1 %2)"
+msgctxt "CoreHighlightSettingsPage|"
+msgid "%1 highlight rules successfully imported."

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/coreconnectionstatuswidget.cpp:75
-msgctxt "CoreConnectionStatusWidget|"
-msgid "The connection to your core is encrypted with SSL."
-msgstr "Соединение с ядром использует SSL-шифрование."
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:759
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Clean up old, duplicate highlight rules?"
+msgstr ""

 
 

-#: ../src/qtui/coreconnectionstatuswidget.cpp:78
-msgctxt "CoreConnectionStatusWidget|"
-msgid "The connection to your core is not encrypted."
-msgstr "Соединение с ядром не использует шифрование."
+#: ../src/qtui/settingspages/corehighlightsettingspage.h:63
+#: ../src/qtui/settingspages/corehighlightsettingspage.h:71
+msgctxt "CoreHighlightSettingsPage|"
+msgid "highlight rule"
+msgstr "правило подсветки"

 
 

-#: ../src/qtui/ui/coreinfodlg.ui:13
+#: ../src/qtui/coreinfodlg.ui:14

 msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr "Информация о ядре"
 
 msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr "Информация о ядре"
 

-#: ../src/qtui/ui/coreinfodlg.ui:21
+#: ../src/qtui/coreinfodlg.ui:22

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

-#: ../src/qtui/ui/coreinfodlg.ui:28
+#: ../src/qtui/coreinfodlg.ui:42

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

-msgid "<core version>"
-msgstr "<core version>"
+msgid "Version date:"
+msgstr ""

 
 

-#: ../src/qtui/ui/coreinfodlg.ui:35
+#: ../src/qtui/coreinfodlg.ui:56

 msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr "Аптайм:"
 
 msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr "Аптайм:"
 

-#: ../src/qtui/ui/coreinfodlg.ui:42
+#: ../src/qtui/coreinfodlg.ui:70

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

-msgid "Connected Clients:"
-msgstr "Соединено клиентов:"
+msgid "Connected clients:"
+msgstr ""

 
 

-#: ../src/qtui/ui/coreinfodlg.ui:49
+#: ../src/qtui/coreinfodlg.ui:123 ../src/qtui/coreinfodlg.cpp:194

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

-msgid "<connected clients>"
-msgstr "<connected clients>"
+msgid "Your Quassel core is too old to show active sessions"
+msgstr ""

 
 

-#: ../src/qtui/ui/coreinfodlg.ui:56
+#: ../src/qtui/coreinfodlg.ui:130

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

-msgid "<core uptime>"
-msgstr "<core uptime>"
+msgid "Details..."
+msgstr ""

 
 

-#: ../src/qtui/ui/coreinfodlg.ui:63
+#: ../src/qtui/coreinfodlg.ui:206

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

-msgid "Build date:"
-msgstr "Ð\94аÑ\82а Ñ\81боÑ\80ки:"
+msgid "Close"
+msgstr "Ð\97акÑ\80Ñ\8bÑ\82Ñ\8c"

 
 

-#: ../src/qtui/ui/coreinfodlg.ui:70
+#: ../src/qtui/coreinfodlg.cpp:86 ../src/qtui/coreinfodlg.cpp:87
+#: ../src/qtui/coreinfodlg.cpp:160

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

-msgid "<build date>"
-msgstr "<build date>"
+msgid "Unknown"
+msgstr ""

 
 

-#: ../src/qtui/ui/coreinfodlg.ui:81
+#: ../src/qtui/coreinfodlg.cpp:91

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

-msgid "Close"
-msgstr "Закрыть"
+msgid "Disconnected from core"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:92 ../src/qtui/coreinfodlg.cpp:156
+msgctxt "CoreInfoDlg|"
+msgid "Not available"
+msgstr ""

 
 

-#: ../src/qtui/coreinfodlg.cpp:53
+#: ../src/qtui/coreinfodlg.cpp:101
+msgctxt "CoreInfoDlg|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:174

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


@@ -2219,119 +3689,348 @@ 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:175

 #, 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/qtui/coreinfodlg.cpp:192
+msgctxt "CoreInfoDlg|"
+msgid "Active sessions unsupported"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:195
+msgctxt "CoreInfoDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer to view and disconnect other "
+"connected clients."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:231

 msgctxt "CoreNetwork|"
 msgctxt "CoreNetwork|"

-msgid "Connection failed. Cycling to next Server"
-msgstr "Сбой соединения. Пробую следующий сервер"
+msgid "Connection failed. Cycling to next server..."
+msgstr ""

 
 

-#: ../src/core/corenetwork.cpp:156 ../src/core/corenetwork.cpp:157
+#: ../src/core/corenetwork.cpp:243 ../src/core/corenetwork.cpp:248

 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connecting to %1:%2..."
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connecting to %1:%2..."

-msgstr ""
+msgstr "Соединяюсь с %1:%2..."

 
 

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

 #, 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:316

 msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr "Ядро завершает работу"
 
 msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr "Ядро завершает работу"
 

-#: ../src/core/corenetwork.cpp:343
+#: ../src/core/corenetwork.cpp:537

 #, 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:543

 #, 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/corenetwork.cpp:591
+msgctxt "CoreNetwork|"
+msgid "Requesting capability list..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1125
+msgctxt "CoreNetwork|"
+msgid "SASL EXTERNAL authentication not supported"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1141
+msgctxt "CoreNetwork|"
+msgid "SASL PLAIN authentication not supported"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1253
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Could not negotiate some capabilities, retrying individually (%1)..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1289
+msgctxt "CoreNetwork|"
+msgid "No capabilities available"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1295
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid ""
+"None of the capabilities provided by the server are supported (found: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1303
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid ""
+"No additional capabilities are supported (found: %1; currently enabled: %2)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1320 ../src/core/corenetwork.cpp:1343
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Quassel is configured to ignore some capabilities (skipped: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1334
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Ready to negotiate (found: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1356
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Negotiating capabilities (requesting: %1)..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1376
+msgctxt "CoreNetwork|"
+msgid "SASL authentication currently not supported by server"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1384
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Capability negotiation finished (enabled: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1518
+msgctxt "CoreNetwork|"
+msgid ""
+"Encrypted connection couldn't be verified, disconnecting since verification "
+"is required"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1522 ../src/core/corenetwork.cpp:1541
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid " (Reason: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1537
+msgctxt "CoreNetwork|"
+msgid ""
+"Encrypted connection couldn't be verified, continuing since verification is "
+"not required"
+msgstr ""
+
+#: ../src/core/coresession.cpp:279

 msgctxt "CoreSession|"
 msgid "Client"
 msgstr "Клиент"
 
 msgctxt "CoreSession|"
 msgid "Client"
 msgstr "Клиент"
 

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

 #, 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:607

 #, 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:638

 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:82

 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:821
+msgctxt "CoreSessionEventProcessor|"
+msgid "Unable to perform key exchange, missing qca-ossl plugin."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:838
+msgctxt "CoreSessionEventProcessor|"
+msgid "Unable to parse the DH1080_INIT. Key exchange failed."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:849
+#: ../src/core/coresessioneventprocessor.cpp:864
+msgctxt "CoreSessionEventProcessor|"
+msgid "Your key is set and messages will be encrypted."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:873
+msgctxt "CoreSessionEventProcessor|"
+msgid "Failed to parse DH1080_FINISH. Key exchange failed."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1602
+msgctxt "CoreSessionEventProcessor|"
+msgid "Reverse DCC SEND not supported"
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1625
+#, qt-format
+msgctxt "CoreSessionEventProcessor|"
+msgid "DCC %1 not supported"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:29
+msgctxt "CoreSessionWidget|"
+msgid "12.34.56.78"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:37
+msgctxt "CoreSessionWidget|"
+msgid "Client:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:57
+msgctxt "CoreSessionWidget|"
+msgid "Version date:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:71
+msgctxt "CoreSessionWidget|"
+msgid "Location:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:85
+msgctxt "CoreSessionWidget|"
+msgid "Connected since:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:99
+msgctxt "CoreSessionWidget|"
+msgid "Secure:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:130
+msgctxt "CoreSessionWidget|"
+msgid "End Session"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:41
+msgctxt "CoreSessionWidget|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:51
+msgctxt "CoreSessionWidget|"
+msgid "Yes"
+msgstr "Да"
+
+#: ../src/qtui/coresessionwidget.cpp:51
+msgctxt "CoreSessionWidget|"
+msgid "No"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:57 ../src/qtui/coresessionwidget.cpp:71
+msgctxt "CoreSessionWidget|"
+msgid "End the client's session, disconnecting it"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:71
+msgctxt "CoreSessionWidget|"
+msgid "This client does not support being remotely disconnected"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:85
+msgctxt "CoreSessionWidget|"
+msgid "Ending session..."
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:64
+msgctxt "CoreTransfer|"
+msgid "Socket closed while still transferring!"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:75
+#, qt-format
+msgctxt "CoreTransfer|"
+msgid "DCC connection error: %1"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:115
+msgctxt "CoreTransfer|"
+msgid "Reverse DCC not supported yet!"

 msgstr ""
 msgstr ""

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

 
 

-#: ../src/core/coreuserinputhandler.cpp:81
+#: ../src/core/coretransfer.cpp:160
+msgctxt "CoreTransfer|"
+msgid "DCC Receive: Got more data than expected!"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:175
+msgctxt "CoreTransfer|"
+msgid "DCC Receive: Quassel Client disconnected during transfer!"
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:91

 msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr "отсутствует"
 
 msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr "отсутствует"
 

-#: ../src/core/coreuserinputhandler.cpp:150
+#: ../src/core/coreuserinputhandler.cpp:178

 #, 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:210
+#: ../src/core/coreuserinputhandler.cpp:406
+#: ../src/core/coreuserinputhandler.cpp:767
+#: ../src/core/coreuserinputhandler.cpp:830
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"Error: QCA provider plugin not found. It is usually provided by the qca-ossl"
+" plugin."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:225

 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:238
+#: ../src/core/coreuserinputhandler.cpp:859

 #, 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:248

 #, 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:257
+#: ../src/core/coreuserinputhandler.cpp:877

 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,85 +4039,222 @@ msgid ""
 "with QCA2 present."
 msgstr ""
 
 "with QCA2 present."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:422
+#: ../src/core/coreuserinputhandler.cpp:420
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:432
+msgctxt "CoreUserInputHandler|"
+msgid "It is only possible to exchange keys in a query buffer."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:447
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Failed to initiate key exchange with %1."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:457
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Initiated key exchange with %1."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:466
+#: ../src/core/coreuserinputhandler.cpp:804
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"Error: Setting an encryption key requires Quassel to have been built with "
+"support for the Qt Cryptographic Architecture (QCA) library. Contact your "
+"distributor about a Quassel package with QCA support, or rebuild Quassel "
+"with QCA present."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:540
+msgctxt "CoreUserInputHandler|"
+msgid "Your persistent modes have been reset."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:682

 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Starting query with %1"
 msgstr ""
 
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Starting query with %1"
 msgstr ""
 

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

 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 "
 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."
+"it. Prefix <key> by cbc: or ebc: to explicitly set the encryption mode "
+"respectively. Default is CBC."

 msgstr ""
 
 msgstr ""
 

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

 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been set."
 msgstr ""
 
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been set."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:487
-msgctxt "CoreUserInputHandler|"
-msgid ""
-"Error: Setting an encryption key requires Quassel to have been built with "
-"support for the Qt Cryptographic Architecture (QCA) library. Contact your "
-"distributor about a Quassel package with QCA support, or rebuild Quassel "
-"with QCA present."
+#: ../src/core/coreuserinputhandler.cpp:845
+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:868
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 is %2:%3"
+msgstr ""
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:17
+msgctxt "CreateIdentityDlg|"
+msgid "Create New Identity"
+msgstr "Создать новую личность"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:25
+msgctxt "CreateIdentityDlg|"
+msgid "Identity name:"
+msgstr "Название личности:"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:37
+msgctxt "CreateIdentityDlg|"
+msgid "Create blank identity"
+msgstr "Создать пустую личность"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:49
+msgctxt "CreateIdentityDlg|"
+msgid "Duplicate:"
+msgstr "Дублировать:"
+
+#: ../src/common/protocols/datastream/datastreampeer.cpp:113
+msgctxt "DataStreamPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
+
+#: ../src/common/protocols/datastream/datastreampeer.cpp:176
+#, qt-format
+msgctxt "DataStreamPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:14
+msgctxt "DccSettingsPage|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:20
+msgctxt "DccSettingsPage|"
+msgid "Enable DCC"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:37
+msgctxt "DccSettingsPage|"
+msgid "Ports:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:51
+#: ../src/qtui/settingspages/dccsettingspage.ui:134
+msgctxt "DccSettingsPage|"
+msgid "Automatic"
+msgstr "Автоматически"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:56
+#: ../src/qtui/settingspages/dccsettingspage.ui:139
+msgctxt "DccSettingsPage|"
+msgid "Manual"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:82
+msgctxt "DccSettingsPage|"
+msgid "to"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:110
+msgctxt "DccSettingsPage|"
+msgid "Outgoing IP:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:164
+msgctxt "DccSettingsPage|"
+msgid "DCC send timeout:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:171
+msgctxt "DccSettingsPage|"
+msgid " seconds"
+msgstr " сек."
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:213
+msgctxt "DccSettingsPage|"
+msgid "Chunk size:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:220
+msgctxt "DccSettingsPage|"
+msgid " KiB"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:263
+msgctxt "DccSettingsPage|"
+msgid "Use passive/reverse DCC"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:276
+msgctxt "DccSettingsPage|"
+msgid "Use fast sending (might not work with all peers)"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:295
+msgctxt "DccSettingsPage|"
+msgid "File transfers"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:509
-msgctxt "CoreUserInputHandler|"
-msgid ""
-"[usage] /showkey <nick|channel> shows the encryption key for nick or channel"
-" or just /showkey when in a channel or query."
+#: ../src/qtui/settingspages/dccsettingspage.ui:303
+msgctxt "DccSettingsPage|"
+msgid "Default download folder:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:521
-#, qt-format
-msgctxt "CoreUserInputHandler|"
-msgid "The key for %1 is %2"
-msgstr "Домашняя страница для %1 %2"
+#: ../src/qtui/settingspages/dccsettingspage.ui:313
+msgctxt "DccSettingsPage|"
+msgid "..."
+msgstr "..."

 
 

-#: ../src/core/coreuserinputhandler.cpp:633
-#, qt-format
-msgctxt "CoreUserInputHandler|"
-msgid "[Error] Could not encrypt your message: %1"
+#: ../src/qtui/settingspages/dccsettingspage.ui:322
+msgctxt "DccSettingsPage|"
+msgid "Create folder per sender"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/createidentitydlg.ui:17
-msgctxt "CreateIdentityDlg|"
-msgid "Create New Identity"
-msgstr "Создать новую личность"
-
-#: ../src/qtui/settingspages/createidentitydlg.ui:25
-msgctxt "CreateIdentityDlg|"
-msgid "Identity name:"
-msgstr "Название личности:"
+#: ../src/qtui/settingspages/dccsettingspage.ui:329
+msgctxt "DccSettingsPage|"
+msgid "Prefix filenames with sender"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/createidentitydlg.ui:37
-msgctxt "CreateIdentityDlg|"
-msgid "Create blank identity"
-msgstr "Создать пустую личность"
+#: ../src/qtui/settingspages/dccsettingspage.cpp:28
+msgctxt "DccSettingsPage|"
+msgid "IRC"
+msgstr "IRC"

 
 

-#: ../src/qtui/settingspages/createidentitydlg.ui:49
-msgctxt "CreateIdentityDlg|"
-msgid "Duplicate:"
-msgstr "Дублировать:"
+#: ../src/qtui/settingspages/dccsettingspage.cpp:28
+msgctxt "DccSettingsPage|"
+msgid "DCC"
+msgstr ""

 
 

-#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
+#: ../src/qtui/debugbufferviewoverlay.ui:13

 msgctxt "DebugBufferViewOverlay|"
 msgid "Debug BufferView Overlay"
 msgstr ""
 
 msgctxt "DebugBufferViewOverlay|"
 msgid "Debug BufferView Overlay"
 msgstr ""
 

-#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
+#: ../src/qtui/debugbufferviewoverlay.ui:26

 msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay View"
 msgstr ""
 
 msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay View"
 msgstr ""
 

-#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
+#: ../src/qtui/debugbufferviewoverlay.ui:39

 msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay Properties"
 msgstr "Свойства соединения"
 msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay Properties"
 msgstr "Свойства соединения"


@@ -2468,377 +4304,515 @@ msgctxt "DebugBufferViewOverlay|"
 msgid "Is initialized:"
 msgstr "Инициализирован:"
 
 msgid "Is initialized:"
 msgstr "Инициализирован:"
 

-#: ../src/qtui/ui/debugconsole.ui:14
-msgctxt "DebugConsole|"
-msgid "Debug Console"
-msgstr "Консоль отладки"
-
-#: ../src/qtui/ui/debugconsole.ui:44
-msgctxt "DebugConsole|"
-msgid "local"
-msgstr "local"
-
-#: ../src/qtui/ui/debugconsole.ui:54
-msgctxt "DebugConsole|"
-msgid "core"
-msgstr "core"
-
-#: ../src/qtui/ui/debugconsole.ui:82
-msgctxt "DebugConsole|"
-msgid "Evaluate!"
-msgstr "Вычислить!"
-
-#: ../src/qtui/ui/debuglogwidget.ui:13
-msgctxt "DebugLogWidget|"
+#: ../src/qtui/debuglogdlg.ui:14
+msgctxt "DebugLogDlg|"

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

-#: ../src/qtui/ui/debuglogwidget.ui:43
-msgctxt "DebugLogWidget|"
-msgid "Close"
-msgstr "Закрыть"
+#: ../src/qtui/dockmanagernotificationbackend.cpp:196
+msgctxt "DockManagerNotificationBackend::ConfigWidget|"
+msgid "Mark dockmanager entry"
+msgstr ""

 
 

-#: ../src/core/eventstringifier.cpp:133 ../src/core/eventstringifier.cpp:250
+#: ../src/core/eventstringifier.cpp:240 ../src/core/eventstringifier.cpp:450

 msgctxt "EventStringifier|"
 msgid "[Whois] "
 msgstr "[Whois] %1"
 
 msgctxt "EventStringifier|"
 msgid "[Whois] "
 msgstr "[Whois] %1"
 

-#: ../src/core/eventstringifier.cpp:145
+#: ../src/core/eventstringifier.cpp:261

 #, 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:264
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 invited %2 to channel %3"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:412

 #, 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:424
+msgctxt "EventStringifier|"
+msgid "Error from server: "
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:429
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Operwall] %1: %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:436

 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:473

 #, 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:479

 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:486

 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:507

 #, 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:522

 #, 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:524

 #, 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:533

 #, 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:541

 #, 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:563

 #, 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:568

 #, 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:576

 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:598

 #, 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:600

 #, 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:602

 #, 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:625

 #, 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:631

 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:647

 #, 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:672

 #, 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:683

 #, 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:686
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was authed as %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:694

 #, 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:701

 #, 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:722

 #, 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:734

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has been invited to %2"
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has been invited to %2"

-msgstr ""
+msgstr "%1 приглашен(а) в %2"

 
 

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

 #, 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:750
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[WhoX] %1"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:756

 msgctxt "EventStringifier|"
 msgid "End of /WHOWAS"
 msgstr ""
 
 msgctxt "EventStringifier|"
 msgid "End of /WHOWAS"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:478
+#: ../src/core/eventstringifier.cpp:765

 #, 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:774

 #, 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:783

 #, 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:812

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
 #. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
 #, 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:829

 msgctxt "EventStringifier|"
 msgid "unknown"
 msgstr ""
 
 msgctxt "EventStringifier|"
 msgid "unknown"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:523
+#: ../src/core/eventstringifier.cpp:830

 #, 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:835

 #, 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:858

 #, 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:58

 #, 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:68

 #, 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:79

 #, 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:100

 #, 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:117

 #, 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:119

 #, 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:33

 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:35
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:260
+msgctxt "HighlightSettingsPage|"
+msgid "Legacy Highlights are replaced by Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:42
+msgctxt "HighlightSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:51

 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:64
+msgctxt "HighlightSettingsPage|"
+msgid "Enabled"
+msgstr "Включено"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:69

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

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

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

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

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

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

 msgctxt "HighlightSettingsPage|"
 msgctxt "HighlightSettingsPage|"

-msgid "Enable"
-msgstr "Ð\92клÑ\8eÑ\87ено"
+msgid "Channel"
+msgstr "Ð\9aанал"

 
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:55
+#: ../src/qtui/settingspages/highlightsettingspage.ui:100

 msgctxt "HighlightSettingsPage|"
 msgid "Add"
 msgstr "Добавить"
 
 msgctxt "HighlightSettingsPage|"
 msgid "Add"
 msgstr "Добавить"
 

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

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

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

 msgctxt "HighlightSettingsPage|"
 msgid "Highlight Nicks"
 msgstr "Подсвечивать ники"
 
 msgctxt "HighlightSettingsPage|"
 msgid "Highlight Nicks"
 msgstr "Подсвечивать ники"
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:91
+#: ../src/qtui/settingspages/highlightsettingspage.ui:138

 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:145

 msgctxt "HighlightSettingsPage|"
 msgid "Current nick"
 msgstr "Текущий ник"
 
 msgctxt "HighlightSettingsPage|"
 msgid "Current nick"
 msgstr "Текущий ник"
 

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

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

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

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

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

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

-#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:34
+msgctxt "HighlightSettingsPage|"
+msgid "Legacy Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:41
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:143
+msgctxt "HighlightSettingsPage|"
+msgid "Enable/disable this rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:45
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:144
+msgctxt "HighlightSettingsPage|"
+msgid "Phrase to match"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:50
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:145
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"<b>RegEx</b>: This option determines if the highlight rule and "
+"<i>Channel</i> should be interpreted as <b>regular expressions</b> or just "
+"as keywords."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:56
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:147
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"<b>CS</b>: This option determines if the highlight rule and <i>Channel</i> "
+"should be interpreted <b>case sensitive</b>."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:62
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:149
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"<p><b>Channel</b>: Semicolon separated list of channel/query names, leave "
+"blank to match any name.</p><p><i>Example:</i><br /><i>#quassel*; #foobar; "
+"!#quasseldroid</i><br />would match on <i>#foobar</i> and any channel "
+"starting with <i>#quassel</i> except for <i>#quasseldroid</i><br /><p>If "
+"only inverted names are specified, it will match anything except for what's "
+"specified (implicit wildcard).</p><p><i>Example:</i><br /><i>!#quassel*; "
+"!#foobar</i><br />would match anything except for <i>#foobar</i> or any "
+"channel starting with <i>#quassel</i></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:234

 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.cpp:258
+msgctxt "HighlightSettingsPage|"
+msgid "Legacy Highlights vs. Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:261
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"These highlights will keep working for now, but you should move to the "
+"improved highlight rules when you can."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:263
+#, qt-format
+msgctxt "HighlightSettingsPage|"
+msgid "Configure the new style of highlights in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:264
+msgctxt "HighlightSettingsPage|"
+msgid "Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.h:47

 msgctxt "HighlightSettingsPage|"
 msgid "highlight rule"
 msgstr "правило подсветки"
 
 msgctxt "HighlightSettingsPage|"
 msgid "highlight rule"
 msgstr "правило подсветки"
 

+#: ../src/core/identserver.cpp:46
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Invalid listen address %1"
+msgstr "Некорректный адрес для прослушивания %1"
+
+#: ../src/core/identserver.cpp:55
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd requests on IPv6 %1 port %2"
+msgstr ""
+
+#: ../src/core/identserver.cpp:63
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Could not open IPv6 interface %1:%2: %3"
+msgstr "Не могу открыть интерфейс IPv6 %1:%2: %3"
+
+#: ../src/core/identserver.cpp:71
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd requests on IPv4 %1 port %2"
+msgstr ""
+
+#: ../src/core/identserver.cpp:81
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Could not open IPv4 interface %1:%2: %3"
+msgstr "Не могу открыть интерфейс IPv4 %1:%2: %3"
+
+#: ../src/core/identserver.cpp:89
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Invalid listen address %1, unknown network protocol"
+msgstr "Некорректный адрес для прослушивания %1, неизвестный сетевой протокол"
+
+#: ../src/core/identserver.cpp:98
+msgctxt "IdentServer|"
+msgid ""
+"Identd could not open any network interfaces to listen on! No identd "
+"functionality will be available"
+msgstr ""
+

 #: ../src/qtui/settingspages/identitiessettingspage.ui:31
 #: ../src/qtui/settingspages/identitiessettingspage.ui:31

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:322
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:352

 msgctxt "IdentitiesSettingsPage|"
 msgid "Rename Identity"
 msgstr "Переименовать личность"
 msgctxt "IdentitiesSettingsPage|"
 msgid "Rename Identity"
 msgstr "Переименовать личность"


@@ -2847,7 +4821,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|"


@@ -2864,106 +4838,104 @@ msgctxt "IdentitiesSettingsPage|"
 msgid "Remove Identity"
 msgstr "Удалить личность"
 
 msgid "Remove Identity"
 msgstr "Удалить личность"
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:33

 msgctxt "IdentitiesSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:33

 msgctxt "IdentitiesSettingsPage|"
 msgid "Identities"
 msgstr "Личности"
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "Identities"
 msgstr "Личности"
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:178
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:192

 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:194

 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:196

 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:198

 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:200

 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:201

 msgctxt "IdentitiesSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:184
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:202

 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:335

 msgctxt "IdentitiesSettingsPage|"
 msgid "Delete Identity?"
 msgstr "Удалить личность?"
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "Delete Identity?"
 msgstr "Удалить личность?"
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:311
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:336

 #, 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:353

 #, 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:141

 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:170

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

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

 msgctxt "Identity|"
 msgid "Gone fishing."
 msgstr "Ловлю рыбу."
 
 msgctxt "Identity|"
 msgid "Gone fishing."
 msgstr "Ловлю рыбу."
 

-#: ../src/common/identity.cpp:172
+#: ../src/common/identity.cpp:180

 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:183

 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:186

 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:187 ../src/common/identity.cpp:188

 msgctxt "Identity|"
 msgctxt "Identity|"

-msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
-msgstr "http://quassel-irc.org - Разговаривать удобно. Везде."
+msgid "https://quassel-irc.org - Chat comfortably. Anywhere."
+msgstr ""

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


@@ -3024,7 +4996,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|"


@@ -3066,8 +5038,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 +5066,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:277

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


@@ -3110,9 +5081,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 +5107,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 +5132,15 @@ 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:396

 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:397
+#: ../src/qtui/settingspages/identityeditwidget.cpp:451

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


@@ -3193,8 +5157,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:449
+#: ../src/qtui/settingspages/identityeditwidget.cpp:450

 msgctxt "IdentityEditWidget|"
 msgid "No Certificate loaded"
 msgstr "Сертификат не загружен"
 msgctxt "IdentityEditWidget|"
 msgid "No Certificate loaded"
 msgstr "Сертификат не загружен"


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

-#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+#: ../src/qtui/settingspages/identityeditwidget.cpp:101
+msgctxt "IdentityEditWidget|"
+msgid ""
+"You can add date/time to this message using the syntax: <br/>%%<span "
+"class='italic'>&lt;format&gt;</span>%%, where <span "
+"class='italic'>&lt;format&gt;</span> is:"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:107
+msgctxt "IdentityEditWidget|"
+msgid "the hour"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:108
+msgctxt "IdentityEditWidget|"
+msgid "the minutes"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:109
+msgctxt "IdentityEditWidget|"
+msgid "seconds"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:110
+msgctxt "IdentityEditWidget|"
+msgid "AM/PM"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:111
+msgctxt "IdentityEditWidget|"
+msgid "day"
+msgstr "день"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:112
+msgctxt "IdentityEditWidget|"
+msgid "month"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:113
+msgctxt "IdentityEditWidget|"
+msgid "current timezone"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:115
+msgctxt "IdentityEditWidget|"
+msgid "Example: Away since %%hh:mm%% on %%dd.MM%%."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:117
+msgctxt "IdentityEditWidget|"
+msgid ""
+"%%%% without anything inside represents %%.  Other format codes are "
+"available."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:355

 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:380
+msgctxt "IdentityEditWidget|"
+msgid "Failed to read key"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:381
+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:386
+msgctxt "IdentityEditWidget|"
+msgid "Core does not support ECDSA keys"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:387
+msgctxt "IdentityEditWidget|"
+msgid ""
+"You loaded an ECDSA key, but the core does not support ECDSA keys. Please "
+"contact the core administrator."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:402

 msgctxt "IdentityEditWidget|"
 msgid "RSA"
 msgstr "RSA"
 
 msgctxt "IdentityEditWidget|"
 msgid "RSA"
 msgstr "RSA"
 

-#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+#: ../src/qtui/settingspages/identityeditwidget.cpp:405
+msgctxt "IdentityEditWidget|"
+msgid "ECDSA"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:408

 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:411
+msgctxt "IdentityEditWidget|"
+msgid "Invalid key or no key loaded"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:413
+#: ../src/qtui/settingspages/identityeditwidget.cpp:456

 msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr "Очистить"
 
 msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr "Очистить"
 

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

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

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

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

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

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


@@ -3379,12 +5432,19 @@ msgid ""
 "<p>A scope rule is a semicolon separated list of either <i>network</i> or <i>channel</i> names.</p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"
 "<p>A scope rule is a semicolon separated list of either <i>network</i> or <i>channel</i> names.</p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"

-"<i>#quassel*; #foobar</i>\n"
+"<i>#quassel*; #foobar; !#quasseldroid</i>\n"
+"<br />\n"
+"would match on <i>#foobar</i> and any channel starting with <i>#quassel</i> except for <i>#quasseldroid</i>\n"
+"<br />\n"
+"<p>If only inverted names are specified, it will match anything except for what's specified (implicit wildcard).</p>\n"
+"<p><i>Example:</i>\n"
+"<br />\n"
+"<i>!#quassel*; !#foobar</i>\n"

 "<br />\n"
 "<br />\n"

-"would match on #foobar and on any channel starting with <i>#quassel</i></p>"
+"would match anything except for <i>#foobar</i> or any channel starting with <i>#quassel</i></p>"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:221

 msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Enable / Disable:</b></p>\n"
 msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Enable / Disable:</b></p>\n"


@@ -3393,19 +5453,19 @@ msgid ""
 "For dynamic rules, disabling actually shows the filtered messages again.</p>"
 msgstr ""
 
 "For dynamic rules, disabling actually shows the filtered messages again.</p>"
 msgstr ""
 

-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:227

 msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr "Правило включено"
 
 msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr "Правило включено"
 

-#: ../src/qtui/settingspages/ignorelistmodel.cpp:69
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:68

 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:72

 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 +5478,27 @@ msgid ""
 "host<br />"
 msgstr ""
 
 "host<br />"
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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


@@ -3463,147 +5523,175 @@ msgctxt "IgnoreListSettingsPage|"
 msgid "&Edit"
 msgstr "&Править..."
 
 msgid "&Edit"
 msgstr "&Править..."
 

-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:37

 msgctxt "IgnoreListSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
 msgctxt "IgnoreListSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 

-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:37

 msgctxt "IgnoreListSettingsPage|"
 msgid "Ignore List"
 msgstr "Список Игнорирования"
 
 msgctxt "IgnoreListSettingsPage|"
 msgid "Ignore List"
 msgstr "Список Игнорирования"
 

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

 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:140

 #, 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/inputwidget.ui:26
+msgctxt "InputWidget|"

 msgid "Form"
 msgstr "Форма"
 
 msgid "Form"
 msgstr "Форма"
 

-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
-msgctxt "IndicatorNotificationConfigWidget|"
-msgid ""
-"This enables support for the Ayatana Project's application indicator "
-"(libindicate)."
+#: ../src/qtui/inputwidget.ui:89
+msgctxt "InputWidget|"
+msgid "View and change nick"

 msgstr ""
 msgstr ""

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

 
 

-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
-msgctxt "IndicatorNotificationConfigWidget|"
-msgid "Show messages in application indicator"
-msgstr "Показать сообщение в индикаторе приложения"
+#: ../src/qtui/inputwidget.ui:175
+msgctxt "InputWidget|"
+msgid "Bold"
+msgstr ""

 
 

-#: ../src/qtui/ui/inputwidget.ui:26
+#: ../src/qtui/inputwidget.ui:215

 msgctxt "InputWidget|"
 msgctxt "InputWidget|"

-msgid "Form"
-msgstr "Форма"
+msgid "Italic"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:258
+msgctxt "InputWidget|"
+msgid "Underline"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:301
+msgctxt "InputWidget|"
+msgid "Strikethrough"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:341
+msgctxt "InputWidget|"
+msgid "Set foreground color"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:372
+msgctxt "InputWidget|"
+msgid "Set background color"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:406
+msgctxt "InputWidget|"
+msgid "Clear formatting"
+msgstr ""

 
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 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:91 ../src/qtui/inputwidget.cpp:92

 msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr "Очистить цвет"
 
 msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr "Очистить цвет"
 

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

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

+#: ../src/qtui/inputwidget.cpp:603
+msgctxt "InputWidget|"
+msgid "Hide formatting options"
+msgstr ""
+
+#: ../src/qtui/inputwidget.cpp:607
+msgctxt "InputWidget|"
+msgid "Show formatting options"
+msgstr ""
+

 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
 msgctxt "InputWidgetSettingsPage|"
 msgid "Form"
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
 msgctxt "InputWidgetSettingsPage|"
 msgid "Form"


@@ -3616,95 +5704,105 @@ msgstr "Пользовательский шрифт окна чата:"
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
 msgctxt "InputWidgetSettingsPage|"
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
 msgctxt "InputWidgetSettingsPage|"

-msgid "Enable spell check"
-msgstr ""
-
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
-msgctxt "InputWidgetSettingsPage|"

 msgid "Enable per chat history"
 msgstr "Включить историю чата"
 
 msgid "Enable per chat history"
 msgstr "Включить историю чата"
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:66

 msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
 msgstr "Показать выбраные ники"
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
 msgstr "Показать выбраные ники"
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:82

 msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
 msgstr "Показать стиль кнопок"
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
 msgstr "Показать стиль кнопок"
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:98
+msgctxt "InputWidgetSettingsPage|"
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr ""
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:101

 msgctxt "InputWidgetSettingsPage|"
 msgctxt "InputWidgetSettingsPage|"

-msgid "Enables (limited) Emacs key bindings in the input field."
+msgid "Emacs key bindings"

 msgstr ""
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
 msgctxt "InputWidgetSettingsPage|"
 msgstr ""
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
 msgctxt "InputWidgetSettingsPage|"

-msgid "Emacs key bindings"
+msgid "Enables line wrapping for input."

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:117

 msgctxt "InputWidgetSettingsPage|"
 msgctxt "InputWidgetSettingsPage|"

-msgid "Multi-Line Editing"
-msgstr "Многострочное поле текста"
+msgid "Line wrapping"
+msgstr ""
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
+msgctxt "InputWidgetSettingsPage|"
+msgid "&Multi-Line Editing"
+msgstr ""

 
 

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

 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:173

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

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

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

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

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

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

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

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

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

-msgstr ": "
+msgstr ""

 
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:262
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:265

 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:52 ../src/common/internalpeer.cpp:57
+msgctxt "InternalPeer|"
+msgid "internal connection"
+msgstr ""
+
+#: ../src/qtui/ircconnectionwizard.cpp:47

 msgctxt "IrcConnectionWizard|"
 msgid "Save && Connect"
 msgstr "Сохранить и соединиться"
 
 msgctxt "IrcConnectionWizard|"
 msgid "Save && Connect"
 msgstr "Сохранить и соединиться"
 

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

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

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

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


@@ -3714,28 +5812,95 @@ msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr "Тема"
 
 msgid "Topic"
 msgstr "Тема"
 

-#: ../src/client/networkmodel.cpp:806
+#: ../src/core/ircparser.cpp:452
+msgctxt "IrcParser|"
+msgid "Capability negotiation not supported"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1100
+msgctxt "IrcUserItem|"
+msgid "Modes"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1102

 msgctxt "IrcUserItem|"
 msgctxt "IrcUserItem|"

-msgid " is away"
-msgstr "%1 отсутствует: \"%2\""
+msgid "Unknown"
+msgstr ""

 
 

-#: ../src/client/networkmodel.cpp:821
-#, qt-format
+#: ../src/client/networkmodel.cpp:1108

 msgctxt "IrcUserItem|"
 msgctxt "IrcUserItem|"

-msgid "idling since %1"
-msgstr "неактивен с %1"
+msgid "Away message"
+msgstr ""

 
 

-#: ../src/client/networkmodel.cpp:824
-#, qt-format
+#: ../src/client/networkmodel.cpp:1110

 msgctxt "IrcUserItem|"
 msgctxt "IrcUserItem|"

-msgid "login time: %1"
-msgstr "вÑ\80емÑ\8f вÑ\85ода: %1"
+msgid "Realname"
+msgstr "РеалÑ\8cное имÑ\8f"

 
 

-#: ../src/client/networkmodel.cpp:827
-#, qt-format
+#: ../src/client/networkmodel.cpp:1115
+msgctxt "IrcUserItem|"
+msgid "Help status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1115
+msgctxt "IrcUserItem|"
+msgid "Available for help"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1118
+msgctxt "IrcUserItem|"
+msgid "Service status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1128

 msgctxt "IrcUserItem|"
 msgctxt "IrcUserItem|"

-msgid "server: %1"
-msgstr "сервер: %1"
+msgid "Not logged in"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1134 ../src/client/networkmodel.cpp:1141
+msgctxt "IrcUserItem|"
+msgid "Account"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1141
+msgctxt "IrcUserItem|"
+msgid "Identified for this nick"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1147
+msgctxt "IrcUserItem|"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1151
+msgctxt "IrcUserItem|"
+msgid "Hostmask"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1155
+msgctxt "IrcUserItem|"
+msgid "Operator"
+msgstr "Оператор"
+
+#: ../src/client/networkmodel.cpp:1163
+msgctxt "IrcUserItem|"
+msgid "Idling since"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1167
+msgctxt "IrcUserItem|"
+msgid "Login time"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1170
+msgctxt "IrcUserItem|"
+msgid "Server"
+msgstr "Сервер"
+
+#: ../src/client/networkmodel.cpp:1175
+msgctxt "IrcUserItem|"
+msgid "No information available"
+msgstr ""

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


@@ -3772,103 +5937,104 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Use Custom Colors"
 msgstr "Использовать Пользовательские Цвета"
 
 msgid "Use Custom Colors"
 msgstr "Использовать Пользовательские Цвета"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:121

 msgctxt "ItemViewSettingsPage|"
 msgid "Standard:"
 msgstr ""
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Standard:"
 msgstr ""
 

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:125
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:149
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:173
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:197
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:221
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:308
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:345
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:128
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:152
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:176
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:200
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:224
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:340
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:380

 msgctxt "ItemViewSettingsPage|"
 msgid "..."
 msgctxt "ItemViewSettingsPage|"
 msgid "..."

-msgstr "..."
+msgstr ""

 
 

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:142
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:145

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

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:169

 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
 msgstr "Собственные сообщения:"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
 msgstr "Собственные сообщения:"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:193

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

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:217

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

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

 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 msgstr "Список Цветов Пользовательского Ника"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 msgstr "Список Цветов Пользовательского Ника"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:333

 msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
 msgstr "Онлайн:"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
 msgstr "Онлайн:"
 

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:373

 msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr "Отсутствует:"
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr "Отсутствует:"
 

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

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

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

 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:78
+#: ../src/qtui/knotificationbackend.cpp:80
+msgctxt "KNotificationBackend|"
+msgid "View"
+msgstr ""
+
+#: ../src/qtui/knotificationbackend.cpp:138

 #, qt-format
 msgctxt "KNotificationBackend|"
 msgid "%n pending highlight(s)"
 #, qt-format
 msgctxt "KNotificationBackend|"
 msgid "%n pending highlight(s)"


@@ -3876,457 +6042,663 @@ 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:76

 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:76

 msgctxt "KeySequenceButton|"
 msgid "Unsupported Key"
 msgstr ""
 
 msgctxt "KeySequenceButton|"
 msgid "Unsupported Key"
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+#: ../src/qtui/settingspages/keysequencewidget.cpp:166

 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:266

 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:268

 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:270

 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:272

 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:276

 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:283

 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:373
+#: ../src/qtui/settingspages/keysequencewidget.cpp:381

 msgctxt "KeySequenceWidget|"
 msgid "Shortcut Conflict"
 msgstr ""
 
 msgctxt "KeySequenceWidget|"
 msgid "Shortcut Conflict"
 msgstr ""
 

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

 #, 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:382

 #, 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:383

 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:387

 msgctxt "KeySequenceWidget|"
 msgid "Reassign"
 msgstr ""
 
 msgctxt "KeySequenceWidget|"
 msgid "Reassign"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:313
+#: ../src/core/ldapauthenticator.cpp:71
+msgctxt "LdapAuthenticator|"
+msgid "LDAP"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:76
+msgctxt "LdapAuthenticator|"
+msgid "Authenticate users using an LDAP server."
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:83
+msgctxt "LdapAuthenticator|"
+msgid "Hostname"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:83
+msgctxt "LdapAuthenticator|"
+msgid "Port"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:84
+msgctxt "LdapAuthenticator|"
+msgid "Bind DN"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:84
+msgctxt "LdapAuthenticator|"
+msgid "Bind Password"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:84
+msgctxt "LdapAuthenticator|"
+msgid "Base DN"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:85
+msgctxt "LdapAuthenticator|"
+msgid "Filter"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:85
+msgctxt "LdapAuthenticator|"
+msgid "UID Attribute"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:142
+msgctxt "LegacyPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:225
+#, qt-format
+msgctxt "LegacyPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
+
+#: ../src/common/logger.cpp:90
+#, qt-format
+msgctxt "Logger|"
+msgid "Invalid log level %1; supported are Debug|Info|Warning|Error"
+msgstr ""
+
+#: ../src/common/logger.cpp:98
+#, qt-format
+msgctxt "Logger|"
+msgid "Could not open log file \"%1\": %2"
+msgstr ""
+
+#: ../src/common/logger.cpp:103
+#, qt-format
+msgctxt "Logger|"
+msgid "Cannot write to stderr: %1"
+msgstr ""
+
+#: ../src/qtui/mainpage.cpp:43
+msgctxt "MainPage|"
+msgid "Connect to Core..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:357

 msgctxt "MainWin|"
 msgid "General"
 msgstr "Общие"
 
 msgctxt "MainWin|"
 msgid "General"
 msgstr "Общие"
 

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

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

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

 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:365

 msgctxt "MainWin|"
 msgid "Core &Info..."
 msgstr "&Инфромация ядра..."
 
 msgctxt "MainWin|"
 msgid "Core &Info..."
 msgstr "&Инфромация ядра..."
 

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

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

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

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

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

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

-#: ../src/qtui/mainwin.cpp:331
-msgctxt "MainWin|"
-msgid "&Lock Layout"
-msgstr "&Блокировать расположение"
-
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:373

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

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

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

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

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

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

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

-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:378
+msgctxt "MainWin|"
+msgid "&Lock Layout"
+msgstr "&Блокировать расположение"
+
+#: ../src/qtui/mainwin.cpp:390

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

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

 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:404

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:422
+msgctxt "MainWin|"
+msgid "Show &Resource Tree"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:425

 msgctxt "MainWin|"
 msgid "Reload Stylesheet"
 msgstr "Использовать свою таблицу стилей"
 
 msgctxt "MainWin|"
 msgid "Reload Stylesheet"
 msgstr "Использовать свою таблицу стилей"
 

-#: ../src/qtui/mainwin.cpp:394
+#: ../src/qtui/mainwin.cpp:432
+msgctxt "MainWin|"
+msgid "Hide Current Buffer"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:435
+msgctxt "MainWin|"
+msgid "Text formatting"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:440
+msgctxt "MainWin|"
+msgid "Apply foreground color"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:447
+msgctxt "MainWin|"
+msgid "Apply background color"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:454
+msgctxt "MainWin|"
+msgid "Clear formatting"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:460
+msgctxt "MainWin|"
+msgid "Toggle bold"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:462
+msgctxt "MainWin|"
+msgid "Toggle italics"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:465
+msgctxt "MainWin|"
+msgid "Toggle underline"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:472
+msgctxt "MainWin|"
+msgid "Toggle strikethrough"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:479

 msgctxt "MainWin|"
 msgid "Navigation"
 msgstr "Организация:"
 
 msgctxt "MainWin|"
 msgid "Navigation"
 msgstr "Организация:"
 

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

 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:485
+msgctxt "MainWin|"
+msgid "Activate the buffer search"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:497

 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:500

 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:503

 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:506

 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:509

 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:512

 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:515

 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:518

 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:521

 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:524

 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:527

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 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:558

 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:565

 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:572

 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:583

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

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

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

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

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

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

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

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

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

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

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

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

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

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

 msgctxt "MainWin|"
 msgid "Debug"
 msgstr "Отладка"
 
 msgctxt "MainWin|"
 msgid "Debug"
 msgstr "Отладка"
 

-#: ../src/qtui/mainwin.cpp:746
+#: ../src/qtui/mainwin.cpp:816
+msgctxt "MainWin|"
+msgid "Feature Not Supported"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:817
+msgctxt "MainWin|"
+msgid "<b>Your Quassel Core does not support this feature</b>"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:819
+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:828
+msgctxt "MainWin|"
+msgid "Upgrading..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:829
+msgctxt "MainWin|"
+msgid "Your database is being upgraded"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:833
+msgctxt "MainWin|"
+msgid ""
+"In order to support new features, we need to make changes to your backlog "
+"database. This may take a long while."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:834
+msgctxt "MainWin|"
+msgid "Do not exit Quassel until the upgrade is complete!"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:849
+msgctxt "MainWin|"
+msgid "Fatal error"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:850
+msgctxt "MainWin|"
+msgid "Quassel encountered a fatal error and is terminated."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:852
+msgctxt "MainWin|"
+msgid "Reason:<em>"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:966

 msgctxt "MainWin|"
 msgid "Nicks"
 msgstr "Ники"
 
 msgctxt "MainWin|"
 msgid "Nicks"
 msgstr "Ники"
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ../src/qtui/mainwin.cpp:894
+#: ../src/qtui/mainwin.cpp:1044
+msgctxt "MainWin|"
+msgid "Transfers"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1055
+msgctxt "MainWin|"
+msgid "Show File Transfers"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1150

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

-#: ../src/qtui/mainwin.cpp:933
+#: ../src/qtui/mainwin.cpp:1170
+msgctxt "MainWin|"
+msgid "Nick Toolbar"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1251

 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr "Соединение с ядром установлено."
 
 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr "Соединение с ядром установлено."
 

-#: ../src/qtui/mainwin.cpp:1024
+#: ../src/qtui/mainwin.cpp:1347

 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:1365 ../src/qtui/mainwin.cpp:1376

 msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr "Незашифрованное Подключение"
 
 msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr "Незашифрованное Подключение"
 

-#: ../src/qtui/mainwin.cpp:1038
+#: ../src/qtui/mainwin.cpp:1366

 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:1368 ../src/qtui/mainwin.cpp:1379

 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:1377

 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:1398 ../src/qtui/mainwin.cpp:1418

 msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr "Недоверяемый Сертификат Безопасности"
 
 msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr "Недоверяемый Сертификат Безопасности"
 

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

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


@@ -4334,63 +6706,122 @@ msgid ""
 "following reasons:</b>"
 msgstr ""
 
 "following reasons:</b>"
 msgstr ""
 

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

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

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

 msgctxt "MainWin|"
 msgid "Show Certificate"
 msgstr "Показать Сертификаты"
 
 msgctxt "MainWin|"
 msgid "Show Certificate"
 msgstr "Показать Сертификаты"
 

-#: ../src/qtui/mainwin.cpp:1084
+#: ../src/qtui/mainwin.cpp:1419

 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:1421

 msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr "Только Текущий Сеанс"
 
 msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr "Только Текущий Сеанс"
 

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

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

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

 msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr "Основная Ошибка Подключения"
 
 msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr "Основная Ошибка Подключения"
 

-#: ../src/client/messagemodel.cpp:375
+#: ../src/qtui/mainwin.cpp:1460 ../src/qtui/mainwin.cpp:1461
+msgctxt "MainWin|"
+msgid "No network selected"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1463
+msgctxt "MainWin|"
+msgid "Select a network before trying to view the channel list."
+msgstr ""
+
+#: ../src/client/messagemodel.cpp:410

 #, qt-format
 msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
 msgstr "Запрашиваю %1 сообщений из журнала для буфера %2:%3"
 
 #, qt-format
 msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
 msgstr "Запрашиваю %1 сообщений из журнала для буфера %2:%3"
 

-#: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
+#: ../src/core/metricsserver.cpp:53
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Invalid listen address %1"
+msgstr "Некорректный адрес для прослушивания %1"
+
+#: ../src/core/metricsserver.cpp:62
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Listening for metrics requests on IPv6 %1 port %2"
+msgstr ""
+
+#: ../src/core/metricsserver.cpp:70
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Could not open IPv6 interface %1:%2: %3"
+msgstr "Не могу открыть интерфейс IPv6 %1:%2: %3"
+
+#: ../src/core/metricsserver.cpp:78
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Listening for metrics requests on IPv4 %1 port %2"
+msgstr ""
+
+#: ../src/core/metricsserver.cpp:88
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Could not open IPv4 interface %1:%2: %3"
+msgstr "Не могу открыть интерфейс IPv4 %1:%2: %3"
+
+#: ../src/core/metricsserver.cpp:96
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Invalid listen address %1, unknown network protocol"
+msgstr "Некорректный адрес для прослушивания %1, неизвестный сетевой протокол"
+
+#: ../src/core/metricsserver.cpp:105
+msgctxt "MetricsServer|"
+msgid ""
+"Metrics could not open any network interfaces to listen on! No metrics "
+"functionality will be available"
+msgstr ""
+
+#: ../src/qtui/msgprocessorstatuswidget.ui:19

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

-#: ../src/qtui/ui/msgprocessorstatuswidget.ui:34
+#: ../src/qtui/msgprocessorstatuswidget.ui:34

 msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr "Получаю журнал"
 
 msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr "Получаю журнал"
 

-#: ../src/uisupport/multilineedit.cpp:661
+#: ../src/uisupport/multilineedit.cpp:95
+msgctxt "MultiLineEdit|"
+msgid "Auto Spell Check"
+msgstr ""
+
+#: ../src/uisupport/multilineedit.cpp:723

 #, 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:732

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


@@ -4437,8 +6868,38 @@ msgstr "Пароль сервера:"
 
 #: ../src/qtui/settingspages/networkadddlg.ui:131
 msgctxt "NetworkAddDlg|"
 
 #: ../src/qtui/settingspages/networkadddlg.ui:131
 msgctxt "NetworkAddDlg|"

-msgid "Use secure connection"
-msgstr "Использовать безопасное соединение"
+msgid "Try to use an encrypted connection (e.g. SSL/TLS)"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:134
+msgctxt "NetworkAddDlg|"
+msgid "Use encrypted connection"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:144
+msgctxt "NetworkAddDlg|"
+msgid ""
+"<p>Verify the encrypted connection provides a valid certificate, increasing "
+"security.<br/>Uncheck if the IRC server uses a self-signed or invalid "
+"certificate.</p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:147
+msgctxt "NetworkAddDlg|"
+msgid "Verify connection security"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1177
+msgctxt "NetworkAddDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1178
+msgctxt "NetworkAddDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to verify connection "
+"security."
+msgstr ""

 
 #: ../src/qtui/settingspages/networkeditdlg.ui:13
 msgctxt "NetworkEditDlg|"
 
 #: ../src/qtui/settingspages/networkeditdlg.ui:13
 msgctxt "NetworkEditDlg|"


@@ -4450,101 +6911,122 @@ 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:1252

 msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr "Добавить сеть"
 
 msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr "Добавить сеть"
 

-#: ../src/client/networkmodel.cpp:196
-#, qt-format
+#: ../src/client/networkmodel.cpp:230

 msgctxt "NetworkItem|"
 msgctxt "NetworkItem|"

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

 
 

-#: ../src/client/networkmodel.cpp:197
-#, qt-format
+#: ../src/client/networkmodel.cpp:231

 msgctxt "NetworkItem|"
 msgctxt "NetworkItem|"

-msgid "Users: %1"
-msgstr "Пользователи: %1"
+msgid "Users"
+msgstr "Пользователи"
+
+#: ../src/client/networkmodel.cpp:233
+msgctxt "NetworkItem|"
+msgid "Lag"
+msgstr ""

 
 

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

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

-msgid "Lag: %1 msecs"
+msgid "%1 msecs"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:238
+msgctxt "NetworkItem|"
+msgid "Not connected"

 msgstr ""
 
 msgstr ""
 

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

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

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

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

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

 msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr "Ников"
 
 msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr "Ников"
 

-#: ../src/uisupport/networkmodelcontroller.cpp:154
+#: ../src/uisupport/networkmodelcontroller.cpp:156

 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:169

 #, 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:170

 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:173

 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:175

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

-#: ../src/uisupport/networkmodelcontroller.cpp:484
+#: ../src/uisupport/networkmodelcontroller.cpp:220
+#: ../src/uisupport/networkmodelcontroller.cpp:228
+msgctxt "NetworkModelController|"
+msgid "Question"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:221
+msgctxt "NetworkModelController|"
+msgid "Really Connect to all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:229
+msgctxt "NetworkModelController|"
+msgid "Really disconnect from all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:543

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

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

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

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

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

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

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

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

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


@@ -4560,13 +7042,13 @@ msgid "Re&name..."
 msgstr "Пере&именовать..."
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:65
 msgstr "Пере&именовать..."
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:65

-#: ../src/qtui/settingspages/networkssettingspage.ui:235
+#: ../src/qtui/settingspages/networkssettingspage.ui:234

 msgctxt "NetworksSettingsPage|"
 msgid "&Add..."
 msgstr "Доб&авить..."
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:88
 msgctxt "NetworksSettingsPage|"
 msgid "&Add..."
 msgstr "Доб&авить..."
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:88

-#: ../src/qtui/settingspages/networkssettingspage.ui:252
+#: ../src/qtui/settingspages/networkssettingspage.ui:251

 msgctxt "NetworksSettingsPage|"
 msgid "De&lete"
 msgstr "У&далить"
 msgctxt "NetworksSettingsPage|"
 msgid "De&lete"
 msgstr "У&далить"


@@ -4582,11 +7064,11 @@ msgid "Identity:"
 msgstr "Личность:"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:149
 msgstr "Личность:"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:149

-#: ../src/qtui/settingspages/networkssettingspage.ui:281
-#: ../src/qtui/settingspages/networkssettingspage.ui:295
+#: ../src/qtui/settingspages/networkssettingspage.ui:280
+#: ../src/qtui/settingspages/networkssettingspage.ui:294

 msgctxt "NetworksSettingsPage|"
 msgid "..."
 msgctxt "NetworksSettingsPage|"
 msgid "..."

-msgstr "..."
+msgstr ""

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


@@ -4603,238 +7085,535 @@ msgctxt "NetworksSettingsPage|"
 msgid "&Edit..."
 msgstr "&Править..."
 
 msgid "&Edit..."
 msgstr "&Править..."
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:278
+#: ../src/qtui/settingspages/networkssettingspage.ui:277

 msgctxt "NetworksSettingsPage|"
 msgid "Move upwards in list"
 msgstr "Передвинуть вверх в списке"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Move upwards in list"
 msgstr "Передвинуть вверх в списке"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:292
+#: ../src/qtui/settingspages/networkssettingspage.ui:291

 msgctxt "NetworksSettingsPage|"
 msgid "Move downwards in list"
 msgstr "Передвинуть вниз в списке"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Move downwards in list"
 msgstr "Передвинуть вниз в списке"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:337
+#: ../src/qtui/settingspages/networkssettingspage.ui:336

 msgctxt "NetworksSettingsPage|"
 msgid "Commands"
 msgstr "Команды"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Commands"
 msgstr "Команды"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:340
+#: ../src/qtui/settingspages/networkssettingspage.ui:339

 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"

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

 
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:346
+#: ../src/qtui/settingspages/networkssettingspage.ui:345

 msgctxt "NetworksSettingsPage|"
 msgid "Commands to execute on connect:"
 msgstr "При подключении выполнить команды:"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Commands to execute on connect:"
 msgstr "При подключении выполнить команды:"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:362
+#: ../src/qtui/settingspages/networkssettingspage.ui:361

 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!"
 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!"

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

 
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:374
+#: ../src/qtui/settingspages/networkssettingspage.ui:373

 msgctxt "NetworksSettingsPage|"
 msgid "Connection"
 msgstr "Соединения"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Connection"
 msgstr "Соединения"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:383
+#: ../src/qtui/settingspages/networkssettingspage.ui:382

 msgctxt "NetworksSettingsPage|"
 msgid "Automatically reconnect to the IRC network after connection failures"
 msgstr "Автоматически переподключиться к IRC сети после ошибки подключения"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Automatically reconnect to the IRC network after connection failures"
 msgstr "Автоматически переподключиться к IRC сети после ошибки подключения"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:386
+#: ../src/qtui/settingspages/networkssettingspage.ui:385

 msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
 msgstr "Автоматическое соединение"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
 msgstr "Автоматическое соединение"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:397
+#: ../src/qtui/settingspages/networkssettingspage.ui:396
+#: ../src/qtui/settingspages/networkssettingspage.ui:595

 msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:404
+#: ../src/qtui/settingspages/networkssettingspage.ui:403
+#: ../src/qtui/settingspages/networkssettingspage.ui:605

 msgctxt "NetworksSettingsPage|"
 msgid " s"
 msgstr " сек"
 
 msgctxt "NetworksSettingsPage|"
 msgid " s"
 msgstr " сек"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:420
+#: ../src/qtui/settingspages/networkssettingspage.ui:419

 msgctxt "NetworksSettingsPage|"
 msgid "between retries"
 msgstr "между повторениями"
 
 msgctxt "NetworksSettingsPage|"
 msgid "between retries"
 msgstr "между повторениями"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:444
+#: ../src/qtui/settingspages/networkssettingspage.ui:443

 msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
 msgstr "между повторениями"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
 msgstr "между повторениями"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:464
+#: ../src/qtui/settingspages/networkssettingspage.ui:463
+#: ../src/qtui/settingspages/networkssettingspage.ui:547

 msgctxt "NetworksSettingsPage|"
 msgid "Unlimited"
 msgstr "Неограничено"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Unlimited"
 msgstr "Неограничено"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:489
+#: ../src/qtui/settingspages/networkssettingspage.ui:488

 msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
 msgstr "Перезайти на все каналы после переподключения"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
 msgstr "Перезайти на все каналы после переподключения"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:516
-#: ../src/qtui/settingspages/networkssettingspage.ui:525
+#: ../src/qtui/settingspages/networkssettingspage.ui:507
+msgctxt "NetworksSettingsPage|"
+msgid "Use Custom Rate Limits"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:521
+msgctxt "NetworksSettingsPage|"
+msgid "Max. messages at once:"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:528
+msgctxt "NetworksSettingsPage|"
+msgid "Maximum number of messages to send without any delays"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:544
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p>Disable all rate limiting, e.g. for IRC "
+"bridges.</p><p>Don't use with most normal networks.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:602
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p>Delay between messages after the maximum number of "
+"undelayed messages have been sent.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:621
+msgctxt "NetworksSettingsPage|"
+msgid "between future messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:663
+#: ../src/qtui/settingspages/networkssettingspage.ui:814

 msgctxt "NetworksSettingsPage|"
 msgid "Auto Identify"
 msgstr "Автоматическая идентификация"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Auto Identify"
 msgstr "Автоматическая идентификация"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:540
+#: ../src/qtui/settingspages/networkssettingspage.ui:672
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Authenticate using your nickname and password before joining any channels"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:675
+msgctxt "NetworksSettingsPage|"
+msgid "Use SASL Authentication"
+msgstr "Использовать SASL Аутентификацию"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:716
+msgctxt "NetworksSettingsPage|"
+msgid "Account name, often the same as your nickname"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:729
+msgctxt "NetworksSettingsPage|"
+msgid "Account:"
+msgstr "Название аккаунта:"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:739
+#: ../src/qtui/settingspages/networkssettingspage.ui:842
+msgctxt "NetworksSettingsPage|"
+msgid "Account password"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:752
+#: ../src/qtui/settingspages/networkssettingspage.ui:862
+msgctxt "NetworksSettingsPage|"
+msgid "Password:"
+msgstr "Пароль:"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:764
+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:789
+msgctxt "NetworksSettingsPage|"
+msgid "Could not detect if supported by server"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:796
+#: ../src/qtui/settingspages/networkssettingspage.ui:933
+msgctxt "NetworksSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:811
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Authenticate to services using your password.  Use SASL instead to identify "
+"before joining channels."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:829
+msgctxt "NetworksSettingsPage|"
+msgid "Service user to send your password to, usually NickServ"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:832

 msgctxt "NetworksSettingsPage|"
 msgid "NickServ"
 msgstr "NickServ"
 
 msgctxt "NetworksSettingsPage|"
 msgid "NickServ"
 msgstr "NickServ"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:557
+#: ../src/qtui/settingspages/networkssettingspage.ui:852

 msgctxt "NetworksSettingsPage|"
 msgid "Service:"
 msgstr "Служба:"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Service:"
 msgstr "Служба:"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:567
-#: ../src/qtui/settingspages/networkssettingspage.ui:615
+#: ../src/qtui/settingspages/networkssettingspage.ui:886

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Password:"
-msgstr "Пароль:"
+msgid "Features"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:580
+#: ../src/qtui/settingspages/networkssettingspage.ui:889

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Use SASL Authentication"
-msgstr "Использовать SASL Аутентификацию"
+msgid "Configure the modern IRC messaging features Quassel supports"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:625
+#: ../src/qtui/settingspages/networkssettingspage.ui:923
+#: ../src/qtui/settingspages/networkssettingspage.cpp:187

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Account:"
-msgstr "Название аккаунта:"
+msgid "These features require support from the network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:964
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<p>Let the IRC network control the timestamps for messages, such as when viewing messages from the past.</p>\n"
+"<p>This is useful when connecting to bouncers, IRC bridges, or networks that send messages you've missed when reconnecting.</p>\n"
+"<p><i>Toggles the IRCv3 'server-time' capability.</i></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:969
+msgctxt "NetworksSettingsPage|"
+msgid "Use network timestamps for messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:978
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Configure which IRC capabilities Quassel will ignore during negotiation"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:981
+msgctxt "NetworksSettingsPage|"
+msgid "Advanced..."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1003
+msgctxt "NetworksSettingsPage|"
+msgid "<i>Changes apply after reconnecting to the network</i>"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:649
+#: ../src/qtui/settingspages/networkssettingspage.ui:1027

 msgctxt "NetworksSettingsPage|"
 msgid "Encodings"
 msgstr "Кодировки"
 
 msgctxt "NetworksSettingsPage|"
 msgid "Encodings"
 msgstr "Кодировки"
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:652
+#: ../src/qtui/settingspages/networkssettingspage.ui:1030

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid ""
-"Configure advanced settings such as message encodings and automatic "
-"reconnect"
+msgid "Configure advanced settings such as message encodings"

 msgstr ""
 msgstr ""

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

 
 

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

 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:1042

 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:1053
+#: ../src/qtui/settingspages/networkssettingspage.ui:1073

 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:1057

 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:1084
+#: ../src/qtui/settingspages/networkssettingspage.ui:1104

 msgctxt "NetworksSettingsPage|"
 msgid ""
 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."
+"Incoming messages encoded in UTF-8 will always be treated as such.\n"
+"This setting defines the encoding for messages that are not UTF-8."

 msgstr ""
 msgstr ""

-"Входящие сообщения, закодированные в Utf8, всегда будут обработаны как надо.\n"
-"Эти настройки затрагивают только сообщения не в кодировке Utf8."

 
 

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

 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:1115
+#: ../src/qtui/settingspages/networkssettingspage.ui:1128

 msgctxt "NetworksSettingsPage|"
 msgid ""
 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!"
+"<qt><p>This specifies how control messages, nicks and servernames are "
+"encoded.</p><p><b>UTF-8</b> should be fine for modern networks.  On other "
+"networks, you may need to use <b>ISO-8859-1</b> to avoid errors with illegal"
+" characters and invalid encoding.</p></qt>"

 msgstr ""
 msgstr ""

-"Это определяет кодировку контрольных сообщений, ников и названий серверов.\n"
-"Если только вы *действительно* не знаете что делаете, оставьте тут ISO-8859-1!"

 
 

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

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

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

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

-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+#: ../src/qtui/settingspages/networkssettingspage.cpp:44
+msgctxt "NetworksSettingsPage|"
+msgid "Networks"
+msgstr "Сети"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:162
+#: ../src/qtui/settingspages/networkssettingspage.cpp:175
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<p>Override default message rate limiting.</p><p><b>Setting limits too low "
+"may get you disconnected from the server!</b></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:178
+msgctxt "NetworksSettingsPage|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:179
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to modify message rate "
+"limits."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:193
+msgctxt "NetworksSettingsPage|"
+msgid "Your Quassel core is too old to configure IRCv3 features"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:230
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<b>The following problems need to be corrected before your changes can be "
+"applied:</b><ul>"
+msgstr "<b>Прежде чем сохранить настройки, необходимо устранить следующие проблемы:</b><ul>"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:232
+msgctxt "NetworksSettingsPage|"
+msgid "<li>All networks need at least one server defined</li>"
+msgstr "<li>У каждой сети должен быть хотя бы один сервер</li>"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:233
+msgctxt "NetworksSettingsPage|"
+msgid "</ul>"
+msgstr "</ul>"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:234
+msgctxt "NetworksSettingsPage|"
+msgid "Invalid Network Settings"
+msgstr "Некорректные настройки сети"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:749
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:754
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:759
+msgctxt "NetworksSettingsPage|"
+msgid "Not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:769
+msgctxt "NetworksSettingsPage|"
+msgid "May be supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:773
+msgctxt "NetworksSettingsPage|"
+msgid "Supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:860
+msgctxt "NetworksSettingsPage|"
+msgid "Delete Network?"
+msgstr "Удалить сеть?"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:861
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Do you really want to delete the network \"%1\" and all related settings, "
+"including the backlog?"
+msgstr "Действительно удалить сеть \"%1\" и все сопутствующие данные, включая журнал?"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:991
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:992
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Quassel could not check if \"%1\" supports SASL.  This may be due to unsaved"
+" changes or an older Quassel core.  You can still try using SASL."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:998
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if SASL supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:999
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Quassel cannot check if \"%1\" supports SASL when disconnected.  Connect to "
+"the network, or try using SASL anyways."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1007
+msgctxt "NetworksSettingsPage|"
+msgid "SASL EXTERNAL not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1008
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" does not currently support SASL EXTERNAL for SSL "
+"certificate authentication.  However, support might be added later on."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1015
+msgctxt "NetworksSettingsPage|"
+msgid "SASL not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1016
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" does not currently support SASL.  However, support might "
+"be added later on."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1027
+msgctxt "NetworksSettingsPage|"
+msgid "SASL EXTERNAL may be supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1028
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" may support SASL EXTERNAL for SSL certificate "
+"authentication.  In most cases, you should use SASL instead of NickServ "
+"identification."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1035
+msgctxt "NetworksSettingsPage|"
+msgid "SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1036
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" supports SASL.  In most cases, you should use SASL "
+"instead of NickServ identification."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1044
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid "SASL support for \"%1\""
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1048
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"SASL is a standardized way to log in and identify yourself to IRC servers."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1087

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Networks"
-msgstr "Сети"
+msgid ""
+"Quassel makes use of newer IRC features when supported by the IRC network.  "
+"If desired, you can disable unwanted or problematic features here."
+msgstr ""

 
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:167
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1089

 msgctxt "NetworksSettingsPage|"
 msgid ""
 msgctxt "NetworksSettingsPage|"
 msgid ""

-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
+"The <a href=\"https://ircv3.net/irc/\">IRCv3 website</a> provides more "
+"technical details on the IRCv3 capabilities powering these features."

 msgstr ""
 msgstr ""

-"<b>Прежде чем сохранить настройки, необходимо устранить следующие "
-"проблемы:</b><ul>"

 
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:168
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1100
+#, qt-format

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "<li>All networks need at least one server defined</li>"
-msgstr "<li>У каждой сети должен быть хотя бы один сервер</li>"
+msgid "Currently enabled IRCv3 capabilities for this network: %1"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:169
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1104

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "</ul>"
-msgstr "</ul>"
+msgid "Configuring network features"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:170
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1108

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Invalid Network Settings"
-msgstr "Некорректные настройки сети"
+msgid "Configuring network features unsupported"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:542
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1110

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Delete Network?"
-msgstr "Удалить сеть?"
+msgid "Your Quassel core is too old to configure IRCv3 network features"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:543
-#, qt-format
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1111

 msgctxt "NetworksSettingsPage|"
 msgid ""
 msgctxt "NetworksSettingsPage|"
 msgid ""

-"Do you really want to delete the network \"%1\" and all related settings, "
-"including the backlog?"
+"You need a Quassel core v0.14.0 or newer to control what network features "
+"Quassel will use."

 msgstr ""
 msgstr ""

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

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


@@ -4851,11 +7630,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:462

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


@@ -4870,282 +7647,762 @@ msgctxt "NotificationsSettingsPage|"
 msgid "Notifications"
 msgstr "Уведомления"
 
 msgid "Notifications"
 msgstr "Уведомления"
 

-#: ../src/qtui/phononnotificationbackend.cpp:143
-msgctxt "PhononNotificationBackend::ConfigWidget|"
-msgid "Select Audio File"
-msgstr "Ð\92Ñ\8bбÑ\80аÑ\82Ñ\8c звÑ\83ковой Ñ\84айл"
+#: ../src/qtui/passwordchangedlg.ui:14
+msgctxt "PasswordChangeDlg|"
+msgid "Change Password"
+msgstr "СмениÑ\82Ñ\8c паÑ\80олÑ\8c"

 
 

-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Form"
-msgstr "ФоÑ\80ма"
+#: ../src/qtui/passwordchangedlg.ui:37
+msgctxt "PasswordChangeDlg|"
+msgid "Old password:"
+msgstr "ТекÑ\83Ñ\89ий паÑ\80олÑ\8c:"

 
 

-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Play a sound"
+#: ../src/qtui/passwordchangedlg.ui:51
+msgctxt "PasswordChangeDlg|"
+msgid "New Password:"
+msgstr "Новый пароль:"
+
+#: ../src/qtui/passwordchangedlg.ui:65
+msgctxt "PasswordChangeDlg|"
+msgid "Confirm password:"
+msgstr "Повторите пароль:"
+
+#: ../src/qtui/passwordchangedlg.cpp:34
+#, 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 ""
 
 msgstr ""
 

-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Prelisten to the selected sound"
-msgstr "Предварительно прослушать выбранный звук"
+#: ../src/qtui/passwordchangedlg.cpp:64
+msgctxt "PasswordChangeDlg|"
+msgid "Password Not Changed"
+msgstr "Пароль не изменен"

 
 

-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Select the sound file to play"
-msgstr "Выберите звуковой файл чтобы воспроизвести"
+#: ../src/qtui/passwordchangedlg.cpp:64
+msgctxt "PasswordChangeDlg|"
+msgid "<b>Password change failed</b>"
+msgstr "<b>Не удалось изменить пароль</b>"

 
 

-#: ../src/core/postgresqlstorage.cpp:62
+#: ../src/qtui/passwordchangedlg.cpp:66
+msgctxt "PasswordChangeDlg|"
+msgid ""
+"The core reported an error when trying to change your password. Make sure "
+"you entered your old password correctly!"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:51
+msgctxt "PostgreSqlStorage|"
+msgid "PostgreSQL driver plugin not available for Qt. Installed drivers:"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:71

 msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr ""
 
 msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr ""
 

-#: ../src/client/backlogrequester.cpp:82
+#: ../src/core/postgresqlstorage.cpp:77
+msgctxt "PostgreSqlStorage|"
+msgid "Username"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:77
+msgctxt "PostgreSqlStorage|"
+msgid "Password"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:77
+msgctxt "PostgreSqlStorage|"
+msgid "Hostname"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:78
+msgctxt "PostgreSqlStorage|"
+msgid "Port"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:78
+msgctxt "PostgreSqlStorage|"
+msgid "Database"
+msgstr ""
+
+#: ../src/client/backlogrequester.cpp:81
+#: ../src/client/backlogrequester.cpp:154

 #, 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:109

 #, 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:127

 #, 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:53

 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:56

 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:147 ../src/uisupport/qssparser.cpp:201
+#: ../src/uisupport/qssparser.cpp:359

 #, 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:166

 #, 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:185

 #, 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:228

 #, 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:272

 #, 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:281

 #, 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:294

 #, 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:305

 #, 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:309

 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:325

 #, 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:333

 #, 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:342

 #, 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:374

 #, 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:393

 #, 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:409

 #, 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:438

 #, 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:476

 #, 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:482

 #, 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:501
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid boolean value: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:537

 #, 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:544

 #, 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:551 ../src/uisupport/qssparser.cpp:574
+#: ../src/uisupport/qssparser.cpp:596

 #, 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:560 ../src/uisupport/qssparser.cpp:582
+#: ../src/uisupport/qssparser.cpp:606

 #, 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:712

 #, 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:762

 #, 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:776

 #, 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:787

 #, 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/qtui/qtmultimedianotificationbackend.cpp:156
+msgctxt "QtMultimediaNotificationBackend::ConfigWidget|"
+msgid "Select Audio File"
+msgstr "Выбрать звуковой файл"
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:14
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:20
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Play a sound"
+msgstr ""
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:46
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Prelisten to the selected sound"
+msgstr "Предварительно прослушать выбранный звук"
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:59
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:69
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Select the sound file to play"
+msgstr "Выберите звуковой файл чтобы воспроизвести"
+
+#. Supported icon theme names
+#: ../src/qtui/qtui.cpp:250
+msgctxt "QtUi|"
+msgid "Breeze"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:251
+msgctxt "QtUi|"
+msgid "Breeze Dark"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:253
+msgctxt "QtUi|"
+msgid "Oxygen"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:304
+msgctxt "QtUi|"
+msgid ""
+"No supported icon theme installed, you'll lack icons! Supported are the "
+"KDE/Plasma themes Breeze, Breeze Dark and Oxygen."
+msgstr ""
+
+#: ../src/qtui/qtuiapplication.cpp:48
+msgctxt "QtUiApplication|"
+msgid "Could not load or upgrade client settings!"
+msgstr ""
+
+#: ../src/common/quassel.cpp:325
+msgctxt "Quassel|"
+msgid "Specify the directory holding the client configuration."
+msgstr ""
+
+#: ../src/common/quassel.cpp:325 ../src/common/quassel.cpp:330
+#: ../src/common/quassel.cpp:367 ../src/common/quassel.cpp:368
+msgctxt "Quassel|"
+msgid "path"
+msgstr ""
+
+#: ../src/common/quassel.cpp:329
+msgctxt "Quassel|"
+msgid ""
+"Specify the directory holding configuration files, the SQlite database and "
+"the SSL certificate."
+msgstr ""
+
+#: ../src/common/quassel.cpp:336
+msgctxt "Quassel|"
+msgid "Override the system icon theme ('breeze' is recommended)."
+msgstr ""
+
+#: ../src/common/quassel.cpp:336
+msgctxt "Quassel|"
+msgid "theme"
+msgstr ""
+
+#: ../src/common/quassel.cpp:337
+msgctxt "Quassel|"
+msgid "Load a custom application stylesheet."
+msgstr ""
+
+#: ../src/common/quassel.cpp:337
+msgctxt "Quassel|"
+msgid "file.qss"
+msgstr ""
+
+#: ../src/common/quassel.cpp:338
+msgctxt "Quassel|"
+msgid "Start the client minimized to the system tray."
+msgstr ""
+
+#: ../src/common/quassel.cpp:339
+msgctxt "Quassel|"
+msgid "Account id to connect to on startup."
+msgstr ""
+
+#: ../src/common/quassel.cpp:339
+msgctxt "Quassel|"
+msgid "account"
+msgstr ""
+
+#: ../src/common/quassel.cpp:346
+msgctxt "Quassel|"
+msgid "The address(es) quasselcore will listen on."
+msgstr ""
+
+#: ../src/common/quassel.cpp:346
+msgctxt "Quassel|"
+msgid "<address>[,<address>[,...]]"
+msgstr ""
+
+#: ../src/common/quassel.cpp:347
+msgctxt "Quassel|"
+msgid "The port quasselcore will listen at."
+msgstr ""
+
+#: ../src/common/quassel.cpp:347 ../src/common/quassel.cpp:360
+#: ../src/common/quassel.cpp:370
+msgctxt "Quassel|"
+msgid "port"
+msgstr ""
+
+#: ../src/common/quassel.cpp:348
+msgctxt "Quassel|"
+msgid "Don't restore last core's state."
+msgstr ""
+
+#: ../src/common/quassel.cpp:349
+msgctxt "Quassel|"
+msgid "Load configuration from environment variables."
+msgstr ""
+
+#: ../src/common/quassel.cpp:350
+msgctxt "Quassel|"
+msgid "Switch storage backend (migrating data if possible)."
+msgstr ""
+
+#: ../src/common/quassel.cpp:350
+msgctxt "Quassel|"
+msgid "backendidentifier"
+msgstr ""
+
+#: ../src/common/quassel.cpp:351
+msgctxt "Quassel|"
+msgid "Select authentication backend."
+msgstr ""
+
+#: ../src/common/quassel.cpp:351
+msgctxt "Quassel|"
+msgid "authidentifier"
+msgstr ""
+
+#: ../src/common/quassel.cpp:352
+msgctxt "Quassel|"
+msgid "Starts an interactive session to add a new core user."
+msgstr ""
+
+#: ../src/common/quassel.cpp:354
+msgctxt "Quassel|"
+msgid ""
+"Starts an interactive session to change the password of the user identified "
+"by <username>."
+msgstr ""
+
+#: ../src/common/quassel.cpp:355
+msgctxt "Quassel|"
+msgid "username"
+msgstr ""
+
+#: ../src/common/quassel.cpp:356
+msgctxt "Quassel|"
+msgid ""
+"Use users' quasselcore username as ident reply. Ignores each user's "
+"configured ident setting."
+msgstr ""
+
+#: ../src/common/quassel.cpp:357
+msgctxt "Quassel|"
+msgid "Enable internal ident daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:359
+msgctxt "Quassel|"
+msgid ""
+"The port quasselcore will listen at for ident requests. Only meaningful with"
+" --ident-daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:362
+msgctxt "Quassel|"
+msgid ""
+"The address(es) quasselcore will listen on for ident requests. Same format "
+"as --listen."
+msgstr ""
+
+#: ../src/common/quassel.cpp:362 ../src/common/quassel.cpp:365
+#: ../src/common/quassel.cpp:371
+msgctxt "Quassel|"
+msgid "<address>[,...]"
+msgstr ""
+
+#: ../src/common/quassel.cpp:363
+msgctxt "Quassel|"
+msgid ""
+"Enable oidentd integration. In most cases you should also enable --strict-"
+"ident."
+msgstr ""
+
+#: ../src/common/quassel.cpp:364
+msgctxt "Quassel|"
+msgid "Set path to oidentd configuration file."
+msgstr ""
+
+#: ../src/common/quassel.cpp:364
+msgctxt "Quassel|"
+msgid "file"
+msgstr ""
+
+#: ../src/common/quassel.cpp:365
+msgctxt "Quassel|"
+msgid "Set IP range from which proxy protocol definitions are allowed"
+msgstr ""
+
+#: ../src/common/quassel.cpp:366
+msgctxt "Quassel|"
+msgid "Require SSL for remote (non-loopback) client connections."
+msgstr ""
+
+#: ../src/common/quassel.cpp:367
+msgctxt "Quassel|"
+msgid "Specify the path to the SSL certificate."
+msgstr ""
+
+#: ../src/common/quassel.cpp:368
+msgctxt "Quassel|"
+msgid "Specify the path to the SSL key."
+msgstr ""
+
+#: ../src/common/quassel.cpp:369
+msgctxt "Quassel|"
+msgid "Enable metrics API."
+msgstr ""
+
+#: ../src/common/quassel.cpp:370
+msgctxt "Quassel|"
+msgid ""
+"The port quasselcore will listen at for metrics requests. Only meaningful "
+"with --metrics-daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:371
+msgctxt "Quassel|"
+msgid ""
+"The address(es) quasselcore will listen on for metrics requests. Same format"
+" as --listen."
+msgstr ""
+
+#: ../src/common/quassel.cpp:377
+msgctxt "Quassel|"
+msgid "Supports one of Debug|Info|Warning|Error; default is Info."
+msgstr ""
+
+#: ../src/common/quassel.cpp:377
+msgctxt "Quassel|"
+msgid "level"
+msgstr ""
+
+#: ../src/common/quassel.cpp:378
+msgctxt "Quassel|"
+msgid "Log to a file."
+msgstr ""
+
+#: ../src/common/quassel.cpp:380
+msgctxt "Quassel|"
+msgid "Log to syslog."
+msgstr ""
+
+#: ../src/common/quassel.cpp:385
+msgctxt "Quassel|"
+msgid "Enable debug output."
+msgstr ""
+
+#: ../src/common/quassel.cpp:388
+msgctxt "Quassel|"
+msgid "Enables debugging for bufferswitches."
+msgstr ""
+
+#: ../src/common/quassel.cpp:389
+msgctxt "Quassel|"
+msgid "Enables debugging for models."
+msgstr ""
+
+#: ../src/common/quassel.cpp:394
+msgctxt "Quassel|"
+msgid ""
+"Enable logging of all raw IRC messages to debug log, including passwords!  "
+"In most cases you should also set --loglevel Debug"
+msgstr ""
+
+#: ../src/common/quassel.cpp:395
+msgctxt "Quassel|"
+msgid "Limit raw IRC logging to this network ID.  Implies --debug-irc"
+msgstr ""
+
+#: ../src/common/quassel.cpp:395 ../src/common/quassel.cpp:397
+msgctxt "Quassel|"
+msgid "database network ID"
+msgstr ""
+
+#: ../src/common/quassel.cpp:396
+msgctxt "Quassel|"
+msgid ""
+"Enable logging of all parsed IRC messages to debug log, including passwords!"
+"  In most cases you should also set --loglevel Debug"
+msgstr ""
+
+#: ../src/common/quassel.cpp:397
+msgctxt "Quassel|"
+msgid ""
+"Limit parsed IRC logging to this network ID.  Implies --debug-irc-parsed"
+msgstr ""
+
+#: ../src/common/quassel.cpp:404
+msgctxt "Quassel|"
+msgid "Quassel IRC is a modern, distributed IRC client."
+msgstr ""
+
+#: ../src/common/util.cpp:181

 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "год"
 
 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "год"
 

-#: ../src/common/util.cpp:146
-msgctxt "Quassel::secondsToString()|"
-msgid "day"
-msgstr "день"
+#: ../src/common/util.cpp:183
+msgctxt "Quassel::secondsToString()|"
+msgid "day"
+msgstr "день"
+
+#: ../src/common/util.cpp:184
+msgctxt "Quassel::secondsToString()|"
+msgid "h"
+msgstr "ч"
+
+#: ../src/common/util.cpp:185
+msgctxt "Quassel::secondsToString()|"
+msgid "min"
+msgstr "мин"
+
+#: ../src/common/util.cpp:186
+msgctxt "Quassel::secondsToString()|"
+msgid "sec"
+msgstr "сек"
+
+#: ../src/client/networkmodel.cpp:543
+#, qt-format
+msgctxt "QueryBufferItem|"
+msgid "Query with %1"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:566
+msgctxt "QueryBufferItem|"
+msgid "Unknown"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:572
+msgctxt "QueryBufferItem|"
+msgid "Away message"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:574
+msgctxt "QueryBufferItem|"
+msgid "Realname"
+msgstr "Настоящее имя"
+
+#: ../src/client/networkmodel.cpp:578
+msgctxt "QueryBufferItem|"
+msgid "Help status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:578
+msgctxt "QueryBufferItem|"
+msgid "Available for help"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:581
+msgctxt "QueryBufferItem|"
+msgid "Service status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:591
+msgctxt "QueryBufferItem|"
+msgid "Not logged in"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:597 ../src/client/networkmodel.cpp:604
+msgctxt "QueryBufferItem|"
+msgid "Account"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:604
+msgctxt "QueryBufferItem|"
+msgid "Identified for this nick"
+msgstr ""

 
 

-#: ../src/common/util.cpp:147
-msgctxt "Quassel::secondsToString()|"
-msgid "h"
-msgstr "ч"
+#: ../src/client/networkmodel.cpp:610
+msgctxt "QueryBufferItem|"
+msgid "Service Reply"
+msgstr ""

 
 

-#: ../src/common/util.cpp:148
-msgctxt "Quassel::secondsToString()|"
-msgid "min"
-msgstr "мин"
+#: ../src/client/networkmodel.cpp:614
+msgctxt "QueryBufferItem|"
+msgid "Hostmask"
+msgstr ""

 
 

-#: ../src/common/util.cpp:149
-msgctxt "Quassel::secondsToString()|"
-msgid "sec"
-msgstr "сек"
+#: ../src/client/networkmodel.cpp:618
+msgctxt "QueryBufferItem|"
+msgid "Operator"
+msgstr "Оператор"

 
 

-#: ../src/client/networkmodel.cpp:429
-#, qt-format
+#: ../src/client/networkmodel.cpp:626

 msgctxt "QueryBufferItem|"
 msgctxt "QueryBufferItem|"

-msgid "<b>Query with %1</b>"
-msgstr "<b>Приват с %1</b>"
+msgid "Idling since"
+msgstr ""

 
 

-#: ../src/client/networkmodel.cpp:447
-#, qt-format
+#: ../src/client/networkmodel.cpp:630

 msgctxt "QueryBufferItem|"
 msgctxt "QueryBufferItem|"

-msgid "idling since %1"
-msgstr "неактивен с %1"
+msgid "Login time"
+msgstr ""

 
 

-#: ../src/client/networkmodel.cpp:450
-#, qt-format
+#: ../src/client/networkmodel.cpp:633

 msgctxt "QueryBufferItem|"
 msgctxt "QueryBufferItem|"

-msgid "login time: %1"
-msgstr "вÑ\80емÑ\8f вÑ\85ода: %1"
+msgid "Server"
+msgstr "СеÑ\80веÑ\80"

 
 

-#: ../src/client/networkmodel.cpp:453
-#, qt-format
+#: ../src/client/networkmodel.cpp:639

 msgctxt "QueryBufferItem|"
 msgctxt "QueryBufferItem|"

-msgid "server: %1"
-msgstr "сервер: %1"
+msgid "No information available"
+msgstr ""
+
+#: ../src/qtui/receivefiledlg.ui:14
+msgctxt "ReceiveFileDlg|"
+msgid "Incoming File Transfer"
+msgstr ""
+
+#: ../src/qtui/receivefiledlg.cpp:36
+#, 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/resourcetreedlg.ui:14
+msgctxt "ResourceTreeDlg|"
+msgid "Resource Tree"
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.ui:20
+msgctxt "ResourceTreeDlg|"
+msgid "Shows the contents of the compiled-in resource tree."
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.cpp:53
+msgctxt "ResourceTreeDlg|"
+msgid "File"
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.cpp:53
+msgctxt "ResourceTreeDlg|"
+msgid "Size"
+msgstr ""

 
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
 msgctxt "SaveIdentitiesDlg|"
 
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
 msgctxt "SaveIdentitiesDlg|"


@@ -5164,8 +8421,8 @@ msgstr "Прервать"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:14
 msgctxt "ServerEditDlg|"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:14
 msgctxt "ServerEditDlg|"

-msgid "Dialog"
-msgstr "Диалог"
+msgid "Edit Server"
+msgstr ""

 
 #: ../src/qtui/settingspages/servereditdlg.ui:30
 msgctxt "ServerEditDlg|"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:30
 msgctxt "ServerEditDlg|"


@@ -5178,7 +8435,7 @@ msgid "Server address:"
 msgstr "Адрес сервера:"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:45
 msgstr "Адрес сервера:"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:45

-#: ../src/qtui/settingspages/servereditdlg.ui:227
+#: ../src/qtui/settingspages/servereditdlg.ui:246

 msgctxt "ServerEditDlg|"
 msgid "Port:"
 msgstr "Порт:"
 msgctxt "ServerEditDlg|"
 msgid "Port:"
 msgstr "Порт:"


@@ -5190,174 +8447,200 @@ msgstr "Пароль:"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:94
 msgctxt "ServerEditDlg|"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:94
 msgctxt "ServerEditDlg|"

-msgid "Use SSL"
-msgstr "Использовать SSL"
+msgid "Try to use an encrypted connection (e.g. SSL/TLS)"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:97
+msgctxt "ServerEditDlg|"
+msgid "Use encrypted connection"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:111
+msgctxt "ServerEditDlg|"
+msgid ""
+"<p>Verify the encrypted connection provides a valid certificate, increasing "
+"security.<br/>Uncheck if the IRC server uses a self-signed or invalid "
+"certificate.</p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:114
+msgctxt "ServerEditDlg|"
+msgid "Verify connection security"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/servereditdlg.ui:119
+#: ../src/qtui/settingspages/servereditdlg.ui:138

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

-#: ../src/qtui/settingspages/servereditdlg.ui:140
+#: ../src/qtui/settingspages/servereditdlg.ui:159

 msgctxt "ServerEditDlg|"
 msgid "SSL Version:"
 msgstr "Версия SSL:"
 
 msgctxt "ServerEditDlg|"
 msgid "SSL Version:"
 msgstr "Версия SSL:"
 

-#: ../src/qtui/settingspages/servereditdlg.ui:147
+#: ../src/qtui/settingspages/servereditdlg.ui:166

 msgctxt "ServerEditDlg|"
 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
+#: ../src/qtui/settingspages/servereditdlg.ui:170

 msgctxt "ServerEditDlg|"
 msgctxt "ServerEditDlg|"

-msgid "SSLv3 (default)"
-msgstr "SSLv3 (по Ñ\83молÑ\87аниÑ\8e)"
+msgid "SSLv3 (insecure)"
+msgstr "SSLv3 (небезопаÑ\81но)"

 
 

-#: ../src/qtui/settingspages/servereditdlg.ui:156
+#: ../src/qtui/settingspages/servereditdlg.ui:175

 msgctxt "ServerEditDlg|"
 msgctxt "ServerEditDlg|"

-msgid "SSLv2"
-msgstr "SSLv2"
+msgid "SSLv2 (insecure)"
+msgstr "SSLv2 (небезопасно)"

 
 

-#: ../src/qtui/settingspages/servereditdlg.ui:161
+#: ../src/qtui/settingspages/servereditdlg.ui:180

 msgctxt "ServerEditDlg|"
 msgid "TLSv1"
 msgstr "TLSv1"
 
 msgctxt "ServerEditDlg|"
 msgid "TLSv1"
 msgstr "TLSv1"
 

-#: ../src/qtui/settingspages/servereditdlg.ui:171
+#: ../src/qtui/settingspages/servereditdlg.ui:190

 msgctxt "ServerEditDlg|"
 msgid "Use a Proxy"
 msgstr "Использовать прокси"
 
 msgctxt "ServerEditDlg|"
 msgid "Use a Proxy"
 msgstr "Использовать прокси"
 

-#: ../src/qtui/settingspages/servereditdlg.ui:188
+#: ../src/qtui/settingspages/servereditdlg.ui:207

 msgctxt "ServerEditDlg|"
 msgid "Proxy Type:"
 msgstr "Тип прокси:"
 
 msgctxt "ServerEditDlg|"
 msgid "Proxy Type:"
 msgstr "Тип прокси:"
 

-#: ../src/qtui/settingspages/servereditdlg.ui:196
+#: ../src/qtui/settingspages/servereditdlg.ui:215

 msgctxt "ServerEditDlg|"
 msgctxt "ServerEditDlg|"

-msgid "Socks 5"
-msgstr "Socks 5"
+msgid "SOCKS 5"
+msgstr ""

 
 

-#: ../src/qtui/settingspages/servereditdlg.ui:201
+#: ../src/qtui/settingspages/servereditdlg.ui:220

 msgctxt "ServerEditDlg|"
 msgid "HTTP"
 msgstr "HTTP"
 
 msgctxt "ServerEditDlg|"
 msgid "HTTP"
 msgstr "HTTP"
 

-#: ../src/qtui/settingspages/servereditdlg.ui:213
+#: ../src/qtui/settingspages/servereditdlg.ui:232

 msgctxt "ServerEditDlg|"
 msgid "Proxy Host:"
 msgstr "Хост прокси:"
 
 msgctxt "ServerEditDlg|"
 msgid "Proxy Host:"
 msgstr "Хост прокси:"
 

-#: ../src/qtui/settingspages/servereditdlg.ui:220
+#: ../src/qtui/settingspages/servereditdlg.ui:239

 msgctxt "ServerEditDlg|"
 msgid "localhost"
 msgstr "localhost"
 
 msgctxt "ServerEditDlg|"
 msgid "localhost"
 msgstr "localhost"
 

-#: ../src/qtui/settingspages/servereditdlg.ui:251
+#: ../src/qtui/settingspages/servereditdlg.ui:270

 msgctxt "ServerEditDlg|"
 msgid "Proxy Username:"
 msgstr "Имя пользователя прокси:"
 
 msgctxt "ServerEditDlg|"
 msgid "Proxy Username:"
 msgstr "Имя пользователя прокси:"
 

-#: ../src/qtui/settingspages/servereditdlg.ui:261
+#: ../src/qtui/settingspages/servereditdlg.ui:280

 msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr "Пароль прокси:"
 
 msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr "Пароль прокси:"
 

-#: ../src/qtui/ui/settingsdlg.ui:14
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1327
+msgctxt "ServerEditDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1328
+msgctxt "ServerEditDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to verify connection "
+"security."
+msgstr ""
+
+#: ../src/qtui/settingsdlg.ui:14

 msgctxt "SettingsDlg|"
 msgid "Configure Quassel"
 msgstr "Настроить Quassel"
 
 msgctxt "SettingsDlg|"
 msgid "Configure Quassel"
 msgstr "Настроить Quassel"
 

-#: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50
-#: ../src/qtui/settingsdlg.cpp:99
+#: ../src/qtui/settingsdlg.ui:41 ../src/qtui/settingsdlg.ui:56
+#: ../src/qtui/settingsdlg.cpp:107

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

-#: ../src/qtui/settingsdlg.cpp:109
+#: ../src/qtui/settingsdlg.cpp:119

 msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr "Сохранить изменения"
 
 msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr "Сохранить изменения"
 

-#: ../src/qtui/settingsdlg.cpp:110
+#: ../src/qtui/settingsdlg.cpp:120

 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:137 ../src/qtui/settingsdlg.cpp:141

 #, 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:221

 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:234

 msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
 msgstr "Вернуть умолчания"
 
 msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
 msgstr "Вернуть умолчания"
 

-#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingsdlg.cpp:235

 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 "Вернуть параметры по-умолчанию для этой вкладки?"
 

-#: ../src/qtui/ui/settingspagedlg.ui:14
+#: ../src/qtui/settingspagedlg.ui:14

 msgctxt "SettingsPageDlg|"
 msgid "Configure Quassel"
 msgstr "Настроить Quassel"
 
 msgctxt "SettingsPageDlg|"
 msgid "Configure Quassel"
 msgstr "Настроить Quassel"
 

-#: ../src/qtui/ui/settingspagedlg.ui:30
+#: ../src/qtui/settingspagedlg.ui:30

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

-#: ../src/qtui/settingspagedlg.cpp:36
+#: ../src/qtui/settingspagedlg.cpp:39

 #, 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:120

 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:133

 msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr "Вернуть умолчания"
 
 msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr "Вернуть умолчания"
 

-#: ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingspagedlg.cpp:134

 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:105

 msgctxt "ShortcutsModel|"
 msgid "Action"
 msgstr "Действие:"
 
 msgctxt "ShortcutsModel|"
 msgid "Action"
 msgstr "Действие:"
 

-#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:107

 msgctxt "ShortcutsModel|"
 msgid "Shortcut"
 msgstr ""
 msgctxt "ShortcutsModel|"
 msgid "Shortcut"
 msgstr ""


@@ -5383,8 +8666,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:96
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:108

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


@@ -5394,122 +8677,142 @@ msgctxt "ShortcutsSettingsPage|"
 msgid "Custom:"
 msgstr "Пользовательские цвета"
 
 msgid "Custom:"
 msgstr "Пользовательские цвета"
 

-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:63

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

-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:63

 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:616

 msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr "Отсоединяюсь"
 
 msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr "Отсоединяюсь"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:28
+#: ../src/qtui/simplenetworkeditor.ui:28

 msgctxt "SimpleNetworkEditor|"
 msgid "Network name:"
 msgstr "Название сети:"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Network name:"
 msgstr "Название сети:"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:35
+#: ../src/qtui/simplenetworkeditor.ui:35

 msgctxt "SimpleNetworkEditor|"
 msgid "The name of the IRC network you are configuring"
 msgstr "Название настраиваемой IRC-сети"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "The name of the IRC network you are configuring"
 msgstr "Название настраиваемой IRC-сети"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:63
+#: ../src/qtui/simplenetworkeditor.ui:63

 msgctxt "SimpleNetworkEditor|"
 msgid "Servers"
 msgstr "Серверы"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Servers"
 msgstr "Серверы"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:81
+#: ../src/qtui/simplenetworkeditor.ui:81

 msgctxt "SimpleNetworkEditor|"
 msgid "A list of IRC servers belonging to this network"
 msgstr "Список IRC-серверов в этой сети"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "A list of IRC servers belonging to this network"
 msgstr "Список IRC-серверов в этой сети"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:96
+#: ../src/qtui/simplenetworkeditor.ui:96

 msgctxt "SimpleNetworkEditor|"
 msgid "Edit this server entry"
 msgstr "Редактировать этот сервер"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Edit this server entry"
 msgstr "Редактировать этот сервер"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:99
+#: ../src/qtui/simplenetworkeditor.ui:99

 msgctxt "SimpleNetworkEditor|"
 msgid "&Edit..."
 msgstr "&Править..."
 
 msgctxt "SimpleNetworkEditor|"
 msgid "&Edit..."
 msgstr "&Править..."
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:116
+#: ../src/qtui/simplenetworkeditor.ui:116

 msgctxt "SimpleNetworkEditor|"
 msgid "Add another IRC server"
 msgstr "Добавить другой IRC-сервер"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Add another IRC server"
 msgstr "Добавить другой IRC-сервер"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:119
+#: ../src/qtui/simplenetworkeditor.ui:119

 msgctxt "SimpleNetworkEditor|"
 msgid "&Add..."
 msgstr "Доб&авить..."
 
 msgctxt "SimpleNetworkEditor|"
 msgid "&Add..."
 msgstr "Доб&авить..."
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:136
+#: ../src/qtui/simplenetworkeditor.ui:136

 msgctxt "SimpleNetworkEditor|"
 msgid "Remove this server entry from the list"
 msgstr "Удалить этот сервер из списка"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Remove this server entry from the list"
 msgstr "Удалить этот сервер из списка"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:139
+#: ../src/qtui/simplenetworkeditor.ui:139

 msgctxt "SimpleNetworkEditor|"
 msgid "De&lete"
 msgstr "У&далить"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "De&lete"
 msgstr "У&далить"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:165
+#: ../src/qtui/simplenetworkeditor.ui:165

 msgctxt "SimpleNetworkEditor|"
 msgid "Move upwards in list"
 msgstr "Передвинуть вверх в списке"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Move upwards in list"
 msgstr "Передвинуть вверх в списке"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:168
-#: ../src/qtui/ui/simplenetworkeditor.ui:182
+#: ../src/qtui/simplenetworkeditor.ui:168
+#: ../src/qtui/simplenetworkeditor.ui:182

 msgctxt "SimpleNetworkEditor|"
 msgid "..."
 msgctxt "SimpleNetworkEditor|"
 msgid "..."

-msgstr "..."
+msgstr ""

 
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:179
+#: ../src/qtui/simplenetworkeditor.ui:179

 msgctxt "SimpleNetworkEditor|"
 msgid "Move downwards in list"
 msgstr "Передвинуть вниз в списке"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Move downwards in list"
 msgstr "Передвинуть вниз в списке"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:226
+#: ../src/qtui/simplenetworkeditor.ui:226

 msgctxt "SimpleNetworkEditor|"
 msgid "Join Channels Automatically"
 msgstr "Автоматически входить на каналы"
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Join Channels Automatically"
 msgstr "Автоматически входить на каналы"
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:250
+#: ../src/qtui/simplenetworkeditor.ui:250

 msgctxt "SimpleNetworkEditor|"
 msgid ""
 "A list of IRC channels you will join automatically after connecting to the "
 "network"
 msgctxt "SimpleNetworkEditor|"
 msgid ""
 "A list of IRC channels you will join automatically after connecting to the "
 "network"

+msgstr "Список каналов IRC, на которые клиент будет автоматически заходить при подключении к сети"
+
+#: ../src/qtui/snorenotificationbackend.cpp:53
+msgctxt "SnoreNotificationBackend|"
+msgid "Private Message"
+msgstr ""
+
+#: ../src/qtui/snorentificationconfigwidget.ui:20
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/snorentificationconfigwidget.ui:29
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Snore"
+msgstr ""
+
+#: ../src/qtui/snorentificationconfigwidget.ui:40
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Enable Snore"
+msgstr ""
+
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Spell Checking"
+msgstr ""
+
+#: ../src/core/sqlauthenticator.cpp:47
+msgctxt "SqlAuthenticator|"
+msgid "Database"

 msgstr ""
 msgstr ""

-"Список каналов IRC, на которые клиент будет автоматически заходить при "
-"подключении к сети"

 
 

-#: ../src/core/sqlitestorage.cpp:52
+#: ../src/core/sqlauthenticator.cpp:52
+msgctxt "SqlAuthenticator|"
+msgid ""
+"Do not authenticate against any remote service, but instead save a hashed "
+"and salted password in the database selected in the next step."
+msgstr ""
+
+#: ../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,135 +8820,171 @@ 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
+#: ../src/qtui/sslinfodlg.ui:14

 msgctxt "SslInfoDlg|"
 msgid "Security Information"
 msgstr "Информация о ядре"
 
 msgctxt "SslInfoDlg|"
 msgid "Security Information"
 msgstr "Информация о ядре"
 

-#: ../src/qtui/ui/sslinfodlg.ui:22
+#: ../src/qtui/sslinfodlg.ui:22

 msgctxt "SslInfoDlg|"
 msgid "<b>Hostname:</b>"
 msgstr "Хост:"
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Hostname:</b>"
 msgstr "Хост:"
 

-#: ../src/qtui/ui/sslinfodlg.ui:39
+#: ../src/qtui/sslinfodlg.ui:39

 msgctxt "SslInfoDlg|"
 msgid "<b>IP address:</b>"
 msgstr "<b>Режим:</b> %1"
 
 msgctxt "SslInfoDlg|"
 msgid "<b>IP address:</b>"
 msgstr "<b>Режим:</b> %1"
 

-#: ../src/qtui/ui/sslinfodlg.ui:56
+#: ../src/qtui/sslinfodlg.ui:56

 msgctxt "SslInfoDlg|"
 msgid "<b>Encryption:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Encryption:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:73
+#: ../src/qtui/sslinfodlg.ui:73

 msgctxt "SslInfoDlg|"
 msgid "<b>Protocol:</b>"
 msgstr "<b>Тема:</b> %1"
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Protocol:</b>"
 msgstr "<b>Тема:</b> %1"
 

-#: ../src/qtui/ui/sslinfodlg.ui:90
+#: ../src/qtui/sslinfodlg.ui:90

 msgctxt "SslInfoDlg|"
 msgid "<b>Certificate chain:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Certificate chain:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:120
+#: ../src/qtui/sslinfodlg.ui:120

 msgctxt "SslInfoDlg|"
 msgid "Subject"
 msgctxt "SslInfoDlg|"
 msgid "Subject"

-msgstr ""
+msgstr "Тема"

 
 

-#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
+#: ../src/qtui/sslinfodlg.ui:126 ../src/qtui/sslinfodlg.ui:248

 msgctxt "SslInfoDlg|"
 msgid "<b>Common name:</b>"
 msgstr "ОбщееИмя:"
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Common name:</b>"
 msgstr "ОбщееИмя:"
 

-#: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265
+#: ../src/qtui/sslinfodlg.ui:143 ../src/qtui/sslinfodlg.ui:265

 msgctxt "SslInfoDlg|"
 msgid "<b>Organization:</b>"
 msgstr "Организация:"
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Organization:</b>"
 msgstr "Организация:"
 

-#: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282
+#: ../src/qtui/sslinfodlg.ui:160 ../src/qtui/sslinfodlg.ui:282

 msgctxt "SslInfoDlg|"
 msgid "<b>Organizational unit:</b>"
 msgstr "Организация:"
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Organizational unit:</b>"
 msgstr "Организация:"
 

-#: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299
+#: ../src/qtui/sslinfodlg.ui:177 ../src/qtui/sslinfodlg.ui:299

 msgctxt "SslInfoDlg|"
 msgid "<b>Country:</b>"
 msgstr "<b>Режим:</b> %1"
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Country:</b>"
 msgstr "<b>Режим:</b> %1"
 

-#: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316
+#: ../src/qtui/sslinfodlg.ui:194 ../src/qtui/sslinfodlg.ui:316

 msgctxt "SslInfoDlg|"
 msgid "<b>State or province:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>State or province:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353
+#: ../src/qtui/sslinfodlg.ui:231 ../src/qtui/sslinfodlg.ui:353

 msgctxt "SslInfoDlg|"
 msgid "<b>Locality:</b>"
 msgstr "<b>Тема:</b> %1"
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Locality:</b>"
 msgstr "<b>Тема:</b> %1"
 

-#: ../src/qtui/ui/sslinfodlg.ui:242
+#: ../src/qtui/sslinfodlg.ui:242

 msgctxt "SslInfoDlg|"
 msgid "Issuer"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "Issuer"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:367
+#: ../src/qtui/sslinfodlg.ui:367

 msgctxt "SslInfoDlg|"
 msgid "<b>Validity period:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Validity period:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:384
+#: ../src/qtui/sslinfodlg.ui:384

 msgctxt "SslInfoDlg|"
 msgid "<b>MD5 digest:</b>"
 msgstr "<b>Режим:</b> %1"
 
 msgctxt "SslInfoDlg|"
 msgid "<b>MD5 digest:</b>"
 msgstr "<b>Режим:</b> %1"
 

-#: ../src/qtui/ui/sslinfodlg.ui:401
+#: ../src/qtui/sslinfodlg.ui:401

 msgctxt "SslInfoDlg|"
 msgid "<b>SHA1 digest:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>SHA1 digest:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:431
+#: ../src/qtui/sslinfodlg.ui:418
+msgctxt "SslInfoDlg|"
+msgid "<b>SHA256 digest:</b>"
+msgstr ""
+
+#: ../src/qtui/sslinfodlg.ui:448

 msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
 msgstr "<b>Пользователи:</b> %1"
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
 msgstr "<b>Пользователи:</b> %1"
 

-#: ../src/qtui/sslinfodlg.cpp:69
+#: ../src/qtui/sslinfodlg.cpp:76

 msgctxt "SslInfoDlg|"
 msgid "Yes"
 msgctxt "SslInfoDlg|"
 msgid "Yes"

-msgstr ""
+msgstr "Да"

 
 

-#: ../src/qtui/sslinfodlg.cpp:71
+#: ../src/qtui/sslinfodlg.cpp:79

 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:88

 #, 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:169

 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:43 ../src/qtui/systemtray.cpp:203

 msgctxt "SystemTray|"
 msgid "&Minimize"
 msgctxt "SystemTray|"
 msgid "&Minimize"

-msgstr ""
+msgstr "&Минимизировать"

 
 

-#: ../src/qtui/systemtray.cpp:94
+#: ../src/qtui/systemtray.cpp:205

 msgctxt "SystemTray|"
 msgid "&Restore"
 msgctxt "SystemTray|"
 msgid "&Restore"

+msgstr "&Восстановить"
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:20
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Form"
+msgstr "Форма"
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:28
+msgctxt "SystrayAnimationConfigWidget|"
+msgid ""
+"<html><head/><body><p>If enabled, alert the system tray or dock in case of a"
+" notification.</p><p>It depends on your desktop environment how an alert is "
+"visualized. For example, Plasma will pulsate the tray icon, while Windows "
+"will change the icon's color. You may choose to forcefully change color or "
+"even letting the icon blink, if desired.</p><p>Note that not all icon themes"
+" support changing the color of the tray icon.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:31
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Alert tray icon and"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:54
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "do nothing"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/systraynotificationbackend.cpp:125
+#: ../src/qtui/systrayanimationconfigwidget.ui:59
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "change color"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:64
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "blink"
+msgstr ""
+
+#: ../src/qtui/systraynotificationbackend.cpp:131

 #, qt-format
 msgctxt "SystrayNotificationBackend|"
 msgid "%n pending highlight(s)"
 #, qt-format
 msgctxt "SystrayNotificationBackend|"
 msgid "%n pending highlight(s)"


@@ -5653,33 +8992,34 @@ 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:145

 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr "Показывать свои сообщения"
 
 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr "Показывать свои сообщения"
 

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

 msgctxt "TabCompleter|"
 msgid "Tab completion"
 msgstr ""
 
 msgctxt "TabCompleter|"
 msgid "Tab completion"
 msgstr ""
 

-#: ../src/qtui/taskbarnotificationbackend.cpp:68
+#: ../src/qtui/taskbarnotificationbackend.cpp:78

 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:80

 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:88

 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Unlimited"
 msgstr "Неограничено"
 
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Unlimited"
 msgstr "Неограничено"
 

-#: ../src/qtui/taskbarnotificationbackend.cpp:79
+#: ../src/qtui/taskbarnotificationbackend.cpp:89

 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr " сек."
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr " сек."


@@ -5704,147 +9044,147 @@ msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
 msgstr "Отсоединиться от IRC"
 
 msgid "Disconnect from IRC"
 msgstr "Отсоединиться от IRC"
 

+#: ../src/uisupport/toolbaractionprovider.cpp:33
+msgctxt "ToolBarActionProvider|"
+msgid "Connect to all"
+msgstr "Подключиться ко всем"
+

 #: ../src/uisupport/toolbaractionprovider.cpp:34
 msgctxt "ToolBarActionProvider|"
 #: ../src/uisupport/toolbaractionprovider.cpp:34
 msgctxt "ToolBarActionProvider|"

+msgid "Disconnect from all"
+msgstr "Отключиться от всех"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:36
+msgctxt "ToolBarActionProvider|"

 msgid "Part"
 msgstr "Выйти"
 
 msgid "Part"
 msgstr "Выйти"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:36

 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:37

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

-#: ../src/uisupport/toolbaractionprovider.cpp:35
+#: ../src/uisupport/toolbaractionprovider.cpp:37

 msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr "Зайти на канал"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr "Зайти на канал"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:39

 msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr "Приват"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr "Приват"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:39

 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:40

 msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:40

 msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr "Запросить информацию о пользователе"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr "Запросить информацию о пользователе"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:42

 msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr "Оп"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr "Оп"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:42

 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:43

 msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr "Снять оп"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr "Снять оп"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:43

 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:44

 msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr "Голос"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr "Голос"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:44

 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:45

 msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr "Снять голос"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr "Снять голос"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:45

 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:46

 msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr "Выгнать"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr "Выгнать"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:46

 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:47

 msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr "Забанить"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr "Забанить"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:47

 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:48

 msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
 msgstr "Выгнать"
 
 msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
 msgstr "Выгнать"
 

-#: ../src/uisupport/toolbaractionprovider.cpp:46
+#: ../src/uisupport/toolbaractionprovider.cpp:48

 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
-msgctxt "ToolBarActionProvider|"
-msgid "Connect to all"
-msgstr "Подключиться ко всем"
-
-#: ../src/uisupport/toolbaractionprovider.cpp:58
-msgctxt "ToolBarActionProvider|"
-msgid "Disconnect from all"
-msgstr "Отключиться от всех"
-
-#: ../src/qtui/ui/topicwidget.ui:32
+#: ../src/qtui/topicwidget.ui:32

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

-#: ../src/qtui/ui/topicwidget.ui:79
+#: ../src/qtui/topicwidget.ui:79

 msgctxt "TopicWidget|"
 msgid "..."
 msgctxt "TopicWidget|"
 msgid "..."

-msgstr "..."
+msgstr ""

 
 

-#: ../src/qtui/topicwidget.cpp:106
+#: ../src/qtui/topicwidget.cpp:116

 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Users: %1"
 msgstr "Пользователи: %1"
 
 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Users: %1"
 msgstr "Пользователи: %1"
 

-#: ../src/qtui/topicwidget.cpp:107
+#: ../src/qtui/topicwidget.cpp:117

 #, 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 +9206,241 @@ 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"
+#: ../src/common/transfer.cpp:92
+msgctxt "Transfer|"
+msgid "New"
+msgstr "Новый"
+
+#: ../src/common/transfer.cpp:94
+msgctxt "Transfer|"
+msgid "Pending"

 msgstr ""
 
 msgstr ""
 

-#. Action Message
-#: ../src/uisupport/uistyle.cpp:583
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "%DN%1%DN %2"
+#: ../src/common/transfer.cpp:96
+msgctxt "Transfer|"
+msgid "Connecting"
+msgstr ""
+
+#: ../src/common/transfer.cpp:98
+msgctxt "Transfer|"
+msgid "Transferring"
+msgstr ""
+
+#: ../src/common/transfer.cpp:100
+msgctxt "Transfer|"
+msgid "Paused"
+msgstr ""
+
+#: ../src/common/transfer.cpp:102
+msgctxt "Transfer|"
+msgid "Completed"
+msgstr ""
+
+#: ../src/common/transfer.cpp:104
+msgctxt "Transfer|"
+msgid "Failed"
+msgstr ""
+
+#: ../src/common/transfer.cpp:106
+msgctxt "Transfer|"
+msgid "Rejected"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Type"
+msgstr "Вид"
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "File"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Status"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Progress"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Transferred"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Speed"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Peer"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Peer Address"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:75
+msgctxt "TransferModel|"
+msgid "Send"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:75
+msgctxt "TransferModel|"
+msgid "Receive"

 msgstr ""
 
 #. Nick Message
 msgstr ""
 
 #. Nick Message

-#: ../src/uisupport/uistyle.cpp:587
+#: ../src/uisupport/uistyle.cpp:915

 #, 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:917

 #, 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:922

 #, 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:924

 #, 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:928

 #, 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:932

 #, 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:938

 #, 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:946

 #, 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:963

 #, 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:975

 #, 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:979 ../src/uisupport/uistyle.cpp:995

 #, 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:990

 #, 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 "<-*"
+msgstr "Нетсплит между %DH%1%DH и %DH%2%DH. Пользователей вышло: "

 
 

-#: ../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 "->"
-
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:954

 #, 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:956

 #, 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:958

 #, 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:960

 #, 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:962

 #, 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:964

 #, 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] ""