cmake: avoid de-duplication of user's CXXFLAGS

[quassel.git] / po / quassel.pot

diff --git a/po/quassel.pot b/po/quassel.pot
index a286518..374c0fd 100644 (file)
--- a/po/quassel.pot
+++ b/po/quassel.pot
@@ -12,12 +12,628 @@ msgstr ""
 "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
 "X-Qt-Contexts: true\n"
 
 "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
 "X-Qt-Contexts: true\n"
 

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

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

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

 msgctxt "AboutDlg|"
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
 msgctxt "AboutDlg|"
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"


@@ -30,117 +646,237 @@ msgid ""
 "html>"
 msgstr ""
 
 "html>"
 msgstr ""
 

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

 msgctxt "AboutDlg|"
 msgid "&About"
 msgstr ""
 
 msgctxt "AboutDlg|"
 msgid "&About"
 msgstr ""
 

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

 msgctxt "AboutDlg|"
 msgid "A&uthors"
 msgstr ""
 
 msgctxt "AboutDlg|"
 msgid "A&uthors"
 msgstr ""
 

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

 msgctxt "AboutDlg|"
 msgid "&Contributors"
 msgstr ""
 
 msgctxt "AboutDlg|"
 msgid "&Contributors"
 msgstr ""
 

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

 msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr ""
 
 msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr ""
 

-#: ../src/qtui/aboutdlg.cpp:33
-#, qt-format
-msgctxt "AboutDlg|"
-msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
+#: ../src/qtui/aboutdlg.cpp:44
+msgctxt "AboutDlg|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:49
+#, qt-format
+msgctxt "AboutDlg|"
+msgid ""
+"<b>Version:</b> %1<br><b>Version date:</b> %2<br><b>Protocol version:</b> %3"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:65
+#, qt-format
+msgctxt "AboutDlg|"
+msgid ""
+"<b>A modern, distributed IRC Client</b><br><br>&copy;%1 by the Quassel "
+"Project<br><a href=\"https://quassel-irc.org\">https://quassel-irc.org</"
+"a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a href="
+"\"https://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
+"licensed under <a href=\"https://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</"
+"a> and <a href=\"https://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br><a "
+"href=\"https://api.kde.org/frameworks/breeze-icons/html\">Breeze icon theme</"
+"a> &copy; Uri Herrera and others, licensed under the <a href=\"https://"
+"github.com/KDE/breeze-icons/blob/21ffd9b/COPYING-ICONS\">LGPLv3</a>.<br><a "
+"href=\"https://api.kde.org/frameworks/oxygen-icons5/html\">Oxygen icon "
+"theme</a> &copy; Nuno Pinheiro and others, licensed under the <a href="
+"\"https://github.com/KDE/oxygen-icons/blob/master/COPYING\">LGPLv3</a>."
+"<br><br>Please use <a href=\"https://bugs.quassel-irc.org\">https://bugs."
+"quassel-irc.org</a> to report bugs."
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:85
+msgctxt "AboutDlg|"
+msgid "Quassel IRC is mainly developed by:"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:98
+msgctxt "AboutDlg|"
+msgid ""
+"We would like to thank the following contributors (in alphabetical order) "
+"and everybody we forgot to mention here:"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:104
+msgctxt "AboutDlg|"
+msgid ""
+"...and anybody else finding and reporting bugs, giving feedback, helping "
+"others and being part of the community!"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:110
+msgctxt "AboutDlg|"
+msgid "Special thanks goes to:"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:116
+msgctxt "AboutDlg|"
+msgid "for the original Quassel logo - The All-Seeing Eye"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:122
+msgctxt "AboutDlg|"
+msgid "for the Oxygen Quassel logo"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:128
+msgctxt "AboutDlg|"
+msgid "for the amazing Breeze and Oxygen icon themes"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:134
+msgctxt "AboutDlg|"
+msgid ""
+"for creating an awesome framework, and for sponsoring development with "
+"Greenphones, N810s, N950s and more"
+msgstr ""
+
+#: ../src/core/abstractsqlstorage.cpp:136
+#, qt-format
+msgctxt "AbstractSqlStorage|"
+msgid ""
+"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:144
+msgctxt "AbstractSqlStorage|"
+msgid "Upgrade failed..."
+msgstr ""
+
+#: ../src/core/abstractsqlstorage.cpp:149
+#, qt-format
+msgctxt "AbstractSqlStorage|"
+msgid "Installed database schema successfully upgraded to version %1."
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:54
+msgctxt "AliasesModel|"
+msgid ""
+"<b>The shortcut for the alias</b><br />It can be used as a regular slash "
+"command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:75
+msgctxt "AliasesModel|"
+msgid "The string the shortcut will be expanded to"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:77
+msgctxt "AliasesModel|"
+msgid "Special variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:83
+msgctxt "AliasesModel|"
+msgid "Parameter variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:84
+msgctxt "AliasesModel|"
+msgid "i'th parameter"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:85
+msgctxt "AliasesModel|"
+msgid "i'th to j'th parameter separated by spaces"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:86
+msgctxt "AliasesModel|"
+msgid "all parameters from i on separated by spaces"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:89
+msgctxt "AliasesModel|"
+msgid "Nickname parameter variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:91
+msgctxt "AliasesModel|"
+msgid ""
+"account of user identified by i'th parameter, or a '*' if logged out or "
+"unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:93
+msgctxt "AliasesModel|"
+msgid "hostname of user identified by i'th parameter, or a '*' if unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:94
+msgctxt "AliasesModel|"
+msgid "ident of user identified by i'th parameter, or a '*' if unknown"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/aboutdlg.cpp:49
-#, qt-format
-msgctxt "AboutDlg|"
+#: ../src/qtui/settingspages/aliasesmodel.cpp:96
+msgctxt "AliasesModel|"

 msgid ""
 msgid ""

-"<b>A modern, distributed IRC Client</b><br><br>&copy;%1 by the Quassel "
-"Project<br><a href=\"http://quassel-irc.org\">http://quassel-irc.org</"
-"a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a href="
-"\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-licensed "
-"under <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> and <a "
-"href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Most icons "
-"are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen Team</a> "
-"and used under the <a href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</"
-"a>.<br><br>Please use <a href=\"http://bugs.quassel-irc.org\">http://bugs."
-"quassel-irc.org</a> to report bugs."
+"ident of user identified by i'th parameter if verified, or a '*' if unknown "
+"or unverified (prefixed with '~')"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/aboutdlg.cpp:67
-msgctxt "AboutDlg|"
-msgid "Quassel IRC is mainly developed by:"
+#: ../src/qtui/settingspages/aliasesmodel.cpp:100
+msgctxt "AliasesModel|"
+msgid "General variables"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/aboutdlg.cpp:84
-msgctxt "AboutDlg|"
-msgid ""
-"We would like to thank the following contributors (in alphabetical order) "
-"and everybody we forgot to mention here:"
+#: ../src/qtui/settingspages/aliasesmodel.cpp:101
+msgctxt "AliasesModel|"
+msgid "the whole string"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/aboutdlg.cpp:206
-msgctxt "AboutDlg|"
-msgid ""
-"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;"
-"<b>John \"nox\" Hand</b></dt><dd>for the original Quassel icon - The All-"
-"Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://"
-"www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for creating all the "
-"artwork you see throughout Quassel</dd><dt><img src=\":/pics/qt-logo-32.png"
-"\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software formerly known "
-"as Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring "
-"development of QuasselTopia with Greenphones and more</dd><dt><a href="
-"\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd>for "
-"keeping Qt alive, and for sponsoring development of Quassel Mobile with "
-"N810s</dd>"
+#: ../src/qtui/settingspages/aliasesmodel.cpp:102
+msgctxt "AliasesModel|"
+msgid "your current nickname"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/abstractsqlstorage.cpp:127
-#, qt-format
-msgctxt "AbstractSqlStorage|"
-msgid ""
-"Installed Schema (version %1) is not up to date. Upgrading to version %2..."
+#: ../src/qtui/settingspages/aliasesmodel.cpp:103
+msgctxt "AliasesModel|"
+msgid "the name of the selected channel"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/abstractsqlstorage.cpp:129
-msgctxt "AbstractSqlStorage|"
-msgid "Upgrade failed..."
+#: ../src/qtui/settingspages/aliasesmodel.cpp:109
+msgctxt "AliasesModel|"
+msgid "Multiple commands can be separated with semicolons"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/aliasesmodel.cpp:57
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112

 msgctxt "AliasesModel|"
 msgctxt "AliasesModel|"

-msgid ""
-"<b>The shortcut for the alias</b><br />It can be used as a regular slash "
-"command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
+msgid "Example:"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
+msgctxt "AliasesModel|"
+msgid "\"Test $1; Test $2; Test All $0\""

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/aliasesmodel.cpp:61
+#: ../src/qtui/settingspages/aliasesmodel.cpp:113

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

-"<b>The string the shortcut will be expanded to</b><br /><b>special variables:"
-"</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - <b>$i..j</b> "
-"represents the i'th to j'th parameter separated by spaces.<br /> - <b>$i..</"
-"b> represents all parameters from i on separated by spaces.<br /> - <b>$i:"
-"hostname</b> represents the hostname of the user identified by the i'th "
-"parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br /> - <b>"
-"$nick</b> your current nickname<br /> - <b>$channel</b> the name of the "
-"selected channel<br /><br />Multiple commands can be separated with "
-"semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will "
-"be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test All "
-"1 2 3\" when called like /test 1 2 3"
+"...will be expanded to three separate messages \"Test 1\", \"Test 2\" and "
+"\"Test All 1 2 3\" when called like <i>/test 1 2 3</i>"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr ""
 
 msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr ""
 

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

 msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr ""
 msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr ""


@@ -177,96 +913,118 @@ msgstr ""
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgctxt "AppearanceSettingsPage|"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgctxt "AppearanceSettingsPage|"

-msgid "Client style:"
+msgid "Language:"

 msgstr ""
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgctxt "AppearanceSettingsPage|"
 msgstr ""
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgctxt "AppearanceSettingsPage|"

-msgid "Set application style"
+msgid "Set the application language. Requires restart!"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "Language:"
+msgid "<Untranslated>"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "Set the application language. Requires restart!"
+msgid "<System Default>"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "<Untranslated>"
+msgid "Widget style:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/appearancesettingspage.ui:52
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:76
+#: ../src/qtui/settingspages/appearancesettingspage.ui:66

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "<System Default>"
+msgid "Set application style"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "Use custom stylesheet"
+msgid "Fallback icon theme:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:80
+msgctxt "AppearanceSettingsPage|"
+msgid ""
+"<html><head/><body><p>Icon theme to use for icons that are not found in the "
+"current system theme. Requires the selected theme to be installed either "
+"system-wide, or as part of the Quassel installation.</p><p>Supported themes "
+"are Breeze, Breeze Dark and Oxygen, all of KDE fame.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:87
+msgctxt "AppearanceSettingsPage|"
+msgid ""
+"<html><head/><body><p>If enabled, uses the selected fallback icon theme "
+"instead of the configured system theme for all icons. Recommended if you "
+"want Quassel to have a consistent look-and-feel.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:90
+msgctxt "AppearanceSettingsPage|"
+msgid "Override system theme"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "Path:"
+msgid "Use custom stylesheet"

 msgstr ""
 
 msgstr ""
 

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

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

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

 msgctxt "AppearanceSettingsPage|"
 msgid "Show system tray icon"
 msgstr ""
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Show system tray icon"
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "Hide to tray on close button"
+msgid "Invert brightness"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgctxt "AppearanceSettingsPage|"

-msgid "Enable animations"
+msgid "Hide to tray on close button"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
 msgstr ""
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr ""
 
 msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
 msgstr ""
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
 msgstr ""
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr ""
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
 msgstr ""
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
 msgstr ""
 

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

 msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr ""
 msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr ""


@@ -276,12 +1034,22 @@ msgctxt "AppearanceSettingsPage|"
 msgid "Interface"
 msgstr ""
 
 msgid "Interface"
 msgstr ""
 

-#: ../src/qtui/settingspages/appearancesettingspage.cpp:242
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:46
+msgctxt "AppearanceSettingsPage|"
+msgid "Icon theme:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:108
+msgctxt "AppearanceSettingsPage|"
+msgid "Automatic"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:281

 msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
 msgstr ""
 
 msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
 msgstr ""
 

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

 msgctxt "AwayLogView|"
 msgid "Away Log"
 msgstr ""
 msgctxt "AwayLogView|"
 msgid "Away Log"
 msgstr ""


@@ -291,7 +1059,7 @@ msgctxt "AwayLogView|"
 msgid "Show Network Name"
 msgstr ""
 
 msgid "Show Network Name"
 msgstr ""
 

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

 msgctxt "AwayLogView|"
 msgid "Show Buffer Name"
 msgstr ""
 msgctxt "AwayLogView|"
 msgid "Show Buffer Name"
 msgstr ""


@@ -313,46 +1081,65 @@ msgctxt "BacklogSettingsPage|"
 msgid "Dynamic backlog amount:"
 msgstr ""
 
 msgid "Dynamic backlog amount:"
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid "Backlog request method:"
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Backlog request method:"
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid "Fixed amount per chat"
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Fixed amount per chat"
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid "Unread messages per chat"
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Unread messages per chat"
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid "Globally unread messages"
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Globally unread messages"
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid ""
 "The simplest requester. It fetches a fixed amount of lines for each chat "
 "window from the backlog."
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid ""
 "The simplest requester. It fetches a fixed amount of lines for each chat "
 "window from the backlog."
 msgstr ""
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:138
+#: ../src/qtui/settingspages/backlogsettingspage.ui:162
+#: ../src/qtui/settingspages/backlogsettingspage.ui:366

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

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

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

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

 msgctxt "BacklogSettingsPage|"
 msgid "Initial backlog amount:"
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Initial backlog amount:"
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid ""
 "This requester fetches unread messages for each chat window individually. "
 msgctxt "BacklogSettingsPage|"
 msgid ""
 "This requester fetches unread messages for each chat window individually. "


@@ -362,42 +1149,58 @@ msgid ""
 "context."
 msgstr ""
 
 "context."
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched per buffer."
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched per buffer."
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid "Limit:"
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Limit:"
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid "Unlimited"
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Unlimited"
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid ""
 "Amount of messages to be fetched in addition to the unread messages. The "
 "Limit does not apply here."
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid ""
 "Amount of messages to be fetched in addition to the unread messages. The "
 "Limit does not apply here."
 msgstr ""
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:263
-#: ../src/qtui/settingspages/backlogsettingspage.ui:385
+#: ../src/qtui/settingspages/backlogsettingspage.ui:287
+#: ../src/qtui/settingspages/backlogsettingspage.ui:494

 msgctxt "BacklogSettingsPage|"
 msgid "Additional Messages:"
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Additional Messages:"
 msgstr ""
 

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

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


@@ -412,33 +1215,33 @@ msgid ""
 "context."
 msgstr ""
 
 "context."
 msgstr ""
 

-#: ../src/qtui/settingspages/backlogsettingspage.ui:344
+#: ../src/qtui/settingspages/backlogsettingspage.ui:453

 msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid "Interface"
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Interface"
 msgstr ""
 

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

 msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 msgstr ""
 
 msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 msgstr ""
 

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

 #, qt-format
 msgctxt "BufferItem|"
 msgid "<p> %1 - %2 </p>"
 msgstr ""
 
 #, qt-format
 msgctxt "BufferItem|"
 msgid "<p> %1 - %2 </p>"
 msgstr ""
 

-#: ../src/uisupport/bufferview.cpp:272
+#: ../src/uisupport/bufferview.cpp:257

 msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr ""
 
 msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr ""
 

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

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


@@ -446,6 +1249,11 @@ msgid ""
 " This cannot be reversed!"
 msgstr ""
 
 " This cannot be reversed!"
 msgstr ""
 

+#: ../src/uisupport/bufferview.cpp:721
+msgctxt "BufferViewDock|"
+msgid "Search..."
+msgstr ""
+

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


@@ -456,12 +1264,12 @@ msgctxt "BufferViewEditDlg|"
 msgid "Please enter a name for the chat list:"
 msgstr ""
 
 msgid "Please enter a name for the chat list:"
 msgstr ""
 

-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:569

 msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr ""
 
 msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr ""
 

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

 msgctxt "BufferViewFilter|"
 msgid "Show / Hide Chats"
 msgstr ""
 msgctxt "BufferViewFilter|"
 msgid "Show / Hide Chats"
 msgstr ""


@@ -546,153 +1354,166 @@ msgstr ""
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:163
 msgctxt "BufferViewSettingsPage|"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:163
 msgctxt "BufferViewSettingsPage|"

+msgid "Show search"
+msgstr ""
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:170
+msgctxt "BufferViewSettingsPage|"

 msgid "Minimum Activity:"
 msgstr ""
 
 msgid "Minimum Activity:"
 msgstr ""
 

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

 msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
 msgstr ""
 
 msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
 msgstr ""
 

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

 msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
 msgstr ""
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
 msgstr ""
 

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

 msgctxt "BufferViewSettingsPage|"
 msgid "New Message"
 msgstr ""
 
 msgctxt "BufferViewSettingsPage|"
 msgid "New Message"
 msgstr ""
 

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

 msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
 msgstr ""
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
 msgstr ""
 

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

 msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr ""
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr ""
 

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

 msgctxt "BufferViewSettingsPage|"
 msgid "Interface"
 msgstr ""
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Interface"
 msgstr ""
 

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

 msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
 msgstr ""
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
 msgstr ""
 

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

 msgctxt "BufferViewSettingsPage|"
 msgid "Delete Chat List?"
 msgstr ""
 
 msgctxt "BufferViewSettingsPage|"
 msgid "Delete Chat List?"
 msgstr ""
 

-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:374

 #, qt-format
 msgctxt "BufferViewSettingsPage|"
 msgid "Do you really want to delete the chat list \"%1\"?"
 msgstr ""
 
 #, qt-format
 msgctxt "BufferViewSettingsPage|"
 msgid "Do you really want to delete the chat list \"%1\"?"
 msgstr ""
 

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

 msgctxt "BufferViewWidget|"
 msgid "BufferView"
 msgstr ""
 
 msgctxt "BufferViewWidget|"
 msgid "BufferView"
 msgstr ""
 

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

 msgctxt "BufferWidget|"
 msgid "Zoom In"
 msgstr ""
 
 msgctxt "BufferWidget|"
 msgid "Zoom In"
 msgstr ""
 

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

 msgctxt "BufferWidget|"
 msgid "Zoom Out"
 msgstr ""
 
 msgctxt "BufferWidget|"
 msgid "Zoom Out"
 msgstr ""
 

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

 msgctxt "BufferWidget|"
 msgid "Actual Size"
 msgstr ""
 
 msgctxt "BufferWidget|"
 msgid "Actual Size"
 msgstr ""
 

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

 msgctxt "BufferWidget|"
 msgid "Set Marker Line"
 msgstr ""
 
 msgctxt "BufferWidget|"
 msgid "Set Marker Line"
 msgstr ""
 

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

 msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr ""
 
 msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr ""
 

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

 msgstr ""
 
 msgstr ""
 

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

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

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChannelBufferItem|"
 msgctxt "ChannelBufferItem|"

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

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:593
-#, qt-format
+#: ../src/client/networkmodel.cpp:729

 msgctxt "ChannelBufferItem|"
 msgctxt "ChannelBufferItem|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChannelBufferItem|"
 msgctxt "ChannelBufferItem|"

-msgid "Not active <br /> Double-click to join"
+msgid "Topic"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChannelBufferItem|"
 msgctxt "ChannelBufferItem|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChannelListDlg|"
 msgid "Channel List"
 msgstr ""
 
 msgctxt "ChannelListDlg|"
 msgid "Channel List"
 msgstr ""
 

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

 msgctxt "ChannelListDlg|"
 msgid "Search Pattern:"
 msgstr ""
 
 msgctxt "ChannelListDlg|"
 msgid "Search Pattern:"
 msgstr ""
 

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

 msgctxt "ChannelListDlg|"
 msgid ""
 "Toggle between simple and advanced mode.\n"
 "Advanced mode allows one to pass search strings to the IRC Server."
 msgstr ""
 
 msgctxt "ChannelListDlg|"
 msgid ""
 "Toggle between simple and advanced mode.\n"
 "Advanced mode allows one to pass search strings to the IRC Server."
 msgstr ""
 

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

 msgctxt "ChannelListDlg|"
 msgid "Show Channels"
 msgstr ""
 
 msgctxt "ChannelListDlg|"
 msgid "Show Channels"
 msgstr ""
 

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

 msgctxt "ChannelListDlg|"
 msgid "Filter:"
 msgstr ""
 
 msgctxt "ChannelListDlg|"
 msgid "Filter:"
 msgstr ""
 

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

 msgctxt "ChannelListDlg|"
 msgid "Errors Occurred:"
 msgstr ""
 
 msgctxt "ChannelListDlg|"
 msgid "Errors Occurred:"
 msgstr ""
 

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

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


@@ -761,7 +1582,7 @@ msgid "Move selected buffers to the right"
 msgstr ""
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
 msgstr ""
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133

-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:272
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:282

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr ""
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr ""


@@ -782,398 +1603,541 @@ msgctxt "ChatMonitorSettingsPage|"
 msgid "Show own messages"
 msgstr ""
 
 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:196

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Display messages from backlog on reconnect"
 msgstr ""
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Display messages from backlog on reconnect"
 msgstr ""
 

-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:167
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:199
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:298

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show messages from backlog"
 msgstr ""
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show messages from backlog"
 msgstr ""
 

-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:192
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:212
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:239

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages from backlog on reconnect"
 msgstr ""
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages from backlog on reconnect"
 msgstr ""
 

-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:195
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:242

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages"
 msgstr ""
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages"
 msgstr ""
 

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

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Interface"
 msgstr ""
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Interface"
 msgstr ""
 

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

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr ""
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr ""
 

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

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr ""
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr ""
 

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

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr ""
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr ""
 

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

 msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr ""
 
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr ""
 

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

 msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
 msgstr ""
 
 msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
 msgstr ""
 

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

 msgctxt "ChatMonitorView|"
 msgid "Show Network Name"
 msgstr ""
 
 msgctxt "ChatMonitorView|"
 msgid "Show Network Name"
 msgstr ""
 

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

 msgctxt "ChatMonitorView|"
 msgid "Show Buffer Name"
 msgstr ""
 
 msgctxt "ChatMonitorView|"
 msgid "Show Buffer Name"
 msgstr ""
 

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

 msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr ""
 
 msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr ""
 

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

 msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr ""
 
 msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr ""
 

-#: ../src/qtui/chatscene.cpp:833
+#: ../src/qtui/chatscene.cpp:806

 #, qt-format
 msgctxt "ChatScene|"
 msgid "Search '%1'"
 msgstr ""
 
 #, qt-format
 msgctxt "ChatScene|"
 msgid "Search '%1'"
 msgstr ""
 

-#: ../src/qtui/chatscene.cpp:844
+#: ../src/qtui/chatscene.cpp:818

 msgctxt "ChatScene|"
 msgid "Reset Column Widths"
 msgstr ""
 
 msgctxt "ChatScene|"
 msgid "Reset Column Widths"
 msgstr ""
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:13
-msgctxt "ChatViewSearchBar|"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:14
+msgctxt "ChatViewColorSettingsPage|"

 msgid "Form"
 msgstr ""
 
 msgid "Form"
 msgstr ""
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:19
-#: ../src/qtui/ui/chatviewsearchbar.ui:33
-#: ../src/qtui/ui/chatviewsearchbar.ui:44
-msgctxt "ChatViewSearchBar|"
+#: ../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 ""
+
+#: ../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 ""
 
 msgid "..."
 msgstr ""
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:55
-msgctxt "ChatViewSearchBar|"
-msgid "case sensitive"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:84
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Timestamp:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:62
-msgctxt "ChatViewSearchBar|"
-msgid "search nick"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:108
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Channel message:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:69
-msgctxt "ChatViewSearchBar|"
-msgid "search message"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:148
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight foreground:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/chatviewsearchbar.ui:82
-msgctxt "ChatViewSearchBar|"
-msgid "ignore joins, parts, etc."
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:172
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Command message:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:14
-msgctxt "ChatViewSettingsPage|"
-msgid "Form"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:196
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight background:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:22
-msgctxt "ChatViewSettingsPage|"
-msgid "Timestamp format:"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:203
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Server message:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:29
-msgctxt "ChatViewSettingsPage|"
-msgid ""
-"<html><head/><body><p>Usage examples:</p>\n"
-"<table cellpadding=\"2\">\n"
-"<tr><td>dd.MM.yyyy</td><td>21.05.2001</td></tr>\n"
-"<tr><td>ddd MMMM d yy</td><td>Tue May 21 01</td></tr>\n"
-"<tr><td>hh:mm:ss.zzz</td><td>14:13:09.042</td></tr>\n"
-"<tr><td>h:m:s ap</td><td>2:13:9 pm</td></tr>\n"
-"</table>\n"
-"</body></html>"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:227
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Marker line:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:42
-msgctxt "ChatViewSettingsPage|"
-msgid "[hh:mm:ss]"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:251
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Error message:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:69
-msgctxt "ChatViewSettingsPage|"
-msgid "Custom chat window font:"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:275
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Background:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:102
-msgctxt "ChatViewSettingsPage|"
-msgid "Show colored text in the chat window"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:332
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color senders in chat based on nicknames"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:105
-msgctxt "ChatViewSettingsPage|"
-msgid "Allow colored text (mIRC color codes)"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:335
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Use Sender Coloring"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:121
-msgctxt "ChatViewSettingsPage|"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:650
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Own messages:"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:689
+msgctxt "ChatViewColorSettingsPage|"

 msgid ""
 msgid ""

-"Show a website preview window when hovering the mouse over a web address"
+"Color sender nicknames in action messages, e.g.<br/>-*- <span style=\" font-"
+"style:italic;\">Nick</span> does an action"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:124
-msgctxt "ChatViewSettingsPage|"
-msgid "Show previews of webpages on URL hover"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:692
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color senders in action messages"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:140
-msgctxt "ChatViewSettingsPage|"
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:708
+msgctxt "ChatViewColorSettingsPage|"

 msgid ""
 msgid ""

-"Set the marker line to the bottom of the current chat window when selecting "
-"another channel"
+"Color nicknames in joins, parts, quits, and other messages, e.g.<br/>--> "
+"<span style=\" font-style:italic;\">Nick</span> joined #quassel"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:711
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color nicknames in other messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Interface"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Chat View Colors"
+msgstr ""
+
+#: ../src/qtui/chatviewsearchbar.ui:13
+msgctxt "ChatViewSearchBar|"
+msgid "Form"
+msgstr ""
+
+#: ../src/qtui/chatviewsearchbar.ui:19 ../src/qtui/chatviewsearchbar.ui:33
+#: ../src/qtui/chatviewsearchbar.ui:44
+msgctxt "ChatViewSearchBar|"
+msgid "..."
+msgstr ""
+
+#: ../src/qtui/chatviewsearchbar.ui:55
+msgctxt "ChatViewSearchBar|"
+msgid "case sensitive"
+msgstr ""
+
+#: ../src/qtui/chatviewsearchbar.ui:62
+msgctxt "ChatViewSearchBar|"
+msgid "search nick"
+msgstr ""
+
+#: ../src/qtui/chatviewsearchbar.ui:69
+msgctxt "ChatViewSearchBar|"
+msgid "search message"
+msgstr ""
+
+#: ../src/qtui/chatviewsearchbar.ui:82
+msgctxt "ChatViewSearchBar|"
+msgid "ignore joins, parts, etc."

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:143
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:14

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Set marker line automatically when switching chats"
+msgid "Form"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/chatviewsettingspage.ui:159
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:22

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid ""
-"Set the marker line to the bottom of the current chat window when Quassel "
-"loses focus."
+msgid "Use a custom format for the timestamp"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Set marker line automatically when Quassel loses focus"
+msgid "Custom timestamp format:"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "AutoMarkerLineOnLostFocus"
+msgid ""
+"<html><head/><body>\n"
+"         <p>Accepts Qt QDateTime Format.</p>\n"
+"         <p>Examples:</p>\n"
+"         <table cellpadding=\"2\">\n"
+"         <tr><td>dd.MM.yyyy</td><td>21.05.2001</td></tr>\n"
+"         <tr><td>ddd MMMM d yy</td><td>Tue May 21 01</td></tr>\n"
+"         <tr><td>hh:mm:ss.zzz</td><td>14:13:09.042</td></tr>\n"
+"         <tr><td>h:m:s ap</td><td>2:13:9 pm</td></tr>\n"
+"         </table>\n"
+"         </body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:56
+msgctxt "ChatViewSettingsPage|"
+msgid " hh:mm:ss"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Web Search Url:"
+msgid "Shows <brackets> around the names of senders"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid ""
-"<html><head/><body><p>The URL to open with the selected text as the "
-"parameter. Place <span style=\" font-weight:600;\">%s</span> where selected "
-"text should go.</p><p>Eg:</p><p>https://www.google.com/search?q=<span style="
-"\" font-weight:600;\">%s<br/></span>https://duckduckgo.com/?q=<span style=\" "
-"font-weight:600;\">%s</span></p></body></html>"
+msgid "Show brackets around sender names"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "WebSearchUrlFormat"
+msgid "Show sender modes before nicknames:"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "https://www.google.com/search?q=%s"
+msgid ""
+"<qt><style>.bold { font-weight: bold; } .italic { font-style: italic; } ."
+"underline { text-decoration: underline; }</style>\n"
+"<p><span class=\"bold\">Sender modes:</span></p>\n"
+"<p><span class=\"underline\">No modes:</span> Don't show any modes<br/><span "
+"class=\"italic\">Example:</span> &lt;nickname&gt;</p>\n"
+"<p><span class=\"underline\">Highest mode:</span> Show only the highest "
+"active mode<br/><span class=\"italic\">Example:</span> &lt;@nickname&gt;</"
+"p>\n"
+"<p><span class=\"underline\">All modes:</span> Show all active modes<br/"
+"><span class=\"italic\">Example:</span> &lt;@+nickname&gt;</p>\n"
+"</qt>"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Custom Colors"
+msgid "Custom chat window font:"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Action:"
+msgid ""
+"Show a website preview window when hovering the mouse over a web address"

 msgstr ""
 
 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.ui:180

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "..."
+msgid "Show previews of webpages on URL hover"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:196
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"Set the marker line to the bottom of the current chat window when selecting "
+"another channel"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Timestamp:"
+msgid "Set marker line automatically when switching chats"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Channel message:"
+msgid ""
+"Set the marker line to the bottom of the current chat window when Quassel "
+"loses focus."

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Highlight foreground:"
+msgid "Set marker line automatically when Quassel loses focus"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Command message:"
+msgid "Web Search URL:"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Highlight background:"
+msgid ""
+"<html><head/><body><p>The URL to open with the selected text as the "
+"parameter. Place <span style=\" font-weight:600;\">%s</span> where selected "
+"text should go.</p><p>Eg:</p><p>https://www.google.com/search?q=<span style="
+"\" font-weight:600;\">%s<br/></span>https://duckduckgo.com/?q=<span style=\" "
+"font-weight:600;\">%s</span></p></body></html>"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Server message:"
+msgid "https://www.google.com/search?q=%s"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Marker line:"
+msgid "Interface"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Error message:"
+msgid "Chat View"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Use Sender Coloring"
+msgid "Your Quassel core does not support this feature"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Own messages:"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to show sender modes "
+"before nicknames."

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Interface"
+msgid "No modes"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

-msgid "Chat View"
+msgid "Highest mode"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "ChatViewSettingsPage|"
 msgctxt "ChatViewSettingsPage|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "Client|"
 msgid "Identity already exists in client!"
 msgstr ""
 
 msgctxt "Client|"
 msgid "Identity already exists in client!"
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:65
-#: ../src/client/clientauthhandler.cpp:471
-msgctxt "ClientAuthHandler|"
-msgid "Unencrypted connection canceled"
-msgstr ""
-
-#: ../src/client/clientauthhandler.cpp:87
-#: ../src/client/clientauthhandler.cpp:103
+#: ../src/client/clientauthhandler.cpp:77
+#: ../src/client/clientauthhandler.cpp:92

 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Connecting to %1..."
 msgstr ""
 
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Connecting to %1..."
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:99
+#: ../src/client/clientauthhandler.cpp:88

 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Looking up %1..."
 msgstr ""
 
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Looking up %1..."
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:106
-#: ../src/client/clientauthhandler.cpp:315
+#: ../src/client/clientauthhandler.cpp:95
+#: ../src/client/clientauthhandler.cpp:302

 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Connected to %1"
 msgstr ""
 
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Connected to %1"
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:110
+#: ../src/client/clientauthhandler.cpp:99

 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Disconnecting from %1..."
 msgstr ""
 
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Disconnecting from %1..."
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:114
+#: ../src/client/clientauthhandler.cpp:103

 msgctxt "ClientAuthHandler|"
 msgid "Disconnected"
 msgstr ""
 
 msgctxt "ClientAuthHandler|"
 msgid "Disconnected"
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:149
+#: ../src/client/clientauthhandler.cpp:137

 msgctxt "ClientAuthHandler|"
 msgid "Reconnecting in compatibility mode..."
 msgstr ""
 
 msgctxt "ClientAuthHandler|"
 msgid "Reconnecting in compatibility mode..."
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:236
+#: ../src/client/clientauthhandler.cpp:224

 msgctxt "ClientAuthHandler|"
 msgid ""
 "<b>Incompatible Quassel Core!</b><br>None of the protocols this client "
 "speaks are supported by the core you are trying to connect to."
 msgstr ""
 
 msgctxt "ClientAuthHandler|"
 msgid ""
 "<b>Incompatible Quassel Core!</b><br>None of the protocols this client "
 "speaks are supported by the core you are trying to connect to."
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:239
+#: ../src/client/clientauthhandler.cpp:227

 msgctxt "ClientAuthHandler|"
 msgid "Core speaks none of the protocols we support"
 msgstr ""
 
 msgctxt "ClientAuthHandler|"
 msgid "Core speaks none of the protocols we support"
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:254
+#: ../src/client/clientauthhandler.cpp:241

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


@@ -1181,53 +2145,70 @@ msgid ""
 "at least protocol v%1, but the core speaks v%2 only."
 msgstr ""
 
 "at least protocol v%1, but the core speaks v%2 only."
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:256
+#: ../src/client/clientauthhandler.cpp:244

 msgctxt "ClientAuthHandler|"
 msgid "Incompatible protocol version, connection to core refused"
 msgstr ""
 
 msgctxt "ClientAuthHandler|"
 msgid "Incompatible protocol version, connection to core refused"
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:278
+#: ../src/client/clientauthhandler.cpp:264

 msgctxt "ClientAuthHandler|"
 msgid "Synchronizing to core..."
 msgstr ""
 
 msgctxt "ClientAuthHandler|"
 msgid "Synchronizing to core..."
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:293
+#: ../src/client/clientauthhandler.cpp:272

 msgctxt "ClientAuthHandler|"
 msgid "The core refused connection from this client"
 msgstr ""
 
 msgctxt "ClientAuthHandler|"
 msgid "The core refused connection from this client"
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:357
+#: ../src/client/clientauthhandler.cpp:295
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core does not support the following features: %1"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:298
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core supports unknown features: %1"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:339

 msgctxt "ClientAuthHandler|"
 msgid "Logging in..."
 msgstr ""
 
 msgctxt "ClientAuthHandler|"
 msgid "Logging in..."
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:362
+#: ../src/client/clientauthhandler.cpp:344

 msgctxt "ClientAuthHandler|"
 msgid "Login canceled"
 msgstr ""
 
 msgctxt "ClientAuthHandler|"
 msgid "Login canceled"
 msgstr ""
 

-#: ../src/client/clientauthhandler.cpp:420
+#: ../src/client/clientauthhandler.cpp:393

 msgctxt "ClientAuthHandler|"
 msgid "Unencrypted connection cancelled"
 msgstr ""
 
 msgctxt "ClientAuthHandler|"
 msgid "Unencrypted connection cancelled"
 msgstr ""
 

-#: ../src/client/clientbacklogmanager.cpp:178
+#: ../src/client/clientauthhandler.cpp:460
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection canceled"
+msgstr ""
+
+#: ../src/client/clientbacklogmanager.cpp:177

 #, qt-format
 msgctxt "ClientBacklogManager|"
 msgid "Processed %1 messages in %2 seconds."
 msgstr ""
 
 #, qt-format
 msgctxt "ClientBacklogManager|"
 msgid "Processed %1 messages in %2 seconds."
 msgstr ""
 

-#: ../src/client/clientbufferviewmanager.cpp:60
+#: ../src/client/clientbufferviewmanager.cpp:54

 msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr ""
 
 msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr ""
 

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

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

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

 msgctxt "ClientUserInputHandler|"
 msgid "/QUERY expects at least a nick"
 msgstr ""
 msgctxt "ClientUserInputHandler|"
 msgid "/QUERY expects at least a nick"
 msgstr ""


@@ -1306,7 +2287,7 @@ msgctxt "ConnectionSettingsPage|"
 msgid "IRC"
 msgstr ""
 
 msgid "IRC"
 msgstr ""
 

-#: ../src/qtui/chatitem.cpp:803
+#: ../src/qtui/chatitem.cpp:826

 msgctxt "ContentsChatItem|"
 msgid "Copy Link Address"
 msgstr ""
 msgctxt "ContentsChatItem|"
 msgid "Copy Link Address"
 msgstr ""


@@ -1343,301 +2324,469 @@ msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:47
 msgctxt "ContextMenuActionProvider|"
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:47
 msgctxt "ContextMenuActionProvider|"

-msgid "Joins"
+msgid "Joins/Parts/Quits"

 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:48
 msgctxt "ContextMenuActionProvider|"
 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:48
 msgctxt "ContextMenuActionProvider|"

-msgid "Parts"
+msgid "Joins"

 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgctxt "ContextMenuActionProvider|"
 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgctxt "ContextMenuActionProvider|"

-msgid "Quits"
+msgid "Parts"

 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgctxt "ContextMenuActionProvider|"
 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgctxt "ContextMenuActionProvider|"

-msgid "Nick Changes"
+msgid "Quits"

 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgctxt "ContextMenuActionProvider|"
 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgctxt "ContextMenuActionProvider|"

-msgid "Mode Changes"
+msgid "Nick Changes"

 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgctxt "ContextMenuActionProvider|"
 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgctxt "ContextMenuActionProvider|"

-msgid "Day Changes"
+msgid "Mode Changes"

 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgctxt "ContextMenuActionProvider|"
 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgctxt "ContextMenuActionProvider|"

-msgid "Topic Changes"
+msgid "Day Changes"

 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgctxt "ContextMenuActionProvider|"
 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgctxt "ContextMenuActionProvider|"

-msgid "Set as Default..."
+msgid "Topic Changes"

 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:55
 msgctxt "ContextMenuActionProvider|"
 msgstr ""
 
 #: ../src/uisupport/contextmenuactionprovider.cpp:55
 msgctxt "ContextMenuActionProvider|"

+msgid "Set as Default..."
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:56
+msgctxt "ContextMenuActionProvider|"

 msgid "Use Defaults..."
 msgstr ""
 
 msgid "Use Defaults..."
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr ""
 

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

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

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr ""
 

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

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

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Client info"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Client info"
 msgstr ""
 

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

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

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Give Half-Operator Status"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Half-Operator Status"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Take Half-Operator Status"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Half-Operator Status"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Temporarily"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Temporarily"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Permanently"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Permanently"
 msgstr ""
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:91
+#: ../src/uisupport/contextmenuactionprovider.cpp:92

 msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
 msgstr ""
 

-#: ../src/uisupport/contextmenuactionprovider.cpp:92
+#: ../src/uisupport/contextmenuactionprovider.cpp:93
+msgctxt "ContextMenuActionProvider|"
+msgid "Configure"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:94

 msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Events"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Events"
 msgstr ""
 

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

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

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Actions"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Actions"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Ignore"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Ignore"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Add Ignore Rule"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Add Ignore Rule"
 msgstr ""
 

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

 msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr ""
 
 msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr ""
 

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

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Could not initialize any storage backend! Exiting..."
+msgid "Cannot configure from environment!"

 msgstr ""
 
 msgstr ""
 

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

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

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

 "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
 "Qt library with the sqlite or postgres plugin enabled in order for "
 "quasselcore\n"
 "to work."
 msgstr ""
 
 "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
 "Qt library with the sqlite or postgres plugin enabled in order for "
 "quasselcore\n"
 "to work."
 msgstr ""
 

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

 msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr ""
 
 msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr ""
 

-#: ../src/core/core.cpp:285
+#: ../src/core/core.cpp:360

 msgctxt "Core|"
 msgid "Core is already configured! Not configuring again..."
 msgstr ""
 
 msgctxt "Core|"
 msgid "Core is already configured! Not configuring again..."
 msgstr ""
 

-#: ../src/core/core.cpp:288
+#: ../src/core/core.cpp:363

 msgctxt "Core|"
 msgid "Admin user or password not set."
 msgstr ""
 
 msgctxt "Core|"
 msgid "Admin user or password not set."
 msgstr ""
 

-#: ../src/core/core.cpp:291
+#: ../src/core/core.cpp:367

 msgctxt "Core|"
 msgid "Could not setup storage!"
 msgstr ""
 
 msgctxt "Core|"
 msgid "Could not setup storage!"
 msgstr ""
 

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

 msgctxt "Core|"
 msgid "Creating admin user..."
 msgstr ""
 
 msgctxt "Core|"
 msgid "Creating admin user..."
 msgstr ""
 

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

 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1"
 msgstr ""
 
 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1"
 msgstr ""
 

-#: ../src/core/core.cpp:458
+#: ../src/core/core.cpp:633

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

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

 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr ""
 
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr ""
 

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

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

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

 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr ""
 
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr ""
 

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

 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr ""
 
 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr ""
 

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

 msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr ""
 
 msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr ""
 

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

 msgctxt "Core|"
 msgid "Client connected from"
 msgstr ""
 
 msgctxt "Core|"
 msgid "Client connected from"
 msgstr ""
 

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

 msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr ""
 
 msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr ""
 

-#: ../src/core/core.cpp:558
+#: ../src/core/core.cpp:733

 msgctxt "Core|"
 msgid "Non-authed client disconnected:"
 msgstr ""
 
 msgctxt "Core|"
 msgid "Non-authed client disconnected:"
 msgstr ""
 

-#: ../src/core/core.cpp:590
+#: ../src/core/core.cpp:807
+msgctxt "Core|"
+msgid "Cannot setup storage backend."
+msgstr ""
+
+#: ../src/core/core.cpp:896
+#, qt-format
+msgctxt "Core|"
+msgid "Unsupported storage backend: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:897
+msgctxt "Core|"
+msgid "Supported backends are:"
+msgstr ""
+
+#: ../src/core/core.cpp:909 ../src/core/core.cpp:929
+#, qt-format
+msgctxt "Core|"
+msgid "Switched storage backend to: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:910
+msgctxt "Core|"
+msgid "Backend already initialized. Skipping Migration..."
+msgstr ""
+
+#: ../src/core/core.cpp:913
+#, qt-format
+msgctxt "Core|"
+msgid "Storage backend is not available: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:917
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to setup storage backend: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:922
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to initialize storage backend: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:937
+#, qt-format
+msgctxt "Core|"
+msgid "Migrating storage backend %1 to %2..."
+msgstr ""
+
+#: ../src/core/core.cpp:942
+msgctxt "Core|"
+msgid "Migration finished!"
+msgstr ""
+
+#: ../src/core/core.cpp:949
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to migrate storage backend! (No migration writer for %1)"
+msgstr ""
+
+#: ../src/core/core.cpp:955
+msgctxt "Core|"
+msgid "No currently active storage backend. Skipping migration..."
+msgstr ""
+
+#: ../src/core/core.cpp:958
+#, qt-format
+msgctxt "Core|"
+msgid "Currently active storage backend does not support migration: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:961
+#, qt-format
+msgctxt "Core|"
+msgid "New storage backend does not support migration: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:983
+#, qt-format
+msgctxt "Core|"
+msgid "Unsupported authenticator: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:984
+msgctxt "Core|"
+msgid "Supported authenticators are:"
+msgstr ""
+
+#: ../src/core/core.cpp:994 ../src/core/core.cpp:1011
+#, qt-format
+msgctxt "Core|"
+msgid "Switched authenticator to: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:997
+#, qt-format
+msgctxt "Core|"
+msgid "Authenticator is not available: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:1001
+#, qt-format

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Could not initialize session for client:"
+msgid "Unable to setup authenticator: %1"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "Core|"
 msgctxt "Core|"

-msgid "Could not find a session for client:"
+msgid "Unable to initialize authenticator: %1"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreAccount|"
 msgid "Internal Core"
 msgstr ""
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
 msgctxt "CoreAccount|"
 msgid "Internal Core"
 msgstr ""
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:14

-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:260
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:276

 msgctxt "CoreAccountEditDlg|"
 msgid "Edit Core Account"
 msgstr ""
 msgctxt "CoreAccountEditDlg|"
 msgid "Edit Core Account"
 msgstr ""


@@ -1658,7 +2807,7 @@ msgid "Local Core"
 msgstr ""
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
 msgstr ""
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40

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

 msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr ""
 msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr ""


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

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

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

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

 msgctxt "CoreAccountEditDlg|"
 msgid "User:"
 msgstr ""
 msgctxt "CoreAccountEditDlg|"
 msgid "User:"
 msgstr ""


@@ -1694,30 +2843,45 @@ msgstr ""
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
 msgctxt "CoreAccountEditDlg|"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
 msgctxt "CoreAccountEditDlg|"

-msgid "Use a Proxy"
+msgid "Proxy Settings"
+msgstr ""
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:144
+msgctxt "CoreAccountEditDlg|"
+msgid "SOCKS 5"
+msgstr ""
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:149
+msgctxt "CoreAccountEditDlg|"
+msgid "HTTP"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreAccountEditDlg|"
 msgid "Proxy Type:"
 msgstr ""
 
 msgctxt "CoreAccountEditDlg|"
 msgid "Proxy Type:"
 msgstr ""
 

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

 msgctxt "CoreAccountEditDlg|"
 msgctxt "CoreAccountEditDlg|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreAccountEditDlg|"
 msgctxt "CoreAccountEditDlg|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr ""
 
 msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr ""
 

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

 msgctxt "CoreAccountModel|"
 msgid "Internal Core"
 msgstr ""
 msgctxt "CoreAccountModel|"
 msgid "Internal Core"
 msgstr ""


@@ -1762,22 +2926,23 @@ msgctxt "CoreAccountSettingsPage|"
 msgid "Always connect to"
 msgstr ""
 
 msgid "Always connect to"
 msgstr ""
 

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

 msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
 msgstr ""
 
 msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
 msgstr ""
 

-#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144
+#: ../src/core/coreauthhandler.cpp:167 ../src/core/coreauthhandler.cpp:179
+#: ../src/core/coreauthhandler.cpp:253

 msgctxt "CoreAuthHandler|"
 msgid "Client"
 msgstr ""
 
 msgctxt "CoreAuthHandler|"
 msgid "Client"
 msgstr ""
 

-#: ../src/core/coreauthhandler.cpp:132
+#: ../src/core/coreauthhandler.cpp:167

 msgctxt "CoreAuthHandler|"
 msgid "too old, rejecting."
 msgstr ""
 
 msgctxt "CoreAuthHandler|"
 msgid "too old, rejecting."
 msgstr ""
 

-#: ../src/core/coreauthhandler.cpp:133
+#: ../src/core/coreauthhandler.cpp:168

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


@@ -1785,94 +2950,133 @@ msgid ""
 "core protocol version %1 (got: %2).<br>Please consider upgrading your client."
 msgstr ""
 
 "core protocol version %1 (got: %2).<br>Please consider upgrading your client."
 msgstr ""
 

-#: ../src/core/coreauthhandler.cpp:144
+#: ../src/core/coreauthhandler.cpp:180

 msgctxt "CoreAuthHandler|"
 msgid "did not send a registration message before trying to login, rejecting."
 msgstr ""
 
 msgctxt "CoreAuthHandler|"
 msgid "did not send a registration message before trying to login, rejecting."
 msgstr ""
 

-#: ../src/core/coreauthhandler.cpp:145
+#: ../src/core/coreauthhandler.cpp:182

 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>Client not initialized!</b><br>You need to send a registration message "
 "before trying to login."
 msgstr ""
 
 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>Client not initialized!</b><br>You need to send a registration message "
 "before trying to login."
 msgstr ""
 

-#: ../src/core/coreauthhandler.cpp:162
+#: ../src/core/coreauthhandler.cpp:198
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "SSL required but non-SSL connection attempt from %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:199

 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>SSL is required!</b><br>You need to use SSL in order to connect to this "
 "core."
 msgstr ""
 
 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>SSL is required!</b><br>You need to use SSL in order to connect to this "
 "core."
 msgstr ""
 

-#: ../src/core/coreauthhandler.cpp:202
+#: ../src/core/coreauthhandler.cpp:254
+msgctxt "CoreAuthHandler|"
+msgid "attempted to login before the core was configured, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:256
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Attempted to login before core was configured!</b><br>The core must be "
+"configured before attempting to login."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:278
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Invalid login attempt from %1 as \"%2\""
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:279

 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>Invalid username or password!</b><br>The username/password combination "
 "you supplied could not be found in the database."
 msgstr ""
 
 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>Invalid username or password!</b><br>The username/password combination "
 "you supplied could not be found in the database."
 msgstr ""
 

-#: ../src/core/coreauthhandler.cpp:207
+#: ../src/core/coreauthhandler.cpp:291

 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid ""
 "Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
 msgstr ""
 
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid ""
 "Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
 msgstr ""
 

-#: ../src/core/coreauthhandler.cpp:226
+#: ../src/core/coreauthhandler.cpp:298
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support extended features."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:300
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support the following features: %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:304
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client supports unknown features: %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:337

 msgctxt "CoreAuthHandler|"
 msgid "Starting encryption for Client:"
 msgstr ""
 
 msgctxt "CoreAuthHandler|"
 msgid "Starting encryption for Client:"
 msgstr ""
 

-#: ../src/qtui/coreconfigwizard.cpp:69
+#: ../src/qtui/coreconfigwizard.cpp:44

 msgctxt "CoreConfigWizard|"
 msgctxt "CoreConfigWizard|"

-msgid "Core Configuration Wizard"
+msgid "Description"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/coreconfigwizard.cpp:98
+#: ../src/qtui/coreconfigwizard.cpp:159

 msgctxt "CoreConfigWizard|"
 msgctxt "CoreConfigWizard|"

-msgid "Your core has been successfully configured. Logging you in..."
+msgid "Core Configuration Wizard"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/coreconfigwizard.cpp:107
-#, qt-format
+#: ../src/qtui/coreconfigwizard.cpp:206

 msgctxt "CoreConfigWizard|"
 msgctxt "CoreConfigWizard|"

-msgid ""
-"Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
+msgid "Your core has been successfully configured. Logging you in..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/coreconfigwizard.cpp:126
+#: ../src/qtui/coreconfigwizard.cpp:216
+#, qt-format

 msgctxt "CoreConfigWizard|"
 msgid ""
 msgctxt "CoreConfigWizard|"
 msgid ""

-"Your are now logged into your freshly configured Quassel Core!<br>Please "
-"remember to configure your identities and networks now."
+"Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Form"
 msgstr ""
 
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Form"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr ""
 
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Password:"
 msgstr ""
 
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Password:"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr ""
 
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr ""
 
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid ""
 "<b>Note:</b> Adding more users and changing your username/password is not "
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid ""
 "<b>Note:</b> Adding more users and changing your username/password is not "


@@ -1881,185 +3085,199 @@ msgid ""
 "nobr></tt>\"."
 msgstr ""
 
 "nobr></tt>\"."
 msgstr ""
 

-#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
+#: ../src/qtui/coreconfigwizardauthenticationselectionpage.ui:14
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Form"
+msgstr ""
+
+#: ../src/qtui/coreconfigwizardauthenticationselectionpage.ui:25
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Authentication Backend:"
+msgstr ""
+
+#: ../src/qtui/coreconfigwizardintropage.ui:13

 msgctxt "CoreConfigWizardIntroPage|"
 msgid "Form"
 msgstr ""
 
 msgctxt "CoreConfigWizardIntroPage|"
 msgid "Form"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr ""
 
 msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr ""
 

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

 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid "Create Admin User"
 msgstr ""
 
 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid "Create Admin User"
 msgstr ""
 

-#: ../src/qtui/coreconfigwizard.cpp:163
+#: ../src/qtui/coreconfigwizard.cpp:261

 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid ""
 "First, we will create a user on the core. This first user will have "
 "administrator privileges."
 msgstr ""
 
 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:244

 msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr ""
 
 msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
 msgstr ""
 
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
 msgstr ""
 

-#: ../src/qtui/coreconfigwizard.cpp:199
+#: ../src/qtui/coreconfigwizard.cpp:367

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

-msgid ""
-"Please select a database backend for the Quassel Core storage to store the "
-"backlog and other data in."
+msgid "Please select a storage backend for Quassel Core."

 msgstr ""
 
 msgstr ""
 

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

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

-msgid "Connection Properties"
+msgid "Storage Settings"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid "Storing Your Settings"
 msgstr ""
 
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid "Storing Your Settings"
 msgstr ""
 

-#: ../src/qtui/coreconfigwizard.cpp:343
+#: ../src/qtui/coreconfigwizard.cpp:459

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

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

 "automatically."
 msgstr ""
 
 "automatically."
 msgstr ""
 

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

 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Form"
 msgstr ""
 
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Form"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr ""
 
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr ""
 

-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
-msgctxt "CoreConfigWizardStorageSelectionPage|"
-msgid "Description"
-msgstr ""
-
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
-msgctxt "CoreConfigWizardStorageSelectionPage|"
-msgid "Foobar"
-msgstr ""
-
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:13
+#: ../src/qtui/coreconfigwizardsyncpage.ui:14

 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Form"
 msgstr ""
 
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Form"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr ""
 
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr ""
 
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Storage Backend:"
 msgstr ""
 
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Storage Backend:"
 msgstr ""
 

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

 msgctxt "CoreConfigWizardSyncPage|"
 msgctxt "CoreConfigWizardSyncPage|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr ""
 
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr ""
 

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

 msgctxt "CoreConnectAuthDlg|"
 msgid "Authentication Required"
 msgstr ""
 
 msgctxt "CoreConnectAuthDlg|"
 msgid "Authentication Required"
 msgstr ""
 

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

 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your account data:"
 msgstr ""
 
 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your account data:"
 msgstr ""
 

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

 msgctxt "CoreConnectAuthDlg|"
 msgid "Password:"
 msgstr ""
 
 msgctxt "CoreConnectAuthDlg|"
 msgid "Password:"
 msgstr ""
 

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

 msgctxt "CoreConnectAuthDlg|"
 msgid "Username:"
 msgstr ""
 
 msgctxt "CoreConnectAuthDlg|"
 msgid "Username:"
 msgstr ""
 

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

 msgctxt "CoreConnectAuthDlg|"
 msgid "Remember password"
 msgstr ""
 
 msgctxt "CoreConnectAuthDlg|"
 msgid "Remember password"
 msgstr ""
 

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

 #, qt-format
 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your credentials for %1:"
 msgstr ""
 
 #, qt-format
 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your credentials for %1:"
 msgstr ""
 

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

 msgctxt "CoreConnectDlg|"
 msgid "Connect to Core"
 msgstr ""
 
 msgctxt "CoreConnectDlg|"
 msgid "Connect to Core"
 msgstr ""
 

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

 msgctxt "CoreConnection|"
 msgid "Network is down"
 msgstr ""
 
 msgctxt "CoreConnection|"
 msgid "Network is down"
 msgstr ""
 

-#: ../src/client/coreconnection.cpp:276
+#: ../src/client/coreconnection.cpp:247

 msgctxt "CoreConnection|"
 msgid "Disconnected"
 msgstr ""
 
 msgctxt "CoreConnection|"
 msgid "Disconnected"
 msgstr ""
 

-#: ../src/client/coreconnection.cpp:311
+#: ../src/client/coreconnection.cpp:281

 msgctxt "CoreConnection|"
 msgid "Disconnected from core."
 msgstr ""
 
 msgctxt "CoreConnection|"
 msgid "Disconnected from core."
 msgstr ""
 

-#: ../src/client/coreconnection.cpp:449
+#: ../src/client/coreconnection.cpp:357
+msgctxt "CoreConnection|"
+msgid "Initializing..."
+msgstr ""
+
+#: ../src/client/coreconnection.cpp:412

 msgctxt "CoreConnection|"
 msgid "Receiving session state"
 msgstr ""
 
 msgctxt "CoreConnection|"
 msgid "Receiving session state"
 msgstr ""
 

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

 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronizing to %1..."
 msgstr ""
 
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronizing to %1..."
 msgstr ""
 

-#: ../src/client/coreconnection.cpp:487
+#: ../src/client/coreconnection.cpp:444

 msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr ""
 
 msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr ""
 

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

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


@@ -2077,19 +3295,16 @@ msgstr ""
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
 msgctxt "CoreConnectionSettingsPage|"
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
 msgctxt "CoreConnectionSettingsPage|"

-msgid ""
-"Rely on KDE's hardware layer to detect if we're online. Recommended for most "
-"KDE users"
+msgid "Rely on Qt's network configuration manager to detect if we're online"

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

-msgid "Use KDE's network status detection (via Solid)"
+msgid "Automatic"

 msgstr ""
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
 msgstr ""
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57

-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154

 msgctxt "CoreConnectionSettingsPage|"
 msgid ""
 "Actively ping the remote core and disconnect if we didn't get a reply after "
 msgctxt "CoreConnectionSettingsPage|"
 msgid ""
 "Actively ping the remote core and disconnect if we didn't get a reply after "


@@ -2129,6 +3344,11 @@ msgctxt "CoreConnectionSettingsPage|"
 msgid "Retry every"
 msgstr ""
 
 msgid "Retry every"
 msgstr ""
 

+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Interval between consecutive connection attempts"
+msgstr ""
+

 #: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
 msgctxt "CoreConnectionSettingsPage|"
 msgid "Remote Cores"
 #: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
 msgctxt "CoreConnectionSettingsPage|"
 msgid "Remote Cores"


@@ -2139,93 +3359,354 @@ msgctxt "CoreConnectionSettingsPage|"
 msgid "Connection"
 msgstr ""
 
 msgid "Connection"
 msgstr ""
 

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

 msgctxt "CoreConnectionStatusWidget|"
 msgid "Form"
 msgstr ""
 
 msgctxt "CoreConnectionStatusWidget|"
 msgid "Form"
 msgstr ""
 

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

 msgctxt "CoreConnectionStatusWidget|"
 msgid "Message"
 msgstr ""
 
 msgctxt "CoreConnectionStatusWidget|"
 msgid "Message"
 msgstr ""
 

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

 msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
 msgstr ""
 
 msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
 msgstr ""
 

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

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

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

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

-#: ../src/qtui/coreconnectionstatuswidget.cpp:83
+#: ../src/qtui/coreconnectionstatuswidget.cpp:80

 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is encrypted with SSL."
 msgstr ""
 
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is encrypted with SSL."
 msgstr ""
 

-#: ../src/qtui/coreconnectionstatuswidget.cpp:87
+#: ../src/qtui/coreconnectionstatuswidget.cpp:84

 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr ""
 
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr ""
 

-#: ../src/qtui/ui/coreinfodlg.ui:13
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:14
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Form"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:57
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:677
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Your Quassel core is too old to support remote highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:64
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:93
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Rules"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:99
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Nicks"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:127
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Case sensitive"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:153
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Custom Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:166
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:269
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enabled"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:171
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:274
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:176
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:279
+msgctxt "CoreHighlightSettingsPage|"
+msgid "RegEx"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:181
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:284
+msgctxt "CoreHighlightSettingsPage|"
+msgid "CS"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:186
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:289
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Sender"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:191
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:294
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Channel"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:207
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:310
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Add"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:214
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:317
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remove"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:250
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Ignore Rules"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:256
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Never Highlight For"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:35
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Interface"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:35
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:43
+msgctxt "CoreHighlightSettingsPage|"
+msgid "All Nicks from Identity"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:44
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Current Nick"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:45
+msgctxt "CoreHighlightSettingsPage|"
+msgid "None"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:86
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import Legacy"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:88
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import highlight rules configured in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:88
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:674
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:696
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Legacy Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:129
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enable/disable this rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:132
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Phrase to match, leave blank to match any message"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:135
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<b>RegEx</b>: This option determines if the highlight rule, <i>Sender</i>, "
+"and <i>Channel</i> should be interpreted as <b>regular expressions</b> or "
+"just as keywords."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:140
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<b>CS</b>: This option determines if the highlight rule, <i>Sender</i>, and "
+"<i>Channel</i> should be interpreted <b>case sensitive</b>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:144
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<p><b>Sender</b>: Semicolon separated list of <i>nick!ident@host</i> names, "
+"leave blank to match any nickname.</p><p><i>Example:</i><br /><i>Alice!*; "
+"Bob!*@example.com; Carol*!*; !Caroline!*</i><br />would match on <i>Alice</"
+"i>, <i>Bob</i> with hostmask <i>example.com</i>, and any nickname starting "
+"with <i>Carol</i> except for <i>Caroline</i><br /><p>If only inverted names "
+"are specified, it will match anything except for what's specified (implicit "
+"wildcard).</p><p><i>Example:</i><br /><i>!Announce*!*; !Wheatley!aperture@*</"
+"i><br />would match anything except for <i>Wheatley</i> with ident "
+"<i>aperture</i> or any nickname starting with <i>Announce</i></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:158
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<p><b>Channel</b>: Semicolon separated list of channel/query names, leave "
+"blank to match any name.</p><p><i>Example:</i><br /><i>#quassel*; #foobar; !"
+"#quasseldroid</i><br />would match on <i>#foobar</i> and any channel "
+"starting with <i>#quassel</i> except for <i>#quasseldroid</i><br /><p>If "
+"only inverted names are specified, it will match anything except for what's "
+"specified (implicit wildcard).</p><p><i>Example:</i><br /><i>!#quassel*; !"
+"#foobar</i><br />would match anything except for <i>#foobar</i> or any "
+"channel starting with <i>#quassel</i></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:678
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer to configure remote highlights."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:680
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "You can still configure highlights for this device only in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:684
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remote Highlights unsupported"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:700
+msgctxt "CoreHighlightSettingsPage|"
+msgid "No highlights to import"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:700
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "No highlight rules in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:705
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import highlights?"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:706
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import all highlight rules from <i>%1</i>?"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:756
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Imported highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:758
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "%1 highlight rules successfully imported."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:759
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Clean up old, duplicate highlight rules?"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.h:63
+#: ../src/qtui/settingspages/corehighlightsettingspage.h:71
+msgctxt "CoreHighlightSettingsPage|"
+msgid "highlight rule"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.ui:14

 msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr ""
 
 msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr ""
 

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

 msgctxt "CoreInfoDlg|"
 msgid "Version:"
 msgstr ""
 
 msgctxt "CoreInfoDlg|"
 msgid "Version:"
 msgstr ""
 

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

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr ""
 
 msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr ""
 

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

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

-msgid "Connected Clients:"
+msgid "Connected clients:"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

-msgid "Build date:"
+msgid "Close"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

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

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "CoreInfoDlg|"
 msgctxt "CoreInfoDlg|"

-msgid "Close"
+msgid "Disconnected from core"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:92 ../src/qtui/coreinfodlg.cpp:156
+msgctxt "CoreInfoDlg|"
+msgid "Not available"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:101
+msgctxt "CoreInfoDlg|"
+msgid "Unknown date"

 msgstr ""
 
 msgstr ""
 

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

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


@@ -2233,58 +3714,159 @@ msgid_plural "%n Day(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/qtui/coreinfodlg.cpp:58
+#: ../src/qtui/coreinfodlg.cpp:175

 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid " %1:%2:%3 (since %4)"
 msgstr ""
 
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid " %1:%2:%3 (since %4)"
 msgstr ""
 

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

 msgctxt "CoreNetwork|"
 msgctxt "CoreNetwork|"

-msgid "Connection failed. Cycling to next Server"
+msgid "Connection failed. Cycling to next server..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/corenetwork.cpp:176 ../src/core/corenetwork.cpp:177
+#: ../src/core/corenetwork.cpp:243 ../src/core/corenetwork.cpp:248

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

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

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

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

 msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr ""
 
 msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr ""
 

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

 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"
 msgstr ""
 
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"
 msgstr ""
 

-#: ../src/core/corenetwork.cpp:434
+#: ../src/core/corenetwork.cpp:543

 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
 msgstr ""
 

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

 msgctxt "CoreSession|"
 msgid "Client"
 msgstr ""
 
 msgctxt "CoreSession|"
 msgid "Client"
 msgstr ""
 

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

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

-#: ../src/core/coresession.cpp:477
+#: ../src/core/coresession.cpp:607

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


@@ -2292,63 +3874,128 @@ msgid ""
 "create network %1!"
 msgstr ""
 
 "create network %1!"
 msgstr ""
 

-#: ../src/core/coresession.cpp:509
-msgctxt "CoreSession|"
-msgid ""
-"CoreSession::createNetwork(): Trying to create a network that already "
-"exists, updating instead!"
+#: ../src/core/coresession.cpp:638
+msgctxt "CoreSession|"
+msgid ""
+"CoreSession::createNetwork(): Trying to create a network that already "
+"exists, updating instead!"
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:82
+msgctxt "CoreSessionEventProcessor|"
+msgid ""
+"No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:821
+msgctxt "CoreSessionEventProcessor|"
+msgid "Unable to perform key exchange, missing qca-ossl plugin."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:838
+msgctxt "CoreSessionEventProcessor|"
+msgid "Unable to parse the DH1080_INIT. Key exchange failed."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:849
+#: ../src/core/coresessioneventprocessor.cpp:864
+msgctxt "CoreSessionEventProcessor|"
+msgid "Your key is set and messages will be encrypted."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:873
+msgctxt "CoreSessionEventProcessor|"
+msgid "Failed to parse DH1080_FINISH. Key exchange failed."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1602
+msgctxt "CoreSessionEventProcessor|"
+msgid "Reverse DCC SEND not supported"
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1625
+#, qt-format
+msgctxt "CoreSessionEventProcessor|"
+msgid "DCC %1 not supported"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:29
+msgctxt "CoreSessionWidget|"
+msgid "12.34.56.78"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:37
+msgctxt "CoreSessionWidget|"
+msgid "Client:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:57
+msgctxt "CoreSessionWidget|"
+msgid "Version date:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:71
+msgctxt "CoreSessionWidget|"
+msgid "Location:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:85
+msgctxt "CoreSessionWidget|"
+msgid "Connected since:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:99
+msgctxt "CoreSessionWidget|"
+msgid "Secure:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coresessioneventprocessor.cpp:78
-msgctxt "CoreSessionEventProcessor|"
-msgid ""
-"No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
+#: ../src/qtui/coresessionwidget.ui:130
+msgctxt "CoreSessionWidget|"
+msgid "End Session"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coresessioneventprocessor.cpp:450
-msgctxt "CoreSessionEventProcessor|"
-msgid "Unable to perform key exchange, missing qca-ossl plugin."
+#: ../src/qtui/coresessionwidget.cpp:41
+msgctxt "CoreSessionWidget|"
+msgid "Unknown date"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coresessioneventprocessor.cpp:461
-msgctxt "CoreSessionEventProcessor|"
-msgid "Unable to parse the DH1080_INIT. Key exchange failed."
+#: ../src/qtui/coresessionwidget.cpp:51
+msgctxt "CoreSessionWidget|"
+msgid "Yes"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coresessioneventprocessor.cpp:465
-#: ../src/core/coresessioneventprocessor.cpp:473
-msgctxt "CoreSessionEventProcessor|"
-msgid "Your key is set and messages will be encrypted."
+#: ../src/qtui/coresessionwidget.cpp:51
+msgctxt "CoreSessionWidget|"
+msgid "No"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coresessioneventprocessor.cpp:475
-msgctxt "CoreSessionEventProcessor|"
-msgid "Failed to parse DH1080_FINISH. Key exchange failed."
+#: ../src/qtui/coresessionwidget.cpp:57 ../src/qtui/coresessionwidget.cpp:71
+msgctxt "CoreSessionWidget|"
+msgid "End the client's session, disconnecting it"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coresessioneventprocessor.cpp:1056
-msgctxt "CoreSessionEventProcessor|"
-msgid "Reverse DCC SEND not supported"
+#: ../src/qtui/coresessionwidget.cpp:71
+msgctxt "CoreSessionWidget|"
+msgid "This client does not support being remotely disconnected"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coresessioneventprocessor.cpp:1074
-#, qt-format
-msgctxt "CoreSessionEventProcessor|"
-msgid "DCC %1 not supported"
+#: ../src/qtui/coresessionwidget.cpp:85
+msgctxt "CoreSessionWidget|"
+msgid "Ending session..."

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/coretransfer.cpp:58
+#: ../src/core/coretransfer.cpp:64

 msgctxt "CoreTransfer|"
 msgid "Socket closed while still transferring!"
 msgstr ""
 
 msgctxt "CoreTransfer|"
 msgid "Socket closed while still transferring!"
 msgstr ""
 

-#: ../src/core/coretransfer.cpp:70
+#: ../src/core/coretransfer.cpp:75

 #, qt-format
 msgctxt "CoreTransfer|"
 msgid "DCC connection error: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "CoreTransfer|"
 msgid "DCC connection error: %1"
 msgstr ""
 

-#: ../src/core/coretransfer.cpp:114
+#: ../src/core/coretransfer.cpp:115

 msgctxt "CoreTransfer|"
 msgid "Reverse DCC not supported yet!"
 msgstr ""
 msgctxt "CoreTransfer|"
 msgid "Reverse DCC not supported yet!"
 msgstr ""


@@ -2358,54 +4005,54 @@ msgctxt "CoreTransfer|"
 msgid "DCC Receive: Got more data than expected!"
 msgstr ""
 
 msgid "DCC Receive: Got more data than expected!"
 msgstr ""
 

-#: ../src/core/coretransfer.cpp:176
+#: ../src/core/coretransfer.cpp:175

 msgctxt "CoreTransfer|"
 msgid "DCC Receive: Quassel Client disconnected during transfer!"
 msgstr ""
 
 msgctxt "CoreTransfer|"
 msgid "DCC Receive: Quassel Client disconnected during transfer!"
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:88
+#: ../src/core/coreuserinputhandler.cpp:91

 msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr ""
 
 msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr ""
 

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

 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:193
-#: ../src/core/coreuserinputhandler.cpp:364
-#: ../src/core/coreuserinputhandler.cpp:609
-#: ../src/core/coreuserinputhandler.cpp:647
+#: ../src/core/coreuserinputhandler.cpp:210
+#: ../src/core/coreuserinputhandler.cpp:406
+#: ../src/core/coreuserinputhandler.cpp:767
+#: ../src/core/coreuserinputhandler.cpp:830

 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: QCA provider plugin not found. It is usually provided by the qca-ossl "
 "plugin."
 msgstr ""
 
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: QCA provider plugin not found. It is usually provided by the qca-ossl "
 "plugin."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:204
+#: ../src/core/coreuserinputhandler.cpp:225

 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /delkey <nick|channel> deletes the encryption key for nick or "
 "channel or just /delkey when in a channel or query."
 msgstr ""
 
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /delkey <nick|channel> deletes the encryption key for nick or "
 "channel or just /delkey when in a channel or query."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:211
-#: ../src/core/coreuserinputhandler.cpp:665
+#: ../src/core/coreuserinputhandler.cpp:238
+#: ../src/core/coreuserinputhandler.cpp:859

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

-#: ../src/core/coreuserinputhandler.cpp:216
+#: ../src/core/coreuserinputhandler.cpp:248

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

-#: ../src/core/coreuserinputhandler.cpp:220
-#: ../src/core/coreuserinputhandler.cpp:673
+#: ../src/core/coreuserinputhandler.cpp:257
+#: ../src/core/coreuserinputhandler.cpp:877

 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "


@@ -2414,30 +4061,30 @@ msgid ""
 "with QCA2 present."
 msgstr ""
 
 "with QCA2 present."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:374
+#: ../src/core/coreuserinputhandler.cpp:420

 msgctxt "CoreUserInputHandler|"
 msgid "[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."
 msgstr ""
 
 msgctxt "CoreUserInputHandler|"
 msgid "[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:381
+#: ../src/core/coreuserinputhandler.cpp:432

 msgctxt "CoreUserInputHandler|"
 msgid "It is only possible to exchange keys in a query buffer."
 msgstr ""
 
 msgctxt "CoreUserInputHandler|"
 msgid "It is only possible to exchange keys in a query buffer."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:391
+#: ../src/core/coreuserinputhandler.cpp:447

 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Failed to initiate key exchange with %1."
 msgstr ""
 
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Failed to initiate key exchange with %1."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:396
+#: ../src/core/coreuserinputhandler.cpp:457

 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Initiated key exchange with %1."
 msgstr ""
 
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Initiated key exchange with %1."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:400
-#: ../src/core/coreuserinputhandler.cpp:631
+#: ../src/core/coreuserinputhandler.cpp:466
+#: ../src/core/coreuserinputhandler.cpp:804

 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "


@@ -2446,44 +4093,45 @@ msgid ""
 "with QCA present."
 msgstr ""
 
 "with QCA present."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:559
+#: ../src/core/coreuserinputhandler.cpp:540
+msgctxt "CoreUserInputHandler|"
+msgid "Your persistent modes have been reset."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:682

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

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

 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "

-"channel. /setkey <key> when in a channel or query buffer sets the key for it."
+"channel. /setkey <key> when in a channel or query buffer sets the key for "
+"it. Prefix <key> by cbc: or ebc: to explicitly set the encryption mode "
+"respectively. Default is CBC."

 msgstr ""
 
 msgstr ""
 

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

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

-#: ../src/core/coreuserinputhandler.cpp:657
+#: ../src/core/coreuserinputhandler.cpp:845

 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /showkey <nick|channel> shows the encryption key for nick or channel "
 "or just /showkey when in a channel or query."
 msgstr ""
 
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /showkey <nick|channel> shows the encryption key for nick or channel "
 "or just /showkey when in a channel or query."
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:669
+#: ../src/core/coreuserinputhandler.cpp:868

 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 is %2:%3"
 msgstr ""
 
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 is %2:%3"
 msgstr ""
 

-#: ../src/core/coreuserinputhandler.cpp:797
-#, qt-format
-msgctxt "CoreUserInputHandler|"
-msgid "[Error] Could not encrypt your message: %1"
-msgstr ""
-

 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgctxt "CreateIdentityDlg|"
 msgid "Create New Identity"
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
 msgctxt "CreateIdentityDlg|"
 msgid "Create New Identity"


@@ -2504,28 +4152,130 @@ msgctxt "CreateIdentityDlg|"
 msgid "Duplicate:"
 msgstr ""
 
 msgid "Duplicate:"
 msgstr ""
 

-#: ../src/common/protocols/datastream/datastreampeer.cpp:115
+#: ../src/common/protocols/datastream/datastreampeer.cpp:113

 msgctxt "DataStreamPeer|"
 msgid "Invalid handshake message!"
 msgstr ""
 
 msgctxt "DataStreamPeer|"
 msgid "Invalid handshake message!"
 msgstr ""
 

-#: ../src/common/protocols/datastream/datastreampeer.cpp:162
+#: ../src/common/protocols/datastream/datastreampeer.cpp:176

 #, qt-format
 msgctxt "DataStreamPeer|"
 msgid "Unknown protocol message of type %1"
 msgstr ""
 
 #, qt-format
 msgctxt "DataStreamPeer|"
 msgid "Unknown protocol message of type %1"
 msgstr ""
 

-#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
+#: ../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:28
+msgctxt "DccSettingsPage|"
+msgid "IRC"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.cpp:28
+msgctxt "DccSettingsPage|"
+msgid "DCC"
+msgstr ""
+
+#: ../src/qtui/debugbufferviewoverlay.ui:13

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

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

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

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

 msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay Properties"
 msgstr ""
 msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay Properties"
 msgstr ""


@@ -2575,312 +4325,299 @@ msgctxt "DebugBufferViewOverlay|"
 msgid "Is initialized:"
 msgstr ""
 
 msgid "Is initialized:"
 msgstr ""
 

-#: ../src/qtui/ui/debugconsole.ui:14
-msgctxt "DebugConsole|"
-msgid "Debug Console"
-msgstr ""
-
-#: ../src/qtui/ui/debugconsole.ui:44
-msgctxt "DebugConsole|"
-msgid "local"
-msgstr ""
-
-#: ../src/qtui/ui/debugconsole.ui:54
-msgctxt "DebugConsole|"
-msgid "core"
-msgstr ""
-
-#: ../src/qtui/ui/debugconsole.ui:82
-msgctxt "DebugConsole|"
-msgid "Evaluate!"
-msgstr ""
-
-#: ../src/qtui/ui/debuglogwidget.ui:13
-msgctxt "DebugLogWidget|"
+#: ../src/qtui/debuglogdlg.ui:14
+msgctxt "DebugLogDlg|"

 msgid "Debug Log"
 msgstr ""
 
 msgid "Debug Log"
 msgstr ""
 

-#: ../src/qtui/ui/debuglogwidget.ui:43
-msgctxt "DebugLogWidget|"
-msgid "Close"
-msgstr ""
-
-#: ../src/qtui/dockmanagernotificationbackend.cpp:184
+#: ../src/qtui/dockmanagernotificationbackend.cpp:196

 msgctxt "DockManagerNotificationBackend::ConfigWidget|"
 msgid "Mark dockmanager entry"
 msgstr ""
 
 msgctxt "DockManagerNotificationBackend::ConfigWidget|"
 msgid "Mark dockmanager entry"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:224 ../src/core/eventstringifier.cpp:370
+#: ../src/core/eventstringifier.cpp:240 ../src/core/eventstringifier.cpp:450

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

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

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 invited you to channel %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 invited you to channel %2"
 msgstr ""
 

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

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:347
+#: ../src/core/eventstringifier.cpp:424
+msgctxt "EventStringifier|"
+msgid "Error from server: "
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:429

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Operwall] %1: %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Operwall] %1: %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:355
+#: ../src/core/eventstringifier.cpp:436

 msgctxt "EventStringifier|"
 msgid ""
 "Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
 "behavior!"
 msgstr ""
 
 msgctxt "EventStringifier|"
 msgid ""
 "Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
 "behavior!"
 msgstr ""
 

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

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

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

 msgctxt "EventStringifier|"
 msgid "You are no longer marked as being away"
 msgstr ""
 
 msgctxt "EventStringifier|"
 msgid "You are no longer marked as being away"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:399
+#: ../src/core/eventstringifier.cpp:486

 msgctxt "EventStringifier|"
 msgid "You have been marked as being away"
 msgstr ""
 
 msgctxt "EventStringifier|"
 msgid "You have been marked as being away"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:421
+#: ../src/core/eventstringifier.cpp:507

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is %2 (%3)"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is %2 (%3)"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:437
+#: ../src/core/eventstringifier.cpp:522

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is online via %2 (%3)"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is online via %2 (%3)"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:439
+#: ../src/core/eventstringifier.cpp:524

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was online via %2 (%3)"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was online via %2 (%3)"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:449
+#: ../src/core/eventstringifier.cpp:533

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was %2@%3 (%4)"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was %2@%3 (%4)"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:458
+#: ../src/core/eventstringifier.cpp:541

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] End of /WHO list for %1"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] End of /WHO list for %1"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:470
+#: ../src/core/eventstringifier.cpp:563

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is logged in since %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is logged in since %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:474
+#: ../src/core/eventstringifier.cpp:568

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is idling for %2 (since %3)"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is idling for %2 (since %3)"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:484
+#: ../src/core/eventstringifier.cpp:576

 msgctxt "EventStringifier|"
 msgid "[Whois] End of /WHOIS list"
 msgstr ""
 
 msgctxt "EventStringifier|"
 msgid "[Whois] End of /WHOIS list"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:507
+#: ../src/core/eventstringifier.cpp:598

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:509
+#: ../src/core/eventstringifier.cpp:600

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:511
+#: ../src/core/eventstringifier.cpp:602

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:532
+#: ../src/core/eventstringifier.cpp:625

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 has %2 users. Topic is: \"%3\""
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 has %2 users. Topic is: \"%3\""
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:540
+#: ../src/core/eventstringifier.cpp:631

 msgctxt "EventStringifier|"
 msgid "End of channel list"
 msgstr ""
 
 msgctxt "EventStringifier|"
 msgid "End of channel list"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:558
+#: ../src/core/eventstringifier.cpp:647

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Homepage for %1 is %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Homepage for %1 is %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:575
+#: ../src/core/eventstringifier.cpp:672

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 created on %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 created on %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:589
+#: ../src/core/eventstringifier.cpp:683

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is authed as %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is authed as %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:592
+#: ../src/core/eventstringifier.cpp:686

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was authed as %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was authed as %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:601
+#: ../src/core/eventstringifier.cpp:694

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "No topic is set for %1."
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "No topic is set for %1."
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:609
+#: ../src/core/eventstringifier.cpp:701

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic for %1 is \"%2\""
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic for %1 is \"%2\""
 msgstr ""
 

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

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic set by %1 on %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic set by %1 on %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:634
+#: ../src/core/eventstringifier.cpp:734

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

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

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] %1"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] %1"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:649
+#: ../src/core/eventstringifier.cpp:750
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[WhoX] %1"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:756

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

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

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick %1 contains illegal characters"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick %1 contains illegal characters"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:669
+#: ../src/core/eventstringifier.cpp:774

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick already in use: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick already in use: %1"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:679
+#: ../src/core/eventstringifier.cpp:783

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:702
+#: ../src/core/eventstringifier.cpp:812

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:717
+#. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
+#: ../src/core/eventstringifier.cpp:829

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

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

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received %1CTCP-%2 request by %3"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received %1CTCP-%2 request by %3"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:721
+#: ../src/core/eventstringifier.cpp:835

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-%1 answer from %2: %3"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-%1 answer from %2: %3"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:737
+#: ../src/core/eventstringifier.cpp:858

 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time"
 msgstr ""
 
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time"
 msgstr ""
 

-#: ../src/core/eventstringifier.cpp:740
-#, qt-format
-msgctxt "EventStringifier|"
-msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time"
-msgstr ""
-
-#: ../src/client/execwrapper.cpp:49
+#: ../src/client/execwrapper.cpp:58

 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Invalid command string for /exec: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Invalid command string for /exec: %1"
 msgstr ""
 

-#: ../src/client/execwrapper.cpp:58
+#: ../src/client/execwrapper.cpp:68

 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
 msgstr ""
 
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
 msgstr ""
 

-#: ../src/client/execwrapper.cpp:69
+#: ../src/client/execwrapper.cpp:79

 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Could not find script \"%1\""
 msgstr ""
 
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Could not find script \"%1\""
 msgstr ""
 

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

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

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

 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" could not start."
 msgstr ""
 
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" could not start."
 msgstr ""
 

-#: ../src/client/execwrapper.cpp:113
+#: ../src/client/execwrapper.cpp:119

 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" caused error %2."
 msgstr ""
 
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" caused error %2."
 msgstr ""
 

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

 msgctxt "FontSelector|"
 msgid "Choose..."
 msgstr ""
 msgctxt "FontSelector|"
 msgid "Choose..."
 msgstr ""


@@ -2890,89 +4627,212 @@ msgctxt "HighlightSettingsPage|"
 msgid "Form"
 msgstr ""
 
 msgid "Form"
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "Custom Highlights"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "Custom Highlights"
 msgstr ""
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:33
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+#: ../src/qtui/settingspages/highlightsettingspage.ui:64

 msgctxt "HighlightSettingsPage|"
 msgctxt "HighlightSettingsPage|"

-msgid "Highlight"
+msgid "Enabled"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgctxt "HighlightSettingsPage|"

-msgid "RegEx"
+msgid "Highlight"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgctxt "HighlightSettingsPage|"

-msgid "CS"
+msgid "RegEx"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgctxt "HighlightSettingsPage|"

-msgid "Enable"
+msgid "CS"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "Channel"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "Channel"
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "Add"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "Add"
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "Remove"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "Remove"
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "Highlight Nicks"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "Highlight Nicks"
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "All nicks from identity"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "All nicks from identity"
 msgstr ""
 

-#: ../src/qtui/settingspages/highlightsettingspage.ui:114
+#: ../src/qtui/settingspages/highlightsettingspage.ui:145

 msgctxt "HighlightSettingsPage|"
 msgid "Current nick"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "Current nick"
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "None"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "None"
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "Interface"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "Interface"
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "this shouldn't be empty"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "this shouldn't be empty"
 msgstr ""
 

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

 msgctxt "HighlightSettingsPage|"
 msgid "highlight rule"
 msgstr ""
 
 msgctxt "HighlightSettingsPage|"
 msgid "highlight rule"
 msgstr ""
 

+#: ../src/core/identserver.cpp:46
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Invalid listen address %1"
+msgstr ""
+
+#: ../src/core/identserver.cpp:55
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd requests on IPv6 %1 port %2"
+msgstr ""
+
+#: ../src/core/identserver.cpp:63
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Could not open IPv6 interface %1:%2: %3"
+msgstr ""
+
+#: ../src/core/identserver.cpp:71
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd requests on IPv4 %1 port %2"
+msgstr ""
+
+#: ../src/core/identserver.cpp:81
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Could not open IPv4 interface %1:%2: %3"
+msgstr ""
+
+#: ../src/core/identserver.cpp:89
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Invalid listen address %1, unknown network protocol"
+msgstr ""
+
+#: ../src/core/identserver.cpp:98
+msgctxt "IdentServer|"
+msgid ""
+"Identd could not open any network interfaces to listen on! No identd "
+"functionality will be available"
+msgstr ""
+

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

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

 msgctxt "IdentitiesSettingsPage|"
 msgid "Rename Identity"
 msgstr ""
 msgctxt "IdentitiesSettingsPage|"
 msgid "Rename Identity"
 msgstr ""


@@ -2998,103 +4858,103 @@ msgctxt "IdentitiesSettingsPage|"
 msgid "Remove Identity"
 msgstr ""
 
 msgid "Remove Identity"
 msgstr ""
 

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

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

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

 msgctxt "IdentitiesSettingsPage|"
 msgid "Identities"
 msgstr ""
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "Identities"
 msgstr ""
 

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

 msgctxt "IdentitiesSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"
 msgstr ""
 
 msgctxt "IdentitiesSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"
 msgstr ""
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:206
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:194

 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>All identities need an identity name set</li>"
 msgstr ""
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>All identities need an identity name set</li>"
 msgstr ""
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:207
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:196

 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>Every identity needs at least one nickname defined</li>"
 msgstr ""
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>Every identity needs at least one nickname defined</li>"
 msgstr ""
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:208
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:198

 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify a real name for every identity</li>"
 msgstr ""
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify a real name for every identity</li>"
 msgstr ""
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:209
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:200

 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr ""
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr ""
 

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

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

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

 msgctxt "IdentitiesSettingsPage|"
 msgid "One or more identities are invalid"
 msgstr ""
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "One or more identities are invalid"
 msgstr ""
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:356
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:335

 msgctxt "IdentitiesSettingsPage|"
 msgid "Delete Identity?"
 msgstr ""
 
 msgctxt "IdentitiesSettingsPage|"
 msgid "Delete Identity?"
 msgstr ""
 

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

 #, qt-format
 msgctxt "IdentitiesSettingsPage|"
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr ""
 
 #, qt-format
 msgctxt "IdentitiesSettingsPage|"
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr ""
 

-#: ../src/qtui/settingspages/identitiessettingspage.cpp:371
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:353

 #, qt-format
 msgctxt "IdentitiesSettingsPage|"
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr ""
 
 #, qt-format
 msgctxt "IdentitiesSettingsPage|"
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr ""
 

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

 msgctxt "Identity|"
 msgid "Quassel IRC User"
 msgstr ""
 
 msgctxt "Identity|"
 msgid "Quassel IRC User"
 msgstr ""
 

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

 msgctxt "Identity|"
 msgid "<empty>"
 msgstr ""
 
 msgctxt "Identity|"
 msgid "<empty>"
 msgstr ""
 

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

 msgctxt "Identity|"
 msgid "Gone fishing."
 msgstr ""
 
 msgctxt "Identity|"
 msgid "Gone fishing."
 msgstr ""
 

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

 msgctxt "Identity|"
 msgid "Not here. No, really. not here!"
 msgstr ""
 
 msgctxt "Identity|"
 msgid "Not here. No, really. not here!"
 msgstr ""
 

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

 msgctxt "Identity|"
 msgid "All Quassel clients vanished from the face of the earth..."
 msgstr ""
 
 msgctxt "Identity|"
 msgid "All Quassel clients vanished from the face of the earth..."
 msgstr ""
 

-#: ../src/common/identity.cpp:193
+#: ../src/common/identity.cpp:186

 msgctxt "Identity|"
 msgid "Kindergarten is elsewhere!"
 msgstr ""
 
 msgctxt "Identity|"
 msgid "Kindergarten is elsewhere!"
 msgstr ""
 

-#: ../src/common/identity.cpp:194 ../src/common/identity.cpp:195
+#: ../src/common/identity.cpp:187 ../src/common/identity.cpp:188

 msgctxt "Identity|"
 msgctxt "Identity|"

-msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
+msgid "https://quassel-irc.org - Chat comfortably. Anywhere."

 msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
 msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:30


@@ -3226,7 +5086,7 @@ msgid "minutes of being idle"
 msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:399
 msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:399

-#: ../src/qtui/settingspages/identityeditwidget.cpp:238
+#: ../src/qtui/settingspages/identityeditwidget.cpp:277

 msgctxt "IdentityEditWidget|"
 msgid "Advanced"
 msgstr ""
 msgctxt "IdentityEditWidget|"
 msgid "Advanced"
 msgstr ""


@@ -3294,16 +5154,15 @@ msgid "Key Type:"
 msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:605
 msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:605

-#: ../src/qtui/settingspages/identityeditwidget.cpp:353
-#: ../src/qtui/settingspages/identityeditwidget.cpp:365
+#: ../src/qtui/settingspages/identityeditwidget.cpp:396

 msgctxt "IdentityEditWidget|"
 msgid "No Key loaded"
 msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:625
 #: ../src/qtui/settingspages/identityeditwidget.ui:723
 msgctxt "IdentityEditWidget|"
 msgid "No Key loaded"
 msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:625
 #: ../src/qtui/settingspages/identityeditwidget.ui:723

-#: ../src/qtui/settingspages/identityeditwidget.cpp:354
-#: ../src/qtui/settingspages/identityeditwidget.cpp:408
+#: ../src/qtui/settingspages/identityeditwidget.cpp:397
+#: ../src/qtui/settingspages/identityeditwidget.cpp:451

 msgctxt "IdentityEditWidget|"
 msgid "Load"
 msgstr ""
 msgctxt "IdentityEditWidget|"
 msgid "Load"
 msgstr ""


@@ -3320,8 +5179,8 @@ msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:663
 #: ../src/qtui/settingspages/identityeditwidget.ui:697
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:663
 #: ../src/qtui/settingspages/identityeditwidget.ui:697

-#: ../src/qtui/settingspages/identityeditwidget.cpp:406
-#: ../src/qtui/settingspages/identityeditwidget.cpp:407
+#: ../src/qtui/settingspages/identityeditwidget.cpp:449
+#: ../src/qtui/settingspages/identityeditwidget.cpp:450

 msgctxt "IdentityEditWidget|"
 msgid "No Certificate loaded"
 msgstr ""
 msgctxt "IdentityEditWidget|"
 msgid "No Certificate loaded"
 msgstr ""


@@ -3331,50 +5190,127 @@ msgctxt "IdentityEditWidget|"
 msgid "CommonName:"
 msgstr ""
 
 msgid "CommonName:"
 msgstr ""
 

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

 msgctxt "IdentityEditWidget|"
 msgid "Load a Key"
 msgstr ""
 
 msgctxt "IdentityEditWidget|"
 msgid "Load a Key"
 msgstr ""
 

-#: ../src/qtui/settingspages/identityeditwidget.cpp:344
+#: ../src/qtui/settingspages/identityeditwidget.cpp:380

 msgctxt "IdentityEditWidget|"
 msgid "Failed to read key"
 msgstr ""
 
 msgctxt "IdentityEditWidget|"
 msgid "Failed to read key"
 msgstr ""
 

-#: ../src/qtui/settingspages/identityeditwidget.cpp:344
+#: ../src/qtui/settingspages/identityeditwidget.cpp:381

 msgctxt "IdentityEditWidget|"
 msgid ""
 "Failed to read the key file. It is either incompatible or invalid. Note that "
 "the key file must not have a passphrase."
 msgstr ""
 
 msgctxt "IdentityEditWidget|"
 msgid ""
 "Failed to read the key file. It is either incompatible or invalid. Note that "
 "the key file must not have a passphrase."
 msgstr ""
 

-#: ../src/qtui/settingspages/identityeditwidget.cpp:359
+#: ../src/qtui/settingspages/identityeditwidget.cpp:386
+msgctxt "IdentityEditWidget|"
+msgid "Core does not support ECDSA keys"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:387
+msgctxt "IdentityEditWidget|"
+msgid ""
+"You loaded an ECDSA key, but the core does not support ECDSA keys. Please "
+"contact the core administrator."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:402

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

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

 msgctxt "IdentityEditWidget|"
 msgid "DSA"
 msgstr ""
 
 msgctxt "IdentityEditWidget|"
 msgid "DSA"
 msgstr ""
 

-#: ../src/qtui/settingspages/identityeditwidget.cpp:367
+#: ../src/qtui/settingspages/identityeditwidget.cpp:411
+msgctxt "IdentityEditWidget|"
+msgid "Invalid key or no key loaded"
+msgstr ""
+

 #: ../src/qtui/settingspages/identityeditwidget.cpp:413
 #: ../src/qtui/settingspages/identityeditwidget.cpp:413

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

 msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr ""
 
 msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr ""
 

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

 msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr ""
 
 msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr ""
 

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

 msgctxt "IdentityPage|"
 msgid "Setup Identity"
 msgstr ""
 
 msgctxt "IdentityPage|"
 msgid "Setup Identity"
 msgstr ""
 

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

 msgctxt "IdentityPage|"
 msgid "Default Identity"
 msgstr ""
 msgctxt "IdentityPage|"
 msgid "Default Identity"
 msgstr ""


@@ -3525,12 +5461,22 @@ msgid ""
 "<i>channel</i> names.</p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"
 "<i>channel</i> names.</p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"

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

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

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

 msgstr ""
 
 msgstr ""
 

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

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


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

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

 msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr ""
 
 msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr ""
 

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

 msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
 "dynamic rules, disabling actually shows the filtered messages again"
 msgstr ""
 
 msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
 "dynamic rules, disabling actually shows the filtered messages again"
 msgstr ""
 

-#: ../src/qtui/settingspages/ignorelistmodel.cpp:75
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:72

 msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "
 msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "


@@ -3563,27 +5509,27 @@ msgid ""
 "nickname \"stupid\" from any host<br />"
 msgstr ""
 
 "nickname \"stupid\" from any host<br />"
 msgstr ""
 

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

 msgctxt "IgnoreListModel|"
 msgid "By Sender"
 msgstr ""
 
 msgctxt "IgnoreListModel|"
 msgid "By Sender"
 msgstr ""
 

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

 msgctxt "IgnoreListModel|"
 msgid "By Message"
 msgstr ""
 
 msgctxt "IgnoreListModel|"
 msgid "By Message"
 msgstr ""
 

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

 msgctxt "IgnoreListModel|"
 msgid "Enabled"
 msgstr ""
 
 msgctxt "IgnoreListModel|"
 msgid "Enabled"
 msgstr ""
 

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

 msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr ""
 
 msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr ""
 

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

 msgctxt "IgnoreListModel|"
 msgid "Ignore Rule"
 msgstr ""
 msgctxt "IgnoreListModel|"
 msgid "Ignore Rule"
 msgstr ""


@@ -3608,142 +5554,175 @@ msgctxt "IgnoreListSettingsPage|"
 msgid "&Edit"
 msgstr ""
 
 msgid "&Edit"
 msgstr ""
 

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

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

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

 msgctxt "IgnoreListSettingsPage|"
 msgid "Ignore List"
 msgstr ""
 
 msgctxt "IgnoreListSettingsPage|"
 msgid "Ignore List"
 msgstr ""
 

-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144
-msgctxt "IgnoreListSettingsPage|"
-msgid "Rule already exists"
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:139
+msgctxt "IgnoreListSettingsPage|"
+msgid "Rule already exists"
+msgstr ""
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:140
+#, qt-format
+msgctxt "IgnoreListSettingsPage|"
+msgid ""
+"There is already a rule\n"
+"\"%1\"\n"
+"Please choose another rule."
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:26
+msgctxt "InputWidget|"
+msgid "Form"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:89
+msgctxt "InputWidget|"
+msgid "View and change nick"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:175
+msgctxt "InputWidget|"
+msgid "Bold"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:215
+msgctxt "InputWidget|"
+msgid "Italic"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145
-#, qt-format
-msgctxt "IgnoreListSettingsPage|"
-msgid ""
-"There is already a rule\n"
-"\"%1\"\n"
-"Please choose another rule."
+#: ../src/qtui/inputwidget.ui:258
+msgctxt "InputWidget|"
+msgid "Underline"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
-msgctxt "IndicatorNotificationConfigWidget|"
-msgid "Form"
+#: ../src/qtui/inputwidget.ui:301
+msgctxt "InputWidget|"
+msgid "Strikethrough"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
-msgctxt "IndicatorNotificationConfigWidget|"
-msgid ""
-"This enables support for the Ayatana Project's application indicator "
-"(libindicate)."
+#: ../src/qtui/inputwidget.ui:341
+msgctxt "InputWidget|"
+msgid "Set foreground color"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
-msgctxt "IndicatorNotificationConfigWidget|"
-msgid "Show messages in application indicator"
+#: ../src/qtui/inputwidget.ui:372
+msgctxt "InputWidget|"
+msgid "Set background color"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgctxt "InputWidget|"

-msgid "Form"
+msgid "Clear formatting"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "White"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "White"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Black"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Black"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Red"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Red"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Orange"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Orange"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Green"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Green"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr ""
 

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

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

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

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

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

 msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr ""
 

-#: ../src/qtui/inputwidget.cpp:85 ../src/qtui/inputwidget.cpp:86
+#: ../src/qtui/inputwidget.cpp:91 ../src/qtui/inputwidget.cpp:92

 msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr ""
 

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

 msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr ""
 
 msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr ""
 

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

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


@@ -3756,80 +5735,75 @@ msgstr ""
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
 msgctxt "InputWidgetSettingsPage|"
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
 msgctxt "InputWidgetSettingsPage|"

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

 msgid "Enable per chat history"
 msgstr ""
 
 msgid "Enable per chat history"
 msgstr ""
 

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

 msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
 msgstr ""
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
 msgstr ""
 

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

 msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
 msgstr ""
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
 msgstr ""
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:98

 msgctxt "InputWidgetSettingsPage|"
 msgid "Enables (limited) Emacs key bindings in the input field."
 msgstr ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Line wrapping"
 msgstr ""
 

-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:143
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130

 msgctxt "InputWidgetSettingsPage|"
 msgctxt "InputWidgetSettingsPage|"

-msgid "Multi-Line Editing"
+msgid "&Multi-Line Editing"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "InputWidgetSettingsPage|"
 msgid "Show at most"
 msgstr ""
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show at most"
 msgstr ""
 

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

 msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
 msgstr ""
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
 msgstr ""
 

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

 msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
 msgstr ""
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
 msgstr ""
 

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

 msgctxt "InputWidgetSettingsPage|"
 msgid "Tab Completion"
 msgstr ""
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Tab Completion"
 msgstr ""
 

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

 msgctxt "InputWidgetSettingsPage|"
 msgid "Completion suffix:"
 msgstr ""
 
 msgctxt "InputWidgetSettingsPage|"
 msgid "Completion suffix:"
 msgstr ""
 

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

 msgctxt "InputWidgetSettingsPage|"
 msgid ": "
 msgstr ""
 
 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 ""
 msgctxt "InputWidgetSettingsPage|"
 msgid "Add space after nick when completing mid-sentence"
 msgstr ""


@@ -3844,52 +5818,119 @@ msgctxt "InputWidgetSettingsPage|"
 msgid "Input Widget"
 msgstr ""
 
 msgid "Input Widget"
 msgstr ""
 

-#: ../src/common/internalpeer.cpp:58
+#: ../src/common/internalpeer.cpp:52 ../src/common/internalpeer.cpp:57

 msgctxt "InternalPeer|"
 msgid "internal connection"
 msgstr ""
 
 msgctxt "InternalPeer|"
 msgid "internal connection"
 msgstr ""
 

-#: ../src/qtui/ircconnectionwizard.cpp:49
+#: ../src/qtui/ircconnectionwizard.cpp:47

 msgctxt "IrcConnectionWizard|"
 msgid "Save && Connect"
 msgstr ""
 
 msgctxt "IrcConnectionWizard|"
 msgid "Save && Connect"
 msgstr ""
 

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

 msgctxt "IrcListModel|"
 msgid "Channel"
 msgstr ""
 
 msgctxt "IrcListModel|"
 msgid "Channel"
 msgstr ""
 

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

 msgctxt "IrcListModel|"
 msgid "Users"
 msgstr ""
 
 msgctxt "IrcListModel|"
 msgid "Users"
 msgstr ""
 

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

 msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr ""
 
 msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr ""
 

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

 msgctxt "IrcUserItem|"
 msgctxt "IrcUserItem|"

-msgid " is away"
+msgid "Modes"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:953
-#, qt-format
+#: ../src/client/networkmodel.cpp:1102

 msgctxt "IrcUserItem|"
 msgctxt "IrcUserItem|"

-msgid "idling since %1"
+msgid "Unknown"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "IrcUserItem|"
 msgctxt "IrcUserItem|"

-msgid "login time: %1"
+msgid "Away message"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:959
-#, qt-format
+#: ../src/client/networkmodel.cpp:1110
+msgctxt "IrcUserItem|"
+msgid "Realname"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1115
+msgctxt "IrcUserItem|"
+msgid "Help status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1115
+msgctxt "IrcUserItem|"
+msgid "Available for help"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1118
+msgctxt "IrcUserItem|"
+msgid "Service status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1128
+msgctxt "IrcUserItem|"
+msgid "Not logged in"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1134 ../src/client/networkmodel.cpp:1141
+msgctxt "IrcUserItem|"
+msgid "Account"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1141
+msgctxt "IrcUserItem|"
+msgid "Identified for this nick"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1147
+msgctxt "IrcUserItem|"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1151
+msgctxt "IrcUserItem|"
+msgid "Hostmask"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1155
+msgctxt "IrcUserItem|"
+msgid "Operator"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1163
+msgctxt "IrcUserItem|"
+msgid "Idling since"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1167
+msgctxt "IrcUserItem|"
+msgid "Login time"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1170

 msgctxt "IrcUserItem|"
 msgctxt "IrcUserItem|"

-msgid "server: %1"
+msgid "Server"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1175
+msgctxt "IrcUserItem|"
+msgid "No information available"

 msgstr ""
 
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:14
 msgstr ""
 
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:14


@@ -3927,63 +5968,63 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Use Custom Colors"
 msgstr ""
 
 msgid "Use Custom Colors"
 msgstr ""
 

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

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

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

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

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

 msgctxt "ItemViewSettingsPage|"
 msgid "Inactive:"
 msgstr ""
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Inactive:"
 msgstr ""
 

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

 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
 msgstr ""
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
 msgstr ""
 

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

 msgctxt "ItemViewSettingsPage|"
 msgid "Highlight:"
 msgstr ""
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Highlight:"
 msgstr ""
 

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

 msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
 msgstr ""
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
 msgstr ""
 

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:318

 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 msgstr ""
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 msgstr ""
 

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:333

 msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
 msgstr ""
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
 msgstr ""
 

-#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:373

 msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr ""
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr ""
 

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

 msgctxt "ItemViewSettingsPage|"
 msgid "Interface"
 msgstr ""
 
 msgctxt "ItemViewSettingsPage|"
 msgid "Interface"
 msgstr ""
 

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

 msgctxt "ItemViewSettingsPage|"
 msgid "Chat & Nick Lists"
 msgstr ""
 msgctxt "ItemViewSettingsPage|"
 msgid "Chat & Nick Lists"
 msgstr ""


@@ -4018,7 +6059,13 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Other activity"
 msgstr ""
 
 msgid "Other activity"
 msgstr ""
 

-#: ../src/qtui/knotificationbackend.cpp:130
+#: ../src/qtui/knotificationbackend.cpp:78
+#: ../src/qtui/knotificationbackend.cpp:80
+msgctxt "KNotificationBackend|"
+msgid "View"
+msgstr ""
+
+#: ../src/qtui/knotificationbackend.cpp:138

 #, qt-format
 msgctxt "KNotificationBackend|"
 msgid "%n pending highlight(s)"
 #, qt-format
 msgctxt "KNotificationBackend|"
 msgid "%n pending highlight(s)"


@@ -4026,61 +6073,61 @@ msgid_plural "%n pending highlight(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:80
+#: ../src/qtui/settingspages/keysequencewidget.cpp:76

 msgctxt "KeySequenceButton|"
 msgid "The key you just pressed is not supported by Qt."
 msgstr ""
 
 msgctxt "KeySequenceButton|"
 msgid "The key you just pressed is not supported by Qt."
 msgstr ""
 

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

 msgctxt "KeySequenceButton|"
 msgid "Unsupported Key"
 msgstr ""
 
 msgctxt "KeySequenceButton|"
 msgid "Unsupported Key"
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:176
+#: ../src/qtui/settingspages/keysequencewidget.cpp:166

 msgctxt "KeySequenceWidget|"
 msgid ""
 "Click on the button, then enter the shortcut like you would in the program.\n"
 "Example for Ctrl+a: hold the Ctrl key and press a."
 msgstr ""
 
 msgctxt "KeySequenceWidget|"
 msgid ""
 "Click on the button, then enter the shortcut like you would in the program.\n"
 "Example for Ctrl+a: hold the Ctrl key and press a."
 msgstr ""
 

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

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

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

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

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

 msgctxt "KeySequenceWidget|Alt key"
 msgid "Alt"
 msgstr ""
 
 msgctxt "KeySequenceWidget|Alt key"
 msgid "Alt"
 msgstr ""
 

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

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

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

 msgctxt ""
 "KeySequenceWidget|What the user inputs now will be taken as the new shortcut"
 msgid "Input"
 msgstr ""
 
 msgctxt ""
 "KeySequenceWidget|What the user inputs now will be taken as the new shortcut"
 msgid "Input"
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:288
+#: ../src/qtui/settingspages/keysequencewidget.cpp:283

 msgctxt "KeySequenceWidget|No shortcut defined"
 msgid "None"
 msgstr ""
 
 msgctxt "KeySequenceWidget|No shortcut defined"
 msgid "None"
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:383
-#: ../src/qtui/settingspages/keysequencewidget.cpp:389
+#: ../src/qtui/settingspages/keysequencewidget.cpp:373
+#: ../src/qtui/settingspages/keysequencewidget.cpp:381

 msgctxt "KeySequenceWidget|"
 msgid "Shortcut Conflict"
 msgstr ""
 
 msgctxt "KeySequenceWidget|"
 msgid "Shortcut Conflict"
 msgstr ""
 

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

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


@@ -4088,413 +6135,599 @@ msgid ""
 "Please choose another one."
 msgstr ""
 
 "Please choose another one."
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:390
+#: ../src/qtui/settingspages/keysequencewidget.cpp:382

 #, qt-format
 msgctxt "KeySequenceWidget|"
 msgid ""
 "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
 msgstr ""
 
 #, qt-format
 msgctxt "KeySequenceWidget|"
 msgid ""
 "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:392
+#: ../src/qtui/settingspages/keysequencewidget.cpp:383

 msgctxt "KeySequenceWidget|"
 msgid "Do you want to reassign this shortcut to the selected action?"
 msgstr ""
 
 msgctxt "KeySequenceWidget|"
 msgid "Do you want to reassign this shortcut to the selected action?"
 msgstr ""
 

-#: ../src/qtui/settingspages/keysequencewidget.cpp:395
+#: ../src/qtui/settingspages/keysequencewidget.cpp:387

 msgctxt "KeySequenceWidget|"
 msgid "Reassign"
 msgstr ""
 
 msgctxt "KeySequenceWidget|"
 msgid "Reassign"
 msgstr ""
 

-#: ../src/common/protocols/legacy/legacypeer.cpp:136
+#: ../src/core/ldapauthenticator.cpp:71
+msgctxt "LdapAuthenticator|"
+msgid "LDAP"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:76
+msgctxt "LdapAuthenticator|"
+msgid "Authenticate users using an LDAP server."
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:83
+msgctxt "LdapAuthenticator|"
+msgid "Hostname"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:83
+msgctxt "LdapAuthenticator|"
+msgid "Port"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:84
+msgctxt "LdapAuthenticator|"
+msgid "Bind DN"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:84
+msgctxt "LdapAuthenticator|"
+msgid "Bind Password"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:84
+msgctxt "LdapAuthenticator|"
+msgid "Base DN"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:85
+msgctxt "LdapAuthenticator|"
+msgid "Filter"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:85
+msgctxt "LdapAuthenticator|"
+msgid "UID Attribute"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:142

 msgctxt "LegacyPeer|"
 msgid "Invalid handshake message!"
 msgstr ""
 
 msgctxt "LegacyPeer|"
 msgid "Invalid handshake message!"
 msgstr ""
 

-#: ../src/common/protocols/legacy/legacypeer.cpp:207
+#: ../src/common/protocols/legacy/legacypeer.cpp:225

 #, qt-format
 msgctxt "LegacyPeer|"
 msgid "Unknown protocol message of type %1"
 msgstr ""
 
 #, qt-format
 msgctxt "LegacyPeer|"
 msgid "Unknown protocol message of type %1"
 msgstr ""
 

-#: ../src/common/protocols/legacy/legacypeer.cpp:256
+#: ../src/common/logger.cpp:90

 #, qt-format
 #, qt-format

-msgctxt "LegacyPeer|"
-msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
+msgctxt "Logger|"
+msgid "Invalid log level %1; supported are Debug|Info|Warning|Error"
+msgstr ""
+
+#: ../src/common/logger.cpp:98
+#, qt-format
+msgctxt "Logger|"
+msgid "Could not open log file \"%1\": %2"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:358
+#: ../src/common/logger.cpp:103
+#, qt-format
+msgctxt "Logger|"
+msgid "Cannot write to stderr: %1"
+msgstr ""
+
+#: ../src/qtui/mainpage.cpp:43
+msgctxt "MainPage|"
+msgid "Connect to Core..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:357

 msgctxt "MainWin|"
 msgid "General"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "General"
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgid "&Connect to Core..."
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&Connect to Core..."
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgid "&Disconnect from Core"
 msgstr ""
 
 #: ../src/qtui/mainwin.cpp:364
 msgctxt "MainWin|"
 msgctxt "MainWin|"
 msgid "&Disconnect from Core"
 msgstr ""
 
 #: ../src/qtui/mainwin.cpp:364
 msgctxt "MainWin|"

+msgid "Change &Password..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:365
+msgctxt "MainWin|"

 msgid "Core &Info..."
 msgstr ""
 
 msgid "Core &Info..."
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:366
+#: ../src/qtui/mainwin.cpp:367

 msgctxt "MainWin|"
 msgid "Configure &Networks..."
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Configure &Networks..."
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgid "&Quit"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&Quit"
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:376
-msgctxt "MainWin|"
-msgid "&Lock Layout"
-msgstr ""
-
-#: ../src/qtui/mainwin.cpp:380
+#: ../src/qtui/mainwin.cpp:373

 msgctxt "MainWin|"
 msgid "Show &Search Bar"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Show &Search Bar"
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgid "Show &Menubar"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Show &Menubar"
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgid "Show Status &Bar"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Show Status &Bar"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:393
+#: ../src/qtui/mainwin.cpp:378
+msgctxt "MainWin|"
+msgid "&Lock Layout"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:390

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

-#: ../src/qtui/mainwin.cpp:400
+#: ../src/qtui/mainwin.cpp:401

 msgctxt "MainWin|"
 msgid "Configure &Shortcuts..."
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Configure &Shortcuts..."
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:406 ../src/qtui/mainwin.cpp:410
+#: ../src/qtui/mainwin.cpp:404

 msgctxt "MainWin|"
 msgid "&Configure Quassel..."
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&Configure Quassel..."
 msgstr ""
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ../src/qtui/mainwin.cpp:435
+#: ../src/qtui/mainwin.cpp:422
+msgctxt "MainWin|"
+msgid "Show &Resource Tree"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:425

 msgctxt "MainWin|"
 msgid "Reload Stylesheet"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Reload Stylesheet"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:438
+#: ../src/qtui/mainwin.cpp:432

 msgctxt "MainWin|"
 msgid "Hide Current Buffer"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Hide Current Buffer"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:442
+#: ../src/qtui/mainwin.cpp:435
+msgctxt "MainWin|"
+msgid "Text formatting"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:440
+msgctxt "MainWin|"
+msgid "Apply foreground color"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:447
+msgctxt "MainWin|"
+msgid "Apply background color"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:454
+msgctxt "MainWin|"
+msgid "Clear formatting"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:460
+msgctxt "MainWin|"
+msgid "Toggle bold"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:462
+msgctxt "MainWin|"
+msgid "Toggle italics"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:465
+msgctxt "MainWin|"
+msgid "Toggle underline"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:472
+msgctxt "MainWin|"
+msgid "Toggle strikethrough"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:479

 msgctxt "MainWin|"
 msgid "Navigation"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Navigation"
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:456
+#: ../src/qtui/mainwin.cpp:485
+msgctxt "MainWin|"
+msgid "Activate the buffer search"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:497

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: ../src/qtui/mainwin.cpp:499
+#: ../src/qtui/mainwin.cpp:551

 msgctxt "MainWin|"
 msgid "Activate Next Chat List"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Activate Next Chat List"
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgid "Activate Previous Chat List"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Activate Previous Chat List"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:503
+#: ../src/qtui/mainwin.cpp:565

 msgctxt "MainWin|"
 msgid "Go to Next Chat"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Go to Next Chat"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:505
+#: ../src/qtui/mainwin.cpp:572

 msgctxt "MainWin|"
 msgid "Go to Previous Chat"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Go to Previous Chat"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:514
+#: ../src/qtui/mainwin.cpp:583

 msgctxt "MainWin|"
 msgid "&File"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&File"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:527
+#: ../src/qtui/mainwin.cpp:598

 msgctxt "MainWin|"
 msgid "&Networks"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&Networks"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:533
+#: ../src/qtui/mainwin.cpp:604

 msgctxt "MainWin|"
 msgid "&View"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&View"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:534
+#: ../src/qtui/mainwin.cpp:605

 msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:550
+#: ../src/qtui/mainwin.cpp:621

 msgctxt "MainWin|"
 msgid "&Settings"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&Settings"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:559
+#: ../src/qtui/mainwin.cpp:635

 msgctxt "MainWin|"
 msgid "&Help"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "&Help"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:567
+#: ../src/qtui/mainwin.cpp:648

 msgctxt "MainWin|"
 msgid "Debug"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Debug"
 msgstr ""
 

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

 msgctxt "MainWin|"
 msgctxt "MainWin|"

-msgid "Nicks"
+msgid "Feature Not Supported"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:817
+msgctxt "MainWin|"
+msgid "<b>Your Quassel Core does not support this feature</b>"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:819
+msgctxt "MainWin|"
+msgid ""
+"You need a Quassel Core v0.12.0 or newer in order to be able to remotely "
+"change your password."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:828
+msgctxt "MainWin|"
+msgid "Upgrading..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:829
+msgctxt "MainWin|"
+msgid "Your database is being upgraded"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:833
+msgctxt "MainWin|"
+msgid ""
+"In order to support new features, we need to make changes to your backlog "
+"database. This may take a long while."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:834
+msgctxt "MainWin|"
+msgid "Do not exit Quassel until the upgrade is complete!"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:849
+msgctxt "MainWin|"
+msgid "Fatal error"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:850
+msgctxt "MainWin|"
+msgid "Quassel encountered a fatal error and is terminated."

 msgstr ""
 
 #: ../src/qtui/mainwin.cpp:852
 msgctxt "MainWin|"
 msgstr ""
 
 #: ../src/qtui/mainwin.cpp:852
 msgctxt "MainWin|"

+msgid "Reason:<em>"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:966
+msgctxt "MainWin|"
+msgid "Nicks"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:976
+msgctxt "MainWin|"

 msgid "Show Nick List"
 msgstr ""
 
 msgid "Show Nick List"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:865
+#: ../src/qtui/mainwin.cpp:990

 msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:877
+#: ../src/qtui/mainwin.cpp:1001

 msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:883
+#: ../src/qtui/mainwin.cpp:1006

 msgctxt "MainWin|"
 msgid "Inputline"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Inputline"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:892
+#: ../src/qtui/mainwin.cpp:1015

 msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:907
+#: ../src/qtui/mainwin.cpp:1025

 msgctxt "MainWin|"
 msgid "Topic"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Topic"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:919
+#: ../src/qtui/mainwin.cpp:1039

 msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1013
+#: ../src/qtui/mainwin.cpp:1044
+msgctxt "MainWin|"
+msgid "Transfers"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1055
+msgctxt "MainWin|"
+msgid "Show File Transfers"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1150

 msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1074
+#: ../src/qtui/mainwin.cpp:1170
+msgctxt "MainWin|"
+msgid "Nick Toolbar"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1251

 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1173
+#: ../src/qtui/mainwin.cpp:1347

 msgctxt "MainWin|"
 msgid "Not connected to core."
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Not connected to core."
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1191 ../src/qtui/mainwin.cpp:1201
+#: ../src/qtui/mainwin.cpp:1365 ../src/qtui/mainwin.cpp:1376

 msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1191
+#: ../src/qtui/mainwin.cpp:1366

 msgctxt "MainWin|"
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1193 ../src/qtui/mainwin.cpp:1203
+#: ../src/qtui/mainwin.cpp:1368 ../src/qtui/mainwin.cpp:1379

 msgctxt "MainWin|"
 msgid ""
 "Sensitive data, like passwords, will be transmitted unencrypted to your "
 "Quassel core."
 msgstr ""
 
 msgctxt "MainWin|"
 msgid ""
 "Sensitive data, like passwords, will be transmitted unencrypted to your "
 "Quassel core."
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1201
+#: ../src/qtui/mainwin.cpp:1377

 msgctxt "MainWin|"
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1219 ../src/qtui/mainwin.cpp:1240
+#: ../src/qtui/mainwin.cpp:1398 ../src/qtui/mainwin.cpp:1418

 msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1220
+#: ../src/qtui/mainwin.cpp:1399

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


@@ -4502,54 +6735,112 @@ msgid ""
 "following reasons:</b>"
 msgstr ""
 
 "following reasons:</b>"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1223
+#: ../src/qtui/mainwin.cpp:1402

 msgctxt "MainWin|"
 msgid "Continue"
 msgstr ""
 
 msgctxt "MainWin|"
 msgid "Continue"
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1224
-msgctxt "MainWin|"
-msgid "Show Certificate"
+#: ../src/qtui/mainwin.cpp:1403
+msgctxt "MainWin|"
+msgid "Show Certificate"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1419
+msgctxt "MainWin|"
+msgid ""
+"Would you like to accept this certificate forever without being prompted?"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1421
+msgctxt "MainWin|"
+msgid "Current Session Only"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1422
+msgctxt "MainWin|"
+msgid "Forever"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1430
+msgctxt "MainWin|"
+msgid "Core Connection Error"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1460 ../src/qtui/mainwin.cpp:1461
+msgctxt "MainWin|"
+msgid "No network selected"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1463
+msgctxt "MainWin|"
+msgid "Select a network before trying to view the channel list."
+msgstr ""
+
+#: ../src/client/messagemodel.cpp:410
+#, qt-format
+msgctxt "MessageModel|"
+msgid "Requesting %1 messages from backlog for buffer %2:%3"
+msgstr ""
+
+#: ../src/core/metricsserver.cpp:53
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Invalid listen address %1"
+msgstr ""
+
+#: ../src/core/metricsserver.cpp:62
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Listening for metrics requests on IPv6 %1 port %2"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1241
-msgctxt "MainWin|"
-msgid ""
-"Would you like to accept this certificate forever without being prompted?"
+#: ../src/core/metricsserver.cpp:70
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Could not open IPv6 interface %1:%2: %3"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1243
-msgctxt "MainWin|"
-msgid "Current Session Only"
+#: ../src/core/metricsserver.cpp:78
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Listening for metrics requests on IPv4 %1 port %2"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1244
-msgctxt "MainWin|"
-msgid "Forever"
+#: ../src/core/metricsserver.cpp:88
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Could not open IPv4 interface %1:%2: %3"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/mainwin.cpp:1255
-msgctxt "MainWin|"
-msgid "Core Connection Error"
+#: ../src/core/metricsserver.cpp:96
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Invalid listen address %1, unknown network protocol"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/messagemodel.cpp:404
-#, qt-format
-msgctxt "MessageModel|"
-msgid "Requesting %1 messages from backlog for buffer %2:%3"
+#: ../src/core/metricsserver.cpp:105
+msgctxt "MetricsServer|"
+msgid ""
+"Metrics could not open any network interfaces to listen on! No metrics "
+"functionality will be available"

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "MsgProcessorStatusWidget|"
 msgid "Form"
 msgstr ""
 
 msgctxt "MsgProcessorStatusWidget|"
 msgid "Form"
 msgstr ""
 

-#: ../src/qtui/ui/msgprocessorstatuswidget.ui:34
+#: ../src/qtui/msgprocessorstatuswidget.ui:34

 msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr ""
 
 msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr ""
 

-#: ../src/uisupport/multilineedit.cpp:718
+#: ../src/uisupport/multilineedit.cpp:95
+msgctxt "MultiLineEdit|"
+msgid "Auto Spell Check"
+msgstr ""
+
+#: ../src/uisupport/multilineedit.cpp:723

 #, qt-format
 msgctxt "MultiLineEdit|"
 msgid "Do you really want to paste %n line(s)?"
 #, qt-format
 msgctxt "MultiLineEdit|"
 msgid "Do you really want to paste %n line(s)?"


@@ -4557,7 +6848,7 @@ msgid_plural "Do you really want to paste %n line(s)?"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/uisupport/multilineedit.cpp:727
+#: ../src/uisupport/multilineedit.cpp:732

 msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr ""
 msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr ""


@@ -4604,7 +6895,37 @@ msgstr ""
 
 #: ../src/qtui/settingspages/networkadddlg.ui:131
 msgctxt "NetworkAddDlg|"
 
 #: ../src/qtui/settingspages/networkadddlg.ui:131
 msgctxt "NetworkAddDlg|"

-msgid "Use secure connection"
+msgid "Try to use an encrypted connection (e.g. SSL/TLS)"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:134
+msgctxt "NetworkAddDlg|"
+msgid "Use encrypted connection"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:144
+msgctxt "NetworkAddDlg|"
+msgid ""
+"<p>Verify the encrypted connection provides a valid certificate, increasing "
+"security.<br/>Uncheck if the IRC server uses a self-signed or invalid "
+"certificate.</p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:147
+msgctxt "NetworkAddDlg|"
+msgid "Verify connection security"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1177
+msgctxt "NetworkAddDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1178
+msgctxt "NetworkAddDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to verify connection "
+"security."

 msgstr ""
 
 #: ../src/qtui/settingspages/networkeditdlg.ui:13
 msgstr ""
 
 #: ../src/qtui/settingspages/networkeditdlg.ui:13


@@ -4617,96 +6938,120 @@ msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
 msgstr ""
 
 msgid "Please enter a network name:"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:840
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1252

 msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr ""
 
 msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:213
-#, qt-format
+#: ../src/client/networkmodel.cpp:230

 msgctxt "NetworkItem|"
 msgctxt "NetworkItem|"

-msgid "Server: %1"
+msgid "Server"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:214
-#, qt-format
+#: ../src/client/networkmodel.cpp:231

 msgctxt "NetworkItem|"
 msgctxt "NetworkItem|"

-msgid "Users: %1"
+msgid "Users"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:217
+#: ../src/client/networkmodel.cpp:233
+msgctxt "NetworkItem|"
+msgid "Lag"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:233

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

-msgid "Lag: %1 msecs"
+msgid "%1 msecs"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:987
+#: ../src/client/networkmodel.cpp:238
+msgctxt "NetworkItem|"
+msgid "Not connected"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1215

 msgctxt "NetworkModel|"
 msgid "Chat"
 msgstr ""
 
 msgctxt "NetworkModel|"
 msgid "Chat"
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:987
+#: ../src/client/networkmodel.cpp:1215

 msgctxt "NetworkModel|"
 msgid "Topic"
 msgstr ""
 
 msgctxt "NetworkModel|"
 msgid "Topic"
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:987
+#: ../src/client/networkmodel.cpp:1215

 msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr ""
 
 msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr ""
 

-#: ../src/uisupport/networkmodelcontroller.cpp:177
+#: ../src/uisupport/networkmodelcontroller.cpp:156

 msgctxt "NetworkModelController|"
 msgid "Do you want to delete the following buffer(s) permanently?"
 msgid_plural "Do you want to delete the following buffer(s) permanently?"
 msgstr[0] ""
 msgstr[1] ""
 
 msgctxt "NetworkModelController|"
 msgid "Do you want to delete the following buffer(s) permanently?"
 msgid_plural "Do you want to delete the following buffer(s) permanently?"
 msgstr[0] ""
 msgstr[1] ""
 

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

 #, qt-format
 msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr ""
 
 #, qt-format
 msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr ""
 

-#: ../src/uisupport/networkmodelcontroller.cpp:191
+#: ../src/uisupport/networkmodelcontroller.cpp:170

 msgctxt "NetworkModelController|"
 msgid ""
 "<b>Note:</b> This will delete all related data, including all backlog data, "
 "from the core's database and cannot be undone."
 msgstr ""
 
 msgctxt "NetworkModelController|"
 msgid ""
 "<b>Note:</b> This will delete all related data, including all backlog data, "
 "from the core's database and cannot be undone."
 msgstr ""
 

-#: ../src/uisupport/networkmodelcontroller.cpp:193
+#: ../src/uisupport/networkmodelcontroller.cpp:173

 msgctxt "NetworkModelController|"
 msgid ""
 "<br>Active channel buffers cannot be deleted, please part the channel first."
 msgstr ""
 
 msgctxt "NetworkModelController|"
 msgid ""
 "<br>Active channel buffers cannot be deleted, please part the channel first."
 msgstr ""
 

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

 msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr ""
 
 msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr ""
 

-#: ../src/uisupport/networkmodelcontroller.cpp:530
+#: ../src/uisupport/networkmodelcontroller.cpp:220
+#: ../src/uisupport/networkmodelcontroller.cpp:228
+msgctxt "NetworkModelController|"
+msgid "Question"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:221
+msgctxt "NetworkModelController|"
+msgid "Really Connect to all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:229
+msgctxt "NetworkModelController|"
+msgid "Really disconnect from all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:543

 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr ""
 
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr ""
 

-#: ../src/uisupport/networkmodelcontroller.cpp:533
+#: ../src/uisupport/networkmodelcontroller.cpp:546

 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Network:"
 msgstr ""
 
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Network:"
 msgstr ""
 

-#: ../src/uisupport/networkmodelcontroller.cpp:535
+#: ../src/uisupport/networkmodelcontroller.cpp:548

 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr ""
 
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr ""
 

-#: ../src/uisupport/networkmodelcontroller.cpp:537
+#: ../src/uisupport/networkmodelcontroller.cpp:550

 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Password:"
 msgstr ""
 
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Password:"
 msgstr ""
 

-#: ../src/qtui/ircconnectionwizard.cpp:158
+#: ../src/qtui/ircconnectionwizard.cpp:151

 msgctxt "NetworkPage|"
 msgid "Setup Network Connection"
 msgstr ""
 msgctxt "NetworkPage|"
 msgid "Setup Network Connection"
 msgstr ""


@@ -4722,13 +7067,13 @@ msgid "Re&name..."
 msgstr ""
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:65
 msgstr ""
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:65

-#: ../src/qtui/settingspages/networkssettingspage.ui:235
+#: ../src/qtui/settingspages/networkssettingspage.ui:234

 msgctxt "NetworksSettingsPage|"
 msgid "&Add..."
 msgstr ""
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:88
 msgctxt "NetworksSettingsPage|"
 msgid "&Add..."
 msgstr ""
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:88

-#: ../src/qtui/settingspages/networkssettingspage.ui:252
+#: ../src/qtui/settingspages/networkssettingspage.ui:251

 msgctxt "NetworksSettingsPage|"
 msgid "De&lete"
 msgstr ""
 msgctxt "NetworksSettingsPage|"
 msgid "De&lete"
 msgstr ""


@@ -4744,8 +7089,8 @@ msgid "Identity:"
 msgstr ""
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:149
 msgstr ""
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:149

-#: ../src/qtui/settingspages/networkssettingspage.ui:281
-#: ../src/qtui/settingspages/networkssettingspage.ui:295
+#: ../src/qtui/settingspages/networkssettingspage.ui:280
+#: ../src/qtui/settingspages/networkssettingspage.ui:294

 msgctxt "NetworksSettingsPage|"
 msgid "..."
 msgstr ""
 msgctxt "NetworksSettingsPage|"
 msgid "..."
 msgstr ""


@@ -4765,34 +7110,34 @@ msgctxt "NetworksSettingsPage|"
 msgid "&Edit..."
 msgstr ""
 
 msgid "&Edit..."
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:278
+#: ../src/qtui/settingspages/networkssettingspage.ui:277

 msgctxt "NetworksSettingsPage|"
 msgid "Move upwards in list"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Move upwards in list"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:292
+#: ../src/qtui/settingspages/networkssettingspage.ui:291

 msgctxt "NetworksSettingsPage|"
 msgid "Move downwards in list"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Move downwards in list"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:337
+#: ../src/qtui/settingspages/networkssettingspage.ui:336

 msgctxt "NetworksSettingsPage|"
 msgid "Commands"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Commands"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:340
+#: ../src/qtui/settingspages/networkssettingspage.ui:339

 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"
 msgstr ""
 
 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 ""
 
 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"
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify a list of IRC commands to be executed upon connect.\n"


@@ -4800,84 +7145,128 @@ msgid ""
 "be needed here!"
 msgstr ""
 
 "be needed here!"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:374
+#: ../src/qtui/settingspages/networkssettingspage.ui:373

 msgctxt "NetworksSettingsPage|"
 msgid "Connection"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Connection"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:383
+#: ../src/qtui/settingspages/networkssettingspage.ui:382

 msgctxt "NetworksSettingsPage|"
 msgid "Automatically reconnect to the IRC network after connection failures"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Automatically reconnect to the IRC network after connection failures"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:386
+#: ../src/qtui/settingspages/networkssettingspage.ui:385

 msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:397
+#: ../src/qtui/settingspages/networkssettingspage.ui:396
+#: ../src/qtui/settingspages/networkssettingspage.ui:595

 msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:404
+#: ../src/qtui/settingspages/networkssettingspage.ui:403
+#: ../src/qtui/settingspages/networkssettingspage.ui:605

 msgctxt "NetworksSettingsPage|"
 msgid " s"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid " s"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:420
+#: ../src/qtui/settingspages/networkssettingspage.ui:419

 msgctxt "NetworksSettingsPage|"
 msgid "between retries"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "between retries"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:444
+#: ../src/qtui/settingspages/networkssettingspage.ui:443

 msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:464
+#: ../src/qtui/settingspages/networkssettingspage.ui:463
+#: ../src/qtui/settingspages/networkssettingspage.ui:547

 msgctxt "NetworksSettingsPage|"
 msgid "Unlimited"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Unlimited"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:489
+#: ../src/qtui/settingspages/networkssettingspage.ui:488

 msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:516
-#: ../src/qtui/settingspages/networkssettingspage.ui:525
+#: ../src/qtui/settingspages/networkssettingspage.ui:507

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Auto Identify"
+msgid "Use Custom Rate Limits"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:540
+#: ../src/qtui/settingspages/networkssettingspage.ui:521

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "NickServ"
+msgid "Max. messages at once:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:557
+#: ../src/qtui/settingspages/networkssettingspage.ui:528

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Service:"
+msgid "Maximum number of messages to send without any delays"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:567
-#: ../src/qtui/settingspages/networkssettingspage.ui:615
+#: ../src/qtui/settingspages/networkssettingspage.ui:544

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Password:"
+msgid ""
+"<html><head/><body><p>Disable all rate limiting, e.g. for IRC bridges.</"
+"p><p>Don't use with most normal networks.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:602
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p>Delay between messages after the maximum number of "
+"undelayed messages have been sent.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:621
+msgctxt "NetworksSettingsPage|"
+msgid "between future messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:663
+#: ../src/qtui/settingspages/networkssettingspage.ui:814
+msgctxt "NetworksSettingsPage|"
+msgid "Auto Identify"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:580
+#: ../src/qtui/settingspages/networkssettingspage.ui:672
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Authenticate using your nickname and password before joining any channels"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:675

 msgctxt "NetworksSettingsPage|"
 msgid "Use SASL Authentication"
 msgstr ""
 
 msgctxt "NetworksSettingsPage|"
 msgid "Use SASL Authentication"
 msgstr ""
 

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

 msgctxt "NetworksSettingsPage|"
 msgid ""
 "<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because "
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because "


@@ -4885,109 +7274,372 @@ msgid ""
 "body></html>"
 msgstr ""
 
 "body></html>"
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:659
+#: ../src/qtui/settingspages/networkssettingspage.ui:789
+msgctxt "NetworksSettingsPage|"
+msgid "Could not detect if supported by server"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:796
+#: ../src/qtui/settingspages/networkssettingspage.ui:933
+msgctxt "NetworksSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:811
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Authenticate to services using your password.  Use SASL instead to identify "
+"before joining channels."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:829
+msgctxt "NetworksSettingsPage|"
+msgid "Service user to send your password to, usually NickServ"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:832
+msgctxt "NetworksSettingsPage|"
+msgid "NickServ"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:852
+msgctxt "NetworksSettingsPage|"
+msgid "Service:"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:886
+msgctxt "NetworksSettingsPage|"
+msgid "Features"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:889
+msgctxt "NetworksSettingsPage|"
+msgid "Configure the modern IRC messaging features Quassel supports"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:923
+#: ../src/qtui/settingspages/networkssettingspage.cpp:187
+msgctxt "NetworksSettingsPage|"
+msgid "These features require support from the network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:964
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<p>Let the IRC network control the timestamps for messages, such as when "
+"viewing messages from the past.</p>\n"
+"<p>This is useful when connecting to bouncers, IRC bridges, or networks that "
+"send messages you've missed when reconnecting.</p>\n"
+"<p><i>Toggles the IRCv3 'server-time' capability.</i></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:969
+msgctxt "NetworksSettingsPage|"
+msgid "Use network timestamps for messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:978
+msgctxt "NetworksSettingsPage|"
+msgid "Configure which IRC capabilities Quassel will ignore during negotiation"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:981
+msgctxt "NetworksSettingsPage|"
+msgid "Advanced..."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1003
+msgctxt "NetworksSettingsPage|"
+msgid "<i>Changes apply after reconnecting to the network</i>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1027
+msgctxt "NetworksSettingsPage|"
+msgid "Encodings"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1030
+msgctxt "NetworksSettingsPage|"
+msgid "Configure advanced settings such as message encodings"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1039
+msgctxt "NetworksSettingsPage|"
+msgid "Control encodings for in- and outgoing messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1042
+msgctxt "NetworksSettingsPage|"
+msgid "Use Custom Encodings"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1053
+#: ../src/qtui/settingspages/networkssettingspage.ui:1073
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Specify which encoding your messages will be sent in.\n"
+"UTF-8 should be a sane choice for most networks."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1057
+msgctxt "NetworksSettingsPage|"
+msgid "Send messages in:"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1084
+#: ../src/qtui/settingspages/networkssettingspage.ui:1104
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"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:1088
+msgctxt "NetworksSettingsPage|"
+msgid "Receive fallback:"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1115
+#: ../src/qtui/settingspages/networkssettingspage.ui:1128
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<qt><p>This specifies how control messages, nicks and servernames are "
+"encoded.</p><p><b>UTF-8</b> should be fine for modern networks.  On other "
+"networks, you may need to use <b>ISO-8859-1</b> to avoid errors with illegal "
+"characters and invalid encoding.</p></qt>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1118
+msgctxt "NetworksSettingsPage|"
+msgid "Server encoding:"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:44
+msgctxt "NetworksSettingsPage|"
+msgid "IRC"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:44
+msgctxt "NetworksSettingsPage|"
+msgid "Networks"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:162
+#: ../src/qtui/settingspages/networkssettingspage.cpp:175
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<p>Override default message rate limiting.</p><p><b>Setting limits too low "
+"may get you disconnected from the server!</b></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:178
+msgctxt "NetworksSettingsPage|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:179
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to modify message rate "
+"limits."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:193
+msgctxt "NetworksSettingsPage|"
+msgid "Your Quassel core is too old to configure IRCv3 features"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:230
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<b>The following problems need to be corrected before your changes can be "
+"applied:</b><ul>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:232
+msgctxt "NetworksSettingsPage|"
+msgid "<li>All networks need at least one server defined</li>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:233
+msgctxt "NetworksSettingsPage|"
+msgid "</ul>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:234
+msgctxt "NetworksSettingsPage|"
+msgid "Invalid Network Settings"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:749
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:754
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:759
+msgctxt "NetworksSettingsPage|"
+msgid "Not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:769
+msgctxt "NetworksSettingsPage|"
+msgid "May be supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:773
+msgctxt "NetworksSettingsPage|"
+msgid "Supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:860
+msgctxt "NetworksSettingsPage|"
+msgid "Delete Network?"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:861
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Do you really want to delete the network \"%1\" and all related settings, "
+"including the backlog?"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:991
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:992
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Quassel could not check if \"%1\" supports SASL.  This may be due to unsaved "
+"changes or an older Quassel core.  You can still try using SASL."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:998

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Encodings"
+msgid "Cannot check if SASL supported when disconnected"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:662
+#: ../src/qtui/settingspages/networkssettingspage.cpp:999
+#, qt-format

 msgctxt "NetworksSettingsPage|"
 msgid ""
 msgctxt "NetworksSettingsPage|"
 msgid ""

-"Configure advanced settings such as message encodings and automatic reconnect"
+"Quassel cannot check if \"%1\" supports SASL when disconnected.  Connect to "
+"the network, or try using SASL anyways."

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Control encodings for in- and outgoing messages"
+msgid "SASL EXTERNAL not currently supported by network"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:674
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1008
+#, qt-format

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Use Custom Encodings"
+msgid ""
+"The network \"%1\" does not currently support SASL EXTERNAL for SSL "
+"certificate authentication.  However, support might be added later on."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1015
+msgctxt "NetworksSettingsPage|"
+msgid "SASL not currently supported by network"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:685
-#: ../src/qtui/settingspages/networkssettingspage.ui:705
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1016
+#, qt-format

 msgctxt "NetworksSettingsPage|"
 msgid ""
 msgctxt "NetworksSettingsPage|"
 msgid ""

-"Specify which encoding your messages will be sent in.\n"
-"UTF-8 should be a sane choice for most networks."
+"The network \"%1\" does not currently support SASL.  However, support might "
+"be added later on."

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Send messages in:"
+msgid "SASL EXTERNAL may be supported by network"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:716
-#: ../src/qtui/settingspages/networkssettingspage.ui:736
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1028
+#, qt-format

 msgctxt "NetworksSettingsPage|"
 msgid ""
 msgctxt "NetworksSettingsPage|"
 msgid ""

-"Incoming messages encoded in Utf8 will always be treated as such.\n"
-"This setting defines the encoding for messages that are not Utf8."
+"The network \"%1\" may support SASL EXTERNAL for SSL certificate "
+"authentication.  In most cases, you should use SASL instead of NickServ "
+"identification."

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Receive fallback:"
+msgid "SASL supported by network"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:747
-#: ../src/qtui/settingspages/networkssettingspage.ui:761
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1036
+#, qt-format

 msgctxt "NetworksSettingsPage|"
 msgid ""
 msgctxt "NetworksSettingsPage|"
 msgid ""

-"This specifies how control messages, nicks and servernames are encoded.\n"
-"Unless you *really* know what you do, leave this as ISO-8859-1!"
+"The network \"%1\" supports SASL.  In most cases, you should use SASL "
+"instead of NickServ identification."

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.ui:751
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1044
+#, qt-format

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Server encoding:"
+msgid "SASL support for \"%1\""

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "IRC"
+msgid ""
+"SASL is a standardized way to log in and identify yourself to IRC servers."

 msgstr ""
 
 msgstr ""
 

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

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Networks"
+msgid ""
+"Quassel makes use of newer IRC features when supported by the IRC network.  "
+"If desired, you can disable unwanted or problematic features here."

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:184
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1089

 msgctxt "NetworksSettingsPage|"
 msgid ""
 msgctxt "NetworksSettingsPage|"
 msgid ""

-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
+"The <a href=\"https://ircv3.net/irc/\">IRCv3 website</a> provides more "
+"technical details on the IRCv3 capabilities powering these features."

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:185
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1100
+#, qt-format

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "<li>All networks need at least one server defined</li>"
+msgid "Currently enabled IRCv3 capabilities for this network: %1"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:186
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1104

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "</ul>"
+msgid "Configuring network features"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:187
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1108

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Invalid Network Settings"
+msgid "Configuring network features unsupported"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:650
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1110

 msgctxt "NetworksSettingsPage|"
 msgctxt "NetworksSettingsPage|"

-msgid "Delete Network?"
+msgid "Your Quassel core is too old to configure IRCv3 network features"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/networkssettingspage.cpp:651
-#, qt-format
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1111

 msgctxt "NetworksSettingsPage|"
 msgid ""
 msgctxt "NetworksSettingsPage|"
 msgid ""

-"Do you really want to delete the network \"%1\" and all related settings, "
-"including the backlog?"
+"You need a Quassel core v0.14.0 or newer to control what network features "
+"Quassel will use."

 msgstr ""
 
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
 msgstr ""
 
 #: ../src/qtui/settingspages/nickeditdlg.ui:13


@@ -5007,7 +7659,7 @@ msgid ""
 "the special characters {, }, [, ], \\, |, `, ^, _ and -."
 msgstr ""
 
 "the special characters {, }, [, ], \\, |, `, ^, _ and -."
 msgstr ""
 

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

 msgctxt "NickEditDlg|"
 msgid "Add Nickname"
 msgstr ""
 msgctxt "NickEditDlg|"
 msgid "Add Nickname"
 msgstr ""


@@ -5022,61 +7674,110 @@ msgctxt "NotificationsSettingsPage|"
 msgid "Notifications"
 msgstr ""
 
 msgid "Notifications"
 msgstr ""
 

-#: ../src/qtui/phononnotificationbackend.cpp:188
-msgctxt "PhononNotificationBackend::ConfigWidget|"
-msgid "Select Audio File"
+#: ../src/qtui/passwordchangedlg.ui:14
+msgctxt "PasswordChangeDlg|"
+msgid "Change Password"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Form"
+#: ../src/qtui/passwordchangedlg.ui:37
+msgctxt "PasswordChangeDlg|"
+msgid "Old password:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Play a sound"
+#: ../src/qtui/passwordchangedlg.ui:51
+msgctxt "PasswordChangeDlg|"
+msgid "New Password:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Prelisten to the selected sound"
+#: ../src/qtui/passwordchangedlg.ui:65
+msgctxt "PasswordChangeDlg|"
+msgid "Confirm password:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Select the sound file to play"
+#: ../src/qtui/passwordchangedlg.cpp:34
+#, qt-format
+msgctxt "PasswordChangeDlg|"
+msgid ""
+"This changes the password for your username <b>%1</b> on the Quassel Core "
+"running at <b>%2</b>."
+msgstr ""
+
+#: ../src/qtui/passwordchangedlg.cpp:64
+msgctxt "PasswordChangeDlg|"
+msgid "Password Not Changed"
+msgstr ""
+
+#: ../src/qtui/passwordchangedlg.cpp:64
+msgctxt "PasswordChangeDlg|"
+msgid "<b>Password change failed</b>"
+msgstr ""
+
+#: ../src/qtui/passwordchangedlg.cpp:66
+msgctxt "PasswordChangeDlg|"
+msgid ""
+"The core reported an error when trying to change your password. Make sure "
+"you entered your old password correctly!"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:51
+msgctxt "PostgreSqlStorage|"
+msgid "PostgreSQL driver plugin not available for Qt. Installed drivers:"

 msgstr ""
 
 msgstr ""
 

-#: ../src/core/postgresqlstorage.cpp:72
+#: ../src/core/postgresqlstorage.cpp:71

 msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr ""
 
 msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr ""
 

-#: ../src/client/backlogrequester.cpp:95
+#: ../src/core/postgresqlstorage.cpp:77
+msgctxt "PostgreSqlStorage|"
+msgid "Username"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:77
+msgctxt "PostgreSqlStorage|"
+msgid "Password"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:77
+msgctxt "PostgreSqlStorage|"
+msgid "Hostname"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:78
+msgctxt "PostgreSqlStorage|"
+msgid "Port"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:78
+msgctxt "PostgreSqlStorage|"
+msgid "Database"
+msgstr ""
+
+#: ../src/client/backlogrequester.cpp:81 ../src/client/backlogrequester.cpp:154

 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
 msgstr ""
 
 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
 msgstr ""
 

-#: ../src/client/backlogrequester.cpp:122
+#: ../src/client/backlogrequester.cpp:109

 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting up to %1 of all unread backlog messages (plus additional %2)"
 msgstr ""
 
 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting up to %1 of all unread backlog messages (plus additional %2)"
 msgstr ""
 

-#: ../src/client/backlogrequester.cpp:142
+#: ../src/client/backlogrequester.cpp:127

 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"
 msgstr ""
 
 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"
 msgstr ""
 

-#: ../src/qtui/ircconnectionwizard.cpp:56
+#: ../src/qtui/ircconnectionwizard.cpp:53

 msgctxt "QObject|"
 msgid "Welcome to Quassel IRC"
 msgstr ""
 
 msgctxt "QObject|"
 msgid "Welcome to Quassel IRC"
 msgstr ""
 

-#: ../src/qtui/ircconnectionwizard.cpp:58
+#: ../src/qtui/ircconnectionwizard.cpp:56

 msgctxt "QObject|"
 msgid ""
 "This wizard will help you to set up your default identity and your IRC "
 msgctxt "QObject|"
 msgid ""
 "This wizard will help you to set up your default identity and your IRC "


@@ -5084,219 +7785,620 @@ msgid ""
 "wizard any time and use the settings dialog for more detailed changes."
 msgstr ""
 
 "wizard any time and use the settings dialog for more detailed changes."
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:128 ../src/uisupport/qssparser.cpp:178
-#: ../src/uisupport/qssparser.cpp:334
+#: ../src/uisupport/qssparser.cpp:147 ../src/uisupport/qssparser.cpp:201
+#: ../src/uisupport/qssparser.cpp:359

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid block declaration: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid block declaration: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:147
+#: ../src/uisupport/qssparser.cpp:166

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette role assignment: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette role assignment: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:166
+#: ../src/uisupport/qssparser.cpp:185

 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:204
+#: ../src/uisupport/qssparser.cpp:228

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:248
+#: ../src/uisupport/qssparser.cpp:272

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message type in %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message type in %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:257
+#: ../src/uisupport/qssparser.cpp:281

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:269
+#: ../src/uisupport/qssparser.cpp:294

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message label: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message label: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:281
+#: ../src/uisupport/qssparser.cpp:305

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:309

 msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
 msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:301
+#: ../src/uisupport/qssparser.cpp:325

 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid format name: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid format name: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:309
+#: ../src/uisupport/qssparser.cpp:333

 #, qt-format
 msgctxt "QssParser|"
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:318
+#: ../src/uisupport/qssparser.cpp:342

 #, qt-format
 msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
 msgstr ""
 
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:349
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid proplist %1"
+#: ../src/uisupport/qssparser.cpp:374
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid proplist %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:393
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid chatlist item type %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:409
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid chatlist state %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:438
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid property declaration: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:476
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid font property: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:482
+#, qt-format
+msgctxt "QssParser|"
+msgid "Unknown ChatLine property: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:501
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid boolean value: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:537
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid palette color role specification: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:544
+#, qt-format
+msgctxt "QssParser|"
+msgid "Unknown palette color role: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:551 ../src/uisupport/qssparser.cpp:574
+#: ../src/uisupport/qssparser.cpp:596
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid gradient declaration: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:560 ../src/uisupport/qssparser.cpp:582
+#: ../src/uisupport/qssparser.cpp:606
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid gradient stops list: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:712
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid font specification: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:762
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid font style specification: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:776
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid font weight specification: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:787
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid font size specification: %1"
+msgstr ""
+
+#: ../src/qtui/qtmultimedianotificationbackend.cpp:156
+msgctxt "QtMultimediaNotificationBackend::ConfigWidget|"
+msgid "Select Audio File"
+msgstr ""
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:14
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Form"
+msgstr ""
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:20
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Play a sound"
+msgstr ""
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:46
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Prelisten to the selected sound"
+msgstr ""
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:59
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:69
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Select the sound file to play"
+msgstr ""
+
+#. Supported icon theme names
+#: ../src/qtui/qtui.cpp:250
+msgctxt "QtUi|"
+msgid "Breeze"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:251
+msgctxt "QtUi|"
+msgid "Breeze Dark"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:253
+msgctxt "QtUi|"
+msgid "Oxygen"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:304
+msgctxt "QtUi|"
+msgid ""
+"No supported icon theme installed, you'll lack icons! Supported are the KDE/"
+"Plasma themes Breeze, Breeze Dark and Oxygen."
+msgstr ""
+
+#: ../src/qtui/qtuiapplication.cpp:48
+msgctxt "QtUiApplication|"
+msgid "Could not load or upgrade client settings!"
+msgstr ""
+
+#: ../src/common/quassel.cpp:325
+msgctxt "Quassel|"
+msgid "Specify the directory holding the client configuration."
+msgstr ""
+
+#: ../src/common/quassel.cpp:325 ../src/common/quassel.cpp:330
+#: ../src/common/quassel.cpp:367 ../src/common/quassel.cpp:368
+msgctxt "Quassel|"
+msgid "path"
+msgstr ""
+
+#: ../src/common/quassel.cpp:329
+msgctxt "Quassel|"
+msgid ""
+"Specify the directory holding configuration files, the SQlite database and "
+"the SSL certificate."
+msgstr ""
+
+#: ../src/common/quassel.cpp:336
+msgctxt "Quassel|"
+msgid "Override the system icon theme ('breeze' is recommended)."
+msgstr ""
+
+#: ../src/common/quassel.cpp:336
+msgctxt "Quassel|"
+msgid "theme"
+msgstr ""
+
+#: ../src/common/quassel.cpp:337
+msgctxt "Quassel|"
+msgid "Load a custom application stylesheet."
+msgstr ""
+
+#: ../src/common/quassel.cpp:337
+msgctxt "Quassel|"
+msgid "file.qss"
+msgstr ""
+
+#: ../src/common/quassel.cpp:338
+msgctxt "Quassel|"
+msgid "Start the client minimized to the system tray."
+msgstr ""
+
+#: ../src/common/quassel.cpp:339
+msgctxt "Quassel|"
+msgid "Account id to connect to on startup."
+msgstr ""
+
+#: ../src/common/quassel.cpp:339
+msgctxt "Quassel|"
+msgid "account"
+msgstr ""
+
+#: ../src/common/quassel.cpp:346
+msgctxt "Quassel|"
+msgid "The address(es) quasselcore will listen on."
+msgstr ""
+
+#: ../src/common/quassel.cpp:346
+msgctxt "Quassel|"
+msgid "<address>[,<address>[,...]]"
+msgstr ""
+
+#: ../src/common/quassel.cpp:347
+msgctxt "Quassel|"
+msgid "The port quasselcore will listen at."
+msgstr ""
+
+#: ../src/common/quassel.cpp:347 ../src/common/quassel.cpp:360
+#: ../src/common/quassel.cpp:370
+msgctxt "Quassel|"
+msgid "port"
+msgstr ""
+
+#: ../src/common/quassel.cpp:348
+msgctxt "Quassel|"
+msgid "Don't restore last core's state."
+msgstr ""
+
+#: ../src/common/quassel.cpp:349
+msgctxt "Quassel|"
+msgid "Load configuration from environment variables."
+msgstr ""
+
+#: ../src/common/quassel.cpp:350
+msgctxt "Quassel|"
+msgid "Switch storage backend (migrating data if possible)."
+msgstr ""
+
+#: ../src/common/quassel.cpp:350
+msgctxt "Quassel|"
+msgid "backendidentifier"
+msgstr ""
+
+#: ../src/common/quassel.cpp:351
+msgctxt "Quassel|"
+msgid "Select authentication backend."
+msgstr ""
+
+#: ../src/common/quassel.cpp:351
+msgctxt "Quassel|"
+msgid "authidentifier"
+msgstr ""
+
+#: ../src/common/quassel.cpp:352
+msgctxt "Quassel|"
+msgid "Starts an interactive session to add a new core user."
+msgstr ""
+
+#: ../src/common/quassel.cpp:354
+msgctxt "Quassel|"
+msgid ""
+"Starts an interactive session to change the password of the user identified "
+"by <username>."
+msgstr ""
+
+#: ../src/common/quassel.cpp:355
+msgctxt "Quassel|"
+msgid "username"
+msgstr ""
+
+#: ../src/common/quassel.cpp:356
+msgctxt "Quassel|"
+msgid ""
+"Use users' quasselcore username as ident reply. Ignores each user's "
+"configured ident setting."
+msgstr ""
+
+#: ../src/common/quassel.cpp:357
+msgctxt "Quassel|"
+msgid "Enable internal ident daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:359
+msgctxt "Quassel|"
+msgid ""
+"The port quasselcore will listen at for ident requests. Only meaningful with "
+"--ident-daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:362
+msgctxt "Quassel|"
+msgid ""
+"The address(es) quasselcore will listen on for ident requests. Same format "
+"as --listen."
+msgstr ""
+
+#: ../src/common/quassel.cpp:362 ../src/common/quassel.cpp:365
+#: ../src/common/quassel.cpp:371
+msgctxt "Quassel|"
+msgid "<address>[,...]"
+msgstr ""
+
+#: ../src/common/quassel.cpp:363
+msgctxt "Quassel|"
+msgid ""
+"Enable oidentd integration. In most cases you should also enable --strict-"
+"ident."
+msgstr ""
+
+#: ../src/common/quassel.cpp:364
+msgctxt "Quassel|"
+msgid "Set path to oidentd configuration file."
+msgstr ""
+
+#: ../src/common/quassel.cpp:364
+msgctxt "Quassel|"
+msgid "file"
+msgstr ""
+
+#: ../src/common/quassel.cpp:365
+msgctxt "Quassel|"
+msgid "Set IP range from which proxy protocol definitions are allowed"
+msgstr ""
+
+#: ../src/common/quassel.cpp:366
+msgctxt "Quassel|"
+msgid "Require SSL for remote (non-loopback) client connections."
+msgstr ""
+
+#: ../src/common/quassel.cpp:367
+msgctxt "Quassel|"
+msgid "Specify the path to the SSL certificate."
+msgstr ""
+
+#: ../src/common/quassel.cpp:368
+msgctxt "Quassel|"
+msgid "Specify the path to the SSL key."
+msgstr ""
+
+#: ../src/common/quassel.cpp:369
+msgctxt "Quassel|"
+msgid "Enable metrics API."
+msgstr ""
+
+#: ../src/common/quassel.cpp:370
+msgctxt "Quassel|"
+msgid ""
+"The port quasselcore will listen at for metrics requests. Only meaningful "
+"with --metrics-daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:371
+msgctxt "Quassel|"
+msgid ""
+"The address(es) quasselcore will listen on for metrics requests. Same format "
+"as --listen."

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:368
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid chatlist item type %1"
+#: ../src/common/quassel.cpp:377
+msgctxt "Quassel|"
+msgid "Supports one of Debug|Info|Warning|Error; default is Info."

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:384
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid chatlist state %1"
+#: ../src/common/quassel.cpp:377
+msgctxt "Quassel|"
+msgid "level"

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:414
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid property declaration: %1"
+#: ../src/common/quassel.cpp:378
+msgctxt "Quassel|"
+msgid "Log to a file."

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:438
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid font property: %1"
+#: ../src/common/quassel.cpp:380
+msgctxt "Quassel|"
+msgid "Log to syslog."

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:444
-#, qt-format
-msgctxt "QssParser|"
-msgid "Unknown ChatLine property: %1"
+#: ../src/common/quassel.cpp:385
+msgctxt "Quassel|"
+msgid "Enable debug output."

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:468
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid palette color role specification: %1"
+#: ../src/common/quassel.cpp:388
+msgctxt "Quassel|"
+msgid "Enables debugging for bufferswitches."

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:475
-#, qt-format
-msgctxt "QssParser|"
-msgid "Unknown palette color role: %1"
+#: ../src/common/quassel.cpp:389
+msgctxt "Quassel|"
+msgid "Enables debugging for models."

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:482 ../src/uisupport/qssparser.cpp:505
-#: ../src/uisupport/qssparser.cpp:527
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid gradient declaration: %1"
+#: ../src/common/quassel.cpp:394
+msgctxt "Quassel|"
+msgid ""
+"Enable logging of all raw IRC messages to debug log, including passwords!  "
+"In most cases you should also set --loglevel Debug"

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:491 ../src/uisupport/qssparser.cpp:513
-#: ../src/uisupport/qssparser.cpp:537
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid gradient stops list: %1"
+#: ../src/common/quassel.cpp:395
+msgctxt "Quassel|"
+msgid "Limit raw IRC logging to this network ID.  Implies --debug-irc"

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:646
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid font specification: %1"
+#: ../src/common/quassel.cpp:395 ../src/common/quassel.cpp:397
+msgctxt "Quassel|"
+msgid "database network ID"

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:687
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid font style specification: %1"
+#: ../src/common/quassel.cpp:396
+msgctxt "Quassel|"
+msgid ""
+"Enable logging of all parsed IRC messages to debug log, including "
+"passwords!  In most cases you should also set --loglevel Debug"

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:702
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid font weight specification: %1"
+#: ../src/common/quassel.cpp:397
+msgctxt "Quassel|"
+msgid ""
+"Limit parsed IRC logging to this network ID.  Implies --debug-irc-parsed"

 msgstr ""
 
 msgstr ""
 

-#: ../src/uisupport/qssparser.cpp:714
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid font size specification: %1"
+#: ../src/common/quassel.cpp:404
+msgctxt "Quassel|"
+msgid "Quassel IRC is a modern, distributed IRC client."

 msgstr ""
 
 msgstr ""
 

-#: ../src/common/util.cpp:169
+#: ../src/common/util.cpp:181

 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr ""
 
 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr ""
 

-#: ../src/common/util.cpp:170
+#: ../src/common/util.cpp:183

 msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr ""
 
 msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr ""
 

-#: ../src/common/util.cpp:171
+#: ../src/common/util.cpp:184

 msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr ""
 
 msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr ""
 

-#: ../src/common/util.cpp:172
+#: ../src/common/util.cpp:185

 msgctxt "Quassel::secondsToString()|"
 msgid "min"
 msgstr ""
 
 msgctxt "Quassel::secondsToString()|"
 msgid "min"
 msgstr ""
 

-#: ../src/common/util.cpp:173
+#: ../src/common/util.cpp:186

 msgctxt "Quassel::secondsToString()|"
 msgid "sec"
 msgstr ""
 
 msgctxt "Quassel::secondsToString()|"
 msgid "sec"
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:490
+#: ../src/client/networkmodel.cpp:543

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

-msgid "<b>Query with %1</b>"
+msgid "Query with %1"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:508
-#, qt-format
+#: ../src/client/networkmodel.cpp:566

 msgctxt "QueryBufferItem|"
 msgctxt "QueryBufferItem|"

-msgid "idling since %1"
+msgid "Unknown"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:511
-#, qt-format
+#: ../src/client/networkmodel.cpp:572

 msgctxt "QueryBufferItem|"
 msgctxt "QueryBufferItem|"

-msgid "login time: %1"
+msgid "Away message"

 msgstr ""
 
 msgstr ""
 

-#: ../src/client/networkmodel.cpp:514
-#, qt-format
+#: ../src/client/networkmodel.cpp:574
+msgctxt "QueryBufferItem|"
+msgid "Realname"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:578
+msgctxt "QueryBufferItem|"
+msgid "Help status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:578
+msgctxt "QueryBufferItem|"
+msgid "Available for help"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:581

 msgctxt "QueryBufferItem|"
 msgctxt "QueryBufferItem|"

-msgid "server: %1"
+msgid "Service status"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/receivefiledlg.ui:14
+#: ../src/client/networkmodel.cpp:591
+msgctxt "QueryBufferItem|"
+msgid "Not logged in"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:597 ../src/client/networkmodel.cpp:604
+msgctxt "QueryBufferItem|"
+msgid "Account"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:604
+msgctxt "QueryBufferItem|"
+msgid "Identified for this nick"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:610
+msgctxt "QueryBufferItem|"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:614
+msgctxt "QueryBufferItem|"
+msgid "Hostmask"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:618
+msgctxt "QueryBufferItem|"
+msgid "Operator"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:626
+msgctxt "QueryBufferItem|"
+msgid "Idling since"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:630
+msgctxt "QueryBufferItem|"
+msgid "Login time"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:633
+msgctxt "QueryBufferItem|"
+msgid "Server"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:639
+msgctxt "QueryBufferItem|"
+msgid "No information available"
+msgstr ""
+
+#: ../src/qtui/receivefiledlg.ui:14

 msgctxt "ReceiveFileDlg|"
 msgid "Incoming File Transfer"
 msgstr ""
 
 msgctxt "ReceiveFileDlg|"
 msgid "Incoming File Transfer"
 msgstr ""
 

-#: ../src/qtui/receivefiledlg.cpp:35
+#: ../src/qtui/receivefiledlg.cpp:36

 #, qt-format
 msgctxt "ReceiveFileDlg|"
 msgid "<b>%1</b> wants to send you a file:<br>%2 (%3 bytes)"
 #, qt-format
 msgctxt "ReceiveFileDlg|"
 msgid "<b>%1</b> wants to send you a file:<br>%2 (%3 bytes)"


@@ -5307,6 +8409,26 @@ msgctxt "RemotePeer|"
 msgid "Disconnecting..."
 msgstr ""
 
 msgid "Disconnecting..."
 msgstr ""
 

+#: ../src/qtui/resourcetreedlg.ui:14
+msgctxt "ResourceTreeDlg|"
+msgid "Resource Tree"
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.ui:20
+msgctxt "ResourceTreeDlg|"
+msgid "Shows the contents of the compiled-in resource tree."
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.cpp:53
+msgctxt "ResourceTreeDlg|"
+msgid "File"
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.cpp:53
+msgctxt "ResourceTreeDlg|"
+msgid "Size"
+msgstr ""
+

 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
 msgctxt "SaveIdentitiesDlg|"
 msgid "Sync With Core"
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
 msgctxt "SaveIdentitiesDlg|"
 msgid "Sync With Core"


@@ -5324,7 +8446,7 @@ msgstr ""
 
 #: ../src/qtui/settingspages/servereditdlg.ui:14
 msgctxt "ServerEditDlg|"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:14
 msgctxt "ServerEditDlg|"

-msgid "Dialog"
+msgid "Edit Server"

 msgstr ""
 
 #: ../src/qtui/settingspages/servereditdlg.ui:30
 msgstr ""
 
 #: ../src/qtui/settingspages/servereditdlg.ui:30


@@ -5338,7 +8460,7 @@ msgid "Server address:"
 msgstr ""
 
 #: ../src/qtui/settingspages/servereditdlg.ui:45
 msgstr ""
 
 #: ../src/qtui/settingspages/servereditdlg.ui:45

-#: ../src/qtui/settingspages/servereditdlg.ui:181
+#: ../src/qtui/settingspages/servereditdlg.ui:246

 msgctxt "ServerEditDlg|"
 msgid "Port:"
 msgstr ""
 msgctxt "ServerEditDlg|"
 msgid "Port:"
 msgstr ""


@@ -5350,78 +8472,133 @@ msgstr ""
 
 #: ../src/qtui/settingspages/servereditdlg.ui:94
 msgctxt "ServerEditDlg|"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:94
 msgctxt "ServerEditDlg|"

-msgid "Use SSL"
+msgid "Try to use an encrypted connection (e.g. SSL/TLS)"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:97
+msgctxt "ServerEditDlg|"
+msgid "Use encrypted connection"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:111
+msgctxt "ServerEditDlg|"
+msgid ""
+"<p>Verify the encrypted connection provides a valid certificate, increasing "
+"security.<br/>Uncheck if the IRC server uses a self-signed or invalid "
+"certificate.</p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:114
+msgctxt "ServerEditDlg|"
+msgid "Verify connection security"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/servereditdlg.ui:119
+#: ../src/qtui/settingspages/servereditdlg.ui:138

 msgctxt "ServerEditDlg|"
 msgid "Advanced"
 msgstr ""
 
 msgctxt "ServerEditDlg|"
 msgid "Advanced"
 msgstr ""
 

-#: ../src/qtui/settingspages/servereditdlg.ui:125
+#: ../src/qtui/settingspages/servereditdlg.ui:159
+msgctxt "ServerEditDlg|"
+msgid "SSL Version:"
+msgstr ""
+
+#: ../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:170
+msgctxt "ServerEditDlg|"
+msgid "SSLv3 (insecure)"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:175
+msgctxt "ServerEditDlg|"
+msgid "SSLv2 (insecure)"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:180
+msgctxt "ServerEditDlg|"
+msgid "TLSv1"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:190

 msgctxt "ServerEditDlg|"
 msgid "Use a Proxy"
 msgstr ""
 
 msgctxt "ServerEditDlg|"
 msgid "Use a Proxy"
 msgstr ""
 

-#: ../src/qtui/settingspages/servereditdlg.ui:142
+#: ../src/qtui/settingspages/servereditdlg.ui:207

 msgctxt "ServerEditDlg|"
 msgid "Proxy Type:"
 msgstr ""
 
 msgctxt "ServerEditDlg|"
 msgid "Proxy Type:"
 msgstr ""
 

-#: ../src/qtui/settingspages/servereditdlg.ui:150
+#: ../src/qtui/settingspages/servereditdlg.ui:215

 msgctxt "ServerEditDlg|"
 msgctxt "ServerEditDlg|"

-msgid "Socks 5"
+msgid "SOCKS 5"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/settingspages/servereditdlg.ui:155
+#: ../src/qtui/settingspages/servereditdlg.ui:220

 msgctxt "ServerEditDlg|"
 msgid "HTTP"
 msgstr ""
 
 msgctxt "ServerEditDlg|"
 msgid "HTTP"
 msgstr ""
 

-#: ../src/qtui/settingspages/servereditdlg.ui:167
+#: ../src/qtui/settingspages/servereditdlg.ui:232

 msgctxt "ServerEditDlg|"
 msgid "Proxy Host:"
 msgstr ""
 
 msgctxt "ServerEditDlg|"
 msgid "Proxy Host:"
 msgstr ""
 

-#: ../src/qtui/settingspages/servereditdlg.ui:174
+#: ../src/qtui/settingspages/servereditdlg.ui:239

 msgctxt "ServerEditDlg|"
 msgid "localhost"
 msgstr ""
 
 msgctxt "ServerEditDlg|"
 msgid "localhost"
 msgstr ""
 

-#: ../src/qtui/settingspages/servereditdlg.ui:205
+#: ../src/qtui/settingspages/servereditdlg.ui:270

 msgctxt "ServerEditDlg|"
 msgid "Proxy Username:"
 msgstr ""
 
 msgctxt "ServerEditDlg|"
 msgid "Proxy Username:"
 msgstr ""
 

-#: ../src/qtui/settingspages/servereditdlg.ui:215
+#: ../src/qtui/settingspages/servereditdlg.ui:280

 msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr ""
 
 msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr ""
 

-#: ../src/qtui/ui/settingsdlg.ui:14
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1327
+msgctxt "ServerEditDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1328
+msgctxt "ServerEditDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to verify connection "
+"security."
+msgstr ""
+
+#: ../src/qtui/settingsdlg.ui:14

 msgctxt "SettingsDlg|"
 msgid "Configure Quassel"
 msgstr ""
 
 msgctxt "SettingsDlg|"
 msgid "Configure Quassel"
 msgstr ""
 

-#: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50
-#: ../src/qtui/settingsdlg.cpp:111
+#: ../src/qtui/settingsdlg.ui:41 ../src/qtui/settingsdlg.ui:56
+#: ../src/qtui/settingsdlg.cpp:107

 msgctxt "SettingsDlg|"
 msgid "Settings"
 msgstr ""
 
 msgctxt "SettingsDlg|"
 msgid "Settings"
 msgstr ""
 

-#: ../src/qtui/settingsdlg.cpp:121
+#: ../src/qtui/settingsdlg.cpp:119

 msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr ""
 
 msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr ""
 

-#: ../src/qtui/settingsdlg.cpp:122
+#: ../src/qtui/settingsdlg.cpp:120

 msgctxt "SettingsDlg|"
 msgid ""
 "There are unsaved changes on the current configuration page. Would you like "
 "to apply your changes now?"
 msgstr ""
 
 msgctxt "SettingsDlg|"
 msgid ""
 "There are unsaved changes on the current configuration page. Would you like "
 "to apply your changes now?"
 msgstr ""
 

-#: ../src/qtui/settingsdlg.cpp:136 ../src/qtui/settingsdlg.cpp:140
+#: ../src/qtui/settingsdlg.cpp:137 ../src/qtui/settingsdlg.cpp:141

 #, qt-format
 msgctxt "SettingsDlg|"
 msgid "Configure %1"
 #, qt-format
 msgctxt "SettingsDlg|"
 msgid "Configure %1"


@@ -5432,27 +8609,27 @@ msgctxt "SettingsDlg|"
 msgid "Reload Settings"
 msgstr ""
 
 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 ""
 
 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:234

 msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
 msgstr ""
 
 msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
 msgstr ""
 

-#: ../src/qtui/settingsdlg.cpp:231
+#: ../src/qtui/settingsdlg.cpp:235

 msgctxt "SettingsDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
 msgctxt "SettingsDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 

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

 msgctxt "SettingsPageDlg|"
 msgid "Configure Quassel"
 msgstr ""
 
 msgctxt "SettingsPageDlg|"
 msgid "Configure Quassel"
 msgstr ""
 

-#: ../src/qtui/ui/settingspagedlg.ui:30
+#: ../src/qtui/settingspagedlg.ui:30

 msgctxt "SettingsPageDlg|"
 msgid "Settings"
 msgstr ""
 msgctxt "SettingsPageDlg|"
 msgid "Settings"
 msgstr ""


@@ -5463,7 +8640,7 @@ msgctxt "SettingsPageDlg|"
 msgid "Configure %1"
 msgstr ""
 
 msgid "Configure %1"
 msgstr ""
 

-#: ../src/qtui/settingspagedlg.cpp:120
+#: ../src/qtui/settingspagedlg.cpp:119

 msgctxt "SettingsPageDlg|"
 msgid "Reload Settings"
 msgstr ""
 msgctxt "SettingsPageDlg|"
 msgid "Reload Settings"
 msgstr ""


@@ -5473,22 +8650,22 @@ msgctxt "SettingsPageDlg|"
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 

-#: ../src/qtui/settingspagedlg.cpp:131
+#: ../src/qtui/settingspagedlg.cpp:133

 msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr ""
 
 msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr ""
 

-#: ../src/qtui/settingspagedlg.cpp:131
+#: ../src/qtui/settingspagedlg.cpp:134

 msgctxt "SettingsPageDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
 msgctxt "SettingsPageDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 

-#: ../src/qtui/settingspages/shortcutsmodel.cpp:121
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:105

 msgctxt "ShortcutsModel|"
 msgid "Action"
 msgstr ""
 
 msgctxt "ShortcutsModel|"
 msgid "Action"
 msgstr ""
 

-#: ../src/qtui/settingspages/shortcutsmodel.cpp:123
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:107

 msgctxt "ShortcutsModel|"
 msgid "Shortcut"
 msgstr ""
 msgctxt "ShortcutsModel|"
 msgid "Shortcut"
 msgstr ""


@@ -5514,8 +8691,8 @@ msgid "Default:"
 msgstr ""
 
 #: ../src/qtui/settingspages/shortcutssettingspage.ui:75
 msgstr ""
 
 #: ../src/qtui/settingspages/shortcutssettingspage.ui:75

-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:99
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:111
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:96
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:108

 msgctxt "ShortcutsSettingsPage|"
 msgid "None"
 msgstr ""
 msgctxt "ShortcutsSettingsPage|"
 msgid "None"
 msgstr ""


@@ -5525,132 +8702,139 @@ msgctxt "ShortcutsSettingsPage|"
 msgid "Custom:"
 msgstr ""
 
 msgid "Custom:"
 msgstr ""
 

-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:63

 msgctxt "ShortcutsSettingsPage|"
 msgid "Interface"
 msgstr ""
 
 msgctxt "ShortcutsSettingsPage|"
 msgid "Interface"
 msgstr ""
 

-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:63

 msgctxt "ShortcutsSettingsPage|"
 msgid "Shortcuts"
 msgstr ""
 
 msgctxt "ShortcutsSettingsPage|"
 msgid "Shortcuts"
 msgstr ""
 

-#: ../src/common/signalproxy.cpp:758
+#: ../src/common/signalproxy.cpp:616

 msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr ""
 
 msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:28
+#: ../src/qtui/simplenetworkeditor.ui:28

 msgctxt "SimpleNetworkEditor|"
 msgid "Network name:"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Network name:"
 msgstr ""
 

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

 msgctxt "SimpleNetworkEditor|"
 msgid "The name of the IRC network you are configuring"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "The name of the IRC network you are configuring"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:63
+#: ../src/qtui/simplenetworkeditor.ui:63

 msgctxt "SimpleNetworkEditor|"
 msgid "Servers"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Servers"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:81
+#: ../src/qtui/simplenetworkeditor.ui:81

 msgctxt "SimpleNetworkEditor|"
 msgid "A list of IRC servers belonging to this network"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "A list of IRC servers belonging to this network"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:96
+#: ../src/qtui/simplenetworkeditor.ui:96

 msgctxt "SimpleNetworkEditor|"
 msgid "Edit this server entry"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Edit this server entry"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:99
+#: ../src/qtui/simplenetworkeditor.ui:99

 msgctxt "SimpleNetworkEditor|"
 msgid "&Edit..."
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "&Edit..."
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:116
+#: ../src/qtui/simplenetworkeditor.ui:116

 msgctxt "SimpleNetworkEditor|"
 msgid "Add another IRC server"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Add another IRC server"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:119
+#: ../src/qtui/simplenetworkeditor.ui:119

 msgctxt "SimpleNetworkEditor|"
 msgid "&Add..."
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "&Add..."
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:136
+#: ../src/qtui/simplenetworkeditor.ui:136

 msgctxt "SimpleNetworkEditor|"
 msgid "Remove this server entry from the list"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Remove this server entry from the list"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:139
+#: ../src/qtui/simplenetworkeditor.ui:139

 msgctxt "SimpleNetworkEditor|"
 msgid "De&lete"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "De&lete"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:165
+#: ../src/qtui/simplenetworkeditor.ui:165

 msgctxt "SimpleNetworkEditor|"
 msgid "Move upwards in list"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Move upwards in list"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:168
-#: ../src/qtui/ui/simplenetworkeditor.ui:182
+#: ../src/qtui/simplenetworkeditor.ui:168
+#: ../src/qtui/simplenetworkeditor.ui:182

 msgctxt "SimpleNetworkEditor|"
 msgid "..."
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "..."
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:179
+#: ../src/qtui/simplenetworkeditor.ui:179

 msgctxt "SimpleNetworkEditor|"
 msgid "Move downwards in list"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Move downwards in list"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:226
+#: ../src/qtui/simplenetworkeditor.ui:226

 msgctxt "SimpleNetworkEditor|"
 msgid "Join Channels Automatically"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid "Join Channels Automatically"
 msgstr ""
 

-#: ../src/qtui/ui/simplenetworkeditor.ui:250
+#: ../src/qtui/simplenetworkeditor.ui:250

 msgctxt "SimpleNetworkEditor|"
 msgid ""
 "A list of IRC channels you will join automatically after connecting to the "
 "network"
 msgstr ""
 
 msgctxt "SimpleNetworkEditor|"
 msgid ""
 "A list of IRC channels you will join automatically after connecting to the "
 "network"
 msgstr ""
 

-#: ../src/qtui/snorenotificationbackend.cpp:60
+#: ../src/qtui/snorenotificationbackend.cpp:53

 msgctxt "SnoreNotificationBackend|"
 msgid "Private Message"
 msgstr ""
 
 msgctxt "SnoreNotificationBackend|"
 msgid "Private Message"
 msgstr ""
 

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

 msgctxt "SnoreNotificationConfigWidget|"
 msgid "Form"
 msgstr ""
 
 msgctxt "SnoreNotificationConfigWidget|"
 msgid "Form"
 msgstr ""
 

-#: ../src/qtui/ui/snorentificationconfigwidget.ui:29
+#: ../src/qtui/snorentificationconfigwidget.ui:29

 msgctxt "SnoreNotificationConfigWidget|"
 msgid "Snore"
 msgstr ""
 
 msgctxt "SnoreNotificationConfigWidget|"
 msgid "Snore"
 msgstr ""
 

-#: ../src/qtui/ui/snorentificationconfigwidget.ui:41
+#: ../src/qtui/snorentificationconfigwidget.ui:40

 msgctxt "SnoreNotificationConfigWidget|"
 msgctxt "SnoreNotificationConfigWidget|"

-msgid "Backend:"
+msgid "Enable Snore"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/snorentificationconfigwidget.ui:64
-msgctxt "SnoreNotificationConfigWidget|"
-msgid "Timeout:"
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Interface"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/snorentificationconfigwidget.ui:80
-msgctxt "SnoreNotificationConfigWidget|"
-msgid " s"
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Spell Checking"

 msgstr ""
 
 msgstr ""
 

-#: ../src/qtui/ui/snorentificationconfigwidget.ui:96
-msgctxt "SnoreNotificationConfigWidget|"
-msgid "0 means infinite"
+#: ../src/core/sqlauthenticator.cpp:47
+msgctxt "SqlAuthenticator|"
+msgid "Database"
+msgstr ""
+
+#: ../src/core/sqlauthenticator.cpp:52
+msgctxt "SqlAuthenticator|"
+msgid ""
+"Do not authenticate against any remote service, but instead save a hashed "
+"and salted password in the database selected in the next step."

 msgstr ""
 
 #: ../src/core/sqlitestorage.cpp:60
 msgstr ""
 
 #: ../src/core/sqlitestorage.cpp:60


@@ -5663,128 +8847,169 @@ msgid ""
 "your core."
 msgstr ""
 
 "your core."
 msgstr ""
 

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

 msgctxt "SslInfoDlg|"
 msgid "Security Information"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "Security Information"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:22
+#: ../src/qtui/sslinfodlg.ui:22

 msgctxt "SslInfoDlg|"
 msgid "<b>Hostname:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Hostname:</b>"
 msgstr ""
 

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

 msgctxt "SslInfoDlg|"
 msgid "<b>IP address:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>IP address:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:56
+#: ../src/qtui/sslinfodlg.ui:56

 msgctxt "SslInfoDlg|"
 msgid "<b>Encryption:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Encryption:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:73
+#: ../src/qtui/sslinfodlg.ui:73

 msgctxt "SslInfoDlg|"
 msgid "<b>Protocol:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Protocol:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:90
+#: ../src/qtui/sslinfodlg.ui:90

 msgctxt "SslInfoDlg|"
 msgid "<b>Certificate chain:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Certificate chain:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:120
+#: ../src/qtui/sslinfodlg.ui:120

 msgctxt "SslInfoDlg|"
 msgid "Subject"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "Subject"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
+#: ../src/qtui/sslinfodlg.ui:126 ../src/qtui/sslinfodlg.ui:248

 msgctxt "SslInfoDlg|"
 msgid "<b>Common name:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Common name:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265
+#: ../src/qtui/sslinfodlg.ui:143 ../src/qtui/sslinfodlg.ui:265

 msgctxt "SslInfoDlg|"
 msgid "<b>Organization:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Organization:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282
+#: ../src/qtui/sslinfodlg.ui:160 ../src/qtui/sslinfodlg.ui:282

 msgctxt "SslInfoDlg|"
 msgid "<b>Organizational unit:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Organizational unit:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299
+#: ../src/qtui/sslinfodlg.ui:177 ../src/qtui/sslinfodlg.ui:299

 msgctxt "SslInfoDlg|"
 msgid "<b>Country:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Country:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316
+#: ../src/qtui/sslinfodlg.ui:194 ../src/qtui/sslinfodlg.ui:316

 msgctxt "SslInfoDlg|"
 msgid "<b>State or province:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>State or province:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353
+#: ../src/qtui/sslinfodlg.ui:231 ../src/qtui/sslinfodlg.ui:353

 msgctxt "SslInfoDlg|"
 msgid "<b>Locality:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Locality:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:242
+#: ../src/qtui/sslinfodlg.ui:242

 msgctxt "SslInfoDlg|"
 msgid "Issuer"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "Issuer"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:367
+#: ../src/qtui/sslinfodlg.ui:367

 msgctxt "SslInfoDlg|"
 msgid "<b>Validity period:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Validity period:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:384
+#: ../src/qtui/sslinfodlg.ui:384

 msgctxt "SslInfoDlg|"
 msgid "<b>MD5 digest:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>MD5 digest:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:401
+#: ../src/qtui/sslinfodlg.ui:401

 msgctxt "SslInfoDlg|"
 msgid "<b>SHA1 digest:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>SHA1 digest:</b>"
 msgstr ""
 

-#: ../src/qtui/ui/sslinfodlg.ui:431
+#: ../src/qtui/sslinfodlg.ui:418
+msgctxt "SslInfoDlg|"
+msgid "<b>SHA256 digest:</b>"
+msgstr ""
+
+#: ../src/qtui/sslinfodlg.ui:448

 msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
 msgstr ""
 

-#: ../src/qtui/sslinfodlg.cpp:71
+#: ../src/qtui/sslinfodlg.cpp:76

 msgctxt "SslInfoDlg|"
 msgid "Yes"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "Yes"
 msgstr ""
 

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

 msgctxt "SslInfoDlg|"
 msgid "No, for the following reasons:<ul>"
 msgstr ""
 
 msgctxt "SslInfoDlg|"
 msgid "No, for the following reasons:<ul>"
 msgstr ""
 

-#: ../src/qtui/sslinfodlg.cpp:80
+#: ../src/qtui/sslinfodlg.cpp:88

 #, qt-format
 msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr ""
 
 #, qt-format
 msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr ""
 

-#: ../src/client/networkmodel.h:151
+#: ../src/client/networkmodel.h:169

 msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
 msgstr ""
 
 msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
 msgstr ""
 

-#: ../src/qtui/systemtray.cpp:68 ../src/qtui/systemtray.cpp:101
+#: ../src/qtui/systemtray.cpp:43 ../src/qtui/systemtray.cpp:203

 msgctxt "SystemTray|"
 msgid "&Minimize"
 msgstr ""
 
 msgctxt "SystemTray|"
 msgid "&Minimize"
 msgstr ""
 

-#: ../src/qtui/systemtray.cpp:103
+#: ../src/qtui/systemtray.cpp:205

 msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr ""
 
 msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr ""
 

-#: ../src/qtui/systraynotificationbackend.cpp:142
+#: ../src/qtui/systrayanimationconfigwidget.ui:20
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Form"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:28
+msgctxt "SystrayAnimationConfigWidget|"
+msgid ""
+"<html><head/><body><p>If enabled, alert the system tray or dock in case of a "
+"notification.</p><p>It depends on your desktop environment how an alert is "
+"visualized. For example, Plasma will pulsate the tray icon, while Windows "
+"will change the icon's color. You may choose to forcefully change color or "
+"even letting the icon blink, if desired.</p><p>Note that not all icon themes "
+"support changing the color of the tray icon.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:31
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Alert tray icon and"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:54
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "do nothing"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:59
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "change color"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:64
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "blink"
+msgstr ""
+
+#: ../src/qtui/systraynotificationbackend.cpp:131

 #, qt-format
 msgctxt "SystrayNotificationBackend|"
 msgid "%n pending highlight(s)"
 #, qt-format
 msgctxt "SystrayNotificationBackend|"
 msgid "%n pending highlight(s)"


@@ -5792,32 +9017,32 @@ msgid_plural "%n pending highlight(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/qtui/systraynotificationbackend.cpp:156
+#: ../src/qtui/systraynotificationbackend.cpp:145

 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr ""
 
 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr ""
 

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

 msgctxt "TabCompleter|"
 msgid "Tab completion"
 msgstr ""
 
 msgctxt "TabCompleter|"
 msgid "Tab completion"
 msgstr ""
 

-#: ../src/qtui/taskbarnotificationbackend.cpp:83
+#: ../src/qtui/taskbarnotificationbackend.cpp:78

 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Activate dock entry, timeout:"
 msgstr ""
 
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Activate dock entry, timeout:"
 msgstr ""
 

-#: ../src/qtui/taskbarnotificationbackend.cpp:85
+#: ../src/qtui/taskbarnotificationbackend.cpp:80

 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Mark taskbar entry, timeout:"
 msgstr ""
 
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Mark taskbar entry, timeout:"
 msgstr ""
 

-#: ../src/qtui/taskbarnotificationbackend.cpp:93
+#: ../src/qtui/taskbarnotificationbackend.cpp:88

 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Unlimited"
 msgstr ""
 
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Unlimited"
 msgstr ""
 

-#: ../src/qtui/taskbarnotificationbackend.cpp:94
+#: ../src/qtui/taskbarnotificationbackend.cpp:89

 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr ""
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr ""


@@ -5842,143 +9067,143 @@ msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
 msgstr ""
 
 msgid "Disconnect from IRC"
 msgstr ""
 

+#: ../src/uisupport/toolbaractionprovider.cpp:33
+msgctxt "ToolBarActionProvider|"
+msgid "Connect to all"
+msgstr ""
+

 #: ../src/uisupport/toolbaractionprovider.cpp:34
 msgctxt "ToolBarActionProvider|"
 #: ../src/uisupport/toolbaractionprovider.cpp:34
 msgctxt "ToolBarActionProvider|"

+msgid "Disconnect from all"
+msgstr ""
+
+#: ../src/uisupport/toolbaractionprovider.cpp:36
+msgctxt "ToolBarActionProvider|"

 msgid "Part"
 msgstr ""
 
 msgid "Part"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:36

 msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:35
+#: ../src/uisupport/toolbaractionprovider.cpp:37

 msgctxt "ToolBarActionProvider|"
 msgid "Join"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Join"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:35
+#: ../src/uisupport/toolbaractionprovider.cpp:37

 msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:39

 msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:39

 msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:40

 msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:40

 msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:42

 msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:42

 msgctxt "ToolBarActionProvider|"
 msgid "Give operator privileges to user"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Give operator privileges to user"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:43

 msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:43

 msgctxt "ToolBarActionProvider|"
 msgid "Take operator privileges from user"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Take operator privileges from user"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:44

 msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:44

 msgctxt "ToolBarActionProvider|"
 msgid "Give voice to user"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Give voice to user"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:45

 msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:45

 msgctxt "ToolBarActionProvider|"
 msgid "Take voice from user"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Take voice from user"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:46

 msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:46

 msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:47

 msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:47

 msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:46
+#: ../src/uisupport/toolbaractionprovider.cpp:48

 msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:46
+#: ../src/uisupport/toolbaractionprovider.cpp:48

 msgctxt "ToolBarActionProvider|"
 msgid "Remove and ban user from channel"
 msgstr ""
 
 msgctxt "ToolBarActionProvider|"
 msgid "Remove and ban user from channel"
 msgstr ""
 

-#: ../src/uisupport/toolbaractionprovider.cpp:51
-msgctxt "ToolBarActionProvider|"
-msgid "Connect to all"
-msgstr ""
-
-#: ../src/uisupport/toolbaractionprovider.cpp:58
-msgctxt "ToolBarActionProvider|"
-msgid "Disconnect from all"
-msgstr ""
-
-#: ../src/qtui/ui/topicwidget.ui:32
+#: ../src/qtui/topicwidget.ui:32

 msgctxt "TopicWidget|"
 msgid "Form"
 msgstr ""
 
 msgctxt "TopicWidget|"
 msgid "Form"
 msgstr ""
 

-#: ../src/qtui/ui/topicwidget.ui:79
+#: ../src/qtui/topicwidget.ui:79

 msgctxt "TopicWidget|"
 msgid "..."
 msgstr ""
 
 msgctxt "TopicWidget|"
 msgid "..."
 msgstr ""
 

-#: ../src/qtui/topicwidget.cpp:120
+#: ../src/qtui/topicwidget.cpp:116

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

-#: ../src/qtui/topicwidget.cpp:121
+#: ../src/qtui/topicwidget.cpp:117

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


@@ -6014,127 +9239,176 @@ msgctxt "TopicWidgetSettingsPage|"
 msgid "Topic Widget"
 msgstr ""
 
 msgid "Topic Widget"
 msgstr ""
 

-#. Plain Message
-#. ----------
-#. Notice Message
-#. ----------
-#. Server Message
-#. ----------
-#. Info Message
-#. ----------
-#. Error Message
-#. ----------
-#. Topic Message
-#. ----------
-#. Invite Message
-#: ../src/uisupport/uistyle.cpp:669 ../src/uisupport/uistyle.cpp:672
-#: ../src/uisupport/uistyle.cpp:713 ../src/uisupport/uistyle.cpp:716
-#: ../src/uisupport/uistyle.cpp:719 ../src/uisupport/uistyle.cpp:728
-#: ../src/uisupport/uistyle.cpp:762
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "%1"
+#: ../src/common/transfer.cpp:92
+msgctxt "Transfer|"
+msgid "New"

 msgstr ""
 
 msgstr ""
 

-#. Action Message
-#: ../src/uisupport/uistyle.cpp:675
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "%DN%1%DN %2"
+#: ../src/common/transfer.cpp:94
+msgctxt "Transfer|"
+msgid "Pending"
+msgstr ""
+
+#: ../src/common/transfer.cpp:96
+msgctxt "Transfer|"
+msgid "Connecting"
+msgstr ""
+
+#: ../src/common/transfer.cpp:98
+msgctxt "Transfer|"
+msgid "Transferring"
+msgstr ""
+
+#: ../src/common/transfer.cpp:100
+msgctxt "Transfer|"
+msgid "Paused"
+msgstr ""
+
+#: ../src/common/transfer.cpp:102
+msgctxt "Transfer|"
+msgid "Completed"
+msgstr ""
+
+#: ../src/common/transfer.cpp:104
+msgctxt "Transfer|"
+msgid "Failed"
+msgstr ""
+
+#: ../src/common/transfer.cpp:106
+msgctxt "Transfer|"
+msgid "Rejected"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Type"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "File"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Status"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Progress"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Transferred"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Speed"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Peer"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Peer Address"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:75
+msgctxt "TransferModel|"
+msgid "Send"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:75
+msgctxt "TransferModel|"
+msgid "Receive"

 msgstr ""
 
 #. Nick Message
 msgstr ""
 
 #. Nick Message

-#: ../src/uisupport/uistyle.cpp:679
+#: ../src/uisupport/uistyle.cpp:915

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "You are now known as %DN%1%DN"
 msgstr ""
 

-#: ../src/uisupport/uistyle.cpp:680
+#: ../src/uisupport/uistyle.cpp:917

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
 #. Mode Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr ""
 
 #. Mode Message

-#: ../src/uisupport/uistyle.cpp:684
+#: ../src/uisupport/uistyle.cpp:922

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "User mode: %DM%1%DM"
 msgstr ""
 
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "User mode: %DM%1%DM"
 msgstr ""
 

-#: ../src/uisupport/uistyle.cpp:685
+#: ../src/uisupport/uistyle.cpp:924

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. Join Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. Join Message

-#: ../src/uisupport/uistyle.cpp:689
+#: ../src/uisupport/uistyle.cpp:928

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. Part Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. Part Message

-#: ../src/uisupport/uistyle.cpp:692
+#: ../src/uisupport/uistyle.cpp:932

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr ""
 
 #. Quit Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr ""
 
 #. Quit Message

-#: ../src/uisupport/uistyle.cpp:697
+#: ../src/uisupport/uistyle.cpp:938

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr ""
 
 #. Kick Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr ""
 
 #. Kick Message

-#: ../src/uisupport/uistyle.cpp:705
+#: ../src/uisupport/uistyle.cpp:946

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr ""
 
 #. Day Change Message
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr ""
 
 #. Day Change Message

-#: ../src/uisupport/uistyle.cpp:723
+#: ../src/uisupport/uistyle.cpp:963

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
 msgstr ""
 
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
 msgstr ""
 

-#: ../src/uisupport/uistyle.cpp:737
+#: ../src/uisupport/uistyle.cpp:975

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
 
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
 

-#: ../src/uisupport/uistyle.cpp:741 ../src/uisupport/uistyle.cpp:757
+#: ../src/uisupport/uistyle.cpp:979 ../src/uisupport/uistyle.cpp:995

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN (%2 more)"
 msgstr ""
 
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN (%2 more)"
 msgstr ""
 

-#: ../src/uisupport/uistyle.cpp:752
+#: ../src/uisupport/uistyle.cpp:990

 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr ""
 
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr ""
 

-#: ../src/uisupport/uistyle.cpp:764 ../src/uisupport/uistyle.cpp:812
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "[%1]"
-msgstr ""
-
-#: ../src/uisupport/uistyle.cpp:810
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "<%1>"
-msgstr ""
-
-#: ../src/client/networkmodel.cpp:810
+#: ../src/client/networkmodel.cpp:954

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Owner(s)"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Owner(s)"


@@ -6142,7 +9416,7 @@ msgid_plural "%n Owner(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/client/networkmodel.cpp:812
+#: ../src/client/networkmodel.cpp:956

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Admin(s)"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Admin(s)"


@@ -6150,7 +9424,7 @@ msgid_plural "%n Admin(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/client/networkmodel.cpp:814
+#: ../src/client/networkmodel.cpp:958

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Operator(s)"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Operator(s)"


@@ -6158,7 +9432,7 @@ msgid_plural "%n Operator(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/client/networkmodel.cpp:816
+#: ../src/client/networkmodel.cpp:960

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Half-Op(s)"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Half-Op(s)"


@@ -6166,7 +9440,7 @@ msgid_plural "%n Half-Op(s)"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/client/networkmodel.cpp:818
+#: ../src/client/networkmodel.cpp:962

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Voiced"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Voiced"


@@ -6174,7 +9448,7 @@ msgid_plural "%n Voiced"
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: ../src/client/networkmodel.cpp:820
+#: ../src/client/networkmodel.cpp:964

 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n User(s)"
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n User(s)"