X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fquassel.pot;fp=po%2Fquassel.pot;h=374c0fd0004e19ab8ccc5187238f4654967c22c9;hp=ac05c41928ef4637b7a351e36199ff70fdc04388;hb=1a611c6267c3536101af2dabe89fae41de4cc6c3;hpb=37f3c64d38c2316fb38675e1ecc187e6e46fb98d

diff --git a/po/quassel.pot b/po/quassel.pot
index ac05c419..374c0fd0 100644
--- a/po/quassel.pot
+++ b/po/quassel.pot
@@ -71,538 +71,559 @@ msgctxt "AboutData|"
 msgid "OSX UI improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:164 ../src/uisupport/aboutdata.cpp:179
+#: ../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:165
+#: ../src/uisupport/aboutdata.cpp:166
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter, Danish translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:166 ../src/uisupport/aboutdata.cpp:244
-#: ../src/uisupport/aboutdata.cpp:273 ../src/uisupport/aboutdata.cpp:285
+#: ../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:167
+#: ../src/uisupport/aboutdata.cpp:168
 msgctxt "AboutData|"
 msgid "Build system fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:168 ../src/uisupport/aboutdata.cpp:308
+#: ../src/uisupport/aboutdata.cpp:169 ../src/uisupport/aboutdata.cpp:316
 msgctxt "AboutData|"
 msgid "Database performance improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:169
+#: ../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:170
+#: ../src/uisupport/aboutdata.cpp:172
 msgctxt "AboutData|"
 msgid "Language improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:171
+#: ../src/uisupport/aboutdata.cpp:173 ../src/uisupport/aboutdata.cpp:314
 msgctxt "AboutData|"
 msgid "Documentation improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:172 ../src/uisupport/aboutdata.cpp:278
+#: ../src/uisupport/aboutdata.cpp:174 ../src/uisupport/aboutdata.cpp:193
 msgctxt "AboutData|"
-msgid "Brazilian translation"
+msgid "Various improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:173 ../src/uisupport/aboutdata.cpp:247
+#: ../src/uisupport/aboutdata.cpp:175 ../src/uisupport/aboutdata.cpp:284
 msgctxt "AboutData|"
-msgid "Slovenian translation"
+msgid "Brazilian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:174 ../src/uisupport/aboutdata.cpp:200
-#: ../src/uisupport/aboutdata.cpp:203 ../src/uisupport/aboutdata.cpp:221
-#: ../src/uisupport/aboutdata.cpp:230 ../src/uisupport/aboutdata.cpp:252
-#: ../src/uisupport/aboutdata.cpp:268 ../src/uisupport/aboutdata.cpp:288
-#: ../src/uisupport/aboutdata.cpp:325
+#: ../src/uisupport/aboutdata.cpp:176 ../src/uisupport/aboutdata.cpp:251
 msgctxt "AboutData|"
-msgid "Fixes"
+msgid "Slovenian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:175 ../src/uisupport/aboutdata.cpp:300
+#: ../src/uisupport/aboutdata.cpp:178 ../src/uisupport/aboutdata.cpp:307
 msgctxt "AboutData|"
 msgid "Romanian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:176
+#: ../src/uisupport/aboutdata.cpp:179
 msgctxt "AboutData|"
 msgid "Punjabi translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:177 ../src/uisupport/aboutdata.cpp:239
-#: ../src/uisupport/aboutdata.cpp:254 ../src/uisupport/aboutdata.cpp:255
+#: ../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:178
+#: ../src/uisupport/aboutdata.cpp:181
 msgctxt "AboutData|"
 msgid "Message indicator support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:180 ../src/uisupport/aboutdata.cpp:181
-#: ../src/uisupport/aboutdata.cpp:324
+#: ../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:182
+#: ../src/uisupport/aboutdata.cpp:185
 msgctxt "AboutData|"
 msgid "Windows build system fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:183
+#: ../src/uisupport/aboutdata.cpp:186
 msgctxt "AboutData|"
 msgid "AppData metadata, LDAP support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:184
+#: ../src/uisupport/aboutdata.cpp:187
 msgctxt "AboutData|"
 msgid "Nicer tooltips, spell check and other improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:185
+#: ../src/uisupport/aboutdata.cpp:188
 msgctxt "AboutData|"
 msgid "Crash fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:186 ../src/uisupport/aboutdata.cpp:211
-#: ../src/uisupport/aboutdata.cpp:289
+#: ../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:187
+#: ../src/uisupport/aboutdata.cpp:190
 msgctxt "AboutData|"
 msgid "Occitan translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:188
+#: ../src/uisupport/aboutdata.cpp:191
 msgctxt "AboutData|"
 msgid "Usability review"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:189
+#: ../src/uisupport/aboutdata.cpp:192
 msgctxt "AboutData|"
 msgid "SASL support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:190
-msgctxt "AboutData|"
-msgid "Various improvements"
-msgstr ""
-
-#: ../src/uisupport/aboutdata.cpp:191 ../src/uisupport/aboutdata.cpp:192
-#: ../src/uisupport/aboutdata.cpp:197
+#: ../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:193
+#: ../src/uisupport/aboutdata.cpp:196
 msgctxt "AboutData|"
 msgid "Settings fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:194 ../src/uisupport/aboutdata.cpp:272
+#: ../src/uisupport/aboutdata.cpp:197 ../src/uisupport/aboutdata.cpp:278
 msgctxt "AboutData|"
 msgid "Galician translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:317
+#: ../src/uisupport/aboutdata.cpp:198 ../src/uisupport/aboutdata.cpp:325
 msgctxt "AboutData|"
 msgid "Esperanto translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:196
+#: ../src/uisupport/aboutdata.cpp:199
 msgctxt "AboutData|"
 msgid "Japanese translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:198 ../src/uisupport/aboutdata.cpp:275
+#: ../src/uisupport/aboutdata.cpp:201 ../src/uisupport/aboutdata.cpp:281
 msgctxt "AboutData|"
 msgid "Gentoo maintainer"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:199 ../src/uisupport/aboutdata.cpp:215
-#: ../src/uisupport/aboutdata.cpp:320
+#: ../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:201
+#: ../src/uisupport/aboutdata.cpp:204
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter (on Vista™!)"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:202
+#: ../src/uisupport/aboutdata.cpp:205
 msgctxt "AboutData|"
 msgid "Translation system fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:204
+#: ../src/uisupport/aboutdata.cpp:207
 msgctxt "AboutData|"
 msgid "OSX Notification Center support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:205 ../src/uisupport/aboutdata.cpp:222
-#: ../src/uisupport/aboutdata.cpp:323 ../src/uisupport/aboutdata.cpp:329
+#: ../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:206 ../src/uisupport/aboutdata.cpp:270
+#: ../src/uisupport/aboutdata.cpp:209 ../src/uisupport/aboutdata.cpp:276
 msgctxt "AboutData|"
 msgid "Mac fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:207
+#: ../src/uisupport/aboutdata.cpp:210
 msgctxt "AboutData|"
 msgid "D-Bus notifications"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:208
+#: ../src/uisupport/aboutdata.cpp:211
 msgctxt "AboutData|"
 msgid "Polish translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:209 ../src/uisupport/aboutdata.cpp:290
+#: ../src/uisupport/aboutdata.cpp:212 ../src/uisupport/aboutdata.cpp:297
 msgctxt "AboutData|"
 msgid "Build system improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:210
+#: ../src/uisupport/aboutdata.cpp:213
 msgctxt "AboutData|"
 msgid "Formatting support and other input line improvements, many other fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:212
+#: ../src/uisupport/aboutdata.cpp:215
 msgctxt "AboutData|"
 msgid "BluesTheme stylesheet"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:213 ../src/uisupport/aboutdata.cpp:259
-#: ../src/uisupport/aboutdata.cpp:301 ../src/uisupport/aboutdata.cpp:321
+#: ../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:214 ../src/uisupport/aboutdata.cpp:263
+#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:269
 msgctxt "AboutData|"
 msgid "Italian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:216 ../src/uisupport/aboutdata.cpp:250
-#: ../src/uisupport/aboutdata.cpp:260 ../src/uisupport/aboutdata.cpp:264
-#: ../src/uisupport/aboutdata.cpp:267 ../src/uisupport/aboutdata.cpp:318
+#: ../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:217
+#: ../src/uisupport/aboutdata.cpp:220
 msgctxt "AboutData|"
 msgid "Sanitize topic handling, twitch.tv support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:218
+#: ../src/uisupport/aboutdata.cpp:221
 msgctxt "AboutData|"
 msgid "Norwegian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:219
+#: ../src/uisupport/aboutdata.cpp:222
 msgctxt "AboutData|"
 msgid "Hungarian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:220
+#: ../src/uisupport/aboutdata.cpp:223
 msgctxt "AboutData|"
 msgid "IRC parser improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:223
+#: ../src/uisupport/aboutdata.cpp:226
 msgctxt "AboutData|"
 msgid "Windows build support and Appveyor maintenance, snorenotify backend"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:224
+#: ../src/uisupport/aboutdata.cpp:227
 msgctxt "AboutData|"
 msgid "Initial Qt5 support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:225
+#: ../src/uisupport/aboutdata.cpp:228
 msgctxt "AboutData|"
 msgid "{Ku|U}buntu packager, motivator, promoter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:226
+#: ../src/uisupport/aboutdata.cpp:229
 msgctxt "AboutData|"
 msgid "Various features and improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:227 ../src/uisupport/aboutdata.cpp:228
-#: ../src/uisupport/aboutdata.cpp:238 ../src/uisupport/aboutdata.cpp:245
-#: ../src/uisupport/aboutdata.cpp:266 ../src/uisupport/aboutdata.cpp:282
-#: ../src/uisupport/aboutdata.cpp:295
+#: ../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:229 ../src/uisupport/aboutdata.cpp:233
-#: ../src/uisupport/aboutdata.cpp:287 ../src/uisupport/aboutdata.cpp:292
-#: ../src/uisupport/aboutdata.cpp:304
+#: ../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:231 ../src/uisupport/aboutdata.cpp:319
-#: ../src/uisupport/aboutdata.cpp:322
+#: ../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:232
+#: ../src/uisupport/aboutdata.cpp:235
 msgctxt "AboutData|"
 msgid "Python improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:234
+#: ../src/uisupport/aboutdata.cpp:237
 msgctxt "AboutData|"
 msgid "Proxy improvements, Spanish translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:235
+#: ../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:236 ../src/uisupport/aboutdata.cpp:240
-#: ../src/uisupport/aboutdata.cpp:279
+#: ../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:237
+#: ../src/uisupport/aboutdata.cpp:241
 msgctxt "AboutData|"
 msgid "Context menu fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:241
+#: ../src/uisupport/aboutdata.cpp:245
 msgctxt "AboutData|"
 msgid "Many fixes and improvements, bug triaging"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:242
+#: ../src/uisupport/aboutdata.cpp:246
 msgctxt "AboutData|"
 msgid "Original \"All-Seeing Eye\" logo"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:243
+#: ../src/uisupport/aboutdata.cpp:247
 msgctxt "AboutData|"
 msgid "Project founder, various improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:246
+#: ../src/uisupport/aboutdata.cpp:250
 msgctxt "AboutData|"
 msgid "Serbian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:248
+#: ../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:249
+#: ../src/uisupport/aboutdata.cpp:253
 msgctxt "AboutData|"
 msgid "Qt5 porting help, Travis CI setup"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:251
+#: ../src/uisupport/aboutdata.cpp:256
 msgctxt "AboutData|"
 msgid "Buffer merge improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:253 ../src/uisupport/aboutdata.cpp:305
-#: ../src/uisupport/aboutdata.cpp:306 ../src/uisupport/aboutdata.cpp:312
-#: ../src/uisupport/aboutdata.cpp:313
+#: ../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:256
+#: ../src/uisupport/aboutdata.cpp:261 ../src/uisupport/aboutdata.cpp:267
+#: ../src/uisupport/aboutdata.cpp:301 ../src/uisupport/aboutdata.cpp:331
 msgctxt "AboutData|"
-msgid "OSX improvements"
+msgid "Improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:257
+#: ../src/uisupport/aboutdata.cpp:262
 msgctxt "AboutData|"
-msgid "Lithuanian translation"
+msgid "OSX improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:258
+#: ../src/uisupport/aboutdata.cpp:263
 msgctxt "AboutData|"
-msgid "Documentation fixes"
+msgid "Lithuanian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:261 ../src/uisupport/aboutdata.cpp:294
+#: ../src/uisupport/aboutdata.cpp:264
 msgctxt "AboutData|"
-msgid "Improvements"
+msgid "Documentation fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:262
+#: ../src/uisupport/aboutdata.cpp:268
 msgctxt "AboutData|"
 msgid "Ideas, hacking, initial motivation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:265
+#: ../src/uisupport/aboutdata.cpp:271
 msgctxt "AboutData|"
 msgid "Many fixes and improvements, Sonnet support, QuasselDroid"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:269
+#: ../src/uisupport/aboutdata.cpp:275
 msgctxt "AboutData|"
 msgid "German translation, fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:271
+#: ../src/uisupport/aboutdata.cpp:277
 msgctxt "AboutData|"
 msgid "Many fixes and improvements; Ubuntu PPAs"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:274
+#: ../src/uisupport/aboutdata.cpp:280
 msgctxt "AboutData|"
 msgid "Tons of Oxygen icons including the Quassel logo"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:276
+#: ../src/uisupport/aboutdata.cpp:282
 msgctxt "AboutData|"
 msgid "Initial design and main window layout"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:277
+#: ../src/uisupport/aboutdata.cpp:283
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:280
+#: ../src/uisupport/aboutdata.cpp:286
 msgctxt "AboutData|"
 msgid "Linewrap for input line"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:281
+#: ../src/uisupport/aboutdata.cpp:287
 msgctxt "AboutData|"
 msgid "Performance improvements and cleanups"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:283
+#: ../src/uisupport/aboutdata.cpp:289
 msgctxt "AboutData|"
 msgid "/print command"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:284
+#: ../src/uisupport/aboutdata.cpp:290
 msgctxt "AboutData|"
 msgid "Performance improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:286
+#: ../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:291
+#: ../src/uisupport/aboutdata.cpp:298
 msgctxt "AboutData|"
 msgid ""
 "Windows build support, automated OSX builds in Travis, various improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:293
+#: ../src/uisupport/aboutdata.cpp:300
 msgctxt "AboutData|"
 msgid "Emacs keybindings"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:296
+#: ../src/uisupport/aboutdata.cpp:303
 msgctxt "AboutData|"
 msgid "Highlight configuration improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:297
+#: ../src/uisupport/aboutdata.cpp:304
 msgctxt "AboutData|"
 msgid "Debian/Kubuntu packager, (packaging/build system) bughunter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:298
+#: ../src/uisupport/aboutdata.cpp:305
 msgctxt "AboutData|"
 msgid "Bugfixes, German translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:299
+#: ../src/uisupport/aboutdata.cpp:306
 msgctxt "AboutData|"
 msgid "Audio backend improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:302
+#: ../src/uisupport/aboutdata.cpp:309
 msgctxt "AboutData|"
 msgid "Chinese translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:303
+#: ../src/uisupport/aboutdata.cpp:310
 msgctxt "AboutData|"
 msgid "Dutch translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:307 ../src/uisupport/aboutdata.cpp:310
+#: ../src/uisupport/aboutdata.cpp:315 ../src/uisupport/aboutdata.cpp:318
 msgctxt "AboutData|"
 msgid "Korean translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:309
+#: ../src/uisupport/aboutdata.cpp:317
 msgctxt "AboutData|"
 msgid "Alias improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:311
+#: ../src/uisupport/aboutdata.cpp:319
 msgctxt "AboutData|"
 msgid "Norwegian translation, documentation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:314
+#: ../src/uisupport/aboutdata.cpp:322
 msgctxt "AboutData|"
 msgid "Former Windows builder"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:315
+#: ../src/uisupport/aboutdata.cpp:323
 msgctxt "AboutData|"
 msgid "Fixes, Debian packaging"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:316
+#: ../src/uisupport/aboutdata.cpp:324
 msgctxt "AboutData|"
 msgid "Fixes and feedback"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:326
+#: ../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:327
+#: ../src/uisupport/aboutdata.cpp:337
 msgctxt "AboutData|"
 msgid "Ukrainian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:328
+#: ../src/uisupport/aboutdata.cpp:338
 msgctxt "AboutData|"
 msgid "Portuguese translation"
 msgstr ""
@@ -1060,46 +1081,65 @@ msgctxt "BacklogSettingsPage|"
 msgid "Dynamic backlog amount:"
 msgstr ""
 
-#: ../src/qtui/settingspages/backlogsettingspage.ui:75
+#: ../src/qtui/settingspages/backlogsettingspage.ui:66
+msgctxt "BacklogSettingsPage|"
+msgid ""
+"When switching to a chat, more backlog will be fetched if no messages are "
+"shown yet or the scrollbar isn't visible.  Useful when not fetching any "
+"initial backlog."
+msgstr ""
+
+#: ../src/qtui/settingspages/backlogsettingspage.ui:69
+msgctxt "BacklogSettingsPage|"
+msgid "Fetch backlog if needed when switching chats"
+msgstr ""
+
+#: ../src/qtui/settingspages/backlogsettingspage.ui:91
 msgctxt "BacklogSettingsPage|"
 msgid "Backlog request method:"
 msgstr ""
 
-#: ../src/qtui/settingspages/backlogsettingspage.ui:83
+#: ../src/qtui/settingspages/backlogsettingspage.ui:102
 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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/qtui/settingspages/backlogsettingspage.ui:138
+#: ../src/qtui/settingspages/backlogsettingspage.ui:162
+#: ../src/qtui/settingspages/backlogsettingspage.ui:366
 msgctxt "BacklogSettingsPage|"
 msgid ""
 "Amount of messages per buffer that are requested after the core connection "
 "has been established."
 msgstr ""
 
-#: ../src/qtui/settingspages/backlogsettingspage.ui:141
+#: ../src/qtui/settingspages/backlogsettingspage.ui:165
 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. "
@@ -1109,42 +1149,58 @@ msgid ""
 "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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -1159,7 +1215,7 @@ msgid ""
 "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 ""
@@ -1193,7 +1249,7 @@ msgid ""
 " This cannot be reversed!"
 msgstr ""
 
-#: ../src/uisupport/bufferview.cpp:715
+#: ../src/uisupport/bufferview.cpp:721
 msgctxt "BufferViewDock|"
 msgid "Search..."
 msgstr ""
@@ -1357,31 +1413,48 @@ msgctxt "BufferViewWidget|"
 msgid "BufferView"
 msgstr ""
 
-#: ../src/qtui/bufferwidget.cpp:74
+#: ../src/qtui/bufferwidget.cpp:75
 msgctxt "BufferWidget|"
 msgid "Zoom In"
 msgstr ""
 
-#: ../src/qtui/bufferwidget.cpp:75
+#: ../src/qtui/bufferwidget.cpp:76
 msgctxt "BufferWidget|"
 msgid "Zoom Out"
 msgstr ""
 
-#: ../src/qtui/bufferwidget.cpp:76
+#: ../src/qtui/bufferwidget.cpp:77
 msgctxt "BufferWidget|"
 msgid "Actual Size"
 msgstr ""
 
-#: ../src/qtui/bufferwidget.cpp:78
+#: ../src/qtui/bufferwidget.cpp:79
 msgctxt "BufferWidget|"
 msgid "Set Marker Line"
 msgstr ""
 
-#: ../src/qtui/bufferwidget.cpp:81
+#: ../src/qtui/bufferwidget.cpp:82
 msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr ""
 
+#: ../src/qtui/settingspages/capseditdlg.ui:14
+msgctxt "CapsEditDlg|"
+msgid "Edit Network Features"
+msgstr ""
+
+#: ../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|"
@@ -1509,7 +1582,7 @@ msgid "Move selected buffers to the right"
 msgstr ""
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:275
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:282
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr ""
@@ -1541,51 +1614,91 @@ msgctxt "ChatMonitorSettingsPage|"
 msgid "Include ignored buffers"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:194
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:196
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Display messages from backlog on reconnect"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:197
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:199
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:298
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show messages from backlog"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:222
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:212
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:239
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages from backlog on reconnect"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:225
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:242
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:39
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Interface"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:39
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:63
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:61
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:64
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:278
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:285
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr ""
 
+#: ../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"
@@ -1821,37 +1934,39 @@ msgstr ""
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:41
 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>"
+"<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:54
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:56
 msgctxt "ChatViewSettingsPage|"
 msgid " hh:mm:ss"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:79
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:81
 msgctxt "ChatViewSettingsPage|"
 msgid "Shows <brackets> around the names of senders"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:82
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:84
 msgctxt "ChatViewSettingsPage|"
 msgid "Show brackets around sender names"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:100
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:102
 msgctxt "ChatViewSettingsPage|"
 msgid "Show sender modes before nicknames:"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:107
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:109
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "<qt><style>.bold { font-weight: bold; } .italic { font-style: italic; } ."
@@ -1867,52 +1982,52 @@ msgid ""
 "</qt>"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:142
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:144
 msgctxt "ChatViewSettingsPage|"
 msgid "Custom chat window font:"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:175
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:177
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Show a website preview window when hovering the mouse over a web address"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:178
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:180
 msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:194
+#: ../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 ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:197
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:199
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when switching chats"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:213
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Set the marker line to the bottom of the current chat window when Quassel "
 "loses focus."
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:216
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:218
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when Quassel loses focus"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:234
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:236
 msgctxt "ChatViewSettingsPage|"
 msgid "Web Search URL:"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:241
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:243
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "<html><head/><body><p>The URL to open with the selected text as the "
@@ -1922,7 +2037,7 @@ msgid ""
 "font-weight:600;\">%s</span></p></body></html>"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:247
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:249
 msgctxt "ChatViewSettingsPage|"
 msgid "https://www.google.com/search?q=%s"
 msgstr ""
@@ -2072,12 +2187,12 @@ msgctxt "ClientAuthHandler|"
 msgid "Unencrypted connection cancelled"
 msgstr ""
 
-#: ../src/client/clientauthhandler.cpp:456
+#: ../src/client/clientauthhandler.cpp:460
 msgctxt "ClientAuthHandler|"
 msgid "Unencrypted connection canceled"
 msgstr ""
 
-#: ../src/client/clientbacklogmanager.cpp:173
+#: ../src/client/clientbacklogmanager.cpp:177
 #, qt-format
 msgctxt "ClientBacklogManager|"
 msgid "Processed %1 messages in %2 seconds."
@@ -3286,7 +3401,7 @@ msgid "Form"
 msgstr ""
 
 #: ../src/qtui/settingspages/corehighlightsettingspage.ui:57
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:689
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:677
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Your Quassel core is too old to support remote highlights"
 msgstr ""
@@ -3379,72 +3494,55 @@ msgctxt "CoreHighlightSettingsPage|"
 msgid "Interface"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:37
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:35
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Highlights"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:37
-msgctxt "CoreHighlightSettingsPage|"
-msgid "Remote Highlights"
-msgstr ""
-
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:45
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:43
 msgctxt "CoreHighlightSettingsPage|"
 msgid "All Nicks from Identity"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:46
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:44
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Current Nick"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:47
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:45
 msgctxt "CoreHighlightSettingsPage|"
 msgid "None"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:89
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:86
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Import Legacy"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:91
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:99
+#: ../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:91
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:709
+#: ../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:97
-msgctxt "CoreHighlightSettingsPage|"
-msgid "Import Local"
-msgstr ""
-
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:99
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:686
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:712
-msgctxt "CoreHighlightSettingsPage|"
-msgid "Local Highlights"
-msgstr ""
-
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:141
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:129
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Enable/disable this rule"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:144
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:132
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Phrase to match, leave blank to match any message"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:147
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:135
 msgctxt "CoreHighlightSettingsPage|"
 msgid ""
 "<b>RegEx</b>: This option determines if the highlight rule, <i>Sender</i>, "
@@ -3452,14 +3550,14 @@ msgid ""
 "just as keywords."
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:152
+#: ../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:156
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:144
 msgctxt "CoreHighlightSettingsPage|"
 msgid ""
 "<p><b>Sender</b>: Semicolon separated list of <i>nick!ident@host</i> names, "
@@ -3473,7 +3571,7 @@ msgid ""
 "<i>aperture</i> or any nickname starting with <i>Announce</i></p>"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:170
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:158
 msgctxt "CoreHighlightSettingsPage|"
 msgid ""
 "<p><b>Channel</b>: Semicolon separated list of channel/query names, leave "
@@ -3486,58 +3584,63 @@ msgid ""
 "channel starting with <i>#quassel</i></p>"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:690
+#: ../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:692
+#: ../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:696
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:684
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Remote Highlights unsupported"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:717
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:700
 msgctxt "CoreHighlightSettingsPage|"
 msgid "No highlights to import"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:717
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:700
 #, qt-format
 msgctxt "CoreHighlightSettingsPage|"
 msgid "No highlight rules in <i>%1</i>."
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:722
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:705
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Import highlights?"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:723
+#: ../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:759
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:756
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Imported highlights"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:760
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:758
 #, qt-format
 msgctxt "CoreHighlightSettingsPage|"
 msgid "%1 highlight rules successfully imported."
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.h:54
-#: ../src/qtui/settingspages/corehighlightsettingspage.h:62
+#: ../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 ""
@@ -3552,32 +3655,32 @@ msgctxt "CoreInfoDlg|"
 msgid "Version:"
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.ui:36
+#: ../src/qtui/coreinfodlg.ui:42
 msgctxt "CoreInfoDlg|"
 msgid "Version date:"
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.ui:50
+#: ../src/qtui/coreinfodlg.ui:56
 msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.ui:64
+#: ../src/qtui/coreinfodlg.ui:70
 msgctxt "CoreInfoDlg|"
 msgid "Connected clients:"
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.ui:117 ../src/qtui/coreinfodlg.cpp:194
+#: ../src/qtui/coreinfodlg.ui:123 ../src/qtui/coreinfodlg.cpp:194
 msgctxt "CoreInfoDlg|"
 msgid "Your Quassel core is too old to show active sessions"
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.ui:124
+#: ../src/qtui/coreinfodlg.ui:130
 msgctxt "CoreInfoDlg|"
 msgid "Details..."
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.ui:200
+#: ../src/qtui/coreinfodlg.ui:206
 msgctxt "CoreInfoDlg|"
 msgid "Close"
 msgstr ""
@@ -3629,117 +3732,123 @@ msgid ""
 "connected clients."
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:229
+#: ../src/core/corenetwork.cpp:231
 msgctxt "CoreNetwork|"
 msgid "Connection failed. Cycling to next server..."
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:241 ../src/core/corenetwork.cpp:246
+#: ../src/core/corenetwork.cpp:243 ../src/core/corenetwork.cpp:248
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connecting to %1:%2..."
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:314
+#: ../src/core/corenetwork.cpp:316
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Disconnecting. (%1)"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:314
+#: ../src/core/corenetwork.cpp:316
 msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:535
+#: ../src/core/corenetwork.cpp:537
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:541
+#: ../src/core/corenetwork.cpp:543
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:589
+#: ../src/core/corenetwork.cpp:591
 msgctxt "CoreNetwork|"
 msgid "Requesting capability list..."
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1117
+#: ../src/core/corenetwork.cpp:1125
 msgctxt "CoreNetwork|"
 msgid "SASL EXTERNAL authentication not supported"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1133
+#: ../src/core/corenetwork.cpp:1141
 msgctxt "CoreNetwork|"
 msgid "SASL PLAIN authentication not supported"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1245
+#: ../src/core/corenetwork.cpp:1253
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Could not negotiate some capabilities, retrying individually (%1)..."
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1261
+#: ../src/core/corenetwork.cpp:1289
 msgctxt "CoreNetwork|"
 msgid "No capabilities available"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1267
+#: ../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:1275
+#: ../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:1296
+#: ../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:1308
+#: ../src/core/corenetwork.cpp:1356
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Negotiating capabilities (requesting: %1)..."
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1328
+#: ../src/core/corenetwork.cpp:1376
 msgctxt "CoreNetwork|"
 msgid "SASL authentication currently not supported by server"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1336
+#: ../src/core/corenetwork.cpp:1384
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Capability negotiation finished (enabled: %1)"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1470
+#: ../src/core/corenetwork.cpp:1518
 msgctxt "CoreNetwork|"
 msgid ""
 "Encrypted connection couldn't be verified, disconnecting since verification "
 "is required"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1474 ../src/core/corenetwork.cpp:1493
+#: ../src/core/corenetwork.cpp:1522 ../src/core/corenetwork.cpp:1541
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid " (Reason: %1)"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1489
+#: ../src/core/corenetwork.cpp:1537
 msgctxt "CoreNetwork|"
 msgid ""
 "Encrypted connection couldn't be verified, continuing since verification is "
@@ -3757,7 +3866,7 @@ msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."
 msgstr ""
 
-#: ../src/core/coresession.cpp:597
+#: ../src/core/coresession.cpp:607
 #, qt-format
 msgctxt "CoreSession|"
 msgid ""
@@ -3765,7 +3874,7 @@ msgid ""
 "create network %1!"
 msgstr ""
 
-#: ../src/core/coresession.cpp:628
+#: ../src/core/coresession.cpp:638
 msgctxt "CoreSession|"
 msgid ""
 "CoreSession::createNetwork(): Trying to create a network that already "
@@ -3778,33 +3887,33 @@ msgid ""
 "No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
 msgstr ""
 
-#: ../src/core/coresessioneventprocessor.cpp:798
+#: ../src/core/coresessioneventprocessor.cpp:821
 msgctxt "CoreSessionEventProcessor|"
 msgid "Unable to perform key exchange, missing qca-ossl plugin."
 msgstr ""
 
-#: ../src/core/coresessioneventprocessor.cpp:815
+#: ../src/core/coresessioneventprocessor.cpp:838
 msgctxt "CoreSessionEventProcessor|"
 msgid "Unable to parse the DH1080_INIT. Key exchange failed."
 msgstr ""
 
-#: ../src/core/coresessioneventprocessor.cpp:826
-#: ../src/core/coresessioneventprocessor.cpp:841
+#: ../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:850
+#: ../src/core/coresessioneventprocessor.cpp:873
 msgctxt "CoreSessionEventProcessor|"
 msgid "Failed to parse DH1080_FINISH. Key exchange failed."
 msgstr ""
 
-#: ../src/core/coresessioneventprocessor.cpp:1579
+#: ../src/core/coresessioneventprocessor.cpp:1602
 msgctxt "CoreSessionEventProcessor|"
 msgid "Reverse DCC SEND not supported"
 msgstr ""
 
-#: ../src/core/coresessioneventprocessor.cpp:1602
+#: ../src/core/coresessioneventprocessor.cpp:1625
 #, qt-format
 msgctxt "CoreSessionEventProcessor|"
 msgid "DCC %1 not supported"
@@ -3820,27 +3929,27 @@ msgctxt "CoreSessionWidget|"
 msgid "Client:"
 msgstr ""
 
-#: ../src/qtui/coresessionwidget.ui:51
+#: ../src/qtui/coresessionwidget.ui:57
 msgctxt "CoreSessionWidget|"
 msgid "Version date:"
 msgstr ""
 
-#: ../src/qtui/coresessionwidget.ui:65
+#: ../src/qtui/coresessionwidget.ui:71
 msgctxt "CoreSessionWidget|"
 msgid "Location:"
 msgstr ""
 
-#: ../src/qtui/coresessionwidget.ui:79
+#: ../src/qtui/coresessionwidget.ui:85
 msgctxt "CoreSessionWidget|"
 msgid "Connected since:"
 msgstr ""
 
-#: ../src/qtui/coresessionwidget.ui:93
+#: ../src/qtui/coresessionwidget.ui:99
 msgctxt "CoreSessionWidget|"
 msgid "Secure:"
 msgstr ""
 
-#: ../src/qtui/coresessionwidget.ui:124
+#: ../src/qtui/coresessionwidget.ui:130
 msgctxt "CoreSessionWidget|"
 msgid "End Session"
 msgstr ""
@@ -3912,38 +4021,38 @@ msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:208
-#: ../src/core/coreuserinputhandler.cpp:404
-#: ../src/core/coreuserinputhandler.cpp:757
-#: ../src/core/coreuserinputhandler.cpp:813
+#: ../src/core/coreuserinputhandler.cpp:210
+#: ../src/core/coreuserinputhandler.cpp:406
+#: ../src/core/coreuserinputhandler.cpp:767
+#: ../src/core/coreuserinputhandler.cpp:830
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: QCA provider plugin not found. It is usually provided by the qca-ossl "
 "plugin."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:223
+#: ../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 ""
 
-#: ../src/core/coreuserinputhandler.cpp:236
-#: ../src/core/coreuserinputhandler.cpp:842
+#: ../src/core/coreuserinputhandler.cpp:238
+#: ../src/core/coreuserinputhandler.cpp:859
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "No key has been set for %1."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:246
+#: ../src/core/coreuserinputhandler.cpp:248
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been deleted."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:255
-#: ../src/core/coreuserinputhandler.cpp:860
+#: ../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 "
@@ -3952,30 +4061,30 @@ msgid ""
 "with QCA2 present."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:418
+#: ../src/core/coreuserinputhandler.cpp:420
 msgctxt "CoreUserInputHandler|"
 msgid "[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:430
+#: ../src/core/coreuserinputhandler.cpp:432
 msgctxt "CoreUserInputHandler|"
 msgid "It is only possible to exchange keys in a query buffer."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:445
+#: ../src/core/coreuserinputhandler.cpp:447
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Failed to initiate key exchange with %1."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:455
+#: ../src/core/coreuserinputhandler.cpp:457
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Initiated key exchange with %1."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:464
-#: ../src/core/coreuserinputhandler.cpp:793
+#: ../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 "
@@ -3984,38 +4093,40 @@ msgid ""
 "with QCA present."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:536
+#: ../src/core/coreuserinputhandler.cpp:540
 msgctxt "CoreUserInputHandler|"
 msgid "Your persistent modes have been reset."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:676
+#: ../src/core/coreuserinputhandler.cpp:682
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Starting query with %1"
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:771
+#: ../src/core/coreuserinputhandler.cpp:781
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
-"channel. /setkey <key> when in a channel or query buffer sets the key for 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 ""
 
-#: ../src/core/coreuserinputhandler.cpp:785
+#: ../src/core/coreuserinputhandler.cpp:796
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been set."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:828
+#: ../src/core/coreuserinputhandler.cpp:845
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /showkey <nick|channel> shows the encryption key for nick or channel "
 "or just /showkey when in a channel or query."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:851
+#: ../src/core/coreuserinputhandler.cpp:868
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 is %2:%3"
@@ -4224,277 +4335,283 @@ msgctxt "DockManagerNotificationBackend::ConfigWidget|"
 msgid "Mark dockmanager entry"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:240 ../src/core/eventstringifier.cpp:439
+#: ../src/core/eventstringifier.cpp:240 ../src/core/eventstringifier.cpp:450
 msgctxt "EventStringifier|"
 msgid "[Whois] "
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:254
+#: ../src/core/eventstringifier.cpp:261
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 invited you to channel %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:401
+#: ../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 ""
 
-#: ../src/core/eventstringifier.cpp:413
+#: ../src/core/eventstringifier.cpp:424
 msgctxt "EventStringifier|"
 msgid "Error from server: "
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:418
+#: ../src/core/eventstringifier.cpp:429
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Operwall] %1: %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:425
+#: ../src/core/eventstringifier.cpp:436
 msgctxt "EventStringifier|"
 msgid ""
 "Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
 "behavior!"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:462
+#: ../src/core/eventstringifier.cpp:473
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 is away: \"%2\""
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:468
+#: ../src/core/eventstringifier.cpp:479
 msgctxt "EventStringifier|"
 msgid "You are no longer marked as being away"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:475
+#: ../src/core/eventstringifier.cpp:486
 msgctxt "EventStringifier|"
 msgid "You have been marked as being away"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:496
+#: ../src/core/eventstringifier.cpp:507
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is %2 (%3)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:511
+#: ../src/core/eventstringifier.cpp:522
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is online via %2 (%3)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:513
+#: ../src/core/eventstringifier.cpp:524
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was online via %2 (%3)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:522
+#: ../src/core/eventstringifier.cpp:533
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was %2@%3 (%4)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:530
+#: ../src/core/eventstringifier.cpp:541
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] End of /WHO list for %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:552
+#: ../src/core/eventstringifier.cpp:563
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is logged in since %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:557
+#: ../src/core/eventstringifier.cpp:568
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is idling for %2 (since %3)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:565
+#: ../src/core/eventstringifier.cpp:576
 msgctxt "EventStringifier|"
 msgid "[Whois] End of /WHOIS list"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:587
+#: ../src/core/eventstringifier.cpp:598
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:589
+#: ../src/core/eventstringifier.cpp:600
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:591
+#: ../src/core/eventstringifier.cpp:602
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:614
+#: ../src/core/eventstringifier.cpp:625
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 has %2 users. Topic is: \"%3\""
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:620
+#: ../src/core/eventstringifier.cpp:631
 msgctxt "EventStringifier|"
 msgid "End of channel list"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:636
+#: ../src/core/eventstringifier.cpp:647
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Homepage for %1 is %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:661
+#: ../src/core/eventstringifier.cpp:672
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 created on %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:672
+#: ../src/core/eventstringifier.cpp:683
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is authed as %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:675
+#: ../src/core/eventstringifier.cpp:686
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was authed as %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:683
+#: ../src/core/eventstringifier.cpp:694
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "No topic is set for %1."
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:690
+#: ../src/core/eventstringifier.cpp:701
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic for %1 is \"%2\""
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:711
+#: ../src/core/eventstringifier.cpp:722
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic set by %1 on %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:723
+#: ../src/core/eventstringifier.cpp:734
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has been invited to %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:730
+#: ../src/core/eventstringifier.cpp:741
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:739
+#: ../src/core/eventstringifier.cpp:750
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[WhoX] %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:745
+#: ../src/core/eventstringifier.cpp:756
 msgctxt "EventStringifier|"
 msgid "End of /WHOWAS"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:754
+#: ../src/core/eventstringifier.cpp:765
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick %1 contains illegal characters"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:763
+#: ../src/core/eventstringifier.cpp:774
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick already in use: %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:772
+#: ../src/core/eventstringifier.cpp:783
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:796
+#: ../src/core/eventstringifier.cpp:812
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
 #. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
-#: ../src/core/eventstringifier.cpp:813
+#: ../src/core/eventstringifier.cpp:829
 msgctxt "EventStringifier|"
 msgid "unknown"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:814
+#: ../src/core/eventstringifier.cpp:830
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received %1CTCP-%2 request by %3"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:817
+#: ../src/core/eventstringifier.cpp:835
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-%1 answer from %2: %3"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:832
+#: ../src/core/eventstringifier.cpp:858
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time"
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:54
+#: ../src/client/execwrapper.cpp:58
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Invalid command string for /exec: %1"
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:63
+#: ../src/client/execwrapper.cpp:68
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:74
+#: ../src/client/execwrapper.cpp:79
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Could not find script \"%1\""
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:95
+#: ../src/client/execwrapper.cpp:100
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" crashed with exit code %2."
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:112
+#: ../src/client/execwrapper.cpp:117
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" could not start."
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:114
+#: ../src/client/execwrapper.cpp:119
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" caused error %2."
@@ -4510,128 +4627,122 @@ msgctxt "HighlightSettingsPage|"
 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 ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:33
+#: ../src/qtui/settingspages/highlightsettingspage.ui:64
 msgctxt "HighlightSettingsPage|"
 msgid "Enabled"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:38
+#: ../src/qtui/settingspages/highlightsettingspage.ui:69
 msgctxt "HighlightSettingsPage|"
 msgid "Highlight"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:43
+#: ../src/qtui/settingspages/highlightsettingspage.ui:74
 msgctxt "HighlightSettingsPage|"
 msgid "RegEx"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:48
+#: ../src/qtui/settingspages/highlightsettingspage.ui:79
 msgctxt "HighlightSettingsPage|"
 msgid "CS"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:53
+#: ../src/qtui/settingspages/highlightsettingspage.ui:84
 msgctxt "HighlightSettingsPage|"
 msgid "Channel"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:69
+#: ../src/qtui/settingspages/highlightsettingspage.ui:100
 msgctxt "HighlightSettingsPage|"
 msgid "Add"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:76
+#: ../src/qtui/settingspages/highlightsettingspage.ui:107
 msgctxt "HighlightSettingsPage|"
 msgid "Remove"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:101
+#: ../src/qtui/settingspages/highlightsettingspage.ui:132
 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 ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:114
+#: ../src/qtui/settingspages/highlightsettingspage.ui:145
 msgctxt "HighlightSettingsPage|"
 msgid "Current nick"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:124
+#: ../src/qtui/settingspages/highlightsettingspage.ui:155
 msgctxt "HighlightSettingsPage|"
 msgid "None"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:131
+#: ../src/qtui/settingspages/highlightsettingspage.ui:162
 msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:156
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:96
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:287
-msgctxt "HighlightSettingsPage|"
-msgid "Local Highlights apply to this device only"
-msgstr ""
-
-#: ../src/qtui/settingspages/highlightsettingspage.ui:163
-msgctxt "HighlightSettingsPage|"
-msgid "Details..."
-msgstr ""
-
 #: ../src/qtui/settingspages/highlightsettingspage.cpp:34
 msgctxt "HighlightSettingsPage|"
 msgid "Interface"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:36
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:34
 msgctxt "HighlightSettingsPage|"
 msgid "Legacy Highlights"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:36
-msgctxt "HighlightSettingsPage|"
-msgid "Local Highlights"
-msgstr ""
-
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:43
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:156
+#: ../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:47
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:157
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:45
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:144
 msgctxt "HighlightSettingsPage|"
 msgid "Phrase to match"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:52
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:158
+#: ../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:58
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:160
+#: ../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:64
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:162
+#: ../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 "
@@ -4644,61 +4755,34 @@ msgid ""
 "channel starting with <i>#quassel</i></p>"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:92
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:275
-msgctxt "HighlightSettingsPage|"
-msgid "Legacy Highlights are replaced by Highlights"
-msgstr ""
-
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:247
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:234
 msgctxt "HighlightSettingsPage|"
 msgid "this shouldn't be empty"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:273
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:258
 msgctxt "HighlightSettingsPage|"
 msgid "Legacy Highlights vs. Highlights"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:276
+#: ../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:278
+#: ../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:280
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:264
 msgctxt "HighlightSettingsPage|"
 msgid "Highlights"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:285
-msgctxt "HighlightSettingsPage|"
-msgid "Local Highlights vs. Remote Highlights"
-msgstr ""
-
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:288
-msgctxt "HighlightSettingsPage|"
-msgid "Highlights configured on this page only apply to your current device."
-msgstr ""
-
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:290
-#, qt-format
-msgctxt "HighlightSettingsPage|"
-msgid "Configure highlights for all of your devices in <i>%1</i>."
-msgstr ""
-
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:292
-msgctxt "HighlightSettingsPage|"
-msgid "Remote Highlights"
-msgstr ""
-
 #: ../src/qtui/settingspages/highlightsettingspage.h:47
 msgctxt "HighlightSettingsPage|"
 msgid "highlight rule"
@@ -5519,117 +5603,122 @@ msgctxt "InputWidget|"
 msgid "Underline"
 msgstr ""
 
-#: ../src/qtui/inputwidget.ui:298
+#: ../src/qtui/inputwidget.ui:301
+msgctxt "InputWidget|"
+msgid "Strikethrough"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:341
 msgctxt "InputWidget|"
 msgid "Set foreground color"
 msgstr ""
 
-#: ../src/qtui/inputwidget.ui:329
+#: ../src/qtui/inputwidget.ui:372
 msgctxt "InputWidget|"
 msgid "Set background color"
 msgstr ""
 
-#: ../src/qtui/inputwidget.ui:363
+#: ../src/qtui/inputwidget.ui:406
 msgctxt "InputWidget|"
 msgid "Clear formatting"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "White"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Black"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Red"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:79
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Orange"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:79
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:79
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Green"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:79
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:79
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:79
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Blue"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:79
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:79
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:80
+#: ../src/qtui/inputwidget.cpp:81
 msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:90 ../src/qtui/inputwidget.cpp:91
+#: ../src/qtui/inputwidget.cpp:91 ../src/qtui/inputwidget.cpp:92
 msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:133
+#: ../src/qtui/inputwidget.cpp:134
 msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:585
+#: ../src/qtui/inputwidget.cpp:603
 msgctxt "InputWidget|"
 msgid "Hide formatting options"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:589
+#: ../src/qtui/inputwidget.cpp:607
 msgctxt "InputWidget|"
 msgid "Show formatting options"
 msgstr ""
@@ -5754,7 +5843,7 @@ msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr ""
 
-#: ../src/core/ircparser.cpp:391
+#: ../src/core/ircparser.cpp:452
 msgctxt "IrcParser|"
 msgid "Capability negotiation not supported"
 msgstr ""
@@ -6309,331 +6398,336 @@ msgstr ""
 
 #: ../src/qtui/mainwin.cpp:472
 msgctxt "MainWin|"
+msgid "Toggle strikethrough"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:479
+msgctxt "MainWin|"
 msgid "Navigation"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:476
+#: ../src/qtui/mainwin.cpp:483
 msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:478
+#: ../src/qtui/mainwin.cpp:485
 msgctxt "MainWin|"
 msgid "Activate the buffer search"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:490
+#: ../src/qtui/mainwin.cpp:497
 msgctxt "MainWin|"
 msgid "Set Quick Access #0"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:493
+#: ../src/qtui/mainwin.cpp:500
 msgctxt "MainWin|"
 msgid "Set Quick Access #1"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:496
+#: ../src/qtui/mainwin.cpp:503
 msgctxt "MainWin|"
 msgid "Set Quick Access #2"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:499
+#: ../src/qtui/mainwin.cpp:506
 msgctxt "MainWin|"
 msgid "Set Quick Access #3"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:502
+#: ../src/qtui/mainwin.cpp:509
 msgctxt "MainWin|"
 msgid "Set Quick Access #4"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:505
+#: ../src/qtui/mainwin.cpp:512
 msgctxt "MainWin|"
 msgid "Set Quick Access #5"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:508
+#: ../src/qtui/mainwin.cpp:515
 msgctxt "MainWin|"
 msgid "Set Quick Access #6"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:511
+#: ../src/qtui/mainwin.cpp:518
 msgctxt "MainWin|"
 msgid "Set Quick Access #7"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:514
+#: ../src/qtui/mainwin.cpp:521
 msgctxt "MainWin|"
 msgid "Set Quick Access #8"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:517
+#: ../src/qtui/mainwin.cpp:524
 msgctxt "MainWin|"
 msgid "Set Quick Access #9"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:520
+#: ../src/qtui/mainwin.cpp:527
 msgctxt "MainWin|"
 msgid "Quick Access #0"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:522
+#: ../src/qtui/mainwin.cpp:529
 msgctxt "MainWin|"
 msgid "Quick Access #1"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:524
+#: ../src/qtui/mainwin.cpp:531
 msgctxt "MainWin|"
 msgid "Quick Access #2"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:526
+#: ../src/qtui/mainwin.cpp:533
 msgctxt "MainWin|"
 msgid "Quick Access #3"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:528
+#: ../src/qtui/mainwin.cpp:535
 msgctxt "MainWin|"
 msgid "Quick Access #4"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:530
+#: ../src/qtui/mainwin.cpp:537
 msgctxt "MainWin|"
 msgid "Quick Access #5"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:532
+#: ../src/qtui/mainwin.cpp:539
 msgctxt "MainWin|"
 msgid "Quick Access #6"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:534
+#: ../src/qtui/mainwin.cpp:541
 msgctxt "MainWin|"
 msgid "Quick Access #7"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:536
+#: ../src/qtui/mainwin.cpp:543
 msgctxt "MainWin|"
 msgid "Quick Access #8"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:538
+#: ../src/qtui/mainwin.cpp:545
 msgctxt "MainWin|"
 msgid "Quick Access #9"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:544
+#: ../src/qtui/mainwin.cpp:551
 msgctxt "MainWin|"
 msgid "Activate Next Chat List"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:551
+#: ../src/qtui/mainwin.cpp:558
 msgctxt "MainWin|"
 msgid "Activate Previous Chat List"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:558
+#: ../src/qtui/mainwin.cpp:565
 msgctxt "MainWin|"
 msgid "Go to Next Chat"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:565
+#: ../src/qtui/mainwin.cpp:572
 msgctxt "MainWin|"
 msgid "Go to Previous Chat"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:576
+#: ../src/qtui/mainwin.cpp:583
 msgctxt "MainWin|"
 msgid "&File"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:591
+#: ../src/qtui/mainwin.cpp:598
 msgctxt "MainWin|"
 msgid "&Networks"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:597
+#: ../src/qtui/mainwin.cpp:604
 msgctxt "MainWin|"
 msgid "&View"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:598
+#: ../src/qtui/mainwin.cpp:605
 msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:600
+#: ../src/qtui/mainwin.cpp:607
 msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:614
+#: ../src/qtui/mainwin.cpp:621
 msgctxt "MainWin|"
 msgid "&Settings"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:628
+#: ../src/qtui/mainwin.cpp:635
 msgctxt "MainWin|"
 msgid "&Help"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:641
+#: ../src/qtui/mainwin.cpp:648
 msgctxt "MainWin|"
 msgid "Debug"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:809
+#: ../src/qtui/mainwin.cpp:816
 msgctxt "MainWin|"
 msgid "Feature Not Supported"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:810
+#: ../src/qtui/mainwin.cpp:817
 msgctxt "MainWin|"
 msgid "<b>Your Quassel Core does not support this feature</b>"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:812
+#: ../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:821
+#: ../src/qtui/mainwin.cpp:828
 msgctxt "MainWin|"
 msgid "Upgrading..."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:822
+#: ../src/qtui/mainwin.cpp:829
 msgctxt "MainWin|"
 msgid "Your database is being upgraded"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:826
+#: ../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:827
+#: ../src/qtui/mainwin.cpp:834
 msgctxt "MainWin|"
 msgid "Do not exit Quassel until the upgrade is complete!"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:842
+#: ../src/qtui/mainwin.cpp:849
 msgctxt "MainWin|"
 msgid "Fatal error"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:843
+#: ../src/qtui/mainwin.cpp:850
 msgctxt "MainWin|"
 msgid "Quassel encountered a fatal error and is terminated."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:845
+#: ../src/qtui/mainwin.cpp:852
 msgctxt "MainWin|"
 msgid "Reason:<em>"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:959
+#: ../src/qtui/mainwin.cpp:966
 msgctxt "MainWin|"
 msgid "Nicks"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:969
+#: ../src/qtui/mainwin.cpp:976
 msgctxt "MainWin|"
 msgid "Show Nick List"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:983
+#: ../src/qtui/mainwin.cpp:990
 msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:994
+#: ../src/qtui/mainwin.cpp:1001
 msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:999
+#: ../src/qtui/mainwin.cpp:1006
 msgctxt "MainWin|"
 msgid "Inputline"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1008
+#: ../src/qtui/mainwin.cpp:1015
 msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1018
+#: ../src/qtui/mainwin.cpp:1025
 msgctxt "MainWin|"
 msgid "Topic"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1032
+#: ../src/qtui/mainwin.cpp:1039
 msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1037
+#: ../src/qtui/mainwin.cpp:1044
 msgctxt "MainWin|"
 msgid "Transfers"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1048
+#: ../src/qtui/mainwin.cpp:1055
 msgctxt "MainWin|"
 msgid "Show File Transfers"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1143
+#: ../src/qtui/mainwin.cpp:1150
 msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1163
+#: ../src/qtui/mainwin.cpp:1170
 msgctxt "MainWin|"
 msgid "Nick Toolbar"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1244
+#: ../src/qtui/mainwin.cpp:1251
 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1340
+#: ../src/qtui/mainwin.cpp:1347
 msgctxt "MainWin|"
 msgid "Not connected to core."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1358 ../src/qtui/mainwin.cpp:1369
+#: ../src/qtui/mainwin.cpp:1365 ../src/qtui/mainwin.cpp:1376
 msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1359
+#: ../src/qtui/mainwin.cpp:1366
 msgctxt "MainWin|"
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1361 ../src/qtui/mainwin.cpp:1372
+#: ../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 ""
 
-#: ../src/qtui/mainwin.cpp:1370
+#: ../src/qtui/mainwin.cpp:1377
 msgctxt "MainWin|"
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1385 ../src/qtui/mainwin.cpp:1405
+#: ../src/qtui/mainwin.cpp:1398 ../src/qtui/mainwin.cpp:1418
 msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1386
+#: ../src/qtui/mainwin.cpp:1399
 #, qt-format
 msgctxt "MainWin|"
 msgid ""
@@ -6641,48 +6735,48 @@ msgid ""
 "following reasons:</b>"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1389
+#: ../src/qtui/mainwin.cpp:1402
 msgctxt "MainWin|"
 msgid "Continue"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1390
+#: ../src/qtui/mainwin.cpp:1403
 msgctxt "MainWin|"
 msgid "Show Certificate"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1406
+#: ../src/qtui/mainwin.cpp:1419
 msgctxt "MainWin|"
 msgid ""
 "Would you like to accept this certificate forever without being prompted?"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1408
+#: ../src/qtui/mainwin.cpp:1421
 msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1409
+#: ../src/qtui/mainwin.cpp:1422
 msgctxt "MainWin|"
 msgid "Forever"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1417
+#: ../src/qtui/mainwin.cpp:1430
 msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1447 ../src/qtui/mainwin.cpp:1448
+#: ../src/qtui/mainwin.cpp:1460 ../src/qtui/mainwin.cpp:1461
 msgctxt "MainWin|"
 msgid "No network selected"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1450
+#: ../src/qtui/mainwin.cpp:1463
 msgctxt "MainWin|"
 msgid "Select a network before trying to view the channel list."
 msgstr ""
 
-#: ../src/client/messagemodel.cpp:399
+#: ../src/client/messagemodel.cpp:410
 #, qt-format
 msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -6746,7 +6840,7 @@ msgctxt "MultiLineEdit|"
 msgid "Auto Spell Check"
 msgstr ""
 
-#: ../src/uisupport/multilineedit.cpp:702
+#: ../src/uisupport/multilineedit.cpp:723
 #, qt-format
 msgctxt "MultiLineEdit|"
 msgid "Do you really want to paste %n line(s)?"
@@ -6754,7 +6848,7 @@ msgid_plural "Do you really want to paste %n line(s)?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/uisupport/multilineedit.cpp:711
+#: ../src/uisupport/multilineedit.cpp:732
 msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr ""
@@ -6822,12 +6916,12 @@ msgctxt "NetworkAddDlg|"
 msgid "Verify connection security"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1026
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1177
 msgctxt "NetworkAddDlg|"
 msgid "Your Quassel core does not support this feature"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1027
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1178
 msgctxt "NetworkAddDlg|"
 msgid ""
 "You need a Quassel core v0.13.0 or newer in order to verify connection "
@@ -6844,7 +6938,7 @@ msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1101
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1252
 msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr ""
@@ -7172,22 +7266,23 @@ msgctxt "NetworksSettingsPage|"
 msgid "Password:"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:776
+#: ../src/qtui/settingspages/networkssettingspage.ui:764
 msgctxt "NetworksSettingsPage|"
-msgid "Could not detect if supported by server"
+msgid ""
+"<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because "
+"the identity has an ssl certificate set, SASL EXTERNAL will be used.</p></"
+"body></html>"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:783
+#: ../src/qtui/settingspages/networkssettingspage.ui:789
 msgctxt "NetworksSettingsPage|"
-msgid "Details..."
+msgid "Could not detect if supported by server"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:798
+#: ../src/qtui/settingspages/networkssettingspage.ui:796
+#: ../src/qtui/settingspages/networkssettingspage.ui:933
 msgctxt "NetworksSettingsPage|"
-msgid ""
-"<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because "
-"the identity has an ssl certificate set, SASL EXTERNAL will be used.</p></"
-"body></html>"
+msgid "Details..."
 msgstr ""
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:811
@@ -7214,53 +7309,98 @@ msgstr ""
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:886
 msgctxt "NetworksSettingsPage|"
-msgid "Encodings"
+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 ""
-"Configure advanced settings such as message encodings and automatic reconnect"
+"<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:898
+#: ../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:901
+#: ../src/qtui/settingspages/networkssettingspage.ui:1042
 msgctxt "NetworksSettingsPage|"
 msgid "Use Custom Encodings"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:912
-#: ../src/qtui/settingspages/networkssettingspage.ui:932
+#: ../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:916
+#: ../src/qtui/settingspages/networkssettingspage.ui:1057
 msgctxt "NetworksSettingsPage|"
 msgid "Send messages in:"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:943
-#: ../src/qtui/settingspages/networkssettingspage.ui:963
+#: ../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:947
+#: ../src/qtui/settingspages/networkssettingspage.ui:1088
 msgctxt "NetworksSettingsPage|"
 msgid "Receive fallback:"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:974
-#: ../src/qtui/settingspages/networkssettingspage.ui:987
+#: ../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 "
@@ -7269,7 +7409,7 @@ msgid ""
 "characters and invalid encoding.</p></qt>"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:977
+#: ../src/qtui/settingspages/networkssettingspage.ui:1118
 msgctxt "NetworksSettingsPage|"
 msgid "Server encoding:"
 msgstr ""
@@ -7284,74 +7424,84 @@ msgctxt "NetworksSettingsPage|"
 msgid "Networks"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:159
-#: ../src/qtui/settingspages/networkssettingspage.cpp:172
+#: ../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:175
+#: ../src/qtui/settingspages/networkssettingspage.cpp:178
 msgctxt "NetworksSettingsPage|"
 msgid "Your Quassel core does not support this feature"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:176
+#: ../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:213
+#: ../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:215
+#: ../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:216
+#: ../src/qtui/settingspages/networkssettingspage.cpp:233
 msgctxt "NetworksSettingsPage|"
 msgid "</ul>"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:217
+#: ../src/qtui/settingspages/networkssettingspage.cpp:234
 msgctxt "NetworksSettingsPage|"
 msgid "Invalid Network Settings"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:708
+#: ../src/qtui/settingspages/networkssettingspage.cpp:749
 msgctxt "NetworksSettingsPage|"
 msgid "Could not check if supported by network"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:713
+#: ../src/qtui/settingspages/networkssettingspage.cpp:754
 msgctxt "NetworksSettingsPage|"
 msgid "Cannot check if supported when disconnected"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:718
+#: ../src/qtui/settingspages/networkssettingspage.cpp:759
 msgctxt "NetworksSettingsPage|"
 msgid "Not currently supported by network"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:724
+#: ../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:806
+#: ../src/qtui/settingspages/networkssettingspage.cpp:860
 msgctxt "NetworksSettingsPage|"
 msgid "Delete Network?"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:807
+#: ../src/qtui/settingspages/networkssettingspage.cpp:861
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7359,12 +7509,12 @@ msgid ""
 "including the backlog?"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:937
+#: ../src/qtui/settingspages/networkssettingspage.cpp:991
 msgctxt "NetworksSettingsPage|"
 msgid "Could not check if SASL supported by network"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:938
+#: ../src/qtui/settingspages/networkssettingspage.cpp:992
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7372,12 +7522,12 @@ msgid ""
 "changes or an older Quassel core.  You can still try using SASL."
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:944
+#: ../src/qtui/settingspages/networkssettingspage.cpp:998
 msgctxt "NetworksSettingsPage|"
 msgid "Cannot check if SASL supported when disconnected"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:945
+#: ../src/qtui/settingspages/networkssettingspage.cpp:999
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7385,12 +7535,25 @@ msgid ""
 "the network, or try using SASL anyways."
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:951
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1007
+msgctxt "NetworksSettingsPage|"
+msgid "SASL EXTERNAL not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1008
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" does not currently support SASL EXTERNAL for SSL "
+"certificate authentication.  However, support might be added later on."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1015
 msgctxt "NetworksSettingsPage|"
 msgid "SASL not currently supported by network"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:952
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1016
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7398,12 +7561,26 @@ msgid ""
 "be added later on."
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:958
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1027
+msgctxt "NetworksSettingsPage|"
+msgid "SASL EXTERNAL may be supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1028
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" may support SASL EXTERNAL for SSL certificate "
+"authentication.  In most cases, you should use SASL instead of NickServ "
+"identification."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1035
 msgctxt "NetworksSettingsPage|"
 msgid "SASL supported by network"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:959
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1036
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7411,18 +7588,60 @@ msgid ""
 "instead of NickServ identification."
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:966
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1044
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid "SASL support for \"%1\""
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:970
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1048
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "SASL is a standardized way to log in and identify yourself to IRC servers."
 msgstr ""
 
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1087
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Quassel makes use of newer IRC features when supported by the IRC network.  "
+"If desired, you can disable unwanted or problematic features here."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1089
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The <a href=\"https://ircv3.net/irc/\">IRCv3 website</a> provides more "
+"technical details on the IRCv3 capabilities powering these features."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1100
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid "Currently enabled IRCv3 capabilities for this network: %1"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1104
+msgctxt "NetworksSettingsPage|"
+msgid "Configuring network features"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1108
+msgctxt "NetworksSettingsPage|"
+msgid "Configuring network features unsupported"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1110
+msgctxt "NetworksSettingsPage|"
+msgid "Your Quassel core is too old to configure IRCv3 network features"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1111
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"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
 msgctxt "NickEditDlg|"
 msgid "Edit Nickname"
@@ -7535,7 +7754,7 @@ msgctxt "PostgreSqlStorage|"
 msgid "Database"
 msgstr ""
 
-#: ../src/client/backlogrequester.cpp:81
+#: ../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"
@@ -8344,12 +8563,12 @@ msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1176
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1327
 msgctxt "ServerEditDlg|"
 msgid "Your Quassel core does not support this feature"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1177
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1328
 msgctxt "ServerEditDlg|"
 msgid ""
 "You need a Quassel core v0.13.0 or newer in order to verify connection "
@@ -8723,17 +8942,17 @@ msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
 msgstr ""
 
-#: ../src/qtui/sslinfodlg.cpp:71
+#: ../src/qtui/sslinfodlg.cpp:76
 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 ""
 
-#: ../src/qtui/sslinfodlg.cpp:81
+#: ../src/qtui/sslinfodlg.cpp:88
 #, qt-format
 msgctxt "SslInfoDlg|"
 msgid "%1 to %2"