Update translations from Transifex

[quassel.git] / po / sv.po

diff --git a/po/sv.po b/po/sv.po
index b995241..7b1d56b 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,193 +1,864 @@
 # 
 # Translators:
-# Daniel Albers <daniel@lbe.rs>, 2012.
-# Daniel Albers <daniel@lbers.com>, 2011.
-# Daniel Nylander <po@danielnylander.se>, 2010, 2011.
+# Daniel Albers <daniel@lbe.rs>, 2012
+# Daniel Albers <daniel@lbers.com>, 2011
+# Daniel Nylander <po@danielnylander.se>, 2010-2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Quassel IRC\n"
 "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
-"PO-Revision-Date: 2012-01-24 16:00+0000\n"
+"PO-Revision-Date: 2018-11-27 13:59+0000\n"
 "Last-Translator: Daniel Albers <daniel@lbe.rs>\n"
-"Language-Team: Swedish (http://www.transifex.net/projects/p/quassel/team/sv/)\n"
+"Language-Team: Swedish (http://www.transifex.com/quassel/quassel/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Qt-Contexts: true\n"
 
-#: ../src/qtui/ui/aboutdlg.ui:17
+#: ../src/uisupport/aboutdata.cpp:117
+msgctxt "AboutData|"
+msgid "Quassel IRC"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:120
+msgctxt "AboutData|"
+msgid "A modern, distributed IRC client"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:152
+msgctxt "AboutData|"
+msgid "Project founder, lead developer"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:153
+msgctxt "AboutData|"
+msgid "Project motivator, lead developer"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:154
+msgctxt "AboutData|"
+msgid "Former lead developer"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:155
+msgctxt "AboutData|"
+msgid "Master of Translation, many fixes and enhancements, Travis support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:156
+msgctxt "AboutData|"
+msgid "Many features, fixes and improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:157
+msgctxt "AboutData|"
+msgid "Many fixes and improvements, bug and patch triaging, community support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:158
+msgctxt "AboutData|"
+msgid ""
+"IRCv3 support, documentation, many other improvements, testing, outstanding "
+"PRs"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:159
+msgctxt "AboutData|"
+msgid ""
+"Quasseldroid, architecture, (mobile) performance, many other improvements "
+"and fixes, testing"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:163
+msgctxt "AboutData|"
+msgid "OSX UI improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:164 ../src/uisupport/aboutdata.cpp:179
+msgctxt "AboutData|"
+msgid "Chatview improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:165
+msgctxt "AboutData|"
+msgid "Early beta tester and bughunter, Danish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:166 ../src/uisupport/aboutdata.cpp:244
+#: ../src/uisupport/aboutdata.cpp:273 ../src/uisupport/aboutdata.cpp:285
+msgctxt "AboutData|"
+msgid "Spanish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:167
+msgctxt "AboutData|"
+msgid "Build system fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:168 ../src/uisupport/aboutdata.cpp:308
+msgctxt "AboutData|"
+msgid "Database performance improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:169
+msgctxt "AboutData|"
+msgid "Tray icon fix"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:170
+msgctxt "AboutData|"
+msgid "Language improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:171
+msgctxt "AboutData|"
+msgid "Documentation improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:172 ../src/uisupport/aboutdata.cpp:278
+msgctxt "AboutData|"
+msgid "Brazilian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:173 ../src/uisupport/aboutdata.cpp:247
+msgctxt "AboutData|"
+msgid "Slovenian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:174 ../src/uisupport/aboutdata.cpp:200
+#: ../src/uisupport/aboutdata.cpp:203 ../src/uisupport/aboutdata.cpp:221
+#: ../src/uisupport/aboutdata.cpp:230 ../src/uisupport/aboutdata.cpp:252
+#: ../src/uisupport/aboutdata.cpp:268 ../src/uisupport/aboutdata.cpp:288
+#: ../src/uisupport/aboutdata.cpp:325
+msgctxt "AboutData|"
+msgid "Fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:175 ../src/uisupport/aboutdata.cpp:300
+msgctxt "AboutData|"
+msgid "Romanian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:176
+msgctxt "AboutData|"
+msgid "Punjabi translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:177 ../src/uisupport/aboutdata.cpp:239
+#: ../src/uisupport/aboutdata.cpp:254 ../src/uisupport/aboutdata.cpp:255
+msgctxt "AboutData|"
+msgid "Finnish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:178
+msgctxt "AboutData|"
+msgid "Message indicator support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:180 ../src/uisupport/aboutdata.cpp:181
+#: ../src/uisupport/aboutdata.cpp:324
+msgctxt "AboutData|"
+msgid "Build system fix"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:182
+msgctxt "AboutData|"
+msgid "Windows build system fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:183
+msgctxt "AboutData|"
+msgid "AppData metadata, LDAP support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:184
+msgctxt "AboutData|"
+msgid "Nicer tooltips, spell check and other improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:185
+msgctxt "AboutData|"
+msgid "Crash fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:186 ../src/uisupport/aboutdata.cpp:211
+#: ../src/uisupport/aboutdata.cpp:289
+msgctxt "AboutData|"
+msgid "French translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:187
+msgctxt "AboutData|"
+msgid "Occitan translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:188
+msgctxt "AboutData|"
+msgid "Usability review"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:189
+msgctxt "AboutData|"
+msgid "SASL support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:190
+msgctxt "AboutData|"
+msgid "Various improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:191 ../src/uisupport/aboutdata.cpp:192
+#: ../src/uisupport/aboutdata.cpp:197
+msgctxt "AboutData|"
+msgid "Various fixes and improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:193
+msgctxt "AboutData|"
+msgid "Settings fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:194 ../src/uisupport/aboutdata.cpp:272
+msgctxt "AboutData|"
+msgid "Galician translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:317
+msgctxt "AboutData|"
+msgid "Esperanto translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:196
+msgctxt "AboutData|"
+msgid "Japanese translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:198 ../src/uisupport/aboutdata.cpp:275
+msgctxt "AboutData|"
+msgid "Gentoo maintainer"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:199 ../src/uisupport/aboutdata.cpp:215
+#: ../src/uisupport/aboutdata.cpp:320
+msgctxt "AboutData|"
+msgid "Certificate handling improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:201
+msgctxt "AboutData|"
+msgid "Early beta tester and bughunter (on Vista™!)"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:202
+msgctxt "AboutData|"
+msgid "Translation system fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:204
+msgctxt "AboutData|"
+msgid "OSX Notification Center support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:205 ../src/uisupport/aboutdata.cpp:222
+#: ../src/uisupport/aboutdata.cpp:323 ../src/uisupport/aboutdata.cpp:329
+msgctxt "AboutData|"
+msgid "Turkish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:206 ../src/uisupport/aboutdata.cpp:270
+msgctxt "AboutData|"
+msgid "Mac fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:207
+msgctxt "AboutData|"
+msgid "D-Bus notifications"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:208
+msgctxt "AboutData|"
+msgid "Polish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:209 ../src/uisupport/aboutdata.cpp:290
+msgctxt "AboutData|"
+msgid "Build system improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:210
+msgctxt "AboutData|"
+msgid "Formatting support and other input line improvements, many other fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:212
+msgctxt "AboutData|"
+msgid "BluesTheme stylesheet"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:213 ../src/uisupport/aboutdata.cpp:259
+#: ../src/uisupport/aboutdata.cpp:301 ../src/uisupport/aboutdata.cpp:321
+msgctxt "AboutData|"
+msgid "Russian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:214 ../src/uisupport/aboutdata.cpp:263
+msgctxt "AboutData|"
+msgid "Italian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:216 ../src/uisupport/aboutdata.cpp:250
+#: ../src/uisupport/aboutdata.cpp:260 ../src/uisupport/aboutdata.cpp:264
+#: ../src/uisupport/aboutdata.cpp:267 ../src/uisupport/aboutdata.cpp:318
+msgctxt "AboutData|"
+msgid "German translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:217
+msgctxt "AboutData|"
+msgid "Sanitize topic handling, twitch.tv support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:218
+msgctxt "AboutData|"
+msgid "Norwegian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:219
+msgctxt "AboutData|"
+msgid "Hungarian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:220
+msgctxt "AboutData|"
+msgid "IRC parser improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:223
+msgctxt "AboutData|"
+msgid "Windows build support and Appveyor maintenance, snorenotify backend"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:224
+msgctxt "AboutData|"
+msgid "Initial Qt5 support"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:225
+msgctxt "AboutData|"
+msgid "{Ku|U}buntu packager, motivator, promoter"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:226
+msgctxt "AboutData|"
+msgid "Various features and improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:227 ../src/uisupport/aboutdata.cpp:228
+#: ../src/uisupport/aboutdata.cpp:238 ../src/uisupport/aboutdata.cpp:245
+#: ../src/uisupport/aboutdata.cpp:266 ../src/uisupport/aboutdata.cpp:282
+#: ../src/uisupport/aboutdata.cpp:295
+msgctxt "AboutData|"
+msgid "Various fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:229 ../src/uisupport/aboutdata.cpp:233
+#: ../src/uisupport/aboutdata.cpp:287 ../src/uisupport/aboutdata.cpp:292
+#: ../src/uisupport/aboutdata.cpp:304
+msgctxt "AboutData|"
+msgid "Bugfixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:231 ../src/uisupport/aboutdata.cpp:319
+#: ../src/uisupport/aboutdata.cpp:322
+msgctxt "AboutData|"
+msgid "Czech translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:232
+msgctxt "AboutData|"
+msgid "Python improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:234
+msgctxt "AboutData|"
+msgid "Proxy improvements, Spanish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:235
+msgctxt "AboutData|"
+msgid "Postgres migration fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:236 ../src/uisupport/aboutdata.cpp:240
+#: ../src/uisupport/aboutdata.cpp:279
+msgctxt "AboutData|"
+msgid "Danish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:237
+msgctxt "AboutData|"
+msgid "Context menu fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:241
+msgctxt "AboutData|"
+msgid "Many fixes and improvements, bug triaging"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:242
+msgctxt "AboutData|"
+msgid "Original \"All-Seeing Eye\" logo"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:243
+msgctxt "AboutData|"
+msgid "Project founder, various improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:246
+msgctxt "AboutData|"
+msgid "Serbian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:248
+msgctxt "AboutData|"
+msgid ""
+"Tireless tester, {Ku|U}buntu tester and lobbyist, liters of delicious "
+"Finnish alcohol"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:249
+msgctxt "AboutData|"
+msgid "Qt5 porting help, Travis CI setup"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:251
+msgctxt "AboutData|"
+msgid "Buffer merge improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:253 ../src/uisupport/aboutdata.cpp:305
+#: ../src/uisupport/aboutdata.cpp:306 ../src/uisupport/aboutdata.cpp:312
+#: ../src/uisupport/aboutdata.cpp:313
+msgctxt "AboutData|"
+msgid "Greek translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:256
+msgctxt "AboutData|"
+msgid "OSX improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:257
+msgctxt "AboutData|"
+msgid "Lithuanian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:258
+msgctxt "AboutData|"
+msgid "Documentation fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:261 ../src/uisupport/aboutdata.cpp:294
+msgctxt "AboutData|"
+msgid "Improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:262
+msgctxt "AboutData|"
+msgid "Ideas, hacking, initial motivation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:265
+msgctxt "AboutData|"
+msgid "Many fixes and improvements, Sonnet support, QuasselDroid"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:269
+msgctxt "AboutData|"
+msgid "German translation, fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:271
+msgctxt "AboutData|"
+msgid "Many fixes and improvements; Ubuntu PPAs"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:274
+msgctxt "AboutData|"
+msgid "Tons of Oxygen icons including the Quassel logo"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:276
+msgctxt "AboutData|"
+msgid "Initial design and main window layout"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:277
+msgctxt "AboutData|"
+msgid "Early beta tester and bughunter"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:280
+msgctxt "AboutData|"
+msgid "Linewrap for input line"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:281
+msgctxt "AboutData|"
+msgid "Performance improvements and cleanups"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:283
+msgctxt "AboutData|"
+msgid "/print command"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:284
+msgctxt "AboutData|"
+msgid "Performance improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:286
+msgctxt "AboutData|"
+msgid "Hindi and Marathi translations"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:291
+msgctxt "AboutData|"
+msgid ""
+"Windows build support, automated OSX builds in Travis, various improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:293
+msgctxt "AboutData|"
+msgid "Emacs keybindings"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:296
+msgctxt "AboutData|"
+msgid "Highlight configuration improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:297
+msgctxt "AboutData|"
+msgid "Debian/Kubuntu packager, (packaging/build system) bughunter"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:298
+msgctxt "AboutData|"
+msgid "Bugfixes, German translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:299
+msgctxt "AboutData|"
+msgid "Audio backend improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:302
+msgctxt "AboutData|"
+msgid "Chinese translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:303
+msgctxt "AboutData|"
+msgid "Dutch translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:307 ../src/uisupport/aboutdata.cpp:310
+msgctxt "AboutData|"
+msgid "Korean translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:309
+msgctxt "AboutData|"
+msgid "Alias improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:311
+msgctxt "AboutData|"
+msgid "Norwegian translation, documentation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:314
+msgctxt "AboutData|"
+msgid "Former Windows builder"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:315
+msgctxt "AboutData|"
+msgid "Fixes, Debian packaging"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:316
+msgctxt "AboutData|"
+msgid "Fixes and feedback"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:326
+msgctxt "AboutData|"
+msgid "Network detection improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:327
+msgctxt "AboutData|"
+msgid "Ukrainian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:328
+msgctxt "AboutData|"
+msgid "Portuguese translation"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.ui:17
 msgctxt "AboutDlg|"
 msgid "About Quassel"
 msgstr "Om Quassel"
 
-#: ../src/qtui/ui/aboutdlg.ui:59
+#: ../src/qtui/aboutdlg.ui:59
 msgctxt "AboutDlg|"
 msgid ""
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel IRC</p></body></html>"
-msgstr ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; font-weight:600; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel IRC</p></body></html>"
-
-#: ../src/qtui/ui/aboutdlg.ui:75
-msgctxt "AboutDlg|"
-msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Version 0.2.0-pre, Build &gt;= 474 (2008-02-08)</p></body></html>"
-msgstr ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; font-weight:600; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Version 0.2.0-pre, Byggd &gt;= 474 (2008-02-08)</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:115
+#: ../src/qtui/aboutdlg.ui:112
 msgctxt "AboutDlg|"
 msgid "&About"
 msgstr "&Om"
 
-#: ../src/qtui/ui/aboutdlg.ui:135
+#: ../src/qtui/aboutdlg.ui:132
 msgctxt "AboutDlg|"
 msgid "A&uthors"
 msgstr "U&pphovsmän"
 
-#: ../src/qtui/ui/aboutdlg.ui:155
+#: ../src/qtui/aboutdlg.ui:152
 msgctxt "AboutDlg|"
 msgid "&Contributors"
 msgstr "&Bidragsgivare"
 
-#: ../src/qtui/ui/aboutdlg.ui:175
+#: ../src/qtui/aboutdlg.ui:172
 msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr "&Tack till"
 
-#: ../src/qtui/aboutdlg.cpp:32
+#: ../src/qtui/aboutdlg.cpp:44
+msgctxt "AboutDlg|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:49
 #, qt-format
 msgctxt "AboutDlg|"
-msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
-msgstr "<b>Version:</b> %1<br><b>Protokollversion:</b> %2<br><b>Byggd:</b> %3"
+msgid ""
+"<b>Version:</b> %1<br><b>Version date:</b> %2<br><b>Protocol version:</b> %3"
+msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:46
+#: ../src/qtui/aboutdlg.cpp:65
+#, qt-format
 msgctxt "AboutDlg|"
 msgid ""
-"<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2012 by the "
-"Quassel Project<br><a href=\"http://quassel-irc.org\">http://quassel-"
+"<b>A modern, distributed IRC Client</b><br><br>&copy;%1 by the Quassel "
+"Project<br><a href=\"https://quassel-irc.org\">https://quassel-"
 "irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a"
-" href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
-"licensed under <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a>"
-" and <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Most "
-"icons are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen "
-"Team</a> and used under the <a "
-"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Please use "
-"<a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to "
+" href=\"https://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
+"licensed under <a "
+"href=\"https://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> and <a "
+"href=\"https://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br><a "
+"href=\"https://api.kde.org/frameworks/breeze-icons/html\">Breeze icon "
+"theme</a> &copy; Uri Herrera and others, licensed under the <a "
+"href=\"https://github.com/KDE/breeze-icons/blob/21ffd9b/COPYING-"
+"ICONS\">LGPLv3</a>.<br><a href=\"https://api.kde.org/frameworks/oxygen-"
+"icons5/html\">Oxygen icon theme</a> &copy; Nuno Pinheiro and others, "
+"licensed under the <a href=\"https://github.com/KDE/oxygen-"
+"icons/blob/master/COPYING\">LGPLv3</a>.<br><br>Please use <a "
+"href=\"https://bugs.quassel-irc.org\">https://bugs.quassel-irc.org</a> to "
 "report bugs."
 msgstr ""
-"<b>En modern, distribuerad IRC-klient</b><br><br>&copy;2005-2012 Quassel-"
-"projektet<br><a href=\"http://quassel-irc.org\">http://quassel-"
-"irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> på <a"
-" href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC är dubbel-"
-"licensierad under <a "
-"href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> och <a "
-"href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>De flesta "
-"ikoner är &copy; av <a href=\"http://www.oxygen-icons.org\">Oxygen Team</a> "
-"och används under <a "
-"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Använd <a "
-"href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> för att"
-" rapportera fel."
-
-#: ../src/qtui/aboutdlg.cpp:62
+
+#: ../src/qtui/aboutdlg.cpp:85
 msgctxt "AboutDlg|"
 msgid "Quassel IRC is mainly developed by:"
 msgstr "Quassel IRC utvecklas huvudsakligen av:"
 
-#: ../src/qtui/aboutdlg.cpp:77
+#: ../src/qtui/aboutdlg.cpp:98
 msgctxt "AboutDlg|"
 msgid ""
 "We would like to thank the following contributors (in alphabetical order) "
 "and everybody we forgot to mention here:"
+msgstr "Vi vill tacka följande bidragsgivare (i alfabetisk ordning) och alla som vi har glömt att nämna här:"
+
+#: ../src/qtui/aboutdlg.cpp:104
+msgctxt "AboutDlg|"
+msgid ""
+"...and anybody else finding and reporting bugs, giving feedback, helping "
+"others and being part of the community!"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:110
+msgctxt "AboutDlg|"
+msgid "Special thanks goes to:"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:116
+msgctxt "AboutDlg|"
+msgid "for the original Quassel logo - The All-Seeing Eye"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:122
+msgctxt "AboutDlg|"
+msgid "for the Oxygen Quassel logo"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:128
+msgctxt "AboutDlg|"
+msgid "for the amazing Breeze and Oxygen icon themes"
 msgstr ""
-"Vi vill tacka följande bidragsgivare (i alfabetisk ordning) och alla som vi "
-"har glömt att nämna här:"
 
-#: ../src/qtui/aboutdlg.cpp:135
+#: ../src/qtui/aboutdlg.cpp:134
 msgctxt "AboutDlg|"
 msgid ""
-"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"
-"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>for the original Quassel "
-"icon - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a"
-" href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for "
-"creating all the artwork you see throughout Quassel</dd><dt><img "
-"src=\":/pics/qt-logo-32.png\">&nbsp;<b><a "
-"href=\"http://www.trolltech.com\">Qt Software formerly known as "
-"Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring "
-"development of QuasselTopia with Greenphones and more</dd><dt><a "
-"href=\"http://www.nokia.com\"><img "
-"src=\":/pics/nokia.png\"></a></b></dt><dd>for keeping Qt alive, and for "
-"sponsoring development of Quassel Mobile with N810s</dd>"
-msgstr ""
-"Speciella tack till:<br><dl><dt><img src=\":/pics/quassel-"
-"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>för den ursprungliga "
-"Quassel-ikonen - The All-Seeing Eye</dt><dt><img "
-"src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-"
-"icons.org\">The Oxygen Team</a></b></dt><dd>för att de skapat grafiken du "
-"ser i Quassel</dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a "
-"href=\"http://www.trolltech.com\">Qt Software tidigare kända som "
-"Trolltech</a></b></dt><dd>för att de skapat Qt och Qtopia samt att de "
-"sponsrat utvecklingen av QuasselTopia med Greenphones och mera</dd><dt><a "
-"href=\"http://www.nokia.com\"><img "
-"src=\":/pics/nokia.png\"></a></b></dt><dd>för att de håller Qt vid liv och "
-"för att de sponsrat utvecklingen av Quassel Mobile med N810</dd>"
-
-#: ../src/core/abstractsqlstorage.cpp:115
+"for creating an awesome framework, and for sponsoring development with "
+"Greenphones, N810s, N950s and more"
+msgstr ""
+
+#: ../src/core/abstractsqlstorage.cpp:133
 #, qt-format
 msgctxt "AbstractSqlStorage|"
 msgid ""
-"Installed Schema (version %1) is not up to date. Upgrading to version %2..."
+"Installed database schema (version %1) is not up to date. Upgrading to "
+"version %2...  This may take a while for major upgrades."
 msgstr ""
-"Installerat schema (version %1) är inte uppdaterat. Uppgraderar till version"
-" %2..."
 
-#: ../src/core/abstractsqlstorage.cpp:117
+#: ../src/core/abstractsqlstorage.cpp:141
 msgctxt "AbstractSqlStorage|"
 msgid "Upgrade failed..."
 msgstr "Uppgradering misslyckades..."
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:55
+#: ../src/core/abstractsqlstorage.cpp:146
+#, qt-format
+msgctxt "AbstractSqlStorage|"
+msgid "Installed database schema successfully upgraded to version %1."
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:54
 msgctxt "AliasesModel|"
 msgid ""
 "<b>The shortcut for the alias</b><br />It can be used as a regular slash "
 "command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:59
+#: ../src/qtui/settingspages/aliasesmodel.cpp:75
+msgctxt "AliasesModel|"
+msgid "The string the shortcut will be expanded to"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:77
+msgctxt "AliasesModel|"
+msgid "Special variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:83
+msgctxt "AliasesModel|"
+msgid "Parameter variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:84
+msgctxt "AliasesModel|"
+msgid "i'th parameter"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:85
+msgctxt "AliasesModel|"
+msgid "i'th to j'th parameter separated by spaces"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:86
+msgctxt "AliasesModel|"
+msgid "all parameters from i on separated by spaces"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:89
+msgctxt "AliasesModel|"
+msgid "Nickname parameter variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:91
+msgctxt "AliasesModel|"
+msgid ""
+"account of user identified by i'th parameter, or a '*' if logged out or "
+"unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:93
+msgctxt "AliasesModel|"
+msgid "hostname of user identified by i'th parameter, or a '*' if unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:94
+msgctxt "AliasesModel|"
+msgid "ident of user identified by i'th parameter, or a '*' if unknown"
+msgstr ""
+
+#: ../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:100
+msgctxt "AliasesModel|"
+msgid "General variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:101
+msgctxt "AliasesModel|"
+msgid "the whole string"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:102
+msgctxt "AliasesModel|"
+msgid "your current nickname"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:103
+msgctxt "AliasesModel|"
+msgid "the name of the selected channel"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:109
+msgctxt "AliasesModel|"
+msgid "Multiple commands can be separated with semicolons"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
+msgctxt "AliasesModel|"
+msgid "Example:"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
+msgctxt "AliasesModel|"
+msgid "\"Test $1; Test $2; Test All $0\""
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:113
 msgctxt "AliasesModel|"
 msgid ""
-"<b>The string the shortcut will be expanded to</b><br /><b>special "
-"variables:</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - "
-"<b>$i..j</b> represents the i'th to j'th parameter separated by spaces.<br "
-"/> - <b>$i..</b> represents all parameters from i on separated by spaces.<br"
-" /> - <b>$i:hostname</b> represents the hostname of the user identified by "
-"the i'th parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br"
-" /> - <b>$nick</b> your current nickname<br /> - <b>$channel</b> the name of"
-" the selected channel<br /><br />Multiple commands can be separated with "
-"semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will"
-" be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test "
-"All 1 2 3\" when called like /test 1 2 3"
+"...will be expanded to three separate messages \"Test 1\", \"Test 2\" and "
+"\"Test All 1 2 3\" when called like <i>/test 1 2 3</i>"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:170
+#: ../src/qtui/settingspages/aliasesmodel.cpp:228
 msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:171
+#: ../src/qtui/settingspages/aliasesmodel.cpp:228
 msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr "Expanderat"
@@ -224,96 +895,118 @@ msgstr "Formulär"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgctxt "AppearanceSettingsPage|"
-msgid "Client style:"
-msgstr "Klientstil:"
+msgid "Language:"
+msgstr "Språk:"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgctxt "AppearanceSettingsPage|"
+msgid "Set the application language. Requires restart!"
+msgstr "Ställ in programmets språk. Kräver omstart!"
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:33
+msgctxt "AppearanceSettingsPage|"
+msgid "<Untranslated>"
+msgstr "<Ej översatt>"
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:38
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:80
+msgctxt "AppearanceSettingsPage|"
+msgid "<System Default>"
+msgstr "<Systemets standard>"
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:59
+msgctxt "AppearanceSettingsPage|"
+msgid "Widget style:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:66
+msgctxt "AppearanceSettingsPage|"
 msgid "Set application style"
 msgstr "Ställ in applikationsutseende"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:36
+#: ../src/qtui/settingspages/appearancesettingspage.ui:73
 msgctxt "AppearanceSettingsPage|"
-msgid "Language:"
-msgstr "Språk:"
+msgid "Fallback icon theme:"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:43
+#: ../src/qtui/settingspages/appearancesettingspage.ui:80
 msgctxt "AppearanceSettingsPage|"
-msgid "Set the application language. Requires restart!"
-msgstr "Ställ in programmets språk. Kräver omstart!"
+msgid ""
+"<html><head/><body><p>Icon theme to use for icons that are not found in the "
+"current system theme. Requires the selected theme to be installed either "
+"system-wide, or as part of the Quassel installation.</p><p>Supported themes "
+"are Breeze, Breeze Dark and Oxygen, all of KDE fame.</p></body></html>"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+#: ../src/qtui/settingspages/appearancesettingspage.ui:87
 msgctxt "AppearanceSettingsPage|"
-msgid "<Untranslated>"
-msgstr "<Ej översatt>"
+msgid ""
+"<html><head/><body><p>If enabled, uses the selected fallback icon theme "
+"instead of the configured system theme for all icons. Recommended if you "
+"want Quassel to have a consistent look-and-feel.</p></body></html>"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:52
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:74
+#: ../src/qtui/settingspages/appearancesettingspage.ui:90
 msgctxt "AppearanceSettingsPage|"
-msgid "<System Default>"
-msgstr "<Systemets standard>"
+msgid "Override system theme"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:75
+#: ../src/qtui/settingspages/appearancesettingspage.ui:110
 msgctxt "AppearanceSettingsPage|"
 msgid "Use custom stylesheet"
 msgstr "Använd anpassad stilmall"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:109
-msgctxt "AppearanceSettingsPage|"
-msgid "Path:"
-msgstr "Sökväg:"
-
-#: ../src/qtui/settingspages/appearancesettingspage.ui:141
+#: ../src/qtui/settingspages/appearancesettingspage.ui:148
 msgctxt "AppearanceSettingsPage|"
 msgid "..."
 msgstr "..."
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:150
+#: ../src/qtui/settingspages/appearancesettingspage.ui:172
 msgctxt "AppearanceSettingsPage|"
 msgid "Show system tray icon"
 msgstr "Visa systemfältsikon"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:184
+#: ../src/qtui/settingspages/appearancesettingspage.ui:188
 msgctxt "AppearanceSettingsPage|"
-msgid "Hide to tray on close button"
-msgstr "Stängknapp minimerar till systemfält"
+msgid "Invert brightness"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:216
+#: ../src/qtui/settingspages/appearancesettingspage.ui:233
 msgctxt "AppearanceSettingsPage|"
-msgid "Enable animations"
-msgstr "Aktivera animeringar"
+msgid "Hide to tray on close button"
+msgstr "Stängknapp minimerar till systemfält"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:231
+#: ../src/qtui/settingspages/appearancesettingspage.ui:248
 msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
 msgstr "Omdirigering av meddelanden"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:237
+#: ../src/qtui/settingspages/appearancesettingspage.ui:257
 msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:280
+#: ../src/qtui/settingspages/appearancesettingspage.ui:300
 msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
 msgstr "Tjänst:"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:294
+#: ../src/qtui/settingspages/appearancesettingspage.ui:314
 msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
 msgstr "Standardmål"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:301
+#: ../src/qtui/settingspages/appearancesettingspage.ui:321
 msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr "Statusfönster"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:308
+#: ../src/qtui/settingspages/appearancesettingspage.ui:328
 msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
 msgstr "Aktuell chatt"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:315
+#: ../src/qtui/settingspages/appearancesettingspage.ui:335
 msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr "Fel:"
@@ -323,22 +1016,32 @@ msgctxt "AppearanceSettingsPage|"
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:225
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:46
+msgctxt "AppearanceSettingsPage|"
+msgid "Icon theme:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:108
+msgctxt "AppearanceSettingsPage|"
+msgid "Automatic"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:281
 msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
 msgstr "Välj en stilmallsfil"
 
-#: ../src/qtui/awaylogview.cpp:33
+#: ../src/qtui/awaylogview.cpp:34
 msgctxt "AwayLogView|"
 msgid "Away Log"
 msgstr "Borta:"
 
-#: ../src/qtui/awaylogview.cpp:44
+#: ../src/qtui/awaylogview.cpp:46
 msgctxt "AwayLogView|"
 msgid "Show Network Name"
 msgstr "Visa nätverksnamn"
 
-#: ../src/qtui/awaylogview.cpp:49
+#: ../src/qtui/awaylogview.cpp:52
 msgctxt "AwayLogView|"
 msgid "Show Buffer Name"
 msgstr "Visa buffertnamn"
@@ -390,7 +1093,7 @@ msgstr ""
 #: ../src/qtui/settingspages/backlogsettingspage.ui:138
 msgctxt "BacklogSettingsPage|"
 msgid ""
-"amount of messages per buffer that are requested after the core connection "
+"Amount of messages per buffer that are requested after the core connection "
 "has been established."
 msgstr ""
 
@@ -458,28 +1161,28 @@ msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr ""
 
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:29
 msgctxt "BacklogSettingsPage|"
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:29
 msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:346
+#: ../src/client/networkmodel.cpp:443
 #, qt-format
 msgctxt "BufferItem|"
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
-#: ../src/uisupport/bufferview.cpp:248
+#: ../src/uisupport/bufferview.cpp:257
 msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr "Slå ihop buffertar permanent?"
 
-#: ../src/uisupport/bufferview.cpp:249
+#: ../src/uisupport/bufferview.cpp:258
 #, qt-format
 msgctxt "BufferView|"
 msgid ""
@@ -487,6 +1190,11 @@ msgid ""
 " This cannot be reversed!"
 msgstr ""
 
+#: ../src/uisupport/bufferview.cpp:715
+msgctxt "BufferViewDock|"
+msgid "Search..."
+msgstr ""
+
 #: ../src/qtui/settingspages/buffervieweditdlg.ui:14
 msgctxt "BufferViewEditDlg|"
 msgid "Dialog"
@@ -497,12 +1205,12 @@ msgctxt "BufferViewEditDlg|"
 msgid "Please enter a name for the chat list:"
 msgstr "Ange ett namn för chattlistan:"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:520
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:568
 msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr "Lägg till chattlista"
 
-#: ../src/uisupport/bufferviewfilter.cpp:52
+#: ../src/uisupport/bufferviewfilter.cpp:45
 msgctxt "BufferViewFilter|"
 msgid "Show / Hide Chats"
 msgstr "Visa / Dölj chattar"
@@ -538,7 +1246,7 @@ msgid "Network:"
 msgstr "Nätverk:"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:117
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:127
 msgctxt "BufferViewSettingsPage|"
 msgid "All"
 msgstr "Alla"
@@ -572,163 +1280,164 @@ msgstr "Dölj inaktiva chattar"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
 msgctxt "BufferViewSettingsPage|"
+msgid "Hide inactive networks"
+msgstr ""
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
+msgctxt "BufferViewSettingsPage|"
 msgid "Add new chats automatically"
 msgstr "Lägg till nya chattar automatiskt"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
 msgctxt "BufferViewSettingsPage|"
 msgid "Sort alphabetically"
 msgstr "Sortera alfabetiskt"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:163
+msgctxt "BufferViewSettingsPage|"
+msgid "Show search"
+msgstr ""
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:170
 msgctxt "BufferViewSettingsPage|"
 msgid "Minimum Activity:"
 msgstr "Ingen aktivitet"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:178
 msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
 msgstr "Ingen aktivitet"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:183
 msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
 msgstr "Annan Aktivitet"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:188
 msgctxt "BufferViewSettingsPage|"
 msgid "New Message"
 msgstr "Nytt meddelande"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:179
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:193
 msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
 msgstr "Markera"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:219
 msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr "Förhandsgranskning:"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:38
 msgctxt "BufferViewSettingsPage|"
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:38
 msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
 msgstr "Anpassade chattlistor"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:342
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:372
 msgctxt "BufferViewSettingsPage|"
 msgid "Delete Chat List?"
 msgstr "Ta bort chattlista?"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:343
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:373
 #, qt-format
 msgctxt "BufferViewSettingsPage|"
 msgid "Do you really want to delete the chat list \"%1\"?"
 msgstr "Vill du verkligen ta bort chattlistan \"%1\"?"
 
-#: ../src/qtui/ui/bufferviewwidget.ui:26
+#: ../src/qtui/bufferviewwidget.ui:26
 msgctxt "BufferViewWidget|"
 msgid "BufferView"
 msgstr ""
 
-#: ../src/qtui/bufferwidget.cpp:79
+#: ../src/qtui/bufferwidget.cpp:74
 msgctxt "BufferWidget|"
 msgid "Zoom In"
 msgstr "Zooma in"
 
-#: ../src/qtui/bufferwidget.cpp:85
+#: ../src/qtui/bufferwidget.cpp:75
 msgctxt "BufferWidget|"
 msgid "Zoom Out"
 msgstr "Zooma ut"
 
-#: ../src/qtui/bufferwidget.cpp:90
+#: ../src/qtui/bufferwidget.cpp:76
 msgctxt "BufferWidget|"
 msgid "Actual Size"
 msgstr "Faktisk storlek"
 
-#: ../src/qtui/bufferwidget.cpp:94
+#: ../src/qtui/bufferwidget.cpp:78
 msgctxt "BufferWidget|"
 msgid "Set Marker Line"
 msgstr "Markörlinje:"
 
-#: ../src/qtui/bufferwidget.cpp:98
+#: ../src/qtui/bufferwidget.cpp:81
 msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr "Markörlinje:"
 
-#: ../src/client/networkmodel.cpp:503
+#: ../src/client/networkmodel.cpp:719
 #, qt-format
 msgctxt "ChannelBufferItem|"
-msgid "<b>Channel %1</b>"
-msgstr "<b>Kanal %1</b>"
+msgid "Channel %1"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:506
-#, qt-format
+#: ../src/client/networkmodel.cpp:723
 msgctxt "ChannelBufferItem|"
-msgid "<b>Users:</b> %1"
-msgstr "<b>Användare:</b> %1"
+msgid "Users"
+msgstr "Användare"
 
-#: ../src/client/networkmodel.cpp:510
-#, qt-format
+#: ../src/client/networkmodel.cpp:728
 msgctxt "ChannelBufferItem|"
-msgid "<b>Mode:</b> %1"
-msgstr "<b>Läge:</b> %1"
+msgid "Mode"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:521
-#, qt-format
+#: ../src/client/networkmodel.cpp:738
 msgctxt "ChannelBufferItem|"
-msgid "<b>Topic:</b> %1"
-msgstr "<b>Ämne:</b> %1"
+msgid "Topic"
+msgstr "Ämne"
 
-#: ../src/client/networkmodel.cpp:525
+#: ../src/client/networkmodel.cpp:745
 msgctxt "ChannelBufferItem|"
-msgid "Not active <br /> Double-click to join"
+msgid "Not active, double-click to join"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:528
-#, qt-format
-msgctxt "ChannelBufferItem|"
-msgid "<p> %1 </p>"
-msgstr "<p> %1 </p>"
-
-#: ../src/qtui/ui/channellistdlg.ui:14
+#: ../src/qtui/channellistdlg.ui:14
 msgctxt "ChannelListDlg|"
 msgid "Channel List"
 msgstr "Kanallista"
 
-#: ../src/qtui/ui/channellistdlg.ui:38
+#: ../src/qtui/channellistdlg.ui:38
 msgctxt "ChannelListDlg|"
 msgid "Search Pattern:"
 msgstr "Sökmönster:"
 
-#: ../src/qtui/ui/channellistdlg.ui:48
+#: ../src/qtui/channellistdlg.ui:48
 msgctxt "ChannelListDlg|"
 msgid ""
 "Toggle between simple and advanced mode.\n"
-"Advanced mode allows to pass search strings to the IRC Server."
+"Advanced mode allows one to pass search strings to the IRC Server."
 msgstr ""
 
-#: ../src/qtui/ui/channellistdlg.ui:62
+#: ../src/qtui/channellistdlg.ui:62
 msgctxt "ChannelListDlg|"
 msgid "Show Channels"
 msgstr "Visa kanaler"
 
-#: ../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 "Fel har inträffat:"
 
-#: ../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"
@@ -737,13 +1446,7 @@ msgid ""
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</span></p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
-msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER KATASTROF FEL ARGHH!!11</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
+msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER KATASTROF FEL ARGHH!!11</span></p>\n<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:14
 msgctxt "ChatMonitorSettingsPage|"
@@ -765,13 +1468,7 @@ msgid ""
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-weight:600;\">Operation modes:</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;\"><span style=\" font-weight:400; text-decoration: underline;\">Opt-In:</span> <span style=\" font-weight:400;\">Only buffers on the right side are shown in chatmonitor</span></p>\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" text-decoration: underline;\">Opt-Out:</span> Buffers on the right side will be ignored in chatmonitor</p></body></html>"
-msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
-"p, li { white-space: pre-wrap; }\n"
-"</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;\">\n"
-"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER KATASTROF FEL ARGHH!!11</span></p>\n"
-"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
+msgstr "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\np, li { white-space: pre-wrap; }\n</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-weight:400; font-style:normal;\">\n<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:'Lucida Grande'; font-size:13pt;\">SUPER KATASTROF FEL ARGHH!!11</span></p>\n<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
 msgctxt "ChatMonitorSettingsPage|"
@@ -789,7 +1486,7 @@ msgid "Move selected buffers to the right"
 msgstr "Flytta valda buffertar till höger"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:236
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:274
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr "Visa:"
@@ -810,6 +1507,37 @@ msgctxt "ChatMonitorSettingsPage|"
 msgid "Show own messages"
 msgstr "Visa egna meddelanden"
 
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:182
+msgctxt "ChatMonitorSettingsPage|"
+msgid ""
+"Show own messages in chatmonitor even if the originating buffer is ignored"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:185
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include ignored buffers"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:194
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Display messages from backlog on reconnect"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:197
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Show messages from backlog"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:222
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include read messages from backlog on reconnect"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:225
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include read messages"
+msgstr ""
+
 #: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Interface"
@@ -820,74 +1548,234 @@ msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr "Chattmonitor"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:58
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:239
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:277
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr "Ignorera:"
 
-#: ../src/qtui/chatmonitorview.cpp:52
+#: ../src/qtui/chatmonitorview.cpp:58
 msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
 msgstr "Visa egna meddelanden"
 
-#: ../src/qtui/chatmonitorview.cpp:59
+#: ../src/qtui/chatmonitorview.cpp:66
 msgctxt "ChatMonitorView|"
 msgid "Show Network Name"
 msgstr "Visa nätverksnamn"
 
-#: ../src/qtui/chatmonitorview.cpp:64
+#: ../src/qtui/chatmonitorview.cpp:72
 msgctxt "ChatMonitorView|"
 msgid "Show Buffer Name"
 msgstr "Visa buffertnamn"
 
-#: ../src/qtui/chatmonitorview.cpp:71
+#: ../src/qtui/chatmonitorview.cpp:80
 msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr "Konfigurera..."
 
-#: ../src/qtui/chatscene.cpp:743
+#: ../src/qtui/chatscene.cpp:796
 msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr "Kopiera markering"
 
-#: ../src/qtui/ui/chatviewsearchbar.ui:13
+#: ../src/qtui/chatscene.cpp:806
+#, qt-format
+msgctxt "ChatScene|"
+msgid "Search '%1'"
+msgstr ""
+
+#: ../src/qtui/chatscene.cpp:818
+msgctxt "ChatScene|"
+msgid "Reset Column Widths"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:14
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Form"
+msgstr "Formulär"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:20
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Show colored text in the chat window"
+msgstr "Visa färgad text i chattfönstret"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:23
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Allow colored text (mIRC color codes)"
+msgstr "Tillåt färgad text (mIRC-färgkoder)"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:39
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Custom Colors"
+msgstr "Anpassade färger"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:60
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Action:"
+msgstr "Åtgärd:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:67
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:91
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:115
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:155
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:179
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:210
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:234
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:258
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:282
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:299
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:361
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:378
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:395
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:412
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:429
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:446
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:463
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:480
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:497
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:514
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:531
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:548
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:565
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:582
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:599
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:616
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:657
+msgctxt "ChatViewColorSettingsPage|"
+msgid "..."
+msgstr "..."
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:84
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Timestamp:"
+msgstr "Tidsstämpel:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:108
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Channel message:"
+msgstr "Kanalmeddelande:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:148
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight foreground:"
+msgstr "Markera"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:172
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Command message:"
+msgstr "Kanalmeddelande:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:196
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight background:"
+msgstr "Bakgrund:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:203
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Server message:"
+msgstr "Servermeddelande:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:227
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Marker line:"
+msgstr "Markörlinje:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:251
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Error message:"
+msgstr "Felmeddelande:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:275
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Background:"
+msgstr "Bakgrund:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:332
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color senders in chat based on nicknames"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:335
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Use Sender Coloring"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:650
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Own messages:"
+msgstr "Egna meddelanden:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:689
+msgctxt "ChatViewColorSettingsPage|"
+msgid ""
+"Color sender nicknames in action messages, e.g.<br/>-*- <span style=\" font-"
+"style:italic;\">Nick</span> does an action"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:692
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color senders in action messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:708
+msgctxt "ChatViewColorSettingsPage|"
+msgid ""
+"Color nicknames in joins, parts, quits, and other messages, e.g.<br/>--> "
+"<span style=\" font-style:italic;\">Nick</span> joined #quassel"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:711
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color nicknames in other messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Interface"
+msgstr "Gränssnitt"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Chat View Colors"
+msgstr ""
+
+#: ../src/qtui/chatviewsearchbar.ui:13
 msgctxt "ChatViewSearchBar|"
 msgid "Form"
 msgstr "Formulär"
 
-#: ../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 "skiftlägeskänslig"
 
-#: ../src/qtui/ui/chatviewsearchbar.ui:62
+#: ../src/qtui/chatviewsearchbar.ui:62
 msgctxt "ChatViewSearchBar|"
 msgid "search nick"
 msgstr "sök smeknanm"
 
-#: ../src/qtui/ui/chatviewsearchbar.ui:69
+#: ../src/qtui/chatviewsearchbar.ui:69
 msgctxt "ChatViewSearchBar|"
 msgid "search message"
 msgstr "sök meddelande"
 
-#: ../src/qtui/ui/chatviewsearchbar.ui:82
+#: ../src/qtui/chatviewsearchbar.ui:82
 msgctxt "ChatViewSearchBar|"
 msgid "ignore joins, parts, etc."
 msgstr ""
@@ -899,185 +1787,286 @@ msgstr "Formulär"
 
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:22
 msgctxt "ChatViewSettingsPage|"
-msgid "Timestamp format:"
-msgstr "Format för tidsstämpel:"
+msgid "Use a custom format for the timestamp"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:32
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:25
 msgctxt "ChatViewSettingsPage|"
-msgid "[hh:mm:ss]"
-msgstr "[hh:mm:ss]"
+msgid "Custom timestamp format:"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:59
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:41
 msgctxt "ChatViewSettingsPage|"
-msgid "Custom chat window font:"
-msgstr "Anpassat chattfönstertypsnitt"
+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 ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:92
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:54
 msgctxt "ChatViewSettingsPage|"
-msgid "Show colored text in the chat window"
-msgstr "Visa färgad text i chattfönstret"
+msgid " hh:mm:ss"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:95
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:79
 msgctxt "ChatViewSettingsPage|"
-msgid "Allow colored text (mIRC color codes)"
-msgstr "Tillåt färgad text (mIRC-färgkoder)"
+msgid "Shows <brackets> around the names of senders"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:82
+msgctxt "ChatViewSettingsPage|"
+msgid "Show brackets around sender names"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:100
+msgctxt "ChatViewSettingsPage|"
+msgid "Show sender modes before nicknames:"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:107
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"<qt><style>.bold { font-weight: bold; } .italic { font-style: italic; } .underline { text-decoration: underline; }</style>\n"
+"<p><span class=\"bold\">Sender modes:</span></p>\n"
+"<p><span class=\"underline\">No modes:</span> Don't show any modes<br/><span class=\"italic\">Example:</span> &lt;nickname&gt;</p>\n"
+"<p><span class=\"underline\">Highest mode:</span> Show only the highest active mode<br/><span class=\"italic\">Example:</span> &lt;@nickname&gt;</p>\n"
+"<p><span class=\"underline\">All modes:</span> Show all active modes<br/><span class=\"italic\">Example:</span> &lt;@+nickname&gt;</p>\n"
+"</qt>"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:142
+msgctxt "ChatViewSettingsPage|"
+msgid "Custom chat window font:"
+msgstr "Anpassat chattfönstertypsnitt"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:111
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:175
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Show a website preview window when hovering the mouse over a web address"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:114
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:178
 msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:130
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:194
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Set the marker line to the bottom of the current chat window when selecting "
 "another channel"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:133
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:197
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when switching chats"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:149
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:213
 msgctxt "ChatViewSettingsPage|"
-msgid "Custom Colors"
-msgstr "Anpassade färger"
+msgid ""
+"Set the marker line to the bottom of the current chat window when Quassel "
+"loses focus."
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:167
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:216
 msgctxt "ChatViewSettingsPage|"
-msgid "Action:"
-msgstr "Åtgärd:"
+msgid "Set marker line automatically when Quassel loses focus"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:174
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:198
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:222
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:259
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:283
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:314
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:338
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:362
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:386
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:403
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:443
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:460
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:477
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:494
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:511
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:528
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:545
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:562
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:579
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:596
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:613
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:630
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:647
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:664
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:681
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:698
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:726
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:234
 msgctxt "ChatViewSettingsPage|"
-msgid "..."
-msgstr "..."
+msgid "Web Search URL:"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:191
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:241
 msgctxt "ChatViewSettingsPage|"
-msgid "Timestamp:"
-msgstr "Tidsstämpel:"
+msgid ""
+"<html><head/><body><p>The URL to open with the selected text as the "
+"parameter. Place <span style=\" font-weight:600;\">%s</span> where selected "
+"text should go.</p><p>Eg:</p><p>https://www.google.com/search?q=<span "
+"style=\" font-weight:600;\">%s<br/></span>https://duckduckgo.com/?q=<span "
+"style=\" font-weight:600;\">%s</span></p></body></html>"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:215
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:247
 msgctxt "ChatViewSettingsPage|"
-msgid "Channel message:"
-msgstr "Kanalmeddelande:"
+msgid "https://www.google.com/search?q=%s"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:252
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:30
 msgctxt "ChatViewSettingsPage|"
-msgid "Highlight foreground:"
-msgstr "Markera"
+msgid "Interface"
+msgstr "Gränssnitt"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:276
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:30
 msgctxt "ChatViewSettingsPage|"
-msgid "Command message:"
-msgstr "Kanalmeddelande:"
+msgid "Chat View"
+msgstr "Chattvy"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:300
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:44
 msgctxt "ChatViewSettingsPage|"
-msgid "Highlight background:"
-msgstr "Bakgrund:"
+msgid "You need at least version 0.6 of Quassel Core to use this feature"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:307
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:54
 msgctxt "ChatViewSettingsPage|"
-msgid "Server message:"
-msgstr "Servermeddelande:"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:331
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:55
 msgctxt "ChatViewSettingsPage|"
-msgid "Marker line:"
-msgstr "Markörlinje:"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to show sender modes "
+"before nicknames."
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:67
+msgctxt "ChatViewSettingsPage|"
+msgid "No modes"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:68
+msgctxt "ChatViewSettingsPage|"
+msgid "Highest mode"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:69
+msgctxt "ChatViewSettingsPage|"
+msgid "All modes"
+msgstr ""
+
+#: ../src/client/client.cpp:276
+msgctxt "Client|"
+msgid "Identity already exists in client!"
+msgstr "Identiteten finns redan i klienten!"
+
+#: ../src/client/clientauthhandler.cpp:64
+#: ../src/client/clientauthhandler.cpp:495
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection canceled"
+msgstr "Okrypterad anslutning"
+
+#: ../src/client/clientauthhandler.cpp:97
+#: ../src/client/clientauthhandler.cpp:112
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connecting to %1..."
+msgstr "Ansluter till %1..."
+
+#: ../src/client/clientauthhandler.cpp:108
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Looking up %1..."
+msgstr "Slår upp %1..."
+
+#: ../src/client/clientauthhandler.cpp:115
+#: ../src/client/clientauthhandler.cpp:331
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Connected to %1"
+msgstr "Ansluten till %1"
+
+#: ../src/client/clientauthhandler.cpp:119
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Disconnecting from %1..."
+msgstr "Kopplar från %1..."
+
+#: ../src/client/clientauthhandler.cpp:123
+msgctxt "ClientAuthHandler|"
+msgid "Disconnected"
+msgstr "Frånkopplad"
+
+#: ../src/client/clientauthhandler.cpp:157
+msgctxt "ClientAuthHandler|"
+msgid "Reconnecting in compatibility mode..."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:247
+msgctxt "ClientAuthHandler|"
+msgid ""
+"<b>Incompatible Quassel Core!</b><br>None of the protocols this client "
+"speaks are supported by the core you are trying to connect to."
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:250
+msgctxt "ClientAuthHandler|"
+msgid "Core speaks none of the protocols we support"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:264
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid ""
+"<b>The Quassel Core you are trying to connect to is too old!</b><br>We need "
+"at least protocol v%1, but the core speaks v%2 only."
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:355
-msgctxt "ChatViewSettingsPage|"
-msgid "Error message:"
-msgstr "Felmeddelande:"
+#: ../src/client/clientauthhandler.cpp:267
+msgctxt "ClientAuthHandler|"
+msgid "Incompatible protocol version, connection to core refused"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:379
-msgctxt "ChatViewSettingsPage|"
-msgid "Background:"
-msgstr "Bakgrund:"
+#: ../src/client/clientauthhandler.cpp:287
+msgctxt "ClientAuthHandler|"
+msgid "Synchronizing to core..."
+msgstr "Synkroniserar till %1..."
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:423
-msgctxt "ChatViewSettingsPage|"
-msgid "Use Sender Coloring"
+#: ../src/client/clientauthhandler.cpp:301
+msgctxt "ClientAuthHandler|"
+msgid "The core refused connection from this client"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:719
-msgctxt "ChatViewSettingsPage|"
-msgid "Own messages:"
-msgstr "Egna meddelanden:"
+#: ../src/client/clientauthhandler.cpp:324
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core does not support the following features: %1"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
-msgctxt "ChatViewSettingsPage|"
-msgid "Interface"
-msgstr "Gränssnitt"
+#: ../src/client/clientauthhandler.cpp:327
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core supports unknown features: %1"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
-msgctxt "ChatViewSettingsPage|"
-msgid "Chat View"
-msgstr "Chattvy"
+#: ../src/client/clientauthhandler.cpp:368
+msgctxt "ClientAuthHandler|"
+msgid "Logging in..."
+msgstr "Loggar in..."
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
-msgctxt "ChatViewSettingsPage|"
-msgid "You need at 0.6 quasselcore to use this feature"
-msgstr "Du behöver minst quasselcore 0.6 för att använda denna funktion"
+#: ../src/client/clientauthhandler.cpp:373
+msgctxt "ClientAuthHandler|"
+msgid "Login canceled"
+msgstr ""
 
-#: ../src/client/client.cpp:270
-msgctxt "Client|"
-msgid "Identity already exists in client!"
-msgstr "Identiteten finns redan i klienten!"
+#: ../src/client/clientauthhandler.cpp:427
+msgctxt "ClientAuthHandler|"
+msgid "Unencrypted connection cancelled"
+msgstr ""
 
-#: ../src/client/clientbacklogmanager.cpp:161
+#: ../src/client/clientbacklogmanager.cpp:171
 #, qt-format
 msgctxt "ClientBacklogManager|"
 msgid "Processed %1 messages in %2 seconds."
 msgstr "Behandlade %1 meddelanden på %2 sekunder."
 
-#: ../src/client/clientbufferviewmanager.cpp:52
+#: ../src/client/clientbufferviewmanager.cpp:54
 msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr "Alla chattar"
 
-#: ../src/client/clientuserinputhandler.cpp:88
+#: ../src/client/clientuserinputhandler.cpp:95
 msgctxt "ClientUserInputHandler|"
 msgid "/JOIN expects a channel"
 msgstr "/JOIN förväntar sig en kanal"
 
-#: ../src/client/clientuserinputhandler.cpp:98
+#: ../src/client/clientuserinputhandler.cpp:106
 msgctxt "ClientUserInputHandler|"
 msgid "/QUERY expects at least a nick"
 msgstr "/QUERY förväntar sig minst ett smeknamn"
@@ -1146,392 +2135,515 @@ msgctxt "ConnectionSettingsPage|"
 msgid "Minimum delay between requests:"
 msgstr ""
 
+#: ../src/qtui/settingspages/connectionsettingspage.ui:250
+msgctxt "ConnectionSettingsPage|"
+msgid "Enable standard-compliant CTCP behavior"
+msgstr ""
+
 #: ../src/qtui/settingspages/connectionsettingspage.cpp:27
 msgctxt "ConnectionSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/chatitem.cpp:683
+#: ../src/qtui/chatitem.cpp:825
 msgctxt "ContentsChatItem|"
 msgid "Copy Link Address"
 msgstr "Kopiera länkadress"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:38
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
 msgctxt "ContextMenuActionProvider|"
 msgid "Connect"
 msgstr "Anslut"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/contextmenuactionprovider.cpp:40
 msgctxt "ContextMenuActionProvider|"
 msgid "Disconnect"
 msgstr "Koppla från"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:41
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
 msgctxt "ContextMenuActionProvider|"
 msgid "Join"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
 msgctxt "ContextMenuActionProvider|"
 msgid "Part"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:43
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
 msgctxt "ContextMenuActionProvider|"
 msgid "Delete Chat(s)..."
 msgstr "Ta bort chattlista?"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:44
+#: ../src/uisupport/contextmenuactionprovider.cpp:45
 msgctxt "ContextMenuActionProvider|"
 msgid "Go to Chat"
 msgstr "Gå till chatt"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:46
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
+msgctxt "ContextMenuActionProvider|"
+msgid "Joins/Parts/Quits"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
 msgctxt "ContextMenuActionProvider|"
 msgid "Joins"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgctxt "ContextMenuActionProvider|"
 msgid "Parts"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgctxt "ContextMenuActionProvider|"
 msgid "Quits"
 msgstr "A&vsluta"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgctxt "ContextMenuActionProvider|"
 msgid "Nick Changes"
 msgstr "Smeknamnsändringar"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgctxt "ContextMenuActionProvider|"
 msgid "Mode Changes"
 msgstr "Smeknamnsändringar"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgctxt "ContextMenuActionProvider|"
 msgid "Day Changes"
 msgstr "Smeknamnsändringar"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgctxt "ContextMenuActionProvider|"
 msgid "Topic Changes"
 msgstr "Smeknamnsändringar"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
 msgctxt "ContextMenuActionProvider|"
 msgid "Set as Default..."
 msgstr "Ställ in som standard..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:56
 msgctxt "ContextMenuActionProvider|"
 msgid "Use Defaults..."
 msgstr "Ställ in som standard..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:56
+#: ../src/uisupport/contextmenuactionprovider.cpp:58
 msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr "Gå in i kanal..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:58
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
 msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
 msgstr "Fråga"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:59
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr "Visa frågor"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/contextmenuactionprovider.cpp:62
 msgctxt "ContextMenuActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:62
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
 msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr "Version"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:63
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
 msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
 msgctxt "ContextMenuActionProvider|"
 msgid "Ping"
 msgstr "Ping"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
 msgctxt "ContextMenuActionProvider|"
 msgid "Client info"
 msgstr "Klientinformation"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:66
+#: ../src/uisupport/contextmenuactionprovider.cpp:68
 msgctxt "ContextMenuActionProvider|"
 msgid "Custom..."
 msgstr "Anpassad..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:78
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:79
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:80
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
+msgctxt "ContextMenuActionProvider|"
+msgid "Give Half-Operator Status"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
+msgctxt "ContextMenuActionProvider|"
+msgid "Take Half-Operator Status"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr "Sparka ut från kanalen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
 msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr "Bannlys från kanalen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:88
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr "Sparka och bannlys"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:86
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Temporarily"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:87
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Permanently"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:88
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
 msgstr "Visa kanallista"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:89
+#: ../src/uisupport/contextmenuactionprovider.cpp:93
+msgctxt "ContextMenuActionProvider|"
+msgid "Configure"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:94
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
 msgstr "Visa ignoreringslista"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:102
+#: ../src/uisupport/contextmenuactionprovider.cpp:109
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Events"
 msgstr "Dölj händelser"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:110
+#: ../src/uisupport/contextmenuactionprovider.cpp:117
 msgctxt "ContextMenuActionProvider|"
 msgid "CTCP"
 msgstr "CTCP"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:122
+#: ../src/uisupport/contextmenuactionprovider.cpp:132
 msgctxt "ContextMenuActionProvider|"
 msgid "Actions"
 msgstr "Åtgärder"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:126
+#: ../src/uisupport/contextmenuactionprovider.cpp:136
 msgctxt "ContextMenuActionProvider|"
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:131
+#: ../src/uisupport/contextmenuactionprovider.cpp:141
 msgctxt "ContextMenuActionProvider|"
 msgid "Add Ignore Rule"
 msgstr "Lägg till ignoreringsregel"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:132
+#: ../src/uisupport/contextmenuactionprovider.cpp:142
 msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr "Befintliga regler"
 
-#: ../src/core/core.cpp:182
+#: ../src/core/core.cpp:100
+msgctxt "Core|"
+msgid "Invalid core settings version!"
+msgstr ""
+
+#: ../src/core/core.cpp:167
+#, qt-format
+msgctxt "Core|"
+msgid "Cannot configure from environment: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:171
 msgctxt "Core|"
-msgid "Could not initialize any storage backend! Exiting..."
+msgid "Cannot configure from environment!"
 msgstr ""
 
-#: ../src/core/core.cpp:183
+#: ../src/core/core.cpp:177
 msgctxt "Core|"
 msgid ""
+"Could not initialize any storage backend! Exiting...\n"
 "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
 "Qt library with the sqlite or postgres plugin enabled in order for quasselcore\n"
 "to work."
 msgstr ""
 
+#: ../src/core/core.cpp:184
+msgctxt "Core|"
+msgid "Cannot write quasselcore configuration; probably a permission problem."
+msgstr ""
+
 #: ../src/core/core.cpp:232
 msgctxt "Core|"
+msgid "Cannot open port for listening!"
+msgstr ""
+
+#: ../src/core/core.cpp:303
+msgctxt "Core|"
+msgid "Cannot restore a state for an unconfigured core!"
+msgstr ""
+
+#: ../src/core/core.cpp:307
+msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr ""
 
-#: ../src/core/core.cpp:273
+#: ../src/core/core.cpp:352
+msgctxt "Core|"
+msgid "Core is already configured! Not configuring again..."
+msgstr ""
+
+#: ../src/core/core.cpp:355
 msgctxt "Core|"
 msgid "Admin user or password not set."
 msgstr ""
 
-#: ../src/core/core.cpp:276
+#: ../src/core/core.cpp:359
 msgctxt "Core|"
 msgid "Could not setup storage!"
 msgstr ""
 
-#: ../src/core/core.cpp:280
+#: ../src/core/core.cpp:364
+msgctxt "Core|"
+msgid "Could not setup authenticator!"
+msgstr ""
+
+#: ../src/core/core.cpp:370
+msgctxt "Core|"
+msgid "Fatal failure while trying to setup, terminating"
+msgstr ""
+
+#: ../src/core/core.cpp:374
+msgctxt "Core|"
+msgid "Could not save backend settings, probably a permission problem."
+msgstr ""
+
+#: ../src/core/core.cpp:378
 msgctxt "Core|"
 msgid "Creating admin user..."
 msgstr "Skapar administrativ användare..."
 
-#: ../src/core/core.cpp:393
+#: ../src/core/core.cpp:456
+#, qt-format
+msgctxt "Core|"
+msgid "Selected storage backend %1 is not available."
+msgstr ""
+
+#: ../src/core/core.cpp:549
+#, qt-format
+msgctxt "Core|"
+msgid "Selected auth backend %1 is not available."
+msgstr ""
+
+#: ../src/core/core.cpp:632
 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/core/core.cpp:401
+#: ../src/core/core.cpp:638
 #, qt-format
 msgctxt "Core|"
 msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
 msgstr ""
 
-#: ../src/core/core.cpp:409
+#: ../src/core/core.cpp:645
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr ""
 
-#: ../src/core/core.cpp:417
+#: ../src/core/core.cpp:649
 #, qt-format
 msgctxt "Core|"
 msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
 msgstr ""
 
-#: ../src/core/core.cpp:427
+#: ../src/core/core.cpp:658
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr ""
 
-#: ../src/core/core.cpp:435
+#: ../src/core/core.cpp:662
 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/core/core.cpp:444
+#: ../src/core/core.cpp:669
 msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr ""
 
-#: ../src/core/core.cpp:478
+#: ../src/core/core.cpp:715
 msgctxt "Core|"
 msgid "Client connected from"
 msgstr "Klient ansluten från"
 
-#: ../src/core/core.cpp:481
+#: ../src/core/core.cpp:718
 msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr ""
 
-#: ../src/core/core.cpp:500
+#: ../src/core/core.cpp:729
+msgctxt "Core|"
+msgid "Non-authed client disconnected:"
+msgstr ""
+
+#: ../src/core/core.cpp:803
 msgctxt "Core|"
-msgid "Antique client trying to connect... refusing."
-msgstr "Antik klient försöker ansluta... nekar."
+msgid "Cannot setup storage backend."
+msgstr ""
 
-#: ../src/core/core.cpp:512
+#: ../src/core/core.cpp:892
 #, qt-format
 msgctxt "Core|"
-msgid ""
-"<b>Your Quassel Client is too old!</b><br>This core needs at least "
-"client/core protocol version %1.<br>Please consider upgrading your client."
+msgid "Unsupported storage backend: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:516 ../src/core/core.cpp:606 ../src/core/core.cpp:630
+#: ../src/core/core.cpp:893
 msgctxt "Core|"
-msgid "Client"
-msgstr "Klient"
+msgid "Supported backends are:"
+msgstr ""
 
-#: ../src/core/core.cpp:516
+#: ../src/core/core.cpp:905 ../src/core/core.cpp:925
+#, qt-format
 msgctxt "Core|"
-msgid "too old, rejecting."
+msgid "Switched storage backend to: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:906
+msgctxt "Core|"
+msgid "Backend already initialized. Skipping Migration..."
 msgstr ""
 
-#: ../src/core/core.cpp:533
+#: ../src/core/core.cpp:909
 #, qt-format
 msgctxt "Core|"
-msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
+msgid "Storage backend is not available: %1"
 msgstr ""
-"<b>Quassel Core version %1</b><br>Byggdes: %2<br>Upptid %3d%4h%5m (sedan %6)"
 
-#: ../src/core/core.cpp:586
+#: ../src/core/core.cpp:913
+#, qt-format
 msgctxt "Core|"
-msgid "Starting TLS for Client:"
+msgid "Unable to setup storage backend: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:604
+#: ../src/core/core.cpp:918
+#, qt-format
 msgctxt "Core|"
-msgid ""
-"<b>Client not initialized!</b><br>You need to send an init message before "
-"trying to login."
+msgid "Unable to initialize storage backend: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:606
+#: ../src/core/core.cpp:933
+#, qt-format
 msgctxt "Core|"
-msgid "did not send an init message before trying to login, rejecting."
+msgid "Migrating storage backend %1 to %2..."
 msgstr ""
 
-#: ../src/core/core.cpp:624
+#: ../src/core/core.cpp:938
 msgctxt "Core|"
-msgid ""
-"<b>Invalid username or password!</b><br>The username/password combination "
-"you supplied could not be found in the database."
+msgid "Migration finished!"
+msgstr ""
+
+#: ../src/core/core.cpp:945
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to migrate storage backend! (No migration writer for %1)"
+msgstr ""
+
+#: ../src/core/core.cpp:951
+msgctxt "Core|"
+msgid "No currently active storage backend. Skipping migration..."
+msgstr ""
+
+#: ../src/core/core.cpp:954
+#, qt-format
+msgctxt "Core|"
+msgid "Currently active storage backend does not support migration: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:957
+#, qt-format
+msgctxt "Core|"
+msgid "New storage backend does not support migration: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:630
+#: ../src/core/core.cpp:979
 #, qt-format
 msgctxt "Core|"
-msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
+msgid "Unsupported authenticator: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:980
+msgctxt "Core|"
+msgid "Supported authenticators are:"
 msgstr ""
 
-#: ../src/core/core.cpp:641
+#: ../src/core/core.cpp:990 ../src/core/core.cpp:1007
+#, qt-format
 msgctxt "Core|"
-msgid "Non-authed client disconnected."
+msgid "Switched authenticator to: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:647
+#: ../src/core/core.cpp:993
+#, qt-format
 msgctxt "Core|"
-msgid "Non-authed client disconnected. (socket allready destroyed)"
+msgid "Authenticator is not available: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:695
+#: ../src/core/core.cpp:997
+#, qt-format
 msgctxt "Core|"
-msgid "Could not initialize session for client:"
+msgid "Unable to setup authenticator: %1"
 msgstr ""
 
-#: ../src/core/core.cpp:717
+#: ../src/core/core.cpp:1002
+#, qt-format
 msgctxt "Core|"
-msgid "Could not find a session for client:"
+msgid "Unable to initialize authenticator: %1"
 msgstr ""
 
-#: ../src/client/coreaccount.h:39
+#: ../src/client/coreaccount.h:43
 msgctxt "CoreAccount|"
 msgid "Internal Core"
 msgstr "Gränssnitt"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:229
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:276
 msgctxt "CoreAccountEditDlg|"
 msgid "Edit Core Account"
 msgstr ""
@@ -1552,7 +2664,7 @@ msgid "Local Core"
 msgstr ""
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:170
 msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr "Värdnamn:"
@@ -1564,13 +2676,13 @@ msgid "localhost"
 msgstr ""
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:54
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:187
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:133
 msgctxt "CoreAccountEditDlg|"
 msgid "Port:"
 msgstr "Port:"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:229
 msgctxt "CoreAccountEditDlg|"
 msgid "User:"
 msgstr "Användare:"
@@ -1588,25 +2700,40 @@ msgstr "Kom ihåg"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
 msgctxt "CoreAccountEditDlg|"
-msgid "Use a Proxy"
-msgstr "Använd en proxyserver"
+msgid "Proxy Settings"
+msgstr ""
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:144
+msgctxt "CoreAccountEditDlg|"
+msgid "SOCKS 5"
+msgstr ""
 
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:149
+msgctxt "CoreAccountEditDlg|"
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:279
 msgctxt "CoreAccountEditDlg|"
 msgid "Proxy Type:"
 msgstr "Typ av proxyserver:"
 
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:288
 msgctxt "CoreAccountEditDlg|"
-msgid "Socks 5"
-msgstr "Socks 5"
+msgid "No pro&xy"
+msgstr ""
 
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:298
 msgctxt "CoreAccountEditDlg|"
-msgid "HTTP"
-msgstr "HTTP"
+msgid "S&ystem proxy"
+msgstr ""
 
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:231
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:311
+msgctxt "CoreAccountEditDlg|"
+msgid "&Manual proxy configuration"
+msgstr ""
+
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:278
 msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr ""
@@ -1656,22 +2783,126 @@ msgctxt "CoreAccountSettingsPage|"
 msgid "Always connect to"
 msgstr "Anslut alltid till"
 
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:30
 msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:69
+#: ../src/core/coreauthhandler.cpp:136 ../src/core/coreauthhandler.cpp:148
+#: ../src/core/coreauthhandler.cpp:222
+msgctxt "CoreAuthHandler|"
+msgid "Client"
+msgstr "Klient"
+
+#: ../src/core/coreauthhandler.cpp:136
+msgctxt "CoreAuthHandler|"
+msgid "too old, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:137
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Your Quassel Client is too old!</b><br>This core needs at least "
+"client/core protocol version %1 (got: %2).<br>Please consider upgrading your"
+" client."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:149
+msgctxt "CoreAuthHandler|"
+msgid "did not send a registration message before trying to login, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:151
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Client not initialized!</b><br>You need to send a registration message "
+"before trying to login."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:167
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "SSL required but non-SSL connection attempt from %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:168
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>SSL is required!</b><br>You need to use SSL in order to connect to this "
+"core."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:223
+msgctxt "CoreAuthHandler|"
+msgid "attempted to login before the core was configured, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:225
+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:237
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Invalid login attempt from %1 as \"%2\""
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:238
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Invalid username or password!</b><br>The username/password combination "
+"you supplied could not be found in the database."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:244
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid ""
+"Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:251
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support extended features."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:253
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support the following features: %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:257
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client supports unknown features: %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:276
+msgctxt "CoreAuthHandler|"
+msgid "Starting encryption for Client:"
+msgstr ""
+
+#: ../src/qtui/coreconfigwizard.cpp:44
+msgctxt "CoreConfigWizard|"
+msgid "Description"
+msgstr "Beskrivning"
+
+#: ../src/qtui/coreconfigwizard.cpp:159
 msgctxt "CoreConfigWizard|"
 msgid "Core Configuration Wizard"
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:97
+#: ../src/qtui/coreconfigwizard.cpp:206
 msgctxt "CoreConfigWizard|"
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:104
+#: ../src/qtui/coreconfigwizard.cpp:216
 #, qt-format
 msgctxt "CoreConfigWizard|"
 msgid ""
@@ -1679,289 +2910,231 @@ msgid ""
 "over."
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:119
-msgctxt "CoreConfigWizard|"
-msgid ""
-"Your are now logged into your freshly configured Quassel Core!<br>Please "
-"remember to configure your identities and networks now."
-msgstr ""
-
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:14
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Form"
 msgstr "Formulär"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:25
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:35
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:49
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr "Upprepa lösenordet:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:63
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr "Kom ihåg lösenordet"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
+#: ../src/qtui/coreconfigwizardadminuserpage.ui:72
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid ""
 "<b>Note:</b> Adding more users and changing your username/password is not possible via Quassel's client interface yet.\n"
 "If you need to do these things, please run \"<tt><nobr>quasselcore --help</nobr></tt>\"."
 msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
+#: ../src/qtui/coreconfigwizardauthenticationselectionpage.ui:14
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Form"
+msgstr "Formulär"
+
+#: ../src/qtui/coreconfigwizardauthenticationselectionpage.ui:25
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Authentication Backend:"
+msgstr ""
+
+#: ../src/qtui/coreconfigwizardintropage.ui:13
 msgctxt "CoreConfigWizardIntroPage|"
 msgid "Form"
 msgstr "Formulär"
 
-#: ../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 ""
 
-#: ../src/qtui/coreconfigwizard.cpp:150
+#: ../src/qtui/coreconfigwizard.cpp:260
 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid "Create Admin User"
 msgstr "Skapa administrativ användare"
 
-#: ../src/qtui/coreconfigwizard.cpp:151
+#: ../src/qtui/coreconfigwizard.cpp:261
 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid ""
 "First, we will create a user on the core. This first user will have "
 "administrator privileges."
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:135
+#: ../src/qtui/coreconfigwizard.cpp:293
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid "Select Authentication Backend"
+msgstr ""
+
+#: ../src/qtui/coreconfigwizard.cpp:294
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid ""
+"Please select a backend for Quassel Core to use for authenticating users."
+msgstr ""
+
+#: ../src/qtui/coreconfigwizard.cpp:314
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid "Authentication Settings"
+msgstr ""
+
+#: ../src/qtui/coreconfigwizard.cpp:244
 msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr "Introduktion"
 
-#: ../src/qtui/coreconfigwizard.cpp:182
+#: ../src/qtui/coreconfigwizard.cpp:366
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:183
+#: ../src/qtui/coreconfigwizard.cpp:367
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
-msgid ""
-"Please select a database backend for the Quassel Core storage to store the "
-"backlog and other data in."
+msgid "Please select a storage backend for Quassel Core."
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:277
+#: ../src/qtui/coreconfigwizard.cpp:407
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
-msgid "Connection Properties"
-msgstr "Anslut till Core"
+msgid "Storage Settings"
+msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:317
+#: ../src/qtui/coreconfigwizard.cpp:458
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid "Storing Your Settings"
 msgstr "Manuella inställningar"
 
-#: ../src/qtui/coreconfigwizard.cpp:318
+#: ../src/qtui/coreconfigwizard.cpp:459
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid ""
-"Your settings are now stored in the core, and you will be logged in "
+"Your settings are now being stored in the core, and you will be logged in "
 "automatically."
 msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
+#: ../src/qtui/coreconfigwizardstorageselectionpage.ui:14
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Form"
 msgstr "Formulär"
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
+#: ../src/qtui/coreconfigwizardstorageselectionpage.ui:22
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
-msgctxt "CoreConfigWizardStorageSelectionPage|"
-msgid "Description"
-msgstr "Beskrivning"
-
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
-msgctxt "CoreConfigWizardStorageSelectionPage|"
-msgid "Foobar"
-msgstr ""
-
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:13
+#: ../src/qtui/coreconfigwizardsyncpage.ui:14
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Form"
 msgstr "Formulär"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
+#: ../src/qtui/coreconfigwizardsyncpage.ui:20
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
+#: ../src/qtui/coreconfigwizardsyncpage.ui:36
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr "Skapa administrativ användare"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:42
-msgctxt "CoreConfigWizardSyncPage|"
-msgid "foo"
-msgstr "foo"
-
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
+#: ../src/qtui/coreconfigwizardsyncpage.ui:56
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Storage Backend:"
 msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
+#: ../src/qtui/coreconfigwizardsyncpage.ui:76
 msgctxt "CoreConfigWizardSyncPage|"
-msgid "bar"
-msgstr "bar"
+msgid "Authentication Backend:"
+msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
+#: ../src/qtui/coreconfigwizardsyncpage.ui:110
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr ""
 
-#: ../src/qtui/ui/coreconnectauthdlg.ui:14
+#: ../src/qtui/coreconnectauthdlg.ui:14
 msgctxt "CoreConnectAuthDlg|"
 msgid "Authentication Required"
 msgstr "Autentisering krävs"
 
-#: ../src/qtui/ui/coreconnectauthdlg.ui:20
+#: ../src/qtui/coreconnectauthdlg.ui:20
 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your account data:"
 msgstr "Ange ett nätverksnamn:"
 
-#: ../src/qtui/ui/coreconnectauthdlg.ui:35
+#: ../src/qtui/coreconnectauthdlg.ui:35
 msgctxt "CoreConnectAuthDlg|"
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/qtui/ui/coreconnectauthdlg.ui:49
+#: ../src/qtui/coreconnectauthdlg.ui:49
 msgctxt "CoreConnectAuthDlg|"
 msgid "Username:"
 msgstr "Användarnamn:"
 
-#: ../src/qtui/ui/coreconnectauthdlg.ui:58
+#: ../src/qtui/coreconnectauthdlg.ui:58
 msgctxt "CoreConnectAuthDlg|"
 msgid "Remember password"
 msgstr "Kom ihåg lösenordet"
 
-#: ../src/qtui/coreconnectdlg.cpp:75
+#: ../src/qtui/coreconnectdlg.cpp:79
 #, qt-format
 msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your credentials for %1:"
 msgstr ""
 
-#: ../src/qtui/coreconnectdlg.cpp:40
+#: ../src/qtui/coreconnectdlg.cpp:42
 msgctxt "CoreConnectDlg|"
 msgid "Connect to Core"
 msgstr "Anslut till Core"
 
-#: ../src/client/coreconnection.cpp:168
+#: ../src/client/coreconnection.cpp:164
 msgctxt "CoreConnection|"
 msgid "Network is down"
 msgstr "Nätverket är nere"
 
-#: ../src/client/coreconnection.cpp:202 ../src/client/coreconnection.cpp:321
+#: ../src/client/coreconnection.cpp:247
 msgctxt "CoreConnection|"
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
-#: ../src/client/coreconnection.cpp:205
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Looking up %1..."
-msgstr "Slår upp %1..."
-
-#: ../src/client/coreconnection.cpp:208 ../src/client/coreconnection.cpp:450
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Connecting to %1..."
-msgstr "Ansluter till %1..."
-
-#: ../src/client/coreconnection.cpp:211 ../src/client/coreconnection.cpp:573
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Connected to %1"
-msgstr "Ansluten till %1"
-
-#: ../src/client/coreconnection.cpp:214
-#, qt-format
-msgctxt "CoreConnection|"
-msgid "Disconnecting from %1..."
-msgstr "Kopplar från %1..."
-
-#: ../src/client/coreconnection.cpp:272
-msgctxt "CoreConnection|"
-msgid ""
-"The Quassel Core you try to connect to is too old! Please consider "
-"upgrading."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:300
-msgctxt "CoreConnection|"
-msgid "Invalid data received from core"
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:349
+#: ../src/client/coreconnection.cpp:281
 msgctxt "CoreConnection|"
 msgid "Disconnected from core."
 msgstr "&Koppla från Core"
 
-#: ../src/client/coreconnection.cpp:427 ../src/client/coreconnection.cpp:511
-#: ../src/client/coreconnection.cpp:556
-msgctxt "CoreConnection|"
-msgid "Unencrypted connection canceled"
-msgstr "Okrypterad anslutning"
-
-#: ../src/client/coreconnection.cpp:457
-msgctxt "CoreConnection|"
-msgid "Synchronizing to core..."
-msgstr "Synkroniserar till %1..."
-
-#: ../src/client/coreconnection.cpp:478
-#, qt-format
-msgctxt "CoreConnection|"
-msgid ""
-"<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at "
-"least core/client protocol v%1 to connect."
-msgstr ""
-
-#: ../src/client/coreconnection.cpp:592
-msgctxt "CoreConnection|"
-msgid "Logging in..."
-msgstr "Loggar in..."
-
-#: ../src/client/coreconnection.cpp:597
+#: ../src/client/coreconnection.cpp:357
 msgctxt "CoreConnection|"
-msgid "Login canceled"
+msgid "Initializing..."
 msgstr ""
 
-#: ../src/client/coreconnection.cpp:622
+#: ../src/client/coreconnection.cpp:414
 msgctxt "CoreConnection|"
 msgid "Receiving session state"
 msgstr ""
 
-#: ../src/client/coreconnection.cpp:624
+#: ../src/client/coreconnection.cpp:416
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronizing to %1..."
 msgstr "Synkroniserar till %1..."
 
-#: ../src/client/coreconnection.cpp:648
+#: ../src/client/coreconnection.cpp:446
 msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr ""
 
-#: ../src/client/coreconnection.cpp:698
+#: ../src/client/coreconnection.cpp:495
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronized to %1"
@@ -1979,19 +3152,16 @@ msgstr "Nätverksinformation"
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
 msgctxt "CoreConnectionSettingsPage|"
-msgid ""
-"Rely on KDE's hardware layer to detect if we're online. Recommended for most"
-" KDE users"
+msgid "Rely on Qt's network configuration manager to detect if we're online"
 msgstr ""
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
 msgctxt "CoreConnectionSettingsPage|"
-msgid "Use KDE's network status detection (via Solid)"
+msgid "Automatic"
 msgstr ""
 
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
 #: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
-#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
 msgctxt "CoreConnectionSettingsPage|"
 msgid ""
 "Actively ping the remote core and disconnect if we didn't get a reply after "
@@ -2031,6 +3201,11 @@ msgctxt "CoreConnectionSettingsPage|"
 msgid "Retry every"
 msgstr ""
 
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Interval between consecutive connection attempts"
+msgstr ""
+
 #: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
 msgctxt "CoreConnectionSettingsPage|"
 msgid "Remote Cores"
@@ -2041,93 +3216,367 @@ msgctxt "CoreConnectionSettingsPage|"
 msgid "Connection"
 msgstr "Anslutning"
 
-#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
+#: ../src/qtui/coreconnectionstatuswidget.ui:14
 msgctxt "CoreConnectionStatusWidget|"
 msgid "Form"
 msgstr "Formulär"
 
-#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
+#: ../src/qtui/coreconnectionstatuswidget.ui:32
 msgctxt "CoreConnectionStatusWidget|"
 msgid "Message"
 msgstr "Meddelande"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+#: ../src/qtui/coreconnectionstatuswidget.cpp:64
 msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
 msgstr "s"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:61
+#: ../src/qtui/coreconnectionstatuswidget.cpp:64
 msgctxt "CoreConnectionStatusWidget|milliseconds"
 msgid "ms"
 msgstr "ms"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:62
+#: ../src/qtui/coreconnectionstatuswidget.cpp:65
 #, qt-format
 msgctxt "CoreConnectionStatusWidget|"
 msgid "(Lag: %1 %2)"
 msgstr "(Fördröjning: %1 %2)"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:75
+#: ../src/qtui/coreconnectionstatuswidget.cpp:80
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is encrypted with SSL."
 msgstr ""
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:78
+#: ../src/qtui/coreconnectionstatuswidget.cpp:84
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:13
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:14
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Form"
+msgstr "Formulär"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:57
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:687
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Your Quassel core is too old to support remote highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:64
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:93
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Rules"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:99
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Nicks"
+msgstr "Markera"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:127
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Case sensitive"
+msgstr "skiftlägeskänslig"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:153
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Custom Highlights"
+msgstr "Markera"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:166
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:269
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enabled"
+msgstr "Aktiverad"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:171
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:274
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:176
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:279
+msgctxt "CoreHighlightSettingsPage|"
+msgid "RegEx"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:181
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:284
+msgctxt "CoreHighlightSettingsPage|"
+msgid "CS"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:186
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:289
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Sender"
+msgstr "Avsändare"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:191
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:294
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:207
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:310
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Add"
+msgstr "Lägg till"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:214
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:317
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remove"
+msgstr "Ta bort"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:250
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Ignore Rules"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:256
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Never Highlight For"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:33
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Interface"
+msgstr "Gränssnitt"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:35
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:35
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remote Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:43
+msgctxt "CoreHighlightSettingsPage|"
+msgid "All Nicks from Identity"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:44
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Current Nick"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:45
+msgctxt "CoreHighlightSettingsPage|"
+msgid "None"
+msgstr "Inget"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:87
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import Legacy"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:89
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:97
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import highlight rules configured in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:89
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:707
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Legacy Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:95
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import Local"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:97
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:684
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:710
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Local Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:139
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enable/disable this rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:142
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Phrase to match, leave blank to match any message"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:145
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<b>RegEx</b>: This option determines if the highlight rule, <i>Sender</i>, "
+"and <i>Channel</i> should be interpreted as <b>regular expressions</b> or "
+"just as keywords."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:150
+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:154
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<p><b>Sender</b>: Semicolon separated list of <i>nick!ident@host</i> names, "
+"leave blank to match any nickname.</p><p><i>Example:</i><br /><i>Alice!*; "
+"Bob!*@example.com; Carol*!*; !Caroline!*</i><br />would match on "
+"<i>Alice</i>, <i>Bob</i> with hostmask <i>example.com</i>, and any nickname "
+"starting with <i>Carol</i> except for <i>Caroline</i><br /><p>If only "
+"inverted names are specified, it will match anything except for what's "
+"specified (implicit wildcard).</p><p><i>Example:</i><br /><i>!Announce*!*; "
+"!Wheatley!aperture@*</i><br />would match anything except for "
+"<i>Wheatley</i> with ident <i>aperture</i> or any nickname starting with "
+"<i>Announce</i></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:168
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<p><b>Channel</b>: Semicolon separated list of channel/query names, leave "
+"blank to match any name.</p><p><i>Example:</i><br /><i>#quassel*; #foobar; "
+"!#quasseldroid</i><br />would match on <i>#foobar</i> and any channel "
+"starting with <i>#quassel</i> except for <i>#quasseldroid</i><br /><p>If "
+"only inverted names are specified, it will match anything except for what's "
+"specified (implicit wildcard).</p><p><i>Example:</i><br /><i>!#quassel*; "
+"!#foobar</i><br />would match anything except for <i>#foobar</i> or any "
+"channel starting with <i>#quassel</i></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:688
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer to configure remote highlights."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:690
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "You can still configure highlights for this device only in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:694
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remote Highlights unsupported"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:715
+msgctxt "CoreHighlightSettingsPage|"
+msgid "No highlights to import"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:715
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "No highlight rules in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:720
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import highlights?"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:721
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import all highlight rules from <i>%1</i>?"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:757
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Imported highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:758
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "%1 highlight rules successfully imported."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.h:54
+#: ../src/qtui/settingspages/corehighlightsettingspage.h:62
+msgctxt "CoreHighlightSettingsPage|"
+msgid "highlight rule"
+msgstr "Markera"
+
+#: ../src/qtui/coreinfodlg.ui:14
 msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr "Säkerhetsinformation"
 
-#: ../src/qtui/ui/coreinfodlg.ui:21
+#: ../src/qtui/coreinfodlg.ui:22
 msgctxt "CoreInfoDlg|"
 msgid "Version:"
 msgstr "Version:"
 
-#: ../src/qtui/ui/coreinfodlg.ui:28
+#: ../src/qtui/coreinfodlg.ui:36
 msgctxt "CoreInfoDlg|"
-msgid "<core version>"
+msgid "Version date:"
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:35
+#: ../src/qtui/coreinfodlg.ui:50
 msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr "Upptid:"
 
-#: ../src/qtui/ui/coreinfodlg.ui:42
+#: ../src/qtui/coreinfodlg.ui:64
+msgctxt "CoreInfoDlg|"
+msgid "Connected clients:"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.ui:117 ../src/qtui/coreinfodlg.cpp:194
+msgctxt "CoreInfoDlg|"
+msgid "Your Quassel core is too old to show active sessions"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.ui:124
 msgctxt "CoreInfoDlg|"
-msgid "Connected Clients:"
-msgstr "Anslutna klienter:"
+msgid "Details..."
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:49
+#: ../src/qtui/coreinfodlg.ui:200
 msgctxt "CoreInfoDlg|"
-msgid "<connected clients>"
-msgstr "<anslutna klienter>"
+msgid "Close"
+msgstr "Stäng"
 
-#: ../src/qtui/ui/coreinfodlg.ui:56
+#: ../src/qtui/coreinfodlg.cpp:86 ../src/qtui/coreinfodlg.cpp:87
+#: ../src/qtui/coreinfodlg.cpp:160
 msgctxt "CoreInfoDlg|"
-msgid "<core uptime>"
+msgid "Unknown"
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:63
+#: ../src/qtui/coreinfodlg.cpp:91
 msgctxt "CoreInfoDlg|"
-msgid "Build date:"
-msgstr "Byggdatum:"
+msgid "Disconnected from core"
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:70
+#: ../src/qtui/coreinfodlg.cpp:92 ../src/qtui/coreinfodlg.cpp:156
 msgctxt "CoreInfoDlg|"
-msgid "<build date>"
-msgstr "<byggdatum>"
+msgid "Not available"
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:81
+#: ../src/qtui/coreinfodlg.cpp:101
 msgctxt "CoreInfoDlg|"
-msgid "Close"
-msgstr "Stäng"
+msgid "Unknown date"
+msgstr ""
 
-#: ../src/qtui/coreinfodlg.cpp:53
+#: ../src/qtui/coreinfodlg.cpp:174
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid "%n Day(s)"
@@ -2135,58 +3584,139 @@ msgid_plural "%n Day(s)"
 msgstr[0] "%n dygn"
 msgstr[1] "%n dygn"
 
-#: ../src/qtui/coreinfodlg.cpp:54
+#: ../src/qtui/coreinfodlg.cpp:175
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid " %1:%2:%3 (since %4)"
 msgstr " %1:%2:%3 (sedan %4)"
 
-#: ../src/core/corenetwork.cpp:148
+#: ../src/qtui/coreinfodlg.cpp:192
+msgctxt "CoreInfoDlg|"
+msgid "Active sessions unsupported"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:195
+msgctxt "CoreInfoDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer to view and disconnect other "
+"connected clients."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:225
 msgctxt "CoreNetwork|"
 msgid "Connection failed. Cycling to next Server"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:156 ../src/core/corenetwork.cpp:157
+#: ../src/core/corenetwork.cpp:236 ../src/core/corenetwork.cpp:237
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Connecting to %1:%2..."
+msgstr "Ansluter till %1:%2..."
+
+#: ../src/core/corenetwork.cpp:304
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Disconnecting. (%1)"
+msgstr "Kopplar från. (%1)"
+
+#: ../src/core/corenetwork.cpp:304
+msgctxt "CoreNetwork|"
+msgid "Core Shutdown"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:533
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Could not connect to %1 (%2)"
+msgstr "Kunde inte ansluta till %1 (%2)"
+
+#: ../src/core/corenetwork.cpp:535
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Connection failure: %1"
+msgstr "Anslutningsfel: %1"
+
+#: ../src/core/corenetwork.cpp:582
+msgctxt "CoreNetwork|"
+msgid "Requesting capability list..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1093
+msgctxt "CoreNetwork|"
+msgid "SASL EXTERNAL authentication not supported"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1105
+msgctxt "CoreNetwork|"
+msgid "SASL PLAIN authentication not supported"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1217
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Could not negotiate some capabilities, retrying individually (%1)..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1231
+msgctxt "CoreNetwork|"
+msgid "No capabilities available"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1237
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Ready to negotiate (found: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1244
 #, qt-format
 msgctxt "CoreNetwork|"
-msgid "Connecting to %1:%2..."
-msgstr "Ansluter till %1:%2..."
+msgid "Negotiating capabilities (requesting: %1)..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1259
+msgctxt "CoreNetwork|"
+msgid "SASL authentication currently not supported by server"
+msgstr ""
 
-#: ../src/core/corenetwork.cpp:205
+#: ../src/core/corenetwork.cpp:1265
 #, qt-format
 msgctxt "CoreNetwork|"
-msgid "Disconnecting. (%1)"
-msgstr "Kopplar från. (%1)"
+msgid "Capability negotiation finished (enabled: %1)"
+msgstr ""
 
-#: ../src/core/corenetwork.cpp:205
+#: ../src/core/corenetwork.cpp:1397
 msgctxt "CoreNetwork|"
-msgid "Core Shutdown"
+msgid ""
+"Encrypted connection couldn't be verified, disconnecting since verification "
+"is required"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:343
+#: ../src/core/corenetwork.cpp:1401 ../src/core/corenetwork.cpp:1415
 #, qt-format
 msgctxt "CoreNetwork|"
-msgid "Could not connect to %1 (%2)"
-msgstr "Kunde inte ansluta till %1 (%2)"
+msgid " (Reason: %1)"
+msgstr ""
 
-#: ../src/core/corenetwork.cpp:345
-#, qt-format
+#: ../src/core/corenetwork.cpp:1411
 msgctxt "CoreNetwork|"
-msgid "Connection failure: %1"
-msgstr "Anslutningsfel: %1"
+msgid ""
+"Encrypted connection couldn't be verified, continuing since verification is "
+"not required"
+msgstr ""
 
-#: ../src/core/coresession.cpp:214
+#: ../src/core/coresession.cpp:270
 msgctxt "CoreSession|"
 msgid "Client"
 msgstr "Klient"
 
-#: ../src/core/coresession.cpp:214
+#: ../src/core/coresession.cpp:270
 #, qt-format
 msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."
 msgstr "frånkopplad (AnvändarId: %1)."
 
-#: ../src/core/coresession.cpp:440
+#: ../src/core/coresession.cpp:604
 #, qt-format
 msgctxt "CoreSession|"
 msgid ""
@@ -2194,53 +3724,186 @@ msgid ""
 " create network %1!"
 msgstr ""
 
-#: ../src/core/coresession.cpp:472
+#: ../src/core/coresession.cpp:635
 msgctxt "CoreSession|"
 msgid ""
 "CoreSession::createNetwork(): Trying to create a network that already "
 "exists, updating instead!"
 msgstr ""
 
-#: ../src/core/coresessioneventprocessor.cpp:65
+#: ../src/core/coresessioneventprocessor.cpp:80
 msgctxt "CoreSessionEventProcessor|"
 msgid ""
 "No free and valid nicks in nicklist found. use: /nick <othernick> to "
 "continue"
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:81
+#: ../src/core/coresessioneventprocessor.cpp:800
+msgctxt "CoreSessionEventProcessor|"
+msgid "Unable to perform key exchange, missing qca-ossl plugin."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:817
+msgctxt "CoreSessionEventProcessor|"
+msgid "Unable to parse the DH1080_INIT. Key exchange failed."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:828
+#: ../src/core/coresessioneventprocessor.cpp:843
+msgctxt "CoreSessionEventProcessor|"
+msgid "Your key is set and messages will be encrypted."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:852
+msgctxt "CoreSessionEventProcessor|"
+msgid "Failed to parse DH1080_FINISH. Key exchange failed."
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1582
+msgctxt "CoreSessionEventProcessor|"
+msgid "Reverse DCC SEND not supported"
+msgstr ""
+
+#: ../src/core/coresessioneventprocessor.cpp:1605
+#, qt-format
+msgctxt "CoreSessionEventProcessor|"
+msgid "DCC %1 not supported"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:29
+msgctxt "CoreSessionWidget|"
+msgid "12.34.56.78"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:37
+msgctxt "CoreSessionWidget|"
+msgid "Client:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:51
+msgctxt "CoreSessionWidget|"
+msgid "Version date:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:65
+msgctxt "CoreSessionWidget|"
+msgid "Location:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:79
+msgctxt "CoreSessionWidget|"
+msgid "Connected since:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:93
+msgctxt "CoreSessionWidget|"
+msgid "Secure:"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.ui:124
+msgctxt "CoreSessionWidget|"
+msgid "End Session"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:41
+msgctxt "CoreSessionWidget|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:51
+msgctxt "CoreSessionWidget|"
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/qtui/coresessionwidget.cpp:51
+msgctxt "CoreSessionWidget|"
+msgid "No"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:57 ../src/qtui/coresessionwidget.cpp:71
+msgctxt "CoreSessionWidget|"
+msgid "End the client's session, disconnecting it"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:71
+msgctxt "CoreSessionWidget|"
+msgid "This client does not support being remotely disconnected"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:85
+msgctxt "CoreSessionWidget|"
+msgid "Ending session..."
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:64
+msgctxt "CoreTransfer|"
+msgid "Socket closed while still transferring!"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:75
+#, qt-format
+msgctxt "CoreTransfer|"
+msgid "DCC connection error: %1"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:115
+msgctxt "CoreTransfer|"
+msgid "Reverse DCC not supported yet!"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:160
+msgctxt "CoreTransfer|"
+msgid "DCC Receive: Got more data than expected!"
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:175
+msgctxt "CoreTransfer|"
+msgid "DCC Receive: Quassel Client disconnected during transfer!"
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:91
 msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr "borta"
 
-#: ../src/core/coreuserinputhandler.cpp:150
+#: ../src/core/coreuserinputhandler.cpp:168
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
 msgstr "skickar CTCP-%1-fråga till %2"
 
-#: ../src/core/coreuserinputhandler.cpp:177
+#: ../src/core/coreuserinputhandler.cpp:190
+#: ../src/core/coreuserinputhandler.cpp:371
+#: ../src/core/coreuserinputhandler.cpp:661
+#: ../src/core/coreuserinputhandler.cpp:706
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"Error: QCA provider plugin not found. It is usually provided by the qca-ossl"
+" plugin."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:203
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /delkey <nick|channel> deletes the encryption key for nick or "
 "channel or just /delkey when in a channel or query."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:184
-#: ../src/core/coreuserinputhandler.cpp:517
+#: ../src/core/coreuserinputhandler.cpp:211
+#: ../src/core/coreuserinputhandler.cpp:728
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "No key has been set for %1."
 msgstr "Inget ämne har ställts in för %1."
 
-#: ../src/core/coreuserinputhandler.cpp:197
+#: ../src/core/coreuserinputhandler.cpp:216
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been deleted."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:201
-#: ../src/core/coreuserinputhandler.cpp:525
+#: ../src/core/coreuserinputhandler.cpp:223
+#: ../src/core/coreuserinputhandler.cpp:742
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "
@@ -2249,27 +3912,31 @@ msgid ""
 "with QCA2 present."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:422
-#, qt-format
+#: ../src/core/coreuserinputhandler.cpp:383
 msgctxt "CoreUserInputHandler|"
-msgid "Starting query with %1"
+msgid ""
+"[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:469
+#: ../src/core/coreuserinputhandler.cpp:390
 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."
+msgid "It is only possible to exchange keys in a query buffer."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:484
+#: ../src/core/coreuserinputhandler.cpp:400
 #, qt-format
 msgctxt "CoreUserInputHandler|"
-msgid "The key for %1 has been set."
+msgid "Failed to initiate key exchange with %1."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:405
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Initiated key exchange with %1."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:487
+#: ../src/core/coreuserinputhandler.cpp:412
+#: ../src/core/coreuserinputhandler.cpp:688
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "
@@ -2278,23 +3945,42 @@ msgid ""
 "with QCA present."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:509
+#: ../src/core/coreuserinputhandler.cpp:472
+msgctxt "CoreUserInputHandler|"
+msgid "Your persistent modes have been reset."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:596
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Starting query with %1"
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:673
 msgctxt "CoreUserInputHandler|"
 msgid ""
-"[usage] /showkey <nick|channel> shows the encryption key for nick or channel"
-" or just /showkey when in a channel or query."
+"[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 ""
 
-#: ../src/core/coreuserinputhandler.cpp:521
+#: ../src/core/coreuserinputhandler.cpp:682
 #, qt-format
 msgctxt "CoreUserInputHandler|"
-msgid "The key for %1 is %2"
-msgstr "Webbsidan för %1 är %2"
+msgid "The key for %1 has been set."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:719
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"[usage] /showkey <nick|channel> shows the encryption key for nick or channel"
+" or just /showkey when in a channel or query."
+msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:633
+#: ../src/core/coreuserinputhandler.cpp:735
 #, qt-format
 msgctxt "CoreUserInputHandler|"
-msgid "[Error] Could not encrypt your message: %1"
+msgid "The key for %1 is %2:%3"
 msgstr ""
 
 #: ../src/qtui/settingspages/createidentitydlg.ui:17
@@ -2317,17 +4003,130 @@ msgctxt "CreateIdentityDlg|"
 msgid "Duplicate:"
 msgstr ""
 
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
+#: ../src/common/protocols/datastream/datastreampeer.cpp:113
+msgctxt "DataStreamPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
+
+#: ../src/common/protocols/datastream/datastreampeer.cpp:176
+#, qt-format
+msgctxt "DataStreamPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:14
+msgctxt "DccSettingsPage|"
+msgid "Form"
+msgstr "Formulär"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:20
+msgctxt "DccSettingsPage|"
+msgid "Enable DCC"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:37
+msgctxt "DccSettingsPage|"
+msgid "Ports:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:51
+#: ../src/qtui/settingspages/dccsettingspage.ui:134
+msgctxt "DccSettingsPage|"
+msgid "Automatic"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:56
+#: ../src/qtui/settingspages/dccsettingspage.ui:139
+msgctxt "DccSettingsPage|"
+msgid "Manual"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:82
+msgctxt "DccSettingsPage|"
+msgid "to"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:110
+msgctxt "DccSettingsPage|"
+msgid "Outgoing IP:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:164
+msgctxt "DccSettingsPage|"
+msgid "DCC send timeout:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:171
+msgctxt "DccSettingsPage|"
+msgid " seconds"
+msgstr " sekunder"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:213
+msgctxt "DccSettingsPage|"
+msgid "Chunk size:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:220
+msgctxt "DccSettingsPage|"
+msgid " KiB"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:263
+msgctxt "DccSettingsPage|"
+msgid "Use passive/reverse DCC"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:276
+msgctxt "DccSettingsPage|"
+msgid "Use fast sending (might not work with all peers)"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:295
+msgctxt "DccSettingsPage|"
+msgid "File transfers"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:303
+msgctxt "DccSettingsPage|"
+msgid "Default download folder:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:313
+msgctxt "DccSettingsPage|"
+msgid "..."
+msgstr "..."
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:322
+msgctxt "DccSettingsPage|"
+msgid "Create folder per sender"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:329
+msgctxt "DccSettingsPage|"
+msgid "Prefix filenames with sender"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.cpp:28
+msgctxt "DccSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/settingspages/dccsettingspage.cpp:28
+msgctxt "DccSettingsPage|"
+msgid "DCC"
+msgstr ""
+
+#: ../src/qtui/debugbufferviewoverlay.ui:13
 msgctxt "DebugBufferViewOverlay|"
 msgid "Debug BufferView Overlay"
 msgstr ""
 
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
+#: ../src/qtui/debugbufferviewoverlay.ui:26
 msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay View"
 msgstr ""
 
-#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
+#: ../src/qtui/debugbufferviewoverlay.ui:39
 msgctxt "DebugBufferViewOverlay|"
 msgid "Overlay Properties"
 msgstr ""
@@ -2377,377 +4176,531 @@ msgctxt "DebugBufferViewOverlay|"
 msgid "Is initialized:"
 msgstr ""
 
-#: ../src/qtui/ui/debugconsole.ui:14
+#: ../src/qtui/debugconsole.ui:14
 msgctxt "DebugConsole|"
 msgid "Debug Console"
 msgstr "Felsökningskonsoll"
 
-#: ../src/qtui/ui/debugconsole.ui:44
+#: ../src/qtui/debugconsole.ui:44
 msgctxt "DebugConsole|"
 msgid "local"
 msgstr ""
 
-#: ../src/qtui/ui/debugconsole.ui:54
+#: ../src/qtui/debugconsole.ui:54
 msgctxt "DebugConsole|"
 msgid "core"
 msgstr ""
 
-#: ../src/qtui/ui/debugconsole.ui:82
+#: ../src/qtui/debugconsole.ui:82
 msgctxt "DebugConsole|"
 msgid "Evaluate!"
 msgstr ""
 
-#: ../src/qtui/ui/debuglogwidget.ui:13
-msgctxt "DebugLogWidget|"
+#: ../src/qtui/debuglogdlg.ui:14
+msgctxt "DebugLogDlg|"
 msgid "Debug Log"
 msgstr "Felsökningslogg"
 
-#: ../src/qtui/ui/debuglogwidget.ui:43
-msgctxt "DebugLogWidget|"
-msgid "Close"
-msgstr "Stäng"
+#: ../src/qtui/dockmanagernotificationbackend.cpp:196
+msgctxt "DockManagerNotificationBackend::ConfigWidget|"
+msgid "Mark dockmanager entry"
+msgstr ""
 
-#: ../src/core/eventstringifier.cpp:133 ../src/core/eventstringifier.cpp:250
+#: ../src/core/eventstringifier.cpp:232 ../src/core/eventstringifier.cpp:431
 msgctxt "EventStringifier|"
 msgid "[Whois] "
 msgstr "[Whois] %1"
 
-#: ../src/core/eventstringifier.cpp:145
+#: ../src/core/eventstringifier.cpp:246
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 invited you to channel %2"
 msgstr "%1 har bjudit in dig till kanalen %2"
 
-#: ../src/core/eventstringifier.cpp:230
+#: ../src/core/eventstringifier.cpp:393
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr "%1 har ändrat ämnet för %2 till: \"%3\""
 
-#: ../src/core/eventstringifier.cpp:237
+#: ../src/core/eventstringifier.cpp:405
+msgctxt "EventStringifier|"
+msgid "Error from server: "
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:410
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Operwall] %1: %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:417
 msgctxt "EventStringifier|"
 msgid ""
 "Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
 "behavior!"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:263
+#: ../src/core/eventstringifier.cpp:454
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 is away: \"%2\""
 msgstr "%1 är frånvarande: \"%2\""
 
-#: ../src/core/eventstringifier.cpp:268
+#: ../src/core/eventstringifier.cpp:460
 msgctxt "EventStringifier|"
 msgid "You are no longer marked as being away"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:274
+#: ../src/core/eventstringifier.cpp:467
 msgctxt "EventStringifier|"
 msgid "You have been marked as being away"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:294
+#: ../src/core/eventstringifier.cpp:488
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 är %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:308
+#: ../src/core/eventstringifier.cpp:503
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is online via %2 (%3)"
 msgstr "%1 är ansluten via %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:310
+#: ../src/core/eventstringifier.cpp:505
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was online via %2 (%3)"
 msgstr "[Whowas] %1 var %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:318
+#: ../src/core/eventstringifier.cpp:514
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was %2@%3 (%4)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:325
+#: ../src/core/eventstringifier.cpp:522
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] End of /WHO list for %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:335
+#: ../src/core/eventstringifier.cpp:543
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is logged in since %2"
 msgstr "[Whois] %1 är inloggad sedan %2"
 
-#: ../src/core/eventstringifier.cpp:337
+#: ../src/core/eventstringifier.cpp:548
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is idling for %2 (since %3)"
 msgstr "[Whois] %1 har varit inaktiv i %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:344
+#: ../src/core/eventstringifier.cpp:556
 msgctxt "EventStringifier|"
 msgid "[Whois] End of /WHOIS list"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:365
+#: ../src/core/eventstringifier.cpp:578
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr "[Whois] %1 är en användare på kanaler: %2"
 
-#: ../src/core/eventstringifier.cpp:367
+#: ../src/core/eventstringifier.cpp:580
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr "[Whois] %1 är en användare på kanaler: %2"
 
-#: ../src/core/eventstringifier.cpp:369
+#: ../src/core/eventstringifier.cpp:582
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr "[Whois] %1 är en operatör på kanaler: %2"
 
-#: ../src/core/eventstringifier.cpp:388
+#: ../src/core/eventstringifier.cpp:605
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 has %2 users. Topic is: \"%3\""
 msgstr "Kanalen %1 har %2 användare. Ämnet är: %3"
 
-#: ../src/core/eventstringifier.cpp:394
+#: ../src/core/eventstringifier.cpp:611
 msgctxt "EventStringifier|"
 msgid "End of channel list"
 msgstr "Slut på kanallistan"
 
-#: ../src/core/eventstringifier.cpp:408
+#: ../src/core/eventstringifier.cpp:627
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Homepage for %1 is %2"
 msgstr "Webbsidan för %1 är %2"
 
-#: ../src/core/eventstringifier.cpp:423
+#: ../src/core/eventstringifier.cpp:652
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 created on %2"
 msgstr "Kanalen %1 skapades %2"
 
-#: ../src/core/eventstringifier.cpp:431
+#: ../src/core/eventstringifier.cpp:663
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is authed as %2"
 msgstr "[Whois] %1 är frånvarande: \"%2\""
 
-#: ../src/core/eventstringifier.cpp:437
+#: ../src/core/eventstringifier.cpp:666
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was authed as %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:674
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "No topic is set for %1."
 msgstr "Inget ämne har ställts in för %1."
 
-#: ../src/core/eventstringifier.cpp:443
+#: ../src/core/eventstringifier.cpp:681
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic for %1 is \"%2\""
 msgstr "Ämnet för %1 är \"%2\""
 
-#: ../src/core/eventstringifier.cpp:452
+#: ../src/core/eventstringifier.cpp:702
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic set by %1 on %2"
 msgstr "Ämnet inställt av %1 den %2"
 
-#: ../src/core/eventstringifier.cpp:462
+#: ../src/core/eventstringifier.cpp:714
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has been invited to %2"
 msgstr "%1 har blivit inbjuden till %2"
 
-#: ../src/core/eventstringifier.cpp:468
+#: ../src/core/eventstringifier.cpp:721
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
-#: ../src/core/eventstringifier.cpp:473
+#: ../src/core/eventstringifier.cpp:730
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[WhoX] %1"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:736
 msgctxt "EventStringifier|"
 msgid "End of /WHOWAS"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:478
+#: ../src/core/eventstringifier.cpp:745
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick %1 contains illegal characters"
 msgstr "Smeknamnet %1 innehåller otillåtna tecken"
 
-#: ../src/core/eventstringifier.cpp:483
+#: ../src/core/eventstringifier.cpp:754
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick already in use: %1"
 msgstr "Smeknamnet används redan: %1"
 
-#: ../src/core/eventstringifier.cpp:488
+#: ../src/core/eventstringifier.cpp:763
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:509
+#: ../src/core/eventstringifier.cpp:787
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "sending CTCP-%1 request to %2"
 msgstr "skickar CTCP-%1-fråga till %2"
 
-#. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
-#: ../src/core/eventstringifier.cpp:522
+#: ../src/core/eventstringifier.cpp:804
 msgctxt "EventStringifier|"
 msgid "unknown"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:523
+#: ../src/core/eventstringifier.cpp:805
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received %1CTCP-%2 request by %3"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:526
+#: ../src/core/eventstringifier.cpp:808
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-%1 answer from %2: %3"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:537
+#: ../src/core/eventstringifier.cpp:823
 #, qt-format
 msgctxt "EventStringifier|"
-msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time"
-msgstr "Tog emot CTCP VERSION-svar från %1: %2"
-
-#: ../src/client/execwrapper.cpp:45
-#, qt-format
-msgctxt "ExecWrapper|"
-msgid "Invalid command string for /exec: %1"
+msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time"
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:53
+#: ../src/client/execwrapper.cpp:50
 #, qt-format
 msgctxt "ExecWrapper|"
-msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
+msgid "Invalid command string for /exec: %1"
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:64
+#: ../src/client/execwrapper.cpp:70
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Could not find script \"%1\""
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:82
+#: ../src/client/execwrapper.cpp:91
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" crashed with exit code %2."
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:98
+#: ../src/client/execwrapper.cpp:108
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" could not start."
 msgstr ""
 
-#: ../src/client/execwrapper.cpp:100
+#: ../src/client/execwrapper.cpp:110
 #, qt-format
 msgctxt "ExecWrapper|"
 msgid "Script \"%1\" caused error %2."
 msgstr ""
 
-#: ../src/uisupport/fontselector.cpp:31
-msgctxt "FontSelector|"
-msgid "Choose..."
-msgstr "Välj..."
+#: ../src/uisupport/fontselector.cpp:33
+msgctxt "FontSelector|"
+msgid "Choose..."
+msgstr "Välj..."
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:14
+msgctxt "HighlightSettingsPage|"
+msgid "Form"
+msgstr "Formulär"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:20
+msgctxt "HighlightSettingsPage|"
+msgid "Custom Highlights"
+msgstr "Markera"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:33
+msgctxt "HighlightSettingsPage|"
+msgid "Enabled"
+msgstr "Aktiverad"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:38
+msgctxt "HighlightSettingsPage|"
+msgid "Highlight"
+msgstr "Markera"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:43
+msgctxt "HighlightSettingsPage|"
+msgid "RegEx"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:48
+msgctxt "HighlightSettingsPage|"
+msgid "CS"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:53
+msgctxt "HighlightSettingsPage|"
+msgid "Channel"
+msgstr "Kanal"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:69
+msgctxt "HighlightSettingsPage|"
+msgid "Add"
+msgstr "Lägg till"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:76
+msgctxt "HighlightSettingsPage|"
+msgid "Remove"
+msgstr "Ta bort"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:101
+msgctxt "HighlightSettingsPage|"
+msgid "Highlight Nicks"
+msgstr "Markera"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:107
+msgctxt "HighlightSettingsPage|"
+msgid "All nicks from identity"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:114
+msgctxt "HighlightSettingsPage|"
+msgid "Current nick"
+msgstr "Aktuell chatt"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:124
+msgctxt "HighlightSettingsPage|"
+msgid "None"
+msgstr "Inget"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:131
+msgctxt "HighlightSettingsPage|"
+msgid "Case sensitive"
+msgstr "skiftlägeskänslig"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:156
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:94
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:285
+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:32
+msgctxt "HighlightSettingsPage|"
+msgid "Interface"
+msgstr "Gränssnitt"
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:34
+msgctxt "HighlightSettingsPage|"
+msgid "Legacy Highlights"
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:13
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:34
 msgctxt "HighlightSettingsPage|"
-msgid "Form"
-msgstr "Formulär"
+msgid "Local Highlights"
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:19
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:41
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:154
 msgctxt "HighlightSettingsPage|"
-msgid "Custom Highlights"
-msgstr "Markera"
+msgid "Enable/disable this rule"
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:32
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:45
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:155
 msgctxt "HighlightSettingsPage|"
-msgid "Highlight"
-msgstr "Markera"
+msgid "Phrase to match"
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:37
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:50
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:156
 msgctxt "HighlightSettingsPage|"
-msgid "RegEx"
+msgid ""
+"<b>RegEx</b>: This option determines if the highlight rule and "
+"<i>Channel</i> should be interpreted as <b>regular expressions</b> or just "
+"as keywords."
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:42
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:56
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:158
 msgctxt "HighlightSettingsPage|"
-msgid "CS"
+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.ui:47
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:62
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:160
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"<p><b>Channel</b>: Semicolon separated list of channel/query names, leave "
+"blank to match any name.</p><p><i>Example:</i><br /><i>#quassel*; #foobar; "
+"!#quasseldroid</i><br />would match on <i>#foobar</i> and any channel "
+"starting with <i>#quassel</i> except for <i>#quasseldroid</i><br /><p>If "
+"only inverted names are specified, it will match anything except for what's "
+"specified (implicit wildcard).</p><p><i>Example:</i><br /><i>!#quassel*; "
+"!#foobar</i><br />would match anything except for <i>#foobar</i> or any "
+"channel starting with <i>#quassel</i></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:90
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:273
 msgctxt "HighlightSettingsPage|"
-msgid "Enable"
-msgstr "Aktivera"
+msgid "Legacy Highlights are replaced by Highlights"
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:55
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:245
 msgctxt "HighlightSettingsPage|"
-msgid "Add"
-msgstr "Lägg till"
+msgid "this shouldn't be empty"
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:62
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:271
 msgctxt "HighlightSettingsPage|"
-msgid "Remove"
-msgstr "Ta bort"
+msgid "Legacy Highlights vs. Highlights"
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:85
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:274
 msgctxt "HighlightSettingsPage|"
-msgid "Highlight Nicks"
-msgstr "Markera"
+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.ui:91
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:276
+#, qt-format
 msgctxt "HighlightSettingsPage|"
-msgid "All nicks from identity"
+msgid "Configure the new style of highlights in <i>%1</i>."
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:98
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:278
 msgctxt "HighlightSettingsPage|"
-msgid "Current nick"
-msgstr "Aktuell chatt"
+msgid "Highlights"
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:108
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:283
 msgctxt "HighlightSettingsPage|"
-msgid "None"
-msgstr "Inget"
+msgid "Local Highlights vs. Remote Highlights"
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:115
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:286
 msgctxt "HighlightSettingsPage|"
-msgid "Case sensitive"
-msgstr "skiftlägeskänslig"
+msgid "Highlights configured on this page only apply to your current device."
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:30
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:288
+#, qt-format
 msgctxt "HighlightSettingsPage|"
-msgid "Interface"
-msgstr "Gränssnitt"
+msgid "Configure highlights for all of your devices in <i>%1</i>."
+msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:159
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:290
 msgctxt "HighlightSettingsPage|"
-msgid "this shouldn't be empty"
+msgid "Remote Highlights"
 msgstr ""
 
-#: ../src/qtui/settingspages/highlightsettingspage.h:45
+#: ../src/qtui/settingspages/highlightsettingspage.h:47
 msgctxt "HighlightSettingsPage|"
 msgid "highlight rule"
 msgstr "Markera"
 
+#: ../src/core/identserver.cpp:40
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd clients on IPv6 %1 port %2"
+msgstr ""
+
+#: ../src/core/identserver.cpp:46
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd clients on IPv4 %1 port %2"
+msgstr ""
+
+#: ../src/core/identserver.cpp:52
+msgctxt "IdentServer|"
+msgid ""
+"Identd could not open any network interfaces to listen on! No identd "
+"functionality will be available"
+msgstr ""
+
 #: ../src/qtui/settingspages/identitiessettingspage.ui:31
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:322
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:369
 msgctxt "IdentitiesSettingsPage|"
 msgid "Rename Identity"
 msgstr "Ta bort identitet"
@@ -2773,104 +4726,104 @@ msgctxt "IdentitiesSettingsPage|"
 msgid "Remove Identity"
 msgstr "Ta bort identitet"
 
-#: ../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 "Identiteter"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:178
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:203
 msgctxt "IdentitiesSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"
 msgstr ""
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:179
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:205
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>All identities need an identity name set</li>"
 msgstr ""
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:180
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:207
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>Every identity needs at least one nickname defined</li>"
 msgstr ""
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:181
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:209
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify a real name for every identity</li>"
 msgstr ""
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:182
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:211
 msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr ""
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:183
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:212
 msgctxt "IdentitiesSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:184
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:213
 msgctxt "IdentitiesSettingsPage|"
 msgid "One or more identities are invalid"
 msgstr "En eller flera identiteter är ogiltiga"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:310
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:352
 msgctxt "IdentitiesSettingsPage|"
 msgid "Delete Identity?"
 msgstr "Ta bort identitet?"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:311
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:353
 #, qt-format
 msgctxt "IdentitiesSettingsPage|"
 msgid "Do you really want to delete identity \"%1\"?"
 msgstr "Vill du verkligen ta bort chattlistan \"%1\"?"
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:323
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:370
 #, qt-format
 msgctxt "IdentitiesSettingsPage|"
 msgid "Please enter a new name for the identity \"%1\"!"
 msgstr ""
 
-#: ../src/common/identity.cpp:134
+#: ../src/common/identity.cpp:141
 msgctxt "Identity|"
 msgid "Quassel IRC User"
 msgstr "Quassel IRC-användare"
 
-#: ../src/common/identity.cpp:162
+#: ../src/common/identity.cpp:170
 msgctxt "Identity|"
 msgid "<empty>"
 msgstr "<tom>"
 
-#: ../src/common/identity.cpp:168
+#: ../src/common/identity.cpp:176
 msgctxt "Identity|"
 msgid "Gone fishing."
 msgstr "Gått och fiskat."
 
-#: ../src/common/identity.cpp:172
+#: ../src/common/identity.cpp:180
 msgctxt "Identity|"
 msgid "Not here. No, really. not here!"
 msgstr "Inte här. Kom igen, inte här!"
 
-#: ../src/common/identity.cpp:175
+#: ../src/common/identity.cpp:183
 msgctxt "Identity|"
 msgid "All Quassel clients vanished from the face of the earth..."
 msgstr ""
 
-#: ../src/common/identity.cpp:178
+#: ../src/common/identity.cpp:186
 msgctxt "Identity|"
 msgid "Kindergarten is elsewhere!"
 msgstr "Detta är inte ett dagis!"
 
-#: ../src/common/identity.cpp:179 ../src/common/identity.cpp:180
+#: ../src/common/identity.cpp:187 ../src/common/identity.cpp:188
 msgctxt "Identity|"
-msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
-msgstr "http://quassel-irc.org - Chatta smidigt. Överallt."
+msgid "https://quassel-irc.org - Chat comfortably. Anywhere."
+msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
 msgctxt "IdentityEditWidget|"
@@ -3001,7 +4954,7 @@ msgid "minutes of being idle"
 msgstr "minuters inaktivitet"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:399
-#: ../src/qtui/settingspages/identityeditwidget.cpp:219
+#: ../src/qtui/settingspages/identityeditwidget.cpp:283
 msgctxt "IdentityEditWidget|"
 msgid "Advanced"
 msgstr "Avancerat"
@@ -3067,16 +5020,15 @@ msgid "Key Type:"
 msgstr "Nyckeltyp:"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:605
-#: ../src/qtui/settingspages/identityeditwidget.cpp:317
-#: ../src/qtui/settingspages/identityeditwidget.cpp:328
+#: ../src/qtui/settingspages/identityeditwidget.cpp:403
 msgctxt "IdentityEditWidget|"
 msgid "No Key loaded"
 msgstr "Ingen nyckel inläst"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:625
 #: ../src/qtui/settingspages/identityeditwidget.ui:723
-#: ../src/qtui/settingspages/identityeditwidget.cpp:318
-#: ../src/qtui/settingspages/identityeditwidget.cpp:365
+#: ../src/qtui/settingspages/identityeditwidget.cpp:404
+#: ../src/qtui/settingspages/identityeditwidget.cpp:458
 msgctxt "IdentityEditWidget|"
 msgid "Load"
 msgstr "Läs in"
@@ -3093,8 +5045,8 @@ msgstr "Organisation:"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:663
 #: ../src/qtui/settingspages/identityeditwidget.ui:697
-#: ../src/qtui/settingspages/identityeditwidget.cpp:363
-#: ../src/qtui/settingspages/identityeditwidget.cpp:364
+#: ../src/qtui/settingspages/identityeditwidget.cpp:456
+#: ../src/qtui/settingspages/identityeditwidget.cpp:457
 msgctxt "IdentityEditWidget|"
 msgid "No Certificate loaded"
 msgstr "Inget certifikat inläst"
@@ -3104,38 +5056,127 @@ msgctxt "IdentityEditWidget|"
 msgid "CommonName:"
 msgstr "Värdnamn:"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:290
+#: ../src/qtui/settingspages/identityeditwidget.cpp:103
+msgctxt "IdentityEditWidget|"
+msgid ""
+"You can add date/time to this message using the syntax: <br/>%%<span "
+"class='italic'>&lt;format&gt;</span>%%, where <span "
+"class='italic'>&lt;format&gt;</span> is:"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:109
+msgctxt "IdentityEditWidget|"
+msgid "the hour"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:110
+msgctxt "IdentityEditWidget|"
+msgid "the minutes"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:111
+msgctxt "IdentityEditWidget|"
+msgid "seconds"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:112
+msgctxt "IdentityEditWidget|"
+msgid "AM/PM"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:113
+msgctxt "IdentityEditWidget|"
+msgid "day"
+msgstr "dag"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:114
+msgctxt "IdentityEditWidget|"
+msgid "month"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:115
+msgctxt "IdentityEditWidget|"
+msgid "current timezone"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:117
+msgctxt "IdentityEditWidget|"
+msgid "Example: Away since %%hh:mm%% on %%dd.MM%%."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:119
+msgctxt "IdentityEditWidget|"
+msgid ""
+"%%%% without anything inside represents %%.  Other format codes are "
+"available."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:362
 msgctxt "IdentityEditWidget|"
 msgid "Load a Key"
 msgstr "Läs in en nyckel"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:322
+#: ../src/qtui/settingspages/identityeditwidget.cpp:387
+msgctxt "IdentityEditWidget|"
+msgid "Failed to read key"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:388
+msgctxt "IdentityEditWidget|"
+msgid ""
+"Failed to read the key file. It is either incompatible or invalid. Note that"
+" the key file must not have a passphrase."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:393
+msgctxt "IdentityEditWidget|"
+msgid "Core does not support ECDSA keys"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:394
+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:409
 msgctxt "IdentityEditWidget|"
 msgid "RSA"
 msgstr "RSA"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:325
+#: ../src/qtui/settingspages/identityeditwidget.cpp:412
+msgctxt "IdentityEditWidget|"
+msgid "ECDSA"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:415
 msgctxt "IdentityEditWidget|"
 msgid "DSA"
 msgstr "DSA"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:330
-#: ../src/qtui/settingspages/identityeditwidget.cpp:369
+#: ../src/qtui/settingspages/identityeditwidget.cpp:418
+msgctxt "IdentityEditWidget|"
+msgid "Invalid key or no key loaded"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:420
+#: ../src/qtui/settingspages/identityeditwidget.cpp:463
 msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr "Töm"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:340
+#: ../src/qtui/settingspages/identityeditwidget.cpp:432
 msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr "Läs in ett certifikat"
 
-#: ../src/qtui/ircconnectionwizard.cpp:107
+#: ../src/qtui/ircconnectionwizard.cpp:110
 msgctxt "IdentityPage|"
 msgid "Setup Identity"
 msgstr "Konfigurera identitet"
 
-#: ../src/qtui/ircconnectionwizard.cpp:112
+#: ../src/qtui/ircconnectionwizard.cpp:115
 msgctxt "IdentityPage|"
 msgid "Default Identity"
 msgstr "Standardidentitet"
@@ -3279,12 +5320,19 @@ msgid ""
 "<p>A scope rule is a semicolon separated list of either <i>network</i> or <i>channel</i> names.</p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"
-"<i>#quassel*; #foobar</i>\n"
+"<i>#quassel*; #foobar; !#quasseldroid</i>\n"
 "<br />\n"
-"would match on #foobar and on any channel starting with <i>#quassel</i></p>"
+"would match on <i>#foobar</i> and any channel starting with <i>#quassel</i> except for <i>#quasseldroid</i>\n"
+"<br />\n"
+"<p>If only inverted names are specified, it will match anything except for what's specified (implicit wildcard).</p>\n"
+"<p><i>Example:</i>\n"
+"<br />\n"
+"<i>!#quassel*; !#foobar</i>\n"
+"<br />\n"
+"would match anything except for <i>#foobar</i> or any channel starting with <i>#quassel</i></p>"
 msgstr ""
 
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:221
 msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Enable / Disable:</b></p>\n"
@@ -3293,19 +5341,19 @@ msgid ""
 "For dynamic rules, disabling actually shows the filtered messages again.</p>"
 msgstr ""
 
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:227
 msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr "Regeln är aktiverad"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:69
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:68
 msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
 "dynamic rules, disabling actually shows the filtered messages again"
 msgstr ""
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:73
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:72
 msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "
@@ -3318,27 +5366,27 @@ msgid ""
 "host<br />"
 msgstr ""
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:89
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:88
 msgctxt "IgnoreListModel|"
 msgid "By Sender"
 msgstr "Avsändare"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:90
 msgctxt "IgnoreListModel|"
 msgid "By Message"
 msgstr "Meddelande"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:193
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:200
 msgctxt "IgnoreListModel|"
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:194
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:200
 msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:195
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:200
 msgctxt "IgnoreListModel|"
 msgid "Ignore Rule"
 msgstr "Ignoreringsregel"
@@ -3363,22 +5411,22 @@ msgctxt "IgnoreListSettingsPage|"
 msgid "&Edit"
 msgstr "R&edigera"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:37
 msgctxt "IgnoreListSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:37
 msgctxt "IgnoreListSettingsPage|"
 msgid "Ignore List"
 msgstr "Visa ignoreringslista"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:128
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:139
 msgctxt "IgnoreListSettingsPage|"
 msgid "Rule already exists"
 msgstr "Regeln finns redan"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:129
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:140
 #, qt-format
 msgctxt "IgnoreListSettingsPage|"
 msgid ""
@@ -3387,118 +5435,146 @@ msgid ""
 "Please choose another rule."
 msgstr ""
 
-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
-msgctxt "IndicatorNotificationConfigWidget|"
+#: ../src/qtui/inputwidget.ui:26
+msgctxt "InputWidget|"
 msgid "Form"
 msgstr "Formulär"
 
-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
-msgctxt "IndicatorNotificationConfigWidget|"
-msgid ""
-"This enables support for the Ayatana Project's application indicator "
-"(libindicate)."
+#: ../src/qtui/inputwidget.ui:59
+msgctxt "InputWidget|"
+msgid "View and change nick"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:139
+msgctxt "InputWidget|"
+msgid "Bold"
 msgstr ""
 
-#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
-msgctxt "IndicatorNotificationConfigWidget|"
-msgid "Show messages in application indicator"
+#: ../src/qtui/inputwidget.ui:179
+msgctxt "InputWidget|"
+msgid "Italic"
 msgstr ""
 
-#: ../src/qtui/ui/inputwidget.ui:26
+#: ../src/qtui/inputwidget.ui:222
 msgctxt "InputWidget|"
-msgid "Form"
-msgstr "Formulär"
+msgid "Underline"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:262
+msgctxt "InputWidget|"
+msgid "Set foreground color"
+msgstr ""
+
+#: ../src/qtui/inputwidget.ui:293
+msgctxt "InputWidget|"
+msgid "Set background color"
+msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.ui:327
+msgctxt "InputWidget|"
+msgid "Clear formatting"
+msgstr ""
+
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "White"
 msgstr "Vit"
 
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Black"
 msgstr "Svart"
 
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr "Mörkblå"
 
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr "Mörkgrön"
 
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Red"
 msgstr "Röd"
 
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr "Mörkröd"
 
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr "Mörk magenta"
 
-#: ../src/qtui/inputwidget.cpp:73
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Orange"
 msgstr "Orange"
 
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr "Gul"
 
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Green"
 msgstr "Grön"
 
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr "Mörk cyan"
 
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr "Cyan"
 
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Blue"
 msgstr "Blå"
 
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:79
 msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr "Mörkgrå"
 
-#: ../src/qtui/inputwidget.cpp:74
+#: ../src/qtui/inputwidget.cpp:80
 msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr "Ljusgrå"
 
-#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85
+#: ../src/qtui/inputwidget.cpp:90 ../src/qtui/inputwidget.cpp:91
 msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr "Töm"
 
-#: ../src/qtui/inputwidget.cpp:132
+#: ../src/qtui/inputwidget.cpp:133
 msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr "Visa inmatningsrad"
 
+#: ../src/qtui/inputwidget.cpp:585
+msgctxt "InputWidget|"
+msgid "Hide formatting options"
+msgstr ""
+
+#: ../src/qtui/inputwidget.cpp:589
+msgctxt "InputWidget|"
+msgid "Show formatting options"
+msgstr ""
+
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
 msgctxt "InputWidgetSettingsPage|"
 msgid "Form"
@@ -3511,95 +5587,105 @@ msgstr "Anpassad:"
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
 msgctxt "InputWidgetSettingsPage|"
-msgid "Enable spell check"
-msgstr ""
-
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
-msgctxt "InputWidgetSettingsPage|"
 msgid "Enable per chat history"
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:66
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
 msgstr "Visa smeknamnslista"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:82
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
 msgstr "Visa systemfältsikon"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:98
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enables (limited) Emacs key bindings in the input field."
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:101
 msgctxt "InputWidgetSettingsPage|"
 msgid "Emacs key bindings"
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgctxt "InputWidgetSettingsPage|"
+msgid "Enables line wrapping for input."
+msgstr ""
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:117
+msgctxt "InputWidgetSettingsPage|"
+msgid "Line wrapping"
+msgstr ""
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
 msgctxt "InputWidgetSettingsPage|"
-msgid "Multi-Line Editing"
+msgid "&Multi-Line Editing"
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:147
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show at most"
 msgstr "Visa som mest"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:173
 msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
 msgstr "rader"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
 msgstr "Aktivera rullningslister"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:214
 msgctxt "InputWidgetSettingsPage|"
 msgid "Tab Completion"
 msgstr "Kopiera markering"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:222
 msgctxt "InputWidgetSettingsPage|"
 msgid "Completion suffix:"
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:238
 msgctxt "InputWidgetSettingsPage|"
 msgid ": "
 msgstr ": "
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:262
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:265
 msgctxt "InputWidgetSettingsPage|"
 msgid "Add space after nick when completing mid-sentence"
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24
 msgctxt "InputWidgetSettingsPage|"
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24
 msgctxt "InputWidgetSettingsPage|"
 msgid "Input Widget"
 msgstr ""
 
-#: ../src/qtui/ircconnectionwizard.cpp:51
+#: ../src/common/internalpeer.cpp:52 ../src/common/internalpeer.cpp:57
+msgctxt "InternalPeer|"
+msgid "internal connection"
+msgstr ""
+
+#: ../src/qtui/ircconnectionwizard.cpp:47
 msgctxt "IrcConnectionWizard|"
 msgid "Save && Connect"
 msgstr "Spara och anslut"
 
-#: ../src/client/irclistmodel.cpp:59
+#: ../src/client/irclistmodel.cpp:61
 msgctxt "IrcListModel|"
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../src/client/irclistmodel.cpp:60
+#: ../src/client/irclistmodel.cpp:61
 msgctxt "IrcListModel|"
 msgid "Users"
 msgstr "Användare"
@@ -3609,28 +5695,95 @@ msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr "Ämne"
 
-#: ../src/client/networkmodel.cpp:806
+#: ../src/core/ircparser.cpp:378
+msgctxt "IrcParser|"
+msgid "Capability negotiation not supported"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1099
 msgctxt "IrcUserItem|"
-msgid " is away"
-msgstr " är borta"
+msgid "Modes"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:821
-#, qt-format
+#: ../src/client/networkmodel.cpp:1101
 msgctxt "IrcUserItem|"
-msgid "idling since %1"
+msgid "Unknown"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:824
-#, qt-format
+#: ../src/client/networkmodel.cpp:1107
 msgctxt "IrcUserItem|"
-msgid "login time: %1"
+msgid "Away message"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:827
-#, qt-format
+#: ../src/client/networkmodel.cpp:1109
+msgctxt "IrcUserItem|"
+msgid "Realname"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1114
+msgctxt "IrcUserItem|"
+msgid "Help status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1114
+msgctxt "IrcUserItem|"
+msgid "Available for help"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1117
+msgctxt "IrcUserItem|"
+msgid "Service status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1127
+msgctxt "IrcUserItem|"
+msgid "Not logged in"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1133 ../src/client/networkmodel.cpp:1140
+msgctxt "IrcUserItem|"
+msgid "Account"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1140
+msgctxt "IrcUserItem|"
+msgid "Identified for this nick"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1146
+msgctxt "IrcUserItem|"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1150
+msgctxt "IrcUserItem|"
+msgid "Hostmask"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1154
+msgctxt "IrcUserItem|"
+msgid "Operator"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1162
 msgctxt "IrcUserItem|"
-msgid "server: %1"
-msgstr "server: %1"
+msgid "Idling since"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1166
+msgctxt "IrcUserItem|"
+msgid "Login time"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1169
+msgctxt "IrcUserItem|"
+msgid "Server"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1174
+msgctxt "IrcUserItem|"
+msgid "No information available"
+msgstr ""
 
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:14
 msgctxt "ItemViewSettingsPage|"
@@ -3667,98 +5820,98 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Use Custom Colors"
 msgstr "Använd anpassade färger"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:121
 msgctxt "ItemViewSettingsPage|"
 msgid "Standard:"
 msgstr "Standard:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:125
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:149
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:173
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:197
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:221
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:308
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:345
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:128
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:152
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:176
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:200
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:224
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:340
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:380
 msgctxt "ItemViewSettingsPage|"
 msgid "..."
 msgstr "..."
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:142
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:145
 msgctxt "ItemViewSettingsPage|"
 msgid "Inactive:"
 msgstr "Inaktiv:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:169
 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
 msgstr "Olästa meddelanden:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:193
 msgctxt "ItemViewSettingsPage|"
 msgid "Highlight:"
 msgstr "Markera"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:217
 msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
 msgstr "Annan Aktivitet"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:318
 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 msgstr "Anpassade färger"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:333
 msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
 msgstr "rader"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:373
 msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr "Borta:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:30
 msgctxt "ItemViewSettingsPage|"
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:30
 msgctxt "ItemViewSettingsPage|"
 msgid "Chat & Nick Lists"
 msgstr "&Chattlistor"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:33
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:35
 msgctxt "ItemViewSettingsPage|"
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:36
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
 msgctxt "ItemViewSettingsPage|"
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
 msgctxt "ItemViewSettingsPage|"
 msgid "Normal"
 msgstr "Normal"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages"
 msgstr "Olästa meddelanden"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:41
 msgctxt "ItemViewSettingsPage|"
 msgid "Highlight"
 msgstr "Markera"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:42
 msgctxt "ItemViewSettingsPage|"
 msgid "Other activity"
 msgstr "Annan Aktivitet"
 
-#: ../src/qtui/knotificationbackend.cpp:115
+#: ../src/qtui/knotificationbackend.cpp:133
 #, qt-format
 msgctxt "KNotificationBackend|"
 msgid "%n pending highlight(s)"
@@ -3766,453 +5919,656 @@ msgid_plural "%n pending highlight(s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:77
+#: ../src/qtui/settingspages/keysequencewidget.cpp:76
 msgctxt "KeySequenceButton|"
 msgid "The key you just pressed is not supported by Qt."
 msgstr ""
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:78
+#: ../src/qtui/settingspages/keysequencewidget.cpp:76
 msgctxt "KeySequenceButton|"
 msgid "Unsupported Key"
 msgstr ""
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:169
+#: ../src/qtui/settingspages/keysequencewidget.cpp:166
 msgctxt "KeySequenceWidget|"
 msgid ""
 "Click on the button, then enter the shortcut like you would in the program.\n"
 "Example for Ctrl+a: hold the Ctrl key and press a."
 msgstr ""
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:259
+#: ../src/qtui/settingspages/keysequencewidget.cpp:266
 msgctxt "KeySequenceWidget|Meta key"
 msgid "Meta"
 msgstr "Meta"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:260
+#: ../src/qtui/settingspages/keysequencewidget.cpp:268
 msgctxt "KeySequenceWidget|Ctrl key"
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:261
+#: ../src/qtui/settingspages/keysequencewidget.cpp:270
 msgctxt "KeySequenceWidget|Alt key"
 msgid "Alt"
 msgstr "Alt"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:262
+#: ../src/qtui/settingspages/keysequencewidget.cpp:272
 msgctxt "KeySequenceWidget|Shift key"
 msgid "Shift"
 msgstr "Skift"
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:265
+#: ../src/qtui/settingspages/keysequencewidget.cpp:276
 msgctxt ""
 "KeySequenceWidget|What the user inputs now will be taken as the new shortcut"
 msgid "Input"
 msgstr ""
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:272
-msgctxt "KeySequenceWidget|No shortcut defined"
-msgid "None"
-msgstr "Inget"
+#: ../src/qtui/settingspages/keysequencewidget.cpp:283
+msgctxt "KeySequenceWidget|No shortcut defined"
+msgid "None"
+msgstr "Inget"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:373
+#: ../src/qtui/settingspages/keysequencewidget.cpp:381
+msgctxt "KeySequenceWidget|"
+msgid "Shortcut Conflict"
+msgstr "Genväg"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:374
+#, qt-format
+msgctxt "KeySequenceWidget|"
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:382
+#, qt-format
+msgctxt "KeySequenceWidget|"
+msgid ""
+"The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:383
+msgctxt "KeySequenceWidget|"
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr ""
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:387
+msgctxt "KeySequenceWidget|"
+msgid "Reassign"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:71
+msgctxt "LdapAuthenticator|"
+msgid "LDAP"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:76
+msgctxt "LdapAuthenticator|"
+msgid "Authenticate users using an LDAP server."
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:83
+msgctxt "LdapAuthenticator|"
+msgid "Hostname"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:83
+msgctxt "LdapAuthenticator|"
+msgid "Port"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:84
+msgctxt "LdapAuthenticator|"
+msgid "Bind DN"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:84
+msgctxt "LdapAuthenticator|"
+msgid "Bind Password"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:84
+msgctxt "LdapAuthenticator|"
+msgid "Base DN"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:85
+msgctxt "LdapAuthenticator|"
+msgid "Filter"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:85
+msgctxt "LdapAuthenticator|"
+msgid "UID Attribute"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:142
+msgctxt "LegacyPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:355
-#: ../src/qtui/settingspages/keysequencewidget.cpp:361
-msgctxt "KeySequenceWidget|"
-msgid "Shortcut Conflict"
-msgstr "Genväg"
+#: ../src/common/protocols/legacy/legacypeer.cpp:225
+#, qt-format
+msgctxt "LegacyPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:356
+#: ../src/common/logger.cpp:90
 #, qt-format
-msgctxt "KeySequenceWidget|"
-msgid ""
-"The \"%1\" shortcut is already in use, and cannot be configured.\n"
-"Please choose another one."
+msgctxt "Logger|"
+msgid "Invalid log level %1; supported are Debug|Info|Warning|Error"
 msgstr ""
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:362
+#: ../src/common/logger.cpp:98
 #, qt-format
-msgctxt "KeySequenceWidget|"
-msgid ""
-"The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgctxt "Logger|"
+msgid "Could not open log file \"%1\": %2"
 msgstr ""
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:364
-msgctxt "KeySequenceWidget|"
-msgid "Do you want to reassign this shortcut to the selected action?"
+#: ../src/common/logger.cpp:103
+#, qt-format
+msgctxt "Logger|"
+msgid "Cannot write to stderr: %1"
 msgstr ""
 
-#: ../src/qtui/settingspages/keysequencewidget.cpp:367
-msgctxt "KeySequenceWidget|"
-msgid "Reassign"
+#: ../src/qtui/mainpage.cpp:43
+msgctxt "MainPage|"
+msgid "Connect to Core..."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:313
+#: ../src/qtui/mainwin.cpp:363
 msgctxt "MainWin|"
 msgid "General"
 msgstr "Allmänt"
 
-#: ../src/qtui/mainwin.cpp:315
+#: ../src/qtui/mainwin.cpp:367
 msgctxt "MainWin|"
 msgid "&Connect to Core..."
 msgstr "&Anslut till Core..."
 
-#: ../src/qtui/mainwin.cpp:317
+#: ../src/qtui/mainwin.cpp:369
 msgctxt "MainWin|"
 msgid "&Disconnect from Core"
 msgstr "&Koppla från Core"
 
-#: ../src/qtui/mainwin.cpp:319
+#: ../src/qtui/mainwin.cpp:370
+msgctxt "MainWin|"
+msgid "Change &Password..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:371
 msgctxt "MainWin|"
 msgid "Core &Info..."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:321
+#: ../src/qtui/mainwin.cpp:373
 msgctxt "MainWin|"
 msgid "Configure &Networks..."
 msgstr "Konfigurera &nätverk..."
 
-#: ../src/qtui/mainwin.cpp:324
+#: ../src/qtui/mainwin.cpp:374
 msgctxt "MainWin|"
 msgid "&Quit"
 msgstr "A&vsluta"
 
-#: ../src/qtui/mainwin.cpp:328
+#: ../src/qtui/mainwin.cpp:377
 msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
 msgstr "&Konfigurera chattlistor..."
 
-#: ../src/qtui/mainwin.cpp:331
-msgctxt "MainWin|"
-msgid "&Lock Layout"
-msgstr "&Lås layout"
-
-#: ../src/qtui/mainwin.cpp:335
+#: ../src/qtui/mainwin.cpp:379
 msgctxt "MainWin|"
 msgid "Show &Search Bar"
 msgstr "Visa status&rad"
 
-#: ../src/qtui/mainwin.cpp:337
+#: ../src/qtui/mainwin.cpp:380
 msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr "Visa som mest"
 
-#: ../src/qtui/mainwin.cpp:339
+#: ../src/qtui/mainwin.cpp:381
 msgctxt "MainWin|"
 msgid "Show &Menubar"
 msgstr "Visa &menyrad"
 
-#: ../src/qtui/mainwin.cpp:342
+#: ../src/qtui/mainwin.cpp:382
 msgctxt "MainWin|"
 msgid "Show Status &Bar"
 msgstr "Visa status&rad"
 
-#: ../src/qtui/mainwin.cpp:348
+#: ../src/qtui/mainwin.cpp:384
+msgctxt "MainWin|"
+msgid "&Lock Layout"
+msgstr "&Lås layout"
+
+#: ../src/qtui/mainwin.cpp:396
 msgctxt "MainWin|"
 msgid "&Full Screen Mode"
 msgstr "&Helskärmsläge"
 
-#: ../src/qtui/mainwin.cpp:355
+#: ../src/qtui/mainwin.cpp:407
 msgctxt "MainWin|"
 msgid "Configure &Shortcuts..."
 msgstr "Konfigurera &genvägar..."
 
-#: ../src/qtui/mainwin.cpp:361 ../src/qtui/mainwin.cpp:365
+#: ../src/qtui/mainwin.cpp:410
 msgctxt "MainWin|"
 msgid "&Configure Quassel..."
 msgstr "&Konfigurera Quassel..."
 
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:414
 msgctxt "MainWin|"
 msgid "&About Quassel"
 msgstr "&Om Quassel"
 
-#: ../src/qtui/mainwin.cpp:376
+#: ../src/qtui/mainwin.cpp:416
 msgctxt "MainWin|"
 msgid "About &Qt"
 msgstr "Om &Qt"
 
-#: ../src/qtui/mainwin.cpp:380
+#: ../src/qtui/mainwin.cpp:420
 msgctxt "MainWin|"
 msgid "Debug &NetworkModel"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:382
+#: ../src/qtui/mainwin.cpp:422
 msgctxt "MainWin|"
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:424
 msgctxt "MainWin|"
 msgid "Debug &MessageModel"
 msgstr "Nytt meddelande"
 
-#: ../src/qtui/mainwin.cpp:386
+#: ../src/qtui/mainwin.cpp:425
 msgctxt "MainWin|"
 msgid "Debug &HotList"
 msgstr "Felsöknings&logg"
 
-#: ../src/qtui/mainwin.cpp:388
+#: ../src/qtui/mainwin.cpp:426
 msgctxt "MainWin|"
 msgid "Debug &Log"
 msgstr "Felsöknings&logg"
 
-#: ../src/qtui/mainwin.cpp:390
+#: ../src/qtui/mainwin.cpp:428
+msgctxt "MainWin|"
+msgid "Show &Resource Tree"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:431
 msgctxt "MainWin|"
 msgid "Reload Stylesheet"
 msgstr "Använd anpassad stilmall"
 
-#: ../src/qtui/mainwin.cpp:394
+#: ../src/qtui/mainwin.cpp:438
+msgctxt "MainWin|"
+msgid "Hide Current Buffer"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:441
+msgctxt "MainWin|"
+msgid "Text formatting"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:446
+msgctxt "MainWin|"
+msgid "Apply foreground color"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:453
+msgctxt "MainWin|"
+msgid "Apply background color"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:460
+msgctxt "MainWin|"
+msgid "Clear formatting"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:466
+msgctxt "MainWin|"
+msgid "Toggle bold"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:468
+msgctxt "MainWin|"
+msgid "Toggle italics"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:471
+msgctxt "MainWin|"
+msgid "Toggle underline"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:478
 msgctxt "MainWin|"
 msgid "Navigation"
 msgstr "Navigation"
 
-#: ../src/qtui/mainwin.cpp:396
+#: ../src/qtui/mainwin.cpp:482
 msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:408
+#: ../src/qtui/mainwin.cpp:484
+msgctxt "MainWin|"
+msgid "Activate the buffer search"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:496
 msgctxt "MainWin|"
 msgid "Set Quick Access #0"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:410
+#: ../src/qtui/mainwin.cpp:499
 msgctxt "MainWin|"
 msgid "Set Quick Access #1"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:412
+#: ../src/qtui/mainwin.cpp:502
 msgctxt "MainWin|"
 msgid "Set Quick Access #2"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:505
 msgctxt "MainWin|"
 msgid "Set Quick Access #3"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:416
+#: ../src/qtui/mainwin.cpp:508
 msgctxt "MainWin|"
 msgid "Set Quick Access #4"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:418
+#: ../src/qtui/mainwin.cpp:511
 msgctxt "MainWin|"
 msgid "Set Quick Access #5"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:420
+#: ../src/qtui/mainwin.cpp:514
 msgctxt "MainWin|"
 msgid "Set Quick Access #6"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:422
+#: ../src/qtui/mainwin.cpp:517
 msgctxt "MainWin|"
 msgid "Set Quick Access #7"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:424
+#: ../src/qtui/mainwin.cpp:520
 msgctxt "MainWin|"
 msgid "Set Quick Access #8"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:426
+#: ../src/qtui/mainwin.cpp:523
 msgctxt "MainWin|"
 msgid "Set Quick Access #9"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:429
+#: ../src/qtui/mainwin.cpp:526
 msgctxt "MainWin|"
 msgid "Quick Access #0"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:431
+#: ../src/qtui/mainwin.cpp:528
 msgctxt "MainWin|"
 msgid "Quick Access #1"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:433
+#: ../src/qtui/mainwin.cpp:530
 msgctxt "MainWin|"
 msgid "Quick Access #2"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:435
+#: ../src/qtui/mainwin.cpp:532
 msgctxt "MainWin|"
 msgid "Quick Access #3"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:437
+#: ../src/qtui/mainwin.cpp:534
 msgctxt "MainWin|"
 msgid "Quick Access #4"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:439
+#: ../src/qtui/mainwin.cpp:536
 msgctxt "MainWin|"
 msgid "Quick Access #5"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:441
+#: ../src/qtui/mainwin.cpp:538
 msgctxt "MainWin|"
 msgid "Quick Access #6"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:443
+#: ../src/qtui/mainwin.cpp:540
 msgctxt "MainWin|"
 msgid "Quick Access #7"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:445
+#: ../src/qtui/mainwin.cpp:542
 msgctxt "MainWin|"
 msgid "Quick Access #8"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:447
+#: ../src/qtui/mainwin.cpp:544
 msgctxt "MainWin|"
 msgid "Quick Access #9"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:451
+#: ../src/qtui/mainwin.cpp:550
 msgctxt "MainWin|"
 msgid "Activate Next Chat List"
 msgstr "Ta bort chattlista?"
 
-#: ../src/qtui/mainwin.cpp:453
+#: ../src/qtui/mainwin.cpp:557
 msgctxt "MainWin|"
 msgid "Activate Previous Chat List"
 msgstr "Gå till föregående chatt"
 
-#: ../src/qtui/mainwin.cpp:455
+#: ../src/qtui/mainwin.cpp:564
 msgctxt "MainWin|"
 msgid "Go to Next Chat"
 msgstr "Gå till nästa chatt"
 
-#: ../src/qtui/mainwin.cpp:457
+#: ../src/qtui/mainwin.cpp:571
 msgctxt "MainWin|"
 msgid "Go to Previous Chat"
 msgstr "Gå till föregående chatt"
 
-#: ../src/qtui/mainwin.cpp:464
+#: ../src/qtui/mainwin.cpp:582
 msgctxt "MainWin|"
 msgid "&File"
 msgstr "&Arkiv"
 
-#: ../src/qtui/mainwin.cpp:477
+#: ../src/qtui/mainwin.cpp:597
 msgctxt "MainWin|"
 msgid "&Networks"
 msgstr "&Nätverk"
 
-#: ../src/qtui/mainwin.cpp:483
+#: ../src/qtui/mainwin.cpp:603
 msgctxt "MainWin|"
 msgid "&View"
 msgstr "&Visa"
 
-#: ../src/qtui/mainwin.cpp:484
+#: ../src/qtui/mainwin.cpp:604
 msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr "&Chattlistor"
 
-#: ../src/qtui/mainwin.cpp:486
+#: ../src/qtui/mainwin.cpp:606
 msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr "Ver&ktygsrader"
 
-#: ../src/qtui/mainwin.cpp:500
+#: ../src/qtui/mainwin.cpp:620
 msgctxt "MainWin|"
 msgid "&Settings"
 msgstr "&Inställningar"
 
-#: ../src/qtui/mainwin.cpp:509
+#: ../src/qtui/mainwin.cpp:634
 msgctxt "MainWin|"
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: ../src/qtui/mainwin.cpp:517
+#: ../src/qtui/mainwin.cpp:647
 msgctxt "MainWin|"
 msgid "Debug"
 msgstr "Felsök"
 
-#: ../src/qtui/mainwin.cpp:746
+#: ../src/qtui/mainwin.cpp:815
+msgctxt "MainWin|"
+msgid "Feature Not Supported"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:816
+msgctxt "MainWin|"
+msgid "<b>Your Quassel Core does not support this feature</b>"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:818
+msgctxt "MainWin|"
+msgid ""
+"You need a Quassel Core v0.12.0 or newer in order to be able to remotely "
+"change your password."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:827
+msgctxt "MainWin|"
+msgid "Upgrading..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:828
+msgctxt "MainWin|"
+msgid "Your database is being upgraded"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:832
+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:833
+msgctxt "MainWin|"
+msgid "Do not exit Quassel until the upgrade is complete!"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:848
+msgctxt "MainWin|"
+msgid "Fatal error"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:849
+msgctxt "MainWin|"
+msgid "Quassel encountered a fatal error and is terminated."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:851
+msgctxt "MainWin|"
+msgid "Reason:<em>"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:965
 msgctxt "MainWin|"
 msgid "Nicks"
 msgstr "Smeknamn"
 
-#: ../src/qtui/mainwin.cpp:755
+#: ../src/qtui/mainwin.cpp:975
 msgctxt "MainWin|"
 msgid "Show Nick List"
 msgstr "Visa smeknamnslista"
 
-#: ../src/qtui/mainwin.cpp:766
+#: ../src/qtui/mainwin.cpp:989
 msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr "Chattmonitor"
 
-#: ../src/qtui/mainwin.cpp:778
+#: ../src/qtui/mainwin.cpp:1000
 msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr "Visa chattmonitor"
 
-#: ../src/qtui/mainwin.cpp:782
+#: ../src/qtui/mainwin.cpp:1005
 msgctxt "MainWin|"
 msgid "Inputline"
 msgstr "Visa inmatningsrad"
 
-#: ../src/qtui/mainwin.cpp:791
+#: ../src/qtui/mainwin.cpp:1014
 msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr "Visa inmatningsrad"
 
-#: ../src/qtui/mainwin.cpp:804
+#: ../src/qtui/mainwin.cpp:1024
 msgctxt "MainWin|"
 msgid "Topic"
 msgstr "Ämne"
 
-#: ../src/qtui/mainwin.cpp:816
+#: ../src/qtui/mainwin.cpp:1038
 msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr "Visa ämnesrad"
 
-#: ../src/qtui/mainwin.cpp:894
+#: ../src/qtui/mainwin.cpp:1043
+msgctxt "MainWin|"
+msgid "Transfers"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1054
+msgctxt "MainWin|"
+msgid "Show File Transfers"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1149
 msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr "Huvudverktygsrad"
 
-#: ../src/qtui/mainwin.cpp:933
+#: ../src/qtui/mainwin.cpp:1169
+msgctxt "MainWin|"
+msgid "Nick Toolbar"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1249
 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr "Anslut till core."
 
-#: ../src/qtui/mainwin.cpp:1024
+#: ../src/qtui/mainwin.cpp:1345
 msgctxt "MainWin|"
 msgid "Not connected to core."
 msgstr "Inte ansluten till core."
 
-#: ../src/qtui/mainwin.cpp:1038 ../src/qtui/mainwin.cpp:1046
+#: ../src/qtui/mainwin.cpp:1363 ../src/qtui/mainwin.cpp:1374
 msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr "Okrypterad anslutning"
 
-#: ../src/qtui/mainwin.cpp:1038
+#: ../src/qtui/mainwin.cpp:1364
 msgctxt "MainWin|"
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr "<b>Din klient saknar stöd för SSL-kryptering</b>"
 
-#: ../src/qtui/mainwin.cpp:1040 ../src/qtui/mainwin.cpp:1048
+#: ../src/qtui/mainwin.cpp:1366 ../src/qtui/mainwin.cpp:1377
 msgctxt "MainWin|"
 msgid ""
 "Sensitive data, like passwords, will be transmitted unencrypted to your "
 "Quassel core."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1046
+#: ../src/qtui/mainwin.cpp:1375
 msgctxt "MainWin|"
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr "<b>Din klient saknar stöd för SSL-kryptering</b>"
 
-#: ../src/qtui/mainwin.cpp:1063 ../src/qtui/mainwin.cpp:1083
+#: ../src/qtui/mainwin.cpp:1392 ../src/qtui/mainwin.cpp:1412
 msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr "Använd SSL-certifikat"
 
-#: ../src/qtui/mainwin.cpp:1064
+#: ../src/qtui/mainwin.cpp:1393
 #, qt-format
 msgctxt "MainWin|"
 msgid ""
@@ -4220,54 +6576,69 @@ msgid ""
 "following reasons:</b>"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1067
+#: ../src/qtui/mainwin.cpp:1396
 msgctxt "MainWin|"
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: ../src/qtui/mainwin.cpp:1068
+#: ../src/qtui/mainwin.cpp:1397
 msgctxt "MainWin|"
 msgid "Show Certificate"
 msgstr "Visa certifikat"
 
-#: ../src/qtui/mainwin.cpp:1084
+#: ../src/qtui/mainwin.cpp:1413
 msgctxt "MainWin|"
 msgid ""
 "Would you like to accept this certificate forever without being prompted?"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1086
+#: ../src/qtui/mainwin.cpp:1415
 msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr "Endast aktuell session"
 
-#: ../src/qtui/mainwin.cpp:1087
+#: ../src/qtui/mainwin.cpp:1416
 msgctxt "MainWin|"
 msgid "Forever"
 msgstr "För alltid"
 
-#: ../src/qtui/mainwin.cpp:1096
+#: ../src/qtui/mainwin.cpp:1426
 msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr "Anslutning"
 
-#: ../src/client/messagemodel.cpp:375
+#: ../src/qtui/mainwin.cpp:1456 ../src/qtui/mainwin.cpp:1457
+msgctxt "MainWin|"
+msgid "No network selected"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1459
+msgctxt "MainWin|"
+msgid "Select a network before trying to view the channel list."
+msgstr ""
+
+#: ../src/client/messagemodel.cpp:397
 #, qt-format
 msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
 msgstr ""
 
-#: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
+#: ../src/qtui/msgprocessorstatuswidget.ui:19
 msgctxt "MsgProcessorStatusWidget|"
 msgid "Form"
 msgstr "Formulär"
 
-#: ../src/qtui/ui/msgprocessorstatuswidget.ui:34
+#: ../src/qtui/msgprocessorstatuswidget.ui:34
 msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr ""
 
-#: ../src/uisupport/multilineedit.cpp:661
+#: ../src/uisupport/multilineedit.cpp:95
+msgctxt "MultiLineEdit|"
+msgid "Auto Spell Check"
+msgstr ""
+
+#: ../src/uisupport/multilineedit.cpp:698
 #, qt-format
 msgctxt "MultiLineEdit|"
 msgid "Do you really want to paste %n line(s)?"
@@ -4275,7 +6646,7 @@ msgid_plural "Do you really want to paste %n line(s)?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/uisupport/multilineedit.cpp:670
+#: ../src/uisupport/multilineedit.cpp:707
 msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr ""
@@ -4322,8 +6693,38 @@ msgstr "Serverlösenord:"
 
 #: ../src/qtui/settingspages/networkadddlg.ui:131
 msgctxt "NetworkAddDlg|"
-msgid "Use secure connection"
-msgstr "Använd säker anslutning"
+msgid "Try to use an encrypted connection (e.g. SSL/TLS)"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:134
+msgctxt "NetworkAddDlg|"
+msgid "Use encrypted connection"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:144
+msgctxt "NetworkAddDlg|"
+msgid ""
+"<p>Verify the encrypted connection provides a valid certificate, increasing "
+"security.<br/>Uncheck if the IRC server uses a self-signed or invalid "
+"certificate.</p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:147
+msgctxt "NetworkAddDlg|"
+msgid "Verify connection security"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1037
+msgctxt "NetworkAddDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1038
+msgctxt "NetworkAddDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to verify connection "
+"security."
+msgstr ""
 
 #: ../src/qtui/settingspages/networkeditdlg.ui:13
 msgctxt "NetworkEditDlg|"
@@ -4335,96 +6736,120 @@ msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
 msgstr "Ange ett nätverksnamn:"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:705
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1112
 msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr "Lägg till nätverk"
 
-#: ../src/client/networkmodel.cpp:196
-#, qt-format
+#: ../src/client/networkmodel.cpp:229
 msgctxt "NetworkItem|"
-msgid "Server: %1"
-msgstr "Server: %1"
+msgid "Server"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:197
-#, qt-format
+#: ../src/client/networkmodel.cpp:230
 msgctxt "NetworkItem|"
-msgid "Users: %1"
-msgstr "Användare: %1"
+msgid "Users"
+msgstr "Användare"
+
+#: ../src/client/networkmodel.cpp:232
+msgctxt "NetworkItem|"
+msgid "Lag"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:200
+#: ../src/client/networkmodel.cpp:232
 #, qt-format
 msgctxt "NetworkItem|"
-msgid "Lag: %1 msecs"
-msgstr "Fördröjning: %1 ms"
+msgid "%1 msecs"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:237
+msgctxt "NetworkItem|"
+msgid "Not connected"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:1214
 msgctxt "NetworkModel|"
 msgid "Chat"
 msgstr "Chatt"
 
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:1214
 msgctxt "NetworkModel|"
 msgid "Topic"
 msgstr "Ämne"
 
-#: ../src/client/networkmodel.cpp:852
+#: ../src/client/networkmodel.cpp:1214
 msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr "Smeknamnsändringar"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:154
+#: ../src/uisupport/networkmodelcontroller.cpp:156
 msgctxt "NetworkModelController|"
 msgid "Do you want to delete the following buffer(s) permanently?"
 msgid_plural "Do you want to delete the following buffer(s) permanently?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/uisupport/networkmodelcontroller.cpp:167
+#: ../src/uisupport/networkmodelcontroller.cpp:169
 #, qt-format
 msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr ""
 
-#: ../src/uisupport/networkmodelcontroller.cpp:168
+#: ../src/uisupport/networkmodelcontroller.cpp:170
 msgctxt "NetworkModelController|"
 msgid ""
 "<b>Note:</b> This will delete all related data, including all backlog data, "
 "from the core's database and cannot be undone."
 msgstr ""
 
-#: ../src/uisupport/networkmodelcontroller.cpp:170
+#: ../src/uisupport/networkmodelcontroller.cpp:173
 msgctxt "NetworkModelController|"
 msgid ""
 "<br>Active channel buffers cannot be deleted, please part the channel first."
 msgstr ""
 
-#: ../src/uisupport/networkmodelcontroller.cpp:172
+#: ../src/uisupport/networkmodelcontroller.cpp:175
 msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr "Slå ihop buffertar permanent?"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:484
+#: ../src/uisupport/networkmodelcontroller.cpp:220
+#: ../src/uisupport/networkmodelcontroller.cpp:228
+msgctxt "NetworkModelController|"
+msgid "Question"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:221
+msgctxt "NetworkModelController|"
+msgid "Really Connect to all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:229
+msgctxt "NetworkModelController|"
+msgid "Really disconnect from all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:543
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr "Gå in i kanal"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:487
+#: ../src/uisupport/networkmodelcontroller.cpp:546
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Network:"
 msgstr "Nätverk:"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:489
+#: ../src/uisupport/networkmodelcontroller.cpp:548
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:491
+#: ../src/uisupport/networkmodelcontroller.cpp:550
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/qtui/ircconnectionwizard.cpp:148
+#: ../src/qtui/ircconnectionwizard.cpp:151
 msgctxt "NetworkPage|"
 msgid "Setup Network Connection"
 msgstr "Konfigurera nätverksanslutning"
@@ -4440,13 +6865,13 @@ msgid "Re&name..."
 msgstr "B&yt namn..."
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:65
-#: ../src/qtui/settingspages/networkssettingspage.ui:235
+#: ../src/qtui/settingspages/networkssettingspage.ui:234
 msgctxt "NetworksSettingsPage|"
 msgid "&Add..."
 msgstr "&Lägg till..."
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:88
-#: ../src/qtui/settingspages/networkssettingspage.ui:252
+#: ../src/qtui/settingspages/networkssettingspage.ui:251
 msgctxt "NetworksSettingsPage|"
 msgid "De&lete"
 msgstr "Ta &bort"
@@ -4462,8 +6887,8 @@ msgid "Identity:"
 msgstr "Identitet:"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:149
-#: ../src/qtui/settingspages/networkssettingspage.ui:281
-#: ../src/qtui/settingspages/networkssettingspage.ui:295
+#: ../src/qtui/settingspages/networkssettingspage.ui:280
+#: ../src/qtui/settingspages/networkssettingspage.ui:294
 msgctxt "NetworksSettingsPage|"
 msgid "..."
 msgstr "..."
@@ -4483,216 +6908,342 @@ msgctxt "NetworksSettingsPage|"
 msgid "&Edit..."
 msgstr "R&edigera..."
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:278
+#: ../src/qtui/settingspages/networkssettingspage.ui:277
 msgctxt "NetworksSettingsPage|"
 msgid "Move upwards in list"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:292
+#: ../src/qtui/settingspages/networkssettingspage.ui:291
 msgctxt "NetworksSettingsPage|"
 msgid "Move downwards in list"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:337
+#: ../src/qtui/settingspages/networkssettingspage.ui:336
 msgctxt "NetworksSettingsPage|"
 msgid "Commands"
 msgstr "Kommandon"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:340
+#: ../src/qtui/settingspages/networkssettingspage.ui:339
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:346
+#: ../src/qtui/settingspages/networkssettingspage.ui:345
 msgctxt "NetworksSettingsPage|"
 msgid "Commands to execute on connect:"
 msgstr "Kommandon att köra vid anslutning:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:362
+#: ../src/qtui/settingspages/networkssettingspage.ui:361
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify a list of IRC commands to be executed upon connect.\n"
 "Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:374
+#: ../src/qtui/settingspages/networkssettingspage.ui:373
 msgctxt "NetworksSettingsPage|"
 msgid "Connection"
 msgstr "Anslutning"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:383
+#: ../src/qtui/settingspages/networkssettingspage.ui:382
 msgctxt "NetworksSettingsPage|"
 msgid "Automatically reconnect to the IRC network after connection failures"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:386
+#: ../src/qtui/settingspages/networkssettingspage.ui:385
 msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
 msgstr "Återanslut automatiskt"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:397
+#: ../src/qtui/settingspages/networkssettingspage.ui:396
+#: ../src/qtui/settingspages/networkssettingspage.ui:595
 msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr "Vänta"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:404
+#: ../src/qtui/settingspages/networkssettingspage.ui:403
+#: ../src/qtui/settingspages/networkssettingspage.ui:605
 msgctxt "NetworksSettingsPage|"
 msgid " s"
 msgstr " s"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:420
+#: ../src/qtui/settingspages/networkssettingspage.ui:419
 msgctxt "NetworksSettingsPage|"
 msgid "between retries"
 msgstr "mellan försök"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:444
+#: ../src/qtui/settingspages/networkssettingspage.ui:443
 msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
 msgstr "Antal försök:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:464
+#: ../src/qtui/settingspages/networkssettingspage.ui:463
+#: ../src/qtui/settingspages/networkssettingspage.ui:547
 msgctxt "NetworksSettingsPage|"
 msgid "Unlimited"
 msgstr "Obegränsat"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:489
+#: ../src/qtui/settingspages/networkssettingspage.ui:488
 msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:516
-#: ../src/qtui/settingspages/networkssettingspage.ui:525
+#: ../src/qtui/settingspages/networkssettingspage.ui:507
+msgctxt "NetworksSettingsPage|"
+msgid "Use Custom Rate Limits"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:521
+msgctxt "NetworksSettingsPage|"
+msgid "Max. messages at once:"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:528
+msgctxt "NetworksSettingsPage|"
+msgid "Maximum number of messages to send without any delays"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:544
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p>Disable all rate limiting, e.g. for IRC "
+"bridges.</p><p>Don't use with most normal networks.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:602
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p>Delay between messages after the maximum number of "
+"undelayed messages have been sent.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:621
+msgctxt "NetworksSettingsPage|"
+msgid "between future messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:663
+#: ../src/qtui/settingspages/networkssettingspage.ui:814
 msgctxt "NetworksSettingsPage|"
 msgid "Auto Identify"
 msgstr "Automatisk identifiering"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:540
+#: ../src/qtui/settingspages/networkssettingspage.ui:672
 msgctxt "NetworksSettingsPage|"
-msgid "NickServ"
-msgstr "NickServ"
+msgid ""
+"Authenticate using your nickname and password before joining any channels"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:675
+msgctxt "NetworksSettingsPage|"
+msgid "Use SASL Authentication"
+msgstr "Använd SASL-autentisering"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:557
+#: ../src/qtui/settingspages/networkssettingspage.ui:716
 msgctxt "NetworksSettingsPage|"
-msgid "Service:"
-msgstr "Tjänst:"
+msgid "Account name, often the same as your nickname"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:729
+msgctxt "NetworksSettingsPage|"
+msgid "Account:"
+msgstr "Konto:"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:739
+#: ../src/qtui/settingspages/networkssettingspage.ui:842
+msgctxt "NetworksSettingsPage|"
+msgid "Account password"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:752
+#: ../src/qtui/settingspages/networkssettingspage.ui:862
+msgctxt "NetworksSettingsPage|"
+msgid "Password:"
+msgstr "Lösenord:"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:776
+msgctxt "NetworksSettingsPage|"
+msgid "Could not detect if supported by server"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:783
+msgctxt "NetworksSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:798
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because"
+" the identity has an ssl certificate set, SASL EXTERNAL will be "
+"used.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:811
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Authenticate to services using your password.  Use SASL instead to identify "
+"before joining channels."
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:567
-#: ../src/qtui/settingspages/networkssettingspage.ui:615
+#: ../src/qtui/settingspages/networkssettingspage.ui:829
 msgctxt "NetworksSettingsPage|"
-msgid "Password:"
-msgstr "Lösenord:"
+msgid "Service user to send your password to, usually NickServ"
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:580
+#: ../src/qtui/settingspages/networkssettingspage.ui:832
 msgctxt "NetworksSettingsPage|"
-msgid "Use SASL Authentication"
-msgstr "Använd SASL-autentisering"
+msgid "NickServ"
+msgstr "NickServ"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:625
+#: ../src/qtui/settingspages/networkssettingspage.ui:852
 msgctxt "NetworksSettingsPage|"
-msgid "Account:"
-msgstr "Konto:"
+msgid "Service:"
+msgstr "Tjänst:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:649
+#: ../src/qtui/settingspages/networkssettingspage.ui:886
 msgctxt "NetworksSettingsPage|"
 msgid "Encodings"
 msgstr "Teckenkodningar"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:652
+#: ../src/qtui/settingspages/networkssettingspage.ui:889
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure advanced settings such as message encodings and automatic "
 "reconnect"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:661
+#: ../src/qtui/settingspages/networkssettingspage.ui:898
 msgctxt "NetworksSettingsPage|"
 msgid "Control encodings for in- and outgoing messages"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:664
+#: ../src/qtui/settingspages/networkssettingspage.ui:901
 msgctxt "NetworksSettingsPage|"
 msgid "Use Custom Encodings"
 msgstr "Använd anpassade färger"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:675
-#: ../src/qtui/settingspages/networkssettingspage.ui:695
+#: ../src/qtui/settingspages/networkssettingspage.ui:912
+#: ../src/qtui/settingspages/networkssettingspage.ui:932
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify which encoding your messages will be sent in.\n"
 "UTF-8 should be a sane choice for most networks."
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:679
+#: ../src/qtui/settingspages/networkssettingspage.ui:916
 msgctxt "NetworksSettingsPage|"
 msgid "Send messages in:"
 msgstr "Skicka meddelanden i:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:706
-#: ../src/qtui/settingspages/networkssettingspage.ui:726
+#: ../src/qtui/settingspages/networkssettingspage.ui:943
+#: ../src/qtui/settingspages/networkssettingspage.ui:963
 msgctxt "NetworksSettingsPage|"
 msgid ""
-"Incoming messages encoded in Utf8 will always be treated as such.\n"
-"This setting defines the encoding for messages that are not Utf8."
+"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:710
+#: ../src/qtui/settingspages/networkssettingspage.ui:947
 msgctxt "NetworksSettingsPage|"
 msgid "Receive fallback:"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:737
-#: ../src/qtui/settingspages/networkssettingspage.ui:751
+#: ../src/qtui/settingspages/networkssettingspage.ui:974
+#: ../src/qtui/settingspages/networkssettingspage.ui:987
 msgctxt "NetworksSettingsPage|"
 msgid ""
-"This specifies how control messages, nicks and servernames are encoded.\n"
-"Unless you *really* know what you do, leave this as ISO-8859-1!"
+"<qt><p>This specifies how control messages, nicks and servernames are "
+"encoded.</p><p><b>UTF-8</b> should be fine for modern networks.  On other "
+"networks, you may need to use <b>ISO-8859-1</b> to avoid errors with illegal"
+" characters and invalid encoding.</p></qt>"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:741
+#: ../src/qtui/settingspages/networkssettingspage.ui:977
 msgctxt "NetworksSettingsPage|"
 msgid "Server encoding:"
 msgstr "Servermeddelande:"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+#: ../src/qtui/settingspages/networkssettingspage.cpp:44
 msgctxt "NetworksSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+#: ../src/qtui/settingspages/networkssettingspage.cpp:44
 msgctxt "NetworksSettingsPage|"
 msgid "Networks"
 msgstr "Nätverk"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:167
+#: ../src/qtui/settingspages/networkssettingspage.cpp:162
+#: ../src/qtui/settingspages/networkssettingspage.cpp:175
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<p>Override default message rate limiting.</p><p><b>Setting limits too low "
+"may get you disconnected from the server!</b></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:178
+msgctxt "NetworksSettingsPage|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:179
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to modify message rate "
+"limits."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:218
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:168
+#: ../src/qtui/settingspages/networkssettingspage.cpp:220
 msgctxt "NetworksSettingsPage|"
 msgid "<li>All networks need at least one server defined</li>"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:169
+#: ../src/qtui/settingspages/networkssettingspage.cpp:221
 msgctxt "NetworksSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:170
+#: ../src/qtui/settingspages/networkssettingspage.cpp:222
 msgctxt "NetworksSettingsPage|"
 msgid "Invalid Network Settings"
 msgstr "Ogiltiga nätverksinställningar"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:542
+#: ../src/qtui/settingspages/networkssettingspage.cpp:717
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:722
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:727
+msgctxt "NetworksSettingsPage|"
+msgid "Not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:733
+msgctxt "NetworksSettingsPage|"
+msgid "Supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:817
 msgctxt "NetworksSettingsPage|"
 msgid "Delete Network?"
 msgstr "Ta bort nätverk?"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:543
+#: ../src/qtui/settingspages/networkssettingspage.cpp:818
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -4700,6 +7251,70 @@ msgid ""
 "including the backlog?"
 msgstr ""
 
+#: ../src/qtui/settingspages/networkssettingspage.cpp:948
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:949
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Quassel could not check if \"%1\" supports SASL.  This may be due to unsaved"
+" changes or an older Quassel core.  You can still try using SASL."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:955
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if SASL supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:956
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Quassel cannot check if \"%1\" supports SASL when disconnected.  Connect to "
+"the network, or try using SASL anyways."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:962
+msgctxt "NetworksSettingsPage|"
+msgid "SASL not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:963
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" does not currently support SASL.  However, support might "
+"be added later on."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:969
+msgctxt "NetworksSettingsPage|"
+msgid "SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:970
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" supports SASL.  In most cases, you should use SASL "
+"instead of NickServ identification."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:977
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid "SASL support for \"%1\""
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:981
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"SASL is a standardized way to log in and identify yourself to IRC servers."
+msgstr ""
+
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
 msgctxt "NickEditDlg|"
 msgid "Edit Nickname"
@@ -4717,7 +7332,7 @@ msgid ""
 "the special characters {, }, [, ], \\, |, `, ^, _ and -."
 msgstr ""
 
-#: ../src/qtui/settingspages/identitiessettingspage.cpp:420
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:481
 msgctxt "NickEditDlg|"
 msgid "Add Nickname"
 msgstr "Lägg till smeknamn"
@@ -4732,62 +7347,111 @@ msgctxt "NotificationsSettingsPage|"
 msgid "Notifications"
 msgstr "Notifieringar"
 
-#: ../src/qtui/phononnotificationbackend.cpp:143
-msgctxt "PhononNotificationBackend::ConfigWidget|"
-msgid "Select Audio File"
-msgstr "Välj ljudfil"
+#: ../src/qtui/passwordchangedlg.ui:14
+msgctxt "PasswordChangeDlg|"
+msgid "Change Password"
+msgstr ""
 
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Form"
-msgstr "Formulär"
+#: ../src/qtui/passwordchangedlg.ui:37
+msgctxt "PasswordChangeDlg|"
+msgid "Old password:"
+msgstr ""
 
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Play a sound"
-msgstr "Spela upp ett ljud"
+#: ../src/qtui/passwordchangedlg.ui:51
+msgctxt "PasswordChangeDlg|"
+msgid "New Password:"
+msgstr ""
 
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Prelisten to the selected sound"
+#: ../src/qtui/passwordchangedlg.ui:65
+msgctxt "PasswordChangeDlg|"
+msgid "Confirm password:"
 msgstr ""
 
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
-#: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
-msgctxt "PhononNotificationConfigWidget|"
-msgid "Select the sound file to play"
+#: ../src/qtui/passwordchangedlg.cpp:34
+#, qt-format
+msgctxt "PasswordChangeDlg|"
+msgid ""
+"This changes the password for your username <b>%1</b> on the Quassel Core "
+"running at <b>%2</b>."
+msgstr ""
+
+#: ../src/qtui/passwordchangedlg.cpp:64
+msgctxt "PasswordChangeDlg|"
+msgid "Password Not Changed"
+msgstr ""
+
+#: ../src/qtui/passwordchangedlg.cpp:64
+msgctxt "PasswordChangeDlg|"
+msgid "<b>Password change failed</b>"
+msgstr ""
+
+#: ../src/qtui/passwordchangedlg.cpp:66
+msgctxt "PasswordChangeDlg|"
+msgid ""
+"The core reported an error when trying to change your password. Make sure "
+"you entered your old password correctly!"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:48
+msgctxt "PostgreSqlStorage|"
+msgid "PostgreSQL driver plugin not available for Qt. Installed drivers:"
 msgstr ""
 
-#: ../src/core/postgresqlstorage.cpp:62
+#: ../src/core/postgresqlstorage.cpp:68
 msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr ""
 
-#: ../src/client/backlogrequester.cpp:82
+#: ../src/core/postgresqlstorage.cpp:74
+msgctxt "PostgreSqlStorage|"
+msgid "Username"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:74
+msgctxt "PostgreSqlStorage|"
+msgid "Password"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:74
+msgctxt "PostgreSqlStorage|"
+msgid "Hostname"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:75
+msgctxt "PostgreSqlStorage|"
+msgid "Port"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:75
+msgctxt "PostgreSqlStorage|"
+msgid "Database"
+msgstr ""
+
+#: ../src/client/backlogrequester.cpp:87
 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
 msgstr ""
 
-#: ../src/client/backlogrequester.cpp:106
+#: ../src/client/backlogrequester.cpp:115
 #, qt-format
 msgctxt "QObject|"
 msgid ""
 "Requesting up to %1 of all unread backlog messages (plus additional %2)"
 msgstr ""
 
-#: ../src/client/backlogrequester.cpp:123
+#: ../src/client/backlogrequester.cpp:133
 #, qt-format
 msgctxt "QObject|"
 msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"
 msgstr ""
 
-#: ../src/qtui/ircconnectionwizard.cpp:56
+#: ../src/qtui/ircconnectionwizard.cpp:53
 msgctxt "QObject|"
 msgid "Welcome to Quassel IRC"
 msgstr "Välkommen till Quassel IRC"
 
-#: ../src/qtui/ircconnectionwizard.cpp:58
+#: ../src/qtui/ircconnectionwizard.cpp:56
 msgctxt "QObject|"
 msgid ""
 "This wizard will help you to set up your default identity and your IRC "
@@ -4795,212 +7459,588 @@ msgid ""
 "wizard any time and use the settings dialog for more detailed changes."
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:121 ../src/uisupport/qssparser.cpp:166
-#: ../src/uisupport/qssparser.cpp:316
+#: ../src/uisupport/qssparser.cpp:147 ../src/uisupport/qssparser.cpp:201
+#: ../src/uisupport/qssparser.cpp:359
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid block declaration: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:140
+#: ../src/uisupport/qssparser.cpp:166
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette role assignment: %1"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/uisupport/qssparser.cpp:156
+#: ../src/uisupport/qssparser.cpp:185
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:192
+#: ../src/uisupport/qssparser.cpp:228
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/uisupport/qssparser.cpp:236
+#: ../src/uisupport/qssparser.cpp:272
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message type in %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:245
+#: ../src/uisupport/qssparser.cpp:281
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/uisupport/qssparser.cpp:257
+#: ../src/uisupport/qssparser.cpp:294
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message label: %1"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/uisupport/qssparser.cpp:268
+#: ../src/uisupport/qssparser.cpp:305
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:272
+#: ../src/uisupport/qssparser.cpp:309
 msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:287
+#: ../src/uisupport/qssparser.cpp:325
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid format name: %1"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/uisupport/qssparser.cpp:294
+#: ../src/uisupport/qssparser.cpp:333
 #, qt-format
 msgctxt "QssParser|"
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:302
+#: ../src/uisupport/qssparser.cpp:342
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:331
+#: ../src/uisupport/qssparser.cpp:374
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid proplist %1"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/uisupport/qssparser.cpp:350
+#: ../src/uisupport/qssparser.cpp:393
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid chatlist item type %1"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/uisupport/qssparser.cpp:366
+#: ../src/uisupport/qssparser.cpp:409
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid chatlist state %1"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/uisupport/qssparser.cpp:392
+#: ../src/uisupport/qssparser.cpp:438
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid property declaration: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:416
+#: ../src/uisupport/qssparser.cpp:476
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font property: %1"
 msgstr "Ogiltig lyssningsadress %1"
 
-#: ../src/uisupport/qssparser.cpp:422
+#: ../src/uisupport/qssparser.cpp:482
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:444
+#: ../src/uisupport/qssparser.cpp:501
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid boolean value: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:537
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:451
-#, qt-format
-msgctxt "QssParser|"
-msgid "Unknown palette color role: %1"
+#: ../src/uisupport/qssparser.cpp:544
+#, qt-format
+msgctxt "QssParser|"
+msgid "Unknown palette color role: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:551 ../src/uisupport/qssparser.cpp:574
+#: ../src/uisupport/qssparser.cpp:596
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid gradient declaration: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:560 ../src/uisupport/qssparser.cpp:582
+#: ../src/uisupport/qssparser.cpp:606
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid gradient stops list: %1"
+msgstr "Ogiltig lyssningsadress %1"
+
+#: ../src/uisupport/qssparser.cpp:712
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid font specification: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:762
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid font style specification: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:776
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid font weight specification: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:787
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid font size specification: %1"
+msgstr ""
+
+#: ../src/qtui/qtmultimedianotificationbackend.cpp:156
+msgctxt "QtMultimediaNotificationBackend::ConfigWidget|"
+msgid "Select Audio File"
+msgstr "Välj ljudfil"
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:14
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Form"
+msgstr "Formulär"
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:20
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Play a sound"
+msgstr "Spela upp ett ljud"
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:46
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Prelisten to the selected sound"
+msgstr ""
+
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:59
+#: ../src/qtui/qtmultimedianotificationconfigwidget.ui:69
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Select the sound file to play"
+msgstr ""
+
+#. Supported icon theme names
+#: ../src/qtui/qtui.cpp:250
+msgctxt "QtUi|"
+msgid "Breeze"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:251
+msgctxt "QtUi|"
+msgid "Breeze Dark"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:253
+msgctxt "QtUi|"
+msgid "Oxygen"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:304
+msgctxt "QtUi|"
+msgid ""
+"No supported icon theme installed, you'll lack icons! Supported are the "
+"KDE/Plasma themes Breeze, Breeze Dark and Oxygen."
+msgstr ""
+
+#: ../src/qtui/qtuiapplication.cpp:45
+msgctxt "QtUiApplication|"
+msgid "Could not load or upgrade client settings!"
+msgstr ""
+
+#: ../src/common/quassel.cpp:325
+msgctxt "Quassel|"
+msgid "Specify the directory holding the client configuration."
+msgstr ""
+
+#: ../src/common/quassel.cpp:325 ../src/common/quassel.cpp:330
+#: ../src/common/quassel.cpp:365 ../src/common/quassel.cpp:366
+msgctxt "Quassel|"
+msgid "path"
+msgstr ""
+
+#: ../src/common/quassel.cpp:329
+msgctxt "Quassel|"
+msgid ""
+"Specify the directory holding configuration files, the SQlite database and "
+"the SSL certificate."
+msgstr ""
+
+#: ../src/common/quassel.cpp:336
+msgctxt "Quassel|"
+msgid "Override the system icon theme ('breeze' is recommended)."
+msgstr ""
+
+#: ../src/common/quassel.cpp:336
+msgctxt "Quassel|"
+msgid "theme"
+msgstr ""
+
+#: ../src/common/quassel.cpp:337
+msgctxt "Quassel|"
+msgid "Load a custom application stylesheet."
+msgstr ""
+
+#: ../src/common/quassel.cpp:337
+msgctxt "Quassel|"
+msgid "file.qss"
+msgstr ""
+
+#: ../src/common/quassel.cpp:338
+msgctxt "Quassel|"
+msgid "Start the client minimized to the system tray."
+msgstr ""
+
+#: ../src/common/quassel.cpp:345
+msgctxt "Quassel|"
+msgid "The address(es) quasselcore will listen on."
+msgstr ""
+
+#: ../src/common/quassel.cpp:345
+msgctxt "Quassel|"
+msgid "<address>[,<address>[,...]]"
+msgstr ""
+
+#: ../src/common/quassel.cpp:346
+msgctxt "Quassel|"
+msgid "The port quasselcore will listen at."
+msgstr ""
+
+#: ../src/common/quassel.cpp:346 ../src/common/quassel.cpp:359
+msgctxt "Quassel|"
+msgid "port"
+msgstr ""
+
+#: ../src/common/quassel.cpp:347
+msgctxt "Quassel|"
+msgid "Don't restore last core's state."
+msgstr ""
+
+#: ../src/common/quassel.cpp:348
+msgctxt "Quassel|"
+msgid "Load configuration from environment variables."
+msgstr ""
+
+#: ../src/common/quassel.cpp:349
+msgctxt "Quassel|"
+msgid "Switch storage backend (migrating data if possible)."
+msgstr ""
+
+#: ../src/common/quassel.cpp:349
+msgctxt "Quassel|"
+msgid "backendidentifier"
+msgstr ""
+
+#: ../src/common/quassel.cpp:350
+msgctxt "Quassel|"
+msgid "Select authentication backend."
+msgstr ""
+
+#: ../src/common/quassel.cpp:350
+msgctxt "Quassel|"
+msgid "authidentifier"
+msgstr ""
+
+#: ../src/common/quassel.cpp:351
+msgctxt "Quassel|"
+msgid "Starts an interactive session to add a new core user."
+msgstr ""
+
+#: ../src/common/quassel.cpp:353
+msgctxt "Quassel|"
+msgid ""
+"Starts an interactive session to change the password of the user identified "
+"by <username>."
+msgstr ""
+
+#: ../src/common/quassel.cpp:354
+msgctxt "Quassel|"
+msgid "username"
+msgstr ""
+
+#: ../src/common/quassel.cpp:355
+msgctxt "Quassel|"
+msgid ""
+"Use users' quasselcore username as ident reply. Ignores each user's "
+"configured ident setting."
+msgstr ""
+
+#: ../src/common/quassel.cpp:356
+msgctxt "Quassel|"
+msgid "Enable internal ident daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:358
+msgctxt "Quassel|"
+msgid ""
+"The port quasselcore will listen at for ident requests. Only meaningful with"
+" --ident-daemon."
+msgstr ""
+
+#: ../src/common/quassel.cpp:361
+msgctxt "Quassel|"
+msgid ""
+"Enable oidentd integration. In most cases you should also enable --strict-"
+"ident."
+msgstr ""
+
+#: ../src/common/quassel.cpp:362
+msgctxt "Quassel|"
+msgid "Set path to oidentd configuration file."
+msgstr ""
+
+#: ../src/common/quassel.cpp:362
+msgctxt "Quassel|"
+msgid "file"
+msgstr ""
+
+#: ../src/common/quassel.cpp:364
+msgctxt "Quassel|"
+msgid "Require SSL for remote (non-loopback) client connections."
+msgstr ""
+
+#: ../src/common/quassel.cpp:365
+msgctxt "Quassel|"
+msgid "Specify the path to the SSL certificate."
+msgstr ""
+
+#: ../src/common/quassel.cpp:366
+msgctxt "Quassel|"
+msgid "Specify the path to the SSL key."
+msgstr ""
+
+#: ../src/common/quassel.cpp:373
+msgctxt "Quassel|"
+msgid "Supports one of Debug|Info|Warning|Error; default is Info."
+msgstr ""
+
+#: ../src/common/quassel.cpp:373
+msgctxt "Quassel|"
+msgid "level"
+msgstr ""
+
+#: ../src/common/quassel.cpp:374
+msgctxt "Quassel|"
+msgid "Log to a file."
+msgstr ""
+
+#: ../src/common/quassel.cpp:376
+msgctxt "Quassel|"
+msgid "Log to syslog."
+msgstr ""
+
+#: ../src/common/quassel.cpp:381
+msgctxt "Quassel|"
+msgid "Enable debug output."
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:458 ../src/uisupport/qssparser.cpp:481
-#: ../src/uisupport/qssparser.cpp:503
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid gradient declaration: %1"
+#: ../src/common/quassel.cpp:384
+msgctxt "Quassel|"
+msgid "Enables debugging for bufferswitches."
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:467 ../src/uisupport/qssparser.cpp:489
-#: ../src/uisupport/qssparser.cpp:513
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid gradient stops list: %1"
-msgstr "Ogiltig lyssningsadress %1"
+#: ../src/common/quassel.cpp:385
+msgctxt "Quassel|"
+msgid "Enables debugging for models."
+msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:610
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid font specification: %1"
+#: ../src/common/quassel.cpp:390
+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/uisupport/qssparser.cpp:649
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid font style specification: %1"
+#: ../src/common/quassel.cpp:391
+msgctxt "Quassel|"
+msgid "Limit raw IRC logging to this network ID.  Implies --debug-irc"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:662
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid font weight specification: %1"
+#: ../src/common/quassel.cpp:391
+msgctxt "Quassel|"
+msgid "database network ID"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:672
-#, qt-format
-msgctxt "QssParser|"
-msgid "Invalid font size specification: %1"
+#: ../src/common/quassel.cpp:398
+msgctxt "Quassel|"
+msgid "Quassel IRC is a modern, distributed IRC client."
 msgstr ""
 
-#: ../src/common/util.cpp:145
+#: ../src/common/util.cpp:180
 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "år"
 
-#: ../src/common/util.cpp:146
+#: ../src/common/util.cpp:182
 msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr "dag"
 
-#: ../src/common/util.cpp:147
+#: ../src/common/util.cpp:183
 msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr "h"
 
-#: ../src/common/util.cpp:148
+#: ../src/common/util.cpp:184
 msgctxt "Quassel::secondsToString()|"
 msgid "min"
 msgstr "min"
 
-#: ../src/common/util.cpp:149
+#: ../src/common/util.cpp:185
 msgctxt "Quassel::secondsToString()|"
 msgid "sec"
 msgstr "s"
 
-#: ../src/client/networkmodel.cpp:429
+#: ../src/client/networkmodel.cpp:542
 #, qt-format
 msgctxt "QueryBufferItem|"
-msgid "<b>Query with %1</b>"
+msgid "Query with %1"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:447
-#, qt-format
+#: ../src/client/networkmodel.cpp:565
 msgctxt "QueryBufferItem|"
-msgid "idling since %1"
+msgid "Unknown"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:450
-#, qt-format
+#: ../src/client/networkmodel.cpp:571
 msgctxt "QueryBufferItem|"
-msgid "login time: %1"
+msgid "Away message"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:453
-#, qt-format
+#: ../src/client/networkmodel.cpp:573
+msgctxt "QueryBufferItem|"
+msgid "Realname"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:577
+msgctxt "QueryBufferItem|"
+msgid "Help status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:577
+msgctxt "QueryBufferItem|"
+msgid "Available for help"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:580
+msgctxt "QueryBufferItem|"
+msgid "Service status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:590
+msgctxt "QueryBufferItem|"
+msgid "Not logged in"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:596 ../src/client/networkmodel.cpp:603
+msgctxt "QueryBufferItem|"
+msgid "Account"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:603
+msgctxt "QueryBufferItem|"
+msgid "Identified for this nick"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:609
+msgctxt "QueryBufferItem|"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:613
+msgctxt "QueryBufferItem|"
+msgid "Hostmask"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:617
+msgctxt "QueryBufferItem|"
+msgid "Operator"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:625
+msgctxt "QueryBufferItem|"
+msgid "Idling since"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:629
+msgctxt "QueryBufferItem|"
+msgid "Login time"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:632
 msgctxt "QueryBufferItem|"
-msgid "server: %1"
-msgstr "server: %1"
+msgid "Server"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:638
+msgctxt "QueryBufferItem|"
+msgid "No information available"
+msgstr ""
+
+#: ../src/qtui/receivefiledlg.ui:14
+msgctxt "ReceiveFileDlg|"
+msgid "Incoming File Transfer"
+msgstr ""
+
+#: ../src/qtui/receivefiledlg.cpp:36
+#, qt-format
+msgctxt "ReceiveFileDlg|"
+msgid "<b>%1</b> wants to send you a file:<br>%2 (%3 bytes)"
+msgstr ""
+
+#: ../src/common/remotepeer.cpp:70
+msgctxt "RemotePeer|"
+msgid "Disconnecting..."
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.ui:14
+msgctxt "ResourceTreeDlg|"
+msgid "Resource Tree"
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.ui:20
+msgctxt "ResourceTreeDlg|"
+msgid "Shows the contents of the compiled-in resource tree."
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.cpp:53
+msgctxt "ResourceTreeDlg|"
+msgid "File"
+msgstr ""
+
+#: ../src/qtui/resourcetreedlg.cpp:53
+msgctxt "ResourceTreeDlg|"
+msgid "Size"
+msgstr ""
 
 #: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
 msgctxt "SaveIdentitiesDlg|"
@@ -5019,8 +8059,8 @@ msgstr "Avbryt"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:14
 msgctxt "ServerEditDlg|"
-msgid "Dialog"
-msgstr "Dialog"
+msgid "Edit Server"
+msgstr ""
 
 #: ../src/qtui/settingspages/servereditdlg.ui:30
 msgctxt "ServerEditDlg|"
@@ -5033,7 +8073,7 @@ msgid "Server address:"
 msgstr "Serveradress:"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:45
-#: ../src/qtui/settingspages/servereditdlg.ui:227
+#: ../src/qtui/settingspages/servereditdlg.ui:246
 msgctxt "ServerEditDlg|"
 msgid "Port:"
 msgstr "Port:"
@@ -5045,172 +8085,200 @@ msgstr "Lösenord:"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:94
 msgctxt "ServerEditDlg|"
-msgid "Use SSL"
-msgstr "Använd SSL"
+msgid "Try to use an encrypted connection (e.g. SSL/TLS)"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:97
+msgctxt "ServerEditDlg|"
+msgid "Use encrypted connection"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:111
+msgctxt "ServerEditDlg|"
+msgid ""
+"<p>Verify the encrypted connection provides a valid certificate, increasing "
+"security.<br/>Uncheck if the IRC server uses a self-signed or invalid "
+"certificate.</p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:114
+msgctxt "ServerEditDlg|"
+msgid "Verify connection security"
+msgstr ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:119
+#: ../src/qtui/settingspages/servereditdlg.ui:138
 msgctxt "ServerEditDlg|"
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:140
+#: ../src/qtui/settingspages/servereditdlg.ui:159
 msgctxt "ServerEditDlg|"
 msgid "SSL Version:"
 msgstr "SSL-version:"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:147
+#: ../src/qtui/settingspages/servereditdlg.ui:166
 msgctxt "ServerEditDlg|"
-msgid ""
-"Do not change unless you're going to connect to a server not supporting "
-"SSLv3!"
+msgid "Use only TLSv1 unless you know what you are doing!"
 msgstr ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:151
+#: ../src/qtui/settingspages/servereditdlg.ui:170
 msgctxt "ServerEditDlg|"
-msgid "SSLv3 (default)"
-msgstr "SSLv3 (standard)"
+msgid "SSLv3 (insecure)"
+msgstr ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:156
+#: ../src/qtui/settingspages/servereditdlg.ui:175
 msgctxt "ServerEditDlg|"
-msgid "SSLv2"
-msgstr "SSLv2"
+msgid "SSLv2 (insecure)"
+msgstr ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:161
+#: ../src/qtui/settingspages/servereditdlg.ui:180
 msgctxt "ServerEditDlg|"
 msgid "TLSv1"
 msgstr "TLSv1"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:171
+#: ../src/qtui/settingspages/servereditdlg.ui:190
 msgctxt "ServerEditDlg|"
 msgid "Use a Proxy"
 msgstr "Använd en proxyserver"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:188
+#: ../src/qtui/settingspages/servereditdlg.ui:207
 msgctxt "ServerEditDlg|"
 msgid "Proxy Type:"
 msgstr "Typ av proxyserver:"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:196
+#: ../src/qtui/settingspages/servereditdlg.ui:215
 msgctxt "ServerEditDlg|"
-msgid "Socks 5"
-msgstr "Socks 5"
+msgid "SOCKS 5"
+msgstr ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:201
+#: ../src/qtui/settingspages/servereditdlg.ui:220
 msgctxt "ServerEditDlg|"
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:213
+#: ../src/qtui/settingspages/servereditdlg.ui:232
 msgctxt "ServerEditDlg|"
 msgid "Proxy Host:"
 msgstr "Proxyserver:"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:220
+#: ../src/qtui/settingspages/servereditdlg.ui:239
 msgctxt "ServerEditDlg|"
 msgid "localhost"
 msgstr ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:251
+#: ../src/qtui/settingspages/servereditdlg.ui:270
 msgctxt "ServerEditDlg|"
 msgid "Proxy Username:"
 msgstr "Användarnamn för proxy:"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:261
+#: ../src/qtui/settingspages/servereditdlg.ui:280
 msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr "Lösenord för proxy:"
 
-#: ../src/qtui/ui/settingsdlg.ui:14
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1187
+msgctxt "ServerEditDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1188
+msgctxt "ServerEditDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to verify connection "
+"security."
+msgstr ""
+
+#: ../src/qtui/settingsdlg.ui:14
 msgctxt "SettingsDlg|"
 msgid "Configure Quassel"
 msgstr "Konfigurera Quassel"
 
-#: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50
-#: ../src/qtui/settingsdlg.cpp:99
+#: ../src/qtui/settingsdlg.ui:41 ../src/qtui/settingsdlg.ui:56
+#: ../src/qtui/settingsdlg.cpp:107
 msgctxt "SettingsDlg|"
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ../src/qtui/settingsdlg.cpp:109
+#: ../src/qtui/settingsdlg.cpp:119
 msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr "Spara ändringar"
 
-#: ../src/qtui/settingsdlg.cpp:110
+#: ../src/qtui/settingsdlg.cpp:120
 msgctxt "SettingsDlg|"
 msgid ""
 "There are unsaved changes on the current configuration page. Would you like "
 "to apply your changes now?"
 msgstr ""
 
-#: ../src/qtui/settingsdlg.cpp:122 ../src/qtui/settingsdlg.cpp:126
+#: ../src/qtui/settingsdlg.cpp:137 ../src/qtui/settingsdlg.cpp:141
 #, qt-format
 msgctxt "SettingsDlg|"
 msgid "Configure %1"
 msgstr "Konfigurera %1"
 
-#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingsdlg.cpp:220
 msgctxt "SettingsDlg|"
 msgid "Reload Settings"
 msgstr "Läs om inställningar"
 
-#: ../src/qtui/settingsdlg.cpp:193
+#: ../src/qtui/settingsdlg.cpp:221
 msgctxt "SettingsDlg|"
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 
-#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingsdlg.cpp:234
 msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
 msgstr "Återställ standardvärden"
 
-#: ../src/qtui/settingsdlg.cpp:202
+#: ../src/qtui/settingsdlg.cpp:235
 msgctxt "SettingsDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
-#: ../src/qtui/ui/settingspagedlg.ui:14
+#: ../src/qtui/settingspagedlg.ui:14
 msgctxt "SettingsPageDlg|"
 msgid "Configure Quassel"
 msgstr "Konfigurera Quassel"
 
-#: ../src/qtui/ui/settingspagedlg.ui:30
+#: ../src/qtui/settingspagedlg.ui:30
 msgctxt "SettingsPageDlg|"
 msgid "Settings"
 msgstr "Inställningar"
 
-#: ../src/qtui/settingspagedlg.cpp:36
+#: ../src/qtui/settingspagedlg.cpp:39
 #, qt-format
 msgctxt "SettingsPageDlg|"
 msgid "Configure %1"
 msgstr "Konfigurera %1"
 
-#: ../src/qtui/settingspagedlg.cpp:104
+#: ../src/qtui/settingspagedlg.cpp:119
 msgctxt "SettingsPageDlg|"
 msgid "Reload Settings"
 msgstr "Läs om inställningar"
 
-#: ../src/qtui/settingspagedlg.cpp:104
+#: ../src/qtui/settingspagedlg.cpp:120
 msgctxt "SettingsPageDlg|"
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 
-#: ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingspagedlg.cpp:133
 msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr "Återställ standardvärden"
 
-#: ../src/qtui/settingspagedlg.cpp:113
+#: ../src/qtui/settingspagedlg.cpp:134
 msgctxt "SettingsPageDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr ""
 
-#: ../src/qtui/settingspages/shortcutsmodel.cpp:110
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:105
 msgctxt "ShortcutsModel|"
 msgid "Action"
 msgstr "Åtgärd"
 
-#: ../src/qtui/settingspages/shortcutsmodel.cpp:112
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:107
 msgctxt "ShortcutsModel|"
 msgid "Shortcut"
 msgstr "Genväg"
@@ -5236,8 +8304,8 @@ msgid "Default:"
 msgstr "Standard:"
 
 #: ../src/qtui/settingspages/shortcutssettingspage.ui:75
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:92
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:102
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:96
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:108
 msgctxt "ShortcutsSettingsPage|"
 msgid "None"
 msgstr "Inget"
@@ -5247,120 +8315,142 @@ msgctxt "ShortcutsSettingsPage|"
 msgid "Custom:"
 msgstr "Anpassad:"
 
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:63
 msgctxt "ShortcutsSettingsPage|"
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: ../src/qtui/settingspages/shortcutssettingspage.cpp:60
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:63
 msgctxt "ShortcutsSettingsPage|"
 msgid "Shortcuts"
 msgstr "Genvägar"
 
-#: ../src/common/signalproxy.cpp:880
-msgctxt "SignalProxy|"
-msgid "Peer tried to send package larger than max package size!"
-msgstr ""
-
-#: ../src/common/signalproxy.cpp:885
-msgctxt "SignalProxy|"
-msgid "Peer tried to send 0 byte package!"
-msgstr ""
-
-#: ../src/common/signalproxy.cpp:902
-msgctxt "SignalProxy|"
-msgid "Peer sent corrupted compressed data!"
-msgstr ""
-
-#: ../src/common/signalproxy.cpp:917
-msgctxt "SignalProxy|"
-msgid "Peer sent corrupt data: unable to load QVariant!"
-msgstr ""
-
-#: ../src/common/signalproxy.cpp:1050
+#: ../src/common/signalproxy.cpp:619
 msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr "Kopplar från"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:28
+#: ../src/qtui/simplenetworkeditor.ui:28
 msgctxt "SimpleNetworkEditor|"
 msgid "Network name:"
 msgstr "Nätverksnamn:"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:35
+#: ../src/qtui/simplenetworkeditor.ui:35
 msgctxt "SimpleNetworkEditor|"
 msgid "The name of the IRC network you are configuring"
 msgstr ""
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:63
+#: ../src/qtui/simplenetworkeditor.ui:63
 msgctxt "SimpleNetworkEditor|"
 msgid "Servers"
 msgstr "Servrar"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:81
+#: ../src/qtui/simplenetworkeditor.ui:81
 msgctxt "SimpleNetworkEditor|"
 msgid "A list of IRC servers belonging to this network"
 msgstr ""
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:96
+#: ../src/qtui/simplenetworkeditor.ui:96
 msgctxt "SimpleNetworkEditor|"
 msgid "Edit this server entry"
 msgstr ""
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:99
+#: ../src/qtui/simplenetworkeditor.ui:99
 msgctxt "SimpleNetworkEditor|"
 msgid "&Edit..."
 msgstr "R&edigera..."
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:116
+#: ../src/qtui/simplenetworkeditor.ui:116
 msgctxt "SimpleNetworkEditor|"
 msgid "Add another IRC server"
 msgstr "Lägg till en annan IRC-server"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:119
+#: ../src/qtui/simplenetworkeditor.ui:119
 msgctxt "SimpleNetworkEditor|"
 msgid "&Add..."
 msgstr "&Lägg till..."
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:136
+#: ../src/qtui/simplenetworkeditor.ui:136
 msgctxt "SimpleNetworkEditor|"
 msgid "Remove this server entry from the list"
 msgstr ""
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:139
+#: ../src/qtui/simplenetworkeditor.ui:139
 msgctxt "SimpleNetworkEditor|"
 msgid "De&lete"
 msgstr "Ta &bort"
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:165
+#: ../src/qtui/simplenetworkeditor.ui:165
 msgctxt "SimpleNetworkEditor|"
 msgid "Move upwards in list"
 msgstr ""
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:168
-#: ../src/qtui/ui/simplenetworkeditor.ui:182
+#: ../src/qtui/simplenetworkeditor.ui:168
+#: ../src/qtui/simplenetworkeditor.ui:182
 msgctxt "SimpleNetworkEditor|"
 msgid "..."
 msgstr "..."
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:179
+#: ../src/qtui/simplenetworkeditor.ui:179
 msgctxt "SimpleNetworkEditor|"
 msgid "Move downwards in list"
 msgstr ""
 
-#: ../src/qtui/ui/simplenetworkeditor.ui:226
+#: ../src/qtui/simplenetworkeditor.ui:226
 msgctxt "SimpleNetworkEditor|"
 msgid "Join Channels Automatically"
 msgstr "Lägg till nya chattar automatiskt"
 
-#: ../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 ""
 
-#: ../src/core/sqlitestorage.cpp:52
+#: ../src/qtui/snorenotificationbackend.cpp:53
+msgctxt "SnoreNotificationBackend|"
+msgid "Private Message"
+msgstr ""
+
+#: ../src/qtui/snorentificationconfigwidget.ui:20
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Form"
+msgstr "Formulär"
+
+#: ../src/qtui/snorentificationconfigwidget.ui:29
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Snore"
+msgstr ""
+
+#: ../src/qtui/snorentificationconfigwidget.ui:40
+msgctxt "SnoreNotificationConfigWidget|"
+msgid "Enable Snore"
+msgstr ""
+
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Interface"
+msgstr "Gränssnitt"
+
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Spell Checking"
+msgstr ""
+
+#: ../src/core/sqlauthenticator.cpp:47
+msgctxt "SqlAuthenticator|"
+msgid "Database"
+msgstr ""
+
+#: ../src/core/sqlauthenticator.cpp:52
+msgctxt "SqlAuthenticator|"
+msgid ""
+"Do not authenticate against any remote service, but instead save a hashed "
+"and salted password in the database selected in the next step."
+msgstr ""
+
+#: ../src/core/sqlitestorage.cpp:57
 msgctxt "SqliteStorage|"
 msgid ""
 "SQLite is a file-based database engine that does not require any setup. It "
@@ -5370,128 +8460,169 @@ msgid ""
 "your core."
 msgstr ""
 
-#: ../src/qtui/ui/sslinfodlg.ui:14
+#: ../src/qtui/sslinfodlg.ui:14
 msgctxt "SslInfoDlg|"
 msgid "Security Information"
 msgstr "Säkerhetsinformation"
 
-#: ../src/qtui/ui/sslinfodlg.ui:22
+#: ../src/qtui/sslinfodlg.ui:22
 msgctxt "SslInfoDlg|"
 msgid "<b>Hostname:</b>"
 msgstr "<b>Värdnamn:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:39
+#: ../src/qtui/sslinfodlg.ui:39
 msgctxt "SslInfoDlg|"
 msgid "<b>IP address:</b>"
 msgstr "<b>IP-adress:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:56
+#: ../src/qtui/sslinfodlg.ui:56
 msgctxt "SslInfoDlg|"
 msgid "<b>Encryption:</b>"
 msgstr "<b>Kryptering:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:73
+#: ../src/qtui/sslinfodlg.ui:73
 msgctxt "SslInfoDlg|"
 msgid "<b>Protocol:</b>"
 msgstr "<b>Protokoll:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:90
+#: ../src/qtui/sslinfodlg.ui:90
 msgctxt "SslInfoDlg|"
 msgid "<b>Certificate chain:</b>"
 msgstr "<b>Certifikatkedja:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:120
+#: ../src/qtui/sslinfodlg.ui:120
 msgctxt "SslInfoDlg|"
 msgid "Subject"
 msgstr ""
 
-#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
+#: ../src/qtui/sslinfodlg.ui:126 ../src/qtui/sslinfodlg.ui:248
 msgctxt "SslInfoDlg|"
 msgid "<b>Common name:</b>"
 msgstr "<b>Värdnamn:</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>Organisation:</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>Organisation:</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>Land:</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>Certifikatkedja:</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>Land:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:242
+#: ../src/qtui/sslinfodlg.ui:242
 msgctxt "SslInfoDlg|"
 msgid "Issuer"
 msgstr "Utfärdare"
 
-#: ../src/qtui/ui/sslinfodlg.ui:367
+#: ../src/qtui/sslinfodlg.ui:367
 msgctxt "SslInfoDlg|"
 msgid "<b>Validity period:</b>"
 msgstr "<b>Organisation:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:384
+#: ../src/qtui/sslinfodlg.ui:384
 msgctxt "SslInfoDlg|"
 msgid "<b>MD5 digest:</b>"
 msgstr "<b>Läge:</b> %1"
 
-#: ../src/qtui/ui/sslinfodlg.ui:401
+#: ../src/qtui/sslinfodlg.ui:401
 msgctxt "SslInfoDlg|"
 msgid "<b>SHA1 digest:</b>"
 msgstr "<b>IP-adress:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:431
+#: ../src/qtui/sslinfodlg.ui:418
+msgctxt "SslInfoDlg|"
+msgid "<b>SHA256 digest:</b>"
+msgstr ""
+
+#: ../src/qtui/sslinfodlg.ui:448
 msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
 msgstr "<b>Pålitligt:</b>"
 
-#: ../src/qtui/sslinfodlg.cpp:69
+#: ../src/qtui/sslinfodlg.cpp:71
 msgctxt "SslInfoDlg|"
 msgid "Yes"
 msgstr "Ja"
 
-#: ../src/qtui/sslinfodlg.cpp:71
+#: ../src/qtui/sslinfodlg.cpp:73
 msgctxt "SslInfoDlg|"
 msgid "No, for the following reasons:<ul>"
 msgstr "Nej av följande anledningar:<ul>"
 
-#: ../src/qtui/sslinfodlg.cpp:78
+#: ../src/qtui/sslinfodlg.cpp:81
 #, qt-format
 msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr "%1 till %2"
 
-#: ../src/client/networkmodel.h:144
+#: ../src/client/networkmodel.h:169
 msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
 msgstr "Visa status&rad"
 
-#: ../src/qtui/systemtray.cpp:61 ../src/qtui/systemtray.cpp:92
+#: ../src/qtui/systemtray.cpp:43 ../src/qtui/systemtray.cpp:203
 msgctxt "SystemTray|"
 msgid "&Minimize"
 msgstr "&Minimera"
 
-#: ../src/qtui/systemtray.cpp:94
+#: ../src/qtui/systemtray.cpp:205
 msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr ""
 
-#: ../src/qtui/systraynotificationbackend.cpp:125
+#: ../src/qtui/systrayanimationconfigwidget.ui:20
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Form"
+msgstr "Formulär"
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:28
+msgctxt "SystrayAnimationConfigWidget|"
+msgid ""
+"<html><head/><body><p>If enabled, alert the system tray or dock in case of a"
+" notification.</p><p>It depends on your desktop environment how an alert is "
+"visualized. For example, Plasma will pulsate the tray icon, while Windows "
+"will change the icon's color. You may choose to forcefully change color or "
+"even letting the icon blink, if desired.</p><p>Note that not all icon themes"
+" support changing the color of the tray icon.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:31
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Alert tray icon and"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:54
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "do nothing"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:59
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "change color"
+msgstr ""
+
+#: ../src/qtui/systrayanimationconfigwidget.ui:64
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "blink"
+msgstr ""
+
+#: ../src/qtui/systraynotificationbackend.cpp:131
 #, qt-format
 msgctxt "SystrayNotificationBackend|"
 msgid "%n pending highlight(s)"
@@ -5499,32 +8630,32 @@ msgid_plural "%n pending highlight(s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/qtui/systraynotificationbackend.cpp:135
+#: ../src/qtui/systraynotificationbackend.cpp:145
 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr "Visa egna meddelanden"
 
-#: ../src/uisupport/tabcompleter.cpp:52
+#: ../src/uisupport/tabcompleter.cpp:53
 msgctxt "TabCompleter|"
 msgid "Tab completion"
 msgstr ""
 
-#: ../src/qtui/taskbarnotificationbackend.cpp:68
+#: ../src/qtui/taskbarnotificationbackend.cpp:78
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Activate dock entry, timeout:"
 msgstr ""
 
-#: ../src/qtui/taskbarnotificationbackend.cpp:70
+#: ../src/qtui/taskbarnotificationbackend.cpp:80
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Mark taskbar entry, timeout:"
 msgstr ""
 
-#: ../src/qtui/taskbarnotificationbackend.cpp:78
+#: ../src/qtui/taskbarnotificationbackend.cpp:88
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Unlimited"
 msgstr "Obegränsat"
 
-#: ../src/qtui/taskbarnotificationbackend.cpp:79
+#: ../src/qtui/taskbarnotificationbackend.cpp:89
 msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr " sekunder"
@@ -5549,143 +8680,143 @@ msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
 msgstr "Koppla från IRC"
 
+#: ../src/uisupport/toolbaractionprovider.cpp:33
+msgctxt "ToolBarActionProvider|"
+msgid "Connect to all"
+msgstr "Anslut till alla"
+
 #: ../src/uisupport/toolbaractionprovider.cpp:34
 msgctxt "ToolBarActionProvider|"
+msgid "Disconnect from all"
+msgstr "Koppla från alla"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:36
+msgctxt "ToolBarActionProvider|"
 msgid "Part"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:36
 msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:35
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgctxt "ToolBarActionProvider|"
 msgid "Join"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:35
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr "Gå in i en kanal"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:39
 msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr "Fråga"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:39
 msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr "Starta en privat konversation"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:38
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr "Begär användarinformation"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr "Op"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgctxt "ToolBarActionProvider|"
 msgid "Give operator privileges to user"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr "Deop"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgctxt "ToolBarActionProvider|"
 msgid "Take operator privileges from user"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgctxt "ToolBarActionProvider|"
 msgid "Give voice to user"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgctxt "ToolBarActionProvider|"
 msgid "Take voice from user"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr "Sparka"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:47
 msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr "Bannlys"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:47
 msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
 msgstr "Bannlys från kanalen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:46
+#: ../src/uisupport/toolbaractionprovider.cpp:48
 msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
 msgstr "Sparka/Bannlys"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:46
+#: ../src/uisupport/toolbaractionprovider.cpp:48
 msgctxt "ToolBarActionProvider|"
 msgid "Remove and ban user from channel"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:51
-msgctxt "ToolBarActionProvider|"
-msgid "Connect to all"
-msgstr "Anslut till alla"
-
-#: ../src/uisupport/toolbaractionprovider.cpp:58
-msgctxt "ToolBarActionProvider|"
-msgid "Disconnect from all"
-msgstr "Koppla från alla"
-
-#: ../src/qtui/ui/topicwidget.ui:32
+#: ../src/qtui/topicwidget.ui:32
 msgctxt "TopicWidget|"
 msgid "Form"
 msgstr "Formulär"
 
-#: ../src/qtui/ui/topicwidget.ui:79
+#: ../src/qtui/topicwidget.ui:79
 msgctxt "TopicWidget|"
 msgid "..."
 msgstr "..."
 
-#: ../src/qtui/topicwidget.cpp:106
+#: ../src/qtui/topicwidget.cpp:116
 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Users: %1"
 msgstr "Användare: %1"
 
-#: ../src/qtui/topicwidget.cpp:107
+#: ../src/qtui/topicwidget.cpp:117
 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Lag: %1 msecs"
@@ -5711,137 +8842,186 @@ msgctxt "TopicWidgetSettingsPage|"
 msgid "On hover only"
 msgstr ""
 
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24
 msgctxt "TopicWidgetSettingsPage|"
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:23
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24
 msgctxt "TopicWidgetSettingsPage|"
 msgid "Topic Widget"
 msgstr ""
 
-#. Plain Message
-#. ----------
-#. Notice Message
-#. ----------
-#. Server Message
-#. ----------
-#. Info Message
-#. ----------
-#. Error Message
-#. ----------
-#. Topic Message
-#. ----------
-#. Invite Message
-#: ../src/uisupport/uistyle.cpp:577 ../src/uisupport/uistyle.cpp:580
-#: ../src/uisupport/uistyle.cpp:620 ../src/uisupport/uistyle.cpp:623
-#: ../src/uisupport/uistyle.cpp:626 ../src/uisupport/uistyle.cpp:633
-#: ../src/uisupport/uistyle.cpp:665
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "%1"
-msgstr "%1"
+#: ../src/common/transfer.cpp:92
+msgctxt "Transfer|"
+msgid "New"
+msgstr "Ny"
 
-#. Action Message
-#: ../src/uisupport/uistyle.cpp:583
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "%DN%1%DN %2"
-msgstr "%DN%1%DN %2"
+#: ../src/common/transfer.cpp:94
+msgctxt "Transfer|"
+msgid "Pending"
+msgstr ""
+
+#: ../src/common/transfer.cpp:96
+msgctxt "Transfer|"
+msgid "Connecting"
+msgstr ""
+
+#: ../src/common/transfer.cpp:98
+msgctxt "Transfer|"
+msgid "Transferring"
+msgstr ""
+
+#: ../src/common/transfer.cpp:100
+msgctxt "Transfer|"
+msgid "Paused"
+msgstr ""
+
+#: ../src/common/transfer.cpp:102
+msgctxt "Transfer|"
+msgid "Completed"
+msgstr ""
+
+#: ../src/common/transfer.cpp:104
+msgctxt "Transfer|"
+msgid "Failed"
+msgstr ""
+
+#: ../src/common/transfer.cpp:106
+msgctxt "Transfer|"
+msgid "Rejected"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Type"
+msgstr "Typ"
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "File"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Status"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Progress"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Transferred"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Speed"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Peer"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:44
+msgctxt "TransferModel|"
+msgid "Peer Address"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:75
+msgctxt "TransferModel|"
+msgid "Send"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:75
+msgctxt "TransferModel|"
+msgid "Receive"
+msgstr ""
 
 #. Nick Message
-#: ../src/uisupport/uistyle.cpp:587
+#: ../src/uisupport/uistyle.cpp:915
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "You are now known as %DN%1%DN"
 msgstr "Du är nu känd som %DN%1%DN"
 
-#: ../src/uisupport/uistyle.cpp:588
+#: ../src/uisupport/uistyle.cpp:917
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr "%DN%1%DN är nu känd som %DN%2%DN"
 
 #. Mode Message
-#: ../src/uisupport/uistyle.cpp:592
+#: ../src/uisupport/uistyle.cpp:922
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "User mode: %DM%1%DM"
 msgstr ""
 
-#: ../src/uisupport/uistyle.cpp:593
+#: ../src/uisupport/uistyle.cpp:924
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr ""
 
 #. Join Message
-#: ../src/uisupport/uistyle.cpp:597
+#: ../src/uisupport/uistyle.cpp:928
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr ""
 
 #. Part Message
-#: ../src/uisupport/uistyle.cpp:600
+#: ../src/uisupport/uistyle.cpp:932
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr ""
 
 #. Quit Message
-#: ../src/uisupport/uistyle.cpp:605
+#: ../src/uisupport/uistyle.cpp:938
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr ""
 
 #. Kick Message
-#: ../src/uisupport/uistyle.cpp:612
+#: ../src/uisupport/uistyle.cpp:946
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr ""
 
 #. Day Change Message
-#: ../src/uisupport/uistyle.cpp:629
+#: ../src/uisupport/uistyle.cpp:963
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
 msgstr "Synkroniserad till %1"
 
-#: ../src/uisupport/uistyle.cpp:641
+#: ../src/uisupport/uistyle.cpp:975
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
 
-#: ../src/uisupport/uistyle.cpp:645 ../src/uisupport/uistyle.cpp:660
+#: ../src/uisupport/uistyle.cpp:979 ../src/uisupport/uistyle.cpp:995
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN (%2 more)"
 msgstr "%DN%1%DN %2"
 
-#: ../src/uisupport/uistyle.cpp:655
+#: ../src/uisupport/uistyle.cpp:990
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr ""
 
-#: ../src/uisupport/uistyle.cpp:667 ../src/uisupport/uistyle.cpp:705
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "[%1]"
-msgstr "[%1]"
-
-#: ../src/uisupport/uistyle.cpp:703
-#, qt-format
-msgctxt "UiStyle::StyledMessage|"
-msgid "<%1>"
-msgstr "<%1>"
-
-#: ../src/client/networkmodel.cpp:697
+#: ../src/client/networkmodel.cpp:953
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Owner(s)"
@@ -5849,7 +9029,7 @@ msgid_plural "%n Owner(s)"
 msgstr[0] "%n ägare"
 msgstr[1] "%n ägare"
 
-#: ../src/client/networkmodel.cpp:698
+#: ../src/client/networkmodel.cpp:955
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Admin(s)"
@@ -5857,7 +9037,7 @@ msgid_plural "%n Admin(s)"
 msgstr[0] "%n administratör"
 msgstr[1] "%n administratörer"
 
-#: ../src/client/networkmodel.cpp:699
+#: ../src/client/networkmodel.cpp:957
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Operator(s)"
@@ -5865,7 +9045,7 @@ msgid_plural "%n Operator(s)"
 msgstr[0] "%n operatör"
 msgstr[1] "%n operatörer"
 
-#: ../src/client/networkmodel.cpp:700
+#: ../src/client/networkmodel.cpp:959
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Half-Op(s)"
@@ -5873,7 +9053,7 @@ msgid_plural "%n Half-Op(s)"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/client/networkmodel.cpp:701
+#: ../src/client/networkmodel.cpp:961
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Voiced"
@@ -5881,12 +9061,10 @@ msgid_plural "%n Voiced"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/client/networkmodel.cpp:702
+#: ../src/client/networkmodel.cpp:963
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n User(s)"
 msgid_plural "%n User(s)"
 msgstr[0] "%n användare"
 msgstr[1] "%n användare"
-
-