X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=po%2Fru.po;h=cc046bda86799296882a64b3feebe277d9fff8c8;hb=c820e4b0bb1aeab59d65f9024301f468159e2337;hp=8dcb3a6675c5f40418bc45fed32cdaf0c2aa9896;hpb=dd711790dddee81442e2138b3917764dac39c487;p=quassel.git
diff --git a/po/ru.po b/po/ru.po
index 8dcb3a66..cc046bda 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,15 +1,17 @@
#
# Translators:
-# Daniel Albers , 2011
-# sfionov , 2012
+# Andrei Stepanov, 2016
# sfionov , 2012
+# Svetlana Tkachenko , 2018
+# Viktor Suprun , 2016
+# Yaroslav Veremenko , 2018
msgid ""
msgstr ""
"Project-Id-Version: Quassel IRC\n"
"Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
-"PO-Revision-Date: 2015-03-25 12:13+0000\n"
+"PO-Revision-Date: 2018-08-28 13:38+0000\n"
"Last-Translator: Daniel Albers \n"
-"Language-Team: Russian (http://www.transifex.com/ald/quassel/language/ru/)\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"
@@ -20,475 +22,597 @@ msgstr ""
#: ../src/uisupport/aboutdata.cpp:136
msgctxt "AboutData|"
msgid "Quassel IRC"
-msgstr ""
+msgstr "Quassel IRC"
#: ../src/uisupport/aboutdata.cpp:141
msgctxt "AboutData|"
msgid "A modern, distributed IRC client"
-msgstr ""
+msgstr "СовÑеменнÑй, ÑаÑпÑеделÑннÑй IRC-клиенÑ"
#: ../src/uisupport/aboutdata.cpp:174
msgctxt "AboutData|"
-msgid "Project Founder, Lead Developer"
-msgstr ""
+msgid "Project founder, lead developer"
+msgstr "ÐÑноваÑÐµÐ»Ñ Ð¿ÑоекÑа, ведÑÑий ÑазÑабоÑÑик"
#: ../src/uisupport/aboutdata.cpp:175
msgctxt "AboutData|"
-msgid "Project Motivator, Lead Developer"
-msgstr ""
+msgid "Project motivator, lead developer"
+msgstr "ÐдейнÑй вдоÑ
новиÑелÑ, ведÑÑий ÑазÑабоÑÑик"
#: ../src/uisupport/aboutdata.cpp:176
msgctxt "AboutData|"
-msgid "Former Lead Developer"
-msgstr ""
+msgid "Former lead developer"
+msgstr "ÐÑвÑий ведÑÑий ÑазÑабоÑÑик"
#: ../src/uisupport/aboutdata.cpp:177
msgctxt "AboutData|"
-msgid "Master of Translation, many fixes and enhancements"
+msgid "Master of Translation, many fixes and enhancements, Travis support"
msgstr ""
#: ../src/uisupport/aboutdata.cpp:178
msgctxt "AboutData|"
msgid "Many features, fixes and improvements"
-msgstr ""
+msgstr "Ðного нововведений, иÑпÑавлений и ÑлÑÑÑений"
#: ../src/uisupport/aboutdata.cpp:179
msgctxt "AboutData|"
msgid "Many fixes and improvements, bug and patch triaging, community support"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:183 ../src/uisupport/aboutdata.cpp:192
+#: ../src/uisupport/aboutdata.cpp:180
msgctxt "AboutData|"
-msgid "Chatview improvements"
+msgid ""
+"IRCv3 support, documentation, many other improvements, testing, outstanding "
+"PRs"
+msgstr "ÐоддеÑжка IRCv3, докÑменÑаÑиÑ, много ÑазнÑÑ
ÑлÑÑÑений, ÑеÑÑиÑование, вÑдаÑÑиеÑÑ Ð¿Ñлл ÑеквеÑÑÑ"
+
+#: ../src/uisupport/aboutdata.cpp:181
+msgctxt "AboutData|"
+msgid ""
+"Quasseldroid, architecture, (mobile) performance, many other improvements "
+"and fixes, testing"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:184
+#: ../src/uisupport/aboutdata.cpp:185
+msgctxt "AboutData|"
+msgid "OSX UI improvements"
+msgstr "УлÑÑÑÐµÐ½Ð¸Ñ Ð¸Ð½ÐµÑеÑÑейÑа Ð´Ð»Ñ OSX"
+
+#: ../src/uisupport/aboutdata.cpp:186 ../src/uisupport/aboutdata.cpp:201
+msgctxt "AboutData|"
+msgid "Chatview improvements"
+msgstr "УлÑÑÑÐµÐ½Ð¸Ñ Ð¸Ð½ÑеÑÑейÑа ÑаÑа"
+
+#: ../src/uisupport/aboutdata.cpp:187
msgctxt "AboutData|"
msgid "Early beta tester and bughunter, Danish translation"
-msgstr ""
+msgstr "ТеÑÑÐµÑ Ñанней беÑа веÑÑии и багÑ
анÑеÑ, даÑÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:185 ../src/uisupport/aboutdata.cpp:261
-#: ../src/uisupport/aboutdata.cpp:284
+#: ../src/uisupport/aboutdata.cpp:188 ../src/uisupport/aboutdata.cpp:266
+#: ../src/uisupport/aboutdata.cpp:295 ../src/uisupport/aboutdata.cpp:307
msgctxt "AboutData|"
msgid "Spanish translation"
-msgstr ""
+msgstr "ÐÑпанÑкий пеÑевод"
+
+#: ../src/uisupport/aboutdata.cpp:189
+msgctxt "AboutData|"
+msgid "Build system fixes"
+msgstr "ÐÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ÑиÑÑÐµÐ¼Ñ ÑбоÑки"
-#: ../src/uisupport/aboutdata.cpp:186
+#: ../src/uisupport/aboutdata.cpp:190 ../src/uisupport/aboutdata.cpp:330
+msgctxt "AboutData|"
+msgid "Database performance improvements"
+msgstr "УлÑÑÑение пÑоизводиÑелÑноÑÑи Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
"
+
+#: ../src/uisupport/aboutdata.cpp:191
msgctxt "AboutData|"
msgid "Tray icon fix"
-msgstr ""
+msgstr "ÐÑпÑавление иконки в ÑÑее"
-#: ../src/uisupport/aboutdata.cpp:187
+#: ../src/uisupport/aboutdata.cpp:192
msgctxt "AboutData|"
msgid "Language improvements"
-msgstr ""
+msgstr "ЯзÑковÑе ÑлÑÑÑениÑ"
-#: ../src/uisupport/aboutdata.cpp:188
+#: ../src/uisupport/aboutdata.cpp:193
msgctxt "AboutData|"
msgid "Documentation improvements"
-msgstr ""
+msgstr "УлÑÑÑÐµÐ½Ð¸Ñ Ð´Ð¾ÐºÑменÑаÑии"
-#: ../src/uisupport/aboutdata.cpp:189 ../src/uisupport/aboutdata.cpp:285
+#: ../src/uisupport/aboutdata.cpp:194 ../src/uisupport/aboutdata.cpp:300
+msgctxt "AboutData|"
+msgid "Brazilian translation"
+msgstr "ÐÑазилÑÑкий пеÑевод"
+
+#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:269
+msgctxt "AboutData|"
+msgid "Slovenian translation"
+msgstr "СловенÑкий пеÑевод"
+
+#: ../src/uisupport/aboutdata.cpp:196 ../src/uisupport/aboutdata.cpp:222
+#: ../src/uisupport/aboutdata.cpp:226 ../src/uisupport/aboutdata.cpp:243
+#: ../src/uisupport/aboutdata.cpp:252 ../src/uisupport/aboutdata.cpp:274
+#: ../src/uisupport/aboutdata.cpp:290 ../src/uisupport/aboutdata.cpp:310
+#: ../src/uisupport/aboutdata.cpp:347
+msgctxt "AboutData|"
+msgid "Fixes"
+msgstr "ÐÑпÑавлениÑ"
+
+#: ../src/uisupport/aboutdata.cpp:197 ../src/uisupport/aboutdata.cpp:322
msgctxt "AboutData|"
msgid "Romanian translation"
-msgstr ""
+msgstr "Ð ÑмÑнÑкий пеÑевод"
+
+#: ../src/uisupport/aboutdata.cpp:198
+msgctxt "AboutData|"
+msgid "Punjabi translation"
+msgstr "ÐанджабÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:190 ../src/uisupport/aboutdata.cpp:235
-#: ../src/uisupport/aboutdata.cpp:246 ../src/uisupport/aboutdata.cpp:247
+#: ../src/uisupport/aboutdata.cpp:199 ../src/uisupport/aboutdata.cpp:261
+#: ../src/uisupport/aboutdata.cpp:276 ../src/uisupport/aboutdata.cpp:277
msgctxt "AboutData|"
msgid "Finnish translation"
-msgstr ""
+msgstr "ФинÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:191
+#: ../src/uisupport/aboutdata.cpp:200
msgctxt "AboutData|"
msgid "Message indicator support"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:193
+#: ../src/uisupport/aboutdata.cpp:202 ../src/uisupport/aboutdata.cpp:203
+#: ../src/uisupport/aboutdata.cpp:346
+msgctxt "AboutData|"
+msgid "Build system fix"
+msgstr "ÐÑпÑавление ÑиÑÑÐµÐ¼Ñ ÑбоÑки"
+
+#: ../src/uisupport/aboutdata.cpp:204
msgctxt "AboutData|"
msgid "Windows build system fixes"
+msgstr "ÐпÑавление ÑиÑÑÐµÐ¼Ñ ÑбоÑки Ð´Ð»Ñ Windows"
+
+#: ../src/uisupport/aboutdata.cpp:205
+msgctxt "AboutData|"
+msgid "AppData metadata, LDAP support"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:194
+#: ../src/uisupport/aboutdata.cpp:206
msgctxt "AboutData|"
-msgid "Crash fixes"
+msgid "Nicer tooltips, spell check and other improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:215
-#: ../src/uisupport/aboutdata.cpp:271
+#: ../src/uisupport/aboutdata.cpp:207
+msgctxt "AboutData|"
+msgid "Crash fixes"
+msgstr "ÐÑпÑавление падений"
+
+#: ../src/uisupport/aboutdata.cpp:208 ../src/uisupport/aboutdata.cpp:233
+#: ../src/uisupport/aboutdata.cpp:311
msgctxt "AboutData|"
msgid "French translation"
+msgstr "ФÑанÑÑзÑкий пеÑевод"
+
+#: ../src/uisupport/aboutdata.cpp:209
+msgctxt "AboutData|"
+msgid "Occitan translation"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:196
+#: ../src/uisupport/aboutdata.cpp:210
msgctxt "AboutData|"
msgid "Usability review"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:197
+#: ../src/uisupport/aboutdata.cpp:211
msgctxt "AboutData|"
msgid "SASL support"
-msgstr ""
+msgstr "ÐоддеÑжка SASL"
-#: ../src/uisupport/aboutdata.cpp:198
+#: ../src/uisupport/aboutdata.cpp:212
msgctxt "AboutData|"
msgid "Various improvements"
-msgstr ""
+msgstr "РазлиÑнÑе ÑлÑÑÑениÑ"
-#: ../src/uisupport/aboutdata.cpp:199 ../src/uisupport/aboutdata.cpp:200
-#: ../src/uisupport/aboutdata.cpp:204
+#: ../src/uisupport/aboutdata.cpp:213 ../src/uisupport/aboutdata.cpp:214
+#: ../src/uisupport/aboutdata.cpp:219
msgctxt "AboutData|"
msgid "Various fixes and improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:201
+#: ../src/uisupport/aboutdata.cpp:215
+msgctxt "AboutData|"
+msgid "Settings fixes"
+msgstr "ÐÑпÑавление окна наÑÑÑоек"
+
+#: ../src/uisupport/aboutdata.cpp:216 ../src/uisupport/aboutdata.cpp:294
msgctxt "AboutData|"
msgid "Galician translation"
-msgstr ""
+msgstr "ÐалиÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:202
+#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:339
msgctxt "AboutData|"
msgid "Esperanto translation"
-msgstr ""
+msgstr "ÐеÑевод на ÑÑпеÑанÑо"
-#: ../src/uisupport/aboutdata.cpp:203
+#: ../src/uisupport/aboutdata.cpp:218
msgctxt "AboutData|"
msgid "Japanese translation"
-msgstr ""
+msgstr "ЯпонÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:205 ../src/uisupport/aboutdata.cpp:263
+#: ../src/uisupport/aboutdata.cpp:220 ../src/uisupport/aboutdata.cpp:297
msgctxt "AboutData|"
msgid "Gentoo maintainer"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:206
+#: ../src/uisupport/aboutdata.cpp:221 ../src/uisupport/aboutdata.cpp:237
+#: ../src/uisupport/aboutdata.cpp:342
+msgctxt "AboutData|"
+msgid "Certificate handling improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:223
msgctxt "AboutData|"
msgid "Early beta tester and bughunter (on Vistaâ¢!)"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:207
+#: ../src/uisupport/aboutdata.cpp:224
msgctxt "AboutData|"
msgid "Translation system fixes"
-msgstr ""
+msgstr "ÐÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ÑиÑÑÐµÐ¼Ñ Ð¿ÐµÑеводов"
-#: ../src/uisupport/aboutdata.cpp:208
+#: ../src/uisupport/aboutdata.cpp:225
msgctxt "AboutData|"
msgid "OSX Notification Center support"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:209 ../src/uisupport/aboutdata.cpp:257
+#: ../src/uisupport/aboutdata.cpp:227 ../src/uisupport/aboutdata.cpp:244
+#: ../src/uisupport/aboutdata.cpp:345 ../src/uisupport/aboutdata.cpp:351
msgctxt "AboutData|"
-msgid "Fixes"
-msgstr ""
+msgid "Turkish translation"
+msgstr "ТÑÑеÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:210 ../src/uisupport/aboutdata.cpp:259
+#: ../src/uisupport/aboutdata.cpp:228 ../src/uisupport/aboutdata.cpp:292
msgctxt "AboutData|"
msgid "Mac fixes"
-msgstr ""
+msgstr "ÐÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Mac"
-#: ../src/uisupport/aboutdata.cpp:211
+#: ../src/uisupport/aboutdata.cpp:229
msgctxt "AboutData|"
msgid "D-Bus notifications"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:212
+#: ../src/uisupport/aboutdata.cpp:230
msgctxt "AboutData|"
msgid "Polish translation"
-msgstr ""
+msgstr "ÐолÑÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:213
+#: ../src/uisupport/aboutdata.cpp:231 ../src/uisupport/aboutdata.cpp:312
msgctxt "AboutData|"
msgid "Build system improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:214
+#: ../src/uisupport/aboutdata.cpp:232
msgctxt "AboutData|"
msgid "Formatting support and other input line improvements, many other fixes"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:216
+#: ../src/uisupport/aboutdata.cpp:234
msgctxt "AboutData|"
msgid "BluesTheme stylesheet"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:251
-#: ../src/uisupport/aboutdata.cpp:279
+#: ../src/uisupport/aboutdata.cpp:235 ../src/uisupport/aboutdata.cpp:281
+#: ../src/uisupport/aboutdata.cpp:323 ../src/uisupport/aboutdata.cpp:343
msgctxt "AboutData|"
msgid "Russian translation"
-msgstr ""
+msgstr "Ð ÑÑÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:218 ../src/uisupport/aboutdata.cpp:253
+#: ../src/uisupport/aboutdata.cpp:236 ../src/uisupport/aboutdata.cpp:285
msgctxt "AboutData|"
msgid "Italian translation"
-msgstr ""
+msgstr "ÐÑалÑÑнÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:219
+#: ../src/uisupport/aboutdata.cpp:238 ../src/uisupport/aboutdata.cpp:272
+#: ../src/uisupport/aboutdata.cpp:282 ../src/uisupport/aboutdata.cpp:286
+#: ../src/uisupport/aboutdata.cpp:289 ../src/uisupport/aboutdata.cpp:340
msgctxt "AboutData|"
-msgid "Certificate handling improvements"
-msgstr ""
+msgid "German translation"
+msgstr "ÐемеÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:220
+#: ../src/uisupport/aboutdata.cpp:239
msgctxt "AboutData|"
-msgid "Sanitize topic handling"
+msgid "Sanitize topic handling, twitch.tv support"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:221
+#: ../src/uisupport/aboutdata.cpp:240
msgctxt "AboutData|"
msgid "Norwegian translation"
-msgstr ""
+msgstr "ÐоÑвежÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:222
+#: ../src/uisupport/aboutdata.cpp:241
msgctxt "AboutData|"
msgid "Hungarian translation"
-msgstr ""
+msgstr "ÐенгеÑÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:223
+#: ../src/uisupport/aboutdata.cpp:242
msgctxt "AboutData|"
msgid "IRC parser improvements"
-msgstr ""
+msgstr "УлÑÑÑÐµÐ½Ð¸Ñ Ð¿Ð°ÑÑеÑа IRC"
-#: ../src/uisupport/aboutdata.cpp:224 ../src/uisupport/aboutdata.cpp:296
-#: ../src/uisupport/aboutdata.cpp:300
+#: ../src/uisupport/aboutdata.cpp:245
msgctxt "AboutData|"
-msgid "Turkish translation"
+msgid "Windows build support and Appveyor maintenance, snorenotify backend"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:225
+#: ../src/uisupport/aboutdata.cpp:246
msgctxt "AboutData|"
msgid "Initial Qt5 support"
-msgstr ""
+msgstr "ÐаÑалÑÐ½Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑжка Qt5"
-#: ../src/uisupport/aboutdata.cpp:226
+#: ../src/uisupport/aboutdata.cpp:247
msgctxt "AboutData|"
msgid "{Ku|U}buntu packager, motivator, promoter"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:227
+#: ../src/uisupport/aboutdata.cpp:248
msgctxt "AboutData|"
-msgid "Various features"
-msgstr ""
+msgid "Various features and improvements"
+msgstr "ÐожеÑÑво ÑлÑÑÑений и иÑпÑавлений"
-#: ../src/uisupport/aboutdata.cpp:228 ../src/uisupport/aboutdata.cpp:229
-#: ../src/uisupport/aboutdata.cpp:234 ../src/uisupport/aboutdata.cpp:239
+#: ../src/uisupport/aboutdata.cpp:249 ../src/uisupport/aboutdata.cpp:250
+#: ../src/uisupport/aboutdata.cpp:260 ../src/uisupport/aboutdata.cpp:267
+#: ../src/uisupport/aboutdata.cpp:288 ../src/uisupport/aboutdata.cpp:304
+#: ../src/uisupport/aboutdata.cpp:317
msgctxt "AboutData|"
msgid "Various fixes"
-msgstr ""
+msgstr "РазлиÑнÑе иÑпÑавлениÑ"
-#: ../src/uisupport/aboutdata.cpp:230 ../src/uisupport/aboutdata.cpp:231
-#: ../src/uisupport/aboutdata.cpp:270 ../src/uisupport/aboutdata.cpp:273
-#: ../src/uisupport/aboutdata.cpp:277 ../src/uisupport/aboutdata.cpp:281
+#: ../src/uisupport/aboutdata.cpp:251 ../src/uisupport/aboutdata.cpp:255
+#: ../src/uisupport/aboutdata.cpp:309 ../src/uisupport/aboutdata.cpp:314
+#: ../src/uisupport/aboutdata.cpp:326
msgctxt "AboutData|"
msgid "Bugfixes"
+msgstr "ÐÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð±Ð°Ð³Ð¾Ð²"
+
+#: ../src/uisupport/aboutdata.cpp:253 ../src/uisupport/aboutdata.cpp:341
+#: ../src/uisupport/aboutdata.cpp:344
+msgctxt "AboutData|"
+msgid "Czech translation"
+msgstr "ЧеÑÑкий пеÑевод"
+
+#: ../src/uisupport/aboutdata.cpp:254
+msgctxt "AboutData|"
+msgid "Python improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:232
+#: ../src/uisupport/aboutdata.cpp:256
msgctxt "AboutData|"
-msgid "Postgres migration fixes"
+msgid "Proxy improvements, Spanish translation"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:233
+#: ../src/uisupport/aboutdata.cpp:257
+msgctxt "AboutData|"
+msgid "Postgres migration fixes"
+msgstr "ÐпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¼Ð¸Ð³ÑаÑии Ð´Ð»Ñ Postgress"
+
+#: ../src/uisupport/aboutdata.cpp:258 ../src/uisupport/aboutdata.cpp:262
+#: ../src/uisupport/aboutdata.cpp:301
+msgctxt "AboutData|"
+msgid "Danish translation"
+msgstr "ÐаÑÑкий пеÑевод"
+
+#: ../src/uisupport/aboutdata.cpp:259
msgctxt "AboutData|"
msgid "Context menu fixes"
-msgstr ""
+msgstr "ÐÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÐ¾Ð½ÑекÑÑного менÑ"
-#: ../src/uisupport/aboutdata.cpp:236
+#: ../src/uisupport/aboutdata.cpp:263
msgctxt "AboutData|"
msgid "Many fixes and improvements, bug triaging"
-msgstr ""
+msgstr "ÐножеÑÑво иÑпÑавлений и ÑлÑÑÑений, ÑоÑÑиÑовка и анализ багов"
-#: ../src/uisupport/aboutdata.cpp:237
+#: ../src/uisupport/aboutdata.cpp:264
msgctxt "AboutData|"
msgid "Original \"All-Seeing Eye\" logo"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:238
+#: ../src/uisupport/aboutdata.cpp:265
msgctxt "AboutData|"
msgid "Project founder, various improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:240
+#: ../src/uisupport/aboutdata.cpp:268
msgctxt "AboutData|"
msgid "Serbian translation"
-msgstr ""
-
-#: ../src/uisupport/aboutdata.cpp:241
-msgctxt "AboutData|"
-msgid "Slovenian translation"
-msgstr ""
+msgstr "СеÑбÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:242
+#: ../src/uisupport/aboutdata.cpp:270
msgctxt "AboutData|"
msgid ""
"Tireless tester, {Ku|U}buntu tester and lobbyist, liters of delicious "
"Finnish alcohol"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:243
+#: ../src/uisupport/aboutdata.cpp:271
msgctxt "AboutData|"
msgid "Qt5 porting help, Travis CI setup"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:244 ../src/uisupport/aboutdata.cpp:254
-#: ../src/uisupport/aboutdata.cpp:256 ../src/uisupport/aboutdata.cpp:293
+#: ../src/uisupport/aboutdata.cpp:273
msgctxt "AboutData|"
-msgid "German translation"
+msgid "Buffer merge improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:245
+#: ../src/uisupport/aboutdata.cpp:275 ../src/uisupport/aboutdata.cpp:327
+#: ../src/uisupport/aboutdata.cpp:328 ../src/uisupport/aboutdata.cpp:334
+#: ../src/uisupport/aboutdata.cpp:335
msgctxt "AboutData|"
-msgid "Buffer merge improvements"
-msgstr ""
+msgid "Greek translation"
+msgstr "ÐÑеÑеÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:248
+#: ../src/uisupport/aboutdata.cpp:278
msgctxt "AboutData|"
msgid "OSX improvements"
-msgstr ""
+msgstr "УлÑÑÑÐµÐ½Ð¸Ñ Ð´Ð»Ñ OSX"
-#: ../src/uisupport/aboutdata.cpp:249
+#: ../src/uisupport/aboutdata.cpp:279
msgctxt "AboutData|"
msgid "Lithuanian translation"
-msgstr ""
+msgstr "ÐиÑовÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:250
+#: ../src/uisupport/aboutdata.cpp:280
msgctxt "AboutData|"
msgid "Documentation fixes"
-msgstr ""
+msgstr "ÐÑпÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð¾ÐºÑменÑаÑии"
+
+#: ../src/uisupport/aboutdata.cpp:283 ../src/uisupport/aboutdata.cpp:316
+msgctxt "AboutData|"
+msgid "Improvements"
+msgstr "УлÑÑÑениÑ"
-#: ../src/uisupport/aboutdata.cpp:252
+#: ../src/uisupport/aboutdata.cpp:284
msgctxt "AboutData|"
msgid "Ideas, hacking, initial motivation"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:255
+#: ../src/uisupport/aboutdata.cpp:287
msgctxt "AboutData|"
-msgid "Core and other fixes, QuasselDroid"
+msgid "Many fixes and improvements, Sonnet support, QuasselDroid"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:258
+#: ../src/uisupport/aboutdata.cpp:291
msgctxt "AboutData|"
msgid "German translation, fixes"
-msgstr ""
+msgstr "ÐемеÑкий пеÑевод, иÑпÑавлениÑ"
-#: ../src/uisupport/aboutdata.cpp:260
+#: ../src/uisupport/aboutdata.cpp:293
msgctxt "AboutData|"
-msgid "Many fixes and improvements; Ubuntu live packages"
+msgid "Many fixes and improvements; Ubuntu PPAs"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:262
+#: ../src/uisupport/aboutdata.cpp:296
msgctxt "AboutData|"
msgid "Tons of Oxygen icons including the Quassel logo"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:264
-msgctxt "AboutData|"
-msgid "MinGW support, SNORE backend, Windows packaging"
-msgstr ""
-
-#: ../src/uisupport/aboutdata.cpp:265
+#: ../src/uisupport/aboutdata.cpp:298
msgctxt "AboutData|"
msgid "Initial design and main window layout"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:266
+#: ../src/uisupport/aboutdata.cpp:299
msgctxt "AboutData|"
msgid "Early beta tester and bughunter"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:267
+#: ../src/uisupport/aboutdata.cpp:302
msgctxt "AboutData|"
-msgid "Danish translation"
+msgid "Linewrap for input line"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:268
+#: ../src/uisupport/aboutdata.cpp:303
msgctxt "AboutData|"
-msgid "Linewrap for input line"
+msgid "Performance improvements and cleanups"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:269
+#: ../src/uisupport/aboutdata.cpp:305
msgctxt "AboutData|"
msgid "/print command"
+msgstr "Ðомманда /print"
+
+#: ../src/uisupport/aboutdata.cpp:306
+msgctxt "AboutData|"
+msgid "Performance improvements"
+msgstr "УлÑÑÑÐµÐ½Ð¸Ñ Ð¿ÑоизводиÑелÑноÑÑи"
+
+#: ../src/uisupport/aboutdata.cpp:308
+msgctxt "AboutData|"
+msgid "Hindi and Marathi translations"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:272
+#: ../src/uisupport/aboutdata.cpp:313
msgctxt "AboutData|"
-msgid "Build system fixes"
+msgid ""
+"Windows build support, automated OSX builds in Travis, various improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:274
+#: ../src/uisupport/aboutdata.cpp:315
msgctxt "AboutData|"
msgid "Emacs keybindings"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:275
+#: ../src/uisupport/aboutdata.cpp:318
msgctxt "AboutData|"
msgid "Highlight configuration improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:276
+#: ../src/uisupport/aboutdata.cpp:319
msgctxt "AboutData|"
-msgid "Kubuntu packager, (packaging/build system) bughunter"
+msgid "Debian/Kubuntu packager, (packaging/build system) bughunter"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:278
+#: ../src/uisupport/aboutdata.cpp:320
msgctxt "AboutData|"
-msgid "Audio backend improvements"
+msgid "Bugfixes, German translation"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:280
+#: ../src/uisupport/aboutdata.cpp:321
msgctxt "AboutData|"
-msgid "Dutch translation"
+msgid "Audio backend improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:282 ../src/uisupport/aboutdata.cpp:283
-#: ../src/uisupport/aboutdata.cpp:288 ../src/uisupport/aboutdata.cpp:289
+#: ../src/uisupport/aboutdata.cpp:324
msgctxt "AboutData|"
-msgid "Greek translation"
+msgid "Chinese translation"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:286
+#: ../src/uisupport/aboutdata.cpp:325
+msgctxt "AboutData|"
+msgid "Dutch translation"
+msgstr "ÐолландÑкий пеÑевод"
+
+#: ../src/uisupport/aboutdata.cpp:329 ../src/uisupport/aboutdata.cpp:332
msgctxt "AboutData|"
msgid "Korean translation"
+msgstr "ÐоÑейÑкий пеÑевод"
+
+#: ../src/uisupport/aboutdata.cpp:331
+msgctxt "AboutData|"
+msgid "Alias improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:287
+#: ../src/uisupport/aboutdata.cpp:333
msgctxt "AboutData|"
msgid "Norwegian translation, documentation"
-msgstr ""
+msgstr "ÐоÑвежÑкий пеÑевод, докÑменÑаÑиÑ"
-#: ../src/uisupport/aboutdata.cpp:290
+#: ../src/uisupport/aboutdata.cpp:336
msgctxt "AboutData|"
msgid "Former Windows builder"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:291
+#: ../src/uisupport/aboutdata.cpp:337
msgctxt "AboutData|"
msgid "Fixes, Debian packaging"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:292
+#: ../src/uisupport/aboutdata.cpp:338
msgctxt "AboutData|"
msgid "Fixes and feedback"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:294 ../src/uisupport/aboutdata.cpp:295
-msgctxt "AboutData|"
-msgid "Czech translation"
-msgstr ""
-
-#: ../src/uisupport/aboutdata.cpp:297
+#: ../src/uisupport/aboutdata.cpp:348
msgctxt "AboutData|"
msgid "Network detection improvements"
msgstr ""
-#: ../src/uisupport/aboutdata.cpp:298
+#: ../src/uisupport/aboutdata.cpp:349
msgctxt "AboutData|"
msgid "Ukrainian translation"
-msgstr ""
+msgstr "УкÑаинÑкий пеÑевод"
-#: ../src/uisupport/aboutdata.cpp:299
+#: ../src/uisupport/aboutdata.cpp:350
msgctxt "AboutData|"
msgid "Portuguese translation"
-msgstr ""
+msgstr "ÐоÑÑÑгалÑÑкий пеÑевод"
#: ../src/qtui/ui/aboutdlg.ui:17
msgctxt "AboutDlg|"
@@ -524,77 +648,105 @@ msgctxt "AboutDlg|"
msgid "&Thanks To"
msgstr "&ÐлагодаÑноÑÑи"
-#: ../src/qtui/aboutdlg.cpp:38
+#: ../src/qtui/aboutdlg.cpp:44
+msgctxt "AboutDlg|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:50
#, qt-format
msgctxt "AboutDlg|"
-msgid "Version: %1
Protocol version: %2
Built: %3"
-msgstr "ÐеÑÑиÑ: %1
ÐеÑÑÐ¸Ñ Ð¿ÑоÑокола: %2
ÐаÑа ÑбоÑки: %3"
+msgid ""
+"Version: %1
Version date: %2
Protocol version: %3"
+msgstr ""
-#: ../src/qtui/aboutdlg.cpp:54
+#: ../src/qtui/aboutdlg.cpp:67
#, qt-format
msgctxt "AboutDlg|"
msgid ""
"A modern, distributed IRC Client
©%1 by the Quassel "
-"Project
http://quassel-"
+"Project
https://quassel-"
"irc.org
#quassel on Freenode
Quassel IRC is dual-"
-"licensed under GPLv2"
-" and GPLv3.
Most "
-"icons are © by the Oxygen "
-"Team and used under the LGPL.
Please use "
-"http://bugs.quassel-irc.org to "
+" href=\"https://www.freenode.net\">Freenode
Quassel IRC is dual-"
+"licensed under GPLv2 and GPLv3.
Breeze icon "
+"theme © Uri Herrera and others, licensed under the LGPLv3.
Oxygen icon theme © Nuno Pinheiro and others, "
+"licensed under the LGPLv3.
Please use https://bugs.quassel-irc.org to "
"report bugs."
msgstr ""
-#: ../src/qtui/aboutdlg.cpp:72
+#: ../src/qtui/aboutdlg.cpp:87
msgctxt "AboutDlg|"
msgid "Quassel IRC is mainly developed by:"
msgstr "Quassel IRC ÑазÑабаÑÑваеÑÑÑ Ð² оÑновном:"
-#: ../src/qtui/aboutdlg.cpp:87
+#: ../src/qtui/aboutdlg.cpp:101
msgctxt "AboutDlg|"
msgid ""
"We would like to thank the following contributors (in alphabetical order) "
"and everybody we forgot to mention here:"
msgstr "ÐÑ Ñ
оÑим вÑÑазиÑÑ Ð±Ð»Ð°Ð³Ð¾Ð´Ð°ÑноÑÑÑ ÑледÑÑÑим лÑдÑм, внеÑÑим Ñвой вклад (в алÑавиÑном поÑÑдке), а Ñакже вÑем, кого Ð¼Ñ Ð·Ð°Ð±Ñли здеÑÑ ÑпомÑнÑÑÑ:"
-#: ../src/qtui/aboutdlg.cpp:91
+#: ../src/qtui/aboutdlg.cpp:105
msgctxt "AboutDlg|"
msgid ""
"...and anybody else finding and reporting bugs, giving feedback, helping "
"others and being part of the community!"
msgstr ""
-#: ../src/qtui/aboutdlg.cpp:100
+#: ../src/qtui/aboutdlg.cpp:112
+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 ""
+
+#: ../src/qtui/aboutdlg.cpp:120
+msgctxt "AboutDlg|"
+msgid "for the Oxygen Quassel logo"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:124
+msgctxt "AboutDlg|"
+msgid "for the amazing Breeze and Oxygen icon themes"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:128
msgctxt "AboutDlg|"
msgid ""
-"Special thanks goes to:
- John \"nox\" Hand
- for the original Quassel"
-" icon - The All-Seeing Eye
- The Oxygen Team
- for creating all the artwork "
-"you see throughout Quassel
- Qt Software "
-"formerly known as Trolltech
- for creating Qt and Qtopia, "
-"and for sponsoring development of QuasselTopia with Greenphones and "
-"more
- for sponsoring development of "
-"Quassel Mobile with N810s
"
+"for creating an awesome framework, and for sponsoring development with "
+"Greenphones, N810s, N950s and more"
msgstr ""
-#: ../src/core/abstractsqlstorage.cpp:127
+#: ../src/core/abstractsqlstorage.cpp:142
#, 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:129
+#: ../src/core/abstractsqlstorage.cpp:149
msgctxt "AbstractSqlStorage|"
msgid "Upgrade failed..."
msgstr "Ðбновление не ÑдалоÑÑ..."
+#: ../src/core/abstractsqlstorage.cpp:154
+#, qt-format
+msgctxt "AbstractSqlStorage|"
+msgid "Installed database schema successfully upgraded to version %1."
+msgstr ""
+
#: ../src/qtui/settingspages/aliasesmodel.cpp:57
msgctxt "AliasesModel|"
msgid ""
@@ -602,164 +754,281 @@ msgid ""
"command.
Example: \"foo\" can be used per /foo"
msgstr "СÑÑлка к пÑевдонимÑ
Ðна Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑполÑзоваÑÑÑÑ ÐºÐ°Ðº обÑкновеннÑй ÑлÑÑ.
ÐÑимеÑ: \"foo\" Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑполÑзоваÑÑÑÑ Ð´Ð»Ñ /foo"
-#: ../src/qtui/settingspages/aliasesmodel.cpp:61
+#: ../src/qtui/settingspages/aliasesmodel.cpp:82
msgctxt "AliasesModel|"
-msgid ""
-"The string the shortcut will be expanded to
special "
-"variables:
- $i represents the i'th parameter.
- "
-"$i..j represents the i'th to j'th parameter separated by spaces.
- $i.. represents all parameters from i on separated by spaces.
- $i:hostname represents the hostname of the user identified by "
-"the i'th parameter or a * if unknown.
- $0 the whole string.
- $nick your current nickname
- $channel the name of"
-" the selected channel
Multiple commands can be separated with "
-"semicolons
Example: \"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 "СÑÑока в бÑÐ´ÐµÑ ÑаÑÑиÑена за ÑÑеÑ
ÑпеÑиалÑнÑÑ
пеÑеменнÑÑ
:
- $i пÑедÑÑавлÑÐµÑ i-ÑÑй паÑамеÑ.
- $i..j пÑедÑÑавлÑÐµÑ Ñ i-Ñого по j-ÑÑй паÑамеÑÑÑ, ÑазделеннÑе пÑобелами.
- $i.. пÑедÑÑавлÑÐµÑ Ð²Ñе паÑамеÑÑÑ Ð½Ð°ÑÐ¸Ð½Ð°Ñ Ñ i-Ñого, ÑазделеннÑе пÑобелами.
- $i:hostnameпÑедÑÑавлÑÐµÑ Ð¸Ð¼Ñ ÑиÑÑÐµÐ¼Ñ (hostname) полÑзоваÑелÑ, опÑеделÑемое по i-ÑÐ¾Ð¼Ñ Ð¿Ð°ÑамеÑÑÑ Ð¸Ð»Ð¸ * еÑли он неизвеÑÑен.
- $0 вÑÑ ÑÑÑока.
- $nick ÐÐ°Ñ ÑекÑÑий ник
- $channel Ð¸Ð¼Ñ Ð²ÑбÑанного канала
ÐеÑколÑко команд могÑÑ Ð±ÑÑÑ ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ñ ÑоÑкой Ñ Ð·Ð°Ð¿ÑÑой
ÐÑимеÑ: \"Test $1; Test $2; Test All $0\" бÑÐ´ÐµÑ ÑаÑÑиÑена до ÑÑеÑ
оÑделÑнÑÑ
ÑообÑений \"Test 1\", \"Test 2\" и \"Test All 1 2 3\" когда вÑзÑваеÑÑÑ ÐºÐ°Ðº /test 1 2 3"
-
-#: ../src/qtui/settingspages/aliasesmodel.cpp:185
-msgctxt "AliasesModel|"
-msgid "Alias"
-msgstr "ÐÑевдоним"
+msgid "The string the shortcut will be expanded to"
+msgstr ""
-#: ../src/qtui/settingspages/aliasesmodel.cpp:186
+#: ../src/qtui/settingspages/aliasesmodel.cpp:85
msgctxt "AliasesModel|"
-msgid "Expansion"
-msgstr "РаÑÑиÑение"
+msgid "Special variables"
+msgstr ""
-#: ../src/qtui/settingspages/aliasessettingspage.ui:13
-msgctxt "AliasesSettingsPage|"
-msgid "Form"
-msgstr "ФоÑма"
+#: ../src/qtui/settingspages/aliasesmodel.cpp:91
+msgctxt "AliasesModel|"
+msgid "Parameter variables"
+msgstr ""
-#: ../src/qtui/settingspages/aliasessettingspage.ui:27
-msgctxt "AliasesSettingsPage|"
-msgid "New"
-msgstr "ÐовÑй"
+#: ../src/qtui/settingspages/aliasesmodel.cpp:92
+msgctxt "AliasesModel|"
+msgid "i'th parameter"
+msgstr ""
-#: ../src/qtui/settingspages/aliasessettingspage.ui:41
-msgctxt "AliasesSettingsPage|"
-msgid "Delete"
-msgstr "УдалиÑÑ"
+#: ../src/qtui/settingspages/aliasesmodel.cpp:93
+msgctxt "AliasesModel|"
+msgid "i'th to j'th parameter separated by spaces"
+msgstr ""
-#: ../src/qtui/settingspages/aliasessettingspage.cpp:28
-msgctxt "AliasesSettingsPage|"
-msgid "IRC"
-msgstr "IRC"
+#: ../src/qtui/settingspages/aliasesmodel.cpp:94
+msgctxt "AliasesModel|"
+msgid "all parameters from i on separated by spaces"
+msgstr ""
-#: ../src/qtui/settingspages/aliasessettingspage.cpp:28
-msgctxt "AliasesSettingsPage|"
-msgid "Aliases"
-msgstr "ÐÑевдонимÑ"
+#: ../src/qtui/settingspages/aliasesmodel.cpp:97
+msgctxt "AliasesModel|"
+msgid "Nickname parameter variables"
+msgstr ""
-#: ../src/qtui/settingspages/appearancesettingspage.ui:14
-msgctxt "AppearanceSettingsPage|"
+#: ../src/qtui/settingspages/aliasesmodel.cpp:99
+msgctxt "AliasesModel|"
+msgid ""
+"account of user identified by i'th parameter, or a '*' if logged out or "
+"unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:102
+msgctxt "AliasesModel|"
+msgid "hostname of user identified by i'th parameter, or a '*' if unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:104
+msgctxt "AliasesModel|"
+msgid "ident of user identified by i'th parameter, or a '*' if unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:106
+msgctxt "AliasesModel|"
+msgid ""
+"ident of user identified by i'th parameter if verified, or a '*' if unknown "
+"or unverified (prefixed with '~')"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:110
+msgctxt "AliasesModel|"
+msgid "General variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:111
+msgctxt "AliasesModel|"
+msgid "the whole string"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
+msgctxt "AliasesModel|"
+msgid "your current nickname"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:113
+msgctxt "AliasesModel|"
+msgid "the name of the selected channel"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:120
+msgctxt "AliasesModel|"
+msgid "Multiple commands can be separated with semicolons"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:124
+msgctxt "AliasesModel|"
+msgid "Example:"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:124
+msgctxt "AliasesModel|"
+msgid "\"Test $1; Test $2; Test All $0\""
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:125
+msgctxt "AliasesModel|"
+msgid ""
+"...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 ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:246
+msgctxt "AliasesModel|"
+msgid "Alias"
+msgstr "ÐÑевдоним"
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:247
+msgctxt "AliasesModel|"
+msgid "Expansion"
+msgstr "РаÑÑиÑение"
+
+#: ../src/qtui/settingspages/aliasessettingspage.ui:13
+msgctxt "AliasesSettingsPage|"
msgid "Form"
msgstr "ФоÑма"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:22
-msgctxt "AppearanceSettingsPage|"
-msgid "Client style:"
-msgstr "СÑÐ¸Ð»Ñ ÐºÐ»Ð¸ÐµÐ½Ñа:"
+#: ../src/qtui/settingspages/aliasessettingspage.ui:27
+msgctxt "AliasesSettingsPage|"
+msgid "New"
+msgstr "ÐовÑй"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:29
+#: ../src/qtui/settingspages/aliasessettingspage.ui:41
+msgctxt "AliasesSettingsPage|"
+msgid "Delete"
+msgstr "УдалиÑÑ"
+
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+msgctxt "AliasesSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+msgctxt "AliasesSettingsPage|"
+msgid "Aliases"
+msgstr "ÐÑевдонимÑ"
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:14
msgctxt "AppearanceSettingsPage|"
-msgid "Set application style"
-msgstr "ÐадаÑÑ ÑÑÐ¸Ð»Ñ Ð¿ÑиложениÑ"
+msgid "Form"
+msgstr "ФоÑма"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:36
+#: ../src/qtui/settingspages/appearancesettingspage.ui:22
msgctxt "AppearanceSettingsPage|"
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 "ÐадаÑÑ ÑзÑк пÑиложениÑ. ТÑебÑÐµÑ Ð¿ÐµÑезапÑÑка!"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+#: ../src/qtui/settingspages/appearancesettingspage.ui:33
msgctxt "AppearanceSettingsPage|"
msgid ""
msgstr ""
-#: ../src/qtui/settingspages/appearancesettingspage.ui:52
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:76
+#: ../src/qtui/settingspages/appearancesettingspage.ui:38
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:86
msgctxt "AppearanceSettingsPage|"
msgid ""
msgstr "<Ðо ÑмолÑаниÑ>"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:75
+#: ../src/qtui/settingspages/appearancesettingspage.ui:59
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 ""
+"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.
Supported themes "
+"are Breeze, Breeze Dark and Oxygen, all of KDE fame.
"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:87
+msgctxt "AppearanceSettingsPage|"
+msgid ""
+"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.
"
+msgstr ""
-#: ../src/qtui/settingspages/appearancesettingspage.ui:109
+#: ../src/qtui/settingspages/appearancesettingspage.ui:90
msgctxt "AppearanceSettingsPage|"
-msgid "Path:"
-msgstr "ÐÑÑÑ:"
+msgid "Override system theme"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:110
+msgctxt "AppearanceSettingsPage|"
+msgid "Use custom stylesheet"
+msgstr "ÐÑполÑзоваÑÑ ÑÐ²Ð¾Ñ ÑаблиÑÑ ÑÑилей"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:141
+#: ../src/qtui/settingspages/appearancesettingspage.ui:148
msgctxt "AppearanceSettingsPage|"
msgid "..."
msgstr "..."
-#: ../src/qtui/settingspages/appearancesettingspage.ui:150
+#: ../src/qtui/settingspages/appearancesettingspage.ui:172
msgctxt "AppearanceSettingsPage|"
msgid "Show system tray icon"
msgstr "ÐоказÑваÑÑ Ð·Ð½Ð°Ñок в ÑÑее"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:184
+#: ../src/qtui/settingspages/appearancesettingspage.ui:188
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|"
-msgid "Enable animations"
-msgstr "ÐклÑÑиÑÑ Ð°Ð½Ð¸Ð¼Ð°ÑиÑ"
+msgid "Hide to tray on close button"
+msgstr "ÐÑи закÑÑÑии ÑвоÑаÑиваÑÑ Ð² ÑиÑÑемнÑй лоÑок"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:231
+#: ../src/qtui/settingspages/appearancesettingspage.ui:248
msgctxt "AppearanceSettingsPage|"
msgid "Message Redirection"
msgstr "ÐеÑенапÑавление ÑообÑений"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:237
+#: ../src/qtui/settingspages/appearancesettingspage.ui:257
msgctxt "AppearanceSettingsPage|"
msgid "User Notices:"
msgstr "ÐолÑзоваÑелÑÑкие ÑообÑениÑ:"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:280
+#: ../src/qtui/settingspages/appearancesettingspage.ui:300
msgctxt "AppearanceSettingsPage|"
msgid "Server Notices:"
msgstr "СеÑвеÑнÑе ÑообÑениÑ:"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:294
+#: ../src/qtui/settingspages/appearancesettingspage.ui:314
msgctxt "AppearanceSettingsPage|"
msgid "Default Target"
msgstr "Ð¦ÐµÐ»Ñ Ð¿Ð¾ ÑмолÑаниÑ"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:301
+#: ../src/qtui/settingspages/appearancesettingspage.ui:321
msgctxt "AppearanceSettingsPage|"
msgid "Status Window"
msgstr "Ðкно ÑÑаÑÑÑа"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:308
+#: ../src/qtui/settingspages/appearancesettingspage.ui:328
msgctxt "AppearanceSettingsPage|"
msgid "Current Chat"
msgstr "ТекÑÑий ÑаÑ"
-#: ../src/qtui/settingspages/appearancesettingspage.ui:315
+#: ../src/qtui/settingspages/appearancesettingspage.ui:335
msgctxt "AppearanceSettingsPage|"
msgid "Errors:"
msgstr "ÐÑибки:"
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:36
msgctxt "AppearanceSettingsPage|"
msgid "Interface"
msgstr "ÐнÑеÑÑейÑ"
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:242
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:51
+msgctxt "AppearanceSettingsPage|"
+msgid "Icon theme:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:115
+msgctxt "AppearanceSettingsPage|"
+msgid "Automatic"
+msgstr "ÐвÑомаÑиÑеÑки"
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:294
msgctxt "AppearanceSettingsPage|"
msgid "Please choose a stylesheet file"
msgstr "ÐÑбеÑиÑе пожалÑйÑÑа Ñайл ÑÑилей"
@@ -826,9 +1095,9 @@ msgstr "СамÑй пÑоÑÑой запÑоÑÑик. Ðн полÑÑÐ°ÐµÑ Ñи
#: ../src/qtui/settingspages/backlogsettingspage.ui:138
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 "колиÑеÑÑво ÑообÑений из каждого бÑÑеÑа, коÑоÑÑе запÑаÑиваÑÑÑÑ Ñ ÑдÑа поÑле ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ ÑоединениÑ."
+msgstr ""
#: ../src/qtui/settingspages/backlogsettingspage.ui:141
msgctxt "BacklogSettingsPage|"
@@ -894,28 +1163,28 @@ 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:30
msgctxt "BacklogSettingsPage|"
msgid "Interface"
msgstr "ÐнÑеÑÑейÑ"
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:30
msgctxt "BacklogSettingsPage|"
msgid "Backlog Fetching"
msgstr "ÐÑоÑмоÑÑ ÐÑÑнала"
-#: ../src/client/networkmodel.cpp:401
+#: ../src/client/networkmodel.cpp:480
#, qt-format
msgctxt "BufferItem|"
msgid " %1 - %2
"
msgstr " %1 - %2
"
-#: ../src/uisupport/bufferview.cpp:268
+#: ../src/uisupport/bufferview.cpp:267
msgctxt "BufferView|"
msgid "Merge buffers permanently?"
msgstr "ÐÑоизвеÑÑи необÑаÑимое ÑлиÑние бÑÑеÑов?"
-#: ../src/uisupport/bufferview.cpp:269
+#: ../src/uisupport/bufferview.cpp:268
#, qt-format
msgctxt "BufferView|"
msgid ""
@@ -923,6 +1192,11 @@ msgid ""
" This cannot be reversed!"
msgstr "ХоÑиÑе ли Ð²Ñ ÑлиÑÑ Ð±ÑÑÐµÑ \"%1\" Ñ Ð±ÑÑеÑом \"%2\"?\n ÐÑо нелÑÐ·Ñ Ð¾Ð±ÑаÑиÑÑ!"
+#: ../src/uisupport/bufferview.cpp:715
+msgctxt "BufferViewDock|"
+msgid "Search..."
+msgstr ""
+
#: ../src/qtui/settingspages/buffervieweditdlg.ui:14
msgctxt "BufferViewEditDlg|"
msgid "Dialog"
@@ -933,12 +1207,12 @@ msgctxt "BufferViewEditDlg|"
msgid "Please enter a name for the chat list:"
msgstr "ÐожалÑйÑÑа, введиÑе Ð¸Ð¼Ñ ÑаÑлиÑÑа:"
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:585
msgctxt "BufferViewEditDlg|"
msgid "Add Chat List"
msgstr "ÐобавиÑÑ Ð§Ð°ÑлиÑÑ"
-#: ../src/uisupport/bufferviewfilter.cpp:53
+#: ../src/uisupport/bufferviewfilter.cpp:46
msgctxt "BufferViewFilter|"
msgid "Show / Hide Chats"
msgstr "ÐоказаÑÑ / СкÑÑÑÑ Ð§Ð°ÑÑ"
@@ -974,7 +1248,7 @@ msgid "Network:"
msgstr "СеÑÑ:"
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:129
msgctxt "BufferViewSettingsPage|"
msgid "All"
msgstr "ÐÑе"
@@ -1023,30 +1297,35 @@ msgstr "СоÑÑиÑоваÑÑ Ð¿Ð¾ алÑавиÑÑ"
#: ../src/qtui/settingspages/bufferviewsettingspage.ui:163
msgctxt "BufferViewSettingsPage|"
+msgid "Show search"
+msgstr ""
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:170
+msgctxt "BufferViewSettingsPage|"
msgid "Minimum Activity:"
msgstr "ÐинималÑÐ½Ð°Ñ Ð°ÐºÑивноÑÑÑ:"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:171
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:178
msgctxt "BufferViewSettingsPage|"
msgid "No Activity"
msgstr "ÐÐµÑ Ð°ÐºÑивноÑÑи"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:176
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:183
msgctxt "BufferViewSettingsPage|"
msgid "Other Activity"
msgstr "ÐÑÑÐ³Ð°Ñ Ð°ÐºÑивноÑÑÑ"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:181
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:188
msgctxt "BufferViewSettingsPage|"
msgid "New Message"
msgstr "Ðовое ÑообÑение"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:186
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:193
msgctxt "BufferViewSettingsPage|"
msgid "Highlight"
msgstr "ÐодÑвеÑка"
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:212
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:219
msgctxt "BufferViewSettingsPage|"
msgid "Preview:"
msgstr "ÐÑедваÑиÑелÑнÑй пÑоÑмоÑÑ:"
@@ -1061,12 +1340,12 @@ msgctxt "BufferViewSettingsPage|"
msgid "Custom Chat Lists"
msgstr "ÐолÑзоваÑелÑÑкие ЧаÑлиÑÑÑ"
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:383
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
msgctxt "BufferViewSettingsPage|"
msgid "Delete Chat List?"
msgstr "УдалиÑÑ Ð§Ð°ÑлиÑÑ?"
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:385
#, qt-format
msgctxt "BufferViewSettingsPage|"
msgid "Do you really want to delete the chat list \"%1\"?"
@@ -1102,40 +1381,31 @@ msgctxt "BufferWidget|"
msgid "Go to Marker Line"
msgstr "ÐÑмеÑка:"
-#: ../src/client/networkmodel.cpp:583 ../src/client/networkmodel.cpp:585
-#, qt-format
-msgctxt "ChannelBufferItem|"
-msgid "Channel %1"
-msgstr "Ðанал %1"
-
-#: ../src/client/networkmodel.cpp:589
+#: ../src/client/networkmodel.cpp:776
#, qt-format
msgctxt "ChannelBufferItem|"
-msgid "Users: %1"
-msgstr "ÐолÑзоваÑели: %1"
+msgid "Channel %1"
+msgstr ""
-#: ../src/client/networkmodel.cpp:593
-#, qt-format
+#: ../src/client/networkmodel.cpp:780
msgctxt "ChannelBufferItem|"
-msgid "Mode: %1"
-msgstr "Режим: %1"
+msgid "Users"
+msgstr "ÐолÑзоваÑели"
-#: ../src/client/networkmodel.cpp:608
-#, qt-format
+#: ../src/client/networkmodel.cpp:785
msgctxt "ChannelBufferItem|"
-msgid "Topic: %1"
-msgstr "Тема: %1"
+msgid "Mode"
+msgstr ""
-#: ../src/client/networkmodel.cpp:613
+#: ../src/client/networkmodel.cpp:795
msgctxt "ChannelBufferItem|"
-msgid "Not active
Double-click to join"
-msgstr "ÐеакÑивно
ÐÐ²Ð°Ð¶Ð´Ñ ÑÑлкниÑе ÑÑÐ¾Ð±Ñ Ð²Ð¾Ð¹Ñи"
+msgid "Topic"
+msgstr "Тема"
-#: ../src/client/networkmodel.cpp:616
-#, qt-format
+#: ../src/client/networkmodel.cpp:801
msgctxt "ChannelBufferItem|"
-msgid " %1
"
-msgstr " %1
"
+msgid "Not active, double-click to join"
+msgstr ""
#: ../src/qtui/ui/channellistdlg.ui:14
msgctxt "ChannelListDlg|"
@@ -1218,7 +1488,7 @@ msgid "Move selected buffers to the right"
msgstr "ÐеÑемеÑÑиÑÑ Ð²ÑбÑаннÑе бÑÑеÑÑ Ð²Ð¿Ñаво"
#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:273
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:285
msgctxt "ChatMonitorSettingsPage|"
msgid "Show:"
msgstr "ÐоказÑваÑÑ:"
@@ -1239,87 +1509,248 @@ msgctxt "ChatMonitorSettingsPage|"
msgid "Show own messages"
msgstr "ÐоказÑваÑÑ Ñвои ÑообÑениÑ"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:164
+#: ../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:194
msgctxt "ChatMonitorSettingsPage|"
msgid "Display messages from backlog on reconnect"
msgstr ""
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:167
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:197
msgctxt "ChatMonitorSettingsPage|"
msgid "Show messages from backlog"
msgstr ""
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:192
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:222
msgctxt "ChatMonitorSettingsPage|"
msgid "Include read messages from backlog on reconnect"
msgstr ""
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:195
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:225
msgctxt "ChatMonitorSettingsPage|"
msgid "Include read messages"
msgstr ""
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
msgctxt "ChatMonitorSettingsPage|"
msgid "Interface"
msgstr "ÐнÑеÑÑейÑ"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
msgctxt "ChatMonitorSettingsPage|"
msgid "Chat Monitor"
msgstr "ÐониÑÐ¾Ñ ÑаÑа"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
msgctxt "ChatMonitorSettingsPage|"
msgid "Opt In"
msgstr "ÐелÑй ÑпиÑок"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:61
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
msgctxt "ChatMonitorSettingsPage|"
msgid "Opt Out"
msgstr "ЧÑÑнÑй ÑпиÑок"
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:276
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:288
msgctxt "ChatMonitorSettingsPage|"
msgid "Ignore:"
msgstr "ÐгноÑиÑоваÑÑ:"
-#: ../src/qtui/chatmonitorview.cpp:54
+#: ../src/qtui/chatmonitorview.cpp:57
msgctxt "ChatMonitorView|"
msgid "Show Own Messages"
msgstr "ÐоказÑваÑÑ Ñвои ÑообÑениÑ"
-#: ../src/qtui/chatmonitorview.cpp:61
+#: ../src/qtui/chatmonitorview.cpp:64
msgctxt "ChatMonitorView|"
msgid "Show Network Name"
msgstr "ÐоказÑваÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ ÑеÑи"
-#: ../src/qtui/chatmonitorview.cpp:66
+#: ../src/qtui/chatmonitorview.cpp:69
msgctxt "ChatMonitorView|"
msgid "Show Buffer Name"
msgstr "ÐоказÑваÑÑ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ðµ бÑÑеÑа"
-#: ../src/qtui/chatmonitorview.cpp:73
+#: ../src/qtui/chatmonitorview.cpp:76
msgctxt "ChatMonitorView|"
msgid "Configure..."
msgstr "ÐаÑÑÑоиÑÑ..."
-#: ../src/qtui/chatscene.cpp:826
+#: ../src/qtui/chatscene.cpp:840
msgctxt "ChatScene|"
msgid "Copy Selection"
msgstr "СкопиÑоваÑÑ Ð²Ñделение"
-#: ../src/qtui/chatscene.cpp:833
+#: ../src/qtui/chatscene.cpp:847
#, qt-format
msgctxt "ChatScene|"
msgid "Search '%1'"
-msgstr ""
+msgstr "ÐайÑи '%1'"
-#: ../src/qtui/chatscene.cpp:845
+#: ../src/qtui/chatscene.cpp:859
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.
-*- Nick 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.
--> "
+"Nick 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/ui/chatviewsearchbar.ui:13
msgctxt "ChatViewSearchBar|"
msgid "Form"
@@ -1359,10 +1790,15 @@ msgstr "ФоÑма"
#: ../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:25
+msgctxt "ChatViewSettingsPage|"
+msgid "Custom timestamp format:"
+msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:29
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:41
msgctxt "ChatViewSettingsPage|"
msgid ""
"Usage examples:
\n"
@@ -1375,67 +1811,83 @@ msgid ""
""
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:42
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:54
msgctxt "ChatViewSettingsPage|"
-msgid "[hh:mm:ss]"
-msgstr "[hh:mm:ss]"
+msgid " hh:mm:ss"
+msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:69
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:79
msgctxt "ChatViewSettingsPage|"
-msgid "Custom chat window font:"
-msgstr "ÐолÑзоваÑелÑÑкий ÑÑиÑÑ Ð¾ÐºÐ½Ð° ÑаÑа:"
+msgid "Shows around the names of senders"
+msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:102
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:82
msgctxt "ChatViewSettingsPage|"
-msgid "Show colored text in the chat window"
-msgstr "ÐоказаÑÑ ÑвеÑной ÑекÑÑ Ð² окне ÑаÑа"
+msgid "Show brackets around sender names"
+msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:105
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:100
msgctxt "ChatViewSettingsPage|"
-msgid "Allow colored text (mIRC color codes)"
-msgstr "РазÑеÑиÑÑ Ð²Ñвод ÑвеÑного ÑекÑÑа (mIRC color codes)"
+msgid "Show sender modes before nicknames:"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:107
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"\n"
+"Sender modes:
\n"
+"No modes: Don't show any modes
Example: <nickname>
\n"
+"Highest mode: Show only the highest active mode
Example: <@nickname>
\n"
+"All modes: Show all active modes
Example: <@+nickname>
\n"
+""
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:142
+msgctxt "ChatViewSettingsPage|"
+msgid "Custom chat window font:"
+msgstr "ÐолÑзоваÑелÑÑкий ÑÑиÑÑ Ð¾ÐºÐ½Ð° ÑаÑа:"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:121
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:175
msgctxt "ChatViewSettingsPage|"
msgid ""
"Show a website preview window when hovering the mouse over a web address"
msgstr "ÐоказÑваÑÑ Ð¿ÑедваÑиÑелÑнÑй пÑоÑмоÑÑ Ð²ÐµÐ±ÑайÑа пÑи наведении мÑÑÑÑ Ð½Ð° адÑеÑ"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:124
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:178
msgctxt "ChatViewSettingsPage|"
msgid "Show previews of webpages on URL hover"
msgstr "ÐоказÑваÑÑ ÑÑкиз вебÑайÑа пÑи наведении на URL"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:140
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:194
msgctxt "ChatViewSettingsPage|"
msgid ""
"Set the marker line to the bottom of the current chat window when selecting "
"another channel"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:143
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:197
msgctxt "ChatViewSettingsPage|"
msgid "Set marker line automatically when switching chats"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:159
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:213
msgctxt "ChatViewSettingsPage|"
msgid ""
"Set the marker line to the bottom of the current chat window when Quassel "
"loses focus."
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:162
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:216
msgctxt "ChatViewSettingsPage|"
msgid "Set marker line automatically when Quassel loses focus"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:180
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:234
msgctxt "ChatViewSettingsPage|"
-msgid "Web Search Url:"
+msgid "Web Search URL:"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:187
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:241
msgctxt "ChatViewSettingsPage|"
msgid ""
"The URL to open with the selected text as the "
@@ -1445,187 +1897,118 @@ msgid ""
"style=\" font-weight:600;\">%s
"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:247
msgctxt "ChatViewSettingsPage|"
msgid "https://www.google.com/search?q=%s"
msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:202
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:29
msgctxt "ChatViewSettingsPage|"
-msgid "Custom Colors"
-msgstr "ÐолÑзоваÑелÑÑкие ÑвеÑа"
+msgid "Interface"
+msgstr "ÐнÑеÑÑейÑ"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:220
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:29
msgctxt "ChatViewSettingsPage|"
-msgid "Action:"
-msgstr "ÐейÑÑвие:"
+msgid "Chat View"
+msgstr "Ðид Ðкна ЧаÑа"
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:227
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:251
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:275
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:312
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:336
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:367
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:391
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:415
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:439
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:456
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:496
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:513
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:530
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:547
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:564
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:581
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:598
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:615
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:632
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:649
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:666
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:683
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:700
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:717
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:734
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:751
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:779
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:43
msgctxt "ChatViewSettingsPage|"
-msgid "..."
-msgstr "..."
+msgid "You need at least version 0.6 of Quassel Core to use this feature"
+msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:244
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:54
msgctxt "ChatViewSettingsPage|"
-msgid "Timestamp:"
-msgstr "ÐÑемÑ:"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:268
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:55
msgctxt "ChatViewSettingsPage|"
-msgid "Channel message:"
-msgstr "СообÑение канала:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:305
-msgctxt "ChatViewSettingsPage|"
-msgid "Highlight foreground:"
-msgstr "ÐодÑвеÑка:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:329
-msgctxt "ChatViewSettingsPage|"
-msgid "Command message:"
-msgstr "СообÑение командÑ:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:353
-msgctxt "ChatViewSettingsPage|"
-msgid "Highlight background:"
-msgstr "ÐодÑвеÑиваÑÑ Ð½Ð¸ÐºÐ¸"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:360
-msgctxt "ChatViewSettingsPage|"
-msgid "Server message:"
-msgstr "СообÑение ÑеÑвеÑа:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:384
-msgctxt "ChatViewSettingsPage|"
-msgid "Marker line:"
-msgstr "ÐÑмеÑка:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:408
-msgctxt "ChatViewSettingsPage|"
-msgid "Error message:"
-msgstr "СообÑение об оÑибке:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:432
-msgctxt "ChatViewSettingsPage|"
-msgid "Background:"
-msgstr "Фон"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:476
-msgctxt "ChatViewSettingsPage|"
-msgid "Use Sender Coloring"
-msgstr "ÐÑполÑзоваÑÑ Ð¦Ð²ÐµÑовÑÑ ÐалиÑÑÑ ÐÑпÑавиÑелÑ"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:772
-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:68
msgctxt "ChatViewSettingsPage|"
-msgid "Interface"
-msgstr "ÐнÑеÑÑейÑ"
+msgid "No modes"
+msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:70
msgctxt "ChatViewSettingsPage|"
-msgid "Chat View"
-msgstr "Ðид Ðкна ЧаÑа"
+msgid "Highest mode"
+msgstr ""
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:72
msgctxt "ChatViewSettingsPage|"
-msgid "You need at least version 0.6 of quasselcore to use this feature"
-msgstr "ÐÐ»Ñ Ð¸ÑполÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ ÑÑой ÑÑнкÑии вам нÑжно имеÑÑ quasselcore веÑÑии 0.6"
+msgid "All modes"
+msgstr ""
#: ../src/common/qt5cliparser.cpp:30
msgctxt "CliParser|"
msgid "Quassel IRC is a modern, distributed IRC client."
msgstr ""
-#: ../src/client/client.cpp:324
+#: ../src/client/client.cpp:354
msgctxt "Client|"
msgid "Identity already exists in client!"
msgstr "ÐиÑноÑÑÑ Ñже еÑÑÑ Ð² клиенÑе!"
-#: ../src/client/clientauthhandler.cpp:65
-#: ../src/client/clientauthhandler.cpp:472
+#: ../src/client/clientauthhandler.cpp:76
+#: ../src/client/clientauthhandler.cpp:525
msgctxt "ClientAuthHandler|"
msgid "Unencrypted connection canceled"
msgstr "ÐезаÑиÑÑованное подклÑÑение оÑменено"
-#: ../src/client/clientauthhandler.cpp:87
-#: ../src/client/clientauthhandler.cpp:103
+#: ../src/client/clientauthhandler.cpp:109
+#: ../src/client/clientauthhandler.cpp:125
#, qt-format
msgctxt "ClientAuthHandler|"
msgid "Connecting to %1..."
msgstr "СоединÑÑÑÑ Ñ %1..."
-#: ../src/client/clientauthhandler.cpp:99
+#: ../src/client/clientauthhandler.cpp:121
#, qt-format
msgctxt "ClientAuthHandler|"
msgid "Looking up %1..."
msgstr "ÐÑÑ Ñ
оÑÑ %1..."
-#: ../src/client/clientauthhandler.cpp:106
-#: ../src/client/clientauthhandler.cpp:316
+#: ../src/client/clientauthhandler.cpp:128
+#: ../src/client/clientauthhandler.cpp:348
#, qt-format
msgctxt "ClientAuthHandler|"
msgid "Connected to %1"
msgstr "Соединение Ñ %1 ÑÑÑановлено"
-#: ../src/client/clientauthhandler.cpp:110
+#: ../src/client/clientauthhandler.cpp:132
#, qt-format
msgctxt "ClientAuthHandler|"
msgid "Disconnecting from %1..."
msgstr "ÐÐ´ÐµÑ Ð¾ÑклÑÑение Ð¾Ñ %1..."
-#: ../src/client/clientauthhandler.cpp:114
+#: ../src/client/clientauthhandler.cpp:136
msgctxt "ClientAuthHandler|"
msgid "Disconnected"
msgstr "ÐÑклÑÑено"
-#: ../src/client/clientauthhandler.cpp:149
+#: ../src/client/clientauthhandler.cpp:171
msgctxt "ClientAuthHandler|"
msgid "Reconnecting in compatibility mode..."
msgstr ""
-#: ../src/client/clientauthhandler.cpp:237
+#: ../src/client/clientauthhandler.cpp:259
msgctxt "ClientAuthHandler|"
msgid ""
"Incompatible Quassel Core!
None of the protocols this client "
"speaks are supported by the core you are trying to connect to."
msgstr ""
-#: ../src/client/clientauthhandler.cpp:240
+#: ../src/client/clientauthhandler.cpp:262
msgctxt "ClientAuthHandler|"
msgid "Core speaks none of the protocols we support"
msgstr ""
-#: ../src/client/clientauthhandler.cpp:255
+#: ../src/client/clientauthhandler.cpp:277
#, qt-format
msgctxt "ClientAuthHandler|"
msgid ""
@@ -1633,32 +2016,44 @@ msgid ""
"at least protocol v%1, but the core speaks v%2 only."
msgstr ""
-#: ../src/client/clientauthhandler.cpp:257
+#: ../src/client/clientauthhandler.cpp:279
msgctxt "ClientAuthHandler|"
msgid "Incompatible protocol version, connection to core refused"
msgstr ""
-#: ../src/client/clientauthhandler.cpp:279
+#: ../src/client/clientauthhandler.cpp:301
msgctxt "ClientAuthHandler|"
msgid "Synchronizing to core..."
msgstr "СинÑ
ÑонизаÑÐ¸Ñ Ñ ÑдÑом..."
-#: ../src/client/clientauthhandler.cpp:294
+#: ../src/client/clientauthhandler.cpp:316
msgctxt "ClientAuthHandler|"
msgid "The core refused connection from this client"
msgstr ""
-#: ../src/client/clientauthhandler.cpp:358
+#: ../src/client/clientauthhandler.cpp:341
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core does not support the following features: %1"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:344
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core supports unknown features: %1"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:390
msgctxt "ClientAuthHandler|"
msgid "Logging in..."
msgstr "ÐвÑоÑизÑÑÑÑ..."
-#: ../src/client/clientauthhandler.cpp:363
+#: ../src/client/clientauthhandler.cpp:395
msgctxt "ClientAuthHandler|"
msgid "Login canceled"
msgstr "ÐÑ
од в ÑиÑÑÐµÐ¼Ñ Ð¾Ñменен"
-#: ../src/client/clientauthhandler.cpp:421
+#: ../src/client/clientauthhandler.cpp:453
msgctxt "ClientAuthHandler|"
msgid "Unencrypted connection cancelled"
msgstr ""
@@ -1674,12 +2069,12 @@ msgctxt "ClientBufferViewManager|"
msgid "All Chats"
msgstr "ÐÑе ЧаÑÑ"
-#: ../src/client/clientuserinputhandler.cpp:98
+#: ../src/client/clientuserinputhandler.cpp:100
msgctxt "ClientUserInputHandler|"
msgid "/JOIN expects a channel"
msgstr ""
-#: ../src/client/clientuserinputhandler.cpp:110
+#: ../src/client/clientuserinputhandler.cpp:112
msgctxt "ClientUserInputHandler|"
msgid "/QUERY expects at least a nick"
msgstr "/QUERY пÑÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÑ Ð½Ð°Ð»Ð¸Ñие Ñ
оÑÑ Ð±Ñ Ð½Ð¸ÐºÐ°"
@@ -1758,196 +2153,201 @@ msgctxt "ConnectionSettingsPage|"
msgid "IRC"
msgstr "IRC"
-#: ../src/qtui/chatitem.cpp:801
+#: ../src/qtui/chatitem.cpp:873
msgctxt "ContentsChatItem|"
msgid "Copy Link Address"
msgstr "СкопиÑоваÑÑ Ð°Ð´ÑÐµÑ ÑÑÑлки"
-#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/contextmenuactionprovider.cpp:38
msgctxt "ContextMenuActionProvider|"
msgid "Connect"
msgstr "СоединиÑÑÑÑ"
-#: ../src/uisupport/contextmenuactionprovider.cpp:40
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
msgctxt "ContextMenuActionProvider|"
msgid "Disconnect"
msgstr "ÐÑÑоединиÑÑÑÑ"
-#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/contextmenuactionprovider.cpp:41
msgctxt "ContextMenuActionProvider|"
msgid "Join"
msgstr "ÐайÑи"
-#: ../src/uisupport/contextmenuactionprovider.cpp:43
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
msgctxt "ContextMenuActionProvider|"
msgid "Part"
msgstr "ÐÑйÑи"
-#: ../src/uisupport/contextmenuactionprovider.cpp:44
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
msgctxt "ContextMenuActionProvider|"
msgid "Delete Chat(s)..."
msgstr "УдалиÑÑ Ð§Ð°Ñ(Ñ)..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:45
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
msgctxt "ContextMenuActionProvider|"
msgid "Go to Chat"
msgstr "ÐойÑи в ЧаÑ"
-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:46
msgctxt "ContextMenuActionProvider|"
msgid "Joins/Parts/Quits"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
msgctxt "ContextMenuActionProvider|"
msgid "Joins"
msgstr "ÐÑ
одÑ"
-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
msgctxt "ContextMenuActionProvider|"
msgid "Parts"
msgstr "ÐÑÑ
Ð¾Ð´Ñ Ð¸Ð· канала"
-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
msgctxt "ContextMenuActionProvider|"
msgid "Quits"
msgstr "ÐÑÑ
Ð¾Ð´Ñ Ð¸Ð· ÑеÑи"
-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
msgctxt "ContextMenuActionProvider|"
msgid "Nick Changes"
msgstr "Ð¡Ð¼ÐµÐ½Ñ Ð½Ð¸ÐºÐ°"
-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
msgctxt "ContextMenuActionProvider|"
msgid "Mode Changes"
msgstr "Ð¡Ð¼ÐµÐ½Ñ Ñежимов"
-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
msgctxt "ContextMenuActionProvider|"
msgid "Day Changes"
msgstr "Ð¡Ð¼ÐµÐ½Ñ Ð´Ð½Ñ"
-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
msgctxt "ContextMenuActionProvider|"
msgid "Topic Changes"
msgstr "Ð¡Ð¼ÐµÐ½Ñ Ð½Ð¸ÐºÐ°"
-#: ../src/uisupport/contextmenuactionprovider.cpp:55
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
msgctxt "ContextMenuActionProvider|"
msgid "Set as Default..."
msgstr "ÐадаÑÑ Ð±ÑÑÐµÑ Ð¿Ð¾ ÑмолÑаниÑ..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:56
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
msgctxt "ContextMenuActionProvider|"
msgid "Use Defaults..."
msgstr "ÐÑполÑзоваÑÑ Ð¿Ð¾ ÑмолÑаниÑ..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:58
+#: ../src/uisupport/contextmenuactionprovider.cpp:57
msgctxt "ContextMenuActionProvider|"
msgid "Join Channel..."
msgstr "ÐайÑи на канал..."
-#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
msgctxt "ContextMenuActionProvider|"
msgid "Start Query"
msgstr "ÐаÑаÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³"
-#: ../src/uisupport/contextmenuactionprovider.cpp:61
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
msgctxt "ContextMenuActionProvider|"
msgid "Show Query"
msgstr "ÐоказаÑÑ Ð´Ð¸Ð°Ð»Ð¾Ð³"
-#: ../src/uisupport/contextmenuactionprovider.cpp:62
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
msgctxt "ContextMenuActionProvider|"
msgid "Whois"
msgstr "Whois"
-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
msgctxt "ContextMenuActionProvider|"
msgid "Version"
msgstr "ÐеÑÑиÑ"
-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
msgctxt "ContextMenuActionProvider|"
msgid "Time"
msgstr "ÐÑемÑ"
-#: ../src/uisupport/contextmenuactionprovider.cpp:66
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
msgctxt "ContextMenuActionProvider|"
msgid "Ping"
msgstr "Ping"
-#: ../src/uisupport/contextmenuactionprovider.cpp:67
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
msgctxt "ContextMenuActionProvider|"
msgid "Client info"
msgstr "ÐнÑоÑмаÑÐ¸Ñ Ð¾ IRC клиенÑе"
-#: ../src/uisupport/contextmenuactionprovider.cpp:68
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
msgctxt "ContextMenuActionProvider|"
msgid "Custom..."
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:80
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
msgctxt "ContextMenuActionProvider|"
msgid "Give Operator Status"
msgstr "ÐаÑÑ Ð¾Ð¿ÐµÑаÑоÑа"
-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
msgctxt "ContextMenuActionProvider|"
msgid "Take Operator Status"
msgstr "СнÑÑÑ Ð¾Ð¿ÐµÑаÑоÑа"
-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
msgctxt "ContextMenuActionProvider|"
msgid "Give Half-Operator Status"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
msgctxt "ContextMenuActionProvider|"
msgid "Take Half-Operator Status"
msgstr ""
-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
msgctxt "ContextMenuActionProvider|"
msgid "Give Voice"
msgstr "ÐаÑÑ Ð³Ð¾Ð»Ð¾Ñ"
-#: ../src/uisupport/contextmenuactionprovider.cpp:85
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
msgctxt "ContextMenuActionProvider|"
msgid "Take Voice"
msgstr "СнÑÑÑ Ð³Ð¾Ð»Ð¾Ñ"
-#: ../src/uisupport/contextmenuactionprovider.cpp:86
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
msgctxt "ContextMenuActionProvider|"
msgid "Kick From Channel"
msgstr "ÐÑгнаÑÑ Ñ ÐºÐ°Ð½Ð°Ð»Ð°"
-#: ../src/uisupport/contextmenuactionprovider.cpp:87
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
msgctxt "ContextMenuActionProvider|"
msgid "Ban From Channel"
msgstr "ÐабаниÑÑ Ð½Ð° канале"
-#: ../src/uisupport/contextmenuactionprovider.cpp:88
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
msgctxt "ContextMenuActionProvider|"
msgid "Kick && Ban"
msgstr "ÐÑгнаÑÑ Ð¸ забаниÑÑ"
-#: ../src/uisupport/contextmenuactionprovider.cpp:90
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
msgctxt "ContextMenuActionProvider|"
msgid "Hide Chat(s) Temporarily"
msgstr "СкÑÑÑÑ ÑаÑ(Ñ), вÑеменно"
-#: ../src/uisupport/contextmenuactionprovider.cpp:91
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
msgctxt "ContextMenuActionProvider|"
msgid "Hide Chat(s) Permanently"
msgstr "СкÑÑÑÑ ÑаÑ(Ñ), ÐоÑÑоÑнно"
-#: ../src/uisupport/contextmenuactionprovider.cpp:92
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
msgctxt "ContextMenuActionProvider|"
msgid "Show Channel List"
msgstr "ÐоказаÑÑ ÑпиÑок каналов"
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
+msgctxt "ContextMenuActionProvider|"
+msgid "Configure"
+msgstr ""
+
#: ../src/uisupport/contextmenuactionprovider.cpp:93
msgctxt "ContextMenuActionProvider|"
msgid "Show Ignore List"
@@ -1983,107 +2383,275 @@ msgctxt "ContextMenuActionProvider|"
msgid "Existing Rules"
msgstr "ÐмеÑÑиеÑÑ Ð¿Ñавила"
-#: ../src/core/core.cpp:191
+#: ../src/core/core.cpp:116
msgctxt "Core|"
-msgid "Could not initialize any storage backend! Exiting..."
-msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð¸Ð½Ð¸ÑиализиÑоваÑÑ Ð½Ð¸ одно Ñ
ÑанилиÑе! ÐÑÑ
ожÑ..."
+msgid "Invalid core settings version!"
+msgstr ""
-#: ../src/core/core.cpp:192
+#: ../src/core/core.cpp:183
+#, qt-format
+msgctxt "Core|"
+msgid "Cannot configure from environment: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:187
+msgctxt "Core|"
+msgid "Cannot configure from environment!"
+msgstr ""
+
+#: ../src/core/core.cpp:193
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 "СейÑаÑ, Quassel поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ SQLite3 и PostgreSQL. вам нÑжно ÑоздаÑÑ ÑвоÑ\nбиблиоÑÐµÐºÑ Qt Ñ ÑазÑеÑеннÑми в ÑдÑе Quassel плагинами sqlite или postgres\nÐ´Ð»Ñ ÑабоÑÑ."
+msgstr ""
-#: ../src/core/core.cpp:252
+#: ../src/core/core.cpp:200
+msgctxt "Core|"
+msgid "Cannot write quasselcore configuration; probably a permission problem."
+msgstr ""
+
+#: ../src/core/core.cpp:249
+msgctxt "Core|"
+msgid "Cannot open port for listening!"
+msgstr ""
+
+#: ../src/core/core.cpp:292
+msgctxt "Core|"
+msgid "Cannot restore a state for an unconfigured core!"
+msgstr ""
+
+#: ../src/core/core.cpp:296
msgctxt "Core|"
msgid "Calling restoreState() even though active sessions exist!"
msgstr "ÐÑзÑÐ²Ð°Ñ restoreState(), неÑмоÑÑÑ Ð½Ð° ÑÑÑеÑÑвÑÑÑие акÑивнÑе ÑеÑÑии!"
-#: ../src/core/core.cpp:286
+#: ../src/core/core.cpp:333
msgctxt "Core|"
msgid "Core is already configured! Not configuring again..."
msgstr ""
-#: ../src/core/core.cpp:289
+#: ../src/core/core.cpp:336
msgctxt "Core|"
msgid "Admin user or password not set."
msgstr "ÐÐµÑ Ð¿Ð¾Ð»ÑзоваÑелÑ-админиÑÑÑаÑоÑа или паÑолÑ."
-#: ../src/core/core.cpp:292
+#: ../src/core/core.cpp:340
msgctxt "Core|"
msgid "Could not setup storage!"
msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð½Ð°ÑÑÑоиÑÑ Ñ
ÑанилиÑе!"
-#: ../src/core/core.cpp:297
+#: ../src/core/core.cpp:346
+msgctxt "Core|"
+msgid "Could not setup authenticator!"
+msgstr ""
+
+#: ../src/core/core.cpp:352
+msgctxt "Core|"
+msgid "Fatal failure while trying to setup, terminating"
+msgstr ""
+
+#: ../src/core/core.cpp:356
+msgctxt "Core|"
+msgid "Could not save backend settings, probably a permission problem."
+msgstr ""
+
+#: ../src/core/core.cpp:360
msgctxt "Core|"
msgid "Creating admin user..."
msgstr "Ð¡Ð¾Ð·Ð´Ð°Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ-админиÑÑÑаÑоÑа..."
-#: ../src/core/core.cpp:447
+#: ../src/core/core.cpp:444
+#, qt-format
+msgctxt "Core|"
+msgid "Selected storage backend %1 is not available."
+msgstr ""
+
+#: ../src/core/core.cpp:544
+#, qt-format
+msgctxt "Core|"
+msgid "Selected auth backend %1 is not available."
+msgstr ""
+
+#: ../src/core/core.cpp:633
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1"
msgstr "ÐекоÑÑекÑнÑй адÑÐµÑ Ð´Ð»Ñ Ð¿ÑоÑлÑÑÐ¸Ð²Ð°Ð½Ð¸Ñ %1"
-#: ../src/core/core.cpp:456
+#: ../src/core/core.cpp:642
#, qt-format
msgctxt "Core|"
msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
msgstr "ÐÐ¶Ð¸Ð´Ð°Ñ Ð³ÑаÑиÑеÑкиÑ
клиенÑов по адÑеÑÑ IPv6 %1 поÑÑ %2, иÑполÑзÑÑ Ð¿ÑоÑокол веÑÑии %3"
-#: ../src/core/core.cpp:465
+#: ../src/core/core.cpp:651
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv6 interface %1:%2: %3"
msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð¾ÑкÑÑÑÑ Ð¸Ð½ÑеÑÑÐµÐ¹Ñ IPv6 %1:%2: %3"
-#: ../src/core/core.cpp:473
+#: ../src/core/core.cpp:659
#, qt-format
msgctxt "Core|"
msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
msgstr "ÐÐ¶Ð¸Ð´Ð°Ñ Ð³ÑаÑиÑеÑкиÑ
клиенÑов по адÑеÑÑ IPv4 %1 поÑÑ %2, иÑполÑзÑÑ Ð¿ÑоÑокол веÑÑии %3"
-#: ../src/core/core.cpp:484
+#: ../src/core/core.cpp:670
#, qt-format
msgctxt "Core|"
msgid "Could not open IPv4 interface %1:%2: %3"
msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð¾ÑкÑÑÑÑ Ð¸Ð½ÑеÑÑÐµÐ¹Ñ IPv4 %1:%2: %3"
-#: ../src/core/core.cpp:492
+#: ../src/core/core.cpp:678
#, qt-format
msgctxt "Core|"
msgid "Invalid listen address %1, unknown network protocol"
msgstr "ÐекоÑÑекÑнÑй адÑÐµÑ Ð´Ð»Ñ Ð¿ÑоÑлÑÑÐ¸Ð²Ð°Ð½Ð¸Ñ %1, неизвеÑÑнÑй ÑеÑевой пÑоÑокол"
-#: ../src/core/core.cpp:501
+#: ../src/core/core.cpp:687
msgctxt "Core|"
msgid "Could not open any network interfaces to listen on!"
msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð¾ÑкÑÑÑÑ Ð½Ð¸ один ÑеÑевой инÑеÑÑÐµÐ¹Ñ Ð´Ð»Ñ Ð¿ÑоÑлÑÑиваниÑ!"
-#: ../src/core/core.cpp:541
+#: ../src/core/core.cpp:735
msgctxt "Core|"
msgid "Client connected from"
msgstr "ÐÐ»Ð¸ÐµÐ½Ñ ÑоединилÑÑ Ñ"
-#: ../src/core/core.cpp:544
+#: ../src/core/core.cpp:738
msgctxt "Core|"
msgid "Closing server for basic setup."
msgstr "ÐакÑÑÐ²Ð°Ñ ÑеÑÐ²ÐµÑ Ð´Ð»Ñ Ð±Ð°Ð·Ð¾Ð²Ð¾Ð¹ наÑÑÑойки."
-#: ../src/core/core.cpp:556
+#: ../src/core/core.cpp:750
msgctxt "Core|"
msgid "Non-authed client disconnected:"
msgstr ""
-#: ../src/client/coreaccount.h:40
+#: ../src/core/core.cpp:829
+msgctxt "Core|"
+msgid "Cannot setup storage backend."
+msgstr ""
+
+#: ../src/core/core.cpp:925
+#, qt-format
+msgctxt "Core|"
+msgid "Unsupported storage backend: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:926
+msgctxt "Core|"
+msgid "Supported backends are:"
+msgstr ""
+
+#: ../src/core/core.cpp:938 ../src/core/core.cpp:958
+#, qt-format
+msgctxt "Core|"
+msgid "Switched storage backend to: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:939
+msgctxt "Core|"
+msgid "Backend already initialized. Skipping Migration..."
+msgstr ""
+
+#: ../src/core/core.cpp:942
+#, qt-format
+msgctxt "Core|"
+msgid "Storage backend is not available: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:946
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to setup storage backend: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:951
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to initialize storage backend: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:966
+#, qt-format
+msgctxt "Core|"
+msgid "Migrating storage backend %1 to %2..."
+msgstr ""
+
+#: ../src/core/core.cpp:971
+msgctxt "Core|"
+msgid "Migration finished!"
+msgstr ""
+
+#: ../src/core/core.cpp:978
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to migrate storage backend! (No migration writer for %1)"
+msgstr ""
+
+#: ../src/core/core.cpp:984
+msgctxt "Core|"
+msgid "No currently active storage backend. Skipping migration..."
+msgstr ""
+
+#: ../src/core/core.cpp:987
+#, qt-format
+msgctxt "Core|"
+msgid "Currently active storage backend does not support migration: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:990
+#, qt-format
+msgctxt "Core|"
+msgid "New storage backend does not support migration: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:1012
+#, qt-format
+msgctxt "Core|"
+msgid "Unsupported authenticator: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:1013
+msgctxt "Core|"
+msgid "Supported authenticators are:"
+msgstr ""
+
+#: ../src/core/core.cpp:1023 ../src/core/core.cpp:1040
+#, qt-format
+msgctxt "Core|"
+msgid "Switched authenticator to: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:1026
+#, qt-format
+msgctxt "Core|"
+msgid "Authenticator is not available: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:1030
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to setup authenticator: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:1035
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to initialize authenticator: %1"
+msgstr ""
+
+#: ../src/client/coreaccount.h:41
msgctxt "CoreAccount|"
msgid "Internal Core"
msgstr "ÐÑÑÑоенное ÑдÑо"
#: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:261
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:293
msgctxt "CoreAccountEditDlg|"
msgid "Edit Core Account"
msgstr "РедакÑиÑоваÑÑ Ð°ÐºÐºÐ°ÑÐ½Ñ Ð² ÑдÑе"
@@ -2104,7 +2672,7 @@ msgid "Local Core"
msgstr "ÐокалÑное ÑдÑо"
#: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:170
msgctxt "CoreAccountEditDlg|"
msgid "Hostname:"
msgstr "ХоÑÑ:"
@@ -2116,13 +2684,13 @@ msgid "localhost"
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
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:229
msgctxt "CoreAccountEditDlg|"
msgid "User:"
msgstr "ÐолÑзоваÑелÑ:"
@@ -2140,25 +2708,40 @@ msgstr "ÐапомниÑÑ"
#: ../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:139
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:149
+msgctxt "CoreAccountEditDlg|"
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:279
msgctxt "CoreAccountEditDlg|"
msgid "Proxy Type:"
msgstr "Тип пÑокÑи:"
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:288
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|"
-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:263
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:295
msgctxt "CoreAccountEditDlg|"
msgid "Add Core Account"
msgstr "ÐобавиÑÑ Ð°ÐºÐºÐ°ÑÐ½Ñ Ð² ÑдÑе"
@@ -2208,22 +2791,28 @@ msgctxt "CoreAccountSettingsPage|"
msgid "Always connect to"
msgstr "ÐÑегда подклÑÑаÑÑÑÑ Ðº"
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:30
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
msgctxt "CoreAccountSettingsPage|"
msgid "Remote Cores"
msgstr "УдаленнÑе Quassel Core ÑеÑвеÑа"
-#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144
+#: ../src/core/coreapplication.cpp:46
+msgctxt "CoreApplication|"
+msgid "Could not initialize Quassel!"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:138 ../src/core/coreauthhandler.cpp:150
+#: ../src/core/coreauthhandler.cpp:225
msgctxt "CoreAuthHandler|"
msgid "Client"
msgstr "ÐлиенÑ"
-#: ../src/core/coreauthhandler.cpp:132
+#: ../src/core/coreauthhandler.cpp:138
msgctxt "CoreAuthHandler|"
msgid "too old, rejecting."
msgstr "ÑлиÑком ÑÑаÑÑй, оÑказÑваÑ."
-#: ../src/core/coreauthhandler.cpp:133
+#: ../src/core/coreauthhandler.cpp:139
#, qt-format
msgctxt "CoreAuthHandler|"
msgid ""
@@ -2232,61 +2821,101 @@ msgid ""
" client."
msgstr ""
-#: ../src/core/coreauthhandler.cpp:144
+#: ../src/core/coreauthhandler.cpp:150
msgctxt "CoreAuthHandler|"
msgid "did not send a registration message before trying to login, rejecting."
msgstr ""
-#: ../src/core/coreauthhandler.cpp:145
+#: ../src/core/coreauthhandler.cpp:151
msgctxt "CoreAuthHandler|"
msgid ""
"Client not initialized!
You need to send a registration message "
"before trying to login."
msgstr ""
-#: ../src/core/coreauthhandler.cpp:162
+#: ../src/core/coreauthhandler.cpp:168
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "SSL required but non-SSL connection attempt from %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:169
msgctxt "CoreAuthHandler|"
msgid ""
"SSL is required!
You need to use SSL in order to connect to this "
"core."
msgstr ""
-#: ../src/core/coreauthhandler.cpp:176
+#: ../src/core/coreauthhandler.cpp:225
+msgctxt "CoreAuthHandler|"
+msgid "attempted to login before the core was configured, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:226
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Attempted to login before core was configured!
The core must be "
+"configured before attempting to login."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:238
#, qt-format
msgctxt "CoreAuthHandler|"
-msgid "Quassel Core Version %1
Built: %2
Up %3d%4h%5m (since %6)"
-msgstr "ЯдÑо Quassel веÑÑии %1
СобÑано: %2
ÐпÑайм %3д%4Ñ%5м (Ñ %6)"
+msgid "Invalid login attempt from %1 as \"%2\""
+msgstr "ÐеÑдаÑÐ½Ð°Ñ Ð¿Ð¾Ð¿ÑÑка вÑ
ода как \"%2\" из %1"
-#: ../src/core/coreauthhandler.cpp:212
+#: ../src/core/coreauthhandler.cpp:239
msgctxt "CoreAuthHandler|"
msgid ""
"Invalid username or password!
The username/password combination "
"you supplied could not be found in the database."
msgstr "ÐевеÑное Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð¸Ð»Ð¸ паÑолÑ!
ÐÑедоÑÑавленнÑе вами Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð¸ паÑÐ¾Ð»Ñ Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ñ Ð² базе."
-#: ../src/core/coreauthhandler.cpp:217
+#: ../src/core/coreauthhandler.cpp:244
#, qt-format
msgctxt "CoreAuthHandler|"
msgid ""
"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
msgstr ""
-#: ../src/core/coreauthhandler.cpp:236
+#: ../src/core/coreauthhandler.cpp:250
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support extended features."
+msgstr "ÐÐ»Ð¸ÐµÐ½Ñ Ð½Ðµ поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ ÑаÑÑиÑеннÑе возможноÑÑи."
+
+#: ../src/core/coreauthhandler.cpp:252
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support the following features: %1"
+msgstr "ÐÐ»Ð¸ÐµÐ½Ñ Ð½Ðµ поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ ÑледÑÑÑие возможноÑÑи: %1"
+
+#: ../src/core/coreauthhandler.cpp:256
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client supports unknown features: %1"
+msgstr "ÐÐ»Ð¸ÐµÐ½Ñ Ð¿Ð¾Ð´Ð´ÐµÑÐ¶Ð¸Ð²Ð°ÐµÑ Ð½ÐµÐ¾Ð¿Ð¾Ð·Ð½Ð°Ð½Ñе возможноÑÑи: %1"
+
+#: ../src/core/coreauthhandler.cpp:276
msgctxt "CoreAuthHandler|"
msgid "Starting encryption for Client:"
msgstr ""
-#: ../src/qtui/coreconfigwizard.cpp:69
+#: ../src/qtui/coreconfigwizard.cpp:43
+msgctxt "CoreConfigWizard|"
+msgid "Description"
+msgstr "ÐпиÑание"
+
+#: ../src/qtui/coreconfigwizard.cpp:162
msgctxt "CoreConfigWizard|"
msgid "Core Configuration Wizard"
msgstr "ÐаÑÑÐµÑ ÐºÐ¾Ð½ÑигÑÑаÑии ÑдÑа"
-#: ../src/qtui/coreconfigwizard.cpp:98
+#: ../src/qtui/coreconfigwizard.cpp:203
msgctxt "CoreConfigWizard|"
msgid "Your core has been successfully configured. Logging you in..."
msgstr "ÐаÑе ÑдÑо ÑконÑигÑÑиÑовано ÑÑпеÑно. ÐÑполнÑÑ Ð²Ñ
од в..."
-#: ../src/qtui/coreconfigwizard.cpp:107
+#: ../src/qtui/coreconfigwizard.cpp:212
#, qt-format
msgctxt "CoreConfigWizard|"
msgid ""
@@ -2294,45 +2923,48 @@ msgid ""
"over."
msgstr "ÐÑибка конÑигÑÑаÑии ÑдÑа:
%1
ÐажмиÑе Ðалее ÑÑÐ¾Ð±Ñ Ð½Ð°ÑаÑÑ ÑнаÑала."
-#: ../src/qtui/coreconfigwizard.cpp:126
-msgctxt "CoreConfigWizard|"
-msgid ""
-"Your are now logged into your freshly configured Quassel Core!
Please "
-"remember to configure your identities and networks now."
-msgstr "ÐÑ Ð²Ð¾Ñли в ÑвежеÑконÑигÑÑиÑованное ÑдÑо Quassel!
ТепеÑÑ, пожалÑйÑÑа, не забÑдÑÑе наÑÑÑоиÑÑ Ð²Ð°Ñи лиÑноÑÑи и ÑеÑи."
-
#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
msgctxt "CoreConfigWizardAdminUserPage|"
msgid "Form"
msgstr "ФоÑма"
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:25
msgctxt "CoreConfigWizardAdminUserPage|"
msgid "Username:"
msgstr "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ:"
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:35
msgctxt "CoreConfigWizardAdminUserPage|"
msgid "Password:"
msgstr "ÐаÑолÑ:"
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:49
msgctxt "CoreConfigWizardAdminUserPage|"
msgid "Repeat password:"
msgstr "ÐовÑоÑиÑе паÑолÑ:"
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:63
msgctxt "CoreConfigWizardAdminUserPage|"
msgid "Remember password"
msgstr "ÐапомниÑÑ Ð¿Ð°ÑолÑ"
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:72
msgctxt "CoreConfigWizardAdminUserPage|"
msgid ""
"Note: 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 \"quasselcore --help\"."
msgstr "ÐÑимеÑание: Рданной веÑÑии пÑогÑаммÑ, добавление полÑзоваÑелей и изменение имени полÑзоваÑÐµÐ»Ñ Ð¸ паÑÐ¾Ð»Ñ Ð½Ðµ возможно ÑеÑез инÑеÑÑÐµÐ¹Ñ ÐºÐ»Ð¸ÐµÐ½Ñа Quassel.\nÐÑли ÐÑ Ñ
оÑиÑе ÑÑо ÑделаÑÑ, вÑполниÑе ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ \"quasselcore --help\"."
+#: ../src/qtui/ui/coreconfigwizardauthenticationselectionpage.ui:14
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Form"
+msgstr "ФоÑма"
+
+#: ../src/qtui/ui/coreconfigwizardauthenticationselectionpage.ui:25
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Authentication Backend:"
+msgstr ""
+
#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
msgctxt "CoreConfigWizardIntroPage|"
msgid "Form"
@@ -2343,103 +2975,102 @@ msgctxt "CoreConfigWizardIntroPage|"
msgid "This wizard will guide you through the setup of your Quassel Core."
msgstr "ÐÑÐ¾Ñ Ð¼Ð°ÑÑÐµÑ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ Ð²Ð°Ð¼ наÑÑÑоиÑÑ ÑдÑо Quassel."
-#: ../src/qtui/coreconfigwizard.cpp:162
+#: ../src/qtui/coreconfigwizard.cpp:258
msgctxt "CoreConfigWizardPages::AdminUserPage|"
msgid "Create Admin User"
msgstr "Создание полÑзоваÑелÑ-админиÑÑÑаÑоÑа"
-#: ../src/qtui/coreconfigwizard.cpp:163
+#: ../src/qtui/coreconfigwizard.cpp:259
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:145
+#: ../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 ""
+
+#: ../src/qtui/coreconfigwizard.cpp:314
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid "Authentication Settings"
+msgstr "ÐаÑÑÑойки аÑÑенÑиÑикаÑии"
+
+#: ../src/qtui/coreconfigwizard.cpp:241
msgctxt "CoreConfigWizardPages::IntroPage|"
msgid "Introduction"
msgstr "Ðведение"
-#: ../src/qtui/coreconfigwizard.cpp:198
+#: ../src/qtui/coreconfigwizard.cpp:379
msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
msgid "Select Storage Backend"
msgstr "ÐÑÐ±Ð¾Ñ ÑÑедÑÑва Ñ
ÑанениÑ"
-#: ../src/qtui/coreconfigwizard.cpp:199
+#: ../src/qtui/coreconfigwizard.cpp:380
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:300
+#: ../src/qtui/coreconfigwizard.cpp:420
msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
-msgid "Connection Properties"
-msgstr "СвойÑÑва ÑоединениÑ"
+msgid "Storage Settings"
+msgstr "ÐаÑÑÑойки Ñ
ÑанилиÑа"
-#: ../src/qtui/coreconfigwizard.cpp:342
+#: ../src/qtui/coreconfigwizard.cpp:484
msgctxt "CoreConfigWizardPages::SyncPage|"
msgid "Storing Your Settings"
msgstr "СоÑ
Ñанение наÑÑÑоек"
-#: ../src/qtui/coreconfigwizard.cpp:343
+#: ../src/qtui/coreconfigwizard.cpp:485
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."
-msgstr "ÐаÑи наÑÑÑойки ÑоÑ
ÑанÑÑÑÑÑ Ð² ÑдÑе, Ð²Ñ Ð±ÑдеÑе подÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ñ Ðº ÑдÑÑ Ð°Ð²ÑомаÑиÑеÑки."
+msgstr "ÐаÑи наÑÑÑойки ÑоÑ
ÑанÑÑÑÑÑ Ð² ÑдÑо, вÑ
од в ÑÐµÐ°Ð½Ñ Ð±ÑÐ´ÐµÑ Ð¿Ñоизведен авÑомаÑиÑеÑки."
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:14
msgctxt "CoreConfigWizardStorageSelectionPage|"
msgid "Form"
msgstr "ФоÑма"
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:22
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/ui/coreconfigwizardsyncpage.ui:14
msgctxt "CoreConfigWizardSyncPage|"
msgid "Form"
msgstr "ФоÑма"
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:20
msgctxt "CoreConfigWizardSyncPage|"
msgid "Your Choices"
msgstr "ÐаÑи вÑбоÑÑ"
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:36
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/ui/coreconfigwizardsyncpage.ui:56
msgctxt "CoreConfigWizardSyncPage|"
msgid "Storage Backend:"
msgstr "Ðвижок Ñ
ÑанениÑ:"
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:76
msgctxt "CoreConfigWizardSyncPage|"
-msgid "bar"
-msgstr "bar"
+msgid "Authentication Backend:"
+msgstr ""
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:110
msgctxt "CoreConfigWizardSyncPage|"
msgid "Please wait while your settings are being transmitted to the core..."
msgstr "ÐожалÑйÑÑа подождиÑе пока ваÑи наÑÑÑойки пеÑедаÑÑÑÑ ÑдÑÑ..."
@@ -2485,33 +3116,38 @@ msgctxt "CoreConnection|"
msgid "Network is down"
msgstr "СеÑÑ Ð½ÐµÐ´Ð¾ÑÑÑпна"
-#: ../src/client/coreconnection.cpp:263
+#: ../src/client/coreconnection.cpp:274
msgctxt "CoreConnection|"
msgid "Disconnected"
msgstr "ÐÑклÑÑено"
-#: ../src/client/coreconnection.cpp:298
+#: ../src/client/coreconnection.cpp:309
msgctxt "CoreConnection|"
msgid "Disconnected from core."
msgstr "&ÐÑклÑÑиÑÑÑÑ Ð¾Ñ ÑдÑа"
-#: ../src/client/coreconnection.cpp:436
+#: ../src/client/coreconnection.cpp:388
+msgctxt "CoreConnection|"
+msgid "Initializing..."
+msgstr "ÐниÑиализаÑиÑ..."
+
+#: ../src/client/coreconnection.cpp:446
msgctxt "CoreConnection|"
msgid "Receiving session state"
msgstr "ÐолÑÑение ÑоÑÑоÑÐ½Ð¸Ñ ÑеÑей"
-#: ../src/client/coreconnection.cpp:438
+#: ../src/client/coreconnection.cpp:448
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronizing to %1..."
msgstr "СинÑ
ÑонизаÑÐ¸Ñ Ñ %1..."
-#: ../src/client/coreconnection.cpp:474
+#: ../src/client/coreconnection.cpp:481
msgctxt "CoreConnection|"
msgid "Receiving network states"
msgstr "ÐолÑÑение ÑоÑÑоÑÐ½Ð¸Ñ ÑеÑей"
-#: ../src/client/coreconnection.cpp:525
+#: ../src/client/coreconnection.cpp:532
#, qt-format
msgctxt "CoreConnection|"
msgid "Synchronized to %1"
@@ -2527,159 +3163,433 @@ msgctxt "CoreConnectionSettingsPage|"
msgid "Network Status Detection"
msgstr "ÐпÑеделение ÑоÑÑоÑÐ½Ð¸Ñ ÑеÑи"
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
-msgctxt "CoreConnectionSettingsPage|"
-msgid "Rely on Qt's network configuration manager to detect if we're online"
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Rely on Qt's network configuration manager to detect if we're online"
+msgstr ""
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Automatic"
+msgstr "ÐвÑомаÑиÑеÑки"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
+msgctxt "CoreConnectionSettingsPage|"
+msgid ""
+"Actively ping the remote core and disconnect if we didn't get a reply after "
+"a certain time"
+msgstr "ÐеÑиодиÑеÑки запÑаÑиваÑÑ Ñдаленное ÑдÑо, и оÑклÑÑаÑÑÑÑ, еÑли Ð¾Ñ Ð½ÐµÐ³Ð¾ Ð½ÐµÑ Ð¾Ñклика"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Ping timeout after"
+msgstr "ÐÑклÑÑаÑÑÑÑ ÑеÑез"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:60
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:157
+msgctxt "CoreConnectionSettingsPage|"
+msgid " seconds"
+msgstr " Ñек."
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:100
+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"
+msgstr "ÐÑклÑÑаÑÑÑÑ ÑолÑко поÑле закÑÑÑÐ¸Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÑиÑÑемой. ÐбнаÑÑжение оÑклÑÑÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑойÑи занÑÑÑ Ð¼Ð½Ð¾Ð³Ð¾ вÑемени"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Never time out actively"
+msgstr "ÐеакÑивное вÑемÑ"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Automatically reconnect on network failures"
+msgstr "ÐвÑомаÑиÑеÑки пеÑеподклÑÑаÑÑÑÑ Ð¿Ð¾Ñле ÑазÑÑва ÑоединениÑ"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:147
+msgctxt "CoreConnectionSettingsPage|"
+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"
+msgstr "УдаленнÑе Quassel Core ÑеÑвеÑа"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Connection"
+msgstr "СоединениÑ"
+
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
+msgctxt "CoreConnectionStatusWidget|"
+msgid "Form"
+msgstr "ФоÑма"
+
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
+msgctxt "CoreConnectionStatusWidget|"
+msgid "Message"
+msgstr "СообÑение"
+
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
+msgctxt "CoreConnectionStatusWidget|seconds"
+msgid "s"
+msgstr " Ñек"
+
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
+msgctxt "CoreConnectionStatusWidget|milliseconds"
+msgid "ms"
+msgstr "мÑ"
+
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67
+#, qt-format
+msgctxt "CoreConnectionStatusWidget|"
+msgid "(Lag: %1 %2)"
+msgstr "(ÐадеÑжка: %1 %2)"
+
+#: ../src/qtui/coreconnectionstatuswidget.cpp:83
+msgctxt "CoreConnectionStatusWidget|"
+msgid "The connection to your core is encrypted with SSL."
+msgstr "Соединение Ñ ÑдÑом иÑполÑзÑÐµÑ SSL-ÑиÑÑование."
+
+#: ../src/qtui/coreconnectionstatuswidget.cpp:87
+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:718
+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:31
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Interface"
+msgstr "ÐнÑеÑÑейÑ"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:34
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:34
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remote Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:42
+msgctxt "CoreHighlightSettingsPage|"
+msgid "All Nicks from Identity"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:43
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Current Nick"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:44
+msgctxt "CoreHighlightSettingsPage|"
+msgid "None"
+msgstr "ÐеÑ"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:99
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import Legacy"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:100
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:107
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import highlight rules configured in %1."
msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
-msgctxt "CoreConnectionSettingsPage|"
-msgid "Automatic"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:101
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:740
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Legacy Highlights"
msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
-msgctxt "CoreConnectionSettingsPage|"
-msgid ""
-"Actively ping the remote core and disconnect if we didn't get a reply after "
-"a certain time"
-msgstr "ÐеÑиодиÑеÑки запÑаÑиваÑÑ Ñдаленное ÑдÑо, и оÑклÑÑаÑÑÑÑ, еÑли Ð¾Ñ Ð½ÐµÐ³Ð¾ Ð½ÐµÑ Ð¾Ñклика"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:106
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import Local"
+msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
-msgctxt "CoreConnectionSettingsPage|"
-msgid "Ping timeout after"
-msgstr "ÐÑклÑÑаÑÑÑÑ ÑеÑез"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:108
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:714
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:742
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Local Highlights"
+msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:60
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:157
-msgctxt "CoreConnectionSettingsPage|"
-msgid " seconds"
-msgstr " Ñек."
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:161
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enable/disable this rule"
+msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:100
-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"
-msgstr "ÐÑклÑÑаÑÑÑÑ ÑолÑко поÑле закÑÑÑÐ¸Ñ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ ÑиÑÑемой. ÐбнаÑÑжение оÑклÑÑÐµÐ½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑойÑи занÑÑÑ Ð¼Ð½Ð¾Ð³Ð¾ вÑемени"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:164
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Phrase to match, leave blank to match any message"
+msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
-msgctxt "CoreConnectionSettingsPage|"
-msgid "Never time out actively"
-msgstr "ÐеакÑивное вÑемÑ"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:167
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"RegEx: This option determines if the highlight rule, Sender, "
+"and Channel should be interpreted as regular expressions or "
+"just as keywords."
+msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
-msgctxt "CoreConnectionSettingsPage|"
-msgid "Automatically reconnect on network failures"
-msgstr "ÐвÑомаÑиÑеÑки пеÑеподклÑÑаÑÑÑÑ Ð¿Ð¾Ñле ÑазÑÑва ÑоединениÑ"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:172
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"CS: This option determines if the highlight rule, Sender, and "
+"Channel should be interpreted case sensitive."
+msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:147
-msgctxt "CoreConnectionSettingsPage|"
-msgid "Retry every"
-msgstr "ÐовÑÐ¾Ñ ÐºÐ°Ð¶Ð´Ñе"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:176
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"Sender: Semicolon separated list of nick!ident@host names, "
+"leave blank to match any nickname.
Example:
Alice!*; "
+"Bob!*@example.com; Carol*!*; !Caroline!*
would match on "
+"Alice, Bob with hostmask example.com, and any nickname "
+"starting with Carol except for Caroline
If only "
+"inverted names are specified, it will match anything except for what's "
+"specified (implicit wildcard).
Example:
!Announce*!*; "
+"!Wheatley!aperture@*
would match anything except for "
+"Wheatley with ident aperture or any nickname starting with "
+"Announce
"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:190
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"Channel: Semicolon separated list of channel/query names, leave "
+"blank to match any name.
Example:
#quassel*; #foobar; "
+"!#quasseldroid
would match on #foobar and any channel "
+"starting with #quassel except for #quasseldroid
If "
+"only inverted names are specified, it will match anything except for what's "
+"specified (implicit wildcard).
Example:
!#quassel*; "
+"!#foobar
would match anything except for #foobar or any "
+"channel starting with #quassel
"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:719
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer to configure remote highlights."
+msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
-msgctxt "CoreConnectionSettingsPage|"
-msgid "Interval between consecutive connection attempts"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:721
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "You can still configure highlights for this device only in %1."
msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
-msgctxt "CoreConnectionSettingsPage|"
-msgid "Remote Cores"
-msgstr "УдаленнÑе Quassel Core ÑеÑвеÑа"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:725
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remote Highlights unsupported"
+msgstr ""
-#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
-msgctxt "CoreConnectionSettingsPage|"
-msgid "Connection"
-msgstr "СоединениÑ"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:748
+msgctxt "CoreHighlightSettingsPage|"
+msgid "No highlights to import"
+msgstr ""
-#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
-msgctxt "CoreConnectionStatusWidget|"
-msgid "Form"
-msgstr "ФоÑма"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:749
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "No highlight rules in %1."
+msgstr ""
-#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
-msgctxt "CoreConnectionStatusWidget|"
-msgid "Message"
-msgstr "СообÑение"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:755
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import highlights?"
+msgstr ""
-#: ../src/qtui/coreconnectionstatuswidget.cpp:67
-msgctxt "CoreConnectionStatusWidget|seconds"
-msgid "s"
-msgstr " Ñек"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:756
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import all highlight rules from %1?"
+msgstr ""
-#: ../src/qtui/coreconnectionstatuswidget.cpp:67
-msgctxt "CoreConnectionStatusWidget|milliseconds"
-msgid "ms"
-msgstr "мÑ"
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:795
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Imported highlights"
+msgstr ""
-#: ../src/qtui/coreconnectionstatuswidget.cpp:68
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:796
#, qt-format
-msgctxt "CoreConnectionStatusWidget|"
-msgid "(Lag: %1 %2)"
-msgstr "(ÐадеÑжка: %1 %2)"
-
-#: ../src/qtui/coreconnectionstatuswidget.cpp:84
-msgctxt "CoreConnectionStatusWidget|"
-msgid "The connection to your core is encrypted with SSL."
-msgstr "Соединение Ñ ÑдÑом иÑполÑзÑÐµÑ SSL-ÑиÑÑование."
+msgctxt "CoreHighlightSettingsPage|"
+msgid "%1 highlight rules successfully imported."
+msgstr ""
-#: ../src/qtui/coreconnectionstatuswidget.cpp:88
-msgctxt "CoreConnectionStatusWidget|"
-msgid "The connection to your core is not encrypted."
-msgstr "Соединение Ñ ÑдÑом не иÑполÑзÑÐµÑ ÑиÑÑование."
+#: ../src/qtui/settingspages/corehighlightsettingspage.h:52
+#: ../src/qtui/settingspages/corehighlightsettingspage.h:55
+msgctxt "CoreHighlightSettingsPage|"
+msgid "highlight rule"
+msgstr "пÑавило подÑвеÑки"
-#: ../src/qtui/ui/coreinfodlg.ui:13
+#: ../src/qtui/ui/coreinfodlg.ui:14
msgctxt "CoreInfoDlg|"
msgid "Core Information"
msgstr "ÐнÑоÑмаÑÐ¸Ñ Ð¾ ÑдÑе"
-#: ../src/qtui/ui/coreinfodlg.ui:21
+#: ../src/qtui/ui/coreinfodlg.ui:22
msgctxt "CoreInfoDlg|"
msgid "Version:"
msgstr "ÐеÑÑиÑ:"
-#: ../src/qtui/ui/coreinfodlg.ui:28
+#: ../src/qtui/ui/coreinfodlg.ui:36
msgctxt "CoreInfoDlg|"
-msgid ""
-msgstr ""
+msgid "Version date:"
+msgstr ""
-#: ../src/qtui/ui/coreinfodlg.ui:35
+#: ../src/qtui/ui/coreinfodlg.ui:50
msgctxt "CoreInfoDlg|"
msgid "Uptime:"
msgstr "ÐпÑайм:"
-#: ../src/qtui/ui/coreinfodlg.ui:42
+#: ../src/qtui/ui/coreinfodlg.ui:64
msgctxt "CoreInfoDlg|"
-msgid "Connected Clients:"
-msgstr "Соединено клиенÑов:"
+msgid "Connected clients:"
+msgstr ""
-#: ../src/qtui/ui/coreinfodlg.ui:49
+#: ../src/qtui/ui/coreinfodlg.ui:117 ../src/qtui/coreinfodlg.cpp:193
msgctxt "CoreInfoDlg|"
-msgid ""
-msgstr ""
+msgid "Your Quassel core is too old to show active sessions"
+msgstr ""
-#: ../src/qtui/ui/coreinfodlg.ui:56
+#: ../src/qtui/ui/coreinfodlg.ui:124
msgctxt "CoreInfoDlg|"
-msgid ""
-msgstr ""
+msgid "Details..."
+msgstr ""
-#: ../src/qtui/ui/coreinfodlg.ui:63
+#: ../src/qtui/ui/coreinfodlg.ui:200
msgctxt "CoreInfoDlg|"
-msgid "Build date:"
-msgstr "ÐаÑа ÑбоÑки:"
+msgid "Close"
+msgstr "ÐакÑÑÑÑ"
-#: ../src/qtui/ui/coreinfodlg.ui:70
+#: ../src/qtui/coreinfodlg.cpp:86 ../src/qtui/coreinfodlg.cpp:87
+#: ../src/qtui/coreinfodlg.cpp:160
msgctxt "CoreInfoDlg|"
-msgid ""
-msgstr ""
+msgid "Unknown"
+msgstr ""
-#: ../src/qtui/ui/coreinfodlg.ui:81
+#: ../src/qtui/coreinfodlg.cpp:90
msgctxt "CoreInfoDlg|"
-msgid "Close"
-msgstr "ÐакÑÑÑÑ"
+msgid "Disconnected from core"
+msgstr ""
-#: ../src/qtui/coreinfodlg.cpp:57
+#: ../src/qtui/coreinfodlg.cpp:91 ../src/qtui/coreinfodlg.cpp:157
+msgctxt "CoreInfoDlg|"
+msgid "Not available"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:99
+msgctxt "CoreInfoDlg|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:173
#, qt-format
msgctxt "CoreInfoDlg|"
msgid "%n Day(s)"
@@ -2689,58 +3599,139 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../src/qtui/coreinfodlg.cpp:58
+#: ../src/qtui/coreinfodlg.cpp:174
#, qt-format
msgctxt "CoreInfoDlg|"
msgid " %1:%2:%3 (since %4)"
msgstr " %1:%2:%3 (Ñ %4)"
-#: ../src/core/corenetwork.cpp:168
+#: ../src/qtui/coreinfodlg.cpp:191
+msgctxt "CoreInfoDlg|"
+msgid "Active sessions unsupported"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:194
+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:238
msgctxt "CoreNetwork|"
msgid "Connection failed. Cycling to next Server"
msgstr "Сбой ÑоединениÑ. ÐÑобÑÑ ÑледÑÑÑий ÑеÑвеÑ"
-#: ../src/core/corenetwork.cpp:176 ../src/core/corenetwork.cpp:177
+#: ../src/core/corenetwork.cpp:249 ../src/core/corenetwork.cpp:250
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connecting to %1:%2..."
-msgstr ""
+msgstr "СоединÑÑÑÑ Ñ %1:%2..."
-#: ../src/core/corenetwork.cpp:234
+#: ../src/core/corenetwork.cpp:316
#, qt-format
msgctxt "CoreNetwork|"
msgid "Disconnecting. (%1)"
msgstr ""
-#: ../src/core/corenetwork.cpp:234
+#: ../src/core/corenetwork.cpp:316
msgctxt "CoreNetwork|"
msgid "Core Shutdown"
msgstr "ЯдÑо завеÑÑÐ°ÐµÑ ÑабоÑÑ"
-#: ../src/core/corenetwork.cpp:442
+#: ../src/core/corenetwork.cpp:539
#, qt-format
msgctxt "CoreNetwork|"
msgid "Could not connect to %1 (%2)"
msgstr "Ðе Ð¼Ð¾Ð³Ñ Ð¿Ð¾Ð´ÑоединиÑÑÑÑ Ðº %1 (%2)"
-#: ../src/core/corenetwork.cpp:444
+#: ../src/core/corenetwork.cpp:541
#, qt-format
msgctxt "CoreNetwork|"
msgid "Connection failure: %1"
msgstr "Сбой ÑоединениÑ: %1"
-#: ../src/core/coresession.cpp:233
+#: ../src/core/corenetwork.cpp:589
+msgctxt "CoreNetwork|"
+msgid "Requesting capability list..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1116
+msgctxt "CoreNetwork|"
+msgid "SASL EXTERNAL authentication not supported"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1127
+msgctxt "CoreNetwork|"
+msgid "SASL PLAIN authentication not supported"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1233
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Could not negotiate some capabilities, retrying individually (%1)..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1248
+msgctxt "CoreNetwork|"
+msgid "No capabilities available"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1255
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Ready to negotiate (found: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1264
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Negotiating capabilities (requesting: %1)..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1279
+msgctxt "CoreNetwork|"
+msgid "SASL authentication currently not supported by server"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1283
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Capability negotiation finished (enabled: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1429
+msgctxt "CoreNetwork|"
+msgid ""
+"Encrypted connection couldn't be verified, disconnecting since verification "
+"is required"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1433 ../src/core/corenetwork.cpp:1446
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid " (Reason: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1442
+msgctxt "CoreNetwork|"
+msgid ""
+"Encrypted connection couldn't be verified, continuing since verification is "
+"not required"
+msgstr ""
+
+#: ../src/core/coresession.cpp:298
msgctxt "CoreSession|"
msgid "Client"
msgstr "ÐлиенÑ"
-#: ../src/core/coresession.cpp:233
+#: ../src/core/coresession.cpp:298
#, qt-format
msgctxt "CoreSession|"
msgid "disconnected (UserId: %1)."
msgstr "оÑÑоединÑн (UserId: %1)."
-#: ../src/core/coresession.cpp:481
+#: ../src/core/coresession.cpp:623
#, qt-format
msgctxt "CoreSession|"
msgid ""
@@ -2748,121 +3739,186 @@ msgid ""
" create network %1!"
msgstr "CoreSession::createNetwork(): ÐолÑÑен невеÑнÑй networkId Ð¾Ñ ÑдÑа, пÑÑаÑÑÑ ÑоздаÑÑ ÑеÑÑ %1!"
-#: ../src/core/coresession.cpp:513
+#: ../src/core/coresession.cpp:655
msgctxt "CoreSession|"
msgid ""
"CoreSession::createNetwork(): Trying to create a network that already "
"exists, updating instead!"
msgstr "CoreSession::createNetwork(): ÐопÑÑалÑÑ ÑоздаÑÑ Ñже ÑÑÑеÑÑвÑÑÑÑÑ ÑеÑÑ, вмеÑÑо ÑÑого обновлÑÑ!"
-#: ../src/core/coresessioneventprocessor.cpp:78
+#: ../src/core/coresessioneventprocessor.cpp:81
msgctxt "CoreSessionEventProcessor|"
msgid ""
"No free and valid nicks in nicklist found. use: /nick to "
"continue"
msgstr "СÑеди ников в ÑпиÑке не найдено Ñвободного и коÑÑекÑного. ÐÑполÑзÑйÑе /nick <дÑÑгой ник> Ð´Ð»Ñ Ð¿ÑодолжениÑ"
-#: ../src/core/coresessioneventprocessor.cpp:450
+#: ../src/core/coresessioneventprocessor.cpp:800
msgctxt "CoreSessionEventProcessor|"
msgid "Unable to perform key exchange, missing qca-ossl plugin."
msgstr ""
-#: ../src/core/coresessioneventprocessor.cpp:461
+#: ../src/core/coresessioneventprocessor.cpp:811
msgctxt "CoreSessionEventProcessor|"
msgid "Unable to parse the DH1080_INIT. Key exchange failed."
msgstr ""
-#: ../src/core/coresessioneventprocessor.cpp:465
-#: ../src/core/coresessioneventprocessor.cpp:473
+#: ../src/core/coresessioneventprocessor.cpp:815
+#: ../src/core/coresessioneventprocessor.cpp:823
msgctxt "CoreSessionEventProcessor|"
msgid "Your key is set and messages will be encrypted."
msgstr ""
-#: ../src/core/coresessioneventprocessor.cpp:475
+#: ../src/core/coresessioneventprocessor.cpp:825
msgctxt "CoreSessionEventProcessor|"
msgid "Failed to parse DH1080_FINISH. Key exchange failed."
msgstr ""
-#: ../src/core/coresessioneventprocessor.cpp:1052
+#: ../src/core/coresessioneventprocessor.cpp:1587
msgctxt "CoreSessionEventProcessor|"
msgid "Reverse DCC SEND not supported"
msgstr ""
-#: ../src/core/coresessioneventprocessor.cpp:1070
+#: ../src/core/coresessioneventprocessor.cpp:1605
#, qt-format
msgctxt "CoreSessionEventProcessor|"
msgid "DCC %1 not supported"
msgstr ""
-#: ../src/core/coretransfer.cpp:58
+#: ../src/qtui/ui/coresessionwidget.ui:29
+msgctxt "CoreSessionWidget|"
+msgid "12.34.56.78"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:37
+msgctxt "CoreSessionWidget|"
+msgid "Client:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:51
+msgctxt "CoreSessionWidget|"
+msgid "Version date:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:65
+msgctxt "CoreSessionWidget|"
+msgid "Location:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:79
+msgctxt "CoreSessionWidget|"
+msgid "Connected since:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:93
+msgctxt "CoreSessionWidget|"
+msgid "Secure:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:124
+msgctxt "CoreSessionWidget|"
+msgid "End Session"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:41
+msgctxt "CoreSessionWidget|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:53
+msgctxt "CoreSessionWidget|"
+msgid "Yes"
+msgstr "Ðа"
+
+#: ../src/qtui/coresessionwidget.cpp:53
+msgctxt "CoreSessionWidget|"
+msgid "No"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:59 ../src/qtui/coresessionwidget.cpp:72
+msgctxt "CoreSessionWidget|"
+msgid "End the client's session, disconnecting it"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:73
+msgctxt "CoreSessionWidget|"
+msgid "This client does not support being remotely disconnected"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:86
+msgctxt "CoreSessionWidget|"
+msgid "Ending session..."
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:64
msgctxt "CoreTransfer|"
msgid "Socket closed while still transferring!"
msgstr ""
-#: ../src/core/coretransfer.cpp:70
+#: ../src/core/coretransfer.cpp:76
#, qt-format
msgctxt "CoreTransfer|"
msgid "DCC connection error: %1"
msgstr ""
-#: ../src/core/coretransfer.cpp:114
+#: ../src/core/coretransfer.cpp:120
msgctxt "CoreTransfer|"
msgid "Reverse DCC not supported yet!"
msgstr ""
-#: ../src/core/coretransfer.cpp:160
+#: ../src/core/coretransfer.cpp:167
msgctxt "CoreTransfer|"
msgid "DCC Receive: Got more data than expected!"
msgstr ""
-#: ../src/core/coretransfer.cpp:176
+#: ../src/core/coretransfer.cpp:183
msgctxt "CoreTransfer|"
msgid "DCC Receive: Quassel Client disconnected during transfer!"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:88
+#: ../src/core/coreuserinputhandler.cpp:104
msgctxt "CoreUserInputHandler|"
msgid "away"
msgstr "оÑÑÑÑÑÑвÑеÑ"
-#: ../src/core/coreuserinputhandler.cpp:169
+#: ../src/core/coreuserinputhandler.cpp:185
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "sending CTCP-%1 request to %2"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:189
-#: ../src/core/coreuserinputhandler.cpp:360
-#: ../src/core/coreuserinputhandler.cpp:622
-#: ../src/core/coreuserinputhandler.cpp:660
+#: ../src/core/coreuserinputhandler.cpp:206
+#: ../src/core/coreuserinputhandler.cpp:377
+#: ../src/core/coreuserinputhandler.cpp:684
+#: ../src/core/coreuserinputhandler.cpp:722
msgctxt "CoreUserInputHandler|"
msgid ""
"Error: QCA provider plugin not found. It is usually provided by the qca-ossl"
" plugin."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:200
+#: ../src/core/coreuserinputhandler.cpp:217
msgctxt "CoreUserInputHandler|"
msgid ""
"[usage] /delkey deletes the encryption key for nick or "
"channel or just /delkey when in a channel or query."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:207
-#: ../src/core/coreuserinputhandler.cpp:678
+#: ../src/core/coreuserinputhandler.cpp:224
+#: ../src/core/coreuserinputhandler.cpp:740
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "No key has been set for %1."
msgstr "Тема Ð´Ð»Ñ ÐºÐ°Ð½Ð°Ð»Ð° %1 не ÑÑÑановлена."
-#: ../src/core/coreuserinputhandler.cpp:212
+#: ../src/core/coreuserinputhandler.cpp:229
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "The key for %1 has been deleted."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:216
-#: ../src/core/coreuserinputhandler.cpp:686
+#: ../src/core/coreuserinputhandler.cpp:233
+#: ../src/core/coreuserinputhandler.cpp:748
msgctxt "CoreUserInputHandler|"
msgid ""
"Error: Setting an encryption key requires Quassel to have been built with "
@@ -2871,31 +3927,31 @@ msgid ""
"with QCA2 present."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:370
+#: ../src/core/coreuserinputhandler.cpp:387
msgctxt "CoreUserInputHandler|"
msgid ""
"[usage] /keyx [] Initiates a DH1080 key exchange with the target."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:377
+#: ../src/core/coreuserinputhandler.cpp:394
msgctxt "CoreUserInputHandler|"
msgid "It is only possible to exchange keys in a query buffer."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:387
+#: ../src/core/coreuserinputhandler.cpp:404
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "Failed to initiate key exchange with %1."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:392
+#: ../src/core/coreuserinputhandler.cpp:409
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "Initiated key exchange with %1."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:396
-#: ../src/core/coreuserinputhandler.cpp:644
+#: ../src/core/coreuserinputhandler.cpp:413
+#: ../src/core/coreuserinputhandler.cpp:706
msgctxt "CoreUserInputHandler|"
msgid ""
"Error: Setting an encryption key requires Quassel to have been built with "
@@ -2904,13 +3960,18 @@ msgid ""
"with QCA present."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:569
+#: ../src/core/coreuserinputhandler.cpp:481
+msgctxt "CoreUserInputHandler|"
+msgid "Your persistent modes have been reset."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:615
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "Starting query with %1"
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:632
+#: ../src/core/coreuserinputhandler.cpp:694
msgctxt "CoreUserInputHandler|"
msgid ""
"[usage] /setkey sets the encryption key for nick or "
@@ -2918,20 +3979,20 @@ msgid ""
"it."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:641
+#: ../src/core/coreuserinputhandler.cpp:703
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "The key for %1 has been set."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:670
+#: ../src/core/coreuserinputhandler.cpp:732
msgctxt "CoreUserInputHandler|"
msgid ""
"[usage] /showkey shows the encryption key for nick or channel"
" or just /showkey when in a channel or query."
msgstr ""
-#: ../src/core/coreuserinputhandler.cpp:682
+#: ../src/core/coreuserinputhandler.cpp:744
#, qt-format
msgctxt "CoreUserInputHandler|"
msgid "The key for %1 is %2:%3"
@@ -2957,17 +4018,119 @@ msgctxt "CreateIdentityDlg|"
msgid "Duplicate:"
msgstr "ÐÑблиÑоваÑÑ:"
-#: ../src/common/protocols/datastream/datastreampeer.cpp:114
+#: ../src/common/protocols/datastream/datastreampeer.cpp:117
msgctxt "DataStreamPeer|"
msgid "Invalid handshake message!"
msgstr ""
-#: ../src/common/protocols/datastream/datastreampeer.cpp:161
+#: ../src/common/protocols/datastream/datastreampeer.cpp:173
#, 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 ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:303
+msgctxt "DccSettingsPage|"
+msgid "Default download folder:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:313
+msgctxt "DccSettingsPage|"
+msgid "..."
+msgstr "..."
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:322
+msgctxt "DccSettingsPage|"
+msgid "Create folder per sender"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:329
+msgctxt "DccSettingsPage|"
+msgid "Prefix filenames with sender"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.cpp:27
+msgctxt "DccSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/settingspages/dccsettingspage.cpp:27
+msgctxt "DccSettingsPage|"
+msgid "DCC"
+msgstr ""
+
#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
msgctxt "DebugBufferViewOverlay|"
msgid "Debug BufferView Overlay"
@@ -3063,229 +4226,240 @@ msgctxt "DockManagerNotificationBackend::ConfigWidget|"
msgid "Mark dockmanager entry"
msgstr ""
-#: ../src/core/eventstringifier.cpp:224 ../src/core/eventstringifier.cpp:370
+#: ../src/core/eventstringifier.cpp:238 ../src/core/eventstringifier.cpp:447
msgctxt "EventStringifier|"
msgid "[Whois] "
msgstr "[Whois] %1"
-#: ../src/core/eventstringifier.cpp:239
+#: ../src/core/eventstringifier.cpp:253
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 invited you to channel %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:341
+#: ../src/core/eventstringifier.cpp:408
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 has changed topic for %2 to: \"%3\""
msgstr "%1 менÑÐµÑ ÑÐµÐ¼Ñ ÐºÐ°Ð½Ð°Ð»Ð° %2 на \"%3\""
-#: ../src/core/eventstringifier.cpp:347
+#: ../src/core/eventstringifier.cpp:419
+msgctxt "EventStringifier|"
+msgid "Error from server: "
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:424
#, qt-format
msgctxt "EventStringifier|"
msgid "[Operwall] %1: %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:355
+#: ../src/core/eventstringifier.cpp:432
msgctxt "EventStringifier|"
msgid ""
"Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
"behavior!"
msgstr "ÐолÑÑен неÑÑандаÑÑнÑй RPL_ISUPPORT: Ð¼Ð¾Ð¶ÐµÑ ÑлÑÑиÑÑÑÑ Ð²ÑÑ ÑÑо Ñгодно!"
-#: ../src/core/eventstringifier.cpp:384
+#: ../src/core/eventstringifier.cpp:471
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 is away: \"%2\""
msgstr ""
-#: ../src/core/eventstringifier.cpp:391
+#: ../src/core/eventstringifier.cpp:478
msgctxt "EventStringifier|"
msgid "You are no longer marked as being away"
msgstr ""
-#: ../src/core/eventstringifier.cpp:399
+#: ../src/core/eventstringifier.cpp:486
msgctxt "EventStringifier|"
msgid "You have been marked as being away"
msgstr ""
-#: ../src/core/eventstringifier.cpp:421
+#: ../src/core/eventstringifier.cpp:508
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is %2 (%3)"
msgstr ""
-#: ../src/core/eventstringifier.cpp:437
+#: ../src/core/eventstringifier.cpp:524
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is online via %2 (%3)"
msgstr "%1 подклÑÑен ÑеÑез %2 (%3)"
-#: ../src/core/eventstringifier.cpp:439
+#: ../src/core/eventstringifier.cpp:526
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whowas] %1 was online via %2 (%3)"
msgstr "[Whowas] %1 бÑл %2 (%3)"
-#: ../src/core/eventstringifier.cpp:449
+#: ../src/core/eventstringifier.cpp:536
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whowas] %1 was %2@%3 (%4)"
msgstr ""
-#: ../src/core/eventstringifier.cpp:458
+#: ../src/core/eventstringifier.cpp:545
#, qt-format
msgctxt "EventStringifier|"
msgid "[Who] End of /WHO list for %1"
msgstr "[Who] ÐÐ¾Ð½ÐµÑ ÑпиÑка /WHO Ð´Ð»Ñ %1"
-#: ../src/core/eventstringifier.cpp:470
+#: ../src/core/eventstringifier.cpp:566
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is logged in since %2"
msgstr "[Whois] %1 в онлайне Ñ %2"
-#: ../src/core/eventstringifier.cpp:474
+#: ../src/core/eventstringifier.cpp:570
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is idling for %2 (since %3)"
msgstr "[Whois] %1 неакÑивен %2 (%3)"
-#: ../src/core/eventstringifier.cpp:484
+#: ../src/core/eventstringifier.cpp:580
msgctxt "EventStringifier|"
msgid "[Whois] End of /WHOIS list"
msgstr "[Who] ÐÐ¾Ð½ÐµÑ ÑпиÑка /WHO Ð´Ð»Ñ %1"
-#: ../src/core/eventstringifier.cpp:507
+#: ../src/core/eventstringifier.cpp:603
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is a user on channels: %2"
msgstr "[Whois] %1 ÑвлÑеÑÑÑ ÑÑаÑÑником каналов: %2"
-#: ../src/core/eventstringifier.cpp:509
+#: ../src/core/eventstringifier.cpp:605
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 has voice on channels: %2"
msgstr "[Whois] %1 ÑвлÑеÑÑÑ ÑÑаÑÑником Ñ Ð³Ð¾Ð»Ð¾Ñом на каналаÑ
: %2"
-#: ../src/core/eventstringifier.cpp:511
+#: ../src/core/eventstringifier.cpp:607
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is an operator on channels: %2"
msgstr "[Whois] %1 ÑвлÑеÑÑÑ Ð¾Ð¿ÐµÑаÑоÑом каналов: %2"
-#: ../src/core/eventstringifier.cpp:532
+#: ../src/core/eventstringifier.cpp:631
#, qt-format
msgctxt "EventStringifier|"
msgid "Channel %1 has %2 users. Topic is: \"%3\""
msgstr "Ðа канале %1 %2 полÑзоваÑелей. Тема: %3"
-#: ../src/core/eventstringifier.cpp:540
+#: ../src/core/eventstringifier.cpp:639
msgctxt "EventStringifier|"
msgid "End of channel list"
msgstr "ÐÐ¾Ð½ÐµÑ ÑпиÑка каналов"
-#: ../src/core/eventstringifier.cpp:558
+#: ../src/core/eventstringifier.cpp:657
#, qt-format
msgctxt "EventStringifier|"
msgid "Homepage for %1 is %2"
msgstr "ÐомаÑнÑÑ ÑÑÑаниÑа Ð´Ð»Ñ %1 %2"
-#: ../src/core/eventstringifier.cpp:575
+#: ../src/core/eventstringifier.cpp:683
#, qt-format
msgctxt "EventStringifier|"
msgid "Channel %1 created on %2"
msgstr "Создан канал %1 на ÑеÑвеÑе %2"
-#: ../src/core/eventstringifier.cpp:589
+#: ../src/core/eventstringifier.cpp:697
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whois] %1 is authed as %2"
msgstr "[Whois] %1 оÑÑÑÑÑÑвÑеÑ: \"%2\""
-#: ../src/core/eventstringifier.cpp:592
+#: ../src/core/eventstringifier.cpp:700
#, qt-format
msgctxt "EventStringifier|"
msgid "[Whowas] %1 was authed as %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:601
+#: ../src/core/eventstringifier.cpp:709
#, qt-format
msgctxt "EventStringifier|"
msgid "No topic is set for %1."
msgstr "Тема Ð´Ð»Ñ ÐºÐ°Ð½Ð°Ð»Ð° %1 не ÑÑÑановлена."
-#: ../src/core/eventstringifier.cpp:609
+#: ../src/core/eventstringifier.cpp:717
#, qt-format
msgctxt "EventStringifier|"
msgid "Topic for %1 is \"%2\""
msgstr ""
-#: ../src/core/eventstringifier.cpp:621
+#: ../src/core/eventstringifier.cpp:738
#, qt-format
msgctxt "EventStringifier|"
msgid "Topic set by %1 on %2"
msgstr "Тема ÑÑÑановлена %1 %2"
-#: ../src/core/eventstringifier.cpp:634
+#: ../src/core/eventstringifier.cpp:751
#, qt-format
msgctxt "EventStringifier|"
msgid "%1 has been invited to %2"
-msgstr ""
+msgstr "%1 пÑиглаÑен(а) в %2"
+
+#: ../src/core/eventstringifier.cpp:759
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Who] %1"
+msgstr "[Who] %1"
-#: ../src/core/eventstringifier.cpp:642
+#: ../src/core/eventstringifier.cpp:769
#, qt-format
msgctxt "EventStringifier|"
-msgid "[Who] %1"
-msgstr "[Who] %1"
+msgid "[WhoX] %1"
+msgstr ""
-#: ../src/core/eventstringifier.cpp:649
+#: ../src/core/eventstringifier.cpp:776
msgctxt "EventStringifier|"
msgid "End of /WHOWAS"
msgstr ""
-#: ../src/core/eventstringifier.cpp:659
+#: ../src/core/eventstringifier.cpp:786
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick %1 contains illegal characters"
msgstr "Ðик %1 ÑодеÑÐ¶Ð¸Ñ Ð½ÐµÐ´Ð¾Ð¿ÑÑÑимÑе ÑимволÑ"
-#: ../src/core/eventstringifier.cpp:669
+#: ../src/core/eventstringifier.cpp:796
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick already in use: %1"
msgstr "Ðик Ñже иÑполÑзÑеÑÑÑ: %1"
-#: ../src/core/eventstringifier.cpp:679
+#: ../src/core/eventstringifier.cpp:806
#, qt-format
msgctxt "EventStringifier|"
msgid "Nick/channel is temporarily unavailable: %1"
msgstr "Ðик/канал вÑеменно недоÑÑÑпен: %1"
-#: ../src/core/eventstringifier.cpp:702
+#: ../src/core/eventstringifier.cpp:830
#, qt-format
msgctxt "EventStringifier|"
msgid "sending CTCP-%1 request to %2"
msgstr ""
-#: ../src/core/eventstringifier.cpp:717
+#: ../src/core/eventstringifier.cpp:846
msgctxt "EventStringifier|"
msgid "unknown"
msgstr ""
-#: ../src/core/eventstringifier.cpp:718
+#: ../src/core/eventstringifier.cpp:847
#, qt-format
msgctxt "EventStringifier|"
msgid "Received %1CTCP-%2 request by %3"
msgstr ""
-#: ../src/core/eventstringifier.cpp:721
+#: ../src/core/eventstringifier.cpp:850
#, qt-format
msgctxt "EventStringifier|"
msgid "Received CTCP-%1 answer from %2: %3"
msgstr ""
-#: ../src/core/eventstringifier.cpp:736
+#: ../src/core/eventstringifier.cpp:865
#, qt-format
msgctxt "EventStringifier|"
msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time"
@@ -3343,26 +4517,25 @@ msgid "Custom Highlights"
msgstr "ÐÑоизволÑнÑе подÑвеÑки"
#: ../src/qtui/settingspages/highlightsettingspage.ui:33
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+msgctxt "HighlightSettingsPage|"
+msgid "Enabled"
+msgstr "ÐклÑÑено"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:38
msgctxt "HighlightSettingsPage|"
msgid "Highlight"
msgstr "ÐодÑвеÑка"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:38
+#: ../src/qtui/settingspages/highlightsettingspage.ui:43
msgctxt "HighlightSettingsPage|"
msgid "RegEx"
msgstr "РегÑкÑп"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:43
+#: ../src/qtui/settingspages/highlightsettingspage.ui:48
msgctxt "HighlightSettingsPage|"
msgid "CS"
msgstr "РегиÑÑÑ"
-#: ../src/qtui/settingspages/highlightsettingspage.ui:48
-msgctxt "HighlightSettingsPage|"
-msgid "Enable"
-msgstr "ÐклÑÑено"
-
#: ../src/qtui/settingspages/highlightsettingspage.ui:53
msgctxt "HighlightSettingsPage|"
msgid "Channel"
@@ -3403,21 +4576,155 @@ msgctxt "HighlightSettingsPage|"
msgid "Case sensitive"
msgstr "УÑиÑÑваÑÑ ÑегиÑÑÑ"
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+#: ../src/qtui/settingspages/highlightsettingspage.ui:156
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:107
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:310
+msgctxt "HighlightSettingsPage|"
+msgid "Local Highlights apply to this device only"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:163
+msgctxt "HighlightSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:33
msgctxt "HighlightSettingsPage|"
msgid "Interface"
msgstr "ÐнÑеÑÑейÑ"
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:192
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:36
+msgctxt "HighlightSettingsPage|"
+msgid "Legacy Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:36
+msgctxt "HighlightSettingsPage|"
+msgid "Local Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:45
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:170
+msgctxt "HighlightSettingsPage|"
+msgid "Enable/disable this rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:50
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:171
+msgctxt "HighlightSettingsPage|"
+msgid "Phrase to match"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:55
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:173
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"RegEx: This option determines if the highlight rule and "
+"Channel should be interpreted as regular expressions or just "
+"as keywords."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:61
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:176
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"CS: This option determines if the highlight rule and Channel "
+"should be interpreted case sensitive."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:67
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:179
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"Channel: Semicolon separated list of channel/query names, leave "
+"blank to match any name.
Example:
#quassel*; #foobar; "
+"!#quasseldroid
would match on #foobar and any channel "
+"starting with #quassel except for #quasseldroid
If "
+"only inverted names are specified, it will match anything except for what's "
+"specified (implicit wildcard).
Example:
!#quassel*; "
+"!#foobar
would match anything except for #foobar or any "
+"channel starting with #quassel
"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:104
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:299
+msgctxt "HighlightSettingsPage|"
+msgid "Legacy Highlights are replaced by Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:269
msgctxt "HighlightSettingsPage|"
msgid "this shouldn't be empty"
msgstr "ÑÑо не должно бÑÑÑ Ð¿ÑÑÑо"
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:297
+msgctxt "HighlightSettingsPage|"
+msgid "Legacy Highlights vs. Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:300
+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:302
+#, qt-format
+msgctxt "HighlightSettingsPage|"
+msgid "Configure the new style of highlights in %1."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:303
+msgctxt "HighlightSettingsPage|"
+msgid "Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:308
+msgctxt "HighlightSettingsPage|"
+msgid "Local Highlights vs. Remote Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:311
+msgctxt "HighlightSettingsPage|"
+msgid "Highlights configured on this page only apply to your current device."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:313
+#, qt-format
+msgctxt "HighlightSettingsPage|"
+msgid "Configure highlights for all of your devices in %1."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:314
+msgctxt "HighlightSettingsPage|"
+msgid "Remote Highlights"
+msgstr ""
+
#: ../src/qtui/settingspages/highlightsettingspage.h:46
msgctxt "HighlightSettingsPage|"
msgid "highlight rule"
msgstr "пÑавило подÑвеÑки"
+#: ../src/core/identserver.cpp:42
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd clients on IPv6 %1 port %2"
+msgstr ""
+
+#: ../src/core/identserver.cpp:52
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd clients on IPv4 %1 port %2"
+msgstr ""
+
+#: ../src/core/identserver.cpp:61
+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.cpp:370
msgctxt "IdentitiesSettingsPage|"
@@ -3541,8 +4848,8 @@ msgstr "ÐеÑÑкий Ñад в дÑÑгом меÑÑе!"
#: ../src/common/identity.cpp:194 ../src/common/identity.cpp:195
msgctxt "Identity|"
-msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
-msgstr "http://quassel-irc.org - РазговаÑиваÑÑ Ñдобно. Ðезде."
+msgid "https://quassel-irc.org - Chat comfortably. Anywhere."
+msgstr ""
#: ../src/qtui/settingspages/identityeditwidget.ui:30
msgctxt "IdentityEditWidget|"
@@ -3592,7 +4899,7 @@ msgstr "ÐеÑеименоваÑÑ Ð»Ð¸ÑноÑÑÑ"
#: ../src/qtui/settingspages/identityeditwidget.ui:139
msgctxt "IdentityEditWidget|"
msgid "Re&name..."
-msgstr ""
+msgstr "ÐеÑе&именоваÑÑ..."
#: ../src/qtui/settingspages/identityeditwidget.ui:165
msgctxt "IdentityEditWidget|"
@@ -3613,7 +4920,7 @@ msgstr "ÐеÑедвинÑÑÑ Ð²Ð½Ð¸Ð· в ÑпиÑке"
#: ../src/qtui/settingspages/identityeditwidget.ui:227
msgctxt "IdentityEditWidget|"
msgid "A&way"
-msgstr ""
+msgstr "&ÐÑÑÑÑÑÑвÑÑ"
#: ../src/qtui/settingspages/identityeditwidget.ui:233
msgctxt "IdentityEditWidget|"
@@ -3673,7 +4980,7 @@ msgid "minutes of being idle"
msgstr "минÑÑ Ð½ÐµÐ°ÐºÑивноÑÑи"
#: ../src/qtui/settingspages/identityeditwidget.ui:399
-#: ../src/qtui/settingspages/identityeditwidget.cpp:244
+#: ../src/qtui/settingspages/identityeditwidget.cpp:290
msgctxt "IdentityEditWidget|"
msgid "Advanced"
msgstr "ÐополниÑелÑно"
@@ -3739,16 +5046,15 @@ msgid "Key Type:"
msgstr "Тип клÑÑа:"
#: ../src/qtui/settingspages/identityeditwidget.ui:605
-#: ../src/qtui/settingspages/identityeditwidget.cpp:364
-#: ../src/qtui/settingspages/identityeditwidget.cpp:376
+#: ../src/qtui/settingspages/identityeditwidget.cpp:425
msgctxt "IdentityEditWidget|"
msgid "No Key loaded"
msgstr "ÐлÑÑ Ð½Ðµ загÑÑжен"
#: ../src/qtui/settingspages/identityeditwidget.ui:625
#: ../src/qtui/settingspages/identityeditwidget.ui:723
-#: ../src/qtui/settingspages/identityeditwidget.cpp:365
-#: ../src/qtui/settingspages/identityeditwidget.cpp:423
+#: ../src/qtui/settingspages/identityeditwidget.cpp:426
+#: ../src/qtui/settingspages/identityeditwidget.cpp:489
msgctxt "IdentityEditWidget|"
msgid "Load"
msgstr "ÐагÑÑзиÑÑ"
@@ -3765,8 +5071,8 @@ msgstr "ÐÑганизаÑиÑ:"
#: ../src/qtui/settingspages/identityeditwidget.ui:663
#: ../src/qtui/settingspages/identityeditwidget.ui:697
-#: ../src/qtui/settingspages/identityeditwidget.cpp:421
-#: ../src/qtui/settingspages/identityeditwidget.cpp:422
+#: ../src/qtui/settingspages/identityeditwidget.cpp:487
+#: ../src/qtui/settingspages/identityeditwidget.cpp:488
msgctxt "IdentityEditWidget|"
msgid "No Certificate loaded"
msgstr "СеÑÑиÑÐ¸ÐºÐ°Ñ Ð½Ðµ загÑÑжен"
@@ -3776,40 +5082,117 @@ msgctxt "IdentityEditWidget|"
msgid "CommonName:"
msgstr "ÐбÑееÐмÑ:"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:327
+#: ../src/qtui/settingspages/identityeditwidget.cpp:107
+msgctxt "IdentityEditWidget|"
+msgid ""
+"You can add date/time to this message using the syntax:
%%<format>%%, where <format> is:"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:112
+msgctxt "IdentityEditWidget|"
+msgid "the hour"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:113
+msgctxt "IdentityEditWidget|"
+msgid "the minutes"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:114
+msgctxt "IdentityEditWidget|"
+msgid "seconds"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:115
+msgctxt "IdentityEditWidget|"
+msgid "AM/PM"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:116
+msgctxt "IdentityEditWidget|"
+msgid "day"
+msgstr "денÑ"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:117
+msgctxt "IdentityEditWidget|"
+msgid "month"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:121
+msgctxt "IdentityEditWidget|"
+msgid "current timezone"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:124
+msgctxt "IdentityEditWidget|"
+msgid "Example: Away since %%hh:mm%% on %%dd.MM%%."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:125
+msgctxt "IdentityEditWidget|"
+msgid ""
+"%%%% without anything inside represents %%. Other format codes are "
+"available."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:373
msgctxt "IdentityEditWidget|"
msgid "Load a Key"
msgstr "ÐагÑÑзиÑÑ ÐºÐ»ÑÑ"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:355
+#: ../src/qtui/settingspages/identityeditwidget.cpp:410
msgctxt "IdentityEditWidget|"
msgid "Failed to read key"
msgstr ""
-#: ../src/qtui/settingspages/identityeditwidget.cpp:355
+#: ../src/qtui/settingspages/identityeditwidget.cpp:410
msgctxt "IdentityEditWidget|"
msgid ""
"Failed to read the key file. It is either incompatible or invalid. Note that"
" the key file must not have a passphrase."
msgstr ""
-#: ../src/qtui/settingspages/identityeditwidget.cpp:370
+#: ../src/qtui/settingspages/identityeditwidget.cpp:414
+msgctxt "IdentityEditWidget|"
+msgid "Core does not support ECDSA keys"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:414
+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:431
msgctxt "IdentityEditWidget|"
msgid "RSA"
msgstr "RSA"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:373
+#: ../src/qtui/settingspages/identityeditwidget.cpp:435
+msgctxt "IdentityEditWidget|"
+msgid "ECDSA"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:439
msgctxt "IdentityEditWidget|"
msgid "DSA"
msgstr "DSA"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:378
-#: ../src/qtui/settingspages/identityeditwidget.cpp:433
+#: ../src/qtui/settingspages/identityeditwidget.cpp:442
+msgctxt "IdentityEditWidget|"
+msgid "Invalid key or no key loaded"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:444
+#: ../src/qtui/settingspages/identityeditwidget.cpp:499
msgctxt "IdentityEditWidget|"
msgid "Clear"
msgstr "ÐÑиÑÑиÑÑ"
-#: ../src/qtui/settingspages/identityeditwidget.cpp:390
+#: ../src/qtui/settingspages/identityeditwidget.cpp:456
msgctxt "IdentityEditWidget|"
msgid "Load a Certificate"
msgstr "ÐагÑÑзиÑÑ ÑеÑÑиÑикаÑ"
@@ -3963,12 +5346,19 @@ msgid ""
"A scope rule is a semicolon separated list of either network or channel names.
\n"
"Example:\n"
"
\n"
-"#quassel*; #foobar\n"
+"#quassel*; #foobar; !#quasseldroid\n"
"
\n"
-"would match on #foobar and on any channel starting with #quassel
"
+"would match on #foobar and any channel starting with #quassel except for #quasseldroid\n"
+"
\n"
+"If only inverted names are specified, it will match anything except for what's specified (implicit wildcard).
\n"
+"Example:\n"
+"
\n"
+"!#quassel*; !#foobar\n"
+"
\n"
+"would match anything except for #foobar or any channel starting with #quassel
"
msgstr ""
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:221
msgctxt "IgnoreListEditDlg|"
msgid ""
"Enable / Disable:
\n"
@@ -3977,7 +5367,7 @@ msgid ""
"For dynamic rules, disabling actually shows the filtered messages again.
"
msgstr ""
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:227
msgctxt "IgnoreListEditDlg|"
msgid "Rule is enabled"
msgstr "ÐÑавило вклÑÑено"
@@ -4012,17 +5402,17 @@ msgctxt "IgnoreListModel|"
msgid "By Message"
msgstr "СообÑение"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:208
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:211
msgctxt "IgnoreListModel|"
msgid "Enabled"
msgstr "ÐклÑÑено"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:209
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:212
msgctxt "IgnoreListModel|"
msgid "Type"
msgstr "Ðид"
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:210
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:213
msgctxt "IgnoreListModel|"
msgid "Ignore Rule"
msgstr "ÐобавиÑÑ Ð¿Ñавило игноÑиÑованиÑ"
@@ -4047,22 +5437,22 @@ msgctxt "IgnoreListSettingsPage|"
msgid "&Edit"
msgstr "&ÐÑавиÑÑ..."
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:37
msgctxt "IgnoreListSettingsPage|"
msgid "IRC"
msgstr "IRC"
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:37
msgctxt "IgnoreListSettingsPage|"
msgid "Ignore List"
msgstr "СпиÑок ÐгноÑиÑованиÑ"
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:147
msgctxt "IgnoreListSettingsPage|"
msgid "Rule already exists"
msgstr "ÐÑавило Ñже ÑÑÑеÑÑвÑеÑ"
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:148
#, qt-format
msgctxt "IgnoreListSettingsPage|"
msgid ""
@@ -4093,96 +5483,141 @@ msgctxt "InputWidget|"
msgid "Form"
msgstr "ФоÑма"
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/ui/inputwidget.ui:59
+msgctxt "InputWidget|"
+msgid "View and change nick"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:139
+msgctxt "InputWidget|"
+msgid "Bold"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:179
+msgctxt "InputWidget|"
+msgid "Italic"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:222
+msgctxt "InputWidget|"
+msgid "Underline"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:262
+msgctxt "InputWidget|"
+msgid "Set foreground color"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:293
+msgctxt "InputWidget|"
+msgid "Set background color"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:327
+msgctxt "InputWidget|"
+msgid "Clear formatting"
+msgstr ""
+
+#: ../src/qtui/inputwidget.cpp:77
msgctxt "InputWidget|"
msgid "White"
msgstr "ÐелÑй"
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
msgctxt "InputWidget|"
msgid "Black"
msgstr "ЧеÑнÑй"
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
msgctxt "InputWidget|"
msgid "Dark blue"
msgstr "Темно-Ñиний"
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
msgctxt "InputWidget|"
msgid "Dark green"
msgstr "Темно-зеленÑй"
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
msgctxt "InputWidget|"
msgid "Red"
msgstr "ÐÑаÑнÑй"
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
msgctxt "InputWidget|"
msgid "Dark red"
msgstr "Темно-кÑаÑнÑй"
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
msgctxt "InputWidget|"
msgid "Dark magenta"
msgstr "ФиолеÑовÑй"
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
msgctxt "InputWidget|"
msgid "Orange"
msgstr "ÐÑанжевÑй"
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
msgctxt "InputWidget|"
msgid "Yellow"
msgstr "ÐÑлÑÑй"
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
msgctxt "InputWidget|"
msgid "Green"
msgstr "ÐелÑнÑй"
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
msgctxt "InputWidget|"
msgid "Dark cyan"
msgstr "Сине-зеленÑй"
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
msgctxt "InputWidget|"
msgid "Cyan"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
msgctxt "InputWidget|"
msgid "Blue"
msgstr ""
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
msgctxt "InputWidget|"
msgid "Magenta"
msgstr "ФиолеÑовÑй"
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
msgctxt "InputWidget|"
msgid "Dark gray"
msgstr "Темно-зеленÑй"
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
msgctxt "InputWidget|"
msgid "Light gray"
msgstr "СвеÑло-ÑеÑÑй"
-#: ../src/qtui/inputwidget.cpp:86 ../src/qtui/inputwidget.cpp:87
+#: ../src/qtui/inputwidget.cpp:88 ../src/qtui/inputwidget.cpp:89
msgctxt "InputWidget|"
msgid "Clear Color"
msgstr "ÐÑиÑÑиÑÑ ÑвеÑ"
-#: ../src/qtui/inputwidget.cpp:137
+#: ../src/qtui/inputwidget.cpp:149
msgctxt "InputWidget|"
msgid "Focus Input Line"
msgstr "ÐкÑивиÑоваÑÑ ÑÑÑÐ¾ÐºÑ Ð²Ð²Ð¾Ð´Ð°"
+#: ../src/qtui/inputwidget.cpp:636
+msgctxt "InputWidget|"
+msgid "Hide formatting options"
+msgstr ""
+
+#: ../src/qtui/inputwidget.cpp:639
+msgctxt "InputWidget|"
+msgid "Show formatting options"
+msgstr ""
+
#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
msgctxt "InputWidgetSettingsPage|"
msgid "Form"
@@ -4195,80 +5630,75 @@ msgstr "ÐолÑзоваÑелÑÑкий ÑÑиÑÑ Ð¾ÐºÐ½Ð° ÑаÑа:"
#: ../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 "ÐклÑÑиÑÑ Ð¸ÑÑоÑÐ¸Ñ ÑаÑа"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:66
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 "ÐоказаÑÑ ÑÑÐ¸Ð»Ñ ÐºÐ½Ð¾Ð¿Ð¾Ðº"
-#: ../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:114
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:101
msgctxt "InputWidgetSettingsPage|"
msgid "Emacs key bindings"
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
msgctxt "InputWidgetSettingsPage|"
msgid "Enables line wrapping for input."
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:117
msgctxt "InputWidgetSettingsPage|"
msgid "Line wrapping"
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:143
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
msgctxt "InputWidgetSettingsPage|"
-msgid "Multi-Line Editing"
+msgid "&Multi-Line Editing"
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:160
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:147
msgctxt "InputWidgetSettingsPage|"
msgid "Show at most"
msgstr "ÐоказÑваÑÑ Ð½Ðµ более"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:186
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:173
msgctxt "InputWidgetSettingsPage|"
msgid "lines"
msgstr "ÑÑÑок"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:208
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
msgctxt "InputWidgetSettingsPage|"
msgid "Enable scrollbars"
msgstr "ÐклÑÑиÑÑ Ð¿ÑокÑÑÑкÑ"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:227
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:214
msgctxt "InputWidgetSettingsPage|"
msgid "Tab Completion"
msgstr "СкопиÑоваÑÑ Ð²Ñделение"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:222
msgctxt "InputWidgetSettingsPage|"
msgid "Completion suffix:"
msgstr "СÑÑÑÐ¸ÐºÑ Ð°Ð²ÑодополнениÑ:"
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:251
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:238
msgctxt "InputWidgetSettingsPage|"
msgid ": "
msgstr ""
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:278
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:265
msgctxt "InputWidgetSettingsPage|"
msgid "Add space after nick when completing mid-sentence"
msgstr ""
@@ -4283,7 +5713,7 @@ msgctxt "InputWidgetSettingsPage|"
msgid "Input Widget"
msgstr "СÑÑокаввода"
-#: ../src/common/internalpeer.cpp:58
+#: ../src/common/internalpeer.cpp:52 ../src/common/internalpeer.cpp:58
msgctxt "InternalPeer|"
msgid "internal connection"
msgstr ""
@@ -4308,28 +5738,95 @@ msgctxt "IrcListModel|"
msgid "Topic"
msgstr "Тема"
-#: ../src/client/networkmodel.cpp:953
+#: ../src/core/ircparser.cpp:369
+msgctxt "IrcParser|"
+msgid "Capability negotiation not supported"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1187
msgctxt "IrcUserItem|"
-msgid " is away"
-msgstr "%1 оÑÑÑÑÑÑвÑеÑ: \"%2\""
+msgid "Modes"
+msgstr ""
-#: ../src/client/networkmodel.cpp:968
-#, qt-format
+#: ../src/client/networkmodel.cpp:1191
msgctxt "IrcUserItem|"
-msgid "idling since %1"
-msgstr "неакÑивен Ñ %1"
+msgid "Unknown"
+msgstr ""
-#: ../src/client/networkmodel.cpp:971
-#, qt-format
+#: ../src/client/networkmodel.cpp:1197
msgctxt "IrcUserItem|"
-msgid "login time: %1"
-msgstr "вÑÐµÐ¼Ñ Ð²Ñ
ода: %1"
+msgid "Away message"
+msgstr ""
-#: ../src/client/networkmodel.cpp:974
-#, qt-format
+#: ../src/client/networkmodel.cpp:1199
+msgctxt "IrcUserItem|"
+msgid "Realname"
+msgstr "РеалÑное имÑ"
+
+#: ../src/client/networkmodel.cpp:1206
+msgctxt "IrcUserItem|"
+msgid "Help status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1207
+msgctxt "IrcUserItem|"
+msgid "Available for help"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1210
+msgctxt "IrcUserItem|"
+msgid "Service status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1220
+msgctxt "IrcUserItem|"
+msgid "Not logged in"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1226 ../src/client/networkmodel.cpp:1235
+msgctxt "IrcUserItem|"
+msgid "Account"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1236
+msgctxt "IrcUserItem|"
+msgid "Identified for this nick"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1242
+msgctxt "IrcUserItem|"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1246
+msgctxt "IrcUserItem|"
+msgid "Hostmask"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1250
msgctxt "IrcUserItem|"
-msgid "server: %1"
-msgstr "ÑеÑвеÑ: %1"
+msgid "Operator"
+msgstr "ÐпеÑаÑоÑ"
+
+#: ../src/client/networkmodel.cpp:1258
+msgctxt "IrcUserItem|"
+msgid "Idling since"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1262
+msgctxt "IrcUserItem|"
+msgid "Login time"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1265
+msgctxt "IrcUserItem|"
+msgid "Server"
+msgstr "СеÑвеÑ"
+
+#: ../src/client/networkmodel.cpp:1270
+msgctxt "IrcUserItem|"
+msgid "No information available"
+msgstr ""
#: ../src/qtui/settingspages/itemviewsettingspage.ui:14
msgctxt "ItemViewSettingsPage|"
@@ -4366,53 +5863,53 @@ msgctxt "ItemViewSettingsPage|"
msgid "Use Custom Colors"
msgstr "ÐÑполÑзоваÑÑ ÐолÑзоваÑелÑÑкие ЦвеÑа"
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:121
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 "..."
msgstr ""
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:142
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:145
msgctxt "ItemViewSettingsPage|"
msgid "Inactive:"
msgstr "ÐеакÑивно:"
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:169
msgctxt "ItemViewSettingsPage|"
msgid "Unread messages:"
msgstr "СобÑÑвеннÑе ÑообÑениÑ:"
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:193
msgctxt "ItemViewSettingsPage|"
msgid "Highlight:"
msgstr "ÐодÑвеÑка:"
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:217
msgctxt "ItemViewSettingsPage|"
msgid "Other activity:"
msgstr "ÐÑÑÐ³Ð°Ñ Ð°ÐºÑивноÑÑÑ:"
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:318
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 "Ðнлайн:"
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:373
msgctxt "ItemViewSettingsPage|"
msgid "Away:"
msgstr "ÐÑÑÑÑÑÑвÑеÑ:"
@@ -4457,7 +5954,7 @@ msgctxt "ItemViewSettingsPage|"
msgid "Other activity"
msgstr "ÐÑÑÐ³Ð°Ñ Ð°ÐºÑивноÑÑÑ"
-#: ../src/qtui/knotificationbackend.cpp:139
+#: ../src/qtui/knotificationbackend.cpp:137
#, qt-format
msgctxt "KNotificationBackend|"
msgid "%n pending highlight(s)"
@@ -4546,412 +6043,572 @@ msgctxt "KeySequenceWidget|"
msgid "Reassign"
msgstr ""
-#: ../src/common/protocols/legacy/legacypeer.cpp:136
+#: ../src/core/ldapauthenticator.cpp:77
+msgctxt "LdapAuthenticator|"
+msgid "LDAP"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:83
+msgctxt "LdapAuthenticator|"
+msgid "Authenticate users using an LDAP server."
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:91
+msgctxt "LdapAuthenticator|"
+msgid "Hostname"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:92
+msgctxt "LdapAuthenticator|"
+msgid "Port"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:93
+msgctxt "LdapAuthenticator|"
+msgid "Bind DN"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:94
+msgctxt "LdapAuthenticator|"
+msgid "Bind Password"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:95
+msgctxt "LdapAuthenticator|"
+msgid "Base DN"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:96
+msgctxt "LdapAuthenticator|"
+msgid "Filter"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:97
+msgctxt "LdapAuthenticator|"
+msgid "UID Attribute"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:146
msgctxt "LegacyPeer|"
msgid "Invalid handshake message!"
msgstr ""
-#: ../src/common/protocols/legacy/legacypeer.cpp:207
+#: ../src/common/protocols/legacy/legacypeer.cpp:224
#, qt-format
msgctxt "LegacyPeer|"
msgid "Unknown protocol message of type %1"
msgstr ""
-#: ../src/qtui/mainwin.cpp:358
+#: ../src/common/logger.cpp:97
+#, qt-format
+msgctxt "Logger|"
+msgid "Invalid log level %1; supported are Debug|Info|Warning|Error"
+msgstr ""
+
+#: ../src/common/logger.cpp:106
+#, qt-format
+msgctxt "Logger|"
+msgid "Could not open log file \"%1\": %2"
+msgstr ""
+
+#: ../src/common/logger.cpp:111
+#, qt-format
+msgctxt "Logger|"
+msgid "Cannot write to stderr: %1"
+msgstr ""
+
+#: ../src/qtui/mainpage.cpp:42
+msgctxt "MainPage|"
+msgid "Connect to Core..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:401
msgctxt "MainWin|"
msgid "General"
msgstr "ÐбÑие"
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:403
msgctxt "MainWin|"
msgid "&Connect to Core..."
msgstr "&ÐодклÑÑиÑÑÑÑ Ðº ÑдÑÑ..."
-#: ../src/qtui/mainwin.cpp:362
+#: ../src/qtui/mainwin.cpp:405
msgctxt "MainWin|"
msgid "&Disconnect from Core"
msgstr "&ÐÑклÑÑиÑÑÑÑ Ð¾Ñ ÑдÑа"
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:407
msgctxt "MainWin|"
msgid "Change &Password..."
msgstr ""
-#: ../src/qtui/mainwin.cpp:366
+#: ../src/qtui/mainwin.cpp:409
msgctxt "MainWin|"
msgid "Core &Info..."
msgstr "&ÐнÑÑомаÑÐ¸Ñ ÑдÑа..."
-#: ../src/qtui/mainwin.cpp:368
+#: ../src/qtui/mainwin.cpp:411
msgctxt "MainWin|"
msgid "Configure &Networks..."
msgstr "ÐаÑÑÑоиÑÑ &ÑеÑи..."
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:418
msgctxt "MainWin|"
msgid "&Quit"
msgstr "Ð&ÑÑ
од"
-#: ../src/qtui/mainwin.cpp:375
+#: ../src/qtui/mainwin.cpp:422
msgctxt "MainWin|"
msgid "&Configure Chat Lists..."
msgstr "&ÐаÑÑÑойка СпиÑка ЧаÑа"
-#: ../src/qtui/mainwin.cpp:378
+#: ../src/qtui/mainwin.cpp:425
msgctxt "MainWin|"
msgid "&Lock Layout"
msgstr "&ÐлокиÑоваÑÑ ÑаÑположение"
-#: ../src/qtui/mainwin.cpp:382
+#: ../src/qtui/mainwin.cpp:429
msgctxt "MainWin|"
msgid "Show &Search Bar"
msgstr "ÐоказаÑÑ ÑÑÑÐ¾ÐºÑ &поиÑка"
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:431
msgctxt "MainWin|"
msgid "Show Away Log"
msgstr "ÐоказаÑÑ Ð¶ÑÑнал оÑÑÑÑÑÑвиÑ"
-#: ../src/qtui/mainwin.cpp:386
+#: ../src/qtui/mainwin.cpp:433
msgctxt "MainWin|"
msgid "Show &Menubar"
msgstr "ÐоказаÑÑ ÑÑÑÐ¾ÐºÑ &поиÑка"
-#: ../src/qtui/mainwin.cpp:389
+#: ../src/qtui/mainwin.cpp:436
msgctxt "MainWin|"
msgid "Show Status &Bar"
msgstr "ÐоказаÑÑ ÑÑÑÐ¾ÐºÑ &ÑÑаÑÑÑа"
-#: ../src/qtui/mainwin.cpp:395
+#: ../src/qtui/mainwin.cpp:442
msgctxt "MainWin|"
msgid "&Full Screen Mode"
msgstr ""
-#: ../src/qtui/mainwin.cpp:402
+#: ../src/qtui/mainwin.cpp:449
msgctxt "MainWin|"
msgid "Configure &Shortcuts..."
msgstr "ÐаÑÑÑоиÑÑ &ÑеÑи..."
-#: ../src/qtui/mainwin.cpp:408 ../src/qtui/mainwin.cpp:412
+#: ../src/qtui/mainwin.cpp:455 ../src/qtui/mainwin.cpp:459
msgctxt "MainWin|"
msgid "&Configure Quassel..."
msgstr "&ÐаÑÑÑойки Quassel..."
-#: ../src/qtui/mainwin.cpp:418
+#: ../src/qtui/mainwin.cpp:465
msgctxt "MainWin|"
msgid "&About Quassel"
msgstr "&Ð Quassel"
-#: ../src/qtui/mainwin.cpp:423
+#: ../src/qtui/mainwin.cpp:470
msgctxt "MainWin|"
msgid "About &Qt"
msgstr "Ð &Qt"
-#: ../src/qtui/mainwin.cpp:427
+#: ../src/qtui/mainwin.cpp:474
msgctxt "MainWin|"
msgid "Debug &NetworkModel"
msgstr "ÐÑладиÑÑ &NetworkModel"
-#: ../src/qtui/mainwin.cpp:429
+#: ../src/qtui/mainwin.cpp:476
msgctxt "MainWin|"
msgid "Debug &BufferViewOverlay"
msgstr ""
-#: ../src/qtui/mainwin.cpp:431
+#: ../src/qtui/mainwin.cpp:478
msgctxt "MainWin|"
msgid "Debug &MessageModel"
msgstr "ÐÑладиÑÑ &MessageModel"
-#: ../src/qtui/mainwin.cpp:433
+#: ../src/qtui/mainwin.cpp:480
msgctxt "MainWin|"
msgid "Debug &HotList"
msgstr "&ÐÑÑнал оÑладки"
-#: ../src/qtui/mainwin.cpp:435
+#: ../src/qtui/mainwin.cpp:482
msgctxt "MainWin|"
msgid "Debug &Log"
msgstr "&ÐÑÑнал оÑладки"
-#: ../src/qtui/mainwin.cpp:437
+#: ../src/qtui/mainwin.cpp:484
msgctxt "MainWin|"
msgid "Reload Stylesheet"
msgstr "ÐÑполÑзоваÑÑ ÑÐ²Ð¾Ñ ÑаблиÑÑ ÑÑилей"
-#: ../src/qtui/mainwin.cpp:440
+#: ../src/qtui/mainwin.cpp:487
msgctxt "MainWin|"
msgid "Hide Current Buffer"
msgstr ""
-#: ../src/qtui/mainwin.cpp:444
+#: ../src/qtui/mainwin.cpp:491
+msgctxt "MainWin|"
+msgid "Text formatting"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:494
+msgctxt "MainWin|"
+msgid "Apply foreground color"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:499
+msgctxt "MainWin|"
+msgid "Apply background color"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:504
+msgctxt "MainWin|"
+msgid "Clear formatting"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:509
+msgctxt "MainWin|"
+msgid "Toggle bold"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:514
+msgctxt "MainWin|"
+msgid "Toggle italics"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:519
+msgctxt "MainWin|"
+msgid "Toggle underline"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:523
msgctxt "MainWin|"
msgid "Navigation"
msgstr "ÐÑганизаÑиÑ:"
-#: ../src/qtui/mainwin.cpp:446
+#: ../src/qtui/mainwin.cpp:525
msgctxt "MainWin|"
msgid "Jump to hot chat"
msgstr ""
-#: ../src/qtui/mainwin.cpp:458
+#: ../src/qtui/mainwin.cpp:528
+msgctxt "MainWin|"
+msgid "Activate the buffer search"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:540
msgctxt "MainWin|"
msgid "Set Quick Access #0"
msgstr ""
-#: ../src/qtui/mainwin.cpp:460
+#: ../src/qtui/mainwin.cpp:542
msgctxt "MainWin|"
msgid "Set Quick Access #1"
msgstr ""
-#: ../src/qtui/mainwin.cpp:462
+#: ../src/qtui/mainwin.cpp:544
msgctxt "MainWin|"
msgid "Set Quick Access #2"
msgstr ""
-#: ../src/qtui/mainwin.cpp:464
+#: ../src/qtui/mainwin.cpp:546
msgctxt "MainWin|"
msgid "Set Quick Access #3"
msgstr ""
-#: ../src/qtui/mainwin.cpp:466
+#: ../src/qtui/mainwin.cpp:548
msgctxt "MainWin|"
msgid "Set Quick Access #4"
msgstr ""
-#: ../src/qtui/mainwin.cpp:468
+#: ../src/qtui/mainwin.cpp:550
msgctxt "MainWin|"
msgid "Set Quick Access #5"
msgstr ""
-#: ../src/qtui/mainwin.cpp:470
+#: ../src/qtui/mainwin.cpp:552
msgctxt "MainWin|"
msgid "Set Quick Access #6"
msgstr ""
-#: ../src/qtui/mainwin.cpp:472
+#: ../src/qtui/mainwin.cpp:554
msgctxt "MainWin|"
msgid "Set Quick Access #7"
msgstr ""
-#: ../src/qtui/mainwin.cpp:474
+#: ../src/qtui/mainwin.cpp:556
msgctxt "MainWin|"
msgid "Set Quick Access #8"
msgstr ""
-#: ../src/qtui/mainwin.cpp:476
+#: ../src/qtui/mainwin.cpp:558
msgctxt "MainWin|"
msgid "Set Quick Access #9"
msgstr ""
-#: ../src/qtui/mainwin.cpp:479
+#: ../src/qtui/mainwin.cpp:561
msgctxt "MainWin|"
msgid "Quick Access #0"
msgstr ""
-#: ../src/qtui/mainwin.cpp:481
+#: ../src/qtui/mainwin.cpp:563
msgctxt "MainWin|"
msgid "Quick Access #1"
msgstr ""
-#: ../src/qtui/mainwin.cpp:483
+#: ../src/qtui/mainwin.cpp:565
msgctxt "MainWin|"
msgid "Quick Access #2"
msgstr ""
-#: ../src/qtui/mainwin.cpp:485
+#: ../src/qtui/mainwin.cpp:567
msgctxt "MainWin|"
msgid "Quick Access #3"
msgstr ""
-#: ../src/qtui/mainwin.cpp:487
+#: ../src/qtui/mainwin.cpp:569
msgctxt "MainWin|"
msgid "Quick Access #4"
msgstr ""
-#: ../src/qtui/mainwin.cpp:489
+#: ../src/qtui/mainwin.cpp:571
msgctxt "MainWin|"
msgid "Quick Access #5"
msgstr ""
-#: ../src/qtui/mainwin.cpp:491
+#: ../src/qtui/mainwin.cpp:573
msgctxt "MainWin|"
msgid "Quick Access #6"
msgstr ""
-#: ../src/qtui/mainwin.cpp:493
+#: ../src/qtui/mainwin.cpp:575
msgctxt "MainWin|"
msgid "Quick Access #7"
msgstr ""
-#: ../src/qtui/mainwin.cpp:495
+#: ../src/qtui/mainwin.cpp:577
msgctxt "MainWin|"
msgid "Quick Access #8"
msgstr ""
-#: ../src/qtui/mainwin.cpp:497
+#: ../src/qtui/mainwin.cpp:579
msgctxt "MainWin|"
msgid "Quick Access #9"
msgstr ""
-#: ../src/qtui/mainwin.cpp:501
+#: ../src/qtui/mainwin.cpp:583
msgctxt "MainWin|"
msgid "Activate Next Chat List"
msgstr "УдалиÑÑ Ð§Ð°ÑлиÑÑ?"
-#: ../src/qtui/mainwin.cpp:503
+#: ../src/qtui/mainwin.cpp:585
msgctxt "MainWin|"
msgid "Activate Previous Chat List"
msgstr ""
-#: ../src/qtui/mainwin.cpp:505
+#: ../src/qtui/mainwin.cpp:587
msgctxt "MainWin|"
msgid "Go to Next Chat"
msgstr "ÐойÑи в ЧаÑ"
-#: ../src/qtui/mainwin.cpp:507
+#: ../src/qtui/mainwin.cpp:589
msgctxt "MainWin|"
msgid "Go to Previous Chat"
msgstr "ÐойÑи в ЧаÑ"
-#: ../src/qtui/mainwin.cpp:516
+#: ../src/qtui/mainwin.cpp:598
msgctxt "MainWin|"
msgid "&File"
msgstr "&Файл"
-#: ../src/qtui/mainwin.cpp:529
+#: ../src/qtui/mainwin.cpp:611
msgctxt "MainWin|"
msgid "&Networks"
msgstr "&СеÑи"
-#: ../src/qtui/mainwin.cpp:535
+#: ../src/qtui/mainwin.cpp:617
msgctxt "MainWin|"
msgid "&View"
msgstr "&Ðид"
-#: ../src/qtui/mainwin.cpp:536
+#: ../src/qtui/mainwin.cpp:618
msgctxt "MainWin|"
msgid "&Chat Lists"
msgstr "&СпиÑок ЧаÑов"
-#: ../src/qtui/mainwin.cpp:538
+#: ../src/qtui/mainwin.cpp:620
msgctxt "MainWin|"
msgid "&Toolbars"
msgstr "Ðа&нели"
-#: ../src/qtui/mainwin.cpp:552
+#: ../src/qtui/mainwin.cpp:634
msgctxt "MainWin|"
msgid "&Settings"
msgstr "&ÐаÑÑÑойки"
-#: ../src/qtui/mainwin.cpp:562
+#: ../src/qtui/mainwin.cpp:644
msgctxt "MainWin|"
msgid "&Help"
msgstr "&ÐомоÑÑ"
-#: ../src/qtui/mainwin.cpp:571
+#: ../src/qtui/mainwin.cpp:653
msgctxt "MainWin|"
msgid "Debug"
msgstr "ÐÑладка"
-#: ../src/qtui/mainwin.cpp:747
+#: ../src/qtui/mainwin.cpp:830
msgctxt "MainWin|"
msgid "Feature Not Supported"
msgstr ""
-#: ../src/qtui/mainwin.cpp:748
+#: ../src/qtui/mainwin.cpp:831
msgctxt "MainWin|"
msgid "Your Quassel Core does not support this feature"
msgstr ""
-#: ../src/qtui/mainwin.cpp:750
+#: ../src/qtui/mainwin.cpp:833
msgctxt "MainWin|"
msgid ""
"You need a Quassel Core v0.12.0 or newer in order to be able to remotely "
"change your password."
msgstr ""
-#: ../src/qtui/mainwin.cpp:863
+#: ../src/qtui/mainwin.cpp:843
+msgctxt "MainWin|"
+msgid "Upgrading..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:844
+msgctxt "MainWin|"
+msgid "Your database is being upgraded"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:847
+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:849
+msgctxt "MainWin|"
+msgid "Do not exit Quassel until the upgrade is complete!"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:866
+msgctxt "MainWin|"
+msgid "Fatal error"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:867
+msgctxt "MainWin|"
+msgid "Quassel encountered a fatal error and is terminated."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:869
+msgctxt "MainWin|"
+msgid "Reason:"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:997
msgctxt "MainWin|"
msgid "Nicks"
msgstr "Ðики"
-#: ../src/qtui/mainwin.cpp:872
+#: ../src/qtui/mainwin.cpp:1007
msgctxt "MainWin|"
msgid "Show Nick List"
msgstr "ÐоказаÑÑ ÑпиÑок ников"
-#: ../src/qtui/mainwin.cpp:885
+#: ../src/qtui/mainwin.cpp:1022
msgctxt "MainWin|"
msgid "Chat Monitor"
msgstr "ÐониÑÐ¾Ñ ÑаÑа"
-#: ../src/qtui/mainwin.cpp:897
+#: ../src/qtui/mainwin.cpp:1033
msgctxt "MainWin|"
msgid "Show Chat Monitor"
msgstr "ÐоказаÑÑ Ð¼Ð¾Ð½Ð¸ÑÐ¾Ñ ÑаÑа"
-#: ../src/qtui/mainwin.cpp:903
+#: ../src/qtui/mainwin.cpp:1039
msgctxt "MainWin|"
msgid "Inputline"
msgstr "СÑÑокаввода"
-#: ../src/qtui/mainwin.cpp:912
+#: ../src/qtui/mainwin.cpp:1048
msgctxt "MainWin|"
msgid "Show Input Line"
msgstr "ÐоказаÑÑ ÑÑÑÐ¾ÐºÑ Ð²Ð²Ð¾Ð´Ð°"
-#: ../src/qtui/mainwin.cpp:927
+#: ../src/qtui/mainwin.cpp:1061
msgctxt "MainWin|"
msgid "Topic"
msgstr "Тема"
-#: ../src/qtui/mainwin.cpp:939
+#: ../src/qtui/mainwin.cpp:1073
msgctxt "MainWin|"
msgid "Show Topic Line"
msgstr "ÐоказаÑÑ ÑÑÑÐ¾ÐºÑ ÑемÑ"
-#: ../src/qtui/mainwin.cpp:1033
+#: ../src/qtui/mainwin.cpp:1079
+msgctxt "MainWin|"
+msgid "Transfers"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1090
+msgctxt "MainWin|"
+msgid "Show File Transfers"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1187
msgctxt "MainWin|"
msgid "Main Toolbar"
msgstr "Ðа&нели"
-#: ../src/qtui/mainwin.cpp:1097
+#: ../src/qtui/mainwin.cpp:1207
+msgctxt "MainWin|"
+msgid "Nick Toolbar"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1284
msgctxt "MainWin|"
msgid "Connected to core."
msgstr "Соединение Ñ ÑдÑом ÑÑÑановлено."
-#: ../src/qtui/mainwin.cpp:1197
+#: ../src/qtui/mainwin.cpp:1384
msgctxt "MainWin|"
msgid "Not connected to core."
msgstr "ÐÐµÑ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ñ Ñ ÑдÑом."
-#: ../src/qtui/mainwin.cpp:1215 ../src/qtui/mainwin.cpp:1225
+#: ../src/qtui/mainwin.cpp:1403 ../src/qtui/mainwin.cpp:1413
msgctxt "MainWin|"
msgid "Unencrypted Connection"
msgstr "ÐезаÑиÑÑованное ÐодклÑÑение"
-#: ../src/qtui/mainwin.cpp:1215
+#: ../src/qtui/mainwin.cpp:1403
msgctxt "MainWin|"
msgid "Your client does not support SSL encryption"
msgstr " ÐÐ°Ñ ÐºÐ»Ð¸ÐµÐ½Ñ Ð½Ðµ поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ SSL ÑиÑÑование"
-#: ../src/qtui/mainwin.cpp:1217 ../src/qtui/mainwin.cpp:1227
+#: ../src/qtui/mainwin.cpp:1405 ../src/qtui/mainwin.cpp:1415
msgctxt "MainWin|"
msgid ""
"Sensitive data, like passwords, will be transmitted unencrypted to your "
"Quassel core."
msgstr ""
-#: ../src/qtui/mainwin.cpp:1225
+#: ../src/qtui/mainwin.cpp:1413
msgctxt "MainWin|"
msgid "Your core does not support SSL encryption"
msgstr " ÐаÑе ÑдÑо не поддеÑÐ¶Ð¸Ð²Ð°ÐµÑ SSL ÑиÑÑование"
-#: ../src/qtui/mainwin.cpp:1243 ../src/qtui/mainwin.cpp:1264
+#: ../src/qtui/mainwin.cpp:1431 ../src/qtui/mainwin.cpp:1452
msgctxt "MainWin|"
msgid "Untrusted Security Certificate"
msgstr "ÐедовеÑÑемÑй СеÑÑиÑÐ¸ÐºÐ°Ñ ÐезопаÑноÑÑи"
-#: ../src/qtui/mainwin.cpp:1244
+#: ../src/qtui/mainwin.cpp:1432
#, qt-format
msgctxt "MainWin|"
msgid ""
@@ -4959,38 +6616,48 @@ msgid ""
"following reasons:"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1247
+#: ../src/qtui/mainwin.cpp:1435
msgctxt "MainWin|"
msgid "Continue"
msgstr "ÐÑодолжиÑÑ"
-#: ../src/qtui/mainwin.cpp:1248
+#: ../src/qtui/mainwin.cpp:1436
msgctxt "MainWin|"
msgid "Show Certificate"
msgstr "ÐоказаÑÑ Ð¡ÐµÑÑиÑикаÑÑ"
-#: ../src/qtui/mainwin.cpp:1265
+#: ../src/qtui/mainwin.cpp:1453
msgctxt "MainWin|"
msgid ""
"Would you like to accept this certificate forever without being prompted?"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1267
+#: ../src/qtui/mainwin.cpp:1455
msgctxt "MainWin|"
msgid "Current Session Only"
msgstr "ТолÑко ТекÑÑий СеанÑ"
-#: ../src/qtui/mainwin.cpp:1268
+#: ../src/qtui/mainwin.cpp:1456
msgctxt "MainWin|"
msgid "Forever"
msgstr ""
-#: ../src/qtui/mainwin.cpp:1279
+#: ../src/qtui/mainwin.cpp:1467
msgctxt "MainWin|"
msgid "Core Connection Error"
msgstr "ÐÑÐ½Ð¾Ð²Ð½Ð°Ñ ÐÑибка ÐодклÑÑениÑ"
-#: ../src/client/messagemodel.cpp:404
+#: ../src/qtui/mainwin.cpp:1499 ../src/qtui/mainwin.cpp:1500
+msgctxt "MainWin|"
+msgid "No network selected"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1502
+msgctxt "MainWin|"
+msgid "Select a network before trying to view the channel list."
+msgstr ""
+
+#: ../src/client/messagemodel.cpp:405
#, qt-format
msgctxt "MessageModel|"
msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -5006,7 +6673,12 @@ msgctxt "MsgProcessorStatusWidget|"
msgid "Receiving Backlog"
msgstr "ÐолÑÑÐ°Ñ Ð¶ÑÑнал"
-#: ../src/uisupport/multilineedit.cpp:701
+#: ../src/uisupport/multilineedit.cpp:111
+msgctxt "MultiLineEdit|"
+msgid "Auto Spell Check"
+msgstr ""
+
+#: ../src/uisupport/multilineedit.cpp:745
#, qt-format
msgctxt "MultiLineEdit|"
msgid "Do you really want to paste %n line(s)?"
@@ -5016,7 +6688,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../src/uisupport/multilineedit.cpp:714
+#: ../src/uisupport/multilineedit.cpp:758
msgctxt "MultiLineEdit|"
msgid "Paste Protection"
msgstr "ÐаÑиÑа пÑи вÑÑавке"
@@ -5063,8 +6735,38 @@ msgstr "ÐаÑÐ¾Ð»Ñ ÑеÑвеÑа:"
#: ../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 ""
+"Verify the encrypted connection provides a valid certificate, increasing "
+"security.
Uncheck if the IRC server uses a self-signed or invalid "
+"certificate.
"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:147
+msgctxt "NetworkAddDlg|"
+msgid "Verify connection security"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1056
+msgctxt "NetworkAddDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1057
+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|"
@@ -5076,45 +6778,53 @@ msgctxt "NetworkEditDlg|"
msgid "Please enter a network name:"
msgstr "ÐожалÑйÑÑа введиÑе название ÑеÑи:"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:841
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1130
msgctxt "NetworkEditDlg|"
msgid "Add Network"
msgstr "ÐобавиÑÑ ÑеÑÑ"
-#: ../src/client/networkmodel.cpp:216 ../src/client/networkmodel.cpp:219
-#, qt-format
+#: ../src/client/networkmodel.cpp:255
+msgctxt "NetworkItem|"
+msgid "Server"
+msgstr "СеÑвеÑ"
+
+#: ../src/client/networkmodel.cpp:256
+msgctxt "NetworkItem|"
+msgid "Users"
+msgstr "ÐолÑзоваÑели"
+
+#: ../src/client/networkmodel.cpp:258
msgctxt "NetworkItem|"
-msgid "Server: %1"
+msgid "Lag"
msgstr ""
-#: ../src/client/networkmodel.cpp:221
+#: ../src/client/networkmodel.cpp:258
#, qt-format
msgctxt "NetworkItem|"
-msgid "Users: %1"
+msgid "%1 msecs"
msgstr ""
-#: ../src/client/networkmodel.cpp:224
-#, qt-format
+#: ../src/client/networkmodel.cpp:262
msgctxt "NetworkItem|"
-msgid "Lag: %1 msecs"
-msgstr "Ðаг: %1 мÑ"
+msgid "Not connected"
+msgstr ""
-#: ../src/client/networkmodel.cpp:1002
+#: ../src/client/networkmodel.cpp:1314
msgctxt "NetworkModel|"
msgid "Chat"
msgstr "Ðид Ðкна ЧаÑа"
-#: ../src/client/networkmodel.cpp:1002
+#: ../src/client/networkmodel.cpp:1314
msgctxt "NetworkModel|"
msgid "Topic"
msgstr "Тема"
-#: ../src/client/networkmodel.cpp:1002
+#: ../src/client/networkmodel.cpp:1314
msgctxt "NetworkModel|"
msgid "Nick Count"
msgstr "Ðиков"
-#: ../src/uisupport/networkmodelcontroller.cpp:177
+#: ../src/uisupport/networkmodelcontroller.cpp:178
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?"
@@ -5123,46 +6833,62 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../src/uisupport/networkmodelcontroller.cpp:190
+#: ../src/uisupport/networkmodelcontroller.cpp:191
#, qt-format
msgctxt "NetworkModelController|"
msgid "...and %1 more
"
msgstr "... и %1 болÑÑе
"
-#: ../src/uisupport/networkmodelcontroller.cpp:191
+#: ../src/uisupport/networkmodelcontroller.cpp:192
msgctxt "NetworkModelController|"
msgid ""
"Note: This will delete all related data, including all backlog data, "
"from the core's database and cannot be undone."
msgstr "ÐамеÑание: ÐÑо ÑÐ´Ð°Ð»Ð¸Ñ Ð²Ñе ÑооÑвеÑÑÑвÑÑÑие даннÑе, вклÑÑае веÑÑ Ð¶ÑÑнал, из Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ
ÑдÑа без возможноÑÑи оÑменÑ."
-#: ../src/uisupport/networkmodelcontroller.cpp:193
+#: ../src/uisupport/networkmodelcontroller.cpp:194
msgctxt "NetworkModelController|"
msgid ""
"
Active channel buffers cannot be deleted, please part the channel first."
msgstr "
ÐелÑÐ·Ñ ÑдалиÑÑ Ð±ÑÑеÑÑ Ð°ÐºÑивнÑÑ
каналов. ÐожалÑйÑÑа, ÑнаÑала покинÑÑе канал."
-#: ../src/uisupport/networkmodelcontroller.cpp:195
+#: ../src/uisupport/networkmodelcontroller.cpp:196
msgctxt "NetworkModelController|"
msgid "Remove buffers permanently?"
msgstr "УдалиÑÑ Ð±ÑÑеÑа навÑегда?"
-#: ../src/uisupport/networkmodelcontroller.cpp:544
+#: ../src/uisupport/networkmodelcontroller.cpp:241
+#: ../src/uisupport/networkmodelcontroller.cpp:243
+msgctxt "NetworkModelController|"
+msgid "Question"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:241
+msgctxt "NetworkModelController|"
+msgid "Really Connect to all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:243
+msgctxt "NetworkModelController|"
+msgid "Really disconnect from all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:556
msgctxt "NetworkModelController::JoinDlg|"
msgid "Join Channel"
msgstr "ÐайÑи на канал"
-#: ../src/uisupport/networkmodelcontroller.cpp:547
+#: ../src/uisupport/networkmodelcontroller.cpp:559
msgctxt "NetworkModelController::JoinDlg|"
msgid "Network:"
msgstr "СеÑÑ:"
-#: ../src/uisupport/networkmodelcontroller.cpp:549
+#: ../src/uisupport/networkmodelcontroller.cpp:561
msgctxt "NetworkModelController::JoinDlg|"
msgid "Channel:"
msgstr "Ðанал:"
-#: ../src/uisupport/networkmodelcontroller.cpp:551
+#: ../src/uisupport/networkmodelcontroller.cpp:563
msgctxt "NetworkModelController::JoinDlg|"
msgid "Password:"
msgstr "ÐаÑолÑ:"
@@ -5180,19 +6906,19 @@ msgstr "ФоÑма"
#: ../src/qtui/settingspages/networkssettingspage.ui:48
msgctxt "NetworksSettingsPage|"
msgid "Re&name..."
-msgstr ""
+msgstr "ÐеÑе&именоваÑÑ..."
#: ../src/qtui/settingspages/networkssettingspage.ui:65
-#: ../src/qtui/settingspages/networkssettingspage.ui:235
+#: ../src/qtui/settingspages/networkssettingspage.ui:234
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 ""
+msgstr "У&далиÑÑ"
#: ../src/qtui/settingspages/networkssettingspage.ui:124
msgctxt "NetworksSettingsPage|"
@@ -5205,8 +6931,8 @@ msgid "Identity:"
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 "..."
msgstr ""
@@ -5226,118 +6952,172 @@ msgctxt "NetworksSettingsPage|"
msgid "&Edit..."
msgstr "&ÐÑавиÑÑ..."
-#: ../src/qtui/settingspages/networkssettingspage.ui:278
+#: ../src/qtui/settingspages/networkssettingspage.ui:277
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 "ÐеÑедвинÑÑÑ Ð²Ð½Ð¸Ð· в ÑпиÑке"
-#: ../src/qtui/settingspages/networkssettingspage.ui:337
+#: ../src/qtui/settingspages/networkssettingspage.ui:336
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"
msgstr "ÐаÑÑÑойка авÑомаÑиÑеÑкого вÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑионнÑÑ
или лÑбÑÑ
дÑÑгиÑ
команд пÑи подклÑÑении к ÑеÑвеÑÑ"
-#: ../src/qtui/settingspages/networkssettingspage.ui:346
+#: ../src/qtui/settingspages/networkssettingspage.ui:345
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!"
msgstr "УкажиÑе ÑпиÑок команд IRC, коÑоÑÑе бÑдÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ñ Ð¿Ñи подклÑÑении.\nУÑÑиÑе, ÑÑо Quassel авÑомаÑиÑеÑки вÑ
Ð¾Ð´Ð¸Ñ Ð½Ð° каналÑ, Ñак ÑÑо /join здеÑÑ Ð½Ñжен Ñедко!"
-#: ../src/qtui/settingspages/networkssettingspage.ui:374
+#: ../src/qtui/settingspages/networkssettingspage.ui:373
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 ÑеÑи поÑле оÑибки подклÑÑениÑ"
-#: ../src/qtui/settingspages/networkssettingspage.ui:386
+#: ../src/qtui/settingspages/networkssettingspage.ui:385
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 ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:404
+#: ../src/qtui/settingspages/networkssettingspage.ui:403
+#: ../src/qtui/settingspages/networkssettingspage.ui:605
msgctxt "NetworksSettingsPage|"
msgid " s"
msgstr " Ñек"
-#: ../src/qtui/settingspages/networkssettingspage.ui:420
+#: ../src/qtui/settingspages/networkssettingspage.ui:419
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 "Ð¼ÐµÐ¶Ð´Ñ Ð¿Ð¾Ð²ÑоÑениÑми"
-#: ../src/qtui/settingspages/networkssettingspage.ui:464
+#: ../src/qtui/settingspages/networkssettingspage.ui:463
+#: ../src/qtui/settingspages/networkssettingspage.ui:547
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 "ÐеÑезайÑи на вÑе ÐºÐ°Ð½Ð°Ð»Ñ Ð¿Ð¾Ñле пеÑеподклÑÑениÑ"
-#: ../src/qtui/settingspages/networkssettingspage.ui:516
-#: ../src/qtui/settingspages/networkssettingspage.ui:525
+#: ../src/qtui/settingspages/networkssettingspage.ui:507
msgctxt "NetworksSettingsPage|"
-msgid "Auto Identify"
-msgstr "ÐвÑомаÑиÑеÑÐºÐ°Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑиÑ"
+msgid "Use Custom Rate Limits"
+msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:540
+#: ../src/qtui/settingspages/networkssettingspage.ui:521
msgctxt "NetworksSettingsPage|"
-msgid "NickServ"
-msgstr "NickServ"
+msgid "Max. messages at once:"
+msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:557
+#: ../src/qtui/settingspages/networkssettingspage.ui:528
msgctxt "NetworksSettingsPage|"
-msgid "Service:"
-msgstr "СлÑжба:"
+msgid "Maximum number of messages to send without any delays"
+msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:567
-#: ../src/qtui/settingspages/networkssettingspage.ui:615
+#: ../src/qtui/settingspages/networkssettingspage.ui:544
msgctxt "NetworksSettingsPage|"
-msgid "Password:"
-msgstr "ÐаÑолÑ:"
+msgid ""
+"Disable all rate limiting, e.g. for IRC "
+"bridges.
Don't use with most normal networks.
"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:602
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Delay between messages after the maximum number of "
+"undelayed messages have been sent.
"
+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 "ÐвÑомаÑиÑеÑÐºÐ°Ñ Ð¸Ð´ÐµÐ½ÑиÑикаÑиÑ"
+
+#: ../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:580
+#: ../src/qtui/settingspages/networkssettingspage.ui:675
msgctxt "NetworksSettingsPage|"
msgid "Use SASL Authentication"
msgstr "ÐÑполÑзоваÑÑ SASL ÐÑÑенÑиÑикаÑиÑ"
-#: ../src/qtui/settingspages/networkssettingspage.ui:625
+#: ../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:635
+#: ../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:776
+msgctxt "NetworksSettingsPage|"
+msgid "Could not detect if supported by server"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:783
+msgctxt "NetworksSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:798
msgctxt "NetworksSettingsPage|"
msgid ""
"Note: because"
@@ -5345,105 +7125,169 @@ msgid ""
"used.
"
msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:659
+#: ../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"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:852
+msgctxt "NetworksSettingsPage|"
+msgid "Service:"
+msgstr "СлÑжба:"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:886
msgctxt "NetworksSettingsPage|"
msgid "Encodings"
msgstr "ÐодиÑовки"
-#: ../src/qtui/settingspages/networkssettingspage.ui:662
+#: ../src/qtui/settingspages/networkssettingspage.ui:889
msgctxt "NetworksSettingsPage|"
msgid ""
"Configure advanced settings such as message encodings and automatic "
"reconnect"
msgstr "ÐаÑÑÑоиÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑелÑнÑе паÑамеÑÑÑ, Ñакие как кодиÑовки ÑообÑений и авÑомаÑиÑеÑкое Ñоединение"
-#: ../src/qtui/settingspages/networkssettingspage.ui:671
+#: ../src/qtui/settingspages/networkssettingspage.ui:898
msgctxt "NetworksSettingsPage|"
msgid "Control encodings for in- and outgoing messages"
msgstr "УпÑавление кодиÑовками Ð´Ð»Ñ Ð²Ñ
одÑÑиÑ
и иÑÑ
одÑÑиÑ
ÑообÑений"
-#: ../src/qtui/settingspages/networkssettingspage.ui:674
+#: ../src/qtui/settingspages/networkssettingspage.ui:901
msgctxt "NetworksSettingsPage|"
msgid "Use Custom Encodings"
msgstr "ÐÑполÑзоваÑÑ Ñвои кодиÑовки"
-#: ../src/qtui/settingspages/networkssettingspage.ui:685
-#: ../src/qtui/settingspages/networkssettingspage.ui:705
+#: ../src/qtui/settingspages/networkssettingspage.ui:912
+#: ../src/qtui/settingspages/networkssettingspage.ui:932
msgctxt "NetworksSettingsPage|"
msgid ""
"Specify which encoding your messages will be sent in.\n"
"UTF-8 should be a sane choice for most networks."
msgstr "УкажиÑе кодиÑовки, в коÑоÑÑÑ
бÑдÑÑ Ð¾ÑпÑавлÑÑÑÑÑ Ð²Ð°Ñи ÑообÑениÑ.\nUTF-8 должен бÑÑÑ ÑазÑмнÑм вÑбоÑом Ð´Ð»Ñ Ð±Ð¾Ð»ÑÑинÑÑва ÑеÑей."
-#: ../src/qtui/settingspages/networkssettingspage.ui:689
+#: ../src/qtui/settingspages/networkssettingspage.ui:916
msgctxt "NetworksSettingsPage|"
msgid "Send messages in:"
msgstr "ÐÑпÑавлÑÑÑ ÑообÑÐµÐ½Ð¸Ñ Ð²:"
-#: ../src/qtui/settingspages/networkssettingspage.ui:716
-#: ../src/qtui/settingspages/networkssettingspage.ui:736
+#: ../src/qtui/settingspages/networkssettingspage.ui:943
+#: ../src/qtui/settingspages/networkssettingspage.ui:963
msgctxt "NetworksSettingsPage|"
msgid ""
-"Incoming messages encoded in Utf8 will always be treated as such.\n"
-"This setting defines the encoding for messages that are not Utf8."
-msgstr "ÐÑ
одÑÑие ÑообÑениÑ, закодиÑованнÑе в Utf8, вÑегда бÑдÑÑ Ð¾Ð±ÑабоÑÐ°Ð½Ñ ÐºÐ°Ðº надо.\nÐÑи наÑÑÑойки заÑÑагиваÑÑ ÑолÑко ÑообÑÐµÐ½Ð¸Ñ Ð½Ðµ в кодиÑовке Utf8."
+"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 ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:720
+#: ../src/qtui/settingspages/networkssettingspage.ui:947
msgctxt "NetworksSettingsPage|"
msgid "Receive fallback:"
msgstr "ÐлÑÑеÑнаÑÐ¸Ð²Ð½Ð°Ñ Ð²Ñ
одÑÑÐ°Ñ ÐºÐ¾Ð´Ð¸Ñовка:"
-#: ../src/qtui/settingspages/networkssettingspage.ui:747
-#: ../src/qtui/settingspages/networkssettingspage.ui:761
+#: ../src/qtui/settingspages/networkssettingspage.ui:974
+#: ../src/qtui/settingspages/networkssettingspage.ui:987
msgctxt "NetworksSettingsPage|"
msgid ""
-"This specifies how control messages, nicks and servernames are encoded.\n"
-"Unless you *really* know what you do, leave this as ISO-8859-1!"
-msgstr "ÐÑо опÑеделÑÐµÑ ÐºÐ¾Ð´Ð¸ÑÐ¾Ð²ÐºÑ ÐºÐ¾Ð½ÑÑолÑнÑÑ
ÑообÑений, ников и названий ÑеÑвеÑов.\nÐÑли ÑолÑко Ð²Ñ *дейÑÑвиÑелÑно* не знаеÑе ÑÑо делаеÑе, оÑÑавÑÑе ÑÑÑ ISO-8859-1!"
+"This specifies how control messages, nicks and servernames are "
+"encoded.
UTF-8 should be fine for modern networks. On other "
+"networks, you may need to use ISO-8859-1 to avoid errors with illegal"
+" characters and invalid encoding.
"
+msgstr ""
-#: ../src/qtui/settingspages/networkssettingspage.ui:751
+#: ../src/qtui/settingspages/networkssettingspage.ui:977
msgctxt "NetworksSettingsPage|"
msgid "Server encoding:"
msgstr "ÐодиÑовка ÑеÑвеÑа:"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:38
+#: ../src/qtui/settingspages/networkssettingspage.cpp:41
msgctxt "NetworksSettingsPage|"
msgid "IRC"
msgstr "IRC"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:38
+#: ../src/qtui/settingspages/networkssettingspage.cpp:41
msgctxt "NetworksSettingsPage|"
msgid "Networks"
msgstr "СеÑи"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:185
+#: ../src/qtui/settingspages/networkssettingspage.cpp:184
+#: ../src/qtui/settingspages/networkssettingspage.cpp:196
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Override default message rate limiting.
Setting limits too low "
+"may get you disconnected from the server!
"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:199
+msgctxt "NetworksSettingsPage|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:200
+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:238
msgctxt "NetworksSettingsPage|"
msgid ""
"The following problems need to be corrected before your changes can be "
"applied:"
msgstr "ÐÑежде Ñем ÑоÑ
ÑаниÑÑ Ð½Ð°ÑÑÑойки, необÑ
одимо ÑÑÑÑаниÑÑ ÑледÑÑÑие пÑоблемÑ:"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:186
+#: ../src/qtui/settingspages/networkssettingspage.cpp:239
msgctxt "NetworksSettingsPage|"
msgid "- All networks need at least one server defined
"
msgstr "- У каждой ÑеÑи должен бÑÑÑ Ñ
оÑÑ Ð±Ñ Ð¾Ð´Ð¸Ð½ ÑеÑвеÑ
"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:187
+#: ../src/qtui/settingspages/networkssettingspage.cpp:240
msgctxt "NetworksSettingsPage|"
msgid "
"
msgstr "
"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:188
+#: ../src/qtui/settingspages/networkssettingspage.cpp:241
msgctxt "NetworksSettingsPage|"
msgid "Invalid Network Settings"
msgstr "ÐекоÑÑекÑнÑе наÑÑÑойки ÑеÑи"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:651
+#: ../src/qtui/settingspages/networkssettingspage.cpp:737
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:743
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:749
+msgctxt "NetworksSettingsPage|"
+msgid "Not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:755
+msgctxt "NetworksSettingsPage|"
+msgid "Supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:838
msgctxt "NetworksSettingsPage|"
msgid "Delete Network?"
msgstr "УдалиÑÑ ÑеÑÑ?"
-#: ../src/qtui/settingspages/networkssettingspage.cpp:652
+#: ../src/qtui/settingspages/networkssettingspage.cpp:839
#, qt-format
msgctxt "NetworksSettingsPage|"
msgid ""
@@ -5451,6 +7295,70 @@ msgid ""
"including the backlog?"
msgstr "ÐейÑÑвиÑелÑно ÑдалиÑÑ ÑеÑÑ \"%1\" и вÑе ÑопÑÑÑÑвÑÑÑие даннÑе, вклÑÑÐ°Ñ Ð¶ÑÑнал?"
+#: ../src/qtui/settingspages/networkssettingspage.cpp:971
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:972
+#, 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:977
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if SASL supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:978
+#, 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:983
+msgctxt "NetworksSettingsPage|"
+msgid "SASL not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:984
+#, 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:989
+msgctxt "NetworksSettingsPage|"
+msgid "SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:990
+#, 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:997
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid "SASL support for \"%1\""
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1002
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"SASL is a standardized way to log in and identify yourself to IRC servers."
+msgstr ""
+
#: ../src/qtui/settingspages/nickeditdlg.ui:13
msgctxt "NickEditDlg|"
msgid "Edit Nickname"
@@ -5486,22 +7394,22 @@ msgstr "УведомлениÑ"
#: ../src/qtui/ui/passwordchangedlg.ui:14
msgctxt "PasswordChangeDlg|"
msgid "Change Password"
-msgstr ""
+msgstr "СмениÑÑ Ð¿Ð°ÑолÑ"
#: ../src/qtui/ui/passwordchangedlg.ui:37
msgctxt "PasswordChangeDlg|"
msgid "Old password:"
-msgstr ""
+msgstr "ТекÑÑий паÑолÑ:"
#: ../src/qtui/ui/passwordchangedlg.ui:51
msgctxt "PasswordChangeDlg|"
msgid "New Password:"
-msgstr ""
+msgstr "ÐовÑй паÑолÑ:"
#: ../src/qtui/ui/passwordchangedlg.ui:65
msgctxt "PasswordChangeDlg|"
msgid "Confirm password:"
-msgstr ""
+msgstr "ÐовÑоÑиÑе паÑолÑ:"
#: ../src/qtui/passwordchangedlg.cpp:33
#, qt-format
@@ -5514,12 +7422,12 @@ msgstr ""
#: ../src/qtui/passwordchangedlg.cpp:66
msgctxt "PasswordChangeDlg|"
msgid "Password Not Changed"
-msgstr ""
+msgstr "ÐаÑÐ¾Ð»Ñ Ð½Ðµ изменен"
#: ../src/qtui/passwordchangedlg.cpp:67
msgctxt "PasswordChangeDlg|"
msgid "Password change failed"
-msgstr ""
+msgstr "Ðе ÑдалоÑÑ Ð¸Ð·Ð¼ÐµÐ½Ð¸ÑÑ Ð¿Ð°ÑолÑ"
#: ../src/qtui/passwordchangedlg.cpp:69
msgctxt "PasswordChangeDlg|"
@@ -5554,11 +7462,41 @@ msgctxt "PhononNotificationConfigWidget|"
msgid "Select the sound file to play"
msgstr "ÐÑбеÑиÑе звÑковой Ñайл ÑÑÐ¾Ð±Ñ Ð²Ð¾ÑпÑоизвеÑÑи"
-#: ../src/core/postgresqlstorage.cpp:72
+#: ../src/core/postgresqlstorage.cpp:58
+msgctxt "PostgreSqlStorage|"
+msgid "PostgreSQL driver plugin not available for Qt. Installed drivers:"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:81
msgctxt "PostgreSqlStorage|"
msgid "PostgreSQL Turbo Bomber HD!"
msgstr ""
+#: ../src/core/postgresqlstorage.cpp:88
+msgctxt "PostgreSqlStorage|"
+msgid "Username"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:89
+msgctxt "PostgreSqlStorage|"
+msgid "Password"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:90
+msgctxt "PostgreSqlStorage|"
+msgid "Hostname"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:91
+msgctxt "PostgreSqlStorage|"
+msgid "Port"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:92
+msgctxt "PostgreSqlStorage|"
+msgid "Database"
+msgstr ""
+
#: ../src/client/backlogrequester.cpp:95
#, qt-format
msgctxt "QObject|"
@@ -5591,212 +7529,339 @@ msgid ""
"wizard any time and use the settings dialog for more detailed changes."
msgstr "ÐÑÐ¾Ñ Ð¼Ð°ÑÑÐµÑ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ Ð½Ð°ÑÑÑоиÑÑ Ð»Ð¸ÑноÑÑÑ Ð¿Ð¾ ÑмолÑÐ°Ð½Ð¸Ñ Ð¸ ÑеÑевое Ñоединение Ñ IRC.
Ðн ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ ÑолÑко базовÑе наÑÑÑойки. РлÑбой Ð¼Ð¾Ð¼ÐµÐ½Ñ Ð¼Ð¾Ð¶Ð½Ð¾ оÑказаÑÑÑÑ Ð¾Ñ Ð¼Ð°ÑÑеÑа и иÑполÑзоваÑÑ Ð¾ÐºÐ½Ð¾ наÑÑÑойки Ð´Ð»Ñ Ð±Ð¾Ð»ÐµÐµ подÑобной конÑигÑÑаÑии."
-#: ../src/uisupport/qssparser.cpp:128 ../src/uisupport/qssparser.cpp:178
-#: ../src/uisupport/qssparser.cpp:334
+#: ../src/uisupport/qssparser.cpp:151 ../src/uisupport/qssparser.cpp:206
+#: ../src/uisupport/qssparser.cpp:365
#, qt-format
msgctxt "QssParser|"
msgid "Invalid block declaration: %1"
msgstr "ÐедопÑÑÑимое ÑÑловие %1"
-#: ../src/uisupport/qssparser.cpp:147
+#: ../src/uisupport/qssparser.cpp:170
#, qt-format
msgctxt "QssParser|"
msgid "Invalid palette role assignment: %1"
msgstr "ÐекоÑÑекÑнÑй адÑÐµÑ Ð´Ð»Ñ Ð¿ÑоÑлÑÑÐ¸Ð²Ð°Ð½Ð¸Ñ %1"
-#: ../src/uisupport/qssparser.cpp:166
+#: ../src/uisupport/qssparser.cpp:189
#, qt-format
msgctxt "QssParser|"
msgid "Unknown palette role name: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:204
+#: ../src/uisupport/qssparser.cpp:233
#, qt-format
msgctxt "QssParser|"
msgid "Invalid subelement name in %1"
msgstr "ÐедопÑÑÑимÑй Ñип ÑообÑÐµÐ½Ð¸Ñ Ð² %1"
-#: ../src/uisupport/qssparser.cpp:248
+#: ../src/uisupport/qssparser.cpp:277
#, qt-format
msgctxt "QssParser|"
msgid "Invalid message type in %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:257
+#: ../src/uisupport/qssparser.cpp:286
#, qt-format
msgctxt "QssParser|"
msgid "Invalid condition %1"
msgstr "ÐедопÑÑÑимое ÑÑловие %1"
-#: ../src/uisupport/qssparser.cpp:269
+#: ../src/uisupport/qssparser.cpp:299
#, qt-format
msgctxt "QssParser|"
msgid "Invalid message label: %1"
msgstr "ÐедопÑÑÑÐ¸Ð¼Ð°Ñ Ð¼ÐµÑка ÑообÑениÑ: %1"
-#: ../src/uisupport/qssparser.cpp:281
+#: ../src/uisupport/qssparser.cpp:310
#, qt-format
msgctxt "QssParser|"
msgid "Invalid senderhash specification: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:314
msgctxt "QssParser|"
msgid "Senderhash can be at most \"0x0f\"!"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:301
+#: ../src/uisupport/qssparser.cpp:330
#, qt-format
msgctxt "QssParser|"
msgid "Invalid format name: %1"
msgstr "ÐедопÑÑÑÐ¸Ð¼Ð°Ñ Ð¼ÐµÑка ÑообÑениÑ: %1"
-#: ../src/uisupport/qssparser.cpp:309
+#: ../src/uisupport/qssparser.cpp:338
#, qt-format
msgctxt "QssParser|"
msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:318
+#: ../src/uisupport/qssparser.cpp:347
#, qt-format
msgctxt "QssParser|"
msgid "Unhandled condition: %1"
msgstr "ÐедопÑÑÑимое ÑÑловие %1"
-#: ../src/uisupport/qssparser.cpp:349
+#: ../src/uisupport/qssparser.cpp:380
#, qt-format
msgctxt "QssParser|"
msgid "Invalid proplist %1"
msgstr "ÐедопÑÑÑимое ÑÑловие %1"
-#: ../src/uisupport/qssparser.cpp:368
+#: ../src/uisupport/qssparser.cpp:399
#, qt-format
msgctxt "QssParser|"
msgid "Invalid chatlist item type %1"
msgstr "ÐекоÑÑекÑнÑй адÑÐµÑ Ð´Ð»Ñ Ð¿ÑоÑлÑÑÐ¸Ð²Ð°Ð½Ð¸Ñ %1"
-#: ../src/uisupport/qssparser.cpp:384
+#: ../src/uisupport/qssparser.cpp:415
#, qt-format
msgctxt "QssParser|"
msgid "Invalid chatlist state %1"
msgstr "ÐекоÑÑекÑнÑй адÑÐµÑ Ð´Ð»Ñ Ð¿ÑоÑлÑÑÐ¸Ð²Ð°Ð½Ð¸Ñ %1"
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:445
#, qt-format
msgctxt "QssParser|"
msgid "Invalid property declaration: %1"
msgstr "ÐедопÑÑÑимое ÑÑловие %1"
-#: ../src/uisupport/qssparser.cpp:438
+#: ../src/uisupport/qssparser.cpp:483
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font property: %1"
msgstr "ÐедопÑÑÑимое ÑÑловие %1"
-#: ../src/uisupport/qssparser.cpp:444
+#: ../src/uisupport/qssparser.cpp:489
#, qt-format
msgctxt "QssParser|"
msgid "Unknown ChatLine property: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:468
+#: ../src/uisupport/qssparser.cpp:508
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid boolean value: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:544
#, qt-format
msgctxt "QssParser|"
msgid "Invalid palette color role specification: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:475
+#: ../src/uisupport/qssparser.cpp:551
#, qt-format
msgctxt "QssParser|"
msgid "Unknown palette color role: %1"
msgstr ""
-#: ../src/uisupport/qssparser.cpp:482 ../src/uisupport/qssparser.cpp:505
-#: ../src/uisupport/qssparser.cpp:527
+#: ../src/uisupport/qssparser.cpp:558 ../src/uisupport/qssparser.cpp:581
+#: ../src/uisupport/qssparser.cpp:603
#, qt-format
msgctxt "QssParser|"
msgid "Invalid gradient declaration: %1"
msgstr "ÐедопÑÑÑимое ÑÑловие %1"
-#: ../src/uisupport/qssparser.cpp:491 ../src/uisupport/qssparser.cpp:513
-#: ../src/uisupport/qssparser.cpp:537
+#: ../src/uisupport/qssparser.cpp:567 ../src/uisupport/qssparser.cpp:589
+#: ../src/uisupport/qssparser.cpp:613
#, qt-format
msgctxt "QssParser|"
msgid "Invalid gradient stops list: %1"
msgstr "ÐедопÑÑÑимÑй Ñип ÑообÑÐµÐ½Ð¸Ñ Ð² %1"
-#: ../src/uisupport/qssparser.cpp:646
+#: ../src/uisupport/qssparser.cpp:722
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font specification: %1"
msgstr "ÐедопÑÑÑимое ÑÑловие %1"
-#: ../src/uisupport/qssparser.cpp:687
+#: ../src/uisupport/qssparser.cpp:773
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font style specification: %1"
msgstr "ÐедопÑÑÑимое ÑÑловие %1"
-#: ../src/uisupport/qssparser.cpp:702
+#: ../src/uisupport/qssparser.cpp:788
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font weight specification: %1"
msgstr "ÐедопÑÑÑимое ÑÑловие %1"
-#: ../src/uisupport/qssparser.cpp:714
+#: ../src/uisupport/qssparser.cpp:800
#, qt-format
msgctxt "QssParser|"
msgid "Invalid font size specification: %1"
msgstr ""
-#: ../src/common/util.cpp:169
+#: ../src/qtui/qtmultimedianotificationbackend.cpp:167
+msgctxt "QtMultimediaNotificationBackend::ConfigWidget|"
+msgid "Select Audio File"
+msgstr "ÐÑбÑаÑÑ Ð·Ð²Ñковой Ñайл"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:14
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Form"
+msgstr "ФоÑма"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:20
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Play a sound"
+msgstr ""
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:46
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Prelisten to the selected sound"
+msgstr "ÐÑедваÑиÑелÑно пÑоÑлÑÑаÑÑ Ð²ÑбÑаннÑй звÑк"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:59
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:69
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Select the sound file to play"
+msgstr "ÐÑбеÑиÑе звÑковой Ñайл ÑÑÐ¾Ð±Ñ Ð²Ð¾ÑпÑоизвеÑÑи"
+
+#. Supported icon theme names
+#: ../src/qtui/qtui.cpp:284
+msgctxt "QtUi|"
+msgid "Breeze"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:285
+msgctxt "QtUi|"
+msgid "Breeze Dark"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:287
+msgctxt "QtUi|"
+msgid "Oxygen"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:341
+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:105
+msgctxt "QtUiApplication|"
+msgid "Could not initialize Quassel!"
+msgstr ""
+
+#: ../src/qtui/qtuiapplication.cpp:110
+msgctxt "QtUiApplication|"
+msgid "Could not load or upgrade client settings!"
+msgstr ""
+
+#: ../src/common/util.cpp:173
msgctxt "Quassel::secondsToString()|"
msgid "year"
msgstr "год"
-#: ../src/common/util.cpp:170
+#: ../src/common/util.cpp:174
msgctxt "Quassel::secondsToString()|"
msgid "day"
msgstr "денÑ"
-#: ../src/common/util.cpp:171
+#: ../src/common/util.cpp:175
msgctxt "Quassel::secondsToString()|"
msgid "h"
msgstr "Ñ"
-#: ../src/common/util.cpp:172
+#: ../src/common/util.cpp:176
msgctxt "Quassel::secondsToString()|"
msgid "min"
msgstr "мин"
-#: ../src/common/util.cpp:173
+#: ../src/common/util.cpp:177
msgctxt "Quassel::secondsToString()|"
msgid "sec"
msgstr "Ñек"
-#: ../src/client/networkmodel.cpp:497
+#: ../src/client/networkmodel.cpp:589
#, qt-format
msgctxt "QueryBufferItem|"
-msgid "Query with %1"
-msgstr "ÐÑÐ¸Ð²Ð°Ñ Ñ %1"
+msgid "Query with %1"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:611
+msgctxt "QueryBufferItem|"
+msgid "Unknown"
+msgstr ""
-#: ../src/client/networkmodel.cpp:515
-#, qt-format
+#: ../src/client/networkmodel.cpp:617
msgctxt "QueryBufferItem|"
-msgid "idling since %1"
-msgstr "неакÑивен Ñ %1"
+msgid "Away message"
+msgstr ""
-#: ../src/client/networkmodel.cpp:518
-#, qt-format
+#: ../src/client/networkmodel.cpp:619
msgctxt "QueryBufferItem|"
-msgid "login time: %1"
-msgstr "вÑÐµÐ¼Ñ Ð²Ñ
ода: %1"
+msgid "Realname"
+msgstr "ÐаÑÑоÑÑее имÑ"
-#: ../src/client/networkmodel.cpp:521
-#, qt-format
+#: ../src/client/networkmodel.cpp:625
+msgctxt "QueryBufferItem|"
+msgid "Help status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:626
+msgctxt "QueryBufferItem|"
+msgid "Available for help"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:629
+msgctxt "QueryBufferItem|"
+msgid "Service status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:639
+msgctxt "QueryBufferItem|"
+msgid "Not logged in"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:645 ../src/client/networkmodel.cpp:654
+msgctxt "QueryBufferItem|"
+msgid "Account"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:655
+msgctxt "QueryBufferItem|"
+msgid "Identified for this nick"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:661
+msgctxt "QueryBufferItem|"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:665
+msgctxt "QueryBufferItem|"
+msgid "Hostmask"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:669
+msgctxt "QueryBufferItem|"
+msgid "Operator"
+msgstr "ÐпеÑаÑоÑ"
+
+#: ../src/client/networkmodel.cpp:677
+msgctxt "QueryBufferItem|"
+msgid "Idling since"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:681
+msgctxt "QueryBufferItem|"
+msgid "Login time"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:684
+msgctxt "QueryBufferItem|"
+msgid "Server"
+msgstr "СеÑвеÑ"
+
+#: ../src/client/networkmodel.cpp:690
msgctxt "QueryBufferItem|"
-msgid "server: %1"
-msgstr "ÑеÑвеÑ: %1"
+msgid "No information available"
+msgstr ""
#: ../src/qtui/ui/receivefiledlg.ui:14
msgctxt "ReceiveFileDlg|"
@@ -5812,7 +7877,7 @@ msgstr ""
#: ../src/common/remotepeer.cpp:69
msgctxt "RemotePeer|"
msgid "Disconnecting..."
-msgstr ""
+msgstr "ÐÑклÑÑение..."
#: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
msgctxt "SaveIdentitiesDlg|"
@@ -5831,8 +7896,8 @@ msgstr "ÐÑеÑваÑÑ"
#: ../src/qtui/settingspages/servereditdlg.ui:14
msgctxt "ServerEditDlg|"
-msgid "Dialog"
-msgstr "Ðиалог"
+msgid "Edit Server"
+msgstr ""
#: ../src/qtui/settingspages/servereditdlg.ui:30
msgctxt "ServerEditDlg|"
@@ -5845,7 +7910,7 @@ msgid "Server address:"
msgstr "ÐдÑÐµÑ ÑеÑвеÑа:"
#: ../src/qtui/settingspages/servereditdlg.ui:45
-#: ../src/qtui/settingspages/servereditdlg.ui:227
+#: ../src/qtui/settingspages/servereditdlg.ui:246
msgctxt "ServerEditDlg|"
msgid "Port:"
msgstr "ÐоÑÑ:"
@@ -5857,124 +7922,154 @@ msgstr "ÐаÑолÑ:"
#: ../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 ""
+"Verify the encrypted connection provides a valid certificate, increasing "
+"security.
Uncheck if the IRC server uses a self-signed or invalid "
+"certificate.
"
+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 "ÐополниÑелÑно"
-#: ../src/qtui/settingspages/servereditdlg.ui:140
+#: ../src/qtui/settingspages/servereditdlg.ui:159
msgctxt "ServerEditDlg|"
msgid "SSL Version:"
msgstr "ÐеÑÑÐ¸Ñ SSL:"
-#: ../src/qtui/settingspages/servereditdlg.ui:147
+#: ../src/qtui/settingspages/servereditdlg.ui:166
msgctxt "ServerEditDlg|"
msgid "Use only TLSv1 unless you know what you are doing!"
msgstr ""
-#: ../src/qtui/settingspages/servereditdlg.ui:151
+#: ../src/qtui/settingspages/servereditdlg.ui:170
msgctxt "ServerEditDlg|"
msgid "SSLv3 (insecure)"
-msgstr ""
+msgstr "SSLv3 (небезопаÑно)"
-#: ../src/qtui/settingspages/servereditdlg.ui:156
+#: ../src/qtui/settingspages/servereditdlg.ui:175
msgctxt "ServerEditDlg|"
msgid "SSLv2 (insecure)"
-msgstr ""
+msgstr "SSLv2 (небезопаÑно)"
-#: ../src/qtui/settingspages/servereditdlg.ui:161
+#: ../src/qtui/settingspages/servereditdlg.ui:180
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 "ÐÑполÑзоваÑÑ Ð¿ÑокÑи"
-#: ../src/qtui/settingspages/servereditdlg.ui:188
+#: ../src/qtui/settingspages/servereditdlg.ui:207
msgctxt "ServerEditDlg|"
msgid "Proxy Type:"
msgstr "Тип пÑокÑи:"
-#: ../src/qtui/settingspages/servereditdlg.ui:196
+#: ../src/qtui/settingspages/servereditdlg.ui:215
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"
-#: ../src/qtui/settingspages/servereditdlg.ui:213
+#: ../src/qtui/settingspages/servereditdlg.ui:232
msgctxt "ServerEditDlg|"
msgid "Proxy Host:"
msgstr "ХоÑÑ Ð¿ÑокÑи:"
-#: ../src/qtui/settingspages/servereditdlg.ui:220
+#: ../src/qtui/settingspages/servereditdlg.ui:239
msgctxt "ServerEditDlg|"
msgid "localhost"
msgstr "localhost"
-#: ../src/qtui/settingspages/servereditdlg.ui:251
+#: ../src/qtui/settingspages/servereditdlg.ui:270
msgctxt "ServerEditDlg|"
msgid "Proxy Username:"
msgstr "ÐÐ¼Ñ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð¿ÑокÑи:"
-#: ../src/qtui/settingspages/servereditdlg.ui:261
+#: ../src/qtui/settingspages/servereditdlg.ui:280
msgctxt "ServerEditDlg|"
msgid "Proxy Password:"
msgstr "ÐаÑÐ¾Ð»Ñ Ð¿ÑокÑи:"
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1205
+msgctxt "ServerEditDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1206
+msgctxt "ServerEditDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to verify connection "
+"security."
+msgstr ""
+
#: ../src/qtui/ui/settingsdlg.ui:14
msgctxt "SettingsDlg|"
msgid "Configure Quassel"
msgstr "ÐаÑÑÑоиÑÑ Quassel"
-#: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50
-#: ../src/qtui/settingsdlg.cpp:111
+#: ../src/qtui/ui/settingsdlg.ui:41 ../src/qtui/ui/settingsdlg.ui:56
+#: ../src/qtui/settingsdlg.cpp:112
msgctxt "SettingsDlg|"
msgid "Settings"
msgstr "ÐаÑÑÑойки"
-#: ../src/qtui/settingsdlg.cpp:121
+#: ../src/qtui/settingsdlg.cpp:122
msgctxt "SettingsDlg|"
msgid "Save changes"
msgstr "СоÑ
ÑаниÑÑ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ"
-#: ../src/qtui/settingsdlg.cpp:122
+#: ../src/qtui/settingsdlg.cpp:123
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:136 ../src/qtui/settingsdlg.cpp:140
+#: ../src/qtui/settingsdlg.cpp:137 ../src/qtui/settingsdlg.cpp:141
#, qt-format
msgctxt "SettingsDlg|"
msgid "Configure %1"
msgstr "ÐаÑÑÑоиÑÑ %1"
-#: ../src/qtui/settingsdlg.cpp:220
+#: ../src/qtui/settingsdlg.cpp:221
msgctxt "SettingsDlg|"
msgid "Reload Settings"
msgstr "ÐеÑнÑÑÑ Ð½Ð°ÑÑÑойки"
-#: ../src/qtui/settingsdlg.cpp:220
+#: ../src/qtui/settingsdlg.cpp:221
msgctxt "SettingsDlg|"
msgid "Do you like to reload the settings, undoing your changes on this page?"
msgstr "ÐеÑнÑÑÑ ÑÑаÑÑй наÑÑÑойки, оÑменив вÑе Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð° ÑÑой вкладке?"
-#: ../src/qtui/settingsdlg.cpp:231
+#: ../src/qtui/settingsdlg.cpp:232
msgctxt "SettingsDlg|"
msgid "Restore Defaults"
msgstr "ÐеÑнÑÑÑ ÑмолÑаниÑ"
-#: ../src/qtui/settingsdlg.cpp:231
+#: ../src/qtui/settingsdlg.cpp:232
msgctxt "SettingsDlg|"
msgid "Do you like to restore the default values for this page?"
msgstr "ÐеÑнÑÑÑ Ð¿Ð°ÑамеÑÑÑ Ð¿Ð¾-ÑмолÑÐ°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÑой вкладки?"
@@ -5989,28 +8084,28 @@ msgctxt "SettingsPageDlg|"
msgid "Settings"
msgstr "ÐаÑÑÑойки"
-#: ../src/qtui/settingspagedlg.cpp:38
+#: ../src/qtui/settingspagedlg.cpp:39
#, qt-format
msgctxt "SettingsPageDlg|"
msgid "Configure %1"
msgstr "ÐаÑÑÑоиÑÑ %1"
-#: ../src/qtui/settingspagedlg.cpp:119
+#: ../src/qtui/settingspagedlg.cpp:120
msgctxt "SettingsPageDlg|"
msgid "Reload Settings"
msgstr "ÐеÑнÑÑÑ Ð½Ð°ÑÑÑойки"
-#: ../src/qtui/settingspagedlg.cpp:119
+#: ../src/qtui/settingspagedlg.cpp:120
msgctxt "SettingsPageDlg|"
msgid "Do you like to reload the settings, undoing your changes on this page?"
msgstr "ÐеÑнÑÑÑ ÑÑаÑÑй наÑÑÑойки, оÑменив вÑе Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ð° ÑÑой вкладке?"
-#: ../src/qtui/settingspagedlg.cpp:130
+#: ../src/qtui/settingspagedlg.cpp:131
msgctxt "SettingsPageDlg|"
msgid "Restore Defaults"
msgstr "ÐеÑнÑÑÑ ÑмолÑаниÑ"
-#: ../src/qtui/settingspagedlg.cpp:130
+#: ../src/qtui/settingspagedlg.cpp:131
msgctxt "SettingsPageDlg|"
msgid "Do you like to restore the default values for this page?"
msgstr "ÐеÑнÑÑÑ Ð¿Ð°ÑамеÑÑÑ Ð¿Ð¾-ÑмолÑÐ°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÑой вкладки?"
@@ -6067,7 +8162,7 @@ msgctxt "ShortcutsSettingsPage|"
msgid "Shortcuts"
msgstr ""
-#: ../src/common/signalproxy.cpp:775
+#: ../src/common/signalproxy.cpp:792
msgctxt "SignalProxy|"
msgid "Disconnecting"
msgstr "ÐÑÑоединÑÑÑÑ"
@@ -6120,7 +8215,7 @@ msgstr "УдалиÑÑ ÑÑÐ¾Ñ ÑеÑÐ²ÐµÑ Ð¸Ð· ÑпиÑка"
#: ../src/qtui/ui/simplenetworkeditor.ui:139
msgctxt "SimpleNetworkEditor|"
msgid "De&lete"
-msgstr ""
+msgstr "У&далиÑÑ"
#: ../src/qtui/ui/simplenetworkeditor.ui:165
msgctxt "SimpleNetworkEditor|"
@@ -6150,7 +8245,7 @@ msgid ""
"network"
msgstr "СпиÑок каналов IRC, на коÑоÑÑе ÐºÐ»Ð¸ÐµÐ½Ñ Ð±ÑÐ´ÐµÑ Ð°Ð²ÑомаÑиÑеÑки заÑ
одиÑÑ Ð¿Ñи подклÑÑении к ÑеÑи"
-#: ../src/qtui/snorenotificationbackend.cpp:59
+#: ../src/qtui/snorenotificationbackend.cpp:56
msgctxt "SnoreNotificationBackend|"
msgid "Private Message"
msgstr ""
@@ -6165,27 +8260,34 @@ msgctxt "SnoreNotificationConfigWidget|"
msgid "Snore"
msgstr ""
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:41
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:40
msgctxt "SnoreNotificationConfigWidget|"
-msgid "Backend:"
+msgid "Enable Snore"
msgstr ""
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:64
-msgctxt "SnoreNotificationConfigWidget|"
-msgid "Timeout:"
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Interface"
+msgstr "ÐнÑеÑÑейÑ"
+
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Spell Checking"
msgstr ""
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:80
-msgctxt "SnoreNotificationConfigWidget|"
-msgid " s"
-msgstr " Ñек"
+#: ../src/core/sqlauthenticator.cpp:58
+msgctxt "SqlAuthenticator|"
+msgid "Database"
+msgstr ""
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:96
-msgctxt "SnoreNotificationConfigWidget|"
-msgid "0 means infinite"
+#: ../src/core/sqlauthenticator.cpp:64
+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
+#: ../src/core/sqlitestorage.cpp:67
msgctxt "SqliteStorage|"
msgid ""
"SQLite is a file-based database engine that does not require any setup. It "
@@ -6228,7 +8330,7 @@ msgstr ""
#: ../src/qtui/ui/sslinfodlg.ui:120
msgctxt "SslInfoDlg|"
msgid "Subject"
-msgstr ""
+msgstr "Тема"
#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
msgctxt "SslInfoDlg|"
@@ -6280,7 +8382,12 @@ msgctxt "SslInfoDlg|"
msgid "SHA1 digest:"
msgstr ""
-#: ../src/qtui/ui/sslinfodlg.ui:431
+#: ../src/qtui/ui/sslinfodlg.ui:418
+msgctxt "SslInfoDlg|"
+msgid "SHA256 digest:"
+msgstr ""
+
+#: ../src/qtui/ui/sslinfodlg.ui:448
msgctxt "SslInfoDlg|"
msgid "Trusted:"
msgstr "ÐолÑзоваÑели: %1"
@@ -6288,7 +8395,7 @@ msgstr "ÐолÑзоваÑели: %1"
#: ../src/qtui/sslinfodlg.cpp:71
msgctxt "SslInfoDlg|"
msgid "Yes"
-msgstr ""
+msgstr "Ðа"
#: ../src/qtui/sslinfodlg.cpp:73
msgctxt "SslInfoDlg|"
@@ -6301,22 +8408,58 @@ msgctxt "SslInfoDlg|"
msgid "%1 to %2"
msgstr ""
-#: ../src/client/networkmodel.h:151
+#: ../src/client/networkmodel.h:170
msgctxt "StatusBufferItem|"
msgid "Status Buffer"
msgstr "ÐÑÑÐµÑ ÑоÑÑоÑниÑ"
-#: ../src/qtui/systemtray.cpp:67 ../src/qtui/systemtray.cpp:100
+#: ../src/qtui/systemtray.cpp:49 ../src/qtui/systemtray.cpp:246
msgctxt "SystemTray|"
msgid "&Minimize"
-msgstr ""
+msgstr "&ÐинимизиÑоваÑÑ"
-#: ../src/qtui/systemtray.cpp:102
+#: ../src/qtui/systemtray.cpp:248
msgctxt "SystemTray|"
msgid "&Restore"
+msgstr "&ÐоÑÑÑановиÑÑ"
+
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:20
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Form"
+msgstr "ФоÑма"
+
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:28
+msgctxt "SystrayAnimationConfigWidget|"
+msgid ""
+"If enabled, alert the system tray or dock in case of a"
+" notification.
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.
Note that not all icon themes"
+" support changing the color of the tray icon.
"
+msgstr ""
+
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:31
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Alert tray icon and"
+msgstr ""
+
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:54
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "do nothing"
+msgstr ""
+
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:59
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "change color"
+msgstr ""
+
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:64
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "blink"
msgstr ""
-#: ../src/qtui/systraynotificationbackend.cpp:141
+#: ../src/qtui/systraynotificationbackend.cpp:132
#, qt-format
msgctxt "SystrayNotificationBackend|"
msgid "%n pending highlight(s)"
@@ -6326,7 +8469,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../src/qtui/systraynotificationbackend.cpp:155
+#: ../src/qtui/systraynotificationbackend.cpp:146
msgctxt "SystrayNotificationBackend::ConfigWidget|"
msgid "Show a message in a popup"
msgstr "ÐоказÑваÑÑ Ñвои ÑообÑениÑ"
@@ -6356,146 +8499,146 @@ msgctxt "TaskbarNotificationBackend::ConfigWidget|"
msgid " seconds"
msgstr " Ñек."
-#: ../src/uisupport/toolbaractionprovider.cpp:30
+#: ../src/uisupport/toolbaractionprovider.cpp:31
msgctxt "ToolBarActionProvider|"
msgid "Connect"
msgstr "СоединиÑÑÑÑ"
-#: ../src/uisupport/toolbaractionprovider.cpp:30
+#: ../src/uisupport/toolbaractionprovider.cpp:31
msgctxt "ToolBarActionProvider|"
msgid "Connect to IRC"
msgstr "СоединиÑÑÑÑ Ñ IRC"
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:32
msgctxt "ToolBarActionProvider|"
msgid "Disconnect"
msgstr "ÐÑÑоединиÑÑÑÑ"
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:32
msgctxt "ToolBarActionProvider|"
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|"
+msgid "Disconnect from all"
+msgstr "ÐÑклÑÑиÑÑÑÑ Ð¾Ñ Ð²ÑеÑ
"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:36
+msgctxt "ToolBarActionProvider|"
msgid "Part"
msgstr "ÐÑйÑи"
-#: ../src/uisupport/toolbaractionprovider.cpp:33
+#: ../src/uisupport/toolbaractionprovider.cpp:36
msgctxt "ToolBarActionProvider|"
msgid "Leave currently selected channel"
msgstr "ÐокинÑÑÑ Ð²ÑделеннÑй канал"
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:37
msgctxt "ToolBarActionProvider|"
msgid "Join"
msgstr "ÐайÑи"
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:37
msgctxt "ToolBarActionProvider|"
msgid "Join a channel"
msgstr "ÐайÑи на канал"
-#: ../src/uisupport/toolbaractionprovider.cpp:36
+#: ../src/uisupport/toolbaractionprovider.cpp:39
msgctxt "ToolBarActionProvider|"
msgid "Query"
msgstr "ÐÑиваÑ"
-#: ../src/uisupport/toolbaractionprovider.cpp:36
+#: ../src/uisupport/toolbaractionprovider.cpp:39
msgctxt "ToolBarActionProvider|"
msgid "Start a private conversation"
msgstr "ÐаÑаÑÑ Ð»Ð¸ÑнÑÑ Ð±ÐµÑедÑ"
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:40
msgctxt "ToolBarActionProvider|"
msgid "Whois"
msgstr "Whois"
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:40
msgctxt "ToolBarActionProvider|"
msgid "Request user information"
msgstr "ÐапÑоÑиÑÑ Ð¸Ð½ÑоÑмаÑÐ¸Ñ Ð¾ полÑзоваÑеле"
-#: ../src/uisupport/toolbaractionprovider.cpp:39
+#: ../src/uisupport/toolbaractionprovider.cpp:42
msgctxt "ToolBarActionProvider|"
msgid "Op"
msgstr "Ðп"
-#: ../src/uisupport/toolbaractionprovider.cpp:39
+#: ../src/uisupport/toolbaractionprovider.cpp:42
msgctxt "ToolBarActionProvider|"
msgid "Give operator privileges to user"
msgstr "ÐаÑÑ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ ÑÑаÑÑÑ Ð¾Ð¿ÐµÑаÑоÑа"
-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:43
msgctxt "ToolBarActionProvider|"
msgid "Deop"
msgstr "СнÑÑÑ Ð¾Ð¿"
-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:43
msgctxt "ToolBarActionProvider|"
msgid "Take operator privileges from user"
msgstr "СнÑÑÑ ÑÑаÑÑÑ Ð¾Ð¿ÐµÑаÑоÑа Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ"
-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:44
msgctxt "ToolBarActionProvider|"
msgid "Voice"
msgstr "ÐолоÑ"
-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:44
msgctxt "ToolBarActionProvider|"
msgid "Give voice to user"
msgstr "ÐаÑÑ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ ÑÑаÑÑÑ \"Ñ Ð³Ð¾Ð»Ð¾Ñом\""
-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:45
msgctxt "ToolBarActionProvider|"
msgid "Devoice"
msgstr "СнÑÑÑ Ð³Ð¾Ð»Ð¾Ñ"
-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:45
msgctxt "ToolBarActionProvider|"
msgid "Take voice from user"
msgstr "СнÑÑÑ ÑÑаÑÑÑ \"Ñ Ð³Ð¾Ð»Ð¾Ñом\" Ñ Ð¿Ð¾Ð»ÑзоваÑелÑ"
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:46
msgctxt "ToolBarActionProvider|"
msgid "Kick"
msgstr "ÐÑгнаÑÑ"
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:46
msgctxt "ToolBarActionProvider|"
msgid "Remove user from channel"
msgstr "УдалиÑÑ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ñ ÐºÐ°Ð½Ð°Ð»Ð°"
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:47
msgctxt "ToolBarActionProvider|"
msgid "Ban"
msgstr "ÐабаниÑÑ"
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:47
msgctxt "ToolBarActionProvider|"
msgid "Ban user from channel"
msgstr "ÐапÑеÑиÑÑ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ð²Ñ
од на канал"
-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:48
msgctxt "ToolBarActionProvider|"
msgid "Kick/Ban"
msgstr "ÐÑгнаÑÑ"
-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:48
msgctxt "ToolBarActionProvider|"
msgid "Remove and ban user from channel"
msgstr "УдалиÑÑ Ð¿Ð¾Ð»ÑзоваÑÐµÐ»Ñ Ñ ÐºÐ°Ð½Ð°Ð»Ð° и запÑеÑиÑÑ ÐµÐ¼Ñ Ð²Ñ
од"
-#: ../src/uisupport/toolbaractionprovider.cpp:50
-msgctxt "ToolBarActionProvider|"
-msgid "Connect to all"
-msgstr "ÐодклÑÑиÑÑÑÑ ÐºÐ¾ вÑем"
-
-#: ../src/uisupport/toolbaractionprovider.cpp:57
-msgctxt "ToolBarActionProvider|"
-msgid "Disconnect from all"
-msgstr "ÐÑклÑÑиÑÑÑÑ Ð¾Ñ Ð²ÑеÑ
"
-
#: ../src/qtui/ui/topicwidget.ui:32
msgctxt "TopicWidget|"
msgid "Form"
@@ -6506,13 +8649,13 @@ msgctxt "TopicWidget|"
msgid "..."
msgstr ""
-#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128
+#: ../src/qtui/topicwidget.cpp:121 ../src/qtui/topicwidget.cpp:127
#, qt-format
msgctxt "TopicWidget|"
msgid "Users: %1"
-msgstr ""
+msgstr "ÐолÑзоваÑели: %1"
-#: ../src/qtui/topicwidget.cpp:123 ../src/qtui/topicwidget.cpp:129
+#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128
#, qt-format
msgctxt "TopicWidget|"
msgid "Lag: %1 msecs"
@@ -6548,86 +8691,176 @@ msgctxt "TopicWidgetSettingsPage|"
msgid "Topic Widget"
msgstr ""
+#: ../src/common/transfer.cpp:95
+msgctxt "Transfer|"
+msgid "New"
+msgstr "ÐовÑй"
+
+#: ../src/common/transfer.cpp:97
+msgctxt "Transfer|"
+msgid "Pending"
+msgstr ""
+
+#: ../src/common/transfer.cpp:99
+msgctxt "Transfer|"
+msgid "Connecting"
+msgstr ""
+
+#: ../src/common/transfer.cpp:101
+msgctxt "Transfer|"
+msgid "Transferring"
+msgstr ""
+
+#: ../src/common/transfer.cpp:103
+msgctxt "Transfer|"
+msgid "Paused"
+msgstr ""
+
+#: ../src/common/transfer.cpp:105
+msgctxt "Transfer|"
+msgid "Completed"
+msgstr ""
+
+#: ../src/common/transfer.cpp:107
+msgctxt "Transfer|"
+msgid "Failed"
+msgstr ""
+
+#: ../src/common/transfer.cpp:109
+msgctxt "Transfer|"
+msgid "Rejected"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Type"
+msgstr "Ðид"
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "File"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Status"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Progress"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Transferred"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Speed"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Peer"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Peer Address"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:80
+msgctxt "TransferModel|"
+msgid "Send"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:80
+msgctxt "TransferModel|"
+msgid "Receive"
+msgstr ""
+
#. Nick Message
-#: ../src/uisupport/uistyle.cpp:690
+#: ../src/uisupport/uistyle.cpp:936
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "You are now known as %DN%1%DN"
msgstr ""
-#: ../src/uisupport/uistyle.cpp:691
+#: ../src/uisupport/uistyle.cpp:937
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN is now known as %DN%2%DN"
msgstr ""
#. Mode Message
-#: ../src/uisupport/uistyle.cpp:695
+#: ../src/uisupport/uistyle.cpp:941
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "User mode: %DM%1%DM"
msgstr ""
-#: ../src/uisupport/uistyle.cpp:696
+#: ../src/uisupport/uistyle.cpp:942
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "Mode %DM%1%DM by %DN%2%DN"
msgstr ""
#. Join Message
-#: ../src/uisupport/uistyle.cpp:700
+#: ../src/uisupport/uistyle.cpp:946
#, 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:703
+#: ../src/uisupport/uistyle.cpp:949
#, 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:708
+#: ../src/uisupport/uistyle.cpp:954
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
msgstr ""
#. Kick Message
-#: ../src/uisupport/uistyle.cpp:716
+#: ../src/uisupport/uistyle.cpp:962
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
msgstr "%DN%1%DN вÑкинÑл %DN%2%DN из %DC%3%DC"
#. Day Change Message
-#: ../src/uisupport/uistyle.cpp:731
+#: ../src/uisupport/uistyle.cpp:977
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "{Day changed to %1}"
msgstr "{ÐовÑе ÑÑÑки. СегоднÑ: %1}"
-#: ../src/uisupport/uistyle.cpp:744
+#: ../src/uisupport/uistyle.cpp:990
#, 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 законÑен. ÐолÑзоваÑелей пÑиÑоединилоÑÑ: "
-#: ../src/uisupport/uistyle.cpp:748 ../src/uisupport/uistyle.cpp:764
+#: ../src/uisupport/uistyle.cpp:994 ../src/uisupport/uistyle.cpp:1010
#, qt-format
msgctxt "UiStyle::StyledMessage|"
msgid "%DN%1%DN (%2 more)"
msgstr ""
-#: ../src/uisupport/uistyle.cpp:759
+#: ../src/uisupport/uistyle.cpp:1005
#, 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/client/networkmodel.cpp:825
+#: ../src/client/networkmodel.cpp:1031
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Owner(s)"
@@ -6637,7 +8870,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:1033
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Admin(s)"
@@ -6647,7 +8880,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../src/client/networkmodel.cpp:829
+#: ../src/client/networkmodel.cpp:1035
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Operator(s)"
@@ -6657,7 +8890,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../src/client/networkmodel.cpp:831
+#: ../src/client/networkmodel.cpp:1037
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Half-Op(s)"
@@ -6667,7 +8900,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../src/client/networkmodel.cpp:833
+#: ../src/client/networkmodel.cpp:1039
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n Voiced"
@@ -6677,7 +8910,7 @@ msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../src/client/networkmodel.cpp:835
+#: ../src/client/networkmodel.cpp:1041
#, qt-format
msgctxt "UserCategoryItem|"
msgid "%n User(s)"