X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fsl.po;h=2ae0437281ae608e1614f0ccb370b2adf9459eae;hp=2aec8c9a387d10fe64e7330a140dfdd9481fe6fc;hb=HEAD;hpb=ad715f63465417cc43c9a4de09d200401238fb11

diff --git a/po/sl.po b/po/sl.po
index 2aec8c9a..552974ce 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Quassel IRC\n"
 "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
-"PO-Revision-Date: 2018-08-28 13:38+0000\n"
-"Last-Translator: Daniel Albers <daniel@lbe.rs>\n"
+"PO-Revision-Date: 2021-01-12 04:21+0000\n"
+"Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
 "Language-Team: Slovenian (http://www.transifex.com/quassel/quassel/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,607 +17,628 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 "X-Qt-Contexts: true\n"
 
-#: ../src/uisupport/aboutdata.cpp:136
+#: ../src/uisupport/aboutdata.cpp:117
 msgctxt "AboutData|"
 msgid "Quassel IRC"
 msgstr "Quassel IRC"
 
-#: ../src/uisupport/aboutdata.cpp:141
+#: ../src/uisupport/aboutdata.cpp:120
 msgctxt "AboutData|"
 msgid "A modern, distributed IRC client"
 msgstr "Moderen, porazdeljen odjemalec za IRC"
 
-#: ../src/uisupport/aboutdata.cpp:174
+#: ../src/uisupport/aboutdata.cpp:152
 msgctxt "AboutData|"
 msgid "Project founder, lead developer"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:175
+#: ../src/uisupport/aboutdata.cpp:153
 msgctxt "AboutData|"
 msgid "Project motivator, lead developer"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:176
+#: ../src/uisupport/aboutdata.cpp:154
 msgctxt "AboutData|"
 msgid "Former lead developer"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:177
+#: ../src/uisupport/aboutdata.cpp:155
 msgctxt "AboutData|"
 msgid "Master of Translation, many fixes and enhancements, Travis support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:178
+#: ../src/uisupport/aboutdata.cpp:156
 msgctxt "AboutData|"
 msgid "Many features, fixes and improvements"
 msgstr "Veliko zmožnosti, popravkov in izboljšav"
 
-#: ../src/uisupport/aboutdata.cpp:179
+#: ../src/uisupport/aboutdata.cpp:157
 msgctxt "AboutData|"
 msgid "Many fixes and improvements, bug and patch triaging, community support"
 msgstr "Veliko popravkov in izboljšav, obravnavanje hroščev in popravkov, podpora skupnosti"
 
-#: ../src/uisupport/aboutdata.cpp:180
+#: ../src/uisupport/aboutdata.cpp:158
 msgctxt "AboutData|"
 msgid ""
 "IRCv3 support, documentation, many other improvements, testing, outstanding "
 "PRs"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:181
+#: ../src/uisupport/aboutdata.cpp:159
 msgctxt "AboutData|"
 msgid ""
 "Quasseldroid, architecture, (mobile) performance, many other improvements "
 "and fixes, testing"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:185
+#: ../src/uisupport/aboutdata.cpp:163
 msgctxt "AboutData|"
 msgid "OSX UI improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:186 ../src/uisupport/aboutdata.cpp:201
+#: ../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 "Izboljšave prikaza klepeta"
 
-#: ../src/uisupport/aboutdata.cpp:187
+#: ../src/uisupport/aboutdata.cpp:166
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter, Danish translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:188 ../src/uisupport/aboutdata.cpp:266
-#: ../src/uisupport/aboutdata.cpp:295 ../src/uisupport/aboutdata.cpp:307
+#: ../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:189
+#: ../src/uisupport/aboutdata.cpp:168
 msgctxt "AboutData|"
 msgid "Build system fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:190 ../src/uisupport/aboutdata.cpp:330
+#: ../src/uisupport/aboutdata.cpp:169 ../src/uisupport/aboutdata.cpp:316
 msgctxt "AboutData|"
 msgid "Database performance improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:191
+#: ../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:192
+#: ../src/uisupport/aboutdata.cpp:172
 msgctxt "AboutData|"
 msgid "Language improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:193
+#: ../src/uisupport/aboutdata.cpp:173 ../src/uisupport/aboutdata.cpp:314
 msgctxt "AboutData|"
 msgid "Documentation improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:194 ../src/uisupport/aboutdata.cpp:300
+#: ../src/uisupport/aboutdata.cpp:174 ../src/uisupport/aboutdata.cpp:193
 msgctxt "AboutData|"
-msgid "Brazilian translation"
+msgid "Various improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:269
+#: ../src/uisupport/aboutdata.cpp:175 ../src/uisupport/aboutdata.cpp:284
 msgctxt "AboutData|"
-msgid "Slovenian translation"
+msgid "Brazilian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:196 ../src/uisupport/aboutdata.cpp:222
-#: ../src/uisupport/aboutdata.cpp:226 ../src/uisupport/aboutdata.cpp:243
-#: ../src/uisupport/aboutdata.cpp:252 ../src/uisupport/aboutdata.cpp:274
-#: ../src/uisupport/aboutdata.cpp:290 ../src/uisupport/aboutdata.cpp:310
-#: ../src/uisupport/aboutdata.cpp:347
+#: ../src/uisupport/aboutdata.cpp:176 ../src/uisupport/aboutdata.cpp:251
 msgctxt "AboutData|"
-msgid "Fixes"
+msgid "Slovenian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:197 ../src/uisupport/aboutdata.cpp:322
+#: ../src/uisupport/aboutdata.cpp:178 ../src/uisupport/aboutdata.cpp:307
 msgctxt "AboutData|"
 msgid "Romanian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:198
+#: ../src/uisupport/aboutdata.cpp:179
 msgctxt "AboutData|"
 msgid "Punjabi translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:199 ../src/uisupport/aboutdata.cpp:261
-#: ../src/uisupport/aboutdata.cpp:276 ../src/uisupport/aboutdata.cpp:277
+#: ../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:200
+#: ../src/uisupport/aboutdata.cpp:181
 msgctxt "AboutData|"
 msgid "Message indicator support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:202 ../src/uisupport/aboutdata.cpp:203
-#: ../src/uisupport/aboutdata.cpp:346
+#: ../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:204
+#: ../src/uisupport/aboutdata.cpp:185
 msgctxt "AboutData|"
 msgid "Windows build system fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:205
+#: ../src/uisupport/aboutdata.cpp:186
 msgctxt "AboutData|"
 msgid "AppData metadata, LDAP support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:206
+#: ../src/uisupport/aboutdata.cpp:187
 msgctxt "AboutData|"
 msgid "Nicer tooltips, spell check and other improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:207
+#: ../src/uisupport/aboutdata.cpp:188
 msgctxt "AboutData|"
 msgid "Crash fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:208 ../src/uisupport/aboutdata.cpp:233
-#: ../src/uisupport/aboutdata.cpp:311
+#: ../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:209
+#: ../src/uisupport/aboutdata.cpp:190
 msgctxt "AboutData|"
 msgid "Occitan translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:210
+#: ../src/uisupport/aboutdata.cpp:191
 msgctxt "AboutData|"
 msgid "Usability review"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:211
+#: ../src/uisupport/aboutdata.cpp:192
 msgctxt "AboutData|"
 msgid "SASL support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:212
-msgctxt "AboutData|"
-msgid "Various improvements"
-msgstr ""
-
-#: ../src/uisupport/aboutdata.cpp:213 ../src/uisupport/aboutdata.cpp:214
-#: ../src/uisupport/aboutdata.cpp:219
+#: ../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:215
+#: ../src/uisupport/aboutdata.cpp:196
 msgctxt "AboutData|"
 msgid "Settings fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:216 ../src/uisupport/aboutdata.cpp:294
+#: ../src/uisupport/aboutdata.cpp:197 ../src/uisupport/aboutdata.cpp:278
 msgctxt "AboutData|"
 msgid "Galician translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:339
+#: ../src/uisupport/aboutdata.cpp:198 ../src/uisupport/aboutdata.cpp:325
 msgctxt "AboutData|"
 msgid "Esperanto translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:218
+#: ../src/uisupport/aboutdata.cpp:199
 msgctxt "AboutData|"
 msgid "Japanese translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:220 ../src/uisupport/aboutdata.cpp:297
+#: ../src/uisupport/aboutdata.cpp:201 ../src/uisupport/aboutdata.cpp:281
 msgctxt "AboutData|"
 msgid "Gentoo maintainer"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:221 ../src/uisupport/aboutdata.cpp:237
-#: ../src/uisupport/aboutdata.cpp:342
+#: ../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:223
+#: ../src/uisupport/aboutdata.cpp:204
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter (on Vista™!)"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:224
+#: ../src/uisupport/aboutdata.cpp:205
 msgctxt "AboutData|"
 msgid "Translation system fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:225
+#: ../src/uisupport/aboutdata.cpp:207
 msgctxt "AboutData|"
 msgid "OSX Notification Center support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:227 ../src/uisupport/aboutdata.cpp:244
-#: ../src/uisupport/aboutdata.cpp:345 ../src/uisupport/aboutdata.cpp:351
+#: ../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:228 ../src/uisupport/aboutdata.cpp:292
+#: ../src/uisupport/aboutdata.cpp:209 ../src/uisupport/aboutdata.cpp:276
 msgctxt "AboutData|"
 msgid "Mac fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:229
+#: ../src/uisupport/aboutdata.cpp:210
 msgctxt "AboutData|"
 msgid "D-Bus notifications"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:230
+#: ../src/uisupport/aboutdata.cpp:211
 msgctxt "AboutData|"
 msgid "Polish translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:231 ../src/uisupport/aboutdata.cpp:312
+#: ../src/uisupport/aboutdata.cpp:212 ../src/uisupport/aboutdata.cpp:297
 msgctxt "AboutData|"
 msgid "Build system improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:232
+#: ../src/uisupport/aboutdata.cpp:213
 msgctxt "AboutData|"
 msgid "Formatting support and other input line improvements, many other fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:234
+#: ../src/uisupport/aboutdata.cpp:215
 msgctxt "AboutData|"
 msgid "BluesTheme stylesheet"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:235 ../src/uisupport/aboutdata.cpp:281
-#: ../src/uisupport/aboutdata.cpp:323 ../src/uisupport/aboutdata.cpp:343
+#: ../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:236 ../src/uisupport/aboutdata.cpp:285
+#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:269
 msgctxt "AboutData|"
 msgid "Italian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:238 ../src/uisupport/aboutdata.cpp:272
-#: ../src/uisupport/aboutdata.cpp:282 ../src/uisupport/aboutdata.cpp:286
-#: ../src/uisupport/aboutdata.cpp:289 ../src/uisupport/aboutdata.cpp:340
+#: ../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:239
+#: ../src/uisupport/aboutdata.cpp:220
 msgctxt "AboutData|"
 msgid "Sanitize topic handling, twitch.tv support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:240
+#: ../src/uisupport/aboutdata.cpp:221
 msgctxt "AboutData|"
 msgid "Norwegian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:241
+#: ../src/uisupport/aboutdata.cpp:222
 msgctxt "AboutData|"
 msgid "Hungarian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:242
+#: ../src/uisupport/aboutdata.cpp:223
 msgctxt "AboutData|"
 msgid "IRC parser improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:245
+#: ../src/uisupport/aboutdata.cpp:226
 msgctxt "AboutData|"
 msgid "Windows build support and Appveyor maintenance, snorenotify backend"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:246
+#: ../src/uisupport/aboutdata.cpp:227
 msgctxt "AboutData|"
 msgid "Initial Qt5 support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:247
+#: ../src/uisupport/aboutdata.cpp:228
 msgctxt "AboutData|"
 msgid "{Ku|U}buntu packager, motivator, promoter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:248
+#: ../src/uisupport/aboutdata.cpp:229
 msgctxt "AboutData|"
 msgid "Various features and improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:249 ../src/uisupport/aboutdata.cpp:250
-#: ../src/uisupport/aboutdata.cpp:260 ../src/uisupport/aboutdata.cpp:267
-#: ../src/uisupport/aboutdata.cpp:288 ../src/uisupport/aboutdata.cpp:304
-#: ../src/uisupport/aboutdata.cpp:317
+#: ../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:251 ../src/uisupport/aboutdata.cpp:255
-#: ../src/uisupport/aboutdata.cpp:309 ../src/uisupport/aboutdata.cpp:314
-#: ../src/uisupport/aboutdata.cpp:326
+#: ../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:253 ../src/uisupport/aboutdata.cpp:341
-#: ../src/uisupport/aboutdata.cpp:344
+#: ../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:254
+#: ../src/uisupport/aboutdata.cpp:235
 msgctxt "AboutData|"
 msgid "Python improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:256
+#: ../src/uisupport/aboutdata.cpp:237
 msgctxt "AboutData|"
 msgid "Proxy improvements, Spanish translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:257
+#: ../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:258 ../src/uisupport/aboutdata.cpp:262
-#: ../src/uisupport/aboutdata.cpp:301
+#: ../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:259
+#: ../src/uisupport/aboutdata.cpp:241
 msgctxt "AboutData|"
 msgid "Context menu fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:263
+#: ../src/uisupport/aboutdata.cpp:245
 msgctxt "AboutData|"
 msgid "Many fixes and improvements, bug triaging"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:264
+#: ../src/uisupport/aboutdata.cpp:246
 msgctxt "AboutData|"
 msgid "Original \"All-Seeing Eye\" logo"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:265
+#: ../src/uisupport/aboutdata.cpp:247
 msgctxt "AboutData|"
 msgid "Project founder, various improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:268
+#: ../src/uisupport/aboutdata.cpp:250
 msgctxt "AboutData|"
 msgid "Serbian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:270
+#: ../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:271
+#: ../src/uisupport/aboutdata.cpp:253
 msgctxt "AboutData|"
 msgid "Qt5 porting help, Travis CI setup"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:273
+#: ../src/uisupport/aboutdata.cpp:256
 msgctxt "AboutData|"
 msgid "Buffer merge improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:275 ../src/uisupport/aboutdata.cpp:327
-#: ../src/uisupport/aboutdata.cpp:328 ../src/uisupport/aboutdata.cpp:334
-#: ../src/uisupport/aboutdata.cpp:335
+#: ../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:278
+#: ../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:279
+#: ../src/uisupport/aboutdata.cpp:262
 msgctxt "AboutData|"
-msgid "Lithuanian translation"
+msgid "OSX improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:280
+#: ../src/uisupport/aboutdata.cpp:263
 msgctxt "AboutData|"
-msgid "Documentation fixes"
+msgid "Lithuanian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:283 ../src/uisupport/aboutdata.cpp:316
+#: ../src/uisupport/aboutdata.cpp:264
 msgctxt "AboutData|"
-msgid "Improvements"
+msgid "Documentation fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:284
+#: ../src/uisupport/aboutdata.cpp:268
 msgctxt "AboutData|"
 msgid "Ideas, hacking, initial motivation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:287
+#: ../src/uisupport/aboutdata.cpp:271
 msgctxt "AboutData|"
 msgid "Many fixes and improvements, Sonnet support, QuasselDroid"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:291
+#: ../src/uisupport/aboutdata.cpp:275
 msgctxt "AboutData|"
 msgid "German translation, fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:293
+#: ../src/uisupport/aboutdata.cpp:277
 msgctxt "AboutData|"
 msgid "Many fixes and improvements; Ubuntu PPAs"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:296
+#: ../src/uisupport/aboutdata.cpp:280
 msgctxt "AboutData|"
 msgid "Tons of Oxygen icons including the Quassel logo"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:298
+#: ../src/uisupport/aboutdata.cpp:282
 msgctxt "AboutData|"
 msgid "Initial design and main window layout"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:299
+#: ../src/uisupport/aboutdata.cpp:283
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:302
+#: ../src/uisupport/aboutdata.cpp:286
 msgctxt "AboutData|"
 msgid "Linewrap for input line"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:303
+#: ../src/uisupport/aboutdata.cpp:287
 msgctxt "AboutData|"
 msgid "Performance improvements and cleanups"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:305
+#: ../src/uisupport/aboutdata.cpp:289
 msgctxt "AboutData|"
 msgid "/print command"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:306
+#: ../src/uisupport/aboutdata.cpp:290
 msgctxt "AboutData|"
 msgid "Performance improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:308
+#: ../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:313
+#: ../src/uisupport/aboutdata.cpp:298
 msgctxt "AboutData|"
 msgid ""
 "Windows build support, automated OSX builds in Travis, various improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:315
+#: ../src/uisupport/aboutdata.cpp:300
 msgctxt "AboutData|"
 msgid "Emacs keybindings"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:318
+#: ../src/uisupport/aboutdata.cpp:303
 msgctxt "AboutData|"
 msgid "Highlight configuration improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:319
+#: ../src/uisupport/aboutdata.cpp:304
 msgctxt "AboutData|"
 msgid "Debian/Kubuntu packager, (packaging/build system) bughunter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:320
+#: ../src/uisupport/aboutdata.cpp:305
 msgctxt "AboutData|"
 msgid "Bugfixes, German translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:321
+#: ../src/uisupport/aboutdata.cpp:306
 msgctxt "AboutData|"
 msgid "Audio backend improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:324
+#: ../src/uisupport/aboutdata.cpp:309
 msgctxt "AboutData|"
 msgid "Chinese translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:325
+#: ../src/uisupport/aboutdata.cpp:310
 msgctxt "AboutData|"
 msgid "Dutch translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:329 ../src/uisupport/aboutdata.cpp:332
+#: ../src/uisupport/aboutdata.cpp:315 ../src/uisupport/aboutdata.cpp:318
 msgctxt "AboutData|"
 msgid "Korean translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:331
+#: ../src/uisupport/aboutdata.cpp:317
 msgctxt "AboutData|"
 msgid "Alias improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:333
+#: ../src/uisupport/aboutdata.cpp:319
 msgctxt "AboutData|"
 msgid "Norwegian translation, documentation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:336
+#: ../src/uisupport/aboutdata.cpp:322
 msgctxt "AboutData|"
 msgid "Former Windows builder"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:337
+#: ../src/uisupport/aboutdata.cpp:323
 msgctxt "AboutData|"
 msgid "Fixes, Debian packaging"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:338
+#: ../src/uisupport/aboutdata.cpp:324
 msgctxt "AboutData|"
 msgid "Fixes and feedback"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:348
+#: ../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:349
+#: ../src/uisupport/aboutdata.cpp:337
 msgctxt "AboutData|"
 msgid "Ukrainian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:350
+#: ../src/uisupport/aboutdata.cpp:338
 msgctxt "AboutData|"
 msgid "Portuguese translation"
 msgstr ""
 
-#: ../src/qtui/ui/aboutdlg.ui:17
+#: ../src/qtui/aboutdlg.ui:17
 msgctxt "AboutDlg|"
 msgid "About Quassel"
 msgstr "O Quassel"
 
-#: ../src/qtui/ui/aboutdlg.ui:59
+#: ../src/qtui/aboutdlg.ui:59
 msgctxt "AboutDlg|"
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
@@ -626,22 +647,22 @@ msgid ""
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel IRC</p></body></html>"
 msgstr "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel IRC</p></body></html>"
 
-#: ../src/qtui/ui/aboutdlg.ui:112
+#: ../src/qtui/aboutdlg.ui:112
 msgctxt "AboutDlg|"
 msgid "&About"
 msgstr "&O programu"
 
-#: ../src/qtui/ui/aboutdlg.ui:132
+#: ../src/qtui/aboutdlg.ui:132
 msgctxt "AboutDlg|"
 msgid "A&uthors"
 msgstr "A&vtorji"
 
-#: ../src/qtui/ui/aboutdlg.ui:152
+#: ../src/qtui/aboutdlg.ui:152
 msgctxt "AboutDlg|"
 msgid "&Contributors"
 msgstr "Pri&spevkarji"
 
-#: ../src/qtui/ui/aboutdlg.ui:172
+#: ../src/qtui/aboutdlg.ui:172
 msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr "&Zahvale"
@@ -651,14 +672,14 @@ msgctxt "AboutDlg|"
 msgid "Unknown date"
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:50
+#: ../src/qtui/aboutdlg.cpp:49
 #, qt-format
 msgctxt "AboutDlg|"
 msgid ""
 "<b>Version:</b> %1<br><b>Version date:</b> %2<br><b>Protocol version:</b> %3"
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:67
+#: ../src/qtui/aboutdlg.cpp:65
 #, qt-format
 msgctxt "AboutDlg|"
 msgid ""
@@ -680,26 +701,26 @@ msgid ""
 "report bugs."
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:87
+#: ../src/qtui/aboutdlg.cpp:85
 msgctxt "AboutDlg|"
 msgid "Quassel IRC is mainly developed by:"
 msgstr "Quassel IRC v glavnem razvijajo:"
 
-#: ../src/qtui/aboutdlg.cpp:101
+#: ../src/qtui/aboutdlg.cpp:98
 msgctxt "AboutDlg|"
 msgid ""
 "We would like to thank the following contributors (in alphabetical order) "
 "and everybody we forgot to mention here:"
 msgstr "Radi bi se zahvalili naslednjim sodelavcem (po abecednem vrstnem redu) in vsem, ki smo jih pozabili omeniti tu:"
 
-#: ../src/qtui/aboutdlg.cpp:105
+#: ../src/qtui/aboutdlg.cpp:104
 msgctxt "AboutDlg|"
 msgid ""
 "...and anybody else finding and reporting bugs, giving feedback, helping "
 "others and being part of the community!"
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:112
+#: ../src/qtui/aboutdlg.cpp:110
 msgctxt "AboutDlg|"
 msgid "Special thanks goes to:"
 msgstr ""
@@ -709,24 +730,24 @@ msgctxt "AboutDlg|"
 msgid "for the original Quassel logo - The All-Seeing Eye"
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:120
+#: ../src/qtui/aboutdlg.cpp:122
 msgctxt "AboutDlg|"
 msgid "for the Oxygen Quassel logo"
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:124
+#: ../src/qtui/aboutdlg.cpp:128
 msgctxt "AboutDlg|"
 msgid "for the amazing Breeze and Oxygen icon themes"
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:128
+#: ../src/qtui/aboutdlg.cpp:134
 msgctxt "AboutDlg|"
 msgid ""
 "for creating an awesome framework, and for sponsoring development with "
 "Greenphones, N810s, N950s and more"
 msgstr ""
 
-#: ../src/core/abstractsqlstorage.cpp:142
+#: ../src/core/abstractsqlstorage.cpp:136
 #, qt-format
 msgctxt "AbstractSqlStorage|"
 msgid ""
@@ -734,131 +755,131 @@ msgid ""
 "version %2...  This may take a while for major upgrades."
 msgstr ""
 
-#: ../src/core/abstractsqlstorage.cpp:149
+#: ../src/core/abstractsqlstorage.cpp:144
 msgctxt "AbstractSqlStorage|"
 msgid "Upgrade failed..."
 msgstr "Nadgradnja ni uspela ..."
 
-#: ../src/core/abstractsqlstorage.cpp:154
+#: ../src/core/abstractsqlstorage.cpp:149
 #, qt-format
 msgctxt "AbstractSqlStorage|"
 msgid "Installed database schema successfully upgraded to version %1."
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:57
+#: ../src/qtui/settingspages/aliasesmodel.cpp:54
 msgctxt "AliasesModel|"
 msgid ""
 "<b>The shortcut for the alias</b><br />It can be used as a regular slash "
 "command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
 msgstr "<b>Bližnjica za vzdevek</b><br />Uporabite jo lahko kot običajen ukaz s poševnico.<br /><br /><b>Primer:</b> »foo« lahko uporabite kot /foo"
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:82
+#: ../src/qtui/settingspages/aliasesmodel.cpp:75
 msgctxt "AliasesModel|"
 msgid "The string the shortcut will be expanded to"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:85
+#: ../src/qtui/settingspages/aliasesmodel.cpp:77
 msgctxt "AliasesModel|"
 msgid "Special variables"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:91
+#: ../src/qtui/settingspages/aliasesmodel.cpp:83
 msgctxt "AliasesModel|"
 msgid "Parameter variables"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:92
+#: ../src/qtui/settingspages/aliasesmodel.cpp:84
 msgctxt "AliasesModel|"
 msgid "i'th parameter"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:93
+#: ../src/qtui/settingspages/aliasesmodel.cpp:85
 msgctxt "AliasesModel|"
 msgid "i'th to j'th parameter separated by spaces"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:94
+#: ../src/qtui/settingspages/aliasesmodel.cpp:86
 msgctxt "AliasesModel|"
 msgid "all parameters from i on separated by spaces"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:97
+#: ../src/qtui/settingspages/aliasesmodel.cpp:89
 msgctxt "AliasesModel|"
 msgid "Nickname parameter variables"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:99
+#: ../src/qtui/settingspages/aliasesmodel.cpp:91
 msgctxt "AliasesModel|"
 msgid ""
 "account of user identified by i'th parameter, or a '*' if logged out or "
 "unknown"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:102
+#: ../src/qtui/settingspages/aliasesmodel.cpp:93
 msgctxt "AliasesModel|"
 msgid "hostname of user identified by i'th parameter, or a '*' if unknown"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:104
+#: ../src/qtui/settingspages/aliasesmodel.cpp:94
 msgctxt "AliasesModel|"
 msgid "ident of user identified by i'th parameter, or a '*' if unknown"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:106
+#: ../src/qtui/settingspages/aliasesmodel.cpp:96
 msgctxt "AliasesModel|"
 msgid ""
 "ident of user identified by i'th parameter if verified, or a '*' if unknown "
 "or unverified (prefixed with '~')"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:110
+#: ../src/qtui/settingspages/aliasesmodel.cpp:100
 msgctxt "AliasesModel|"
 msgid "General variables"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:111
+#: ../src/qtui/settingspages/aliasesmodel.cpp:101
 msgctxt "AliasesModel|"
 msgid "the whole string"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:112
+#: ../src/qtui/settingspages/aliasesmodel.cpp:102
 msgctxt "AliasesModel|"
 msgid "your current nickname"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:113
+#: ../src/qtui/settingspages/aliasesmodel.cpp:103
 msgctxt "AliasesModel|"
 msgid "the name of the selected channel"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:120
+#: ../src/qtui/settingspages/aliasesmodel.cpp:109
 msgctxt "AliasesModel|"
 msgid "Multiple commands can be separated with semicolons"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:124
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
 msgctxt "AliasesModel|"
 msgid "Example:"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:124
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
 msgctxt "AliasesModel|"
 msgid "\"Test $1; Test $2; Test All $0\""
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:125
+#: ../src/qtui/settingspages/aliasesmodel.cpp:113
 msgctxt "AliasesModel|"
 msgid ""
 "...will be expanded to three separate messages \"Test 1\", \"Test 2\" and "
 "\"Test All 1 2 3\" when called like <i>/test 1 2 3</i>"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:246
+#: ../src/qtui/settingspages/aliasesmodel.cpp:228
 msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr "Vzdevek"
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:247
+#: ../src/qtui/settingspages/aliasesmodel.cpp:228
 msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr "Razširitev"
@@ -909,7 +930,7 @@ msgid "<Untranslated>"
 msgstr "<ni prevedeno>"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:38
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:86
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:80
 msgctxt "AppearanceSettingsPage|"
 msgid "<System Default>"
 msgstr "<sistemsko privzeti>"
@@ -1011,27 +1032,27 @@ msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr "Napake:"
 
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:36
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
 msgctxt "AppearanceSettingsPage|"
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:51
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:46
 msgctxt "AppearanceSettingsPage|"
 msgid "Icon theme:"
 msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:115
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:108
 msgctxt "AppearanceSettingsPage|"
 msgid "Automatic"
 msgstr "Samodejno"
 
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:294
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:281
 msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
 msgstr "Izberite datoteko s slogovno predlogo"
 
-#: ../src/qtui/awaylogview.cpp:33
+#: ../src/qtui/awaylogview.cpp:34
 msgctxt "AwayLogView|"
 msgid "Away Log"
 msgstr "Dnevnik odsotnosti"
@@ -1041,7 +1062,7 @@ msgctxt "AwayLogView|"
 msgid "Show Network Name"
 msgstr "Pokaži ime omrežja"
 
-#: ../src/qtui/awaylogview.cpp:51
+#: ../src/qtui/awaylogview.cpp:52
 msgctxt "AwayLogView|"
 msgid "Show Buffer Name"
 msgstr "Pokaži ime prikaza"
@@ -1063,46 +1084,65 @@ msgctxt "BacklogSettingsPage|"
 msgid "Dynamic backlog amount:"
 msgstr "Dinamično število sporočil v dnevniku:"
 
-#: ../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 "Način zahtevanja sporočil iz dnevnika:"
 
-#: ../src/qtui/settingspages/backlogsettingspage.ui:83
+#: ../src/qtui/settingspages/backlogsettingspage.ui:102
 msgctxt "BacklogSettingsPage|"
 msgid "Fixed amount per chat"
 msgstr "Določeno število na klepet"
 
-#: ../src/qtui/settingspages/backlogsettingspage.ui:88
+#: ../src/qtui/settingspages/backlogsettingspage.ui:107
 msgctxt "BacklogSettingsPage|"
 msgid "Unread messages per chat"
 msgstr "Neprebranih sporočil na klepet"
 
-#: ../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 "Globalno neprebranih sporočil"
 
-#: ../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 "Najpreprostejše zahtevanje. Iz dnevnika pridobi določeno število vrstic za vsako okno za klepet."
 
-#: ../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 "Začetno število sporočil dnevnika:"
 
-#: ../src/qtui/settingspages/backlogsettingspage.ui:205
+#: ../src/qtui/settingspages/backlogsettingspage.ui:229
 msgctxt "BacklogSettingsPage|"
 msgid ""
 "This requester fetches unread messages for each chat window individually. The amount of lines can be limited per chat.\n"
@@ -1110,42 +1150,56 @@ msgid ""
 "You can also choose to fetch additional older chatlines to provide a better context."
 msgstr "Zahteva se pridobivanje neprebranih sporočil za vsako okno za klepet posebej. Število vrstic je mogoče omejiti na klepet.\n\nZa boljši kontekst lahko omogočite tudi pridobivanje dodatnih starejših vrstic klepeta."
 
-#: ../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 "Največje število pridobljenih sporočil na prikaz."
 
-#: ../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 "Omejitev:"
 
-#: ../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 "Neomejeno"
 
-#: ../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 "Število sporočil, ki naj se pridobijo poleg neprebranih sporočil. Omejitev tu nima veljave."
 
-#: ../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 "Dodatna sporočila:"
 
-#: ../src/qtui/settingspages/backlogsettingspage.ui:324
+#: ../src/qtui/settingspages/backlogsettingspage.ui:348
+msgctxt "BacklogSettingsPage|"
+msgid ""
+"<p>On modern cores (v0.13.0 or newer), no backlog will be fetched.  The core keeps track of chat activity automatically.<br/>\n"
+"<i>Note: Chat Monitor won't show past messages.</i>\n"
+"</p>\n"
+"<p>On older cores, this requester fetches a fixed amount of lines for each chat window from the backlog.</p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/backlogsettingspage.ui:369
+msgctxt "BacklogSettingsPage|"
+msgid "For legacy cores, initial backlog amount:"
+msgstr ""
+
+#: ../src/qtui/settingspages/backlogsettingspage.ui:433
 msgctxt "BacklogSettingsPage|"
 msgid ""
 "This requester fetches all messages newer than the oldest unread message for all chats.\n"
@@ -1156,33 +1210,33 @@ msgid ""
 "You can also chose to fetch additional older chatlines to provide a better context."
 msgstr "Zahteva se pridobivanje vseh sporočil, ki so novejša od najstarejšega neprebranega sporočila iz kateregakoli klepeta.\n\nOpomba: ta način ni priporočljiv, če uporabljate skrita okna za klepet ali pa imate nedejavne klepete (t.j. stare poizvedbe in kanale).\nUporaben je za omejitev skupnega števila sporočil dnevnika in je verjetno najhitrejši.\n\nZa boljši kontekst lahko omogočite tudi pridobivanje dodatnih starejših vrstic klepeta."
 
-#: ../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 "Največje število sporočil, pridobljenih za vse prikaze."
 
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:30
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:29
 msgctxt "BacklogSettingsPage|"
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:30
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:29
 msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 msgstr "Pridobivanje sporočil iz dnevnika"
 
-#: ../src/client/networkmodel.cpp:480
+#: ../src/client/networkmodel.cpp:444
 #, qt-format
 msgctxt "BufferItem|"
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
-#: ../src/uisupport/bufferview.cpp:267
+#: ../src/uisupport/bufferview.cpp:257
 msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr "Trajno združim prikaza?"
 
-#: ../src/uisupport/bufferview.cpp:268
+#: ../src/uisupport/bufferview.cpp:258
 #, qt-format
 msgctxt "BufferView|"
 msgid ""
@@ -1190,7 +1244,7 @@ msgid ""
 " This cannot be reversed!"
 msgstr "Ali želite trajno združiti prikaz »%1« v prikaz »%2«?\nTega kasneje ni mogoče razveljaviti!"
 
-#: ../src/uisupport/bufferview.cpp:715
+#: ../src/uisupport/bufferview.cpp:721
 msgctxt "BufferViewDock|"
 msgid "Search..."
 msgstr ""
@@ -1205,7 +1259,7 @@ msgctxt "BufferViewEditDlg|"
 msgid "Please enter a name for the chat list:"
 msgstr "Vnesite ime za seznam klepetov:"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:585
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:569
 msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr "Dodaj seznam klepetov"
@@ -1246,7 +1300,7 @@ msgid "Network:"
 msgstr "Omrežje:"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:129
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128
 msgctxt "BufferViewSettingsPage|"
 msgid "All"
 msgstr "Vsa"
@@ -1328,116 +1382,133 @@ msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr "Predogled:"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:39
 msgctxt "BufferViewSettingsPage|"
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:39
 msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
 msgstr "Seznami klepetov po meri"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:373
 msgctxt "BufferViewSettingsPage|"
 msgid "Delete Chat List?"
 msgstr "Izbrišem seznam klepetov?"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:385
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:374
 #, qt-format
 msgctxt "BufferViewSettingsPage|"
 msgid "Do you really want to delete the chat list \"%1\"?"
 msgstr "Ali resnično želite izbrisati seznam klepetov »%1«?"
 
-#: ../src/qtui/ui/bufferviewwidget.ui:26
+#: ../src/qtui/bufferviewwidget.ui:26
 msgctxt "BufferViewWidget|"
 msgid "BufferView"
 msgstr "BufferView"
 
-#: ../src/qtui/bufferwidget.cpp:79
+#: ../src/qtui/bufferwidget.cpp:75
 msgctxt "BufferWidget|"
 msgid "Zoom In"
 msgstr "Približaj"
 
-#: ../src/qtui/bufferwidget.cpp:85
+#: ../src/qtui/bufferwidget.cpp:76
 msgctxt "BufferWidget|"
 msgid "Zoom Out"
 msgstr "Oddalji"
 
-#: ../src/qtui/bufferwidget.cpp:90
+#: ../src/qtui/bufferwidget.cpp:77
 msgctxt "BufferWidget|"
 msgid "Actual Size"
 msgstr "Dejanska velikost"
 
-#: ../src/qtui/bufferwidget.cpp:94
+#: ../src/qtui/bufferwidget.cpp:79
 msgctxt "BufferWidget|"
 msgid "Set Marker Line"
 msgstr "Postavi črto označevalnika"
 
-#: ../src/qtui/bufferwidget.cpp:98
+#: ../src/qtui/bufferwidget.cpp:82
 msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr "Pojdi do črte označevalnika"
 
-#: ../src/client/networkmodel.cpp:776
+#: ../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|"
 msgid "Channel %1"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:780
+#: ../src/client/networkmodel.cpp:724
 msgctxt "ChannelBufferItem|"
 msgid "Users"
 msgstr "Uporabniki"
 
-#: ../src/client/networkmodel.cpp:785
+#: ../src/client/networkmodel.cpp:729
 msgctxt "ChannelBufferItem|"
 msgid "Mode"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:795
+#: ../src/client/networkmodel.cpp:739
 msgctxt "ChannelBufferItem|"
 msgid "Topic"
 msgstr "Tema"
 
-#: ../src/client/networkmodel.cpp:801
+#: ../src/client/networkmodel.cpp:746
 msgctxt "ChannelBufferItem|"
 msgid "Not active, double-click to join"
 msgstr ""
 
-#: ../src/qtui/ui/channellistdlg.ui:14
+#: ../src/qtui/channellistdlg.ui:14
 msgctxt "ChannelListDlg|"
 msgid "Channel List"
 msgstr "Seznam kanalov"
 
-#: ../src/qtui/ui/channellistdlg.ui:38
+#: ../src/qtui/channellistdlg.ui:38
 msgctxt "ChannelListDlg|"
 msgid "Search Pattern:"
 msgstr "Iskalni vzorec:"
 
-#: ../src/qtui/ui/channellistdlg.ui:48
+#: ../src/qtui/channellistdlg.ui:48
 msgctxt "ChannelListDlg|"
 msgid ""
 "Toggle between simple and advanced mode.\n"
 "Advanced mode allows one to pass search strings to the IRC Server."
 msgstr "Preklopi med preprostim in naprednim načinom.\nNapredni način omogoča pošiljanje iskalnih nizov na strežnik za IRC."
 
-#: ../src/qtui/ui/channellistdlg.ui:62
+#: ../src/qtui/channellistdlg.ui:62
 msgctxt "ChannelListDlg|"
 msgid "Show Channels"
 msgstr "Pokaži kanale"
 
-#: ../src/qtui/ui/channellistdlg.ui:86
+#: ../src/qtui/channellistdlg.ui:86
 msgctxt "ChannelListDlg|"
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/qtui/ui/channellistdlg.ui:98
+#: ../src/qtui/channellistdlg.ui:98
 msgctxt "ChannelListDlg|"
 msgid "Errors Occurred:"
 msgstr "Prišlo je do napak:"
 
-#: ../src/qtui/ui/channellistdlg.ui:132
+#: ../src/qtui/channellistdlg.ui:132
 msgctxt "ChannelListDlg|"
 msgid ""
 "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
@@ -1486,7 +1557,7 @@ msgid "Move selected buffers to the right"
 msgstr "Premakni izbrane prikaze na desno"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:285
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:282
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr "Pokaži:"
@@ -1518,83 +1589,123 @@ 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 "Ob ponovni povezavi pokaži sporočila iz dnevnika"
 
-#: ../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 "Pokaži sporočila iz dnevnika"
 
-#: ../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 "Ob ponovni povezavi vključi prebrana sporočila iz dnevnika"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:225
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:242
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages"
 msgstr "Vključi prebrana sporočila"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:39
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:39
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr "Nadzornik klepeta"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:63
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr "Vključi"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:64
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr "Izvzemi"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:288
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:285
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr "Prezri:"
 
-#: ../src/qtui/chatmonitorview.cpp:57
+#: ../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 "Pridobivanje sporočil iz dnevnika"
+
+#: ../src/qtui/chatmonitorview.cpp:58
 msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
 msgstr "Pokaži lastna sporočila"
 
-#: ../src/qtui/chatmonitorview.cpp:64
+#: ../src/qtui/chatmonitorview.cpp:66
 msgctxt "ChatMonitorView|"
 msgid "Show Network Name"
 msgstr "Pokaži ime omrežja"
 
-#: ../src/qtui/chatmonitorview.cpp:69
+#: ../src/qtui/chatmonitorview.cpp:72
 msgctxt "ChatMonitorView|"
 msgid "Show Buffer Name"
 msgstr "Pokaži ime prikaza"
 
-#: ../src/qtui/chatmonitorview.cpp:76
+#: ../src/qtui/chatmonitorview.cpp:80
 msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr "Nastavi ..."
 
-#: ../src/qtui/chatscene.cpp:840
+#: ../src/qtui/chatscene.cpp:796
 msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr "Kopiraj izbor"
 
-#: ../src/qtui/chatscene.cpp:847
+#: ../src/qtui/chatscene.cpp:806
 #, qt-format
 msgctxt "ChatScene|"
 msgid "Search '%1'"
 msgstr "Poišči »%1«"
 
-#: ../src/qtui/chatscene.cpp:859
+#: ../src/qtui/chatscene.cpp:818
 msgctxt "ChatScene|"
 msgid "Reset Column Widths"
 msgstr "Ponastavi Å¡irino stolpcev"
@@ -1749,34 +1860,33 @@ msgctxt "ChatViewColorSettingsPage|"
 msgid "Chat View Colors"
 msgstr ""
 
-#: ../src/qtui/ui/chatviewsearchbar.ui:13
+#: ../src/qtui/chatviewsearchbar.ui:13
 msgctxt "ChatViewSearchBar|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/chatviewsearchbar.ui:19
-#: ../src/qtui/ui/chatviewsearchbar.ui:33
-#: ../src/qtui/ui/chatviewsearchbar.ui:44
+#: ../src/qtui/chatviewsearchbar.ui:19 ../src/qtui/chatviewsearchbar.ui:33
+#: ../src/qtui/chatviewsearchbar.ui:44
 msgctxt "ChatViewSearchBar|"
 msgid "..."
 msgstr "…"
 
-#: ../src/qtui/ui/chatviewsearchbar.ui:55
+#: ../src/qtui/chatviewsearchbar.ui:55
 msgctxt "ChatViewSearchBar|"
 msgid "case sensitive"
 msgstr "Ločevanje velikosti črk"
 
-#: ../src/qtui/ui/chatviewsearchbar.ui:62
+#: ../src/qtui/chatviewsearchbar.ui:62
 msgctxt "ChatViewSearchBar|"
 msgid "search nick"
 msgstr "v vzdevkih"
 
-#: ../src/qtui/ui/chatviewsearchbar.ui:69
+#: ../src/qtui/chatviewsearchbar.ui:69
 msgctxt "ChatViewSearchBar|"
 msgid "search message"
 msgstr "v sporočilih"
 
-#: ../src/qtui/ui/chatviewsearchbar.ui:82
+#: ../src/qtui/chatviewsearchbar.ui:82
 msgctxt "ChatViewSearchBar|"
 msgid "ignore joins, parts, etc."
 msgstr "prezri pridružitve, zapustitve ..."
@@ -1799,37 +1909,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>"
-msgstr "<html><head/><body><p>Primeri uporabe:</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>tor maj 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 pop</td></tr>\n</table>\n</body></html>"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:54
+"<html><head/><body>\n"
+"         <p>Accepts Qt QDateTime Format.</p>\n"
+"         <p>Examples:</p>\n"
+"         <table cellpadding=\"2\">\n"
+"         <tr><td>dd.MM.yyyy</td><td>21.05.2001</td></tr>\n"
+"         <tr><td>ddd MMMM d yy</td><td>Tue May 21 01</td></tr>\n"
+"         <tr><td>hh:mm:ss.zzz</td><td>14:13:09.042</td></tr>\n"
+"         <tr><td>h:m:s ap</td><td>2:13:9 pm</td></tr>\n"
+"         </table>\n"
+"         </body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:56
 msgctxt "ChatViewSettingsPage|"
 msgid " hh:mm:ss"
 msgstr ""
 
-#: ../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; } .underline { text-decoration: underline; }</style>\n"
@@ -1840,52 +1952,52 @@ msgid ""
 "</qt>"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:142
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:144
 msgctxt "ChatViewSettingsPage|"
 msgid "Custom chat window font:"
 msgstr "Pisava okna za klepet:"
 
-#: ../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 "Prikaži okno s predogledom spletišča ob prehodu miške čez spletni naslov"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:178
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:180
 msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr "Ob prehodu miške čez URL prikaži predoglede spletišč"
 
-#: ../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 "Ob izboru drugega kanala postavi črto označevalnika na dno trenutnega okna za klepet"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:197
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:199
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when switching chats"
 msgstr "Ob preklopu med klepeti samodejno postavi črto označevalnika"
 
-#: ../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 "Če Quassel izgubi žarišče, postavi črto označevalnika na dno trenutnega okna za klepet."
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:216
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:218
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when Quassel loses focus"
 msgstr "Ob izgubi žarišča programa samodejno postavi črto označevalnika"
 
-#: ../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 "
@@ -1895,22 +2007,22 @@ msgid ""
 "style=\" font-weight:600;\">%s</span></p></body></html>"
 msgstr "<html><head/><body><p>URL, ki bo odprt z izbranim besedilom kot parametrom. Postavite <span style=\" font-weight:600;\">%s</span> na mesto, kamor naj bo postavljeno izbrano besedilo.</p><p>Na primer:</p><p>https://www.google.com/search?q=<span style=\" font-weight:600;\">%s<br/></span>https://duckduckgo.com/?q=<span style=\" font-weight:600;\">%s</span></p></body></html>"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:247
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:249
 msgctxt "ChatViewSettingsPage|"
 msgid "https://www.google.com/search?q=%s"
 msgstr "https://www.google.com/search?q=%s"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:29
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:30
 msgctxt "ChatViewSettingsPage|"
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:29
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:30
 msgctxt "ChatViewSettingsPage|"
 msgid "Chat View"
 msgstr "Prikaz klepeta"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:43
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:44
 msgctxt "ChatViewSettingsPage|"
 msgid "You need at least version 0.6 of Quassel Core to use this feature"
 msgstr ""
@@ -1927,86 +2039,75 @@ msgid ""
 "before nicknames."
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:68
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:67
 msgctxt "ChatViewSettingsPage|"
 msgid "No modes"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:70
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:68
 msgctxt "ChatViewSettingsPage|"
 msgid "Highest mode"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:72
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:69
 msgctxt "ChatViewSettingsPage|"
 msgid "All modes"
 msgstr ""
 
-#: ../src/common/qt5cliparser.cpp:30
-msgctxt "CliParser|"
-msgid "Quassel IRC is a modern, distributed IRC client."
-msgstr "Quassel IRC je moderen, porazdeljen odjemalec za IRC"
-
-#: ../src/client/client.cpp:354
+#: ../src/client/client.cpp:274
 msgctxt "Client|"
 msgid "Identity already exists in client!"
 msgstr "Istovetnost že obstaja v odjemalcu!"
 
-#: ../src/client/clientauthhandler.cpp:76
-#: ../src/client/clientauthhandler.cpp:525
-msgctxt "ClientAuthHandler|"
-msgid "Unencrypted connection canceled"
-msgstr "Nešifrirana povezava preklicana"
-
-#: ../src/client/clientauthhandler.cpp:109
-#: ../src/client/clientauthhandler.cpp:125
+#: ../src/client/clientauthhandler.cpp:77
+#: ../src/client/clientauthhandler.cpp:92
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Connecting to %1..."
 msgstr "Povezovanje z %1 ..."
 
-#: ../src/client/clientauthhandler.cpp:121
+#: ../src/client/clientauthhandler.cpp:88
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Looking up %1..."
 msgstr "Iskanje %1 ..."
 
-#: ../src/client/clientauthhandler.cpp:128
-#: ../src/client/clientauthhandler.cpp:348
+#: ../src/client/clientauthhandler.cpp:95
+#: ../src/client/clientauthhandler.cpp:302
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Connected to %1"
 msgstr "Povezan z %1"
 
-#: ../src/client/clientauthhandler.cpp:132
+#: ../src/client/clientauthhandler.cpp:99
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Disconnecting from %1..."
 msgstr "Prekinjanje povezave z %1 ..."
 
-#: ../src/client/clientauthhandler.cpp:136
+#: ../src/client/clientauthhandler.cpp:103
 msgctxt "ClientAuthHandler|"
 msgid "Disconnected"
 msgstr "Povezava prekinjena"
 
-#: ../src/client/clientauthhandler.cpp:171
+#: ../src/client/clientauthhandler.cpp:137
 msgctxt "ClientAuthHandler|"
 msgid "Reconnecting in compatibility mode..."
 msgstr "Ponovno povezovanje v združljivostnem načinu ..."
 
-#: ../src/client/clientauthhandler.cpp:259
+#: ../src/client/clientauthhandler.cpp:224
 msgctxt "ClientAuthHandler|"
 msgid ""
 "<b>Incompatible Quassel Core!</b><br>None of the protocols this client "
 "speaks are supported by the core you are trying to connect to."
 msgstr "<b>Nezdružljivo jedro za Quassel!</b><br>Nobeden izmed protokolov, ki ga uporablja ta odjemalec, ni podprt s strani jedra, na katerega se poskušate povezati."
 
-#: ../src/client/clientauthhandler.cpp:262
+#: ../src/client/clientauthhandler.cpp:227
 msgctxt "ClientAuthHandler|"
 msgid "Core speaks none of the protocols we support"
 msgstr "Jedro ne podpira nobenega izmed protokolov, ki ga uporabljamo mi"
 
-#: ../src/client/clientauthhandler.cpp:277
+#: ../src/client/clientauthhandler.cpp:241
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid ""
@@ -2014,65 +2115,70 @@ msgid ""
 "at least protocol v%1, but the core speaks v%2 only."
 msgstr "<b>Jedro za Quassel, s katerim se želite povezati, je prestaro!</b><br>Zahtevan je protokol r%1, jedro pa podpira samo protokol r%2."
 
-#: ../src/client/clientauthhandler.cpp:279
+#: ../src/client/clientauthhandler.cpp:244
 msgctxt "ClientAuthHandler|"
 msgid "Incompatible protocol version, connection to core refused"
 msgstr "Nezdružljiva različica protokola, povezava z jedrom je bila zavrnjena"
 
-#: ../src/client/clientauthhandler.cpp:301
+#: ../src/client/clientauthhandler.cpp:264
 msgctxt "ClientAuthHandler|"
 msgid "Synchronizing to core..."
 msgstr "Usklajevanje z jedrom ..."
 
-#: ../src/client/clientauthhandler.cpp:316
+#: ../src/client/clientauthhandler.cpp:272
 msgctxt "ClientAuthHandler|"
 msgid "The core refused connection from this client"
 msgstr "Jedro je zavrnilo povezavo s tem odjemalcem"
 
-#: ../src/client/clientauthhandler.cpp:341
+#: ../src/client/clientauthhandler.cpp:295
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Core does not support the following features: %1"
 msgstr ""
 
-#: ../src/client/clientauthhandler.cpp:344
+#: ../src/client/clientauthhandler.cpp:298
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Core supports unknown features: %1"
 msgstr ""
 
-#: ../src/client/clientauthhandler.cpp:390
+#: ../src/client/clientauthhandler.cpp:339
 msgctxt "ClientAuthHandler|"
 msgid "Logging in..."
 msgstr "Prijavljanje ..."
 
-#: ../src/client/clientauthhandler.cpp:395
+#: ../src/client/clientauthhandler.cpp:344
 msgctxt "ClientAuthHandler|"
 msgid "Login canceled"
 msgstr "Prijava preklicana"
 
-#: ../src/client/clientauthhandler.cpp:453
+#: ../src/client/clientauthhandler.cpp:393
 msgctxt "ClientAuthHandler|"
 msgid "Unencrypted connection cancelled"
 msgstr "Nešifrirana povezava preklicana"
 
-#: ../src/client/clientbacklogmanager.cpp:178
+#: ../src/client/clientauthhandler.cpp:460
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection canceled"
+msgstr "Nešifrirana povezava preklicana"
+
+#: ../src/client/clientbacklogmanager.cpp:177
 #, qt-format
 msgctxt "ClientBacklogManager|"
 msgid "Processed %1 messages in %2 seconds."
 msgstr "Obdelanih %1 sporočil v %2 sekundah."
 
-#: ../src/client/clientbufferviewmanager.cpp:60
+#: ../src/client/clientbufferviewmanager.cpp:54
 msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr "Vsi klepeti"
 
-#: ../src/client/clientuserinputhandler.cpp:100
+#: ../src/client/clientuserinputhandler.cpp:95
 msgctxt "ClientUserInputHandler|"
 msgid "/JOIN expects a channel"
 msgstr "/JOIN pričakuje kanal"
 
-#: ../src/client/clientuserinputhandler.cpp:112
+#: ../src/client/clientuserinputhandler.cpp:106
 msgctxt "ClientUserInputHandler|"
 msgid "/QUERY expects at least a nick"
 msgstr "/QUERY pričakuje vsaj vzdevek"
@@ -2151,253 +2257,253 @@ msgctxt "ConnectionSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/chatitem.cpp:873
+#: ../src/qtui/chatitem.cpp:826
 msgctxt "ContentsChatItem|"
 msgid "Copy Link Address"
 msgstr "Kopiraj naslov povezave"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:38
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
 msgctxt "ContextMenuActionProvider|"
 msgid "Connect"
 msgstr "Poveži se"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/contextmenuactionprovider.cpp:40
 msgctxt "ContextMenuActionProvider|"
 msgid "Disconnect"
 msgstr "Prekini povezavo"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:41
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
 msgctxt "ContextMenuActionProvider|"
 msgid "Join"
 msgstr "Pridruži se"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
 msgctxt "ContextMenuActionProvider|"
 msgid "Part"
 msgstr "Zapusti"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:43
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
 msgctxt "ContextMenuActionProvider|"
 msgid "Delete Chat(s)..."
 msgstr "Izbriši klepete ..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:44
+#: ../src/uisupport/contextmenuactionprovider.cpp:45
 msgctxt "ContextMenuActionProvider|"
 msgid "Go to Chat"
 msgstr "Pojdi na klepet"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:46
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
 msgctxt "ContextMenuActionProvider|"
 msgid "Joins/Parts/Quits"
 msgstr "Pridružitve/zapustitve/končanja"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
 msgctxt "ContextMenuActionProvider|"
 msgid "Joins"
 msgstr "Pridružitve"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgctxt "ContextMenuActionProvider|"
 msgid "Parts"
 msgstr "Zapustitve"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgctxt "ContextMenuActionProvider|"
 msgid "Quits"
 msgstr "Končanja"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgctxt "ContextMenuActionProvider|"
 msgid "Nick Changes"
 msgstr "Spremembe vzdevkov"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgctxt "ContextMenuActionProvider|"
 msgid "Mode Changes"
 msgstr "Spremembe načina"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgctxt "ContextMenuActionProvider|"
 msgid "Day Changes"
 msgstr "Spremembe dneva"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgctxt "ContextMenuActionProvider|"
 msgid "Topic Changes"
 msgstr "Spremembe teme"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
 msgctxt "ContextMenuActionProvider|"
 msgid "Set as Default..."
 msgstr "Nastavi kot privzeto ..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:55
+#: ../src/uisupport/contextmenuactionprovider.cpp:56
 msgctxt "ContextMenuActionProvider|"
 msgid "Use Defaults..."
 msgstr "Uporabi privzete vrednosti ..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:57
+#: ../src/uisupport/contextmenuactionprovider.cpp:58
 msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr "Pridruži se kanalu ..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:59
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
 msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
 msgstr "Začni poizvedbo"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr "Pokaži poizvedbo"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:61
+#: ../src/uisupport/contextmenuactionprovider.cpp:62
 msgctxt "ContextMenuActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:63
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
 msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr "Različica"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
 msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
 msgctxt "ContextMenuActionProvider|"
 msgid "Ping"
 msgstr "Ping"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:66
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
 msgctxt "ContextMenuActionProvider|"
 msgid "Client info"
 msgstr "Podatki o odjemalcu"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:67
+#: ../src/uisupport/contextmenuactionprovider.cpp:68
 msgctxt "ContextMenuActionProvider|"
 msgid "Custom..."
 msgstr "Po meri ..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:79
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr "Dodeli stanje operaterja"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:80
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr "Odvzemi stanje operaterja"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Half-Operator Status"
 msgstr "Dodeli stanje pol-operaterja"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Half-Operator Status"
 msgstr "Odvzemi stanje pol-operaterja"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
 msgstr "Dodeli glasovno pravico"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr "Odvzemi glasovno pravico"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:85
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr "Brcni s kanala"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:86
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
 msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr "Izobči s kanala"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:87
+#: ../src/uisupport/contextmenuactionprovider.cpp:88
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr "Brcni in izobči"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:89
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Temporarily"
 msgstr "Začasno skrij klepete"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:90
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Permanently"
 msgstr "Trajno skrij klepete"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:91
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
 msgstr "Pokaži seznam kanalov"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:92
+#: ../src/uisupport/contextmenuactionprovider.cpp:93
 msgctxt "ContextMenuActionProvider|"
 msgid "Configure"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:93
+#: ../src/uisupport/contextmenuactionprovider.cpp:94
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
 msgstr "Pokaži seznam prezrtih"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:108
+#: ../src/uisupport/contextmenuactionprovider.cpp:109
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Events"
 msgstr "Skrij dogodke"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:116
+#: ../src/uisupport/contextmenuactionprovider.cpp:117
 msgctxt "ContextMenuActionProvider|"
 msgid "CTCP"
 msgstr "CTCP"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:131
+#: ../src/uisupport/contextmenuactionprovider.cpp:132
 msgctxt "ContextMenuActionProvider|"
 msgid "Actions"
 msgstr "Dejanja"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:135
+#: ../src/uisupport/contextmenuactionprovider.cpp:136
 msgctxt "ContextMenuActionProvider|"
 msgid "Ignore"
 msgstr "Prezri"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:140
+#: ../src/uisupport/contextmenuactionprovider.cpp:141
 msgctxt "ContextMenuActionProvider|"
 msgid "Add Ignore Rule"
 msgstr "Dodaj pravilo za preziranje"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:141
+#: ../src/uisupport/contextmenuactionprovider.cpp:142
 msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr "Obstoječa pravila"
 
-#: ../src/core/core.cpp:116
+#: ../src/core/core.cpp:100
 msgctxt "Core|"
 msgid "Invalid core settings version!"
 msgstr ""
 
-#: ../src/core/core.cpp:183
+#: ../src/core/core.cpp:167
 #, qt-format
 msgctxt "Core|"
 msgid "Cannot configure from environment: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:187
+#: ../src/core/core.cpp:171
 msgctxt "Core|"
 msgid "Cannot configure from environment!"
 msgstr ""
 
-#: ../src/core/core.cpp:193
+#: ../src/core/core.cpp:177
 msgctxt "Core|"
 msgid ""
 "Could not initialize any storage backend! Exiting...\n"
@@ -2406,250 +2512,250 @@ msgid ""
 "to work."
 msgstr ""
 
-#: ../src/core/core.cpp:200
+#: ../src/core/core.cpp:184
 msgctxt "Core|"
 msgid "Cannot write quasselcore configuration; probably a permission problem."
 msgstr ""
 
-#: ../src/core/core.cpp:249
+#: ../src/core/core.cpp:240
 msgctxt "Core|"
 msgid "Cannot open port for listening!"
 msgstr ""
 
-#: ../src/core/core.cpp:292
+#: ../src/core/core.cpp:311
 msgctxt "Core|"
 msgid "Cannot restore a state for an unconfigured core!"
 msgstr ""
 
-#: ../src/core/core.cpp:296
+#: ../src/core/core.cpp:315
 msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr "Klicanje restoreState(), čeprav obstajajo dejavne seje!"
 
-#: ../src/core/core.cpp:333
+#: ../src/core/core.cpp:360
 msgctxt "Core|"
 msgid "Core is already configured! Not configuring again..."
 msgstr "Jedro je že nastavljeno! Novega nastavljanja ne bo ..."
 
-#: ../src/core/core.cpp:336
+#: ../src/core/core.cpp:363
 msgctxt "Core|"
 msgid "Admin user or password not set."
 msgstr "Skrbniški uporabnik, ali njegovo geslo, ni nastavljen."
 
-#: ../src/core/core.cpp:340
+#: ../src/core/core.cpp:367
 msgctxt "Core|"
 msgid "Could not setup storage!"
 msgstr "Ni mogoče nastaviti shrambe!"
 
-#: ../src/core/core.cpp:346
+#: ../src/core/core.cpp:372
 msgctxt "Core|"
 msgid "Could not setup authenticator!"
 msgstr ""
 
-#: ../src/core/core.cpp:352
+#: ../src/core/core.cpp:378
 msgctxt "Core|"
 msgid "Fatal failure while trying to setup, terminating"
 msgstr ""
 
-#: ../src/core/core.cpp:356
+#: ../src/core/core.cpp:382
 msgctxt "Core|"
 msgid "Could not save backend settings, probably a permission problem."
 msgstr ""
 
-#: ../src/core/core.cpp:360
+#: ../src/core/core.cpp:386
 msgctxt "Core|"
 msgid "Creating admin user..."
 msgstr "Ustvarjanje skrbniškega uporabnika ..."
 
-#: ../src/core/core.cpp:444
+#: ../src/core/core.cpp:464
 #, qt-format
 msgctxt "Core|"
 msgid "Selected storage backend %1 is not available."
 msgstr ""
 
-#: ../src/core/core.cpp:544
+#: ../src/core/core.cpp:557
 #, qt-format
 msgctxt "Core|"
 msgid "Selected auth backend %1 is not available."
 msgstr ""
 
-#: ../src/core/core.cpp:633
+#: ../src/core/core.cpp:627
 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1"
 msgstr "Neveljaven naslov za poslušanje (%1)"
 
-#: ../src/core/core.cpp:642
+#: ../src/core/core.cpp:633
 #, qt-format
 msgctxt "Core|"
 msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
 msgstr "Poslušanje za odjemalci na IPv6 %1, vratih %2, z uporabo protokola različice %3"
 
-#: ../src/core/core.cpp:651
+#: ../src/core/core.cpp:640
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr "Ni mogoče odpreti vmesnika IPv6 %1:%2: %3"
 
-#: ../src/core/core.cpp:659
+#: ../src/core/core.cpp:644
 #, qt-format
 msgctxt "Core|"
 msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
 msgstr "Poslušanje za odjemalci na IPv4 %1, vratih %2, z uporabo protokola različice %3"
 
-#: ../src/core/core.cpp:670
+#: ../src/core/core.cpp:653
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr "Ni mogoče odpreti vmesnika IPv4 %1:%2: %3"
 
-#: ../src/core/core.cpp:678
+#: ../src/core/core.cpp:657
 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr "Neveljaven naslov za poslušanje (%1), neznan omrežni protokol"
 
-#: ../src/core/core.cpp:687
+#: ../src/core/core.cpp:664
 msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr "Ni mogoče odpreti nobenega omrežnega vmesnika za poslušanje!"
 
-#: ../src/core/core.cpp:735
+#: ../src/core/core.cpp:719
 msgctxt "Core|"
 msgid "Client connected from"
 msgstr "Odjemalec se je povezal z"
 
-#: ../src/core/core.cpp:738
+#: ../src/core/core.cpp:722
 msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr "Zapiranje strežnika za osnovno nastavitev."
 
-#: ../src/core/core.cpp:750
+#: ../src/core/core.cpp:733
 msgctxt "Core|"
 msgid "Non-authed client disconnected:"
 msgstr "Nepooblaščen odjemalec je prekinil povezavo:"
 
-#: ../src/core/core.cpp:829
+#: ../src/core/core.cpp:807
 msgctxt "Core|"
 msgid "Cannot setup storage backend."
 msgstr ""
 
-#: ../src/core/core.cpp:925
+#: ../src/core/core.cpp:896
 #, qt-format
 msgctxt "Core|"
 msgid "Unsupported storage backend: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:926
+#: ../src/core/core.cpp:897
 msgctxt "Core|"
 msgid "Supported backends are:"
 msgstr ""
 
-#: ../src/core/core.cpp:938 ../src/core/core.cpp:958
+#: ../src/core/core.cpp:909 ../src/core/core.cpp:929
 #, qt-format
 msgctxt "Core|"
 msgid "Switched storage backend to: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:939
+#: ../src/core/core.cpp:910
 msgctxt "Core|"
 msgid "Backend already initialized. Skipping Migration..."
 msgstr ""
 
-#: ../src/core/core.cpp:942
+#: ../src/core/core.cpp:913
 #, qt-format
 msgctxt "Core|"
 msgid "Storage backend is not available: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:946
+#: ../src/core/core.cpp:917
 #, qt-format
 msgctxt "Core|"
 msgid "Unable to setup storage backend: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:951
+#: ../src/core/core.cpp:922
 #, qt-format
 msgctxt "Core|"
 msgid "Unable to initialize storage backend: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:966
+#: ../src/core/core.cpp:937
 #, qt-format
 msgctxt "Core|"
 msgid "Migrating storage backend %1 to %2..."
 msgstr ""
 
-#: ../src/core/core.cpp:971
+#: ../src/core/core.cpp:942
 msgctxt "Core|"
 msgid "Migration finished!"
 msgstr ""
 
-#: ../src/core/core.cpp:978
+#: ../src/core/core.cpp:949
 #, qt-format
 msgctxt "Core|"
 msgid "Unable to migrate storage backend! (No migration writer for %1)"
 msgstr ""
 
-#: ../src/core/core.cpp:984
+#: ../src/core/core.cpp:955
 msgctxt "Core|"
 msgid "No currently active storage backend. Skipping migration..."
 msgstr ""
 
-#: ../src/core/core.cpp:987
+#: ../src/core/core.cpp:958
 #, qt-format
 msgctxt "Core|"
 msgid "Currently active storage backend does not support migration: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:990
+#: ../src/core/core.cpp:961
 #, qt-format
 msgctxt "Core|"
 msgid "New storage backend does not support migration: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:1012
+#: ../src/core/core.cpp:983
 #, qt-format
 msgctxt "Core|"
 msgid "Unsupported authenticator: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:1013
+#: ../src/core/core.cpp:984
 msgctxt "Core|"
 msgid "Supported authenticators are:"
 msgstr ""
 
-#: ../src/core/core.cpp:1023 ../src/core/core.cpp:1040
+#: ../src/core/core.cpp:994 ../src/core/core.cpp:1011
 #, qt-format
 msgctxt "Core|"
 msgid "Switched authenticator to: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:1026
+#: ../src/core/core.cpp:997
 #, qt-format
 msgctxt "Core|"
 msgid "Authenticator is not available: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:1030
+#: ../src/core/core.cpp:1001
 #, qt-format
 msgctxt "Core|"
 msgid "Unable to setup authenticator: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:1035
+#: ../src/core/core.cpp:1006
 #, qt-format
 msgctxt "Core|"
 msgid "Unable to initialize authenticator: %1"
 msgstr ""
 
-#: ../src/client/coreaccount.h:41
+#: ../src/client/coreaccount.h:43
 msgctxt "CoreAccount|"
 msgid "Internal Core"
 msgstr "Notranje jedro"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:293
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:276
 msgctxt "CoreAccountEditDlg|"
 msgid "Edit Core Account"
 msgstr "Urejanje računa pri jedru"
@@ -2739,12 +2845,12 @@ msgctxt "CoreAccountEditDlg|"
 msgid "&Manual proxy configuration"
 msgstr ""
 
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:295
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:278
 msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr "Dodaj račun pri jedru"
 
-#: ../src/client/coreaccountmodel.cpp:68
+#: ../src/client/coreaccountmodel.cpp:64
 msgctxt "CoreAccountModel|"
 msgid "Internal Core"
 msgstr "Notranje jedro"
@@ -2789,28 +2895,23 @@ msgctxt "CoreAccountSettingsPage|"
 msgid "Always connect to"
 msgstr "Vedno se poveži z"
 
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:30
 msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
 msgstr "Oddaljena jedra"
 
-#: ../src/core/coreapplication.cpp:46
-msgctxt "CoreApplication|"
-msgid "Could not initialize Quassel!"
-msgstr ""
-
-#: ../src/core/coreauthhandler.cpp:138 ../src/core/coreauthhandler.cpp:150
-#: ../src/core/coreauthhandler.cpp:225
+#: ../src/core/coreauthhandler.cpp:167 ../src/core/coreauthhandler.cpp:179
+#: ../src/core/coreauthhandler.cpp:253
 msgctxt "CoreAuthHandler|"
 msgid "Client"
 msgstr "Odjemalec"
 
-#: ../src/core/coreauthhandler.cpp:138
+#: ../src/core/coreauthhandler.cpp:167
 msgctxt "CoreAuthHandler|"
 msgid "too old, rejecting."
 msgstr "je prestar, zavračanje."
 
-#: ../src/core/coreauthhandler.cpp:139
+#: ../src/core/coreauthhandler.cpp:168
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid ""
@@ -2819,101 +2920,101 @@ msgid ""
 " client."
 msgstr "<b>Vaš odjemalec Quassel je prestar!</b><br>To jedro zahteva vsaj različico odjemalca/jedra %1 (dobljena: %2).<br>Razmislite o nadgradnji odjemalca."
 
-#: ../src/core/coreauthhandler.cpp:150
+#: ../src/core/coreauthhandler.cpp:180
 msgctxt "CoreAuthHandler|"
 msgid "did not send a registration message before trying to login, rejecting."
 msgstr "ni poslal registracijskega sporočila pred poskusom prijave, zavračanje."
 
-#: ../src/core/coreauthhandler.cpp:151
+#: ../src/core/coreauthhandler.cpp:182
 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>Client not initialized!</b><br>You need to send a registration message "
 "before trying to login."
 msgstr "<b>Odjemalec ni začet!</b><br>Pred poskusom prijave morate poslati registracijsko sporočilo."
 
-#: ../src/core/coreauthhandler.cpp:168
+#: ../src/core/coreauthhandler.cpp:198
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid "SSL required but non-SSL connection attempt from %1"
 msgstr "Zahtevan je SSL, zaznan pa je bil poskus povezave brez SSL od %1"
 
-#: ../src/core/coreauthhandler.cpp:169
+#: ../src/core/coreauthhandler.cpp:199
 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>SSL is required!</b><br>You need to use SSL in order to connect to this "
 "core."
 msgstr "<b>Zahtevan je SSL!</b><br>Za povezavo s tem jedrom morate uporabiti SSL."
 
-#: ../src/core/coreauthhandler.cpp:225
+#: ../src/core/coreauthhandler.cpp:254
 msgctxt "CoreAuthHandler|"
 msgid "attempted to login before the core was configured, rejecting."
 msgstr ""
 
-#: ../src/core/coreauthhandler.cpp:226
+#: ../src/core/coreauthhandler.cpp:256
 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>Attempted to login before core was configured!</b><br>The core must be "
 "configured before attempting to login."
 msgstr ""
 
-#: ../src/core/coreauthhandler.cpp:238
+#: ../src/core/coreauthhandler.cpp:278
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid "Invalid login attempt from %1 as \"%2\""
 msgstr "Neveljaven poskus prijave od %1 kot »%2«"
 
-#: ../src/core/coreauthhandler.cpp:239
+#: ../src/core/coreauthhandler.cpp:279
 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>Invalid username or password!</b><br>The username/password combination "
 "you supplied could not be found in the database."
 msgstr "<b>Neveljavno uporabniško ime ali geslo.</b><br>Podane kombinacije uporabniškega imena in gesla ni mogoče najti v podatkovni zbirki."
 
-#: ../src/core/coreauthhandler.cpp:244
+#: ../src/core/coreauthhandler.cpp:291
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid ""
 "Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
 msgstr "Odjemalec %1 je bil uspešno začet in pooblaščen kot »%2« (ID uporabnika: %3)."
 
-#: ../src/core/coreauthhandler.cpp:250
+#: ../src/core/coreauthhandler.cpp:298
 msgctxt "CoreAuthHandler|"
 msgid "Client does not support extended features."
 msgstr ""
 
-#: ../src/core/coreauthhandler.cpp:252
+#: ../src/core/coreauthhandler.cpp:300
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid "Client does not support the following features: %1"
 msgstr ""
 
-#: ../src/core/coreauthhandler.cpp:256
+#: ../src/core/coreauthhandler.cpp:304
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid "Client supports unknown features: %1"
 msgstr ""
 
-#: ../src/core/coreauthhandler.cpp:276
+#: ../src/core/coreauthhandler.cpp:337
 msgctxt "CoreAuthHandler|"
 msgid "Starting encryption for Client:"
 msgstr "Začenjanje šifriranja za odjemalec:"
 
-#: ../src/qtui/coreconfigwizard.cpp:43
+#: ../src/qtui/coreconfigwizard.cpp:44
 msgctxt "CoreConfigWizard|"
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/qtui/coreconfigwizard.cpp:162
+#: ../src/qtui/coreconfigwizard.cpp:159
 msgctxt "CoreConfigWizard|"
 msgid "Core Configuration Wizard"
 msgstr "Čarovnik za nastavitev jedra"
 
-#: ../src/qtui/coreconfigwizard.cpp:203
+#: ../src/qtui/coreconfigwizard.cpp:206
 msgctxt "CoreConfigWizard|"
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr "Jedro je bilo uspešno nastavljeno. Prijavljanje ..."
 
-#: ../src/qtui/coreconfigwizard.cpp:212
+#: ../src/qtui/coreconfigwizard.cpp:216
 #, qt-format
 msgctxt "CoreConfigWizard|"
 msgid ""
@@ -2921,64 +3022,64 @@ msgid ""
 "over."
 msgstr "Nastavitev jedra ni uspela.<br><b>%1</b><br>Kliknite <em>Naprej</em>, da začnete znova."
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:14
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:25
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:25
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:35
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:35
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:49
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:49
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr "Ponovite geslo:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:63
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:63
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr "Zapomni si geslo"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:72
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:72
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid ""
 "<b>Note:</b> Adding more users and changing your username/password is not possible via Quassel's client interface yet.\n"
 "If you need to do these things, please run \"<tt><nobr>quasselcore --help</nobr></tt>\"."
 msgstr "<b>Opomba:</b> dodajanje uporabnikov in spreminjanje uporabniškega imena ter gesla iz odjemalca Quassel še ni mogoče.\nČe želite to storiti, zaženite »<tt><nobr>quasselcore --help</nobr></tt>«."
 
-#: ../src/qtui/ui/coreconfigwizardauthenticationselectionpage.ui:14
+#: ../src/qtui/coreconfigwizardauthenticationselectionpage.ui:14
 msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/coreconfigwizardauthenticationselectionpage.ui:25
+#: ../src/qtui/coreconfigwizardauthenticationselectionpage.ui:25
 msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
 msgid "Authentication Backend:"
 msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
+#: ../src/qtui/coreconfigwizardintropage.ui:13
 msgctxt "CoreConfigWizardIntroPage|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/coreconfigwizardintropage.ui:19
+#: ../src/qtui/coreconfigwizardintropage.ui:19
 msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr "Ta čarovnik vas bo vodil skozi namestitev jedra za Quassel."
 
-#: ../src/qtui/coreconfigwizard.cpp:258
+#: ../src/qtui/coreconfigwizard.cpp:260
 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid "Create Admin User"
 msgstr "Ustvari skrbniškega uporabnika"
 
-#: ../src/qtui/coreconfigwizard.cpp:259
+#: ../src/qtui/coreconfigwizard.cpp:261
 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid ""
 "First, we will create a user on the core. This first user will have "
@@ -3001,151 +3102,151 @@ msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
 msgid "Authentication Settings"
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:241
+#: ../src/qtui/coreconfigwizard.cpp:244
 msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr "Uvod"
 
-#: ../src/qtui/coreconfigwizard.cpp:379
+#: ../src/qtui/coreconfigwizard.cpp:366
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
 msgstr "Izberite zaledje za shranjevanje"
 
-#: ../src/qtui/coreconfigwizard.cpp:380
+#: ../src/qtui/coreconfigwizard.cpp:367
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Please select a storage backend for Quassel Core."
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:420
+#: ../src/qtui/coreconfigwizard.cpp:407
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Storage Settings"
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:484
+#: ../src/qtui/coreconfigwizard.cpp:458
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid "Storing Your Settings"
 msgstr "Shranjevanje nastavitev"
 
-#: ../src/qtui/coreconfigwizard.cpp:485
+#: ../src/qtui/coreconfigwizard.cpp:459
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid ""
 "Your settings are now being stored in the core, and you will be logged in "
 "automatically."
 msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:14
+#: ../src/qtui/coreconfigwizardstorageselectionpage.ui:14
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:22
+#: ../src/qtui/coreconfigwizardstorageselectionpage.ui:22
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr "Zaledje za shranjevanje:"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:14
+#: ../src/qtui/coreconfigwizardsyncpage.ui:14
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:20
+#: ../src/qtui/coreconfigwizardsyncpage.ui:20
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr "Vaše izbire"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:36
+#: ../src/qtui/coreconfigwizardsyncpage.ui:36
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr "Skrbniški uporabnik:"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:56
+#: ../src/qtui/coreconfigwizardsyncpage.ui:56
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Storage Backend:"
 msgstr "Zaledje za shranjevanje:"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:76
+#: ../src/qtui/coreconfigwizardsyncpage.ui:76
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Authentication Backend:"
 msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:110
+#: ../src/qtui/coreconfigwizardsyncpage.ui:110
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr "Počakajte med prenašanjem vaših nastavitev do jedra ..."
 
-#: ../src/qtui/ui/coreconnectauthdlg.ui:14
+#: ../src/qtui/coreconnectauthdlg.ui:14
 msgctxt "CoreConnectAuthDlg|"
 msgid "Authentication Required"
 msgstr "Zahtevana je overitev"
 
-#: ../src/qtui/ui/coreconnectauthdlg.ui:20
+#: ../src/qtui/coreconnectauthdlg.ui:20
 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your account data:"
 msgstr "Vnesite podatke o svojem računu:"
 
-#: ../src/qtui/ui/coreconnectauthdlg.ui:35
+#: ../src/qtui/coreconnectauthdlg.ui:35
 msgctxt "CoreConnectAuthDlg|"
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../src/qtui/ui/coreconnectauthdlg.ui:49
+#: ../src/qtui/coreconnectauthdlg.ui:49
 msgctxt "CoreConnectAuthDlg|"
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: ../src/qtui/ui/coreconnectauthdlg.ui:58
+#: ../src/qtui/coreconnectauthdlg.ui:58
 msgctxt "CoreConnectAuthDlg|"
 msgid "Remember password"
 msgstr "Zapomni si geslo"
 
-#: ../src/qtui/coreconnectdlg.cpp:81
+#: ../src/qtui/coreconnectdlg.cpp:79
 #, qt-format
 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your credentials for %1:"
 msgstr "Vnesite poverila za %1:"
 
-#: ../src/qtui/coreconnectdlg.cpp:41
+#: ../src/qtui/coreconnectdlg.cpp:42
 msgctxt "CoreConnectDlg|"
 msgid "Connect to Core"
 msgstr "Poveži se z jedrom"
 
-#: ../src/client/coreconnection.cpp:182
+#: ../src/client/coreconnection.cpp:164
 msgctxt "CoreConnection|"
 msgid "Network is down"
 msgstr "Omrežje ni vzpostavljeno"
 
-#: ../src/client/coreconnection.cpp:274
+#: ../src/client/coreconnection.cpp:247
 msgctxt "CoreConnection|"
 msgid "Disconnected"
 msgstr "Povezava prekinjena"
 
-#: ../src/client/coreconnection.cpp:309
+#: ../src/client/coreconnection.cpp:281
 msgctxt "CoreConnection|"
 msgid "Disconnected from core."
 msgstr "Povezava z jedrom prekinjena."
 
-#: ../src/client/coreconnection.cpp:388
+#: ../src/client/coreconnection.cpp:357
 msgctxt "CoreConnection|"
 msgid "Initializing..."
 msgstr ""
 
-#: ../src/client/coreconnection.cpp:446
+#: ../src/client/coreconnection.cpp:412
 msgctxt "CoreConnection|"
 msgid "Receiving session state"
 msgstr "Prejemanje stanja seje"
 
-#: ../src/client/coreconnection.cpp:448
+#: ../src/client/coreconnection.cpp:414
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronizing to %1..."
 msgstr "Usklajevanje z %1 ..."
 
-#: ../src/client/coreconnection.cpp:481
+#: ../src/client/coreconnection.cpp:444
 msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr "Prejemanje stanj omrežij"
 
-#: ../src/client/coreconnection.cpp:532
+#: ../src/client/coreconnection.cpp:493
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronized to %1"
@@ -3227,38 +3328,38 @@ msgctxt "CoreConnectionSettingsPage|"
 msgid "Connection"
 msgstr "Povezava"
 
-#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
+#: ../src/qtui/coreconnectionstatuswidget.ui:14
 msgctxt "CoreConnectionStatusWidget|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
+#: ../src/qtui/coreconnectionstatuswidget.ui:32
 msgctxt "CoreConnectionStatusWidget|"
 msgid "Message"
 msgstr "Sporočilo"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:66
+#: ../src/qtui/coreconnectionstatuswidget.cpp:64
 msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
 msgstr "s"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:66
+#: ../src/qtui/coreconnectionstatuswidget.cpp:64
 msgctxt "CoreConnectionStatusWidget|milliseconds"
 msgid "ms"
 msgstr "ms"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:67
+#: ../src/qtui/coreconnectionstatuswidget.cpp:65
 #, qt-format
 msgctxt "CoreConnectionStatusWidget|"
 msgid "(Lag: %1 %2)"
 msgstr "(zakasnitev: %1 %2)"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:83
+#: ../src/qtui/coreconnectionstatuswidget.cpp:80
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is encrypted with SSL."
 msgstr "Povezava z jedrom je Å¡ifrirana s SSL."
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:87
+#: ../src/qtui/coreconnectionstatuswidget.cpp:84
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr "Povezava z jedrom ni Å¡ifrirana."
@@ -3269,7 +3370,7 @@ msgid "Form"
 msgstr "Obrazec"
 
 #: ../src/qtui/settingspages/corehighlightsettingspage.ui:57
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:718
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:677
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Your Quassel core is too old to support remote highlights"
 msgstr ""
@@ -3357,77 +3458,60 @@ msgctxt "CoreHighlightSettingsPage|"
 msgid "Never Highlight For"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:31
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:35
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:34
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:35
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Highlights"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:34
-msgctxt "CoreHighlightSettingsPage|"
-msgid "Remote Highlights"
-msgstr ""
-
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:42
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:43
 msgctxt "CoreHighlightSettingsPage|"
 msgid "All Nicks from Identity"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:43
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:44
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Current Nick"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:44
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:45
 msgctxt "CoreHighlightSettingsPage|"
 msgid "None"
 msgstr "Nobenega"
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:99
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:86
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Import Legacy"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:100
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:107
+#: ../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:101
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:740
+#: ../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:106
-msgctxt "CoreHighlightSettingsPage|"
-msgid "Import Local"
-msgstr ""
-
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:108
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:714
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:742
-msgctxt "CoreHighlightSettingsPage|"
-msgid "Local Highlights"
-msgstr ""
-
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:161
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:129
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Enable/disable this rule"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:164
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:132
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Phrase to match, leave blank to match any message"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:167
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:135
 msgctxt "CoreHighlightSettingsPage|"
 msgid ""
 "<b>RegEx</b>: This option determines if the highlight rule, <i>Sender</i>, "
@@ -3435,14 +3519,14 @@ msgid ""
 "just as keywords."
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:172
+#: ../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:176
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:144
 msgctxt "CoreHighlightSettingsPage|"
 msgid ""
 "<p><b>Sender</b>: Semicolon separated list of <i>nick!ident@host</i> names, "
@@ -3457,7 +3541,7 @@ msgid ""
 "<i>Announce</i></p>"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:190
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:158
 msgctxt "CoreHighlightSettingsPage|"
 msgid ""
 "<p><b>Channel</b>: Semicolon separated list of channel/query names, leave "
@@ -3470,98 +3554,103 @@ msgid ""
 "channel starting with <i>#quassel</i></p>"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:719
+#: ../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:721
+#: ../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:725
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:684
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Remote Highlights unsupported"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:748
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:700
 msgctxt "CoreHighlightSettingsPage|"
 msgid "No highlights to import"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:749
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:700
 #, qt-format
 msgctxt "CoreHighlightSettingsPage|"
 msgid "No highlight rules in <i>%1</i>."
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:755
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:705
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Import highlights?"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:756
+#: ../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:795
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:756
 msgctxt "CoreHighlightSettingsPage|"
 msgid "Imported highlights"
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:796
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:758
 #, qt-format
 msgctxt "CoreHighlightSettingsPage|"
 msgid "%1 highlight rules successfully imported."
 msgstr ""
 
-#: ../src/qtui/settingspages/corehighlightsettingspage.h:52
-#: ../src/qtui/settingspages/corehighlightsettingspage.h:55
+#: ../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 "pravilo poudarjanja"
 
-#: ../src/qtui/ui/coreinfodlg.ui:14
+#: ../src/qtui/coreinfodlg.ui:14
 msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr "Podatki o jedru"
 
-#: ../src/qtui/ui/coreinfodlg.ui:22
+#: ../src/qtui/coreinfodlg.ui:22
 msgctxt "CoreInfoDlg|"
 msgid "Version:"
 msgstr "Različica:"
 
-#: ../src/qtui/ui/coreinfodlg.ui:36
+#: ../src/qtui/coreinfodlg.ui:42
 msgctxt "CoreInfoDlg|"
 msgid "Version date:"
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:50
+#: ../src/qtui/coreinfodlg.ui:56
 msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr "Čas delovanja:"
 
-#: ../src/qtui/ui/coreinfodlg.ui:64
+#: ../src/qtui/coreinfodlg.ui:70
 msgctxt "CoreInfoDlg|"
 msgid "Connected clients:"
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:117 ../src/qtui/coreinfodlg.cpp:193
+#: ../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/ui/coreinfodlg.ui:124
+#: ../src/qtui/coreinfodlg.ui:130
 msgctxt "CoreInfoDlg|"
 msgid "Details..."
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:200
+#: ../src/qtui/coreinfodlg.ui:206
 msgctxt "CoreInfoDlg|"
 msgid "Close"
 msgstr "Zapri"
@@ -3572,22 +3661,22 @@ msgctxt "CoreInfoDlg|"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.cpp:90
+#: ../src/qtui/coreinfodlg.cpp:91
 msgctxt "CoreInfoDlg|"
 msgid "Disconnected from core"
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.cpp:91 ../src/qtui/coreinfodlg.cpp:157
+#: ../src/qtui/coreinfodlg.cpp:92 ../src/qtui/coreinfodlg.cpp:156
 msgctxt "CoreInfoDlg|"
 msgid "Not available"
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.cpp:99
+#: ../src/qtui/coreinfodlg.cpp:101
 msgctxt "CoreInfoDlg|"
 msgid "Unknown date"
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.cpp:173
+#: ../src/qtui/coreinfodlg.cpp:174
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid "%n Day(s)"
@@ -3597,30 +3686,30 @@ msgstr[1] "%n dneva"
 msgstr[2] "%n dni"
 msgstr[3] "%n dan"
 
-#: ../src/qtui/coreinfodlg.cpp:174
+#: ../src/qtui/coreinfodlg.cpp:175
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid " %1:%2:%3 (since %4)"
 msgstr " %1:%2:%3 (od %4)"
 
-#: ../src/qtui/coreinfodlg.cpp:191
+#: ../src/qtui/coreinfodlg.cpp:192
 msgctxt "CoreInfoDlg|"
 msgid "Active sessions unsupported"
 msgstr ""
 
-#: ../src/qtui/coreinfodlg.cpp:194
+#: ../src/qtui/coreinfodlg.cpp:195
 msgctxt "CoreInfoDlg|"
 msgid ""
 "You need a Quassel core v0.13.0 or newer to view and disconnect other "
 "connected clients."
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:238
+#: ../src/core/corenetwork.cpp:231
 msgctxt "CoreNetwork|"
-msgid "Connection failed. Cycling to next Server"
-msgstr "Povezava ni uspela. Prehajanje na naslednji strežnik"
+msgid "Connection failed. Cycling to next server..."
+msgstr ""
 
-#: ../src/core/corenetwork.cpp:249 ../src/core/corenetwork.cpp:250
+#: ../src/core/corenetwork.cpp:243 ../src/core/corenetwork.cpp:248
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connecting to %1:%2..."
@@ -3637,99 +3726,119 @@ msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr "Izklop jedra"
 
-#: ../src/core/corenetwork.cpp:539
+#: ../src/core/corenetwork.cpp:537
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"
 msgstr "Ni se bilo mogoče povezati z %1 (%2)"
 
-#: ../src/core/corenetwork.cpp:541
+#: ../src/core/corenetwork.cpp:543
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
 msgstr "Napaka povezave: %1"
 
-#: ../src/core/corenetwork.cpp:589
+#: ../src/core/corenetwork.cpp:591
 msgctxt "CoreNetwork|"
 msgid "Requesting capability list..."
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1116
+#: ../src/core/corenetwork.cpp:1125
 msgctxt "CoreNetwork|"
 msgid "SASL EXTERNAL authentication not supported"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1127
+#: ../src/core/corenetwork.cpp:1141
 msgctxt "CoreNetwork|"
 msgid "SASL PLAIN authentication not supported"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1233
+#: ../src/core/corenetwork.cpp:1253
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Could not negotiate some capabilities, retrying individually (%1)..."
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1248
+#: ../src/core/corenetwork.cpp:1289
 msgctxt "CoreNetwork|"
 msgid "No capabilities available"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1255
+#: ../src/core/corenetwork.cpp:1295
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid ""
+"None of the capabilities provided by the server are supported (found: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1303
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid ""
+"No additional capabilities are supported (found: %1; currently enabled: %2)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1320 ../src/core/corenetwork.cpp:1343
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Quassel is configured to ignore some capabilities (skipped: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1334
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Ready to negotiate (found: %1)"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1264
+#: ../src/core/corenetwork.cpp:1356
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Negotiating capabilities (requesting: %1)..."
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1279
+#: ../src/core/corenetwork.cpp:1376
 msgctxt "CoreNetwork|"
 msgid "SASL authentication currently not supported by server"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1283
+#: ../src/core/corenetwork.cpp:1384
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Capability negotiation finished (enabled: %1)"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1429
+#: ../src/core/corenetwork.cpp:1518
 msgctxt "CoreNetwork|"
 msgid ""
 "Encrypted connection couldn't be verified, disconnecting since verification "
 "is required"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1433 ../src/core/corenetwork.cpp:1446
+#: ../src/core/corenetwork.cpp:1522 ../src/core/corenetwork.cpp:1541
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid " (Reason: %1)"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:1442
+#: ../src/core/corenetwork.cpp:1537
 msgctxt "CoreNetwork|"
 msgid ""
 "Encrypted connection couldn't be verified, continuing since verification is "
 "not required"
 msgstr ""
 
-#: ../src/core/coresession.cpp:298
+#: ../src/core/coresession.cpp:279
 msgctxt "CoreSession|"
 msgid "Client"
 msgstr "Odjemalec"
 
-#: ../src/core/coresession.cpp:298
+#: ../src/core/coresession.cpp:279
 #, qt-format
 msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."
 msgstr "je prekinil povezavo (ID uporabnika: %1)."
 
-#: ../src/core/coresession.cpp:623
+#: ../src/core/coresession.cpp:607
 #, qt-format
 msgctxt "CoreSession|"
 msgid ""
@@ -3737,83 +3846,83 @@ msgid ""
 " create network %1!"
 msgstr "CoreSession::createNetwork(): med poskusom ustvarjanja omrežja %1 je bil od jedra prejet neveljaven networkId!"
 
-#: ../src/core/coresession.cpp:655
+#: ../src/core/coresession.cpp:638
 msgctxt "CoreSession|"
 msgid ""
 "CoreSession::createNetwork(): Trying to create a network that already "
 "exists, updating instead!"
 msgstr "CoreSession::createNetwork(): poskus ustvaritve omrežja, ki že obstaja, namesto tega posodabljam!"
 
-#: ../src/core/coresessioneventprocessor.cpp:81
+#: ../src/core/coresessioneventprocessor.cpp:82
 msgctxt "CoreSessionEventProcessor|"
 msgid ""
 "No free and valid nicks in nicklist found. use: /nick <othernick> to "
 "continue"
 msgstr "Na seznamu vzdevkov ni mogoče najti nobenega prostega ali veljavnega vzdevka. Za nadaljevanje uporabite »/nick <drug_vzdevek>«"
 
-#: ../src/core/coresessioneventprocessor.cpp:800
+#: ../src/core/coresessioneventprocessor.cpp:821
 msgctxt "CoreSessionEventProcessor|"
 msgid "Unable to perform key exchange, missing qca-ossl plugin."
 msgstr "Ni mogoče izvesti izmenjave ključa, manjka vstavek qca-ossl."
 
-#: ../src/core/coresessioneventprocessor.cpp:811
+#: ../src/core/coresessioneventprocessor.cpp:838
 msgctxt "CoreSessionEventProcessor|"
 msgid "Unable to parse the DH1080_INIT. Key exchange failed."
 msgstr "Ni mogoče razčleniti DH1080_INIT. Izmenjava ključa je spodletela."
 
-#: ../src/core/coresessioneventprocessor.cpp:815
-#: ../src/core/coresessioneventprocessor.cpp:823
+#: ../src/core/coresessioneventprocessor.cpp:849
+#: ../src/core/coresessioneventprocessor.cpp:864
 msgctxt "CoreSessionEventProcessor|"
 msgid "Your key is set and messages will be encrypted."
 msgstr "Vaš ključ je nastavljen in sporočila bodo šifrirana."
 
-#: ../src/core/coresessioneventprocessor.cpp:825
+#: ../src/core/coresessioneventprocessor.cpp:873
 msgctxt "CoreSessionEventProcessor|"
 msgid "Failed to parse DH1080_FINISH. Key exchange failed."
 msgstr "Ni bilo mogoče razčleniti DH1080_FINISH. Izmenjava ključa je spodletela."
 
-#: ../src/core/coresessioneventprocessor.cpp:1587
+#: ../src/core/coresessioneventprocessor.cpp:1602
 msgctxt "CoreSessionEventProcessor|"
 msgid "Reverse DCC SEND not supported"
 msgstr "Obratni DCC SEND ni podprt"
 
-#: ../src/core/coresessioneventprocessor.cpp:1605
+#: ../src/core/coresessioneventprocessor.cpp:1625
 #, qt-format
 msgctxt "CoreSessionEventProcessor|"
 msgid "DCC %1 not supported"
 msgstr "DCC %1 ni podprt"
 
-#: ../src/qtui/ui/coresessionwidget.ui:29
+#: ../src/qtui/coresessionwidget.ui:29
 msgctxt "CoreSessionWidget|"
 msgid "12.34.56.78"
 msgstr ""
 
-#: ../src/qtui/ui/coresessionwidget.ui:37
+#: ../src/qtui/coresessionwidget.ui:37
 msgctxt "CoreSessionWidget|"
 msgid "Client:"
 msgstr ""
 
-#: ../src/qtui/ui/coresessionwidget.ui:51
+#: ../src/qtui/coresessionwidget.ui:57
 msgctxt "CoreSessionWidget|"
 msgid "Version date:"
 msgstr ""
 
-#: ../src/qtui/ui/coresessionwidget.ui:65
+#: ../src/qtui/coresessionwidget.ui:71
 msgctxt "CoreSessionWidget|"
 msgid "Location:"
 msgstr ""
 
-#: ../src/qtui/ui/coresessionwidget.ui:79
+#: ../src/qtui/coresessionwidget.ui:85
 msgctxt "CoreSessionWidget|"
 msgid "Connected since:"
 msgstr ""
 
-#: ../src/qtui/ui/coresessionwidget.ui:93
+#: ../src/qtui/coresessionwidget.ui:99
 msgctxt "CoreSessionWidget|"
 msgid "Secure:"
 msgstr ""
 
-#: ../src/qtui/ui/coresessionwidget.ui:124
+#: ../src/qtui/coresessionwidget.ui:130
 msgctxt "CoreSessionWidget|"
 msgid "End Session"
 msgstr ""
@@ -3823,27 +3932,27 @@ msgctxt "CoreSessionWidget|"
 msgid "Unknown date"
 msgstr ""
 
-#: ../src/qtui/coresessionwidget.cpp:53
+#: ../src/qtui/coresessionwidget.cpp:51
 msgctxt "CoreSessionWidget|"
 msgid "Yes"
 msgstr "Da"
 
-#: ../src/qtui/coresessionwidget.cpp:53
+#: ../src/qtui/coresessionwidget.cpp:51
 msgctxt "CoreSessionWidget|"
 msgid "No"
 msgstr ""
 
-#: ../src/qtui/coresessionwidget.cpp:59 ../src/qtui/coresessionwidget.cpp:72
+#: ../src/qtui/coresessionwidget.cpp:57 ../src/qtui/coresessionwidget.cpp:71
 msgctxt "CoreSessionWidget|"
 msgid "End the client's session, disconnecting it"
 msgstr ""
 
-#: ../src/qtui/coresessionwidget.cpp:73
+#: ../src/qtui/coresessionwidget.cpp:71
 msgctxt "CoreSessionWidget|"
 msgid "This client does not support being remotely disconnected"
 msgstr ""
 
-#: ../src/qtui/coresessionwidget.cpp:86
+#: ../src/qtui/coresessionwidget.cpp:85
 msgctxt "CoreSessionWidget|"
 msgid "Ending session..."
 msgstr ""
@@ -3853,70 +3962,70 @@ msgctxt "CoreTransfer|"
 msgid "Socket closed while still transferring!"
 msgstr "Vtič je bil zaprt med prenosom!"
 
-#: ../src/core/coretransfer.cpp:76
+#: ../src/core/coretransfer.cpp:75
 #, qt-format
 msgctxt "CoreTransfer|"
 msgid "DCC connection error: %1"
 msgstr "Napaka povezave DCC: %1"
 
-#: ../src/core/coretransfer.cpp:120
+#: ../src/core/coretransfer.cpp:115
 msgctxt "CoreTransfer|"
 msgid "Reverse DCC not supported yet!"
 msgstr "Obratni DCC Å¡e ni podprt!"
 
-#: ../src/core/coretransfer.cpp:167
+#: ../src/core/coretransfer.cpp:160
 msgctxt "CoreTransfer|"
 msgid "DCC Receive: Got more data than expected!"
 msgstr "Prejetje DCC: dobljenih je bilo več podatkov kot pričakovano!"
 
-#: ../src/core/coretransfer.cpp:183
+#: ../src/core/coretransfer.cpp:175
 msgctxt "CoreTransfer|"
 msgid "DCC Receive: Quassel Client disconnected during transfer!"
 msgstr "Prejetje DCC: odjemalec Quassel je prekinil povezavo med prenosom!"
 
-#: ../src/core/coreuserinputhandler.cpp:104
+#: ../src/core/coreuserinputhandler.cpp:91
 msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr "odsoten"
 
-#: ../src/core/coreuserinputhandler.cpp:185
+#: ../src/core/coreuserinputhandler.cpp:178
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
 msgstr "pošiljanje zahteve CTCP-%1 do %2"
 
-#: ../src/core/coreuserinputhandler.cpp:206
-#: ../src/core/coreuserinputhandler.cpp:377
-#: ../src/core/coreuserinputhandler.cpp:684
-#: ../src/core/coreuserinputhandler.cpp:722
+#: ../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 "Napaka: ponudnik za vstavek QCA ni bil najden. Običajno ga vsebuje vstavek qca-ossl."
 
-#: ../src/core/coreuserinputhandler.cpp:217
+#: ../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 "[uporaba] /delkey <vzdevek|kanal> izbriše šifrirni ključ za vzdevek ali kanal, v kanalu ali poizvedbi lahko uporabite samo /delkey."
 
-#: ../src/core/coreuserinputhandler.cpp:224
-#: ../src/core/coreuserinputhandler.cpp:740
+#: ../src/core/coreuserinputhandler.cpp:238
+#: ../src/core/coreuserinputhandler.cpp:859
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "No key has been set for %1."
 msgstr "Za %1 ni bil nastavljen noben ključ."
 
-#: ../src/core/coreuserinputhandler.cpp:229
+#: ../src/core/coreuserinputhandler.cpp:248
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been deleted."
 msgstr "Ključ za %1 je bil izbrisan."
 
-#: ../src/core/coreuserinputhandler.cpp:233
-#: ../src/core/coreuserinputhandler.cpp:748
+#: ../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 "
@@ -3925,31 +4034,31 @@ msgid ""
 "with QCA2 present."
 msgstr "Napaka: nastavljanje šifrirnega ključa zahteva vgrajeno podporo knjižnici Šifrirna arhitektura Qt (QCA2). Stopite v stik z avtorjem vaše distribucije za to podporo ali pa Quassel izgradite sami s prisotnim QCA2."
 
-#: ../src/core/coreuserinputhandler.cpp:387
+#: ../src/core/coreuserinputhandler.cpp:420
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."
 msgstr "[usage] /keyx [<vzdevek>] začne izmenjavo ključev DH1080 s ciljem."
 
-#: ../src/core/coreuserinputhandler.cpp:394
+#: ../src/core/coreuserinputhandler.cpp:432
 msgctxt "CoreUserInputHandler|"
 msgid "It is only possible to exchange keys in a query buffer."
 msgstr "Ključe je mogoče izmenjati le v prikazu poizvedbe."
 
-#: ../src/core/coreuserinputhandler.cpp:404
+#: ../src/core/coreuserinputhandler.cpp:447
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Failed to initiate key exchange with %1."
 msgstr "Ni bilo mogoče začeti izmenjave ključa z %1."
 
-#: ../src/core/coreuserinputhandler.cpp:409
+#: ../src/core/coreuserinputhandler.cpp:457
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Initiated key exchange with %1."
 msgstr "Začeta izmenjava ključa z %1."
 
-#: ../src/core/coreuserinputhandler.cpp:413
-#: ../src/core/coreuserinputhandler.cpp:706
+#: ../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 "
@@ -3958,39 +4067,40 @@ msgid ""
 "with QCA present."
 msgstr "Napaka: nastavljanje šifrirnega ključa zahteva vgrajeno podporo knjižnici Šifrirna arhitektura Qt (QCA). Stopite v stik z avtorjem vaše distribucije za to podporo ali pa Quassel izgradite sami s prisotnim QCA."
 
-#: ../src/core/coreuserinputhandler.cpp:481
+#: ../src/core/coreuserinputhandler.cpp:540
 msgctxt "CoreUserInputHandler|"
 msgid "Your persistent modes have been reset."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:615
+#: ../src/core/coreuserinputhandler.cpp:682
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Starting query with %1"
 msgstr "Začenjanje poizvedbe z %1"
 
-#: ../src/core/coreuserinputhandler.cpp:694
+#: ../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."
-msgstr "[uporaba] /setkey <vzdevek|kanal> <ključ> nastavi šifrirni ključ za vzdevek ali kanal, v kanalu ali poizvedbi lahko uporabite samo /setkey <ključ>"
+"it. Prefix <key> by cbc: or ebc: to explicitly set the encryption mode "
+"respectively. Default is CBC."
+msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:703
+#: ../src/core/coreuserinputhandler.cpp:796
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been set."
 msgstr "Ključ za %1 je bil nastavljen."
 
-#: ../src/core/coreuserinputhandler.cpp:732
+#: ../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 "[uporaba] /showkey <vzdevek|kanal> pokaže šifrirni ključ za vzdevek ali kanal, v kanalu ali poizvedbi lahko uporabite samo /showkey."
 
-#: ../src/core/coreuserinputhandler.cpp:744
+#: ../src/core/coreuserinputhandler.cpp:868
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 is %2:%3"
@@ -4016,12 +4126,12 @@ msgctxt "CreateIdentityDlg|"
 msgid "Duplicate:"
 msgstr "Podvoji:"
 
-#: ../src/common/protocols/datastream/datastreampeer.cpp:117
+#: ../src/common/protocols/datastream/datastreampeer.cpp:113
 msgctxt "DataStreamPeer|"
 msgid "Invalid handshake message!"
 msgstr "Neveljavno sporočilo rokovanja!"
 
-#: ../src/common/protocols/datastream/datastreampeer.cpp:173
+#: ../src/common/protocols/datastream/datastreampeer.cpp:176
 #, qt-format
 msgctxt "DataStreamPeer|"
 msgid "Unknown protocol message of type %1"
@@ -4119,27 +4229,27 @@ msgctxt "DccSettingsPage|"
 msgid "Prefix filenames with sender"
 msgstr ""
 
-#: ../src/qtui/settingspages/dccsettingspage.cpp:27
+#: ../src/qtui/settingspages/dccsettingspage.cpp:28
 msgctxt "DccSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/settingspages/dccsettingspage.cpp:27
+#: ../src/qtui/settingspages/dccsettingspage.cpp:28
 msgctxt "DccSettingsPage|"
 msgid "DCC"
 msgstr ""
 
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
+#: ../src/qtui/debugbufferviewoverlay.ui:13
 msgctxt "DebugBufferViewOverlay|"
 msgid "Debug BufferView Overlay"
 msgstr "Razhroščevanje BufferViewOverlay"
 
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
+#: ../src/qtui/debugbufferviewoverlay.ui:26
 msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay View"
 msgstr "Prekrivni prikaz"
 
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
+#: ../src/qtui/debugbufferviewoverlay.ui:39
 msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay Properties"
 msgstr "Lastnosti prekritja"
@@ -4189,83 +4299,64 @@ msgctxt "DebugBufferViewOverlay|"
 msgid "Is initialized:"
 msgstr "Je začet:"
 
-#: ../src/qtui/ui/debugconsole.ui:14
-msgctxt "DebugConsole|"
-msgid "Debug Console"
-msgstr "Razhroščevalna konzola"
-
-#: ../src/qtui/ui/debugconsole.ui:44
-msgctxt "DebugConsole|"
-msgid "local"
-msgstr "krajevno"
-
-#: ../src/qtui/ui/debugconsole.ui:54
-msgctxt "DebugConsole|"
-msgid "core"
-msgstr "jedro"
-
-#: ../src/qtui/ui/debugconsole.ui:82
-msgctxt "DebugConsole|"
-msgid "Evaluate!"
-msgstr "Ovrednoti!"
-
-#: ../src/qtui/ui/debuglogwidget.ui:13
-msgctxt "DebugLogWidget|"
+#: ../src/qtui/debuglogdlg.ui:14
+msgctxt "DebugLogDlg|"
 msgid "Debug Log"
 msgstr "Razhroščevalni dnevnik"
 
-#: ../src/qtui/ui/debuglogwidget.ui:43
-msgctxt "DebugLogWidget|"
-msgid "Close"
-msgstr "Zapri"
-
-#: ../src/qtui/dockmanagernotificationbackend.cpp:184
+#: ../src/qtui/dockmanagernotificationbackend.cpp:196
 msgctxt "DockManagerNotificationBackend::ConfigWidget|"
 msgid "Mark dockmanager entry"
 msgstr "Označi vnos upravljalnika sidrišča"
 
-#: ../src/core/eventstringifier.cpp:238 ../src/core/eventstringifier.cpp:447
+#: ../src/core/eventstringifier.cpp:240 ../src/core/eventstringifier.cpp:450
 msgctxt "EventStringifier|"
 msgid "[Whois] "
 msgstr "[Whois] "
 
-#: ../src/core/eventstringifier.cpp:253
+#: ../src/core/eventstringifier.cpp:261
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 invited you to channel %2"
 msgstr "%1 vas je povabil v kanal %2"
 
-#: ../src/core/eventstringifier.cpp:408
+#: ../src/core/eventstringifier.cpp:264
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 invited %2 to channel %3"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:412
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr "%1 je spremenil temo za %2 v: »%3«"
 
-#: ../src/core/eventstringifier.cpp:419
+#: ../src/core/eventstringifier.cpp:424
 msgctxt "EventStringifier|"
 msgid "Error from server: "
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:424
+#: ../src/core/eventstringifier.cpp:429
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Operwall] %1: %2"
 msgstr "[Operwall] %1: %2"
 
-#: ../src/core/eventstringifier.cpp:432
+#: ../src/core/eventstringifier.cpp:436
 msgctxt "EventStringifier|"
 msgid ""
 "Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
 "behavior!"
 msgstr "Prejet je bil RPL_ISUPPORT, ki ni skladen z RFC: to lahko vodi do nepredvidenega obnašanja!"
 
-#: ../src/core/eventstringifier.cpp:471
+#: ../src/core/eventstringifier.cpp:473
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 is away: \"%2\""
 msgstr "%1 je odsoten: »%2«"
 
-#: ../src/core/eventstringifier.cpp:478
+#: ../src/core/eventstringifier.cpp:479
 msgctxt "EventStringifier|"
 msgid "You are no longer marked as being away"
 msgstr "Niste več označeni kot odsotni"
@@ -4275,231 +4366,232 @@ msgctxt "EventStringifier|"
 msgid "You have been marked as being away"
 msgstr "Sedaj ste označeni kot odsotni"
 
-#: ../src/core/eventstringifier.cpp:508
+#: ../src/core/eventstringifier.cpp:507
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 je %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:524
+#: ../src/core/eventstringifier.cpp:522
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is online via %2 (%3)"
 msgstr "[Whois] %1 je povezan prek %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:526
+#: ../src/core/eventstringifier.cpp:524
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was online via %2 (%3)"
 msgstr "[Whowas] %1 je bil povezan prek %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:536
+#: ../src/core/eventstringifier.cpp:533
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was %2@%3 (%4)"
 msgstr "[Whowas] %1 je bil %2@%3 (%4)"
 
-#: ../src/core/eventstringifier.cpp:545
+#: ../src/core/eventstringifier.cpp:541
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] Konec seznama /WHO za %1"
 
-#: ../src/core/eventstringifier.cpp:566
+#: ../src/core/eventstringifier.cpp:563
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is logged in since %2"
 msgstr "[Whois] %1 je prijavljen od %2"
 
-#: ../src/core/eventstringifier.cpp:570
+#: ../src/core/eventstringifier.cpp:568
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is idling for %2 (since %3)"
 msgstr "[Whois] %1 je nedejaven od %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:580
+#: ../src/core/eventstringifier.cpp:576
 msgctxt "EventStringifier|"
 msgid "[Whois] End of /WHOIS list"
 msgstr "[Whois] Konec seznama /WHOIS"
 
-#: ../src/core/eventstringifier.cpp:603
+#: ../src/core/eventstringifier.cpp:598
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr "[Whois] %1 je uporabnik na kanalih: %2"
 
-#: ../src/core/eventstringifier.cpp:605
+#: ../src/core/eventstringifier.cpp:600
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr "[Whois] %1 ima glas na kanalih: %2"
 
-#: ../src/core/eventstringifier.cpp:607
+#: ../src/core/eventstringifier.cpp:602
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr "[Whois] %1 je operater na kanalih: %2"
 
-#: ../src/core/eventstringifier.cpp:631
+#: ../src/core/eventstringifier.cpp:625
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 has %2 users. Topic is: \"%3\""
 msgstr "Kanal %1 ima %2 uporabnikov. Tema je: %3"
 
-#: ../src/core/eventstringifier.cpp:639
+#: ../src/core/eventstringifier.cpp:631
 msgctxt "EventStringifier|"
 msgid "End of channel list"
 msgstr "Konec seznama kanalov"
 
-#: ../src/core/eventstringifier.cpp:657
+#: ../src/core/eventstringifier.cpp:647
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Homepage for %1 is %2"
 msgstr "Domača stran za %1 je %2"
 
-#: ../src/core/eventstringifier.cpp:683
+#: ../src/core/eventstringifier.cpp:672
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 created on %2"
 msgstr "Kanal %1 je bil ustvarjen %2"
 
-#: ../src/core/eventstringifier.cpp:697
+#: ../src/core/eventstringifier.cpp:683
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is authed as %2"
 msgstr "[Whois] %1 je pooblaščen kot %2"
 
-#: ../src/core/eventstringifier.cpp:700
+#: ../src/core/eventstringifier.cpp:686
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was authed as %2"
 msgstr "[Whowas] %1 je bil pooblaščen kot %2"
 
-#: ../src/core/eventstringifier.cpp:709
+#: ../src/core/eventstringifier.cpp:694
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "No topic is set for %1."
 msgstr "Za %1 ni nastavljene nobene teme."
 
-#: ../src/core/eventstringifier.cpp:717
+#: ../src/core/eventstringifier.cpp:701
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic for %1 is \"%2\""
 msgstr "Tema za %1 je »%2«"
 
-#: ../src/core/eventstringifier.cpp:738
+#: ../src/core/eventstringifier.cpp:722
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic set by %1 on %2"
 msgstr "Temo za %2 je nastavil %1"
 
-#: ../src/core/eventstringifier.cpp:751
+#: ../src/core/eventstringifier.cpp:734
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has been invited to %2"
 msgstr "%1 je bil povabljen v %2"
 
-#: ../src/core/eventstringifier.cpp:759
+#: ../src/core/eventstringifier.cpp:741
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
-#: ../src/core/eventstringifier.cpp:769
+#: ../src/core/eventstringifier.cpp:750
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[WhoX] %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:776
+#: ../src/core/eventstringifier.cpp:756
 msgctxt "EventStringifier|"
 msgid "End of /WHOWAS"
 msgstr "Konec /WHOWAS"
 
-#: ../src/core/eventstringifier.cpp:786
+#: ../src/core/eventstringifier.cpp:765
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick %1 contains illegal characters"
 msgstr "Vzdevek %1 vsebuje neveljavne znake"
 
-#: ../src/core/eventstringifier.cpp:796
+#: ../src/core/eventstringifier.cpp:774
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick already in use: %1"
 msgstr "Vzdevek je že v uporabi: %1"
 
-#: ../src/core/eventstringifier.cpp:806
+#: ../src/core/eventstringifier.cpp:783
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr "Vzdevek ali kanal začasno ni dosegljiv: %1"
 
-#: ../src/core/eventstringifier.cpp:830
+#: ../src/core/eventstringifier.cpp:812
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "sending CTCP-%1 request to %2"
 msgstr "pošiljanje zahteve CTCP-%1 na %2"
 
-#: ../src/core/eventstringifier.cpp:846
+#. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
+#: ../src/core/eventstringifier.cpp:829
 msgctxt "EventStringifier|"
 msgid "unknown"
 msgstr "neznano"
 
-#: ../src/core/eventstringifier.cpp:847
+#: ../src/core/eventstringifier.cpp:830
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received %1CTCP-%2 request by %3"
 msgstr "Prejeta zahteva %1CTCP-%2 od %3"
 
-#: ../src/core/eventstringifier.cpp:850
+#: ../src/core/eventstringifier.cpp:835
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-%1 answer from %2: %3"
 msgstr "Prejet odgovor CTCP-%1 od %2: %3"
 
-#: ../src/core/eventstringifier.cpp:865
+#: ../src/core/eventstringifier.cpp:858
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time"
 msgstr "Prejet odgovor CTCP-PING od %1 z zamikom %2 milisekund"
 
-#: ../src/client/execwrapper.cpp:49
+#: ../src/client/execwrapper.cpp:58
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Invalid command string for /exec: %1"
 msgstr "Neveljaven ukazni niz za /exec: %1"
 
-#: ../src/client/execwrapper.cpp:58
+#: ../src/client/execwrapper.cpp:68
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
 msgstr "Ime »%1« ni veljavno: ../ in ..\\ nista dovoljena!"
 
-#: ../src/client/execwrapper.cpp:69
+#: ../src/client/execwrapper.cpp:79
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Could not find script \"%1\""
 msgstr "Ni bilo mogoče najti skripta »%1«"
 
-#: ../src/client/execwrapper.cpp:93
+#: ../src/client/execwrapper.cpp:100
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" crashed with exit code %2."
 msgstr "Skript »%1« se je sesul z izhodno kodo %2."
 
-#: ../src/client/execwrapper.cpp:111
+#: ../src/client/execwrapper.cpp:117
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" could not start."
 msgstr "Skript »%1« se ni mogel zagnati."
 
-#: ../src/client/execwrapper.cpp:113
+#: ../src/client/execwrapper.cpp:119
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" caused error %2."
 msgstr "Skript »%1« je povzročil napako %2."
 
-#: ../src/uisupport/fontselector.cpp:32
+#: ../src/uisupport/fontselector.cpp:33
 msgctxt "FontSelector|"
 msgid "Choose..."
 msgstr "Izberite ..."
@@ -4509,112 +4601,106 @@ msgctxt "HighlightSettingsPage|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../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 "Poudarjanje po meri"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:33
+#: ../src/qtui/settingspages/highlightsettingspage.ui:64
 msgctxt "HighlightSettingsPage|"
 msgid "Enabled"
 msgstr "Omogočeno"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:38
+#: ../src/qtui/settingspages/highlightsettingspage.ui:69
 msgctxt "HighlightSettingsPage|"
 msgid "Highlight"
 msgstr "Poudarek"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:43
+#: ../src/qtui/settingspages/highlightsettingspage.ui:74
 msgctxt "HighlightSettingsPage|"
 msgid "RegEx"
 msgstr "Reg. izr."
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:48
+#: ../src/qtui/settingspages/highlightsettingspage.ui:79
 msgctxt "HighlightSettingsPage|"
 msgid "CS"
 msgstr "VČ"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:53
+#: ../src/qtui/settingspages/highlightsettingspage.ui:84
 msgctxt "HighlightSettingsPage|"
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:69
+#: ../src/qtui/settingspages/highlightsettingspage.ui:100
 msgctxt "HighlightSettingsPage|"
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:76
+#: ../src/qtui/settingspages/highlightsettingspage.ui:107
 msgctxt "HighlightSettingsPage|"
 msgid "Remove"
 msgstr "Odstrani"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:101
+#: ../src/qtui/settingspages/highlightsettingspage.ui:132
 msgctxt "HighlightSettingsPage|"
 msgid "Highlight Nicks"
 msgstr "Poudari vzdevke"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:107
+#: ../src/qtui/settingspages/highlightsettingspage.ui:138
 msgctxt "HighlightSettingsPage|"
 msgid "All nicks from identity"
 msgstr "Vse vzdevke iz istovetnosti"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:114
+#: ../src/qtui/settingspages/highlightsettingspage.ui:145
 msgctxt "HighlightSettingsPage|"
 msgid "Current nick"
 msgstr "Trenutni vzdevek"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:124
+#: ../src/qtui/settingspages/highlightsettingspage.ui:155
 msgctxt "HighlightSettingsPage|"
 msgid "None"
 msgstr "Nobenega"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:131
+#: ../src/qtui/settingspages/highlightsettingspage.ui:162
 msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr "Ločevanje velikosti črk"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:156
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:107
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:310
-msgctxt "HighlightSettingsPage|"
-msgid "Local Highlights apply to this device only"
-msgstr ""
-
-#: ../src/qtui/settingspages/highlightsettingspage.ui:163
-msgctxt "HighlightSettingsPage|"
-msgid "Details..."
-msgstr ""
-
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:33
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:34
 msgctxt "HighlightSettingsPage|"
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../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:45
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:170
+#: ../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:50
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:171
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:45
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:144
 msgctxt "HighlightSettingsPage|"
 msgid "Phrase to match"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:55
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:173
+#: ../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 "
@@ -4622,16 +4708,16 @@ msgid ""
 "as keywords."
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:61
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:176
+#: ../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:67
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:179
+#: ../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,79 +4730,76 @@ msgid ""
 "channel starting with <i>#quassel</i></p>"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:104
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:299
-msgctxt "HighlightSettingsPage|"
-msgid "Legacy Highlights are replaced by Highlights"
-msgstr ""
-
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:269
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:234
 msgctxt "HighlightSettingsPage|"
 msgid "this shouldn't be empty"
 msgstr "to ne sme biti prazno"
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:297
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:258
 msgctxt "HighlightSettingsPage|"
 msgid "Legacy Highlights vs. Highlights"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:300
+#: ../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:302
+#: ../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:303
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:264
 msgctxt "HighlightSettingsPage|"
 msgid "Highlights"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:308
+#: ../src/qtui/settingspages/highlightsettingspage.h:47
 msgctxt "HighlightSettingsPage|"
-msgid "Local Highlights vs. Remote Highlights"
-msgstr ""
-
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:311
-msgctxt "HighlightSettingsPage|"
-msgid "Highlights configured on this page only apply to your current device."
-msgstr ""
+msgid "highlight rule"
+msgstr "pravilo poudarjanja"
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:313
+#: ../src/core/identserver.cpp:46
 #, qt-format
-msgctxt "HighlightSettingsPage|"
-msgid "Configure highlights for all of your devices in <i>%1</i>."
-msgstr ""
+msgctxt "IdentServer|"
+msgid "Invalid listen address %1"
+msgstr "Neveljaven naslov za poslušanje (%1)"
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:314
-msgctxt "HighlightSettingsPage|"
-msgid "Remote Highlights"
+#: ../src/core/identserver.cpp:55
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd requests on IPv6 %1 port %2"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.h:46
-msgctxt "HighlightSettingsPage|"
-msgid "highlight rule"
-msgstr "pravilo poudarjanja"
+#: ../src/core/identserver.cpp:63
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Could not open IPv6 interface %1:%2: %3"
+msgstr "Ni mogoče odpreti vmesnika IPv6 %1:%2: %3"
 
-#: ../src/core/identserver.cpp:42
+#: ../src/core/identserver.cpp:71
 #, qt-format
 msgctxt "IdentServer|"
-msgid "Listening for identd clients on IPv6 %1 port %2"
+msgid "Listening for identd requests on IPv4 %1 port %2"
 msgstr ""
 
-#: ../src/core/identserver.cpp:52
+#: ../src/core/identserver.cpp:81
 #, qt-format
 msgctxt "IdentServer|"
-msgid "Listening for identd clients on IPv4 %1 port %2"
-msgstr ""
+msgid "Could not open IPv4 interface %1:%2: %3"
+msgstr "Ni mogoče odpreti vmesnika IPv4 %1:%2: %3"
+
+#: ../src/core/identserver.cpp:89
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Invalid listen address %1, unknown network protocol"
+msgstr "Neveljaven naslov za poslušanje (%1), neznan omrežni protokol"
 
-#: ../src/core/identserver.cpp:61
+#: ../src/core/identserver.cpp:98
 msgctxt "IdentServer|"
 msgid ""
 "Identd could not open any network interfaces to listen on! No identd "
@@ -4724,7 +4807,7 @@ msgid ""
 msgstr ""
 
 #: ../src/qtui/settingspages/identitiessettingspage.ui:31
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:370
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:352
 msgctxt "IdentitiesSettingsPage|"
 msgid "Rename Identity"
 msgstr "Preimenuj istovetnost"
@@ -4750,101 +4833,101 @@ msgctxt "IdentitiesSettingsPage|"
 msgid "Remove Identity"
 msgstr "Odstrani istovetnost"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:33
 msgctxt "IdentitiesSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:33
 msgctxt "IdentitiesSettingsPage|"
 msgid "Identities"
 msgstr "Istovetnosti"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:205
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:192
 msgctxt "IdentitiesSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"
 msgstr "<b>Preden se uveljavijo spremembe, je potrebno odpraviti naslednje težave:</b><ul>"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:206
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:194
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>All identities need an identity name set</li>"
 msgstr "<li>Vse istovetnosti morajo imeti nastavljeno ime</li>"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:207
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:196
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>Every identity needs at least one nickname defined</li>"
 msgstr "<li>Vsaka istovetnost mora imeti določen vsaj en vzdevek</li>"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:208
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:198
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify a real name for every identity</li>"
 msgstr "<li>Za vsako istovetnost morate podati pravo ime</li>"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:209
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:200
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr "<li>Za vsako istovetnost morate podati ident</li>"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:210
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:201
 msgctxt "IdentitiesSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:211
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:202
 msgctxt "IdentitiesSettingsPage|"
 msgid "One or more identities are invalid"
 msgstr "Vsaj ena istovetnost ni veljavna"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:356
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:335
 msgctxt "IdentitiesSettingsPage|"
 msgid "Delete Identity?"
 msgstr "Izbrišem istovetnost?"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:357
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:336
 #, qt-format
 msgctxt "IdentitiesSettingsPage|"
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr "Ali resnično želite zbrisati istovetnost »%1«?"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:371
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:353
 #, qt-format
 msgctxt "IdentitiesSettingsPage|"
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr "Vnesite novo ime istovetnosti »%1«!"
 
-#: ../src/common/identity.cpp:147
+#: ../src/common/identity.cpp:141
 msgctxt "Identity|"
 msgid "Quassel IRC User"
 msgstr "Uporabnik Quassel IRC"
 
-#: ../src/common/identity.cpp:177
+#: ../src/common/identity.cpp:170
 msgctxt "Identity|"
 msgid "<empty>"
 msgstr "<prazno>"
 
-#: ../src/common/identity.cpp:183
+#: ../src/common/identity.cpp:176
 msgctxt "Identity|"
 msgid "Gone fishing."
 msgstr "Odšel sem ribarit."
 
-#: ../src/common/identity.cpp:187
+#: ../src/common/identity.cpp:180
 msgctxt "Identity|"
 msgid "Not here. No, really. not here!"
 msgstr "Ni me tu. Ne, res, ni me tu!"
 
-#: ../src/common/identity.cpp:190
+#: ../src/common/identity.cpp:183
 msgctxt "Identity|"
 msgid "All Quassel clients vanished from the face of the earth..."
 msgstr "Vsi odjemalci Quassel so izginili z obličja Zemlje ..."
 
-#: ../src/common/identity.cpp:193
+#: ../src/common/identity.cpp:186
 msgctxt "Identity|"
 msgid "Kindergarten is elsewhere!"
 msgstr "Otroški vrtec je drugje!"
 
-#: ../src/common/identity.cpp:194 ../src/common/identity.cpp:195
+#: ../src/common/identity.cpp:187 ../src/common/identity.cpp:188
 msgctxt "Identity|"
 msgid "https://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr ""
@@ -4978,7 +5061,7 @@ msgid "minutes of being idle"
 msgstr "minutah nedejavnosti"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:399
-#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+#: ../src/qtui/settingspages/identityeditwidget.cpp:277
 msgctxt "IdentityEditWidget|"
 msgid "Advanced"
 msgstr "Napredno"
@@ -5044,15 +5127,15 @@ msgid "Key Type:"
 msgstr "Vrsta ključa:"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:605
-#: ../src/qtui/settingspages/identityeditwidget.cpp:425
+#: ../src/qtui/settingspages/identityeditwidget.cpp:396
 msgctxt "IdentityEditWidget|"
 msgid "No Key loaded"
 msgstr "Naložen ni noben ključ"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:625
 #: ../src/qtui/settingspages/identityeditwidget.ui:723
-#: ../src/qtui/settingspages/identityeditwidget.cpp:426
-#: ../src/qtui/settingspages/identityeditwidget.cpp:489
+#: ../src/qtui/settingspages/identityeditwidget.cpp:397
+#: ../src/qtui/settingspages/identityeditwidget.cpp:451
 msgctxt "IdentityEditWidget|"
 msgid "Load"
 msgstr "Naloži"
@@ -5069,8 +5152,8 @@ msgstr "Organizacija:"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:663
 #: ../src/qtui/settingspages/identityeditwidget.ui:697
-#: ../src/qtui/settingspages/identityeditwidget.cpp:487
-#: ../src/qtui/settingspages/identityeditwidget.cpp:488
+#: ../src/qtui/settingspages/identityeditwidget.cpp:449
+#: ../src/qtui/settingspages/identityeditwidget.cpp:450
 msgctxt "IdentityEditWidget|"
 msgid "No Certificate loaded"
 msgstr "Naloženo ni nobeno potrdilo"
@@ -5080,7 +5163,7 @@ msgctxt "IdentityEditWidget|"
 msgid "CommonName:"
 msgstr "Skupno ime:"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:107
+#: ../src/qtui/settingspages/identityeditwidget.cpp:101
 msgctxt "IdentityEditWidget|"
 msgid ""
 "You can add date/time to this message using the syntax: <br/>%%<span "
@@ -5088,119 +5171,119 @@ msgid ""
 "class='italic'>&lt;format&gt;</span> is:"
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:112
+#: ../src/qtui/settingspages/identityeditwidget.cpp:107
 msgctxt "IdentityEditWidget|"
 msgid "the hour"
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:113
+#: ../src/qtui/settingspages/identityeditwidget.cpp:108
 msgctxt "IdentityEditWidget|"
 msgid "the minutes"
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:114
+#: ../src/qtui/settingspages/identityeditwidget.cpp:109
 msgctxt "IdentityEditWidget|"
 msgid "seconds"
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:115
+#: ../src/qtui/settingspages/identityeditwidget.cpp:110
 msgctxt "IdentityEditWidget|"
 msgid "AM/PM"
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:116
+#: ../src/qtui/settingspages/identityeditwidget.cpp:111
 msgctxt "IdentityEditWidget|"
 msgid "day"
 msgstr "dni"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:117
+#: ../src/qtui/settingspages/identityeditwidget.cpp:112
 msgctxt "IdentityEditWidget|"
 msgid "month"
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:121
+#: ../src/qtui/settingspages/identityeditwidget.cpp:113
 msgctxt "IdentityEditWidget|"
 msgid "current timezone"
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:124
+#: ../src/qtui/settingspages/identityeditwidget.cpp:115
 msgctxt "IdentityEditWidget|"
 msgid "Example: Away since %%hh:mm%% on %%dd.MM%%."
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:125
+#: ../src/qtui/settingspages/identityeditwidget.cpp:117
 msgctxt "IdentityEditWidget|"
 msgid ""
 "%%%% without anything inside represents %%.  Other format codes are "
 "available."
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:373
+#: ../src/qtui/settingspages/identityeditwidget.cpp:355
 msgctxt "IdentityEditWidget|"
 msgid "Load a Key"
 msgstr "Naloži ključ"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:410
+#: ../src/qtui/settingspages/identityeditwidget.cpp:380
 msgctxt "IdentityEditWidget|"
 msgid "Failed to read key"
 msgstr "Ključa ni bilo mogoče prebrati"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:410
+#: ../src/qtui/settingspages/identityeditwidget.cpp:381
 msgctxt "IdentityEditWidget|"
 msgid ""
 "Failed to read the key file. It is either incompatible or invalid. Note that"
 " the key file must not have a passphrase."
 msgstr "Datoteke ključa ni bilo mogoče prebrati, saj je ali nezdružljiva ali pa neveljavna. Zapomnite si, da datoteka s ključem ne sme imeti šifrirne fraze."
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:414
+#: ../src/qtui/settingspages/identityeditwidget.cpp:386
 msgctxt "IdentityEditWidget|"
 msgid "Core does not support ECDSA keys"
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:414
+#: ../src/qtui/settingspages/identityeditwidget.cpp:387
 msgctxt "IdentityEditWidget|"
 msgid ""
 "You loaded an ECDSA key, but the core does not support ECDSA keys. Please "
 "contact the core administrator."
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:431
+#: ../src/qtui/settingspages/identityeditwidget.cpp:402
 msgctxt "IdentityEditWidget|"
 msgid "RSA"
 msgstr "RSA"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:435
+#: ../src/qtui/settingspages/identityeditwidget.cpp:405
 msgctxt "IdentityEditWidget|"
 msgid "ECDSA"
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:439
+#: ../src/qtui/settingspages/identityeditwidget.cpp:408
 msgctxt "IdentityEditWidget|"
 msgid "DSA"
 msgstr "DSA"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:442
+#: ../src/qtui/settingspages/identityeditwidget.cpp:411
 msgctxt "IdentityEditWidget|"
 msgid "Invalid key or no key loaded"
 msgstr ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:444
-#: ../src/qtui/settingspages/identityeditwidget.cpp:499
+#: ../src/qtui/settingspages/identityeditwidget.cpp:413
+#: ../src/qtui/settingspages/identityeditwidget.cpp:456
 msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr "Počisti"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:456
+#: ../src/qtui/settingspages/identityeditwidget.cpp:425
 msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr "Naloži potrdilo"
 
-#: ../src/qtui/ircconnectionwizard.cpp:116
+#: ../src/qtui/ircconnectionwizard.cpp:110
 msgctxt "IdentityPage|"
 msgid "Setup Identity"
 msgstr "Nastavitev istovetnosti"
 
-#: ../src/qtui/ircconnectionwizard.cpp:121
+#: ../src/qtui/ircconnectionwizard.cpp:115
 msgctxt "IdentityPage|"
 msgid "Default Identity"
 msgstr "Privzeta istovetnost"
@@ -5370,14 +5453,14 @@ msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr "Pravilo je omogočeno"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:71
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:68
 msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
 "dynamic rules, disabling actually shows the filtered messages again"
 msgstr "<b>Omogoči/onemogoči:</b><br />Filtrirajo samo omogočena pravila.<br />Onemogočenje dinamičnega pravila spet prikaže filtrirana sporočila."
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:75
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:72
 msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "
@@ -5390,27 +5473,27 @@ msgid ""
 "host<br />"
 msgstr "<b>Pravilo preziranja:</b><br />Glede na vrsto pravila se besedilo nanaša na:<br /><br />- <u>vsebino sporočila:</u><br /><i>Primer:<i><br />»*foobar*« se ujema s katerimkoli besedilom, ki vsebuje besedo »foobar«<br /><br />- <u>niz pošiljatelja <i>vzdevek!ident@ime.gostitelja</i></u><br /><i>Primera:</i><br />»*@foobar.si« se ujema s katerimkoli pošiljateljem z gostitelja foobar.si<br />»baraba!.+« (regularni izraz) se ujema s katerimkoli pošiljateljem z vzdevkom baraba s kateregakoli gostitelja<br />"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:88
 msgctxt "IgnoreListModel|"
 msgid "By Sender"
 msgstr "Po pošiljatelju"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:93
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:90
 msgctxt "IgnoreListModel|"
 msgid "By Message"
 msgstr "Po sporočilu"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:211
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:199
 msgctxt "IgnoreListModel|"
 msgid "Enabled"
 msgstr "Omogočeno"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:212
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:199
 msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:213
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:199
 msgctxt "IgnoreListModel|"
 msgid "Ignore Rule"
 msgstr "Pravilo preziranja"
@@ -5445,12 +5528,12 @@ msgctxt "IgnoreListSettingsPage|"
 msgid "Ignore List"
 msgstr "Seznam prezrtih"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:147
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:139
 msgctxt "IgnoreListSettingsPage|"
 msgid "Rule already exists"
 msgstr "Pravilo že obstaja"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:148
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:140
 #, qt-format
 msgctxt "IgnoreListSettingsPage|"
 msgid ""
@@ -5459,159 +5542,147 @@ msgid ""
 "Please choose another rule."
 msgstr "Pravilo že obstaja: »%1«\nIzberite drugo pravilo."
 
-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
-msgctxt "IndicatorNotificationConfigWidget|"
-msgid "Form"
-msgstr "Obrazec"
-
-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
-msgctxt "IndicatorNotificationConfigWidget|"
-msgid ""
-"This enables support for the Ayatana Project's application indicator "
-"(libindicate)."
-msgstr "To omogoči podporo za programski kazalnik projekta Ayatana (libindicate)."
-
-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
-msgctxt "IndicatorNotificationConfigWidget|"
-msgid "Show messages in application indicator"
-msgstr "Pokaži sporočila v programskem kazalniku"
-
-#: ../src/qtui/ui/inputwidget.ui:26
+#: ../src/qtui/inputwidget.ui:26
 msgctxt "InputWidget|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/inputwidget.ui:59
+#: ../src/qtui/inputwidget.ui:89
 msgctxt "InputWidget|"
 msgid "View and change nick"
 msgstr ""
 
-#: ../src/qtui/ui/inputwidget.ui:139
+#: ../src/qtui/inputwidget.ui:175
 msgctxt "InputWidget|"
 msgid "Bold"
 msgstr ""
 
-#: ../src/qtui/ui/inputwidget.ui:179
+#: ../src/qtui/inputwidget.ui:215
 msgctxt "InputWidget|"
 msgid "Italic"
 msgstr ""
 
-#: ../src/qtui/ui/inputwidget.ui:222
+#: ../src/qtui/inputwidget.ui:258
 msgctxt "InputWidget|"
 msgid "Underline"
 msgstr ""
 
-#: ../src/qtui/ui/inputwidget.ui:262
+#: ../src/qtui/inputwidget.ui:301
+msgctxt "InputWidget|"
+msgid "Strikethrough"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:341
 msgctxt "InputWidget|"
 msgid "Set foreground color"
 msgstr ""
 
-#: ../src/qtui/ui/inputwidget.ui:293
+#: ../src/qtui/inputwidget.ui:372
 msgctxt "InputWidget|"
 msgid "Set background color"
 msgstr ""
 
-#: ../src/qtui/ui/inputwidget.ui:327
+#: ../src/qtui/inputwidget.ui:406
 msgctxt "InputWidget|"
 msgid "Clear formatting"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:77
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "White"
 msgstr "Bela"
 
-#: ../src/qtui/inputwidget.cpp:77
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Black"
 msgstr "Črna"
 
-#: ../src/qtui/inputwidget.cpp:77
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr "Temno modra"
 
-#: ../src/qtui/inputwidget.cpp:77
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr "Temno zelena"
 
-#: ../src/qtui/inputwidget.cpp:77
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Red"
 msgstr "Rdeča"
 
-#: ../src/qtui/inputwidget.cpp:77
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr "Temno rdeča"
 
-#: ../src/qtui/inputwidget.cpp:77
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr "Temno Å¡krlatna"
 
-#: ../src/qtui/inputwidget.cpp:77
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Orange"
 msgstr "Oranžna"
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr "Rumena"
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Green"
 msgstr "Zelena"
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr "Temno sinja"
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr "Sinja"
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Blue"
 msgstr "Modra"
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr "Å krlatna"
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr "Temno siva"
 
-#: ../src/qtui/inputwidget.cpp:78
+#: ../src/qtui/inputwidget.cpp:81
 msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr "Svetlo siva"
 
-#: ../src/qtui/inputwidget.cpp:88 ../src/qtui/inputwidget.cpp:89
+#: ../src/qtui/inputwidget.cpp:91 ../src/qtui/inputwidget.cpp:92
 msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr "Počisti barvo"
 
-#: ../src/qtui/inputwidget.cpp:149
+#: ../src/qtui/inputwidget.cpp:134
 msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr "Postavi vnosno vrstico v žarišče"
 
-#: ../src/qtui/inputwidget.cpp:636
+#: ../src/qtui/inputwidget.cpp:603
 msgctxt "InputWidget|"
 msgid "Hide formatting options"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:639
+#: ../src/qtui/inputwidget.cpp:607
 msgctxt "InputWidget|"
 msgid "Show formatting options"
 msgstr ""
@@ -5711,117 +5782,117 @@ msgctxt "InputWidgetSettingsPage|"
 msgid "Input Widget"
 msgstr "Vnosni gradnik"
 
-#: ../src/common/internalpeer.cpp:52 ../src/common/internalpeer.cpp:58
+#: ../src/common/internalpeer.cpp:52 ../src/common/internalpeer.cpp:57
 msgctxt "InternalPeer|"
 msgid "internal connection"
 msgstr "notranja povezava"
 
-#: ../src/qtui/ircconnectionwizard.cpp:50
+#: ../src/qtui/ircconnectionwizard.cpp:47
 msgctxt "IrcConnectionWizard|"
 msgid "Save && Connect"
 msgstr "Shrani in poveži"
 
-#: ../src/client/irclistmodel.cpp:65
+#: ../src/client/irclistmodel.cpp:61
 msgctxt "IrcListModel|"
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../src/client/irclistmodel.cpp:66
+#: ../src/client/irclistmodel.cpp:61
 msgctxt "IrcListModel|"
 msgid "Users"
 msgstr "Uporabniki"
 
-#: ../src/client/irclistmodel.cpp:67
+#: ../src/client/irclistmodel.cpp:61
 msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr "Tema"
 
-#: ../src/core/ircparser.cpp:369
+#: ../src/core/ircparser.cpp:452
 msgctxt "IrcParser|"
 msgid "Capability negotiation not supported"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1187
+#: ../src/client/networkmodel.cpp:1100
 msgctxt "IrcUserItem|"
 msgid "Modes"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1191
+#: ../src/client/networkmodel.cpp:1102
 msgctxt "IrcUserItem|"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1197
+#: ../src/client/networkmodel.cpp:1108
 msgctxt "IrcUserItem|"
 msgid "Away message"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1199
+#: ../src/client/networkmodel.cpp:1110
 msgctxt "IrcUserItem|"
 msgid "Realname"
 msgstr "Pravo ime"
 
-#: ../src/client/networkmodel.cpp:1206
+#: ../src/client/networkmodel.cpp:1115
 msgctxt "IrcUserItem|"
 msgid "Help status"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1207
+#: ../src/client/networkmodel.cpp:1115
 msgctxt "IrcUserItem|"
 msgid "Available for help"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1210
+#: ../src/client/networkmodel.cpp:1118
 msgctxt "IrcUserItem|"
 msgid "Service status"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1220
+#: ../src/client/networkmodel.cpp:1128
 msgctxt "IrcUserItem|"
 msgid "Not logged in"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1226 ../src/client/networkmodel.cpp:1235
+#: ../src/client/networkmodel.cpp:1134 ../src/client/networkmodel.cpp:1141
 msgctxt "IrcUserItem|"
 msgid "Account"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1236
+#: ../src/client/networkmodel.cpp:1141
 msgctxt "IrcUserItem|"
 msgid "Identified for this nick"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1242
+#: ../src/client/networkmodel.cpp:1147
 msgctxt "IrcUserItem|"
 msgid "Service Reply"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1246
+#: ../src/client/networkmodel.cpp:1151
 msgctxt "IrcUserItem|"
 msgid "Hostmask"
 msgstr "Maska gostitelja"
 
-#: ../src/client/networkmodel.cpp:1250
+#: ../src/client/networkmodel.cpp:1155
 msgctxt "IrcUserItem|"
 msgid "Operator"
 msgstr "Operater"
 
-#: ../src/client/networkmodel.cpp:1258
+#: ../src/client/networkmodel.cpp:1163
 msgctxt "IrcUserItem|"
 msgid "Idling since"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1262
+#: ../src/client/networkmodel.cpp:1167
 msgctxt "IrcUserItem|"
 msgid "Login time"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1265
+#: ../src/client/networkmodel.cpp:1170
 msgctxt "IrcUserItem|"
 msgid "Server"
 msgstr "Strežnik"
 
-#: ../src/client/networkmodel.cpp:1270
+#: ../src/client/networkmodel.cpp:1175
 msgctxt "IrcUserItem|"
 msgid "No information available"
 msgstr ""
@@ -5912,12 +5983,12 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr "Odsoten:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:30
 msgctxt "ItemViewSettingsPage|"
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:30
 msgctxt "ItemViewSettingsPage|"
 msgid "Chat & Nick Lists"
 msgstr "Seznama klepetov in vzdevkov"
@@ -5952,7 +6023,13 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Other activity"
 msgstr "Druga dejavnost"
 
-#: ../src/qtui/knotificationbackend.cpp:137
+#: ../src/qtui/knotificationbackend.cpp:78
+#: ../src/qtui/knotificationbackend.cpp:80
+msgctxt "KNotificationBackend|"
+msgid "View"
+msgstr ""
+
+#: ../src/qtui/knotificationbackend.cpp:138
 #, qt-format
 msgctxt "KNotificationBackend|"
 msgid "%n pending highlight(s)"
@@ -5962,61 +6039,61 @@ msgstr[1] "%n čakajoča poudarka"
 msgstr[2] "%n čakajoči poudarki"
 msgstr[3] "%n čakajočih poudarkov"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:80
+#: ../src/qtui/settingspages/keysequencewidget.cpp:76
 msgctxt "KeySequenceButton|"
 msgid "The key you just pressed is not supported by Qt."
 msgstr "Qt ne podpira tipke, ki ste jo ravnokar pritisnili."
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:81
+#: ../src/qtui/settingspages/keysequencewidget.cpp:76
 msgctxt "KeySequenceButton|"
 msgid "Unsupported Key"
 msgstr "Nepodprta tipka"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:176
+#: ../src/qtui/settingspages/keysequencewidget.cpp:166
 msgctxt "KeySequenceWidget|"
 msgid ""
 "Click on the button, then enter the shortcut like you would in the program.\n"
 "Example for Ctrl+a: hold the Ctrl key and press a."
 msgstr "Kliknite gumb in nato vnesite bližnjico, kot bi jo v programu.\nPrimer za Ctrl+A: držite pritisnjeno tipko Ctrl in pritisnite tipko A."
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:274
+#: ../src/qtui/settingspages/keysequencewidget.cpp:266
 msgctxt "KeySequenceWidget|Meta key"
 msgid "Meta"
 msgstr "Meta"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:275
+#: ../src/qtui/settingspages/keysequencewidget.cpp:268
 msgctxt "KeySequenceWidget|Ctrl key"
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:276
+#: ../src/qtui/settingspages/keysequencewidget.cpp:270
 msgctxt "KeySequenceWidget|Alt key"
 msgid "Alt"
 msgstr "Alt"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:277
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
 msgctxt "KeySequenceWidget|Shift key"
 msgid "Shift"
 msgstr "Shift"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:281
+#: ../src/qtui/settingspages/keysequencewidget.cpp:276
 msgctxt ""
 "KeySequenceWidget|What the user inputs now will be taken as the new shortcut"
 msgid "Input"
 msgstr "Vnos"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:288
+#: ../src/qtui/settingspages/keysequencewidget.cpp:283
 msgctxt "KeySequenceWidget|No shortcut defined"
 msgid "None"
 msgstr "Nobenega"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:383
-#: ../src/qtui/settingspages/keysequencewidget.cpp:389
+#: ../src/qtui/settingspages/keysequencewidget.cpp:373
+#: ../src/qtui/settingspages/keysequencewidget.cpp:381
 msgctxt "KeySequenceWidget|"
 msgid "Shortcut Conflict"
 msgstr "Spor med bližnjicami"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:384
+#: ../src/qtui/settingspages/keysequencewidget.cpp:374
 #, qt-format
 msgctxt "KeySequenceWidget|"
 msgid ""
@@ -6024,589 +6101,599 @@ msgid ""
 "Please choose another one."
 msgstr "Bližnjica »%1« je že v uporabi in je ni mogoče nastaviti.\nIzberite drugo."
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:390
+#: ../src/qtui/settingspages/keysequencewidget.cpp:382
 #, qt-format
 msgctxt "KeySequenceWidget|"
 msgid ""
 "The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
 msgstr "Bližnjica »%1« je dvoumna, saj je prav tako bližnjica za naslednje dejanje:"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:392
+#: ../src/qtui/settingspages/keysequencewidget.cpp:383
 msgctxt "KeySequenceWidget|"
 msgid "Do you want to reassign this shortcut to the selected action?"
 msgstr "Ali želite prestaviti to bližnjico k izbranemu dejanju?"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:395
+#: ../src/qtui/settingspages/keysequencewidget.cpp:387
 msgctxt "KeySequenceWidget|"
 msgid "Reassign"
 msgstr "Prestavi"
 
-#: ../src/core/ldapauthenticator.cpp:77
+#: ../src/core/ldapauthenticator.cpp:71
 msgctxt "LdapAuthenticator|"
 msgid "LDAP"
 msgstr ""
 
-#: ../src/core/ldapauthenticator.cpp:83
+#: ../src/core/ldapauthenticator.cpp:76
 msgctxt "LdapAuthenticator|"
 msgid "Authenticate users using an LDAP server."
 msgstr ""
 
-#: ../src/core/ldapauthenticator.cpp:91
+#: ../src/core/ldapauthenticator.cpp:83
 msgctxt "LdapAuthenticator|"
 msgid "Hostname"
 msgstr ""
 
-#: ../src/core/ldapauthenticator.cpp:92
+#: ../src/core/ldapauthenticator.cpp:83
 msgctxt "LdapAuthenticator|"
 msgid "Port"
 msgstr ""
 
-#: ../src/core/ldapauthenticator.cpp:93
+#: ../src/core/ldapauthenticator.cpp:84
 msgctxt "LdapAuthenticator|"
 msgid "Bind DN"
 msgstr ""
 
-#: ../src/core/ldapauthenticator.cpp:94
+#: ../src/core/ldapauthenticator.cpp:84
 msgctxt "LdapAuthenticator|"
 msgid "Bind Password"
 msgstr ""
 
-#: ../src/core/ldapauthenticator.cpp:95
+#: ../src/core/ldapauthenticator.cpp:84
 msgctxt "LdapAuthenticator|"
 msgid "Base DN"
 msgstr ""
 
-#: ../src/core/ldapauthenticator.cpp:96
+#: ../src/core/ldapauthenticator.cpp:85
 msgctxt "LdapAuthenticator|"
 msgid "Filter"
 msgstr ""
 
-#: ../src/core/ldapauthenticator.cpp:97
+#: ../src/core/ldapauthenticator.cpp:85
 msgctxt "LdapAuthenticator|"
 msgid "UID Attribute"
 msgstr ""
 
-#: ../src/common/protocols/legacy/legacypeer.cpp:146
+#: ../src/common/protocols/legacy/legacypeer.cpp:142
 msgctxt "LegacyPeer|"
 msgid "Invalid handshake message!"
 msgstr "Neveljavno sporočilo rokovanja!"
 
-#: ../src/common/protocols/legacy/legacypeer.cpp:224
+#: ../src/common/protocols/legacy/legacypeer.cpp:225
 #, qt-format
 msgctxt "LegacyPeer|"
 msgid "Unknown protocol message of type %1"
 msgstr "Neznano sporočilo protokola vrste %1"
 
-#: ../src/common/logger.cpp:97
+#: ../src/common/logger.cpp:90
 #, qt-format
 msgctxt "Logger|"
 msgid "Invalid log level %1; supported are Debug|Info|Warning|Error"
 msgstr ""
 
-#: ../src/common/logger.cpp:106
+#: ../src/common/logger.cpp:98
 #, qt-format
 msgctxt "Logger|"
 msgid "Could not open log file \"%1\": %2"
 msgstr ""
 
-#: ../src/common/logger.cpp:111
+#: ../src/common/logger.cpp:103
 #, qt-format
 msgctxt "Logger|"
 msgid "Cannot write to stderr: %1"
 msgstr ""
 
-#: ../src/qtui/mainpage.cpp:42
+#: ../src/qtui/mainpage.cpp:43
 msgctxt "MainPage|"
 msgid "Connect to Core..."
 msgstr "Poveži se z jedrom ..."
 
-#: ../src/qtui/mainwin.cpp:401
+#: ../src/qtui/mainwin.cpp:357
 msgctxt "MainWin|"
 msgid "General"
 msgstr "Splošno"
 
-#: ../src/qtui/mainwin.cpp:403
+#: ../src/qtui/mainwin.cpp:361
 msgctxt "MainWin|"
 msgid "&Connect to Core..."
 msgstr "&Poveži se z jedrom ..."
 
-#: ../src/qtui/mainwin.cpp:405
+#: ../src/qtui/mainwin.cpp:363
 msgctxt "MainWin|"
 msgid "&Disconnect from Core"
 msgstr "P&rekini povezavo z jedrom"
 
-#: ../src/qtui/mainwin.cpp:407
+#: ../src/qtui/mainwin.cpp:364
 msgctxt "MainWin|"
 msgid "Change &Password..."
 msgstr "S&premeni geslo ..."
 
-#: ../src/qtui/mainwin.cpp:409
+#: ../src/qtui/mainwin.cpp:365
 msgctxt "MainWin|"
 msgid "Core &Info..."
 msgstr "Podatk&i o jedru ..."
 
-#: ../src/qtui/mainwin.cpp:411
+#: ../src/qtui/mainwin.cpp:367
 msgctxt "MainWin|"
 msgid "Configure &Networks..."
 msgstr "&Nastavi omrežja ..."
 
-#: ../src/qtui/mainwin.cpp:418
+#: ../src/qtui/mainwin.cpp:368
 msgctxt "MainWin|"
 msgid "&Quit"
 msgstr "Konča&j"
 
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:371
 msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
 msgstr "&Nastavi sezname klepetov ..."
 
-#: ../src/qtui/mainwin.cpp:425
-msgctxt "MainWin|"
-msgid "&Lock Layout"
-msgstr "Zak&leni razpored"
-
-#: ../src/qtui/mainwin.cpp:429
+#: ../src/qtui/mainwin.cpp:373
 msgctxt "MainWin|"
 msgid "Show &Search Bar"
 msgstr "Pokaži i&skalno vrstico"
 
-#: ../src/qtui/mainwin.cpp:431
+#: ../src/qtui/mainwin.cpp:374
 msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr "Pokaži dnevnik odsotnosti"
 
-#: ../src/qtui/mainwin.cpp:433
+#: ../src/qtui/mainwin.cpp:375
 msgctxt "MainWin|"
 msgid "Show &Menubar"
 msgstr "Pokaži &menijsko vrstico"
 
-#: ../src/qtui/mainwin.cpp:436
+#: ../src/qtui/mainwin.cpp:376
 msgctxt "MainWin|"
 msgid "Show Status &Bar"
 msgstr "Po&kaži vrstico stanja"
 
-#: ../src/qtui/mainwin.cpp:442
+#: ../src/qtui/mainwin.cpp:378
+msgctxt "MainWin|"
+msgid "&Lock Layout"
+msgstr "Zak&leni razpored"
+
+#: ../src/qtui/mainwin.cpp:390
 msgctxt "MainWin|"
 msgid "&Full Screen Mode"
 msgstr "&Celozaslonski način"
 
-#: ../src/qtui/mainwin.cpp:449
+#: ../src/qtui/mainwin.cpp:401
 msgctxt "MainWin|"
 msgid "Configure &Shortcuts..."
 msgstr "Na&stavi bližnjice ..."
 
-#: ../src/qtui/mainwin.cpp:455 ../src/qtui/mainwin.cpp:459
+#: ../src/qtui/mainwin.cpp:404
 msgctxt "MainWin|"
 msgid "&Configure Quassel..."
 msgstr "&Nastavi Quassel ..."
 
-#: ../src/qtui/mainwin.cpp:465
+#: ../src/qtui/mainwin.cpp:408
 msgctxt "MainWin|"
 msgid "&About Quassel"
 msgstr "&O programu Quassel"
 
-#: ../src/qtui/mainwin.cpp:470
+#: ../src/qtui/mainwin.cpp:410
 msgctxt "MainWin|"
 msgid "About &Qt"
 msgstr "O &Qt"
 
-#: ../src/qtui/mainwin.cpp:474
+#: ../src/qtui/mainwin.cpp:414
 msgctxt "MainWin|"
 msgid "Debug &NetworkModel"
 msgstr "Razhroščevanje &modela omrežja"
 
-#: ../src/qtui/mainwin.cpp:476
+#: ../src/qtui/mainwin.cpp:416
 msgctxt "MainWin|"
 msgid "Debug &BufferViewOverlay"
 msgstr "Razhroščevanje &BufferViewOverlay"
 
-#: ../src/qtui/mainwin.cpp:478
+#: ../src/qtui/mainwin.cpp:418
 msgctxt "MainWin|"
 msgid "Debug &MessageModel"
 msgstr "Ra&zhroščevanje modela sporočil"
 
-#: ../src/qtui/mainwin.cpp:480
+#: ../src/qtui/mainwin.cpp:419
 msgctxt "MainWin|"
 msgid "Debug &HotList"
 msgstr "Razhroščevanje &HotList"
 
-#: ../src/qtui/mainwin.cpp:482
+#: ../src/qtui/mainwin.cpp:420
 msgctxt "MainWin|"
 msgid "Debug &Log"
 msgstr "Razhroščevalni &dnevnik"
 
-#: ../src/qtui/mainwin.cpp:484
+#: ../src/qtui/mainwin.cpp:422
+msgctxt "MainWin|"
+msgid "Show &Resource Tree"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:425
 msgctxt "MainWin|"
 msgid "Reload Stylesheet"
 msgstr "Znova naloži slogovno predlogo"
 
-#: ../src/qtui/mainwin.cpp:487
+#: ../src/qtui/mainwin.cpp:432
 msgctxt "MainWin|"
 msgid "Hide Current Buffer"
 msgstr "Skrij trenuten prikaz"
 
-#: ../src/qtui/mainwin.cpp:491
+#: ../src/qtui/mainwin.cpp:435
 msgctxt "MainWin|"
 msgid "Text formatting"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:494
+#: ../src/qtui/mainwin.cpp:440
 msgctxt "MainWin|"
 msgid "Apply foreground color"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:499
+#: ../src/qtui/mainwin.cpp:447
 msgctxt "MainWin|"
 msgid "Apply background color"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:504
+#: ../src/qtui/mainwin.cpp:454
 msgctxt "MainWin|"
 msgid "Clear formatting"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:509
+#: ../src/qtui/mainwin.cpp:460
 msgctxt "MainWin|"
 msgid "Toggle bold"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:514
+#: ../src/qtui/mainwin.cpp:462
 msgctxt "MainWin|"
 msgid "Toggle italics"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:519
+#: ../src/qtui/mainwin.cpp:465
 msgctxt "MainWin|"
 msgid "Toggle underline"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:523
+#: ../src/qtui/mainwin.cpp:472
+msgctxt "MainWin|"
+msgid "Toggle strikethrough"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:479
 msgctxt "MainWin|"
 msgid "Navigation"
 msgstr "Krmarjenje"
 
-#: ../src/qtui/mainwin.cpp:525
+#: ../src/qtui/mainwin.cpp:483
 msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr "Skoči na vroči klepet"
 
-#: ../src/qtui/mainwin.cpp:528
+#: ../src/qtui/mainwin.cpp:485
 msgctxt "MainWin|"
 msgid "Activate the buffer search"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:540
+#: ../src/qtui/mainwin.cpp:497
 msgctxt "MainWin|"
 msgid "Set Quick Access #0"
 msgstr "Nastavi hitri dostop #1"
 
-#: ../src/qtui/mainwin.cpp:542
+#: ../src/qtui/mainwin.cpp:500
 msgctxt "MainWin|"
 msgid "Set Quick Access #1"
 msgstr "Nastavi hitri dostop #1"
 
-#: ../src/qtui/mainwin.cpp:544
+#: ../src/qtui/mainwin.cpp:503
 msgctxt "MainWin|"
 msgid "Set Quick Access #2"
 msgstr "Nastavi hitri dostop #2"
 
-#: ../src/qtui/mainwin.cpp:546
+#: ../src/qtui/mainwin.cpp:506
 msgctxt "MainWin|"
 msgid "Set Quick Access #3"
 msgstr "Nastavi hitri dostop #3"
 
-#: ../src/qtui/mainwin.cpp:548
+#: ../src/qtui/mainwin.cpp:509
 msgctxt "MainWin|"
 msgid "Set Quick Access #4"
 msgstr "Nastavi hitri dostop #4"
 
-#: ../src/qtui/mainwin.cpp:550
+#: ../src/qtui/mainwin.cpp:512
 msgctxt "MainWin|"
 msgid "Set Quick Access #5"
 msgstr "Nastavi hitri dostop #5"
 
-#: ../src/qtui/mainwin.cpp:552
+#: ../src/qtui/mainwin.cpp:515
 msgctxt "MainWin|"
 msgid "Set Quick Access #6"
 msgstr "Nastavi hitri dostop #6"
 
-#: ../src/qtui/mainwin.cpp:554
+#: ../src/qtui/mainwin.cpp:518
 msgctxt "MainWin|"
 msgid "Set Quick Access #7"
 msgstr "Nastavi hitri dostop #7"
 
-#: ../src/qtui/mainwin.cpp:556
+#: ../src/qtui/mainwin.cpp:521
 msgctxt "MainWin|"
 msgid "Set Quick Access #8"
 msgstr "Nastavi hitri dostop #8"
 
-#: ../src/qtui/mainwin.cpp:558
+#: ../src/qtui/mainwin.cpp:524
 msgctxt "MainWin|"
 msgid "Set Quick Access #9"
 msgstr "Nastavi hitri dostop #9"
 
-#: ../src/qtui/mainwin.cpp:561
+#: ../src/qtui/mainwin.cpp:527
 msgctxt "MainWin|"
 msgid "Quick Access #0"
 msgstr "Hitri dostop #0"
 
-#: ../src/qtui/mainwin.cpp:563
+#: ../src/qtui/mainwin.cpp:529
 msgctxt "MainWin|"
 msgid "Quick Access #1"
 msgstr "Hitri dostop #1"
 
-#: ../src/qtui/mainwin.cpp:565
+#: ../src/qtui/mainwin.cpp:531
 msgctxt "MainWin|"
 msgid "Quick Access #2"
 msgstr "Hitri dostop #2"
 
-#: ../src/qtui/mainwin.cpp:567
+#: ../src/qtui/mainwin.cpp:533
 msgctxt "MainWin|"
 msgid "Quick Access #3"
 msgstr "Hitri dostop #3"
 
-#: ../src/qtui/mainwin.cpp:569
+#: ../src/qtui/mainwin.cpp:535
 msgctxt "MainWin|"
 msgid "Quick Access #4"
 msgstr "Hitri dostop #4"
 
-#: ../src/qtui/mainwin.cpp:571
+#: ../src/qtui/mainwin.cpp:537
 msgctxt "MainWin|"
 msgid "Quick Access #5"
 msgstr "Hitri dostop #5"
 
-#: ../src/qtui/mainwin.cpp:573
+#: ../src/qtui/mainwin.cpp:539
 msgctxt "MainWin|"
 msgid "Quick Access #6"
 msgstr "Hitri dostop #6"
 
-#: ../src/qtui/mainwin.cpp:575
+#: ../src/qtui/mainwin.cpp:541
 msgctxt "MainWin|"
 msgid "Quick Access #7"
 msgstr "Hitri dostop #7"
 
-#: ../src/qtui/mainwin.cpp:577
+#: ../src/qtui/mainwin.cpp:543
 msgctxt "MainWin|"
 msgid "Quick Access #8"
 msgstr "Hitri dostop #8"
 
-#: ../src/qtui/mainwin.cpp:579
+#: ../src/qtui/mainwin.cpp:545
 msgctxt "MainWin|"
 msgid "Quick Access #9"
 msgstr "Hitri dostop #9"
 
-#: ../src/qtui/mainwin.cpp:583
+#: ../src/qtui/mainwin.cpp:551
 msgctxt "MainWin|"
 msgid "Activate Next Chat List"
 msgstr "Omogoči naslednji seznam klepetov"
 
-#: ../src/qtui/mainwin.cpp:585
+#: ../src/qtui/mainwin.cpp:558
 msgctxt "MainWin|"
 msgid "Activate Previous Chat List"
 msgstr "Omogoči predhodni seznam klepetov"
 
-#: ../src/qtui/mainwin.cpp:587
+#: ../src/qtui/mainwin.cpp:565
 msgctxt "MainWin|"
 msgid "Go to Next Chat"
 msgstr "Pojdi na naslednji klepet"
 
-#: ../src/qtui/mainwin.cpp:589
+#: ../src/qtui/mainwin.cpp:572
 msgctxt "MainWin|"
 msgid "Go to Previous Chat"
 msgstr "Pojdi na predhodni klepet"
 
-#: ../src/qtui/mainwin.cpp:598
+#: ../src/qtui/mainwin.cpp:583
 msgctxt "MainWin|"
 msgid "&File"
 msgstr "&Datoteka"
 
-#: ../src/qtui/mainwin.cpp:611
+#: ../src/qtui/mainwin.cpp:598
 msgctxt "MainWin|"
 msgid "&Networks"
 msgstr "O&mrežja"
 
-#: ../src/qtui/mainwin.cpp:617
+#: ../src/qtui/mainwin.cpp:604
 msgctxt "MainWin|"
 msgid "&View"
 msgstr "Po&gled"
 
-#: ../src/qtui/mainwin.cpp:618
+#: ../src/qtui/mainwin.cpp:605
 msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr "Seznami &klepetov"
 
-#: ../src/qtui/mainwin.cpp:620
+#: ../src/qtui/mainwin.cpp:607
 msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr "Orodne vrs&tice"
 
-#: ../src/qtui/mainwin.cpp:634
+#: ../src/qtui/mainwin.cpp:621
 msgctxt "MainWin|"
 msgid "&Settings"
 msgstr "Na&stavitve"
 
-#: ../src/qtui/mainwin.cpp:644
+#: ../src/qtui/mainwin.cpp:635
 msgctxt "MainWin|"
 msgid "&Help"
 msgstr "&Pomoč"
 
-#: ../src/qtui/mainwin.cpp:653
+#: ../src/qtui/mainwin.cpp:648
 msgctxt "MainWin|"
 msgid "Debug"
 msgstr "Razhrošči"
 
-#: ../src/qtui/mainwin.cpp:830
+#: ../src/qtui/mainwin.cpp:816
 msgctxt "MainWin|"
 msgid "Feature Not Supported"
 msgstr "Zmožnost ni podprta"
 
-#: ../src/qtui/mainwin.cpp:831
+#: ../src/qtui/mainwin.cpp:817
 msgctxt "MainWin|"
 msgid "<b>Your Quassel Core does not support this feature</b>"
 msgstr "<b>Vaše jedro ne podpira te zmožnosti</b>"
 
-#: ../src/qtui/mainwin.cpp:833
+#: ../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 "Da bi lahko oddaljeno spremenili vaše geslo, morate imeti jedro Quassel različice 0.12.0 ali novejše"
 
-#: ../src/qtui/mainwin.cpp:843
+#: ../src/qtui/mainwin.cpp:828
 msgctxt "MainWin|"
 msgid "Upgrading..."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:844
+#: ../src/qtui/mainwin.cpp:829
 msgctxt "MainWin|"
 msgid "Your database is being upgraded"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:847
+#: ../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:849
+#: ../src/qtui/mainwin.cpp:834
 msgctxt "MainWin|"
 msgid "Do not exit Quassel until the upgrade is complete!"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:866
+#: ../src/qtui/mainwin.cpp:849
 msgctxt "MainWin|"
 msgid "Fatal error"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:867
+#: ../src/qtui/mainwin.cpp:850
 msgctxt "MainWin|"
 msgid "Quassel encountered a fatal error and is terminated."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:869
+#: ../src/qtui/mainwin.cpp:852
 msgctxt "MainWin|"
 msgid "Reason:<em>"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:997
+#: ../src/qtui/mainwin.cpp:966
 msgctxt "MainWin|"
 msgid "Nicks"
 msgstr "Vzdevki"
 
-#: ../src/qtui/mainwin.cpp:1007
+#: ../src/qtui/mainwin.cpp:976
 msgctxt "MainWin|"
 msgid "Show Nick List"
 msgstr "Pokaži seznam vzdevkov"
 
-#: ../src/qtui/mainwin.cpp:1022
+#: ../src/qtui/mainwin.cpp:990
 msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr "Nadzornik klepeta"
 
-#: ../src/qtui/mainwin.cpp:1033
+#: ../src/qtui/mainwin.cpp:1001
 msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr "Pokaži nadzornik klepeta"
 
-#: ../src/qtui/mainwin.cpp:1039
+#: ../src/qtui/mainwin.cpp:1006
 msgctxt "MainWin|"
 msgid "Inputline"
 msgstr "Vnosna vrstica"
 
-#: ../src/qtui/mainwin.cpp:1048
+#: ../src/qtui/mainwin.cpp:1015
 msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr "Pokaži vnosno vrstico"
 
-#: ../src/qtui/mainwin.cpp:1061
+#: ../src/qtui/mainwin.cpp:1025
 msgctxt "MainWin|"
 msgid "Topic"
 msgstr "Tema"
 
-#: ../src/qtui/mainwin.cpp:1073
+#: ../src/qtui/mainwin.cpp:1039
 msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr "Pokaži vrstico s temo"
 
-#: ../src/qtui/mainwin.cpp:1079
+#: ../src/qtui/mainwin.cpp:1044
 msgctxt "MainWin|"
 msgid "Transfers"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1090
+#: ../src/qtui/mainwin.cpp:1055
 msgctxt "MainWin|"
 msgid "Show File Transfers"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1187
+#: ../src/qtui/mainwin.cpp:1150
 msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr "Glavna orodna vrstica"
 
-#: ../src/qtui/mainwin.cpp:1207
+#: ../src/qtui/mainwin.cpp:1170
 msgctxt "MainWin|"
 msgid "Nick Toolbar"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1284
+#: ../src/qtui/mainwin.cpp:1251
 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr "Povezan z jedrom."
 
-#: ../src/qtui/mainwin.cpp:1384
+#: ../src/qtui/mainwin.cpp:1347
 msgctxt "MainWin|"
 msgid "Not connected to core."
 msgstr "Brez povezave z jedrom."
 
-#: ../src/qtui/mainwin.cpp:1403 ../src/qtui/mainwin.cpp:1413
+#: ../src/qtui/mainwin.cpp:1365 ../src/qtui/mainwin.cpp:1376
 msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr "Nešifrirana povezava"
 
-#: ../src/qtui/mainwin.cpp:1403
+#: ../src/qtui/mainwin.cpp:1366
 msgctxt "MainWin|"
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr "<b>Vaš odjemalec ne podpira šifriranja SSL.</b>"
 
-#: ../src/qtui/mainwin.cpp:1405 ../src/qtui/mainwin.cpp:1415
+#: ../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 "Zaupni podatki, kot so gesla, bodo do jedra za Quassel poslani nešifrirani."
 
-#: ../src/qtui/mainwin.cpp:1413
+#: ../src/qtui/mainwin.cpp:1377
 msgctxt "MainWin|"
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr "<b>Vaše jedro ne podpira šifriranja SSL.</b>"
 
-#: ../src/qtui/mainwin.cpp:1431 ../src/qtui/mainwin.cpp:1452
+#: ../src/qtui/mainwin.cpp:1398 ../src/qtui/mainwin.cpp:1418
 msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr "Varnostno potrdilo, ki ni zaupanja vredno"
 
-#: ../src/qtui/mainwin.cpp:1432
+#: ../src/qtui/mainwin.cpp:1399
 #, qt-format
 msgctxt "MainWin|"
 msgid ""
@@ -6614,69 +6701,112 @@ msgid ""
 "following reasons:</b>"
 msgstr "<b>Potrdilo SSL, ki ga je ponudilo jedro na %1, ni zaupanja vredno zaradi naslednjih razlogov:</b>"
 
-#: ../src/qtui/mainwin.cpp:1435
+#: ../src/qtui/mainwin.cpp:1402
 msgctxt "MainWin|"
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: ../src/qtui/mainwin.cpp:1436
+#: ../src/qtui/mainwin.cpp:1403
 msgctxt "MainWin|"
 msgid "Show Certificate"
 msgstr "Prikaži potrdilo"
 
-#: ../src/qtui/mainwin.cpp:1453
+#: ../src/qtui/mainwin.cpp:1419
 msgctxt "MainWin|"
 msgid ""
 "Would you like to accept this certificate forever without being prompted?"
 msgstr "Ali bi radi trajno sprejeli to potrdilo brez nadaljnjih vprašanj?"
 
-#: ../src/qtui/mainwin.cpp:1455
+#: ../src/qtui/mainwin.cpp:1421
 msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr "Samo za trenutno sejo"
 
-#: ../src/qtui/mainwin.cpp:1456
+#: ../src/qtui/mainwin.cpp:1422
 msgctxt "MainWin|"
 msgid "Forever"
 msgstr "Trajno"
 
-#: ../src/qtui/mainwin.cpp:1467
+#: ../src/qtui/mainwin.cpp:1430
 msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr "Napaka povezave z jedrom"
 
-#: ../src/qtui/mainwin.cpp:1499 ../src/qtui/mainwin.cpp:1500
+#: ../src/qtui/mainwin.cpp:1460 ../src/qtui/mainwin.cpp:1461
 msgctxt "MainWin|"
 msgid "No network selected"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1502
+#: ../src/qtui/mainwin.cpp:1463
 msgctxt "MainWin|"
 msgid "Select a network before trying to view the channel list."
 msgstr ""
 
-#: ../src/client/messagemodel.cpp:405
+#: ../src/client/messagemodel.cpp:410
 #, qt-format
 msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
 msgstr "Zahtevanje %1 sporočil iz dnevnika za prikaz %2:%3"
 
-#: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
+#: ../src/core/metricsserver.cpp:53
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Invalid listen address %1"
+msgstr "Neveljaven naslov za poslušanje (%1)"
+
+#: ../src/core/metricsserver.cpp:62
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Listening for metrics requests on IPv6 %1 port %2"
+msgstr ""
+
+#: ../src/core/metricsserver.cpp:70
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Could not open IPv6 interface %1:%2: %3"
+msgstr "Ni mogoče odpreti vmesnika IPv6 %1:%2: %3"
+
+#: ../src/core/metricsserver.cpp:78
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Listening for metrics requests on IPv4 %1 port %2"
+msgstr ""
+
+#: ../src/core/metricsserver.cpp:88
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Could not open IPv4 interface %1:%2: %3"
+msgstr "Ni mogoče odpreti vmesnika IPv4 %1:%2: %3"
+
+#: ../src/core/metricsserver.cpp:96
+#, qt-format
+msgctxt "MetricsServer|"
+msgid "Invalid listen address %1, unknown network protocol"
+msgstr "Neveljaven naslov za poslušanje (%1), neznan omrežni protokol"
+
+#: ../src/core/metricsserver.cpp:105
+msgctxt "MetricsServer|"
+msgid ""
+"Metrics could not open any network interfaces to listen on! No metrics "
+"functionality will be available"
+msgstr ""
+
+#: ../src/qtui/msgprocessorstatuswidget.ui:19
 msgctxt "MsgProcessorStatusWidget|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/msgprocessorstatuswidget.ui:34
+#: ../src/qtui/msgprocessorstatuswidget.ui:34
 msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr "Prejemanje sporočil iz dnevnika"
 
-#: ../src/uisupport/multilineedit.cpp:111
+#: ../src/uisupport/multilineedit.cpp:95
 msgctxt "MultiLineEdit|"
 msgid "Auto Spell Check"
 msgstr ""
 
-#: ../src/uisupport/multilineedit.cpp:745
+#: ../src/uisupport/multilineedit.cpp:723
 #, qt-format
 msgctxt "MultiLineEdit|"
 msgid "Do you really want to paste %n line(s)?"
@@ -6686,7 +6816,7 @@ msgstr[1] "Ali resnično želite prilepiti %n vrstici?"
 msgstr[2] "Ali resnično želite prilepiti %n vrstice?"
 msgstr[3] "Ali resnično želite prilepiti %n vrstic?"
 
-#: ../src/uisupport/multilineedit.cpp:758
+#: ../src/uisupport/multilineedit.cpp:732
 msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr "Zaščita pri lepljenju"
@@ -6754,12 +6884,12 @@ msgctxt "NetworkAddDlg|"
 msgid "Verify connection security"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1056
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1177
 msgctxt "NetworkAddDlg|"
 msgid "Your Quassel core does not support this feature"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1057
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1178
 msgctxt "NetworkAddDlg|"
 msgid ""
 "You need a Quassel core v0.13.0 or newer in order to verify connection "
@@ -6776,53 +6906,53 @@ msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
 msgstr "Vnesite ime omrežja:"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1130
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1252
 msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr "Dodaj omrežje"
 
-#: ../src/client/networkmodel.cpp:255
+#: ../src/client/networkmodel.cpp:230
 msgctxt "NetworkItem|"
 msgid "Server"
 msgstr "Strežnik"
 
-#: ../src/client/networkmodel.cpp:256
+#: ../src/client/networkmodel.cpp:231
 msgctxt "NetworkItem|"
 msgid "Users"
 msgstr "Uporabniki"
 
-#: ../src/client/networkmodel.cpp:258
+#: ../src/client/networkmodel.cpp:233
 msgctxt "NetworkItem|"
 msgid "Lag"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:258
+#: ../src/client/networkmodel.cpp:233
 #, qt-format
 msgctxt "NetworkItem|"
 msgid "%1 msecs"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:262
+#: ../src/client/networkmodel.cpp:238
 msgctxt "NetworkItem|"
 msgid "Not connected"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1314
+#: ../src/client/networkmodel.cpp:1215
 msgctxt "NetworkModel|"
 msgid "Chat"
 msgstr "Klepet"
 
-#: ../src/client/networkmodel.cpp:1314
+#: ../src/client/networkmodel.cpp:1215
 msgctxt "NetworkModel|"
 msgid "Topic"
 msgstr "Tema"
 
-#: ../src/client/networkmodel.cpp:1314
+#: ../src/client/networkmodel.cpp:1215
 msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr "Å t. vzdevkov"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:178
+#: ../src/uisupport/networkmodelcontroller.cpp:156
 msgctxt "NetworkModelController|"
 msgid "Do you want to delete the following buffer(s) permanently?"
 msgid_plural "Do you want to delete the following buffer(s) permanently?"
@@ -6831,67 +6961,67 @@ msgstr[1] "Ali želite trajno izbrisati naslednja %n prikaza?"
 msgstr[2] "Ali želite trajno izbrisati naslednje %n prikaze?"
 msgstr[3] "Ali želite trajno izbrisati naslednjih %n prikazov?"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:191
+#: ../src/uisupport/networkmodelcontroller.cpp:169
 #, qt-format
 msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr "... in še <b>%1</b> več<br><br>"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:192
+#: ../src/uisupport/networkmodelcontroller.cpp:170
 msgctxt "NetworkModelController|"
 msgid ""
 "<b>Note:</b> This will delete all related data, including all backlog data, "
 "from the core's database and cannot be undone."
 msgstr "<b>Opomba:</b> s tem iz podatkovne zbirke jedra izbrišete vse povezane podatke, vključno z dnevnikom sporočil. Tega kasneje ni mogoče razveljaviti."
 
-#: ../src/uisupport/networkmodelcontroller.cpp:194
+#: ../src/uisupport/networkmodelcontroller.cpp:173
 msgctxt "NetworkModelController|"
 msgid ""
 "<br>Active channel buffers cannot be deleted, please part the channel first."
 msgstr "<br>Dejavnih prikazov kanalov ni mogoče izbrisati. Najprej zapustite kanale."
 
-#: ../src/uisupport/networkmodelcontroller.cpp:196
+#: ../src/uisupport/networkmodelcontroller.cpp:175
 msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr "Ali trajno izbrišem prikaze?"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:241
-#: ../src/uisupport/networkmodelcontroller.cpp:243
+#: ../src/uisupport/networkmodelcontroller.cpp:220
+#: ../src/uisupport/networkmodelcontroller.cpp:228
 msgctxt "NetworkModelController|"
 msgid "Question"
 msgstr ""
 
-#: ../src/uisupport/networkmodelcontroller.cpp:241
+#: ../src/uisupport/networkmodelcontroller.cpp:221
 msgctxt "NetworkModelController|"
 msgid "Really Connect to all IRC Networks?"
 msgstr ""
 
-#: ../src/uisupport/networkmodelcontroller.cpp:243
+#: ../src/uisupport/networkmodelcontroller.cpp:229
 msgctxt "NetworkModelController|"
 msgid "Really disconnect from all IRC Networks?"
 msgstr ""
 
-#: ../src/uisupport/networkmodelcontroller.cpp:556
+#: ../src/uisupport/networkmodelcontroller.cpp:543
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr "Pridruži se kanalu"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:559
+#: ../src/uisupport/networkmodelcontroller.cpp:546
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Network:"
 msgstr "Omrežje:"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:561
+#: ../src/uisupport/networkmodelcontroller.cpp:548
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:563
+#: ../src/uisupport/networkmodelcontroller.cpp:550
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../src/qtui/ircconnectionwizard.cpp:159
+#: ../src/qtui/ircconnectionwizard.cpp:151
 msgctxt "NetworkPage|"
 msgid "Setup Network Connection"
 msgstr "Nastavitev omrežne povezave"
@@ -7105,24 +7235,25 @@ msgctxt "NetworksSettingsPage|"
 msgid "Password:"
 msgstr "Geslo:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:776
+#: ../src/qtui/settingspages/networkssettingspage.ui:764
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because"
+" the identity has an ssl certificate set, SASL EXTERNAL will be "
+"used.</p></body></html>"
+msgstr "<html><head/><body><p><span style=\" font-weight:600;\">Opomba:</span> ker ima ta istovetnost nastavljeno potrdilo SSL, bo uporabljen SASL EXTERNAL.</p></body></html>"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:789
 msgctxt "NetworksSettingsPage|"
 msgid "Could not detect if supported by server"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:783
+#: ../src/qtui/settingspages/networkssettingspage.ui:796
+#: ../src/qtui/settingspages/networkssettingspage.ui:933
 msgctxt "NetworksSettingsPage|"
 msgid "Details..."
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:798
-msgctxt "NetworksSettingsPage|"
-msgid ""
-"<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because"
-" the identity has an ssl certificate set, SASL EXTERNAL will be "
-"used.</p></body></html>"
-msgstr "<html><head/><body><p><span style=\" font-weight:600;\">Opomba:</span> ker ima ta istovetnost nastavljeno potrdilo SSL, bo uporabljen SASL EXTERNAL.</p></body></html>"
-
 #: ../src/qtui/settingspages/networkssettingspage.ui:811
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7147,54 +7278,97 @@ msgstr "Storitev:"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:886
 msgctxt "NetworksSettingsPage|"
-msgid "Encodings"
-msgstr "Kodiranja"
+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"
-msgstr "Nastavite napredne nastavitve, kot so kodiranja za sporočila in samodejno ponovno povezovanje"
+"<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:898
+#: ../src/qtui/settingspages/networkssettingspage.ui:978
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Configure which IRC capabilities Quassel will ignore during negotiation"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:981
+msgctxt "NetworksSettingsPage|"
+msgid "Advanced..."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1003
+msgctxt "NetworksSettingsPage|"
+msgid "<i>Changes apply after reconnecting to the network</i>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:1027
+msgctxt "NetworksSettingsPage|"
+msgid "Encodings"
+msgstr "Kodiranja"
+
+#: ../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 "Nadzor nad kodiranjem prejetih in poslanih sporočil"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:901
+#: ../src/qtui/settingspages/networkssettingspage.ui:1042
 msgctxt "NetworksSettingsPage|"
 msgid "Use Custom Encodings"
 msgstr "Uporabi kodiranja po meri"
 
-#: ../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 "Določite, s katerim kodiranjem bodo poslana vaša sporočila.\nZa večino omrežij bi morala biti UTF-8 razumna izbira."
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:916
+#: ../src/qtui/settingspages/networkssettingspage.ui:1057
 msgctxt "NetworksSettingsPage|"
 msgid "Send messages in:"
 msgstr "Pošlji sporočila z:"
 
-#: ../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 "Zasilen za prejeta:"
 
-#: ../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 "
@@ -7203,89 +7377,99 @@ 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 "Kodiranje strežnika:"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:41
+#: ../src/qtui/settingspages/networkssettingspage.cpp:44
 msgctxt "NetworksSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:41
+#: ../src/qtui/settingspages/networkssettingspage.cpp:44
 msgctxt "NetworksSettingsPage|"
 msgid "Networks"
 msgstr "Omrežja"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:184
-#: ../src/qtui/settingspages/networkssettingspage.cpp:196
+#: ../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:199
+#: ../src/qtui/settingspages/networkssettingspage.cpp:178
 msgctxt "NetworksSettingsPage|"
 msgid "Your Quassel core does not support this feature"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:200
+#: ../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:238
+#: ../src/qtui/settingspages/networkssettingspage.cpp:193
+msgctxt "NetworksSettingsPage|"
+msgid "Your Quassel core is too old to configure IRCv3 features"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:230
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"
 msgstr "<b>Preden se uveljavijo spremembe, je potrebno odpraviti naslednje težave:</b><ul>"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:239
+#: ../src/qtui/settingspages/networkssettingspage.cpp:232
 msgctxt "NetworksSettingsPage|"
 msgid "<li>All networks need at least one server defined</li>"
 msgstr "<li>Vsako omrežje mora imeti določen vsaj en strežnik</li>"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:240
+#: ../src/qtui/settingspages/networkssettingspage.cpp:233
 msgctxt "NetworksSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:241
+#: ../src/qtui/settingspages/networkssettingspage.cpp:234
 msgctxt "NetworksSettingsPage|"
 msgid "Invalid Network Settings"
 msgstr "Neveljavne nastavitve omrežja"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:737
+#: ../src/qtui/settingspages/networkssettingspage.cpp:749
 msgctxt "NetworksSettingsPage|"
 msgid "Could not check if supported by network"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:743
+#: ../src/qtui/settingspages/networkssettingspage.cpp:754
 msgctxt "NetworksSettingsPage|"
 msgid "Cannot check if supported when disconnected"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:749
+#: ../src/qtui/settingspages/networkssettingspage.cpp:759
 msgctxt "NetworksSettingsPage|"
 msgid "Not currently supported by network"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:755
+#: ../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:838
+#: ../src/qtui/settingspages/networkssettingspage.cpp:860
 msgctxt "NetworksSettingsPage|"
 msgid "Delete Network?"
 msgstr "Izbrišem omrežje?"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:839
+#: ../src/qtui/settingspages/networkssettingspage.cpp:861
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7293,12 +7477,12 @@ msgid ""
 "including the backlog?"
 msgstr "Ali resnično želite izbrisati omrežje »%1« in vse z njim povezane nastavitve, vključno z dnevnikom sporočil?"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:971
+#: ../src/qtui/settingspages/networkssettingspage.cpp:991
 msgctxt "NetworksSettingsPage|"
 msgid "Could not check if SASL supported by network"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:972
+#: ../src/qtui/settingspages/networkssettingspage.cpp:992
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7306,12 +7490,12 @@ msgid ""
 " changes or an older Quassel core.  You can still try using SASL."
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:977
+#: ../src/qtui/settingspages/networkssettingspage.cpp:998
 msgctxt "NetworksSettingsPage|"
 msgid "Cannot check if SASL supported when disconnected"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:978
+#: ../src/qtui/settingspages/networkssettingspage.cpp:999
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7319,12 +7503,25 @@ msgid ""
 "the network, or try using SASL anyways."
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:983
+#: ../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:984
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1016
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7332,12 +7529,26 @@ msgid ""
 "be added later on."
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:989
+#: ../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:990
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1036
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -7345,18 +7556,60 @@ msgid ""
 "instead of NickServ identification."
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:997
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1044
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid "SASL support for \"%1\""
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1002
+#: ../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"
@@ -7374,7 +7627,7 @@ msgid ""
 "the special characters {, }, [, ], \\, |, `, ^, _ and -."
 msgstr "Veljaven vzdevek lahko vsebuje znake angleške abecede, števke in posebne znake {, }, [, ], \\, |, `, ^, _ ter -."
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:480
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:462
 msgctxt "NickEditDlg|"
 msgid "Add Nickname"
 msgstr "Dodaj vzdevek"
@@ -7389,27 +7642,27 @@ msgctxt "NotificationsSettingsPage|"
 msgid "Notifications"
 msgstr "Obvestila"
 
-#: ../src/qtui/ui/passwordchangedlg.ui:14
+#: ../src/qtui/passwordchangedlg.ui:14
 msgctxt "PasswordChangeDlg|"
 msgid "Change Password"
 msgstr "Spremeni geslo"
 
-#: ../src/qtui/ui/passwordchangedlg.ui:37
+#: ../src/qtui/passwordchangedlg.ui:37
 msgctxt "PasswordChangeDlg|"
 msgid "Old password:"
 msgstr "Staro geslo:"
 
-#: ../src/qtui/ui/passwordchangedlg.ui:51
+#: ../src/qtui/passwordchangedlg.ui:51
 msgctxt "PasswordChangeDlg|"
 msgid "New Password:"
 msgstr "Novo geslo:"
 
-#: ../src/qtui/ui/passwordchangedlg.ui:65
+#: ../src/qtui/passwordchangedlg.ui:65
 msgctxt "PasswordChangeDlg|"
 msgid "Confirm password:"
 msgstr "Potrdite geslo:"
 
-#: ../src/qtui/passwordchangedlg.cpp:33
+#: ../src/qtui/passwordchangedlg.cpp:34
 #, qt-format
 msgctxt "PasswordChangeDlg|"
 msgid ""
@@ -7417,109 +7670,84 @@ msgid ""
 "running at <b>%2</b>."
 msgstr "To spremeni geslo za uporabniško ime <b>%1</b> na jedru Quassel, ki teče na <b>%2</b>."
 
-#: ../src/qtui/passwordchangedlg.cpp:66
+#: ../src/qtui/passwordchangedlg.cpp:64
 msgctxt "PasswordChangeDlg|"
 msgid "Password Not Changed"
 msgstr "Geslo ni bilo spremenjeno"
 
-#: ../src/qtui/passwordchangedlg.cpp:67
+#: ../src/qtui/passwordchangedlg.cpp:64
 msgctxt "PasswordChangeDlg|"
 msgid "<b>Password change failed</b>"
 msgstr "<b>Sprememba gesla ni uspela</b>"
 
-#: ../src/qtui/passwordchangedlg.cpp:69
+#: ../src/qtui/passwordchangedlg.cpp:66
 msgctxt "PasswordChangeDlg|"
 msgid ""
 "The core reported an error when trying to change your password. Make sure "
 "you entered your old password correctly!"
 msgstr "Med poskusom spreminjanja gesla je jedro sporočilo napako. Prepričajte se, da ste vnesli pravilno staro geslo!"
 
-#: ../src/qtui/phononnotificationbackend.cpp:188
-msgctxt "PhononNotificationBackend::ConfigWidget|"
-msgid "Select Audio File"
-msgstr "Izberite zvočno datoteko"
-
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Form"
-msgstr "Obrazec"
-
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Play a sound"
-msgstr "Predvajaj zvok"
-
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Prelisten to the selected sound"
-msgstr "Poslušajte izbrani zvok"
-
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Select the sound file to play"
-msgstr "Izberite zvočno datoteko za predvajanje"
-
-#: ../src/core/postgresqlstorage.cpp:58
+#: ../src/core/postgresqlstorage.cpp:51
 msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL driver plugin not available for Qt. Installed drivers:"
 msgstr ""
 
-#: ../src/core/postgresqlstorage.cpp:81
+#: ../src/core/postgresqlstorage.cpp:71
 msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr "PostgreSQL Turbo Bomber HD!"
 
-#: ../src/core/postgresqlstorage.cpp:88
+#: ../src/core/postgresqlstorage.cpp:77
 msgctxt "PostgreSqlStorage|"
 msgid "Username"
 msgstr ""
 
-#: ../src/core/postgresqlstorage.cpp:89
+#: ../src/core/postgresqlstorage.cpp:77
 msgctxt "PostgreSqlStorage|"
 msgid "Password"
 msgstr ""
 
-#: ../src/core/postgresqlstorage.cpp:90
+#: ../src/core/postgresqlstorage.cpp:77
 msgctxt "PostgreSqlStorage|"
 msgid "Hostname"
 msgstr ""
 
-#: ../src/core/postgresqlstorage.cpp:91
+#: ../src/core/postgresqlstorage.cpp:78
 msgctxt "PostgreSqlStorage|"
 msgid "Port"
 msgstr ""
 
-#: ../src/core/postgresqlstorage.cpp:92
+#: ../src/core/postgresqlstorage.cpp:78
 msgctxt "PostgreSqlStorage|"
 msgid "Database"
 msgstr ""
 
-#: ../src/client/backlogrequester.cpp:95
+#: ../src/client/backlogrequester.cpp:81
+#: ../src/client/backlogrequester.cpp:154
 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
 msgstr "Zahtevanje največ %1 sporočil iz dnevnika za %2 prikazov"
 
-#: ../src/client/backlogrequester.cpp:122
+#: ../src/client/backlogrequester.cpp:109
 #, qt-format
 msgctxt "QObject|"
 msgid ""
 "Requesting up to %1 of all unread backlog messages (plus additional %2)"
 msgstr "Zahtevanje največ %1 neprebranih sporočil iz dnevnika (in dodatnih %2)"
 
-#: ../src/client/backlogrequester.cpp:142
+#: ../src/client/backlogrequester.cpp:127
 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"
 msgstr "Zahtevanje največ %1 neprebranih sporočil iz dnevnika za %2 prikazov"
 
-#: ../src/qtui/ircconnectionwizard.cpp:57
+#: ../src/qtui/ircconnectionwizard.cpp:53
 msgctxt "QObject|"
 msgid "Welcome to Quassel IRC"
 msgstr "Dobrodošli v Quassel IRC"
 
-#: ../src/qtui/ircconnectionwizard.cpp:59
+#: ../src/qtui/ircconnectionwizard.cpp:56
 msgctxt "QObject|"
 msgid ""
 "This wizard will help you to set up your default identity and your IRC "
@@ -7527,346 +7755,620 @@ msgid ""
 "wizard any time and use the settings dialog for more detailed changes."
 msgstr "Ta čarovnik vam bo pomagal pri nastavitvi privzete istovetnosti in povezave v omrežje IRC.<br>Zaobjete so le osnovne nastavitve. Tega čarovnika lahko prekličete kadarkoli in za podrobnejše spremembe uporabite nastavitveno okno."
 
-#: ../src/uisupport/qssparser.cpp:151 ../src/uisupport/qssparser.cpp:206
-#: ../src/uisupport/qssparser.cpp:365
+#: ../src/uisupport/qssparser.cpp:147 ../src/uisupport/qssparser.cpp:201
+#: ../src/uisupport/qssparser.cpp:359
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid block declaration: %1"
 msgstr "Neveljavna deklaracija bloka: %1"
 
-#: ../src/uisupport/qssparser.cpp:170
+#: ../src/uisupport/qssparser.cpp:166
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette role assignment: %1"
 msgstr "Neveljavna dodelitev vloge barvnega nabora: %1"
 
-#: ../src/uisupport/qssparser.cpp:189
+#: ../src/uisupport/qssparser.cpp:185
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr "Neznano ime vloge barvnega nabora: %1"
 
-#: ../src/uisupport/qssparser.cpp:233
+#: ../src/uisupport/qssparser.cpp:228
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
 msgstr "Neveljavno ime podpredmeta v %1"
 
-#: ../src/uisupport/qssparser.cpp:277
+#: ../src/uisupport/qssparser.cpp:272
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message type in %1"
 msgstr "Neveljavna vrsta sporočila v %1"
 
-#: ../src/uisupport/qssparser.cpp:286
+#: ../src/uisupport/qssparser.cpp:281
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr "Neveljaven pogoj %1"
 
-#: ../src/uisupport/qssparser.cpp:299
+#: ../src/uisupport/qssparser.cpp:294
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message label: %1"
 msgstr "Neveljavna oznaka sporočila: %1"
 
-#: ../src/uisupport/qssparser.cpp:310
+#: ../src/uisupport/qssparser.cpp:305
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr "Neveljavno določilo razpršila vzdevka: %1"
 
-#: ../src/uisupport/qssparser.cpp:314
+#: ../src/uisupport/qssparser.cpp:309
 msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr "Razpršilo vzdevka je lahko največ »0x0f«!"
 
-#: ../src/uisupport/qssparser.cpp:330
+#: ../src/uisupport/qssparser.cpp:325
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid format name: %1"
 msgstr "Neveljavno ime oblike: %1"
 
-#: ../src/uisupport/qssparser.cpp:338
+#: ../src/uisupport/qssparser.cpp:333
 #, qt-format
 msgctxt "QssParser|"
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr "Neveljavno določilo barve za IRC (mora biti med 00 in 0F): %1"
 
-#: ../src/uisupport/qssparser.cpp:347
+#: ../src/uisupport/qssparser.cpp:342
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
 msgstr "Neobravnavan pogoj: %1"
 
-#: ../src/uisupport/qssparser.cpp:380
+#: ../src/uisupport/qssparser.cpp:374
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid proplist %1"
 msgstr "Neveljaven seznam lastnosti: %1"
 
-#: ../src/uisupport/qssparser.cpp:399
+#: ../src/uisupport/qssparser.cpp:393
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid chatlist item type %1"
 msgstr "Neveljavna vrsta predmeta na seznamu klepetov: %1"
 
-#: ../src/uisupport/qssparser.cpp:415
+#: ../src/uisupport/qssparser.cpp:409
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid chatlist state %1"
 msgstr "Neveljavno stanje seznama klepetov: %1"
 
-#: ../src/uisupport/qssparser.cpp:445
+#: ../src/uisupport/qssparser.cpp:438
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid property declaration: %1"
 msgstr "Neveljavno določilo lastnosti: %1"
 
-#: ../src/uisupport/qssparser.cpp:483
+#: ../src/uisupport/qssparser.cpp:476
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font property: %1"
 msgstr "Neveljavna lastnost pisave: %1"
 
-#: ../src/uisupport/qssparser.cpp:489
+#: ../src/uisupport/qssparser.cpp:482
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown ChatLine property: %1"
 msgstr "Neznana lastnost za vrstico klepeta: %1"
 
-#: ../src/uisupport/qssparser.cpp:508
+#: ../src/uisupport/qssparser.cpp:501
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid boolean value: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:544
+#: ../src/uisupport/qssparser.cpp:537
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette color role specification: %1"
 msgstr "Neveljavno določilo vloge barve barvnega nabora: %1"
 
-#: ../src/uisupport/qssparser.cpp:551
+#: ../src/uisupport/qssparser.cpp:544
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette color role: %1"
 msgstr "Neznana vloga barve barvnega nabora: %1"
 
-#: ../src/uisupport/qssparser.cpp:558 ../src/uisupport/qssparser.cpp:581
-#: ../src/uisupport/qssparser.cpp:603
+#: ../src/uisupport/qssparser.cpp:551 ../src/uisupport/qssparser.cpp:574
+#: ../src/uisupport/qssparser.cpp:596
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid gradient declaration: %1"
 msgstr "Neveljavno določilo preliva: %1"
 
-#: ../src/uisupport/qssparser.cpp:567 ../src/uisupport/qssparser.cpp:589
-#: ../src/uisupport/qssparser.cpp:613
+#: ../src/uisupport/qssparser.cpp:560 ../src/uisupport/qssparser.cpp:582
+#: ../src/uisupport/qssparser.cpp:606
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid gradient stops list: %1"
 msgstr "Neveljaven seznam postankov preliva: %1"
 
-#: ../src/uisupport/qssparser.cpp:722
+#: ../src/uisupport/qssparser.cpp:712
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font specification: %1"
 msgstr "Neveljavno določilo pisave: %1"
 
-#: ../src/uisupport/qssparser.cpp:773
+#: ../src/uisupport/qssparser.cpp:762
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font style specification: %1"
 msgstr "Neveljavno določilo sloga pisave: %1"
 
-#: ../src/uisupport/qssparser.cpp:788
+#: ../src/uisupport/qssparser.cpp:776
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font weight specification: %1"
 msgstr "Neveljavno določilo debeline pisave: %1"
 
-#: ../src/uisupport/qssparser.cpp:800
+#: ../src/uisupport/qssparser.cpp:787
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font size specification: %1"
 msgstr "Neveljavno določilo velikosti pisave: %1"
 
-#: ../src/qtui/qtmultimedianotificationbackend.cpp:167
+#: ../src/qtui/qtmultimedianotificationbackend.cpp:156
 msgctxt "QtMultimediaNotificationBackend::ConfigWidget|"
 msgid "Select Audio File"
 msgstr "Izberite zvočno datoteko"
 
-#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:14
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:14
 msgctxt "QtMultimediaNotificationConfigWidget|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:20
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:20
 msgctxt "QtMultimediaNotificationConfigWidget|"
 msgid "Play a sound"
 msgstr "Predvajaj zvok"
 
-#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:46
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:46
 msgctxt "QtMultimediaNotificationConfigWidget|"
 msgid "Prelisten to the selected sound"
 msgstr "Poslušajte izbrani zvok"
 
-#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:59
-#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:69
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:59
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:69
 msgctxt "QtMultimediaNotificationConfigWidget|"
 msgid "Select the sound file to play"
 msgstr "Izberite zvočno datoteko za predvajanje"
 
 #. Supported icon theme names
-#: ../src/qtui/qtui.cpp:284
+#: ../src/qtui/qtui.cpp:250
 msgctxt "QtUi|"
 msgid "Breeze"
 msgstr ""
 
-#: ../src/qtui/qtui.cpp:285
+#: ../src/qtui/qtui.cpp:251
 msgctxt "QtUi|"
 msgid "Breeze Dark"
 msgstr ""
 
-#: ../src/qtui/qtui.cpp:287
+#: ../src/qtui/qtui.cpp:253
 msgctxt "QtUi|"
 msgid "Oxygen"
 msgstr ""
 
-#: ../src/qtui/qtui.cpp:341
+#: ../src/qtui/qtui.cpp:304
 msgctxt "QtUi|"
 msgid ""
 "No supported icon theme installed, you'll lack icons! Supported are the "
 "KDE/Plasma themes Breeze, Breeze Dark and Oxygen."
 msgstr ""
 
-#: ../src/qtui/qtuiapplication.cpp:105
+#: ../src/qtui/qtuiapplication.cpp:48
 msgctxt "QtUiApplication|"
-msgid "Could not initialize Quassel!"
+msgid "Could not load or upgrade client settings!"
 msgstr ""
 
-#: ../src/qtui/qtuiapplication.cpp:110
-msgctxt "QtUiApplication|"
-msgid "Could not load or upgrade client settings!"
+#: ../src/common/quassel.cpp:325
+msgctxt "Quassel|"
+msgid "Specify the directory holding the client configuration."
+msgstr ""
+
+#: ../src/common/quassel.cpp:325 ../src/common/quassel.cpp:330
+#: ../src/common/quassel.cpp:367 ../src/common/quassel.cpp:368
+msgctxt "Quassel|"
+msgid "path"
+msgstr ""
+
+#: ../src/common/quassel.cpp:329
+msgctxt "Quassel|"
+msgid ""
+"Specify the directory holding configuration files, the SQlite database and "
+"the SSL certificate."
+msgstr ""
+
+#: ../src/common/quassel.cpp:336
+msgctxt "Quassel|"
+msgid "Override the system icon theme ('breeze' is recommended)."
 msgstr ""
 
-#: ../src/common/util.cpp:173
+#: ../src/common/quassel.cpp:336
+msgctxt "Quassel|"
+msgid "theme"
+msgstr ""
+
+#: ../src/common/quassel.cpp:337
+msgctxt "Quassel|"
+msgid "Load a custom application stylesheet."
+msgstr ""
+
+#: ../src/common/quassel.cpp:337
+msgctxt "Quassel|"
+msgid "file.qss"
+msgstr ""
+
+#: ../src/common/quassel.cpp:338
+msgctxt "Quassel|"
+msgid "Start the client minimized to the system tray."
+msgstr ""
+
+#: ../src/common/quassel.cpp:339
+msgctxt "Quassel|"
+msgid "Account id to connect to on startup."
+msgstr ""
+
+#: ../src/common/quassel.cpp:339
+msgctxt "Quassel|"
+msgid "account"
+msgstr ""
+
+#: ../src/common/quassel.cpp:346
+msgctxt "Quassel|"
+msgid "The address(es) quasselcore will listen on."
+msgstr ""
+
+#: ../src/common/quassel.cpp:346
+msgctxt "Quassel|"
+msgid "<address>[,<address>[,...]]"
+msgstr ""
+
+#: ../src/common/quassel.cpp:347
+msgctxt "Quassel|"
+msgid "The port quasselcore will listen at."
+msgstr ""
+
+#: ../src/common/quassel.cpp:347 ../src/common/quassel.cpp:360
+#: ../src/common/quassel.cpp:370
+msgctxt "Quassel|"
+msgid "port"
+msgstr ""
+
+#: ../src/common/quassel.cpp:348
+msgctxt "Quassel|"
+msgid "Don't restore last core's state."
+msgstr ""
+
+#: ../src/common/quassel.cpp:349
+msgctxt "Quassel|"
+msgid "Load configuration from environment variables."
+msgstr ""
+
+#: ../src/common/quassel.cpp:350
+msgctxt "Quassel|"
+msgid "Switch storage backend (migrating data if possible)."
+msgstr ""
+
+#: ../src/common/quassel.cpp:350
+msgctxt "Quassel|"
+msgid "backendidentifier"
+msgstr ""
+
+#: ../src/common/quassel.cpp:351
+msgctxt "Quassel|"
+msgid "Select authentication backend."
+msgstr ""
+
+#: ../src/common/quassel.cpp:351
+msgctxt "Quassel|"
+msgid "authidentifier"
+msgstr ""
+
+#: ../src/common/quassel.cpp:352
+msgctxt "Quassel|"
+msgid "Starts an interactive session to add a new core user."
+msgstr ""
+
+#: ../src/common/quassel.cpp:354
+msgctxt "Quassel|"
+msgid ""
+"Starts an interactive session to change the password of the user identified "
+"by <username>."
+msgstr ""
+
+#: ../src/common/quassel.cpp:355
+msgctxt "Quassel|"
+msgid "username"
+msgstr ""
+
+#: ../src/common/quassel.cpp:356
+msgctxt "Quassel|"
+msgid ""
+"Use users' quasselcore username as ident reply. Ignores each user's "
+"configured ident setting."
+msgstr ""
+
+#: ../src/common/quassel.cpp:357
+msgctxt "Quassel|"
+msgid "Enable internal ident daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:359
+msgctxt "Quassel|"
+msgid ""
+"The port quasselcore will listen at for ident requests. Only meaningful with"
+" --ident-daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:362
+msgctxt "Quassel|"
+msgid ""
+"The address(es) quasselcore will listen on for ident requests. Same format "
+"as --listen."
+msgstr ""
+
+#: ../src/common/quassel.cpp:362 ../src/common/quassel.cpp:365
+#: ../src/common/quassel.cpp:371
+msgctxt "Quassel|"
+msgid "<address>[,...]"
+msgstr ""
+
+#: ../src/common/quassel.cpp:363
+msgctxt "Quassel|"
+msgid ""
+"Enable oidentd integration. In most cases you should also enable --strict-"
+"ident."
+msgstr ""
+
+#: ../src/common/quassel.cpp:364
+msgctxt "Quassel|"
+msgid "Set path to oidentd configuration file."
+msgstr ""
+
+#: ../src/common/quassel.cpp:364
+msgctxt "Quassel|"
+msgid "file"
+msgstr ""
+
+#: ../src/common/quassel.cpp:365
+msgctxt "Quassel|"
+msgid "Set IP range from which proxy protocol definitions are allowed"
+msgstr ""
+
+#: ../src/common/quassel.cpp:366
+msgctxt "Quassel|"
+msgid "Require SSL for remote (non-loopback) client connections."
+msgstr ""
+
+#: ../src/common/quassel.cpp:367
+msgctxt "Quassel|"
+msgid "Specify the path to the SSL certificate."
+msgstr ""
+
+#: ../src/common/quassel.cpp:368
+msgctxt "Quassel|"
+msgid "Specify the path to the SSL key."
+msgstr ""
+
+#: ../src/common/quassel.cpp:369
+msgctxt "Quassel|"
+msgid "Enable metrics API."
+msgstr ""
+
+#: ../src/common/quassel.cpp:370
+msgctxt "Quassel|"
+msgid ""
+"The port quasselcore will listen at for metrics requests. Only meaningful "
+"with --metrics-daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:371
+msgctxt "Quassel|"
+msgid ""
+"The address(es) quasselcore will listen on for metrics requests. Same format"
+" as --listen."
+msgstr ""
+
+#: ../src/common/quassel.cpp:377
+msgctxt "Quassel|"
+msgid "Supports one of Debug|Info|Warning|Error; default is Info."
+msgstr ""
+
+#: ../src/common/quassel.cpp:377
+msgctxt "Quassel|"
+msgid "level"
+msgstr ""
+
+#: ../src/common/quassel.cpp:378
+msgctxt "Quassel|"
+msgid "Log to a file."
+msgstr ""
+
+#: ../src/common/quassel.cpp:380
+msgctxt "Quassel|"
+msgid "Log to syslog."
+msgstr ""
+
+#: ../src/common/quassel.cpp:385
+msgctxt "Quassel|"
+msgid "Enable debug output."
+msgstr ""
+
+#: ../src/common/quassel.cpp:388
+msgctxt "Quassel|"
+msgid "Enables debugging for bufferswitches."
+msgstr ""
+
+#: ../src/common/quassel.cpp:389
+msgctxt "Quassel|"
+msgid "Enables debugging for models."
+msgstr ""
+
+#: ../src/common/quassel.cpp:394
+msgctxt "Quassel|"
+msgid ""
+"Enable logging of all raw IRC messages to debug log, including passwords!  "
+"In most cases you should also set --loglevel Debug"
+msgstr ""
+
+#: ../src/common/quassel.cpp:395
+msgctxt "Quassel|"
+msgid "Limit raw IRC logging to this network ID.  Implies --debug-irc"
+msgstr ""
+
+#: ../src/common/quassel.cpp:395 ../src/common/quassel.cpp:397
+msgctxt "Quassel|"
+msgid "database network ID"
+msgstr ""
+
+#: ../src/common/quassel.cpp:396
+msgctxt "Quassel|"
+msgid ""
+"Enable logging of all parsed IRC messages to debug log, including passwords!"
+"  In most cases you should also set --loglevel Debug"
+msgstr ""
+
+#: ../src/common/quassel.cpp:397
+msgctxt "Quassel|"
+msgid ""
+"Limit parsed IRC logging to this network ID.  Implies --debug-irc-parsed"
+msgstr ""
+
+#: ../src/common/quassel.cpp:404
+msgctxt "Quassel|"
+msgid "Quassel IRC is a modern, distributed IRC client."
+msgstr "Quassel IRC je moderen, porazdeljen odjemalec za IRC"
+
+#: ../src/common/util.cpp:181
 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "let"
 
-#: ../src/common/util.cpp:174
+#: ../src/common/util.cpp:183
 msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr "dni"
 
-#: ../src/common/util.cpp:175
+#: ../src/common/util.cpp:184
 msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr "ur"
 
-#: ../src/common/util.cpp:176
+#: ../src/common/util.cpp:185
 msgctxt "Quassel::secondsToString()|"
 msgid "min"
 msgstr "min"
 
-#: ../src/common/util.cpp:177
+#: ../src/common/util.cpp:186
 msgctxt "Quassel::secondsToString()|"
 msgid "sec"
 msgstr "sek"
 
-#: ../src/client/networkmodel.cpp:589
+#: ../src/client/networkmodel.cpp:543
 #, qt-format
 msgctxt "QueryBufferItem|"
 msgid "Query with %1"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:611
+#: ../src/client/networkmodel.cpp:566
 msgctxt "QueryBufferItem|"
 msgid "Unknown"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:617
+#: ../src/client/networkmodel.cpp:572
 msgctxt "QueryBufferItem|"
 msgid "Away message"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:619
+#: ../src/client/networkmodel.cpp:574
 msgctxt "QueryBufferItem|"
 msgid "Realname"
 msgstr "Pravo ime"
 
-#: ../src/client/networkmodel.cpp:625
+#: ../src/client/networkmodel.cpp:578
 msgctxt "QueryBufferItem|"
 msgid "Help status"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:626
+#: ../src/client/networkmodel.cpp:578
 msgctxt "QueryBufferItem|"
 msgid "Available for help"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:629
+#: ../src/client/networkmodel.cpp:581
 msgctxt "QueryBufferItem|"
 msgid "Service status"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:639
+#: ../src/client/networkmodel.cpp:591
 msgctxt "QueryBufferItem|"
 msgid "Not logged in"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:645 ../src/client/networkmodel.cpp:654
+#: ../src/client/networkmodel.cpp:597 ../src/client/networkmodel.cpp:604
 msgctxt "QueryBufferItem|"
 msgid "Account"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:655
+#: ../src/client/networkmodel.cpp:604
 msgctxt "QueryBufferItem|"
 msgid "Identified for this nick"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:661
+#: ../src/client/networkmodel.cpp:610
 msgctxt "QueryBufferItem|"
 msgid "Service Reply"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:665
+#: ../src/client/networkmodel.cpp:614
 msgctxt "QueryBufferItem|"
 msgid "Hostmask"
 msgstr "Maska gostitelja"
 
-#: ../src/client/networkmodel.cpp:669
+#: ../src/client/networkmodel.cpp:618
 msgctxt "QueryBufferItem|"
 msgid "Operator"
 msgstr "Operater"
 
-#: ../src/client/networkmodel.cpp:677
+#: ../src/client/networkmodel.cpp:626
 msgctxt "QueryBufferItem|"
 msgid "Idling since"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:681
+#: ../src/client/networkmodel.cpp:630
 msgctxt "QueryBufferItem|"
 msgid "Login time"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:684
+#: ../src/client/networkmodel.cpp:633
 msgctxt "QueryBufferItem|"
 msgid "Server"
 msgstr "Strežnik"
 
-#: ../src/client/networkmodel.cpp:690
+#: ../src/client/networkmodel.cpp:639
 msgctxt "QueryBufferItem|"
 msgid "No information available"
 msgstr ""
 
-#: ../src/qtui/ui/receivefiledlg.ui:14
+#: ../src/qtui/receivefiledlg.ui:14
 msgctxt "ReceiveFileDlg|"
 msgid "Incoming File Transfer"
 msgstr "Dohodni prenos datoteke"
 
-#: ../src/qtui/receivefiledlg.cpp:35
+#: ../src/qtui/receivefiledlg.cpp:36
 #, qt-format
 msgctxt "ReceiveFileDlg|"
 msgid "<b>%1</b> wants to send you a file:<br>%2 (%3 bytes)"
@@ -7877,6 +8379,26 @@ msgctxt "RemotePeer|"
 msgid "Disconnecting..."
 msgstr "Prekinjanje povezave ..."
 
+#: ../src/qtui/resourcetreedlg.ui:14
+msgctxt "ResourceTreeDlg|"
+msgid "Resource Tree"
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.ui:20
+msgctxt "ResourceTreeDlg|"
+msgid "Shows the contents of the compiled-in resource tree."
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.cpp:53
+msgctxt "ResourceTreeDlg|"
+msgid "File"
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.cpp:53
+msgctxt "ResourceTreeDlg|"
+msgid "Size"
+msgstr ""
+
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
 msgctxt "SaveIdentitiesDlg|"
 msgid "Sync With Core"
@@ -8011,35 +8533,35 @@ msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr "Geslo pos. strž.:"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1205
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1327
 msgctxt "ServerEditDlg|"
 msgid "Your Quassel core does not support this feature"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:1206
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1328
 msgctxt "ServerEditDlg|"
 msgid ""
 "You need a Quassel core v0.13.0 or newer in order to verify connection "
 "security."
 msgstr ""
 
-#: ../src/qtui/ui/settingsdlg.ui:14
+#: ../src/qtui/settingsdlg.ui:14
 msgctxt "SettingsDlg|"
 msgid "Configure Quassel"
 msgstr "Nastavi Quassel"
 
-#: ../src/qtui/ui/settingsdlg.ui:41 ../src/qtui/ui/settingsdlg.ui:56
-#: ../src/qtui/settingsdlg.cpp:112
+#: ../src/qtui/settingsdlg.ui:41 ../src/qtui/settingsdlg.ui:56
+#: ../src/qtui/settingsdlg.cpp:107
 msgctxt "SettingsDlg|"
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: ../src/qtui/settingsdlg.cpp:122
+#: ../src/qtui/settingsdlg.cpp:119
 msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr "Shrani spremembe"
 
-#: ../src/qtui/settingsdlg.cpp:123
+#: ../src/qtui/settingsdlg.cpp:120
 msgctxt "SettingsDlg|"
 msgid ""
 "There are unsaved changes on the current configuration page. Would you like "
@@ -8052,7 +8574,7 @@ msgctxt "SettingsDlg|"
 msgid "Configure %1"
 msgstr "Nastavi %1"
 
-#: ../src/qtui/settingsdlg.cpp:221
+#: ../src/qtui/settingsdlg.cpp:220
 msgctxt "SettingsDlg|"
 msgid "Reload Settings"
 msgstr "Znova naloži nastavitve"
@@ -8062,22 +8584,22 @@ msgctxt "SettingsDlg|"
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr "Ali želite znova naložiti nastavitve, pri čemer se spremembe izgubijo?"
 
-#: ../src/qtui/settingsdlg.cpp:232
+#: ../src/qtui/settingsdlg.cpp:234
 msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
 msgstr "Obnovi privzete vrednosti"
 
-#: ../src/qtui/settingsdlg.cpp:232
+#: ../src/qtui/settingsdlg.cpp:235
 msgctxt "SettingsDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Ali želite obnoviti privzete vrednosti za to stran?"
 
-#: ../src/qtui/ui/settingspagedlg.ui:14
+#: ../src/qtui/settingspagedlg.ui:14
 msgctxt "SettingsPageDlg|"
 msgid "Configure Quassel"
 msgstr "Nastavi Quassel"
 
-#: ../src/qtui/ui/settingspagedlg.ui:30
+#: ../src/qtui/settingspagedlg.ui:30
 msgctxt "SettingsPageDlg|"
 msgid "Settings"
 msgstr "Nastavitve"
@@ -8088,7 +8610,7 @@ msgctxt "SettingsPageDlg|"
 msgid "Configure %1"
 msgstr "Nastavi %1"
 
-#: ../src/qtui/settingspagedlg.cpp:120
+#: ../src/qtui/settingspagedlg.cpp:119
 msgctxt "SettingsPageDlg|"
 msgid "Reload Settings"
 msgstr "Znova naloži nastavitve"
@@ -8098,22 +8620,22 @@ msgctxt "SettingsPageDlg|"
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr "Ali želite znova naložiti nastavitve, pri čemer se spremembe izgubijo?"
 
-#: ../src/qtui/settingspagedlg.cpp:131
+#: ../src/qtui/settingspagedlg.cpp:133
 msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr "Obnovi privzete vrednosti"
 
-#: ../src/qtui/settingspagedlg.cpp:131
+#: ../src/qtui/settingspagedlg.cpp:134
 msgctxt "SettingsPageDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Ali želite obnoviti privzete vrednosti za to stran?"
 
-#: ../src/qtui/settingspages/shortcutsmodel.cpp:121
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:105
 msgctxt "ShortcutsModel|"
 msgid "Action"
 msgstr "Dejanje"
 
-#: ../src/qtui/settingspages/shortcutsmodel.cpp:123
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:107
 msgctxt "ShortcutsModel|"
 msgid "Shortcut"
 msgstr "Bližnjica"
@@ -8139,8 +8661,8 @@ msgid "Default:"
 msgstr "Privzeto:"
 
 #: ../src/qtui/settingspages/shortcutssettingspage.ui:75
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:99
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:111
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:96
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:108
 msgctxt "ShortcutsSettingsPage|"
 msgid "None"
 msgstr "Nobenega"
@@ -8150,115 +8672,115 @@ msgctxt "ShortcutsSettingsPage|"
 msgid "Custom:"
 msgstr "Po meri:"
 
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:63
 msgctxt "ShortcutsSettingsPage|"
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:63
 msgctxt "ShortcutsSettingsPage|"
 msgid "Shortcuts"
 msgstr "Bližnjice"
 
-#: ../src/common/signalproxy.cpp:792
+#: ../src/common/signalproxy.cpp:616
 msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr "Prekinjanje povezave"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:28
+#: ../src/qtui/simplenetworkeditor.ui:28
 msgctxt "SimpleNetworkEditor|"
 msgid "Network name:"
 msgstr "Ime omrežja:"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:35
+#: ../src/qtui/simplenetworkeditor.ui:35
 msgctxt "SimpleNetworkEditor|"
 msgid "The name of the IRC network you are configuring"
 msgstr "Ime omrežja IRC, ki ga nastavljate"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:63
+#: ../src/qtui/simplenetworkeditor.ui:63
 msgctxt "SimpleNetworkEditor|"
 msgid "Servers"
 msgstr "Strežniki"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:81
+#: ../src/qtui/simplenetworkeditor.ui:81
 msgctxt "SimpleNetworkEditor|"
 msgid "A list of IRC servers belonging to this network"
 msgstr "Seznam strežnikov, ki spadajo v to omrežje"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:96
+#: ../src/qtui/simplenetworkeditor.ui:96
 msgctxt "SimpleNetworkEditor|"
 msgid "Edit this server entry"
 msgstr "Uredi izbran vnos strežnika"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:99
+#: ../src/qtui/simplenetworkeditor.ui:99
 msgctxt "SimpleNetworkEditor|"
 msgid "&Edit..."
 msgstr "Ur&edi ..."
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:116
+#: ../src/qtui/simplenetworkeditor.ui:116
 msgctxt "SimpleNetworkEditor|"
 msgid "Add another IRC server"
 msgstr "Doda nov strežnik za IRC"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:119
+#: ../src/qtui/simplenetworkeditor.ui:119
 msgctxt "SimpleNetworkEditor|"
 msgid "&Add..."
 msgstr "Dod&aj ..."
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:136
+#: ../src/qtui/simplenetworkeditor.ui:136
 msgctxt "SimpleNetworkEditor|"
 msgid "Remove this server entry from the list"
 msgstr "Odstrani ta vnos strežnika s seznama"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:139
+#: ../src/qtui/simplenetworkeditor.ui:139
 msgctxt "SimpleNetworkEditor|"
 msgid "De&lete"
 msgstr "Iz&briši"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:165
+#: ../src/qtui/simplenetworkeditor.ui:165
 msgctxt "SimpleNetworkEditor|"
 msgid "Move upwards in list"
 msgstr "Premakni gor po seznamu"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:168
-#: ../src/qtui/ui/simplenetworkeditor.ui:182
+#: ../src/qtui/simplenetworkeditor.ui:168
+#: ../src/qtui/simplenetworkeditor.ui:182
 msgctxt "SimpleNetworkEditor|"
 msgid "..."
 msgstr "…"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:179
+#: ../src/qtui/simplenetworkeditor.ui:179
 msgctxt "SimpleNetworkEditor|"
 msgid "Move downwards in list"
 msgstr "Premakni dol po seznamu"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:226
+#: ../src/qtui/simplenetworkeditor.ui:226
 msgctxt "SimpleNetworkEditor|"
 msgid "Join Channels Automatically"
 msgstr "Samodejno se pridruži kanalom"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:250
+#: ../src/qtui/simplenetworkeditor.ui:250
 msgctxt "SimpleNetworkEditor|"
 msgid ""
 "A list of IRC channels you will join automatically after connecting to the "
 "network"
 msgstr "Seznam kanalov IRC, katerim se boste po vzpostavljeni povezavi v omrežje pridružili samodejno"
 
-#: ../src/qtui/snorenotificationbackend.cpp:56
+#: ../src/qtui/snorenotificationbackend.cpp:53
 msgctxt "SnoreNotificationBackend|"
 msgid "Private Message"
 msgstr "Zasebno sporočilo"
 
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:20
+#: ../src/qtui/snorentificationconfigwidget.ui:20
 msgctxt "SnoreNotificationConfigWidget|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:29
+#: ../src/qtui/snorentificationconfigwidget.ui:29
 msgctxt "SnoreNotificationConfigWidget|"
 msgid "Snore"
 msgstr "Snore"
 
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:40
+#: ../src/qtui/snorentificationconfigwidget.ui:40
 msgctxt "SnoreNotificationConfigWidget|"
 msgid "Enable Snore"
 msgstr "Omogoči smrčanje"
@@ -8273,19 +8795,19 @@ msgctxt "SonnetSettingsPage|"
 msgid "Spell Checking"
 msgstr ""
 
-#: ../src/core/sqlauthenticator.cpp:58
+#: ../src/core/sqlauthenticator.cpp:47
 msgctxt "SqlAuthenticator|"
 msgid "Database"
 msgstr ""
 
-#: ../src/core/sqlauthenticator.cpp:64
+#: ../src/core/sqlauthenticator.cpp:52
 msgctxt "SqlAuthenticator|"
 msgid ""
 "Do not authenticate against any remote service, but instead save a hashed "
 "and salted password in the database selected in the next step."
 msgstr ""
 
-#: ../src/core/sqlitestorage.cpp:67
+#: ../src/core/sqlitestorage.cpp:60
 msgctxt "SqliteStorage|"
 msgid ""
 "SQLite is a file-based database engine that does not require any setup. It "
@@ -8295,138 +8817,138 @@ msgid ""
 "your core."
 msgstr "SQLite je pogon za zbirko podatkov, ki temelji na datotekah in ne potrebuje nobenega nastavljanja. Primeren je za male in srednje-velike podatkovne zbirke, ki ne potrebujejo dostopa prek omrežja. Uporabite SQLite, če naj jedro Quassel shranjuje svoje podatke na računalniku, kjer teče, in če bo jedro uporabljalo malo uporabnikov."
 
-#: ../src/qtui/ui/sslinfodlg.ui:14
+#: ../src/qtui/sslinfodlg.ui:14
 msgctxt "SslInfoDlg|"
 msgid "Security Information"
 msgstr "Podrobnosti o varnosti"
 
-#: ../src/qtui/ui/sslinfodlg.ui:22
+#: ../src/qtui/sslinfodlg.ui:22
 msgctxt "SslInfoDlg|"
 msgid "<b>Hostname:</b>"
 msgstr "<b>Ime gostitelja:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:39
+#: ../src/qtui/sslinfodlg.ui:39
 msgctxt "SslInfoDlg|"
 msgid "<b>IP address:</b>"
 msgstr "<b>Naslov IP:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:56
+#: ../src/qtui/sslinfodlg.ui:56
 msgctxt "SslInfoDlg|"
 msgid "<b>Encryption:</b>"
 msgstr "<b>Å ifriranje:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:73
+#: ../src/qtui/sslinfodlg.ui:73
 msgctxt "SslInfoDlg|"
 msgid "<b>Protocol:</b>"
 msgstr "<b>Protokol:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:90
+#: ../src/qtui/sslinfodlg.ui:90
 msgctxt "SslInfoDlg|"
 msgid "<b>Certificate chain:</b>"
 msgstr "<b>Veriga potrdil:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:120
+#: ../src/qtui/sslinfodlg.ui:120
 msgctxt "SslInfoDlg|"
 msgid "Subject"
 msgstr "Zadeva"
 
-#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
+#: ../src/qtui/sslinfodlg.ui:126 ../src/qtui/sslinfodlg.ui:248
 msgctxt "SslInfoDlg|"
 msgid "<b>Common name:</b>"
 msgstr "<b>Splošno ime:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265
+#: ../src/qtui/sslinfodlg.ui:143 ../src/qtui/sslinfodlg.ui:265
 msgctxt "SslInfoDlg|"
 msgid "<b>Organization:</b>"
 msgstr "<b>Organizacija:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282
+#: ../src/qtui/sslinfodlg.ui:160 ../src/qtui/sslinfodlg.ui:282
 msgctxt "SslInfoDlg|"
 msgid "<b>Organizational unit:</b>"
 msgstr "<b>Organizacijska enota:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299
+#: ../src/qtui/sslinfodlg.ui:177 ../src/qtui/sslinfodlg.ui:299
 msgctxt "SslInfoDlg|"
 msgid "<b>Country:</b>"
 msgstr "<b>Država:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316
+#: ../src/qtui/sslinfodlg.ui:194 ../src/qtui/sslinfodlg.ui:316
 msgctxt "SslInfoDlg|"
 msgid "<b>State or province:</b>"
 msgstr "<b>Dežela ali pokrajina:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353
+#: ../src/qtui/sslinfodlg.ui:231 ../src/qtui/sslinfodlg.ui:353
 msgctxt "SslInfoDlg|"
 msgid "<b>Locality:</b>"
 msgstr "<b>Krajevnost:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:242
+#: ../src/qtui/sslinfodlg.ui:242
 msgctxt "SslInfoDlg|"
 msgid "Issuer"
 msgstr "Izdajatelj"
 
-#: ../src/qtui/ui/sslinfodlg.ui:367
+#: ../src/qtui/sslinfodlg.ui:367
 msgctxt "SslInfoDlg|"
 msgid "<b>Validity period:</b>"
 msgstr "<b>Obdobje veljavnosti:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:384
+#: ../src/qtui/sslinfodlg.ui:384
 msgctxt "SslInfoDlg|"
 msgid "<b>MD5 digest:</b>"
 msgstr "<b>Izvleček MD5:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:401
+#: ../src/qtui/sslinfodlg.ui:401
 msgctxt "SslInfoDlg|"
 msgid "<b>SHA1 digest:</b>"
 msgstr "<b>Izvleček SHA1:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:418
+#: ../src/qtui/sslinfodlg.ui:418
 msgctxt "SslInfoDlg|"
 msgid "<b>SHA256 digest:</b>"
 msgstr "<b>Izvleček SHA256:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:448
+#: ../src/qtui/sslinfodlg.ui:448
 msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
 msgstr "<b>Zaupano:</b>"
 
-#: ../src/qtui/sslinfodlg.cpp:71
+#: ../src/qtui/sslinfodlg.cpp:76
 msgctxt "SslInfoDlg|"
 msgid "Yes"
 msgstr "Da"
 
-#: ../src/qtui/sslinfodlg.cpp:73
+#: ../src/qtui/sslinfodlg.cpp:79
 msgctxt "SslInfoDlg|"
 msgid "No, for the following reasons:<ul>"
 msgstr "Ne, zaradi naslednjih razlogov:<ul>"
 
-#: ../src/qtui/sslinfodlg.cpp:80
+#: ../src/qtui/sslinfodlg.cpp:88
 #, qt-format
 msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr "%1 do %2"
 
-#: ../src/client/networkmodel.h:170
+#: ../src/client/networkmodel.h:169
 msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
 msgstr "Prikaz stanja"
 
-#: ../src/qtui/systemtray.cpp:49 ../src/qtui/systemtray.cpp:246
+#: ../src/qtui/systemtray.cpp:43 ../src/qtui/systemtray.cpp:203
 msgctxt "SystemTray|"
 msgid "&Minimize"
 msgstr "S&krči"
 
-#: ../src/qtui/systemtray.cpp:248
+#: ../src/qtui/systemtray.cpp:205
 msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr "&Obnovi"
 
-#: ../src/qtui/ui/systrayanimationconfigwidget.ui:20
+#: ../src/qtui/systrayanimationconfigwidget.ui:20
 msgctxt "SystrayAnimationConfigWidget|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/systrayanimationconfigwidget.ui:28
+#: ../src/qtui/systrayanimationconfigwidget.ui:28
 msgctxt "SystrayAnimationConfigWidget|"
 msgid ""
 "<html><head/><body><p>If enabled, alert the system tray or dock in case of a"
@@ -8437,27 +8959,27 @@ msgid ""
 " support changing the color of the tray icon.</p></body></html>"
 msgstr ""
 
-#: ../src/qtui/ui/systrayanimationconfigwidget.ui:31
+#: ../src/qtui/systrayanimationconfigwidget.ui:31
 msgctxt "SystrayAnimationConfigWidget|"
 msgid "Alert tray icon and"
 msgstr ""
 
-#: ../src/qtui/ui/systrayanimationconfigwidget.ui:54
+#: ../src/qtui/systrayanimationconfigwidget.ui:54
 msgctxt "SystrayAnimationConfigWidget|"
 msgid "do nothing"
 msgstr ""
 
-#: ../src/qtui/ui/systrayanimationconfigwidget.ui:59
+#: ../src/qtui/systrayanimationconfigwidget.ui:59
 msgctxt "SystrayAnimationConfigWidget|"
 msgid "change color"
 msgstr ""
 
-#: ../src/qtui/ui/systrayanimationconfigwidget.ui:64
+#: ../src/qtui/systrayanimationconfigwidget.ui:64
 msgctxt "SystrayAnimationConfigWidget|"
 msgid "blink"
 msgstr ""
 
-#: ../src/qtui/systraynotificationbackend.cpp:132
+#: ../src/qtui/systraynotificationbackend.cpp:131
 #, qt-format
 msgctxt "SystrayNotificationBackend|"
 msgid "%n pending highlight(s)"
@@ -8467,32 +8989,32 @@ msgstr[1] "%n čakajoča poudarka"
 msgstr[2] "%n čakajoči poudarki"
 msgstr[3] "%n čakajočih poudarkov"
 
-#: ../src/qtui/systraynotificationbackend.cpp:146
+#: ../src/qtui/systraynotificationbackend.cpp:145
 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr "Prikaži sporočilo v pojavnem oknu"
 
-#: ../src/uisupport/tabcompleter.cpp:52
+#: ../src/uisupport/tabcompleter.cpp:53
 msgctxt "TabCompleter|"
 msgid "Tab completion"
 msgstr "Dopolnjevanje s tabulatorjem"
 
-#: ../src/qtui/taskbarnotificationbackend.cpp:83
+#: ../src/qtui/taskbarnotificationbackend.cpp:78
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Activate dock entry, timeout:"
 msgstr "Omogoči vnos sidrišča, časovna omejitev:"
 
-#: ../src/qtui/taskbarnotificationbackend.cpp:85
+#: ../src/qtui/taskbarnotificationbackend.cpp:80
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Mark taskbar entry, timeout:"
 msgstr "Označi vnos v opravilni vrstici, časovna omejitev:"
 
-#: ../src/qtui/taskbarnotificationbackend.cpp:93
+#: ../src/qtui/taskbarnotificationbackend.cpp:88
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Unlimited"
 msgstr "Neomejeno"
 
-#: ../src/qtui/taskbarnotificationbackend.cpp:94
+#: ../src/qtui/taskbarnotificationbackend.cpp:89
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr " s"
@@ -8637,23 +9159,23 @@ msgctxt "ToolBarActionProvider|"
 msgid "Remove and ban user from channel"
 msgstr "Uporabnika odstrani in izobči iz kanala"
 
-#: ../src/qtui/ui/topicwidget.ui:32
+#: ../src/qtui/topicwidget.ui:32
 msgctxt "TopicWidget|"
 msgid "Form"
 msgstr "Obrazec"
 
-#: ../src/qtui/ui/topicwidget.ui:79
+#: ../src/qtui/topicwidget.ui:79
 msgctxt "TopicWidget|"
 msgid "..."
 msgstr "…"
 
-#: ../src/qtui/topicwidget.cpp:121 ../src/qtui/topicwidget.cpp:127
+#: ../src/qtui/topicwidget.cpp:116
 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Users: %1"
 msgstr "Uporabniki: %1"
 
-#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128
+#: ../src/qtui/topicwidget.cpp:117
 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Lag: %1 msecs"
@@ -8689,176 +9211,176 @@ msgctxt "TopicWidgetSettingsPage|"
 msgid "Topic Widget"
 msgstr "Gradnik s temo"
 
-#: ../src/common/transfer.cpp:95
+#: ../src/common/transfer.cpp:92
 msgctxt "Transfer|"
 msgid "New"
 msgstr "Nov"
 
-#: ../src/common/transfer.cpp:97
+#: ../src/common/transfer.cpp:94
 msgctxt "Transfer|"
 msgid "Pending"
 msgstr ""
 
-#: ../src/common/transfer.cpp:99
+#: ../src/common/transfer.cpp:96
 msgctxt "Transfer|"
 msgid "Connecting"
 msgstr ""
 
-#: ../src/common/transfer.cpp:101
+#: ../src/common/transfer.cpp:98
 msgctxt "Transfer|"
 msgid "Transferring"
 msgstr ""
 
-#: ../src/common/transfer.cpp:103
+#: ../src/common/transfer.cpp:100
 msgctxt "Transfer|"
 msgid "Paused"
 msgstr ""
 
-#: ../src/common/transfer.cpp:105
+#: ../src/common/transfer.cpp:102
 msgctxt "Transfer|"
 msgid "Completed"
 msgstr ""
 
-#: ../src/common/transfer.cpp:107
+#: ../src/common/transfer.cpp:104
 msgctxt "Transfer|"
 msgid "Failed"
 msgstr ""
 
-#: ../src/common/transfer.cpp:109
+#: ../src/common/transfer.cpp:106
 msgctxt "Transfer|"
 msgid "Rejected"
 msgstr ""
 
-#: ../src/client/transfermodel.cpp:47
+#: ../src/client/transfermodel.cpp:44
 msgctxt "TransferModel|"
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../src/client/transfermodel.cpp:47
+#: ../src/client/transfermodel.cpp:44
 msgctxt "TransferModel|"
 msgid "File"
 msgstr ""
 
-#: ../src/client/transfermodel.cpp:47
+#: ../src/client/transfermodel.cpp:44
 msgctxt "TransferModel|"
 msgid "Status"
 msgstr ""
 
-#: ../src/client/transfermodel.cpp:47
+#: ../src/client/transfermodel.cpp:44
 msgctxt "TransferModel|"
 msgid "Progress"
 msgstr ""
 
-#: ../src/client/transfermodel.cpp:47
+#: ../src/client/transfermodel.cpp:44
 msgctxt "TransferModel|"
 msgid "Transferred"
 msgstr ""
 
-#: ../src/client/transfermodel.cpp:47
+#: ../src/client/transfermodel.cpp:44
 msgctxt "TransferModel|"
 msgid "Speed"
 msgstr ""
 
-#: ../src/client/transfermodel.cpp:47
+#: ../src/client/transfermodel.cpp:44
 msgctxt "TransferModel|"
 msgid "Peer"
 msgstr ""
 
-#: ../src/client/transfermodel.cpp:47
+#: ../src/client/transfermodel.cpp:44
 msgctxt "TransferModel|"
 msgid "Peer Address"
 msgstr ""
 
-#: ../src/client/transfermodel.cpp:80
+#: ../src/client/transfermodel.cpp:75
 msgctxt "TransferModel|"
 msgid "Send"
 msgstr ""
 
-#: ../src/client/transfermodel.cpp:80
+#: ../src/client/transfermodel.cpp:75
 msgctxt "TransferModel|"
 msgid "Receive"
 msgstr ""
 
 #. Nick Message
-#: ../src/uisupport/uistyle.cpp:936
+#: ../src/uisupport/uistyle.cpp:915
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "You are now known as %DN%1%DN"
 msgstr "Sedaj ste znani kot %DN%1%DN"
 
-#: ../src/uisupport/uistyle.cpp:937
+#: ../src/uisupport/uistyle.cpp:917
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr "%DN%1%DN je sedaj znan kot %DN%2%DN"
 
 #. Mode Message
-#: ../src/uisupport/uistyle.cpp:941
+#: ../src/uisupport/uistyle.cpp:922
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "User mode: %DM%1%DM"
 msgstr "Uporabniški način: %DM%1%DM"
 
-#: ../src/uisupport/uistyle.cpp:942
+#: ../src/uisupport/uistyle.cpp:924
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr "Način %DM%1%DM od %DN%2%DN"
 
 #. Join Message
-#: ../src/uisupport/uistyle.cpp:946
+#: ../src/uisupport/uistyle.cpp:928
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH se je pridružil %DC%4%DC"
 
 #. Part Message
-#: ../src/uisupport/uistyle.cpp:949
+#: ../src/uisupport/uistyle.cpp:932
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH je zapustil %DC%4%DC"
 
 #. Quit Message
-#: ../src/uisupport/uistyle.cpp:954
+#: ../src/uisupport/uistyle.cpp:938
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr "%DN%1%DN %DH(%2@%3)%DH je končal"
 
 #. Kick Message
-#: ../src/uisupport/uistyle.cpp:962
+#: ../src/uisupport/uistyle.cpp:946
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr "%DN%1%DN je brcnil %DN%2%DN iz %DC%3%DC"
 
 #. Day Change Message
-#: ../src/uisupport/uistyle.cpp:977
+#: ../src/uisupport/uistyle.cpp:963
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
 msgstr "{dan se je spremenil na %1}"
 
-#: ../src/uisupport/uistyle.cpp:990
+#: ../src/uisupport/uistyle.cpp:975
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr "Združitev omrežij %DH%1%DH in %DH%2%DH Uporabniki, ki so se pridružili: "
 
-#: ../src/uisupport/uistyle.cpp:994 ../src/uisupport/uistyle.cpp:1010
+#: ../src/uisupport/uistyle.cpp:979 ../src/uisupport/uistyle.cpp:995
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN (%2 more)"
 msgstr "%DN%1%DN (Å¡e %2)"
 
-#: ../src/uisupport/uistyle.cpp:1005
+#: ../src/uisupport/uistyle.cpp:990
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr "Ločitev omrežij %DH%1%DH in %DH%2%DH. Uporabniki, ki so končali: "
 
-#: ../src/client/networkmodel.cpp:1031
+#: ../src/client/networkmodel.cpp:954
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Owner(s)"
@@ -8868,7 +9390,7 @@ msgstr[1] "%n lastnika"
 msgstr[2] "%n lastniki"
 msgstr[3] "%n lastnikov"
 
-#: ../src/client/networkmodel.cpp:1033
+#: ../src/client/networkmodel.cpp:956
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Admin(s)"
@@ -8878,7 +9400,7 @@ msgstr[1] "%n skrbnika"
 msgstr[2] "%n skrbniki"
 msgstr[3] "%n skrbnikov"
 
-#: ../src/client/networkmodel.cpp:1035
+#: ../src/client/networkmodel.cpp:958
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Operator(s)"
@@ -8888,7 +9410,7 @@ msgstr[1] "%n operaterja"
 msgstr[2] "%n operaterji"
 msgstr[3] "%n operaterjev"
 
-#: ../src/client/networkmodel.cpp:1037
+#: ../src/client/networkmodel.cpp:960
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Half-Op(s)"
@@ -8898,7 +9420,7 @@ msgstr[1] "%n pol-operaterja"
 msgstr[2] "%n pol-operaterji"
 msgstr[3] "%n pol-operaterjev"
 
-#: ../src/client/networkmodel.cpp:1039
+#: ../src/client/networkmodel.cpp:962
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Voiced"
@@ -8908,7 +9430,7 @@ msgstr[1] "%n z glasovno pravico"
 msgstr[2] "%n z glasovno pravico"
 msgstr[3] "%n z glasovno pravico"
 
-#: ../src/client/networkmodel.cpp:1041
+#: ../src/client/networkmodel.cpp:964
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n User(s)"