X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fde.po;h=f50c57315aa0f39e663ece98008ef406d951813e;hp=ccc06f663e71ab4a12a7367149ba785c1943c37a;hb=7c0eb0111b70089f563ee793e2b52036b76ca643;hpb=8cece06596c290d69c1f32b7221c796437f5fabb

diff --git a/po/de.po b/po/de.po
index ccc06f66..f50c5731 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,23 +1,19 @@
 # 
 # Translators:
 # contradictioned <contradictioned@googlemail.com>, 2014
-# Daniel Albers <daniel@lbe.rs>, 2012-2013
-# Daniel Albers <daniel@lbers.com>, 2011-2012
+# Daniel Albers <daniel@lbe.rs>, 2011-2013
 # Felix Kaechele <felix@fetzig.org>, 2013
-# Felix Kaechele <felix@fetzig.org>, 2013
-# m4yer <m4yer+quassel@minad.de>, 2012
-# m4yer <m4yer+quassel@minad.de>, 2012
-# Martin Mayer <m4yer@minad.de>, Michael Groh <brot@minad.de>, 2009-2010
+# Martin Mayer <m4yer@minad.de>, 2009-2010,2012
+# Michael Groh <brot@minad.de>, 2009-2010
 # Sebastian Meyer <transifex@netzvieh.de>, 2015
 # Tobias Frei <tobias@freiwuppertal.de>, 2012
-# Tobias Frei <tobias@freiwuppertal.de>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Quassel IRC\n"
 "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
-"PO-Revision-Date: 2015-04-28 08:47+0000\n"
-"Last-Translator: Sebastian Meyer <transifex@netzvieh.de>\n"
-"Language-Team: German (http://www.transifex.com/ald/quassel/language/de/)\n"
+"PO-Revision-Date: 2018-09-03 16:41+0000\n"
+"Last-Translator: Steve M <transifex@lostinweb.eu>\n"
+"Language-Team: German (http://www.transifex.com/quassel/quassel/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,467 +29,589 @@ msgstr "Quassel IRC"
 #: ../src/uisupport/aboutdata.cpp:141
 msgctxt "AboutData|"
 msgid "A modern, distributed IRC client"
-msgstr ""
+msgstr "Ein moderner, verteilter IRC-Client"
 
 #: ../src/uisupport/aboutdata.cpp:174
 msgctxt "AboutData|"
-msgid "Project Founder, Lead Developer"
+msgid "Project founder, lead developer"
 msgstr "Projektgründer, Hauptentwickler"
 
 #: ../src/uisupport/aboutdata.cpp:175
 msgctxt "AboutData|"
-msgid "Project Motivator, Lead Developer"
+msgid "Project motivator, lead developer"
 msgstr ""
 
 #: ../src/uisupport/aboutdata.cpp:176
 msgctxt "AboutData|"
-msgid "Former Lead Developer"
-msgstr "Früherer Hauptentwickler"
+msgid "Former lead developer"
+msgstr "Frühere Hauptentwickler"
 
 #: ../src/uisupport/aboutdata.cpp:177
 msgctxt "AboutData|"
-msgid "Master of Translation, many fixes and enhancements"
+msgid "Master of Translation, many fixes and enhancements, Travis support"
 msgstr ""
 
 #: ../src/uisupport/aboutdata.cpp:178
 msgctxt "AboutData|"
 msgid "Many features, fixes and improvements"
-msgstr ""
+msgstr "Viele Leistungsmerkmale, Fixes und Verbesserungen"
 
 #: ../src/uisupport/aboutdata.cpp:179
 msgctxt "AboutData|"
 msgid "Many fixes and improvements, bug and patch triaging, community support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:183 ../src/uisupport/aboutdata.cpp:192
+#: ../src/uisupport/aboutdata.cpp:180
+msgctxt "AboutData|"
+msgid ""
+"IRCv3 support, documentation, many other improvements, testing, outstanding "
+"PRs"
+msgstr "IRCv3 Unterstützung, Dokumentation, viele weitere Verbesserungen, Tests, ausstehende PRs"
+
+#: ../src/uisupport/aboutdata.cpp:181
+msgctxt "AboutData|"
+msgid ""
+"Quasseldroid, architecture, (mobile) performance, many other improvements "
+"and fixes, testing"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:185
+msgctxt "AboutData|"
+msgid "OSX UI improvements"
+msgstr "OSX UI Verbesserungen"
+
+#: ../src/uisupport/aboutdata.cpp:186 ../src/uisupport/aboutdata.cpp:201
 msgctxt "AboutData|"
 msgid "Chatview improvements"
-msgstr "Chatview Verbesserungen"
+msgstr "Chat-Ansicht Verbesserungen"
 
-#: ../src/uisupport/aboutdata.cpp:184
+#: ../src/uisupport/aboutdata.cpp:187
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter, Danish translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:185 ../src/uisupport/aboutdata.cpp:261
-#: ../src/uisupport/aboutdata.cpp:284
+#: ../src/uisupport/aboutdata.cpp:188 ../src/uisupport/aboutdata.cpp:266
+#: ../src/uisupport/aboutdata.cpp:295 ../src/uisupport/aboutdata.cpp:307
 msgctxt "AboutData|"
 msgid "Spanish translation"
 msgstr "Spanische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:186
+#: ../src/uisupport/aboutdata.cpp:189
+msgctxt "AboutData|"
+msgid "Build system fixes"
+msgstr "Baue Systemkorrekturen"
+
+#: ../src/uisupport/aboutdata.cpp:190 ../src/uisupport/aboutdata.cpp:330
+msgctxt "AboutData|"
+msgid "Database performance improvements"
+msgstr "Datenbankleistungsverbesserung"
+
+#: ../src/uisupport/aboutdata.cpp:191
 msgctxt "AboutData|"
 msgid "Tray icon fix"
-msgstr ""
+msgstr "Benachrichtigungssymbolkorrektur"
 
-#: ../src/uisupport/aboutdata.cpp:187
+#: ../src/uisupport/aboutdata.cpp:192
 msgctxt "AboutData|"
 msgid "Language improvements"
-msgstr ""
+msgstr "Sprachenverbesserung"
 
-#: ../src/uisupport/aboutdata.cpp:188
+#: ../src/uisupport/aboutdata.cpp:193
 msgctxt "AboutData|"
 msgid "Documentation improvements"
-msgstr ""
+msgstr "Dokumentationsverbesserung"
+
+#: ../src/uisupport/aboutdata.cpp:194 ../src/uisupport/aboutdata.cpp:300
+msgctxt "AboutData|"
+msgid "Brazilian translation"
+msgstr "Brasilianische Übersetzung"
+
+#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:269
+msgctxt "AboutData|"
+msgid "Slovenian translation"
+msgstr "Slovenische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:189 ../src/uisupport/aboutdata.cpp:285
+#: ../src/uisupport/aboutdata.cpp:196 ../src/uisupport/aboutdata.cpp:222
+#: ../src/uisupport/aboutdata.cpp:226 ../src/uisupport/aboutdata.cpp:243
+#: ../src/uisupport/aboutdata.cpp:252 ../src/uisupport/aboutdata.cpp:274
+#: ../src/uisupport/aboutdata.cpp:290 ../src/uisupport/aboutdata.cpp:310
+#: ../src/uisupport/aboutdata.cpp:347
+msgctxt "AboutData|"
+msgid "Fixes"
+msgstr "Verbesserungen"
+
+#: ../src/uisupport/aboutdata.cpp:197 ../src/uisupport/aboutdata.cpp:322
 msgctxt "AboutData|"
 msgid "Romanian translation"
 msgstr "Rumänische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:190 ../src/uisupport/aboutdata.cpp:235
-#: ../src/uisupport/aboutdata.cpp:246 ../src/uisupport/aboutdata.cpp:247
+#: ../src/uisupport/aboutdata.cpp:198
+msgctxt "AboutData|"
+msgid "Punjabi translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:199 ../src/uisupport/aboutdata.cpp:261
+#: ../src/uisupport/aboutdata.cpp:276 ../src/uisupport/aboutdata.cpp:277
 msgctxt "AboutData|"
 msgid "Finnish translation"
 msgstr "Finnische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:191
+#: ../src/uisupport/aboutdata.cpp:200
 msgctxt "AboutData|"
 msgid "Message indicator support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:193
+#: ../src/uisupport/aboutdata.cpp:202 ../src/uisupport/aboutdata.cpp:203
+#: ../src/uisupport/aboutdata.cpp:346
+msgctxt "AboutData|"
+msgid "Build system fix"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:204
 msgctxt "AboutData|"
 msgid "Windows build system fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:194
+#: ../src/uisupport/aboutdata.cpp:205
+msgctxt "AboutData|"
+msgid "AppData metadata, LDAP support"
+msgstr "AppData Metadaten, LDAP-Unterstützung"
+
+#: ../src/uisupport/aboutdata.cpp:206
+msgctxt "AboutData|"
+msgid "Nicer tooltips, spell check and other improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:207
 msgctxt "AboutData|"
 msgid "Crash fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:215
-#: ../src/uisupport/aboutdata.cpp:271
+#: ../src/uisupport/aboutdata.cpp:208 ../src/uisupport/aboutdata.cpp:233
+#: ../src/uisupport/aboutdata.cpp:311
 msgctxt "AboutData|"
 msgid "French translation"
 msgstr "Französische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:196
+#: ../src/uisupport/aboutdata.cpp:209
+msgctxt "AboutData|"
+msgid "Occitan translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:210
 msgctxt "AboutData|"
 msgid "Usability review"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:197
+#: ../src/uisupport/aboutdata.cpp:211
 msgctxt "AboutData|"
 msgid "SASL support"
 msgstr "SASL Unterstützung"
 
-#: ../src/uisupport/aboutdata.cpp:198
+#: ../src/uisupport/aboutdata.cpp:212
 msgctxt "AboutData|"
 msgid "Various improvements"
-msgstr ""
+msgstr "Verschiedene Verbesserungen"
 
-#: ../src/uisupport/aboutdata.cpp:199 ../src/uisupport/aboutdata.cpp:200
-#: ../src/uisupport/aboutdata.cpp:204
+#: ../src/uisupport/aboutdata.cpp:213 ../src/uisupport/aboutdata.cpp:214
+#: ../src/uisupport/aboutdata.cpp:219
 msgctxt "AboutData|"
 msgid "Various fixes and improvements"
-msgstr ""
+msgstr "Verschiedene Korrekturen und Verbesserungen"
+
+#: ../src/uisupport/aboutdata.cpp:215
+msgctxt "AboutData|"
+msgid "Settings fixes"
+msgstr "Einstellungskorrekturen"
 
-#: ../src/uisupport/aboutdata.cpp:201
+#: ../src/uisupport/aboutdata.cpp:216 ../src/uisupport/aboutdata.cpp:294
 msgctxt "AboutData|"
 msgid "Galician translation"
 msgstr "Galicische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:202
+#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:339
 msgctxt "AboutData|"
 msgid "Esperanto translation"
 msgstr "Esperanto Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:203
+#: ../src/uisupport/aboutdata.cpp:218
 msgctxt "AboutData|"
 msgid "Japanese translation"
 msgstr "Japanische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:205 ../src/uisupport/aboutdata.cpp:263
+#: ../src/uisupport/aboutdata.cpp:220 ../src/uisupport/aboutdata.cpp:297
 msgctxt "AboutData|"
 msgid "Gentoo maintainer"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:206
+#: ../src/uisupport/aboutdata.cpp:221 ../src/uisupport/aboutdata.cpp:237
+#: ../src/uisupport/aboutdata.cpp:342
+msgctxt "AboutData|"
+msgid "Certificate handling improvements"
+msgstr "Verbesserungen im Umgang mit Zertifikaten"
+
+#: ../src/uisupport/aboutdata.cpp:223
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter (on Vista™!)"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:207
+#: ../src/uisupport/aboutdata.cpp:224
 msgctxt "AboutData|"
 msgid "Translation system fixes"
-msgstr ""
+msgstr "Übersetzungskorrekturen"
 
-#: ../src/uisupport/aboutdata.cpp:208
+#: ../src/uisupport/aboutdata.cpp:225
 msgctxt "AboutData|"
 msgid "OSX Notification Center support"
 msgstr "OSX Benachrichtigungscenter Unterstützung"
 
-#: ../src/uisupport/aboutdata.cpp:209 ../src/uisupport/aboutdata.cpp:257
+#: ../src/uisupport/aboutdata.cpp:227 ../src/uisupport/aboutdata.cpp:244
+#: ../src/uisupport/aboutdata.cpp:345 ../src/uisupport/aboutdata.cpp:351
 msgctxt "AboutData|"
-msgid "Fixes"
-msgstr "Verbesserungen"
+msgid "Turkish translation"
+msgstr "Türkische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:210 ../src/uisupport/aboutdata.cpp:259
+#: ../src/uisupport/aboutdata.cpp:228 ../src/uisupport/aboutdata.cpp:292
 msgctxt "AboutData|"
 msgid "Mac fixes"
-msgstr ""
+msgstr "Mac-Korrekturen"
 
-#: ../src/uisupport/aboutdata.cpp:211
+#: ../src/uisupport/aboutdata.cpp:229
 msgctxt "AboutData|"
 msgid "D-Bus notifications"
 msgstr "D-Bus Benachrichtigungen"
 
-#: ../src/uisupport/aboutdata.cpp:212
+#: ../src/uisupport/aboutdata.cpp:230
 msgctxt "AboutData|"
 msgid "Polish translation"
 msgstr "Polnische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:213
+#: ../src/uisupport/aboutdata.cpp:231 ../src/uisupport/aboutdata.cpp:312
 msgctxt "AboutData|"
 msgid "Build system improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:214
+#: ../src/uisupport/aboutdata.cpp:232
 msgctxt "AboutData|"
 msgid "Formatting support and other input line improvements, many other fixes"
-msgstr ""
+msgstr "Formatierunterstützungs- und weitere Eingabeverbesserungen, viele weitere Korrekturen"
 
-#: ../src/uisupport/aboutdata.cpp:216
+#: ../src/uisupport/aboutdata.cpp:234
 msgctxt "AboutData|"
 msgid "BluesTheme stylesheet"
-msgstr ""
+msgstr "Blues Design Formatvorlage"
 
-#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:251
-#: ../src/uisupport/aboutdata.cpp:279
+#: ../src/uisupport/aboutdata.cpp:235 ../src/uisupport/aboutdata.cpp:281
+#: ../src/uisupport/aboutdata.cpp:323 ../src/uisupport/aboutdata.cpp:343
 msgctxt "AboutData|"
 msgid "Russian translation"
 msgstr "Russische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:218 ../src/uisupport/aboutdata.cpp:253
+#: ../src/uisupport/aboutdata.cpp:236 ../src/uisupport/aboutdata.cpp:285
 msgctxt "AboutData|"
 msgid "Italian translation"
 msgstr "Italienische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:219
+#: ../src/uisupport/aboutdata.cpp:238 ../src/uisupport/aboutdata.cpp:272
+#: ../src/uisupport/aboutdata.cpp:282 ../src/uisupport/aboutdata.cpp:286
+#: ../src/uisupport/aboutdata.cpp:289 ../src/uisupport/aboutdata.cpp:340
 msgctxt "AboutData|"
-msgid "Certificate handling improvements"
-msgstr "Verbesserungen im Umgang mit Zertifikaten"
+msgid "German translation"
+msgstr "Deutsche Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:220
+#: ../src/uisupport/aboutdata.cpp:239
 msgctxt "AboutData|"
-msgid "Sanitize topic handling"
+msgid "Sanitize topic handling, twitch.tv support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:221
+#: ../src/uisupport/aboutdata.cpp:240
 msgctxt "AboutData|"
 msgid "Norwegian translation"
 msgstr "Norwegische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:222
+#: ../src/uisupport/aboutdata.cpp:241
 msgctxt "AboutData|"
 msgid "Hungarian translation"
 msgstr "Ungarische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:223
+#: ../src/uisupport/aboutdata.cpp:242
 msgctxt "AboutData|"
 msgid "IRC parser improvements"
-msgstr ""
+msgstr "IRC Parser Verbesserungen"
 
-#: ../src/uisupport/aboutdata.cpp:224 ../src/uisupport/aboutdata.cpp:296
-#: ../src/uisupport/aboutdata.cpp:300
+#: ../src/uisupport/aboutdata.cpp:245
 msgctxt "AboutData|"
-msgid "Turkish translation"
-msgstr "Türkische Übersetzung"
+msgid "Windows build support and Appveyor maintenance, snorenotify backend"
+msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:225
+#: ../src/uisupport/aboutdata.cpp:246
 msgctxt "AboutData|"
 msgid "Initial Qt5 support"
 msgstr "Initiale Qt5 Unterstützung"
 
-#: ../src/uisupport/aboutdata.cpp:226
+#: ../src/uisupport/aboutdata.cpp:247
 msgctxt "AboutData|"
 msgid "{Ku|U}buntu packager, motivator, promoter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:227
+#: ../src/uisupport/aboutdata.cpp:248
 msgctxt "AboutData|"
-msgid "Various features"
-msgstr ""
+msgid "Various features and improvements"
+msgstr "Verschiedene Leistungsmerkmale und Verbesserungen"
 
-#: ../src/uisupport/aboutdata.cpp:228 ../src/uisupport/aboutdata.cpp:229
-#: ../src/uisupport/aboutdata.cpp:234 ../src/uisupport/aboutdata.cpp:239
+#: ../src/uisupport/aboutdata.cpp:249 ../src/uisupport/aboutdata.cpp:250
+#: ../src/uisupport/aboutdata.cpp:260 ../src/uisupport/aboutdata.cpp:267
+#: ../src/uisupport/aboutdata.cpp:288 ../src/uisupport/aboutdata.cpp:304
+#: ../src/uisupport/aboutdata.cpp:317
 msgctxt "AboutData|"
 msgid "Various fixes"
-msgstr ""
+msgstr "Verschiedene Korrekturen"
 
-#: ../src/uisupport/aboutdata.cpp:230 ../src/uisupport/aboutdata.cpp:231
-#: ../src/uisupport/aboutdata.cpp:270 ../src/uisupport/aboutdata.cpp:273
-#: ../src/uisupport/aboutdata.cpp:277 ../src/uisupport/aboutdata.cpp:281
+#: ../src/uisupport/aboutdata.cpp:251 ../src/uisupport/aboutdata.cpp:255
+#: ../src/uisupport/aboutdata.cpp:309 ../src/uisupport/aboutdata.cpp:314
+#: ../src/uisupport/aboutdata.cpp:326
 msgctxt "AboutData|"
 msgid "Bugfixes"
-msgstr ""
+msgstr "Fehlerkorrektur"
 
-#: ../src/uisupport/aboutdata.cpp:232
+#: ../src/uisupport/aboutdata.cpp:253 ../src/uisupport/aboutdata.cpp:341
+#: ../src/uisupport/aboutdata.cpp:344
+msgctxt "AboutData|"
+msgid "Czech translation"
+msgstr "Tschechische Übersetzung"
+
+#: ../src/uisupport/aboutdata.cpp:254
+msgctxt "AboutData|"
+msgid "Python improvements"
+msgstr "Python-Verbesserungen"
+
+#: ../src/uisupport/aboutdata.cpp:256
+msgctxt "AboutData|"
+msgid "Proxy improvements, Spanish translation"
+msgstr "Proxy-Verbesserungen, Spanisch Übersetzung"
+
+#: ../src/uisupport/aboutdata.cpp:257
 msgctxt "AboutData|"
 msgid "Postgres migration fixes"
-msgstr ""
+msgstr "Postgres Migrationskorrekturen"
 
-#: ../src/uisupport/aboutdata.cpp:233
+#: ../src/uisupport/aboutdata.cpp:258 ../src/uisupport/aboutdata.cpp:262
+#: ../src/uisupport/aboutdata.cpp:301
+msgctxt "AboutData|"
+msgid "Danish translation"
+msgstr "Dänische Übersetzung"
+
+#: ../src/uisupport/aboutdata.cpp:259
 msgctxt "AboutData|"
 msgid "Context menu fixes"
-msgstr ""
+msgstr "Kontextmenükorrekturen"
 
-#: ../src/uisupport/aboutdata.cpp:236
+#: ../src/uisupport/aboutdata.cpp:263
 msgctxt "AboutData|"
 msgid "Many fixes and improvements, bug triaging"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:237
+#: ../src/uisupport/aboutdata.cpp:264
 msgctxt "AboutData|"
 msgid "Original \"All-Seeing Eye\" logo"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:238
+#: ../src/uisupport/aboutdata.cpp:265
 msgctxt "AboutData|"
 msgid "Project founder, various improvements"
 msgstr "Projektgründer, verschiedene Verbesserungen"
 
-#: ../src/uisupport/aboutdata.cpp:240
+#: ../src/uisupport/aboutdata.cpp:268
 msgctxt "AboutData|"
 msgid "Serbian translation"
 msgstr "Serbische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:241
-msgctxt "AboutData|"
-msgid "Slovenian translation"
-msgstr "Slovenische Übersetzung"
-
-#: ../src/uisupport/aboutdata.cpp:242
+#: ../src/uisupport/aboutdata.cpp:270
 msgctxt "AboutData|"
 msgid ""
 "Tireless tester, {Ku|U}buntu tester and lobbyist, liters of delicious "
 "Finnish alcohol"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:243
+#: ../src/uisupport/aboutdata.cpp:271
 msgctxt "AboutData|"
 msgid "Qt5 porting help, Travis CI setup"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:244 ../src/uisupport/aboutdata.cpp:254
-#: ../src/uisupport/aboutdata.cpp:256 ../src/uisupport/aboutdata.cpp:293
-msgctxt "AboutData|"
-msgid "German translation"
-msgstr "Deutsche Übersetzung"
-
-#: ../src/uisupport/aboutdata.cpp:245
+#: ../src/uisupport/aboutdata.cpp:273
 msgctxt "AboutData|"
 msgid "Buffer merge improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:248
+#: ../src/uisupport/aboutdata.cpp:275 ../src/uisupport/aboutdata.cpp:327
+#: ../src/uisupport/aboutdata.cpp:328 ../src/uisupport/aboutdata.cpp:334
+#: ../src/uisupport/aboutdata.cpp:335
+msgctxt "AboutData|"
+msgid "Greek translation"
+msgstr "Griechische Übersetzung"
+
+#: ../src/uisupport/aboutdata.cpp:278
 msgctxt "AboutData|"
 msgid "OSX improvements"
 msgstr "OSX Verbesserungen"
 
-#: ../src/uisupport/aboutdata.cpp:249
+#: ../src/uisupport/aboutdata.cpp:279
 msgctxt "AboutData|"
 msgid "Lithuanian translation"
 msgstr "Litauische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:250
+#: ../src/uisupport/aboutdata.cpp:280
 msgctxt "AboutData|"
 msgid "Documentation fixes"
-msgstr ""
+msgstr "Dokumentationskorrektur"
 
-#: ../src/uisupport/aboutdata.cpp:252
+#: ../src/uisupport/aboutdata.cpp:283 ../src/uisupport/aboutdata.cpp:316
+msgctxt "AboutData|"
+msgid "Improvements"
+msgstr "Verbesserungen"
+
+#: ../src/uisupport/aboutdata.cpp:284
 msgctxt "AboutData|"
 msgid "Ideas, hacking, initial motivation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:255
+#: ../src/uisupport/aboutdata.cpp:287
 msgctxt "AboutData|"
-msgid "Core and other fixes, QuasselDroid"
+msgid "Many fixes and improvements, Sonnet support, QuasselDroid"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:258
+#: ../src/uisupport/aboutdata.cpp:291
 msgctxt "AboutData|"
 msgid "German translation, fixes"
 msgstr "Deutsche Übersetzung, Fehlerbehebung"
 
-#: ../src/uisupport/aboutdata.cpp:260
+#: ../src/uisupport/aboutdata.cpp:293
 msgctxt "AboutData|"
-msgid "Many fixes and improvements; Ubuntu live packages"
+msgid "Many fixes and improvements; Ubuntu PPAs"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:262
+#: ../src/uisupport/aboutdata.cpp:296
 msgctxt "AboutData|"
 msgid "Tons of Oxygen icons including the Quassel logo"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:264
-msgctxt "AboutData|"
-msgid "MinGW support, SNORE backend, Windows packaging"
-msgstr ""
-
-#: ../src/uisupport/aboutdata.cpp:265
+#: ../src/uisupport/aboutdata.cpp:298
 msgctxt "AboutData|"
 msgid "Initial design and main window layout"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:266
+#: ../src/uisupport/aboutdata.cpp:299
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:267
-msgctxt "AboutData|"
-msgid "Danish translation"
-msgstr "Dänische Übersetzung"
-
-#: ../src/uisupport/aboutdata.cpp:268
+#: ../src/uisupport/aboutdata.cpp:302
 msgctxt "AboutData|"
 msgid "Linewrap for input line"
 msgstr "Zeilenumbruch für die Eingabezeile"
 
-#: ../src/uisupport/aboutdata.cpp:269
+#: ../src/uisupport/aboutdata.cpp:303
+msgctxt "AboutData|"
+msgid "Performance improvements and cleanups"
+msgstr "Performance-Verbesserungen und Aufräumarbeiten"
+
+#: ../src/uisupport/aboutdata.cpp:305
 msgctxt "AboutData|"
 msgid "/print command"
 msgstr "/print Befehl"
 
-#: ../src/uisupport/aboutdata.cpp:272
+#: ../src/uisupport/aboutdata.cpp:306
 msgctxt "AboutData|"
-msgid "Build system fixes"
+msgid "Performance improvements"
+msgstr "Performance-Verbesserung"
+
+#: ../src/uisupport/aboutdata.cpp:308
+msgctxt "AboutData|"
+msgid "Hindi and Marathi translations"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:313
+msgctxt "AboutData|"
+msgid ""
+"Windows build support, automated OSX builds in Travis, various improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:274
+#: ../src/uisupport/aboutdata.cpp:315
 msgctxt "AboutData|"
 msgid "Emacs keybindings"
 msgstr "Emacs-Tastaturbefehle"
 
-#: ../src/uisupport/aboutdata.cpp:275
+#: ../src/uisupport/aboutdata.cpp:318
 msgctxt "AboutData|"
 msgid "Highlight configuration improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:276
+#: ../src/uisupport/aboutdata.cpp:319
 msgctxt "AboutData|"
-msgid "Kubuntu packager, (packaging/build system) bughunter"
+msgid "Debian/Kubuntu packager, (packaging/build system) bughunter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:278
+#: ../src/uisupport/aboutdata.cpp:320
+msgctxt "AboutData|"
+msgid "Bugfixes, German translation"
+msgstr "Fehlerkorrektur, Deutsche Übersetzung"
+
+#: ../src/uisupport/aboutdata.cpp:321
 msgctxt "AboutData|"
 msgid "Audio backend improvements"
 msgstr "Verbesserung des Audio Backends"
 
-#: ../src/uisupport/aboutdata.cpp:280
+#: ../src/uisupport/aboutdata.cpp:324
 msgctxt "AboutData|"
-msgid "Dutch translation"
-msgstr "Niederländische Übersetzung"
+msgid "Chinese translation"
+msgstr "Chinesische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:282 ../src/uisupport/aboutdata.cpp:283
-#: ../src/uisupport/aboutdata.cpp:288 ../src/uisupport/aboutdata.cpp:289
+#: ../src/uisupport/aboutdata.cpp:325
 msgctxt "AboutData|"
-msgid "Greek translation"
-msgstr "Griechische Übersetzung"
+msgid "Dutch translation"
+msgstr "Niederländische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:286
+#: ../src/uisupport/aboutdata.cpp:329 ../src/uisupport/aboutdata.cpp:332
 msgctxt "AboutData|"
 msgid "Korean translation"
 msgstr "Koreanische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:287
+#: ../src/uisupport/aboutdata.cpp:331
+msgctxt "AboutData|"
+msgid "Alias improvements"
+msgstr "Alias Verbesserungen"
+
+#: ../src/uisupport/aboutdata.cpp:333
 msgctxt "AboutData|"
 msgid "Norwegian translation, documentation"
 msgstr "Norwegische Übersetzung, Dokumentation"
 
-#: ../src/uisupport/aboutdata.cpp:290
+#: ../src/uisupport/aboutdata.cpp:336
 msgctxt "AboutData|"
 msgid "Former Windows builder"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:291
+#: ../src/uisupport/aboutdata.cpp:337
 msgctxt "AboutData|"
 msgid "Fixes, Debian packaging"
-msgstr ""
+msgstr "Korrekturen, Debian-Paket"
 
-#: ../src/uisupport/aboutdata.cpp:292
+#: ../src/uisupport/aboutdata.cpp:338
 msgctxt "AboutData|"
 msgid "Fixes and feedback"
-msgstr ""
+msgstr "Korrekturen und Rückmeldung"
 
-#: ../src/uisupport/aboutdata.cpp:294 ../src/uisupport/aboutdata.cpp:295
-msgctxt "AboutData|"
-msgid "Czech translation"
-msgstr "Tschechische Übersetzung"
-
-#: ../src/uisupport/aboutdata.cpp:297
+#: ../src/uisupport/aboutdata.cpp:348
 msgctxt "AboutData|"
 msgid "Network detection improvements"
 msgstr "Verbesserung der Netzwerkerkennung"
 
-#: ../src/uisupport/aboutdata.cpp:298
+#: ../src/uisupport/aboutdata.cpp:349
 msgctxt "AboutData|"
 msgid "Ukrainian translation"
 msgstr "Ukrainische Übersetzung"
 
-#: ../src/uisupport/aboutdata.cpp:299
+#: ../src/uisupport/aboutdata.cpp:350
 msgctxt "AboutData|"
 msgid "Portuguese translation"
 msgstr "Portugiesische Übersetzung"
@@ -532,77 +650,105 @@ msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr "&Dank an"
 
-#: ../src/qtui/aboutdlg.cpp:38
+#: ../src/qtui/aboutdlg.cpp:44
+msgctxt "AboutDlg|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:50
 #, qt-format
 msgctxt "AboutDlg|"
-msgid "<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>Kompiliert:</b> %3"
+msgid ""
+"<b>Version:</b> %1<br><b>Version date:</b> %2<br><b>Protocol version:</b> %3"
+msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:54
+#: ../src/qtui/aboutdlg.cpp:67
 #, qt-format
 msgctxt "AboutDlg|"
 msgid ""
 "<b>A modern, distributed IRC Client</b><br><br>&copy;%1 by the Quassel "
-"Project<br><a href=\"http://quassel-irc.org\">http://quassel-"
+"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>Ein moderner, dezentralisierter IRC-Client</b><br><br>&copy;%1 durch das Quassel Projekt<br><a href=\"http://quassel-irc.org\">http://quassel-irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> auf <a href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC ist dual-lizenziert <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> und <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Die meisten der Icons sind &copy; durch das <a href=\"http://www.oxygen-icons.org\">Oxygen Team</a> und werden unter der <a href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a> benutzt.<br><br>Bitte benutzen Sie <a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> um Fehler zu melden."
+msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:72
+#: ../src/qtui/aboutdlg.cpp:87
 msgctxt "AboutDlg|"
 msgid "Quassel IRC is mainly developed by:"
 msgstr "Quassel IRC wird hauptsächlich entwickelt von:"
 
-#: ../src/qtui/aboutdlg.cpp:87
+#: ../src/qtui/aboutdlg.cpp:101
 msgctxt "AboutDlg|"
 msgid ""
 "We would like to thank the following contributors (in alphabetical order) "
 "and everybody we forgot to mention here:"
 msgstr "Wir danken hier den folgenden Mitwirkenden (in alphabetischer Reihenfolge) und all jenen, die wir vergessen haben zu erwähnen:"
 
-#: ../src/qtui/aboutdlg.cpp:91
+#: ../src/qtui/aboutdlg.cpp:105
 msgctxt "AboutDlg|"
 msgid ""
 "...and anybody else finding and reporting bugs, giving feedback, helping "
 "others and being part of the community!"
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:100
+#: ../src/qtui/aboutdlg.cpp:112
+msgctxt "AboutDlg|"
+msgid "Special thanks goes to:"
+msgstr "Besonderen Gang gilt:"
+
+#: ../src/qtui/aboutdlg.cpp:116
+msgctxt "AboutDlg|"
+msgid "for the original Quassel logo - The All-Seeing Eye"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:120
+msgctxt "AboutDlg|"
+msgid "for the Oxygen Quassel logo"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:124
+msgctxt "AboutDlg|"
+msgid "for the amazing Breeze and Oxygen icon themes"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:128
 msgctxt "AboutDlg|"
 msgid ""
-"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"
-"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd><i>for the original Quassel"
-" icon - The All-Seeing Eye</i><br></dt><dt><img "
-"src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-"
-"icons.org\">The Oxygen Team</a></b></dt><dd><i>for creating all the artwork "
-"you see throughout Quassel</i><br></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><i>for creating Qt and Qtopia, "
-"and for sponsoring development of QuasselTopia with Greenphones and "
-"more</i><br></dd><dt><a href=\"http://www.nokia.com\"><img "
-"src=\":/pics/nokia.png\"></a></b></dt><dd><i>for sponsoring development of "
-"Quassel Mobile with N810s</i></dd>"
+"for creating an awesome framework, and for sponsoring development with "
+"Greenphones, N810s, N950s and more"
 msgstr ""
 
-#: ../src/core/abstractsqlstorage.cpp:127
+#: ../src/core/abstractsqlstorage.cpp:142
 #, qt-format
 msgctxt "AbstractSqlStorage|"
 msgid ""
-"Installed Schema (version %1) is not up to date. Upgrading to version %2..."
-msgstr "Installiertes Datenbankschema (Version %1) is nicht aktuell. Aktualisiere auf 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 ""
 
-#: ../src/core/abstractsqlstorage.cpp:129
+#: ../src/core/abstractsqlstorage.cpp:149
 msgctxt "AbstractSqlStorage|"
 msgid "Upgrade failed..."
 msgstr "Upgrade fehlgeschlagen..."
 
+#: ../src/core/abstractsqlstorage.cpp:154
+#, qt-format
+msgctxt "AbstractSqlStorage|"
+msgid "Installed database schema successfully upgraded to version %1."
+msgstr ""
+
 #: ../src/qtui/settingspages/aliasesmodel.cpp:57
 msgctxt "AliasesModel|"
 msgid ""
@@ -610,28 +756,113 @@ msgid ""
 "command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
 msgstr "<b>Kurzbefehl des Alias</b><br />Kann als normaler Slash-Befehl verwendet werden.<br /><br /><b>Beispiel:</b> Der Alias \"foo\" wird mit /foo ausgeführt."
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:61
+#: ../src/qtui/settingspages/aliasesmodel.cpp:82
+msgctxt "AliasesModel|"
+msgid "The string the shortcut will be expanded to"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:85
+msgctxt "AliasesModel|"
+msgid "Special variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:91
+msgctxt "AliasesModel|"
+msgid "Parameter variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:92
+msgctxt "AliasesModel|"
+msgid "i'th parameter"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:93
+msgctxt "AliasesModel|"
+msgid "i'th to j'th parameter separated by spaces"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:94
+msgctxt "AliasesModel|"
+msgid "all parameters from i on separated by spaces"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:97
+msgctxt "AliasesModel|"
+msgid "Nickname parameter variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:99
 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"
-msgstr "<b>Der Befehl, zudem der Alias erweitert wird</b><br /><b> Besondere Variablen:</b><br /> - <b>$i</b> steht für den i-ten Parameter.<br /> - <b>$i..j</b> steht für den i-ten bis zum j-ten Parameter, mit Leerzeichen getrennt.<br /> - <b>$i..</b> steht für alle Parameter ab dem i-ten, mit Leerzeichen getrennt.<br /> - <b>$i:hostname</b> steht für den Hostnamen des Bentuzers, der im i-ten Parameter übergeben wird oder * falls es unbekannt ist.<br /> - <b>$0</b> steht für die gesamte Zeichenkette.<br /> - <b>$nick</b> steht für Ihren momentanen Spitznamen.<br /> - <b>$channel</b> steht für den Namen des momentan ausgewählten Chats.<br /><br />Mehrere Befehle können mit Strichkommata getrennt werden.<br /><br /><b>Beispiel:</b> \"Test $1; Test $2; Test All $0\" wird erweitert zu den drei getrennten Meldungen \"Test 1\", \"Test 2\" und \"Test All 1 2 3\", wenn /test 1 2 3 aufgerufen wird."
-
-#: ../src/qtui/settingspages/aliasesmodel.cpp:185
+"account of user identified by i'th parameter, or a '*' if logged out or "
+"unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:102
+msgctxt "AliasesModel|"
+msgid "hostname of user identified by i'th parameter, or a '*' if unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:104
+msgctxt "AliasesModel|"
+msgid "ident of user identified by i'th parameter, or a '*' if unknown"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:106
+msgctxt "AliasesModel|"
+msgid ""
+"ident of user identified by i'th parameter if verified, or a '*' if unknown "
+"or unverified (prefixed with '~')"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:110
+msgctxt "AliasesModel|"
+msgid "General variables"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:111
+msgctxt "AliasesModel|"
+msgid "the whole string"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
+msgctxt "AliasesModel|"
+msgid "your current nickname"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:113
+msgctxt "AliasesModel|"
+msgid "the name of the selected channel"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:120
+msgctxt "AliasesModel|"
+msgid "Multiple commands can be separated with semicolons"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:124
+msgctxt "AliasesModel|"
+msgid "Example:"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:124
+msgctxt "AliasesModel|"
+msgid "\"Test $1; Test $2; Test All $0\""
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:125
+msgctxt "AliasesModel|"
+msgid ""
+"...will be expanded to three separate messages \"Test 1\", \"Test 2\" and "
+"\"Test All 1 2 3\" when called like <i>/test 1 2 3</i>"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:246
 msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr "Alias"
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:186
+#: ../src/qtui/settingspages/aliasesmodel.cpp:247
 msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr "Erweiterung"
@@ -651,12 +882,12 @@ msgctxt "AliasesSettingsPage|"
 msgid "Delete"
 msgstr "Löschen"
 
-#: ../src/qtui/settingspages/aliasessettingspage.cpp:28
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
 msgctxt "AliasesSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/settingspages/aliasessettingspage.cpp:28
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
 msgctxt "AliasesSettingsPage|"
 msgid "Aliases"
 msgstr "Aliase"
@@ -668,106 +899,138 @@ msgstr "Formular"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgctxt "AppearanceSettingsPage|"
-msgid "Client style:"
-msgstr "Client-Stil:"
-
-#: ../src/qtui/settingspages/appearancesettingspage.ui:29
-msgctxt "AppearanceSettingsPage|"
-msgid "Set application style"
-msgstr "Anwendungsstil ändern"
-
-#: ../src/qtui/settingspages/appearancesettingspage.ui:36
-msgctxt "AppearanceSettingsPage|"
 msgid "Language:"
 msgstr "Sprache:"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:43
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgctxt "AppearanceSettingsPage|"
 msgid "Set the application language. Requires restart!"
 msgstr "Sprache für die Anwendung ändern. Erfordert Neustart!"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+#: ../src/qtui/settingspages/appearancesettingspage.ui:33
 msgctxt "AppearanceSettingsPage|"
 msgid "<Untranslated>"
 msgstr "<Unübersetzt>"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:52
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:76
+#: ../src/qtui/settingspages/appearancesettingspage.ui:38
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:86
 msgctxt "AppearanceSettingsPage|"
 msgid "<System Default>"
 msgstr "<Systemstandard>"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:75
+#: ../src/qtui/settingspages/appearancesettingspage.ui:59
 msgctxt "AppearanceSettingsPage|"
-msgid "Use custom stylesheet"
-msgstr "Eine benutzerdefinierte Layoutdatei verwenden"
+msgid "Widget style:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:66
+msgctxt "AppearanceSettingsPage|"
+msgid "Set application style"
+msgstr "Anwendungsstil ändern"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:109
+#: ../src/qtui/settingspages/appearancesettingspage.ui:73
 msgctxt "AppearanceSettingsPage|"
-msgid "Path:"
-msgstr "Pfad:"
+msgid "Fallback icon theme:"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:141
+#: ../src/qtui/settingspages/appearancesettingspage.ui:80
+msgctxt "AppearanceSettingsPage|"
+msgid ""
+"<html><head/><body><p>Icon theme to use for icons that are not found in the "
+"current system theme. Requires the selected theme to be installed either "
+"system-wide, or as part of the Quassel installation.</p><p>Supported themes "
+"are Breeze, Breeze Dark and Oxygen, all of KDE fame.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:87
+msgctxt "AppearanceSettingsPage|"
+msgid ""
+"<html><head/><body><p>If enabled, uses the selected fallback icon theme "
+"instead of the configured system theme for all icons. Recommended if you "
+"want Quassel to have a consistent look-and-feel.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:90
+msgctxt "AppearanceSettingsPage|"
+msgid "Override system theme"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:110
+msgctxt "AppearanceSettingsPage|"
+msgid "Use custom stylesheet"
+msgstr "Eine benutzerdefinierte Layoutdatei verwenden"
+
+#: ../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 "Systemleistensymbol zeigen"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:184
+#: ../src/qtui/settingspages/appearancesettingspage.ui:188
 msgctxt "AppearanceSettingsPage|"
-msgid "Hide to tray on close button"
-msgstr "In die Systemleiste minimieren bei \"Schließen\""
+msgid "Invert brightness"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:216
+#: ../src/qtui/settingspages/appearancesettingspage.ui:233
 msgctxt "AppearanceSettingsPage|"
-msgid "Enable animations"
-msgstr "Animationen verwenden"
+msgid "Hide to tray on close button"
+msgstr "In die Systemleiste minimieren bei \"Schließen\""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:231
+#: ../src/qtui/settingspages/appearancesettingspage.ui:248
 msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
 msgstr "Nachrichtenumlenkung"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:237
+#: ../src/qtui/settingspages/appearancesettingspage.ui:257
 msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr "Benutzernotizen:"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:280
+#: ../src/qtui/settingspages/appearancesettingspage.ui:300
 msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
 msgstr "Servernotizen:"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:294
+#: ../src/qtui/settingspages/appearancesettingspage.ui:314
 msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
 msgstr "Standardziel"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:301
+#: ../src/qtui/settingspages/appearancesettingspage.ui:321
 msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr "Statusfenster"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:308
+#: ../src/qtui/settingspages/appearancesettingspage.ui:328
 msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
 msgstr "Aktueller Chat"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:315
+#: ../src/qtui/settingspages/appearancesettingspage.ui:335
 msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr "Fehler:"
 
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:36
 msgctxt "AppearanceSettingsPage|"
 msgid "Interface"
 msgstr "Oberfläche"
 
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:242
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:51
+msgctxt "AppearanceSettingsPage|"
+msgid "Icon theme:"
+msgstr "Symbol Desgin:"
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:115
+msgctxt "AppearanceSettingsPage|"
+msgid "Automatic"
+msgstr "Automatisch"
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:294
 msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
 msgstr "Bitte wählen Sie eine Layoutdatei"
@@ -834,9 +1097,9 @@ msgstr "Die einfachste Methode: Eine feste Anzahl Zeilen wird für jeden Chat an
 #: ../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 "Anzahl der Nachrichten pro Fenster, die nach dem Core-Verbindungsaufbau angefordert werden."
+msgstr ""
 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:141
 msgctxt "BacklogSettingsPage|"
@@ -902,28 +1165,28 @@ msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr "Maximale Anzahl der Nachrichten die für alle Fenster angefordert werden."
 
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:30
 msgctxt "BacklogSettingsPage|"
 msgid "Interface"
 msgstr "Oberfläche"
 
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:30
 msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 msgstr "Verlaufsempfänger"
 
-#: ../src/client/networkmodel.cpp:401
+#: ../src/client/networkmodel.cpp:480
 #, qt-format
 msgctxt "BufferItem|"
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
-#: ../src/uisupport/bufferview.cpp:268
+#: ../src/uisupport/bufferview.cpp:267
 msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr "Chats permanent zusammenführen?"
 
-#: ../src/uisupport/bufferview.cpp:269
+#: ../src/uisupport/bufferview.cpp:268
 #, qt-format
 msgctxt "BufferView|"
 msgid ""
@@ -931,6 +1194,11 @@ msgid ""
 " This cannot be reversed!"
 msgstr "Wollen Sie den Chat \"%1\" permanent mit dem Chat \"%2\" zusammenfügen?\nDiese Aktion kann nicht rückgängig gemacht werden!"
 
+#: ../src/uisupport/bufferview.cpp:715
+msgctxt "BufferViewDock|"
+msgid "Search..."
+msgstr "Suche..."
+
 #: ../src/qtui/settingspages/buffervieweditdlg.ui:14
 msgctxt "BufferViewEditDlg|"
 msgid "Dialog"
@@ -941,12 +1209,12 @@ msgctxt "BufferViewEditDlg|"
 msgid "Please enter a name for the chat list:"
 msgstr "Bitte geben Sie einen Namen für die Chat-Liste an:"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:585
 msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr "Eine Chat-Liste hinzufügen"
 
-#: ../src/uisupport/bufferviewfilter.cpp:53
+#: ../src/uisupport/bufferviewfilter.cpp:46
 msgctxt "BufferViewFilter|"
 msgid "Show / Hide Chats"
 msgstr "Chats zeigen/verstecken"
@@ -982,7 +1250,7 @@ msgid "Network:"
 msgstr "Netzwerk:"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:129
 msgctxt "BufferViewSettingsPage|"
 msgid "All"
 msgstr "Alle"
@@ -1031,30 +1299,35 @@ msgstr "Alphabetisch sortieren"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:163
 msgctxt "BufferViewSettingsPage|"
+msgid "Show search"
+msgstr "Zeige Suche"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:170
+msgctxt "BufferViewSettingsPage|"
 msgid "Minimum Activity:"
 msgstr "Aktivitätsminimum:"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:171
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:178
 msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
 msgstr "Keine Aktivität"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:176
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:183
 msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
 msgstr "Andere Aktivitität"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:181
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:188
 msgctxt "BufferViewSettingsPage|"
 msgid "New Message"
 msgstr "Neue Meldung"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:186
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:193
 msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
 msgstr "Hervorhebung"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:212
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:219
 msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr "Vorschau:"
@@ -1069,12 +1342,12 @@ msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
 msgstr "Spezielle Chat-Listen"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:383
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
 msgctxt "BufferViewSettingsPage|"
 msgid "Delete Chat List?"
 msgstr "Chat-Liste löschen?"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:385
 #, qt-format
 msgctxt "BufferViewSettingsPage|"
 msgid "Do you really want to delete the chat list \"%1\"?"
@@ -1110,40 +1383,31 @@ msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr "Zur Markierungslinie springen"
 
-#: ../src/client/networkmodel.cpp:583 ../src/client/networkmodel.cpp:585
-#, qt-format
-msgctxt "ChannelBufferItem|"
-msgid "<b>Channel %1</b>"
-msgstr "<b>Kanal %1</b>"
-
-#: ../src/client/networkmodel.cpp:589
+#: ../src/client/networkmodel.cpp:776
 #, qt-format
 msgctxt "ChannelBufferItem|"
-msgid "<b>Users:</b> %1"
-msgstr "<b>Benutzer:</b> %1"
+msgid "Channel %1"
+msgstr "Kanal %1"
 
-#: ../src/client/networkmodel.cpp:593
-#, qt-format
+#: ../src/client/networkmodel.cpp:780
 msgctxt "ChannelBufferItem|"
-msgid "<b>Mode:</b> %1"
-msgstr "<b>Modus:</b> %1"
+msgid "Users"
+msgstr "Benutzer"
 
-#: ../src/client/networkmodel.cpp:608
-#, qt-format
+#: ../src/client/networkmodel.cpp:785
 msgctxt "ChannelBufferItem|"
-msgid "<b>Topic:</b> %1"
-msgstr "<b>Thema:</b> %1"
+msgid "Mode"
+msgstr "Modus"
 
-#: ../src/client/networkmodel.cpp:613
+#: ../src/client/networkmodel.cpp:795
 msgctxt "ChannelBufferItem|"
-msgid "Not active <br /> Double-click to join"
-msgstr "Nicht aktiv <br /> Doppelklick zum Betreten"
+msgid "Topic"
+msgstr "Thema"
 
-#: ../src/client/networkmodel.cpp:616
-#, qt-format
+#: ../src/client/networkmodel.cpp:801
 msgctxt "ChannelBufferItem|"
-msgid "<p> %1 </p>"
-msgstr "<p> %1 </p>"
+msgid "Not active, double-click to join"
+msgstr "Nicht aktiv, Doppelklick zum Beitreten"
 
 #: ../src/qtui/ui/channellistdlg.ui:14
 msgctxt "ChannelListDlg|"
@@ -1226,7 +1490,7 @@ msgid "Move selected buffers to the right"
 msgstr "Verschiebe ausgewählte Fenster nach rechts"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:273
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:285
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr "Anzeigen:"
@@ -1247,87 +1511,248 @@ msgctxt "ChatMonitorSettingsPage|"
 msgid "Show own messages"
 msgstr "Eigene Nachrichten anzeigen"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:164
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:182
+msgctxt "ChatMonitorSettingsPage|"
+msgid ""
+"Show own messages in chatmonitor even if the originating buffer is ignored"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:185
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Include ignored buffers"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:194
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Display messages from backlog on reconnect"
 msgstr "Nachrichten aus dem Verlauf beim Wiederverbinden anzeigen"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:167
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:197
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show messages from backlog"
 msgstr "Nachrichten aus dem Verlauf anzeigen"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:192
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:222
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages from backlog on reconnect"
 msgstr "Gelesene Nachrichten beim Wiederverbinden aus dem Verlauf einbinden."
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:195
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:225
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages"
 msgstr "Gelesene Nachrichten einbinden."
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Interface"
 msgstr "Oberfläche"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr "Chatmonitor"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr "Ausgewählte zulassen"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:61
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr "Ausgewählte ignorieren"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:276
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:288
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr "Ignorieren:"
 
-#: ../src/qtui/chatmonitorview.cpp:54
+#: ../src/qtui/chatmonitorview.cpp:57
 msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
 msgstr "Eigene Nachrichten anzeigen"
 
-#: ../src/qtui/chatmonitorview.cpp:61
+#: ../src/qtui/chatmonitorview.cpp:64
 msgctxt "ChatMonitorView|"
 msgid "Show Network Name"
 msgstr "Netzwerknamen zeigen"
 
-#: ../src/qtui/chatmonitorview.cpp:66
+#: ../src/qtui/chatmonitorview.cpp:69
 msgctxt "ChatMonitorView|"
 msgid "Show Buffer Name"
 msgstr "Fensternamen zeigen"
 
-#: ../src/qtui/chatmonitorview.cpp:73
+#: ../src/qtui/chatmonitorview.cpp:76
 msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr "Konfigurieren..."
 
-#: ../src/qtui/chatscene.cpp:826
+#: ../src/qtui/chatscene.cpp:840
 msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr "Auswahl kopieren"
 
-#: ../src/qtui/chatscene.cpp:833
+#: ../src/qtui/chatscene.cpp:847
 #, qt-format
 msgctxt "ChatScene|"
 msgid "Search '%1'"
 msgstr "Suche '%1'"
 
-#: ../src/qtui/chatscene.cpp:845
+#: ../src/qtui/chatscene.cpp:859
 msgctxt "ChatScene|"
 msgid "Reset Column Widths"
 msgstr "Spaltenbreiten zurücksetzen"
 
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:14
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Form"
+msgstr "Formular"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:20
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Show colored text in the chat window"
+msgstr "Farbigen Text im Chat anzeigen"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:23
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Allow colored text (mIRC color codes)"
+msgstr "Farbigen Text erlauben (mIRC-Farbcode)"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:39
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Custom Colors"
+msgstr "Benutzerdefinierte Farben"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:60
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Action:"
+msgstr "Aktion:"
+
+#: ../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 "Zeitstempel:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:108
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Channel message:"
+msgstr "Chat-Nachricht:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:148
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight foreground:"
+msgstr "Vordergrundfarbe für Hervorhebungen:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:172
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Command message:"
+msgstr "Befehls-Nachricht:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:196
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight background:"
+msgstr "Hintergrundfarbe für Hervorhebungen:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:203
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Server message:"
+msgstr "Server-Nachricht:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:227
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Marker line:"
+msgstr "Markierungslinie:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:251
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Error message:"
+msgstr "Fehlermeldung:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:275
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Background:"
+msgstr "Hintergrund:"
+
+#: ../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 "Absendernamen färben"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:650
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Own messages:"
+msgstr "Eigene Nachrichten:"
+
+#: ../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 "Färbe Absender in Aktionsnachrichten"
+
+#: ../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 "Färbe Benutzernamen in anderen Nachrichten"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Interface"
+msgstr "Oberfläche"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Chat View Colors"
+msgstr "Chat-Ansicht Farbe"
+
 #: ../src/qtui/ui/chatviewsearchbar.ui:13
 msgctxt "ChatViewSearchBar|"
 msgid "Form"
@@ -1367,10 +1792,15 @@ msgstr "Formular"
 
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:22
 msgctxt "ChatViewSettingsPage|"
-msgid "Timestamp format:"
-msgstr "Zeitstempel-Format:"
+msgid "Use a custom format for the timestamp"
+msgstr "Nutze ein benutzerdefiniertes Format für den Zeitstempel"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:25
+msgctxt "ChatViewSettingsPage|"
+msgid "Custom timestamp format:"
+msgstr "Benutzerdefiniertes Zeitstempel-Format:"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:29
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:41
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "<html><head/><body><p>Usage examples:</p>\n"
@@ -1383,67 +1813,83 @@ msgid ""
 "</body></html>"
 msgstr "<html><head/><body><p>Anwendungsbeispiele:</p>⏎ <table cellpadding=\"2\">⏎ <tr><td>dd.MM.yyyy</td><td>21.05.2001</td></tr>⏎ <tr><td>ddd MMMM d yy</td><td>Tue May 21 01</td></tr>⏎ <tr><td>hh:mm:ss.zzz</td><td>14:13:09.042</td></tr>⏎ <tr><td>h:m:s ap</td><td>2:13:9 pm</td></tr>⏎ </table>⏎ </body></html>"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:42
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:54
 msgctxt "ChatViewSettingsPage|"
-msgid "[hh:mm:ss]"
-msgstr "[hh:mm:ss]"
+msgid " hh:mm:ss"
+msgstr "hh:mm:ss"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:69
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:79
 msgctxt "ChatViewSettingsPage|"
-msgid "Custom chat window font:"
-msgstr "Benutzerdefinierte Schriftart für das Chat-Fenster:"
+msgid "Shows <brackets> around the names of senders"
+msgstr "Zeige <brackets>um den Absendernamen"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:102
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:82
 msgctxt "ChatViewSettingsPage|"
-msgid "Show colored text in the chat window"
-msgstr "Farbigen Text im Chat anzeigen"
+msgid "Show brackets around sender names"
+msgstr "Zeige Klammern um den Absendernamen"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:105
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:100
 msgctxt "ChatViewSettingsPage|"
-msgid "Allow colored text (mIRC color codes)"
-msgstr "Farbigen Text erlauben (mIRC-Farbcode)"
+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 "Benutzerdefinierte Schriftart für das Chat-Fenster:"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:121
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:175
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Show a website preview window when hovering the mouse over a web address"
 msgstr "Webseitenvorschau beim Hovern mit der Maus über eine Webadresse zeigen"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:124
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:178
 msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr "Vorschau von Webseiten beim Hovern über URLs zeigen"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:140
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:194
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Set the marker line to the bottom of the current chat window when selecting "
 "another channel"
 msgstr "Setze die Markierungslinie auf das Ende des aktuellen Chats beim Wechsel zu einem anderen Kanal"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:143
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:197
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when switching chats"
 msgstr "Setze die Markierungslinie automatisch beim Wechsel der Fenster"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:159
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:213
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Set the marker line to the bottom of the current chat window when Quassel "
 "loses focus."
 msgstr "Setze die Markierungslinie auf das Ende des aktuellen Chats wenn Quassel nicht mehr fokussiert ist."
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:162
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:216
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when Quassel loses focus"
 msgstr "Setze die Markierungslinie automatisch wenn Quassel nicht mehr fokussiert ist"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:180
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:234
 msgctxt "ChatViewSettingsPage|"
-msgid "Web Search Url:"
-msgstr "Websuche-URL:"
+msgid "Web Search URL:"
+msgstr "Websuche URL:"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:187
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:241
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "<html><head/><body><p>The URL to open with the selected text as the "
@@ -1453,187 +1899,118 @@ msgid ""
 "style=\" font-weight:600;\">%s</span></p></body></html>"
 msgstr "<html><head/><body><p>Die URL, die mit dem ausgewählten Text als Parameter geöffnet wird. Schreiben Sie <span style=\" font-weight:600;\">%s</span> an die Stelle, an die der ausgewählte Text gesetzt werden soll.</p><p>Z.B.:</p><p>https://www.google.com/search?q=<span style=\" font-weight:600;\">%s<br/></span>https://duckduckgo.com/?q=<span style=\" font-weight:600;\">%s</span></p></body></html>"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:247
 msgctxt "ChatViewSettingsPage|"
 msgid "https://www.google.com/search?q=%s"
 msgstr "https://www.google.com/search?q=%s"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:202
-msgctxt "ChatViewSettingsPage|"
-msgid "Custom Colors"
-msgstr "Benutzerdefinierte Farben"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:220
-msgctxt "ChatViewSettingsPage|"
-msgid "Action:"
-msgstr "Aktion:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:227
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:251
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:275
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:312
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:336
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:367
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:391
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:415
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:439
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:456
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:496
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:513
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:530
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:547
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:564
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:581
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:598
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:615
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:632
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:649
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:666
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:683
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:700
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:717
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:734
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:751
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:779
-msgctxt "ChatViewSettingsPage|"
-msgid "..."
-msgstr "…"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:244
-msgctxt "ChatViewSettingsPage|"
-msgid "Timestamp:"
-msgstr "Zeitstempel:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:268
-msgctxt "ChatViewSettingsPage|"
-msgid "Channel message:"
-msgstr "Chat-Nachricht:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:305
-msgctxt "ChatViewSettingsPage|"
-msgid "Highlight foreground:"
-msgstr "Vordergrundfarbe für Hervorhebungen:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:329
-msgctxt "ChatViewSettingsPage|"
-msgid "Command message:"
-msgstr "Befehls-Nachricht:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:353
-msgctxt "ChatViewSettingsPage|"
-msgid "Highlight background:"
-msgstr "Hintergrundfarbe für Hervorhebungen:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:360
-msgctxt "ChatViewSettingsPage|"
-msgid "Server message:"
-msgstr "Server-Nachricht:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:384
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:29
 msgctxt "ChatViewSettingsPage|"
-msgid "Marker line:"
-msgstr "Markierungslinie:"
+msgid "Interface"
+msgstr "Oberfläche"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:408
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:29
 msgctxt "ChatViewSettingsPage|"
-msgid "Error message:"
-msgstr "Fehlermeldung:"
+msgid "Chat View"
+msgstr "Chat-Ansicht"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:432
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:43
 msgctxt "ChatViewSettingsPage|"
-msgid "Background:"
-msgstr "Hintergrund:"
+msgid "You need at least version 0.6 of Quassel Core to use this feature"
+msgstr "Du benötigst mindestens Version 0.6 von Quassel Core, um das Feature zu nutzen"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:476
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:54
 msgctxt "ChatViewSettingsPage|"
-msgid "Use Sender Coloring"
-msgstr "Absendernamen färben"
+msgid "Your Quassel core does not support this feature"
+msgstr "Dein Quassel Core unterstützt dieses Leistungsmerkmal nicht"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:772
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:55
 msgctxt "ChatViewSettingsPage|"
-msgid "Own messages:"
-msgstr "Eigene Nachrichten:"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to show sender modes "
+"before nicknames."
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:68
 msgctxt "ChatViewSettingsPage|"
-msgid "Interface"
-msgstr "Oberfläche"
+msgid "No modes"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:70
 msgctxt "ChatViewSettingsPage|"
-msgid "Chat View"
-msgstr "Chat-Ansicht"
+msgid "Highest mode"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:72
 msgctxt "ChatViewSettingsPage|"
-msgid "You need at least version 0.6 of quasselcore to use this feature"
-msgstr "Sie benötigen quasselcore mit Version 0.6 um dieses Feature nutzen zu können"
+msgid "All modes"
+msgstr ""
 
 #: ../src/common/qt5cliparser.cpp:30
 msgctxt "CliParser|"
 msgid "Quassel IRC is a modern, distributed IRC client."
-msgstr ""
+msgstr "Quassel IRC ist ein moderner, verteilter IRC-Client"
 
-#: ../src/client/client.cpp:324
+#: ../src/client/client.cpp:354
 msgctxt "Client|"
 msgid "Identity already exists in client!"
 msgstr "Identität im Client schon vorhanden!"
 
-#: ../src/client/clientauthhandler.cpp:65
-#: ../src/client/clientauthhandler.cpp:472
+#: ../src/client/clientauthhandler.cpp:76
+#: ../src/client/clientauthhandler.cpp:525
 msgctxt "ClientAuthHandler|"
 msgid "Unencrypted connection canceled"
 msgstr "Gesicherte Verbindung abgebrochen"
 
-#: ../src/client/clientauthhandler.cpp:87
-#: ../src/client/clientauthhandler.cpp:103
+#: ../src/client/clientauthhandler.cpp:109
+#: ../src/client/clientauthhandler.cpp:125
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Connecting to %1..."
 msgstr "Verbinde mit %1..."
 
-#: ../src/client/clientauthhandler.cpp:99
+#: ../src/client/clientauthhandler.cpp:121
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Looking up %1..."
 msgstr "Suche %1..."
 
-#: ../src/client/clientauthhandler.cpp:106
-#: ../src/client/clientauthhandler.cpp:316
+#: ../src/client/clientauthhandler.cpp:128
+#: ../src/client/clientauthhandler.cpp:348
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Connected to %1"
 msgstr "Verbunden mit %1"
 
-#: ../src/client/clientauthhandler.cpp:110
+#: ../src/client/clientauthhandler.cpp:132
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Disconnecting from %1..."
 msgstr "Getrennt von %1..."
 
-#: ../src/client/clientauthhandler.cpp:114
+#: ../src/client/clientauthhandler.cpp:136
 msgctxt "ClientAuthHandler|"
 msgid "Disconnected"
 msgstr "Getrennt"
 
-#: ../src/client/clientauthhandler.cpp:149
+#: ../src/client/clientauthhandler.cpp:171
 msgctxt "ClientAuthHandler|"
 msgid "Reconnecting in compatibility mode..."
 msgstr "Verbinde erneut im Kompatibilitätsmodus..."
 
-#: ../src/client/clientauthhandler.cpp:237
+#: ../src/client/clientauthhandler.cpp:259
 msgctxt "ClientAuthHandler|"
 msgid ""
 "<b>Incompatible Quassel Core!</b><br>None of the protocols this client "
 "speaks are supported by the core you are trying to connect to."
 msgstr "<b>Inkompatibler Quassel Core</b><br>Keine der Protokolle, die dieser Client spricht, werden von diesem Core unterstützt, mit den Sie sich verbinden möchten."
 
-#: ../src/client/clientauthhandler.cpp:240
+#: ../src/client/clientauthhandler.cpp:262
 msgctxt "ClientAuthHandler|"
 msgid "Core speaks none of the protocols we support"
 msgstr "Core spricht keine der Protokolle, die wir unterstützen."
 
-#: ../src/client/clientauthhandler.cpp:255
+#: ../src/client/clientauthhandler.cpp:277
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid ""
@@ -1641,32 +2018,44 @@ msgid ""
 "at least protocol v%1, but the core speaks v%2 only."
 msgstr "<b>Der Quassel Core, mit dem Sie sich verbinden wollen, ist zu alt!</b><br>Es wird mindestens Protokollversion %1 benötigt, der Core versteht jedoch nur Version %2."
 
-#: ../src/client/clientauthhandler.cpp:257
+#: ../src/client/clientauthhandler.cpp:279
 msgctxt "ClientAuthHandler|"
 msgid "Incompatible protocol version, connection to core refused"
 msgstr "Inkompatible Protokolversionen, Verbindung zum Core zurückgewiesen."
 
-#: ../src/client/clientauthhandler.cpp:279
+#: ../src/client/clientauthhandler.cpp:301
 msgctxt "ClientAuthHandler|"
 msgid "Synchronizing to core..."
 msgstr "Mit Quassel-Core synchronisieren..."
 
-#: ../src/client/clientauthhandler.cpp:294
+#: ../src/client/clientauthhandler.cpp:316
 msgctxt "ClientAuthHandler|"
 msgid "The core refused connection from this client"
 msgstr "Der Core verweigert die Verbindung von diesem Client."
 
-#: ../src/client/clientauthhandler.cpp:358
+#: ../src/client/clientauthhandler.cpp:341
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core does not support the following features: %1"
+msgstr "Core unterstützt das folgende Leistungsmerkmal nicht: %1"
+
+#: ../src/client/clientauthhandler.cpp:344
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core supports unknown features: %1"
+msgstr "Core unterstützt unbekannte Leistungsmerkmale: %1"
+
+#: ../src/client/clientauthhandler.cpp:390
 msgctxt "ClientAuthHandler|"
 msgid "Logging in..."
 msgstr "Anmelden..."
 
-#: ../src/client/clientauthhandler.cpp:363
+#: ../src/client/clientauthhandler.cpp:395
 msgctxt "ClientAuthHandler|"
 msgid "Login canceled"
 msgstr "Anmelden abgebrochen"
 
-#: ../src/client/clientauthhandler.cpp:421
+#: ../src/client/clientauthhandler.cpp:453
 msgctxt "ClientAuthHandler|"
 msgid "Unencrypted connection cancelled"
 msgstr "Unverschlüsselte Verbindung abgebrochen."
@@ -1682,12 +2071,12 @@ msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr "Alle Chats"
 
-#: ../src/client/clientuserinputhandler.cpp:98
+#: ../src/client/clientuserinputhandler.cpp:100
 msgctxt "ClientUserInputHandler|"
 msgid "/JOIN expects a channel"
 msgstr "/JOIN benötigt einen Channel"
 
-#: ../src/client/clientuserinputhandler.cpp:110
+#: ../src/client/clientuserinputhandler.cpp:112
 msgctxt "ClientUserInputHandler|"
 msgid "/QUERY expects at least a nick"
 msgstr "/QUERY benötigt wenigstens einen Spitznamen"
@@ -1766,196 +2155,201 @@ msgctxt "ConnectionSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/chatitem.cpp:801
+#: ../src/qtui/chatitem.cpp:873
 msgctxt "ContentsChatItem|"
 msgid "Copy Link Address"
 msgstr "Linkadresse kopieren"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/contextmenuactionprovider.cpp:38
 msgctxt "ContextMenuActionProvider|"
 msgid "Connect"
 msgstr "Verbindung herstellen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:40
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
 msgctxt "ContextMenuActionProvider|"
 msgid "Disconnect"
 msgstr "Verbindung trennen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/contextmenuactionprovider.cpp:41
 msgctxt "ContextMenuActionProvider|"
 msgid "Join"
 msgstr "Betreten"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:43
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
 msgctxt "ContextMenuActionProvider|"
 msgid "Part"
 msgstr "Verlassen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:44
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
 msgctxt "ContextMenuActionProvider|"
 msgid "Delete Chat(s)..."
 msgstr "Chat(s) löschen..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:45
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
 msgctxt "ContextMenuActionProvider|"
 msgid "Go to Chat"
 msgstr "Chat zeigen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:46
 msgctxt "ContextMenuActionProvider|"
 msgid "Joins/Parts/Quits"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
 msgctxt "ContextMenuActionProvider|"
 msgid "Joins"
 msgstr "Join-Meldungen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
 msgctxt "ContextMenuActionProvider|"
 msgid "Parts"
 msgstr "Part-Meldungen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgctxt "ContextMenuActionProvider|"
 msgid "Quits"
 msgstr "Quit-Meldungen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgctxt "ContextMenuActionProvider|"
 msgid "Nick Changes"
 msgstr "Spitznamenänderungen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgctxt "ContextMenuActionProvider|"
 msgid "Mode Changes"
 msgstr "Modiänderungen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgctxt "ContextMenuActionProvider|"
 msgid "Day Changes"
 msgstr "Tageswechsel"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgctxt "ContextMenuActionProvider|"
 msgid "Topic Changes"
 msgstr "Themenwechsel"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:55
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgctxt "ContextMenuActionProvider|"
 msgid "Set as Default..."
 msgstr "Als Standard setzen..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:56
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
 msgctxt "ContextMenuActionProvider|"
 msgid "Use Defaults..."
 msgstr "Standardwerte benutzen..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:58
+#: ../src/uisupport/contextmenuactionprovider.cpp:57
 msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr "Kanal betreten..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
 msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
 msgstr "Dialog starten"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:61
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr "Dialog anzeigen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:62
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
 msgctxt "ContextMenuActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
 msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr "Version"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
 msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr "Zeit"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:66
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
 msgctxt "ContextMenuActionProvider|"
 msgid "Ping"
 msgstr "Ping"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:67
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
 msgctxt "ContextMenuActionProvider|"
 msgid "Client info"
 msgstr "Informationen zum Client"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:68
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
 msgctxt "ContextMenuActionProvider|"
 msgid "Custom..."
 msgstr "Eigene..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:80
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr "Operator-Status geben"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr "Operator-Status nehmen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Half-Operator Status"
 msgstr "Halb-Operator-Status geben"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Half-Operator Status"
 msgstr "Halb-Operator-Status nehmen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
 msgstr "Voice geben"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:85
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr "Voice nehmen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:86
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr "Aus Kanal werfen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:87
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
 msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr "Vom Kanal bannen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:88
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr "Rauswerfen und bannen"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:90
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Temporarily"
 msgstr "Chats temporär verstecken"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:91
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Permanently"
 msgstr "Chats permanent verstecken"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:92
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
 msgstr "Kanalliste zeigen"
 
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
+msgctxt "ContextMenuActionProvider|"
+msgid "Configure"
+msgstr ""
+
 #: ../src/uisupport/contextmenuactionprovider.cpp:93
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
@@ -1991,107 +2385,275 @@ msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr "Bestehende Regeln"
 
-#: ../src/core/core.cpp:191
+#: ../src/core/core.cpp:116
+msgctxt "Core|"
+msgid "Invalid core settings version!"
+msgstr ""
+
+#: ../src/core/core.cpp:183
+#, qt-format
+msgctxt "Core|"
+msgid "Cannot configure from environment: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:187
 msgctxt "Core|"
-msgid "Could not initialize any storage backend! Exiting..."
-msgstr "Konnte keinen Speichermechanismus initialisieren! Beende..."
+msgid "Cannot configure from environment!"
+msgstr ""
 
-#: ../src/core/core.cpp:192
+#: ../src/core/core.cpp:193
 msgctxt "Core|"
 msgid ""
+"Could not initialize any storage backend! Exiting...\n"
 "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
 "Qt library with the sqlite or postgres plugin enabled in order for quasselcore\n"
 "to work."
-msgstr "Quassel unterstützt momentan SQLite3 und PostgreSQL. Die Qt-Bibliothek\nmuss das sqlite oder postgres Plugin aktiviert haben, damit der Quasselcore\nlauffähig ist."
+msgstr ""
+
+#: ../src/core/core.cpp:200
+msgctxt "Core|"
+msgid "Cannot write quasselcore configuration; probably a permission problem."
+msgstr ""
+
+#: ../src/core/core.cpp:249
+msgctxt "Core|"
+msgid "Cannot open port for listening!"
+msgstr ""
+
+#: ../src/core/core.cpp:292
+msgctxt "Core|"
+msgid "Cannot restore a state for an unconfigured core!"
+msgstr ""
 
-#: ../src/core/core.cpp:252
+#: ../src/core/core.cpp:296
 msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr "restoreState() aufgerufen, obwohl aktive Sitzungen vorhanden sind!"
 
-#: ../src/core/core.cpp:286
+#: ../src/core/core.cpp:333
 msgctxt "Core|"
 msgid "Core is already configured! Not configuring again..."
 msgstr "Core ist bereits konfiguriert! Wird nicht nochmal konfiguriert..."
 
-#: ../src/core/core.cpp:289
+#: ../src/core/core.cpp:336
 msgctxt "Core|"
 msgid "Admin user or password not set."
 msgstr "Administrativbenutzer oder Passwort nicht gesetzt."
 
-#: ../src/core/core.cpp:292
+#: ../src/core/core.cpp:340
 msgctxt "Core|"
 msgid "Could not setup storage!"
 msgstr "Speicher konnte nicht eingerichtet werden!"
 
-#: ../src/core/core.cpp:297
+#: ../src/core/core.cpp:346
+msgctxt "Core|"
+msgid "Could not setup authenticator!"
+msgstr ""
+
+#: ../src/core/core.cpp:352
+msgctxt "Core|"
+msgid "Fatal failure while trying to setup, terminating"
+msgstr ""
+
+#: ../src/core/core.cpp:356
+msgctxt "Core|"
+msgid "Could not save backend settings, probably a permission problem."
+msgstr ""
+
+#: ../src/core/core.cpp:360
 msgctxt "Core|"
 msgid "Creating admin user..."
 msgstr "Erstelle Administrativbenutzer..."
 
-#: ../src/core/core.cpp:447
+#: ../src/core/core.cpp:444
+#, qt-format
+msgctxt "Core|"
+msgid "Selected storage backend %1 is not available."
+msgstr ""
+
+#: ../src/core/core.cpp:544
+#, qt-format
+msgctxt "Core|"
+msgid "Selected auth backend %1 is not available."
+msgstr ""
+
+#: ../src/core/core.cpp:633
 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1"
 msgstr "Ungültige Adresse %1"
 
-#: ../src/core/core.cpp:456
+#: ../src/core/core.cpp:642
 #, qt-format
 msgctxt "Core|"
 msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
 msgstr "Warte auf GUI Clients auf IPv6 %1 Port %2 mit Protokollversion %3"
 
-#: ../src/core/core.cpp:465
+#: ../src/core/core.cpp:651
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr "Konnte IPv6-Interface nicht öffnen %1:%2: %3"
 
-#: ../src/core/core.cpp:473
+#: ../src/core/core.cpp:659
 #, qt-format
 msgctxt "Core|"
 msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
 msgstr "Warte auf GUI Clients auf IPv4 %1 Port %2 mit Protokollversion %3"
 
-#: ../src/core/core.cpp:484
+#: ../src/core/core.cpp:670
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr "Konnte IPv4-Interface nicht öffnen %1:%2: %3"
 
-#: ../src/core/core.cpp:492
+#: ../src/core/core.cpp:678
 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr "Ungültige Adresse %1, unbekanntes Netzwerkprotokoll"
 
-#: ../src/core/core.cpp:501
+#: ../src/core/core.cpp:687
 msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr "Konnte keine Netzwerkoberfläche öffnen!"
 
-#: ../src/core/core.cpp:541
+#: ../src/core/core.cpp:735
 msgctxt "Core|"
 msgid "Client connected from"
 msgstr "Client verbunden von"
 
-#: ../src/core/core.cpp:544
+#: ../src/core/core.cpp:738
 msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr "Beende Server für Setup."
 
-#: ../src/core/core.cpp:556
+#: ../src/core/core.cpp:750
 msgctxt "Core|"
 msgid "Non-authed client disconnected:"
 msgstr "Nichtauthentifizierter Client, verbindung getrennt."
 
-#: ../src/client/coreaccount.h:40
+#: ../src/core/core.cpp:829
+msgctxt "Core|"
+msgid "Cannot setup storage backend."
+msgstr ""
+
+#: ../src/core/core.cpp:925
+#, qt-format
+msgctxt "Core|"
+msgid "Unsupported storage backend: %1"
+msgstr "Nicht unterstütztes Speicher-Backend: %1"
+
+#: ../src/core/core.cpp:926
+msgctxt "Core|"
+msgid "Supported backends are:"
+msgstr "Unterstützte Backends sind:"
+
+#: ../src/core/core.cpp:938 ../src/core/core.cpp:958
+#, qt-format
+msgctxt "Core|"
+msgid "Switched storage backend to: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:939
+msgctxt "Core|"
+msgid "Backend already initialized. Skipping Migration..."
+msgstr "Backend schon initialisiert. Migration überspringen..."
+
+#: ../src/core/core.cpp:942
+#, qt-format
+msgctxt "Core|"
+msgid "Storage backend is not available: %1"
+msgstr "Speicher-Backend ist nicht erreichbar: %1"
+
+#: ../src/core/core.cpp:946
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to setup storage backend: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:951
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to initialize storage backend: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:966
+#, qt-format
+msgctxt "Core|"
+msgid "Migrating storage backend %1 to %2..."
+msgstr "Migriere Speicher-Backend %1 zu %2..."
+
+#: ../src/core/core.cpp:971
+msgctxt "Core|"
+msgid "Migration finished!"
+msgstr "Migration fertiggestellt!"
+
+#: ../src/core/core.cpp:978
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to migrate storage backend! (No migration writer for %1)"
+msgstr ""
+
+#: ../src/core/core.cpp:984
+msgctxt "Core|"
+msgid "No currently active storage backend. Skipping migration..."
+msgstr "Aktuell kein aktives Speicher-Backend. Migration überspringen..."
+
+#: ../src/core/core.cpp:987
+#, qt-format
+msgctxt "Core|"
+msgid "Currently active storage backend does not support migration: %1"
+msgstr "Aktuell aktives Speicher-Backend unterstützt keine Migration: %1"
+
+#: ../src/core/core.cpp:990
+#, qt-format
+msgctxt "Core|"
+msgid "New storage backend does not support migration: %1"
+msgstr "Neues Speicher-Backend unterstützt keine Migration: %1"
+
+#: ../src/core/core.cpp:1012
+#, qt-format
+msgctxt "Core|"
+msgid "Unsupported authenticator: %1"
+msgstr "Nicht unterstützte Authentifizierung: %1"
+
+#: ../src/core/core.cpp:1013
+msgctxt "Core|"
+msgid "Supported authenticators are:"
+msgstr "Unterstützte Authentifizierungen sind:"
+
+#: ../src/core/core.cpp:1023 ../src/core/core.cpp:1040
+#, qt-format
+msgctxt "Core|"
+msgid "Switched authenticator to: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:1026
+#, qt-format
+msgctxt "Core|"
+msgid "Authenticator is not available: %1"
+msgstr "Authentifizierung ist nicht verfügbar: %1"
+
+#: ../src/core/core.cpp:1030
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to setup authenticator: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:1035
+#, qt-format
+msgctxt "Core|"
+msgid "Unable to initialize authenticator: %1"
+msgstr ""
+
+#: ../src/client/coreaccount.h:41
 msgctxt "CoreAccount|"
 msgid "Internal Core"
 msgstr "Interner Core"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:261
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:293
 msgctxt "CoreAccountEditDlg|"
 msgid "Edit Core Account"
 msgstr "Remote-Konto ändern"
@@ -2112,7 +2674,7 @@ msgid "Local Core"
 msgstr "Lokaler Core"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:170
 msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr "Rechnername:"
@@ -2124,13 +2686,13 @@ msgid "localhost"
 msgstr "Lokaler Rechner"
 
 #: ../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 "Benutzer:"
@@ -2148,25 +2710,40 @@ msgstr "Merken"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
 msgctxt "CoreAccountEditDlg|"
-msgid "Use a Proxy"
-msgstr "Proxy benutzen"
+msgid "Proxy Settings"
+msgstr "Proxy-Einstellungen"
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:144
+msgctxt "CoreAccountEditDlg|"
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:149
+msgctxt "CoreAccountEditDlg|"
+msgid "HTTP"
+msgstr "HTTP"
 
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:279
 msgctxt "CoreAccountEditDlg|"
 msgid "Proxy Type:"
 msgstr "Proxy-Typ:"
 
-#: ../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 "Kein Pro&xy"
 
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:298
 msgctxt "CoreAccountEditDlg|"
-msgid "HTTP"
-msgstr "HTTP"
+msgid "S&ystem proxy"
+msgstr "S&ystem Proxy"
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:311
+msgctxt "CoreAccountEditDlg|"
+msgid "&Manual proxy configuration"
+msgstr "&Manuelle Proxy-Konfiguration"
 
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:263
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:295
 msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr "Remote-Konto hinzufügen"
@@ -2216,22 +2793,28 @@ msgctxt "CoreAccountSettingsPage|"
 msgid "Always connect to"
 msgstr "Immer verbinden mit"
 
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:30
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
 msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
 msgstr "Entfernte Cores"
 
-#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144
+#: ../src/core/coreapplication.cpp:46
+msgctxt "CoreApplication|"
+msgid "Could not initialize Quassel!"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:138 ../src/core/coreauthhandler.cpp:150
+#: ../src/core/coreauthhandler.cpp:225
 msgctxt "CoreAuthHandler|"
 msgid "Client"
 msgstr "Client"
 
-#: ../src/core/coreauthhandler.cpp:132
+#: ../src/core/coreauthhandler.cpp:138
 msgctxt "CoreAuthHandler|"
 msgid "too old, rejecting."
 msgstr "zu alt, lehne ab."
 
-#: ../src/core/coreauthhandler.cpp:133
+#: ../src/core/coreauthhandler.cpp:139
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid ""
@@ -2240,61 +2823,101 @@ msgid ""
 " client."
 msgstr "<b>Ihr Quasselclient ist zu alt!</b><br>Dieser Core benötigt mindestens Client/Core Protokollversion %1 (Sie haben %2).<br>Denken Sie darüber nach, Ihren Client zu upgraden."
 
-#: ../src/core/coreauthhandler.cpp:144
+#: ../src/core/coreauthhandler.cpp:150
 msgctxt "CoreAuthHandler|"
 msgid "did not send a registration message before trying to login, rejecting."
 msgstr "Keine Registrierungsnachricht vor dem Loginversuch gesendet; lehne ab."
 
-#: ../src/core/coreauthhandler.cpp:145
+#: ../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 "<b>Client nicht initialisiert!</b><br>Sie müssen vor dem Anmeldungsversuch eine Registrierungsnachricht senden."
 
-#: ../src/core/coreauthhandler.cpp:162
+#: ../src/core/coreauthhandler.cpp:168
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "SSL required but non-SSL connection attempt from %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:169
 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>SSL is required!</b><br>You need to use SSL in order to connect to this "
 "core."
 msgstr "<b>SSL wird benötigt!</b><br>Um sich mit diesem Core zu verbinden, wir SSL benötigt."
 
-#: ../src/core/coreauthhandler.cpp:176
+#: ../src/core/coreauthhandler.cpp:225
+msgctxt "CoreAuthHandler|"
+msgid "attempted to login before the core was configured, rejecting."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:226
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Attempted to login before core was configured!</b><br>The core must be "
+"configured before attempting to login."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:238
 #, qt-format
 msgctxt "CoreAuthHandler|"
-msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
-msgstr "<b>Quassel-Core Version %1</b><br>Erstellungsdatum: %2<br>Betriebsdauer: %3T%4S%5M (seit %6)"
+msgid "Invalid login attempt from %1 as \"%2\""
+msgstr "Ungültiger Login-Versuch von %1 als \"%2\""
 
-#: ../src/core/coreauthhandler.cpp:212
+#: ../src/core/coreauthhandler.cpp:239
 msgctxt "CoreAuthHandler|"
 msgid ""
 "<b>Invalid username or password!</b><br>The username/password combination "
 "you supplied could not be found in the database."
 msgstr "<b>Ungültiger Benutzername oder Passwort!</b><br>Die angegebene Benutzername/Passwort-Kombination konnte in der Datenbank nicht gefunden werden."
 
-#: ../src/core/coreauthhandler.cpp:217
+#: ../src/core/coreauthhandler.cpp:244
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid ""
 "Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
 msgstr "Client %1 erfolgreich initialisiert und authentifiziert als \"%2\" (UserId: %3)."
 
-#: ../src/core/coreauthhandler.cpp:236
+#: ../src/core/coreauthhandler.cpp:250
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support extended features."
+msgstr "Client unterstützt keine erweiterten Leistungsmerkmale."
+
+#: ../src/core/coreauthhandler.cpp:252
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support the following features: %1"
+msgstr "Client unterstützt die folgenden Leistungsmerkmale nicht: %1"
+
+#: ../src/core/coreauthhandler.cpp:256
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client supports unknown features: %1"
+msgstr "Client unterstützt unbekannte Leistungsmerkmale: %1"
+
+#: ../src/core/coreauthhandler.cpp:276
 msgctxt "CoreAuthHandler|"
 msgid "Starting encryption for Client:"
 msgstr "Starte Verschlüsselung für den Client."
 
-#: ../src/qtui/coreconfigwizard.cpp:69
+#: ../src/qtui/coreconfigwizard.cpp:43
+msgctxt "CoreConfigWizard|"
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ../src/qtui/coreconfigwizard.cpp:162
 msgctxt "CoreConfigWizard|"
 msgid "Core Configuration Wizard"
 msgstr "Core-Konfigurationshelfer"
 
-#: ../src/qtui/coreconfigwizard.cpp:98
+#: ../src/qtui/coreconfigwizard.cpp:203
 msgctxt "CoreConfigWizard|"
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr "Ihr Core wurde erfolgreich konfiguriert. Melde an..."
 
-#: ../src/qtui/coreconfigwizard.cpp:107
+#: ../src/qtui/coreconfigwizard.cpp:212
 #, qt-format
 msgctxt "CoreConfigWizard|"
 msgid ""
@@ -2302,45 +2925,48 @@ msgid ""
 "over."
 msgstr "Core-Konfiguration fehlgeschlagen:<br><b>%1</b><br>Zum Neustarten <em>Weiter</em> wählen."
 
-#: ../src/qtui/coreconfigwizard.cpp:126
-msgctxt "CoreConfigWizard|"
-msgid ""
-"Your are now logged into your freshly configured Quassel Core!<br>Please "
-"remember to configure your identities and networks now."
-msgstr "Sie sind jetzt bei Ihrem frisch konfigurierten Quassel-Core angemeldet!<br>Bitte denken Sie daran, jetzt Identitäten und Netzwerke zu konfigurieren."
-
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Form"
 msgstr "Formular"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:25
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr "Benutzername:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:35
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:49
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr "Passwort wiederholen:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:63
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr "Passwort merken"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:72
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid ""
 "<b>Note:</b> Adding more users and changing your username/password is not possible via Quassel's client interface yet.\n"
 "If you need to do these things, please run \"<tt><nobr>quasselcore --help</nobr></tt>\"."
 msgstr "<b>Anmerkung:</b> Das Hinzufügen von Benutzern und das Ändern des Benutzernamens/Passwortes ist noch nicht in die Benutzeroberfläche integriert. Um dies zu tun \"<tt><nobr>quasselcore --help</nobr></tt>\" ausführen."
 
+#: ../src/qtui/ui/coreconfigwizardauthenticationselectionpage.ui:14
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Form"
+msgstr "Formular"
+
+#: ../src/qtui/ui/coreconfigwizardauthenticationselectionpage.ui:25
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Authentication Backend:"
+msgstr "Authentifizierungs-Backend:"
+
 #: ../src/qtui/ui/coreconfigwizardintropage.ui:13
 msgctxt "CoreConfigWizardIntroPage|"
 msgid "Form"
@@ -2351,103 +2977,102 @@ msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr "Dieser Helfer wird Sie durch die Einrichtung Ihres Quassel-Core führen."
 
-#: ../src/qtui/coreconfigwizard.cpp:162
+#: ../src/qtui/coreconfigwizard.cpp:258
 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid "Create Admin User"
 msgstr "Administrativbenutzer erstellen"
 
-#: ../src/qtui/coreconfigwizard.cpp:163
+#: ../src/qtui/coreconfigwizard.cpp:259
 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid ""
 "First, we will create a user on the core. This first user will have "
 "administrator privileges."
 msgstr "Zuerst werden wir einen Benutzer im Quassel-Core anlegen. Der erste Benutzer wird administrative Privilegien besitzen."
 
-#: ../src/qtui/coreconfigwizard.cpp:145
+#: ../src/qtui/coreconfigwizard.cpp:293
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid "Select Authentication Backend"
+msgstr "Wähle Authentifizierungs-Backend"
+
+#: ../src/qtui/coreconfigwizard.cpp:294
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid ""
+"Please select a backend for Quassel Core to use for authenticating users."
+msgstr "Bitte wähle ein Backend für Quassel Core zur Authentifizierung der Benutzer."
+
+#: ../src/qtui/coreconfigwizard.cpp:314
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid "Authentication Settings"
+msgstr "Authentifizierungseinstellungen"
+
+#: ../src/qtui/coreconfigwizard.cpp:241
 msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr "Einleitung"
 
-#: ../src/qtui/coreconfigwizard.cpp:198
+#: ../src/qtui/coreconfigwizard.cpp:379
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
 msgstr "Speichermechanismus auswählen"
 
-#: ../src/qtui/coreconfigwizard.cpp:199
+#: ../src/qtui/coreconfigwizard.cpp:380
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
-msgid ""
-"Please select a database backend for the Quassel Core storage to store the "
-"backlog and other data in."
-msgstr "Bitte wählen Sie einen Datenbankmechanismus für den Quassel-Core-Speicher, der zum Speichern des Verlaufs und anderen Daten verwendet wird."
+msgid "Please select a storage backend for Quassel Core."
+msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:300
+#: ../src/qtui/coreconfigwizard.cpp:420
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
-msgid "Connection Properties"
-msgstr "Verbindungseinstellungen"
+msgid "Storage Settings"
+msgstr "Speichereinstellungen"
 
-#: ../src/qtui/coreconfigwizard.cpp:342
+#: ../src/qtui/coreconfigwizard.cpp:484
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid "Storing Your Settings"
 msgstr "Speichere Ihre Einstellungen"
 
-#: ../src/qtui/coreconfigwizard.cpp:343
+#: ../src/qtui/coreconfigwizard.cpp:485
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid ""
-"Your settings are now stored in the core, and you will be logged in "
+"Your settings are now being stored in the core, and you will be logged in "
 "automatically."
-msgstr "Ihre Einstellungen sind jetzt im Core gespeichert, Sie werden automatisch angemeldet."
+msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:14
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Form"
 msgstr "Formular"
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:22
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr "Speichermechanismus:"
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
-msgctxt "CoreConfigWizardStorageSelectionPage|"
-msgid "Description"
-msgstr "Beschreibung"
-
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
-msgctxt "CoreConfigWizardStorageSelectionPage|"
-msgid "Foobar"
-msgstr "Foobar"
-
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:13
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:14
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Form"
 msgstr "Formular"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:20
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr "Ihre Auswahl"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:36
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr "Administrativbenutzer:"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:42
-msgctxt "CoreConfigWizardSyncPage|"
-msgid "foo"
-msgstr "foo"
-
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:56
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Storage Backend:"
 msgstr "Speichermechanismus:"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:76
 msgctxt "CoreConfigWizardSyncPage|"
-msgid "bar"
-msgstr "bar"
+msgid "Authentication Backend:"
+msgstr "Authentifizierungs-Backend:"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:110
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Please wait while your settings are being transmitted to the core..."
 msgstr "Bitte warten Sie, bis Ihre Einstellungen zum Core übermittelt wurden..."
@@ -2493,33 +3118,38 @@ msgctxt "CoreConnection|"
 msgid "Network is down"
 msgstr "Keine Netzwerkverbindung"
 
-#: ../src/client/coreconnection.cpp:263
+#: ../src/client/coreconnection.cpp:274
 msgctxt "CoreConnection|"
 msgid "Disconnected"
 msgstr "Getrennt"
 
-#: ../src/client/coreconnection.cpp:298
+#: ../src/client/coreconnection.cpp:309
 msgctxt "CoreConnection|"
 msgid "Disconnected from core."
 msgstr "Vom Core getrennt."
 
-#: ../src/client/coreconnection.cpp:436
+#: ../src/client/coreconnection.cpp:388
+msgctxt "CoreConnection|"
+msgid "Initializing..."
+msgstr ""
+
+#: ../src/client/coreconnection.cpp:446
 msgctxt "CoreConnection|"
 msgid "Receiving session state"
 msgstr "Empfange Sitzungsstatus"
 
-#: ../src/client/coreconnection.cpp:438
+#: ../src/client/coreconnection.cpp:448
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronizing to %1..."
 msgstr "Synchronisiere mit %1..."
 
-#: ../src/client/coreconnection.cpp:474
+#: ../src/client/coreconnection.cpp:481
 msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr "Empfange Status der Netzwerke"
 
-#: ../src/client/coreconnection.cpp:525
+#: ../src/client/coreconnection.cpp:532
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronized to %1"
@@ -2611,83 +3241,357 @@ msgctxt "CoreConnectionStatusWidget|"
 msgid "Message"
 msgstr "Mitteilung"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:67
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
 msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
 msgstr "s"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:67
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
 msgctxt "CoreConnectionStatusWidget|milliseconds"
 msgid "ms"
 msgstr "ms"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:68
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67
 #, qt-format
 msgctxt "CoreConnectionStatusWidget|"
 msgid "(Lag: %1 %2)"
 msgstr "(Latenz: %1 %2)"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:84
+#: ../src/qtui/coreconnectionstatuswidget.cpp:83
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is encrypted with SSL."
 msgstr "Die Verbindung zum Quassel-Core ist mit SSL verschlüsselt"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:88
+#: ../src/qtui/coreconnectionstatuswidget.cpp:87
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr "Die Verbindung zum Quassel-Core ist nicht verschlüsselt"
 
-#: ../src/qtui/ui/coreinfodlg.ui:13
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:14
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Form"
+msgstr "Formular"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:57
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:718
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Your Quassel core is too old to support remote highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:64
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Details..."
+msgstr "Details..."
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:93
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Rules"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:99
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Nicks"
+msgstr "Hervorgehobene Spitznamen"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:127
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Case sensitive"
+msgstr "Groß-/Kleinschreibung beachten"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:153
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Custom Highlights"
+msgstr "Spezielle Hervorhebungen"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:166
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:269
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enabled"
+msgstr "Einschalten"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:171
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:274
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Rule"
+msgstr "Regeln"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:176
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:279
+msgctxt "CoreHighlightSettingsPage|"
+msgid "RegEx"
+msgstr "RegEx"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:181
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:284
+msgctxt "CoreHighlightSettingsPage|"
+msgid "CS"
+msgstr "CS"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:186
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:289
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Sender"
+msgstr "Absender"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:191
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:294
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Channel"
+msgstr "Raum"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:207
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:310
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:214
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:317
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remove"
+msgstr "Entfernen"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:250
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Ignore Rules"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:256
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Never Highlight For"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:31
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Interface"
+msgstr "Oberfläche"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:34
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:34
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remote Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:42
+msgctxt "CoreHighlightSettingsPage|"
+msgid "All Nicks from Identity"
+msgstr "Alle Benutzer der Identität"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:43
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Current Nick"
+msgstr "Aktueller Benutzer"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:44
+msgctxt "CoreHighlightSettingsPage|"
+msgid "None"
+msgstr "Kein(e)"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:99
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import Legacy"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:100
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:107
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import highlight rules configured in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:101
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:740
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Legacy Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:106
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import Local"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:108
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:714
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:742
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Local Highlights"
+msgstr "Lokale Markierungen"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:161
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enable/disable this rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:164
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Phrase to match, leave blank to match any message"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:167
+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:172
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"<b>CS</b>: This option determines if the highlight rule, <i>Sender</i>, and "
+"<i>Channel</i> should be interpreted <b>case sensitive</b>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:176
+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:190
+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:719
+msgctxt "CoreHighlightSettingsPage|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer to configure remote highlights."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:721
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "You can still configure highlights for this device only in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:725
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remote Highlights unsupported"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:748
+msgctxt "CoreHighlightSettingsPage|"
+msgid "No highlights to import"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:749
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "No highlight rules in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:755
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import highlights?"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:756
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Import all highlight rules from <i>%1</i>?"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:795
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Imported highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:796
+#, qt-format
+msgctxt "CoreHighlightSettingsPage|"
+msgid "%1 highlight rules successfully imported."
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.h:52
+#: ../src/qtui/settingspages/corehighlightsettingspage.h:55
+msgctxt "CoreHighlightSettingsPage|"
+msgid "highlight rule"
+msgstr "Highlight-Regel"
+
+#: ../src/qtui/ui/coreinfodlg.ui:14
 msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr "Informationen zum Core"
 
-#: ../src/qtui/ui/coreinfodlg.ui:21
+#: ../src/qtui/ui/coreinfodlg.ui:22
 msgctxt "CoreInfoDlg|"
 msgid "Version:"
 msgstr "Version:"
 
-#: ../src/qtui/ui/coreinfodlg.ui:28
+#: ../src/qtui/ui/coreinfodlg.ui:36
 msgctxt "CoreInfoDlg|"
-msgid "<core version>"
-msgstr "<core version>"
+msgid "Version date:"
+msgstr "Versionsdatum:"
 
-#: ../src/qtui/ui/coreinfodlg.ui:35
+#: ../src/qtui/ui/coreinfodlg.ui:50
 msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr "Betriebsdauer:"
 
-#: ../src/qtui/ui/coreinfodlg.ui:42
+#: ../src/qtui/ui/coreinfodlg.ui:64
+msgctxt "CoreInfoDlg|"
+msgid "Connected clients:"
+msgstr ""
+
+#: ../src/qtui/ui/coreinfodlg.ui:117 ../src/qtui/coreinfodlg.cpp:193
+msgctxt "CoreInfoDlg|"
+msgid "Your Quassel core is too old to show active sessions"
+msgstr ""
+
+#: ../src/qtui/ui/coreinfodlg.ui:124
 msgctxt "CoreInfoDlg|"
-msgid "Connected Clients:"
-msgstr "Verbundene Clients:"
+msgid "Details..."
+msgstr "Details..."
 
-#: ../src/qtui/ui/coreinfodlg.ui:49
+#: ../src/qtui/ui/coreinfodlg.ui:200
 msgctxt "CoreInfoDlg|"
-msgid "<connected clients>"
-msgstr "<connected clients>"
+msgid "Close"
+msgstr "Schließen"
 
-#: ../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>"
-msgstr "<core uptime>"
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: ../src/qtui/ui/coreinfodlg.ui:63
+#: ../src/qtui/coreinfodlg.cpp:90
 msgctxt "CoreInfoDlg|"
-msgid "Build date:"
-msgstr "Erstellungsdatum:"
+msgid "Disconnected from core"
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:70
+#: ../src/qtui/coreinfodlg.cpp:91 ../src/qtui/coreinfodlg.cpp:157
 msgctxt "CoreInfoDlg|"
-msgid "<build date>"
-msgstr "<build date>"
+msgid "Not available"
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:81
+#: ../src/qtui/coreinfodlg.cpp:99
 msgctxt "CoreInfoDlg|"
-msgid "Close"
-msgstr "Schließen"
+msgid "Unknown date"
+msgstr ""
 
-#: ../src/qtui/coreinfodlg.cpp:57
+#: ../src/qtui/coreinfodlg.cpp:173
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid "%n Day(s)"
@@ -2695,58 +3599,139 @@ msgid_plural "%n Day(s)"
 msgstr[0] "%n Tag"
 msgstr[1] "%n Tage"
 
-#: ../src/qtui/coreinfodlg.cpp:58
+#: ../src/qtui/coreinfodlg.cpp:174
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid " %1:%2:%3 (since %4)"
 msgstr " %1:%2:%3 (seit %4)"
 
-#: ../src/core/corenetwork.cpp:168
+#: ../src/qtui/coreinfodlg.cpp:191
+msgctxt "CoreInfoDlg|"
+msgid "Active sessions unsupported"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:194
+msgctxt "CoreInfoDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer to view and disconnect other "
+"connected clients."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:238
 msgctxt "CoreNetwork|"
 msgid "Connection failed. Cycling to next Server"
 msgstr "Verbindung fehlgeschlagen. Wechsle zum nächsten Server"
 
-#: ../src/core/corenetwork.cpp:176 ../src/core/corenetwork.cpp:177
+#: ../src/core/corenetwork.cpp:249 ../src/core/corenetwork.cpp:250
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connecting to %1:%2..."
 msgstr "Verbinde mit %1:%2..."
 
-#: ../src/core/corenetwork.cpp:234
+#: ../src/core/corenetwork.cpp:316
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Disconnecting. (%1)"
 msgstr "Trenne Verbindung. (%1)"
 
-#: ../src/core/corenetwork.cpp:234
+#: ../src/core/corenetwork.cpp:316
 msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr "Core-Shutdown"
 
-#: ../src/core/corenetwork.cpp:442
+#: ../src/core/corenetwork.cpp:539
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"
 msgstr "Konnte nicht mit %1 (%2) verbinden"
 
-#: ../src/core/corenetwork.cpp:444
+#: ../src/core/corenetwork.cpp:541
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
 msgstr "Verbindungsfehler: %1"
 
-#: ../src/core/coresession.cpp:233
+#: ../src/core/corenetwork.cpp:589
+msgctxt "CoreNetwork|"
+msgid "Requesting capability list..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1116
+msgctxt "CoreNetwork|"
+msgid "SASL EXTERNAL authentication not supported"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1127
+msgctxt "CoreNetwork|"
+msgid "SASL PLAIN authentication not supported"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1233
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Could not negotiate some capabilities, retrying individually (%1)..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1248
+msgctxt "CoreNetwork|"
+msgid "No capabilities available"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1255
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Ready to negotiate (found: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1264
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Negotiating capabilities (requesting: %1)..."
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1279
+msgctxt "CoreNetwork|"
+msgid "SASL authentication currently not supported by server"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1283
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid "Capability negotiation finished (enabled: %1)"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1429
+msgctxt "CoreNetwork|"
+msgid ""
+"Encrypted connection couldn't be verified, disconnecting since verification "
+"is required"
+msgstr ""
+
+#: ../src/core/corenetwork.cpp:1433 ../src/core/corenetwork.cpp:1446
+#, qt-format
+msgctxt "CoreNetwork|"
+msgid " (Reason: %1)"
+msgstr "(Grund: %1)"
+
+#: ../src/core/corenetwork.cpp:1442
+msgctxt "CoreNetwork|"
+msgid ""
+"Encrypted connection couldn't be verified, continuing since verification is "
+"not required"
+msgstr ""
+
+#: ../src/core/coresession.cpp:298
 msgctxt "CoreSession|"
 msgid "Client"
 msgstr "Client"
 
-#: ../src/core/coresession.cpp:233
+#: ../src/core/coresession.cpp:298
 #, qt-format
 msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."
 msgstr "getrennt (UserId: %1)."
 
-#: ../src/core/coresession.cpp:481
+#: ../src/core/coresession.cpp:623
 #, qt-format
 msgctxt "CoreSession|"
 msgid ""
@@ -2754,121 +3739,186 @@ msgid ""
 " create network %1!"
 msgstr "CoreSession::createNetwork(): Ungültige networkId vom Core erhalten beim Versuch Netzwerk %1 anzulegen!"
 
-#: ../src/core/coresession.cpp:513
+#: ../src/core/coresession.cpp:655
 msgctxt "CoreSession|"
 msgid ""
 "CoreSession::createNetwork(): Trying to create a network that already "
 "exists, updating instead!"
 msgstr "CoreSession::createNetwork(): Versuche ein Netzwerk anzulegen, das bereits existiert, aktualisiere stattdessen!"
 
-#: ../src/core/coresessioneventprocessor.cpp:78
+#: ../src/core/coresessioneventprocessor.cpp:81
 msgctxt "CoreSessionEventProcessor|"
 msgid ""
 "No free and valid nicks in nicklist found. use: /nick <othernick> to "
 "continue"
 msgstr "Keine freien und gültigen Spitznamen in Spitznamensliste gefunden. Benutze: /nick <andererSpitzname> zum Fortfahren"
 
-#: ../src/core/coresessioneventprocessor.cpp:450
+#: ../src/core/coresessioneventprocessor.cpp:800
 msgctxt "CoreSessionEventProcessor|"
 msgid "Unable to perform key exchange, missing qca-ossl plugin."
 msgstr "Konnte keine Schlüssel austauschen, da das qca-ossl-Plugin fehlt."
 
-#: ../src/core/coresessioneventprocessor.cpp:461
+#: ../src/core/coresessioneventprocessor.cpp:811
 msgctxt "CoreSessionEventProcessor|"
 msgid "Unable to parse the DH1080_INIT. Key exchange failed."
 msgstr "DH1080_INIT kann nicht verarbeitet werden. Schlüsselaustausch fehlgeschlagen."
 
-#: ../src/core/coresessioneventprocessor.cpp:465
-#: ../src/core/coresessioneventprocessor.cpp:473
+#: ../src/core/coresessioneventprocessor.cpp:815
+#: ../src/core/coresessioneventprocessor.cpp:823
 msgctxt "CoreSessionEventProcessor|"
 msgid "Your key is set and messages will be encrypted."
 msgstr "Der Schlüssel ist eingerichtet und Nachrichten werden verschlüsselt gesendet."
 
-#: ../src/core/coresessioneventprocessor.cpp:475
+#: ../src/core/coresessioneventprocessor.cpp:825
 msgctxt "CoreSessionEventProcessor|"
 msgid "Failed to parse DH1080_FINISH. Key exchange failed."
 msgstr "DH1080_FINISH kann nicht verarbeitet werden. Schlüsselaustausch fehlgeschlagen."
 
-#: ../src/core/coresessioneventprocessor.cpp:1052
+#: ../src/core/coresessioneventprocessor.cpp:1587
 msgctxt "CoreSessionEventProcessor|"
 msgid "Reverse DCC SEND not supported"
 msgstr "Reverse DCC SEND nicht unterstützt"
 
-#: ../src/core/coresessioneventprocessor.cpp:1070
+#: ../src/core/coresessioneventprocessor.cpp:1605
 #, qt-format
 msgctxt "CoreSessionEventProcessor|"
 msgid "DCC %1 not supported"
 msgstr "DCC %1 nicht unterstützt"
 
-#: ../src/core/coretransfer.cpp:58
+#: ../src/qtui/ui/coresessionwidget.ui:29
+msgctxt "CoreSessionWidget|"
+msgid "12.34.56.78"
+msgstr "12.34.56.78"
+
+#: ../src/qtui/ui/coresessionwidget.ui:37
+msgctxt "CoreSessionWidget|"
+msgid "Client:"
+msgstr "Client:"
+
+#: ../src/qtui/ui/coresessionwidget.ui:51
+msgctxt "CoreSessionWidget|"
+msgid "Version date:"
+msgstr "Versionsdatum:"
+
+#: ../src/qtui/ui/coresessionwidget.ui:65
+msgctxt "CoreSessionWidget|"
+msgid "Location:"
+msgstr "Lokation:"
+
+#: ../src/qtui/ui/coresessionwidget.ui:79
+msgctxt "CoreSessionWidget|"
+msgid "Connected since:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:93
+msgctxt "CoreSessionWidget|"
+msgid "Secure:"
+msgstr "Sicher:"
+
+#: ../src/qtui/ui/coresessionwidget.ui:124
+msgctxt "CoreSessionWidget|"
+msgid "End Session"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:41
+msgctxt "CoreSessionWidget|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:53
+msgctxt "CoreSessionWidget|"
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/qtui/coresessionwidget.cpp:53
+msgctxt "CoreSessionWidget|"
+msgid "No"
+msgstr "Nein"
+
+#: ../src/qtui/coresessionwidget.cpp:59 ../src/qtui/coresessionwidget.cpp:72
+msgctxt "CoreSessionWidget|"
+msgid "End the client's session, disconnecting it"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:73
+msgctxt "CoreSessionWidget|"
+msgid "This client does not support being remotely disconnected"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:86
+msgctxt "CoreSessionWidget|"
+msgid "Ending session..."
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:64
 msgctxt "CoreTransfer|"
 msgid "Socket closed while still transferring!"
 msgstr "Verbindung geschlossen während noch Dateien übertragen wurden!"
 
-#: ../src/core/coretransfer.cpp:70
+#: ../src/core/coretransfer.cpp:76
 #, qt-format
 msgctxt "CoreTransfer|"
 msgid "DCC connection error: %1"
 msgstr "DCC Verbindungsfehler: %1"
 
-#: ../src/core/coretransfer.cpp:114
+#: ../src/core/coretransfer.cpp:120
 msgctxt "CoreTransfer|"
 msgid "Reverse DCC not supported yet!"
 msgstr "Reverse DCC noch nicht unterstütz!"
 
-#: ../src/core/coretransfer.cpp:160
+#: ../src/core/coretransfer.cpp:167
 msgctxt "CoreTransfer|"
 msgid "DCC Receive: Got more data than expected!"
 msgstr "DCC Receive: Mehr Daten bekommen als erwartet!"
 
-#: ../src/core/coretransfer.cpp:176
+#: ../src/core/coretransfer.cpp:183
 msgctxt "CoreTransfer|"
 msgid "DCC Receive: Quassel Client disconnected during transfer!"
 msgstr "DCC Receive: Quassel Client hat während einer Übertragung die Verbindung beendet!"
 
-#: ../src/core/coreuserinputhandler.cpp:88
+#: ../src/core/coreuserinputhandler.cpp:104
 msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr "Abwesend"
 
-#: ../src/core/coreuserinputhandler.cpp:169
+#: ../src/core/coreuserinputhandler.cpp:185
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
 msgstr "Sende CTCP-%1-Anfrage an %2"
 
-#: ../src/core/coreuserinputhandler.cpp:189
-#: ../src/core/coreuserinputhandler.cpp:360
-#: ../src/core/coreuserinputhandler.cpp:622
-#: ../src/core/coreuserinputhandler.cpp:660
+#: ../src/core/coreuserinputhandler.cpp:206
+#: ../src/core/coreuserinputhandler.cpp:377
+#: ../src/core/coreuserinputhandler.cpp:684
+#: ../src/core/coreuserinputhandler.cpp:722
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: QCA provider plugin not found. It is usually provided by the qca-ossl"
 " plugin."
 msgstr "Fehler: QCA-Providerplugin nicht gefunden. Es wird normalerweise vom qca-ossl-Plugin bereitgestellt."
 
-#: ../src/core/coreuserinputhandler.cpp:200
+#: ../src/core/coreuserinputhandler.cpp:217
 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 "[Benutzung] /delkey <nick|channel> löscht den Schlüssel für die Verschlüsselung des Nicks oder Channels oder nur /delkey in einem aktiven Raum/Dialog"
 
-#: ../src/core/coreuserinputhandler.cpp:207
-#: ../src/core/coreuserinputhandler.cpp:678
+#: ../src/core/coreuserinputhandler.cpp:224
+#: ../src/core/coreuserinputhandler.cpp:740
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "No key has been set for %1."
 msgstr "Für %1 wurde kein Schlüssel gesetzt."
 
-#: ../src/core/coreuserinputhandler.cpp:212
+#: ../src/core/coreuserinputhandler.cpp:229
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been deleted."
 msgstr "Der Schlüssel für %1 wurde entfernt."
 
-#: ../src/core/coreuserinputhandler.cpp:216
-#: ../src/core/coreuserinputhandler.cpp:686
+#: ../src/core/coreuserinputhandler.cpp:233
+#: ../src/core/coreuserinputhandler.cpp:748
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "
@@ -2877,31 +3927,31 @@ msgid ""
 "with QCA2 present."
 msgstr "Fehler: Wenn eine Verschlüsselung genutzt werden soll muss Quassel mit Unterstützung für die \"Qt Cryptographic Architecture\" (QCA2) Bibliothek kompiliert worden sein. Kontaktieren Sie ihren Distributor, dass Quassel mit Unterstützung für QCA2 kompiliert wird, oder kompilieren Sie Quassel selber mit QCA2."
 
-#: ../src/core/coreuserinputhandler.cpp:370
+#: ../src/core/coreuserinputhandler.cpp:387
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /keyx [<nick>] Initiates a DH1080 key exchange with the target."
 msgstr "[usage] /keyx [<nick>] Startet einen DH1080 Schlüsselaustausch mit dem Ziel."
 
-#: ../src/core/coreuserinputhandler.cpp:377
+#: ../src/core/coreuserinputhandler.cpp:394
 msgctxt "CoreUserInputHandler|"
 msgid "It is only possible to exchange keys in a query buffer."
 msgstr "Es ist nur möglich Schlüssel in einem Dialogfenster auszutauschen."
 
-#: ../src/core/coreuserinputhandler.cpp:387
+#: ../src/core/coreuserinputhandler.cpp:404
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Failed to initiate key exchange with %1."
 msgstr "Initiierung des Schlüsselaustauschs mit %1 fehlgeschlagen."
 
-#: ../src/core/coreuserinputhandler.cpp:392
+#: ../src/core/coreuserinputhandler.cpp:409
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Initiated key exchange with %1."
 msgstr "Schlüsselaustausch mit %1 initiiert."
 
-#: ../src/core/coreuserinputhandler.cpp:396
-#: ../src/core/coreuserinputhandler.cpp:644
+#: ../src/core/coreuserinputhandler.cpp:413
+#: ../src/core/coreuserinputhandler.cpp:706
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "Error: Setting an encryption key requires Quassel to have been built with "
@@ -2910,13 +3960,18 @@ msgid ""
 "with QCA present."
 msgstr "Fehler: Die Nutzung der Verschlüsselung setzt vorraus, dass Quassel mit Unterstützung für die \"Qt Cryptographic Architecture\" (QCA2) Bibliothek kompiliert worden ist. Kontaktieren Sie ihren Distributor, dass Quassel mit Unterstützung für QCA2 kompiliert wird, oder kompilieren Sie Quassel selber mit QCA2."
 
-#: ../src/core/coreuserinputhandler.cpp:569
+#: ../src/core/coreuserinputhandler.cpp:481
+msgctxt "CoreUserInputHandler|"
+msgid "Your persistent modes have been reset."
+msgstr ""
+
+#: ../src/core/coreuserinputhandler.cpp:615
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Starting query with %1"
 msgstr "Dialog mit %1 starten"
 
-#: ../src/core/coreuserinputhandler.cpp:632
+#: ../src/core/coreuserinputhandler.cpp:694
 msgctxt "CoreUserInputHandler|"
 msgid ""
 "[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
@@ -2924,20 +3979,20 @@ msgid ""
 "it."
 msgstr "[Benutzung] /setkey <nick|channel> <key> setzt den Schlüssel für die Verschlüsselung des Dialogs oder des Raums; oder ohne Argument für den derzeit aktiven Raum oder Dialog"
 
-#: ../src/core/coreuserinputhandler.cpp:641
+#: ../src/core/coreuserinputhandler.cpp:703
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been set."
 msgstr "Der Schlüssel für %1 wurde gesetzt."
 
-#: ../src/core/coreuserinputhandler.cpp:670
+#: ../src/core/coreuserinputhandler.cpp:732
 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 "[Benutzung] /delkey <nick|channel> löscht den Schlüssel für die Verschlüsselung des Nicks oder Channels oder nur /delkey in einem aktiven Raum/Dialog"
 
-#: ../src/core/coreuserinputhandler.cpp:682
+#: ../src/core/coreuserinputhandler.cpp:744
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 is %2:%3"
@@ -2963,17 +4018,119 @@ msgctxt "CreateIdentityDlg|"
 msgid "Duplicate:"
 msgstr "Duplizieren:"
 
-#: ../src/common/protocols/datastream/datastreampeer.cpp:114
+#: ../src/common/protocols/datastream/datastreampeer.cpp:117
 msgctxt "DataStreamPeer|"
 msgid "Invalid handshake message!"
 msgstr "Ungültige Handshake-Nachricht!"
 
-#: ../src/common/protocols/datastream/datastreampeer.cpp:161
+#: ../src/common/protocols/datastream/datastreampeer.cpp:173
 #, qt-format
 msgctxt "DataStreamPeer|"
 msgid "Unknown protocol message of type %1"
 msgstr "Unbekannte Protokollnachricht vom Typ %1"
 
+#: ../src/qtui/settingspages/dccsettingspage.ui:14
+msgctxt "DccSettingsPage|"
+msgid "Form"
+msgstr "Formular"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:20
+msgctxt "DccSettingsPage|"
+msgid "Enable DCC"
+msgstr "DCC aktivieren"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:37
+msgctxt "DccSettingsPage|"
+msgid "Ports:"
+msgstr "Ports:"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:51
+#: ../src/qtui/settingspages/dccsettingspage.ui:134
+msgctxt "DccSettingsPage|"
+msgid "Automatic"
+msgstr "Automatisch"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:56
+#: ../src/qtui/settingspages/dccsettingspage.ui:139
+msgctxt "DccSettingsPage|"
+msgid "Manual"
+msgstr "Manuell"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:82
+msgctxt "DccSettingsPage|"
+msgid "to"
+msgstr "zu"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:110
+msgctxt "DccSettingsPage|"
+msgid "Outgoing IP:"
+msgstr "Ausgehende IP:"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:164
+msgctxt "DccSettingsPage|"
+msgid "DCC send timeout:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:171
+msgctxt "DccSettingsPage|"
+msgid " seconds"
+msgstr " Sekunden"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:213
+msgctxt "DccSettingsPage|"
+msgid "Chunk size:"
+msgstr "Chunk Größe:"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:220
+msgctxt "DccSettingsPage|"
+msgid " KiB"
+msgstr "KiB"
+
+#: ../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 "Dateiübertragung"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:303
+msgctxt "DccSettingsPage|"
+msgid "Default download folder:"
+msgstr "Standard Download-Ordner:"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:313
+msgctxt "DccSettingsPage|"
+msgid "..."
+msgstr "…"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:322
+msgctxt "DccSettingsPage|"
+msgid "Create folder per sender"
+msgstr "Erstelle Ordner pro Absender"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:329
+msgctxt "DccSettingsPage|"
+msgid "Prefix filenames with sender"
+msgstr "Präfix Dateinamen mit Absender"
+
+#: ../src/qtui/settingspages/dccsettingspage.cpp:27
+msgctxt "DccSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/settingspages/dccsettingspage.cpp:27
+msgctxt "DccSettingsPage|"
+msgid "DCC"
+msgstr "DCC"
+
 #: ../src/qtui/ui/debugbufferviewoverlay.ui:13
 msgctxt "DebugBufferViewOverlay|"
 msgid "Debug BufferView Overlay"
@@ -3069,229 +4226,240 @@ msgctxt "DockManagerNotificationBackend::ConfigWidget|"
 msgid "Mark dockmanager entry"
 msgstr "Markiere DockManager Eintrag"
 
-#: ../src/core/eventstringifier.cpp:224 ../src/core/eventstringifier.cpp:370
+#: ../src/core/eventstringifier.cpp:238 ../src/core/eventstringifier.cpp:447
 msgctxt "EventStringifier|"
 msgid "[Whois] "
 msgstr "[Whois] %1"
 
-#: ../src/core/eventstringifier.cpp:239
+#: ../src/core/eventstringifier.cpp:253
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 invited you to channel %2"
 msgstr "%1 hat Sie in Raum %2 eingeladen."
 
-#: ../src/core/eventstringifier.cpp:341
+#: ../src/core/eventstringifier.cpp:408
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr "%1 hat das Thema für %2 geändert zu: \"%3\""
 
-#: ../src/core/eventstringifier.cpp:347
+#: ../src/core/eventstringifier.cpp:419
+msgctxt "EventStringifier|"
+msgid "Error from server: "
+msgstr "Fehler vom Server:"
+
+#: ../src/core/eventstringifier.cpp:424
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Operwall] %1: %2"
 msgstr "[Operwall] %1: %2"
 
-#: ../src/core/eventstringifier.cpp:355
+#: ../src/core/eventstringifier.cpp:432
 msgctxt "EventStringifier|"
 msgid ""
 "Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
 "behavior!"
 msgstr "nicht RFC-konformes RPL_ISUPPORT erhalten: Dies kann unerwartete Auswirkungen haben!"
 
-#: ../src/core/eventstringifier.cpp:384
+#: ../src/core/eventstringifier.cpp:471
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 is away: \"%2\""
 msgstr "%1 ist abwesend: \"%2\""
 
-#: ../src/core/eventstringifier.cpp:391
+#: ../src/core/eventstringifier.cpp:478
 msgctxt "EventStringifier|"
 msgid "You are no longer marked as being away"
 msgstr "Sie werden nun nicht mehr als abwesend angezeigt."
 
-#: ../src/core/eventstringifier.cpp:399
+#: ../src/core/eventstringifier.cpp:486
 msgctxt "EventStringifier|"
 msgid "You have been marked as being away"
 msgstr "Sie werden nun als abwesend angezeigt."
 
-#: ../src/core/eventstringifier.cpp:421
+#: ../src/core/eventstringifier.cpp:508
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 ist %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:437
+#: ../src/core/eventstringifier.cpp:524
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is online via %2 (%3)"
 msgstr "%1 ist angemeldet über %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:439
+#: ../src/core/eventstringifier.cpp:526
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was online via %2 (%3)"
 msgstr "[Whowas] %1 war %2 (%3)"
 
-#: ../src/core/eventstringifier.cpp:449
+#: ../src/core/eventstringifier.cpp:536
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was %2@%3 (%4)"
 msgstr "[Whowas] %1 war %2@%3 (%4)"
 
-#: ../src/core/eventstringifier.cpp:458
+#: ../src/core/eventstringifier.cpp:545
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] End of /WHO list for %1"
 msgstr "[Who] Ende der /WHO Liste für %1"
 
-#: ../src/core/eventstringifier.cpp:470
+#: ../src/core/eventstringifier.cpp:566
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is logged in since %2"
 msgstr "[Whois] %1 ist seit %2 angemeldet"
 
-#: ../src/core/eventstringifier.cpp:474
+#: ../src/core/eventstringifier.cpp:570
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is idling for %2 (since %3)"
 msgstr "[Whois] %1 ist seit %2 (%3) inaktiv"
 
-#: ../src/core/eventstringifier.cpp:484
+#: ../src/core/eventstringifier.cpp:580
 msgctxt "EventStringifier|"
 msgid "[Whois] End of /WHOIS list"
 msgstr "[Who] Ende der /WHO Liste für %1"
 
-#: ../src/core/eventstringifier.cpp:507
+#: ../src/core/eventstringifier.cpp:603
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr "[Whois] %1 ist Benutzer in den Kanälen: %2"
 
-#: ../src/core/eventstringifier.cpp:509
+#: ../src/core/eventstringifier.cpp:605
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr "[Whois] %1 hat Voice in den Kanälen: %2"
 
-#: ../src/core/eventstringifier.cpp:511
+#: ../src/core/eventstringifier.cpp:607
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr "[Whois] %1 ist Operator in den Kanälen: %2"
 
-#: ../src/core/eventstringifier.cpp:532
+#: ../src/core/eventstringifier.cpp:631
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 has %2 users. Topic is: \"%3\""
 msgstr "Kanal %1 hat %2 Benutzer. Thema ist: %3"
 
-#: ../src/core/eventstringifier.cpp:540
+#: ../src/core/eventstringifier.cpp:639
 msgctxt "EventStringifier|"
 msgid "End of channel list"
 msgstr "Ende der Kanalliste"
 
-#: ../src/core/eventstringifier.cpp:558
+#: ../src/core/eventstringifier.cpp:657
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Homepage for %1 is %2"
 msgstr "Webseite für %1 ist %2"
 
-#: ../src/core/eventstringifier.cpp:575
+#: ../src/core/eventstringifier.cpp:683
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 created on %2"
 msgstr "Chat %1 wurde am %2 erzeugt"
 
-#: ../src/core/eventstringifier.cpp:589
+#: ../src/core/eventstringifier.cpp:697
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is authed as %2"
 msgstr "[Whois] %1 ist abwesend: \"%2\""
 
-#: ../src/core/eventstringifier.cpp:592
+#: ../src/core/eventstringifier.cpp:700
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was authed as %2"
 msgstr "[Whowas] %1 war angemeldet als %2"
 
-#: ../src/core/eventstringifier.cpp:601
+#: ../src/core/eventstringifier.cpp:709
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "No topic is set for %1."
 msgstr "Für %1 ist kein Thema gesetzt."
 
-#: ../src/core/eventstringifier.cpp:609
+#: ../src/core/eventstringifier.cpp:717
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic for %1 is \"%2\""
 msgstr "Thema für %1 ist \"%2\""
 
-#: ../src/core/eventstringifier.cpp:621
+#: ../src/core/eventstringifier.cpp:738
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic set by %1 on %2"
 msgstr "Thema gesetzt von %1 am %2"
 
-#: ../src/core/eventstringifier.cpp:634
+#: ../src/core/eventstringifier.cpp:751
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has been invited to %2"
 msgstr "%1 wurde nach %2 eingeladen"
 
-#: ../src/core/eventstringifier.cpp:642
+#: ../src/core/eventstringifier.cpp:759
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] %1"
 msgstr "[Who] %1"
 
-#: ../src/core/eventstringifier.cpp:649
+#: ../src/core/eventstringifier.cpp:769
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[WhoX] %1"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:776
 msgctxt "EventStringifier|"
 msgid "End of /WHOWAS"
 msgstr "/WHOWAS Ende"
 
-#: ../src/core/eventstringifier.cpp:659
+#: ../src/core/eventstringifier.cpp:786
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick %1 contains illegal characters"
 msgstr "Spitzname %1 enthält ungültige Zeichen"
 
-#: ../src/core/eventstringifier.cpp:669
+#: ../src/core/eventstringifier.cpp:796
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick already in use: %1"
 msgstr "Spitzname bereits in Benutzung: %1"
 
-#: ../src/core/eventstringifier.cpp:679
+#: ../src/core/eventstringifier.cpp:806
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr "Spitzname/Kanal ist aktuell nicht verfügbar: %1"
 
-#: ../src/core/eventstringifier.cpp:702
+#: ../src/core/eventstringifier.cpp:830
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "sending CTCP-%1 request to %2"
 msgstr "Sende CTCP-%1-Anfrage an %2"
 
-#: ../src/core/eventstringifier.cpp:717
+#: ../src/core/eventstringifier.cpp:846
 msgctxt "EventStringifier|"
 msgid "unknown"
 msgstr "unbekannten"
 
-#: ../src/core/eventstringifier.cpp:718
+#: ../src/core/eventstringifier.cpp:847
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received %1CTCP-%2 request by %3"
 msgstr "%1CTCP %2-Anfrage von %3 erhalten"
 
-#: ../src/core/eventstringifier.cpp:721
+#: ../src/core/eventstringifier.cpp:850
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-%1 answer from %2: %3"
 msgstr "CTCP %1-Antwort von %2: %3"
 
-#: ../src/core/eventstringifier.cpp:736
+#: ../src/core/eventstringifier.cpp:865
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-PING answer from %1 with %2 milliseconds round trip time"
@@ -3349,26 +4517,25 @@ msgid "Custom Highlights"
 msgstr "Spezielle Hervorhebungen"
 
 #: ../src/qtui/settingspages/highlightsettingspage.ui:33
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+msgctxt "HighlightSettingsPage|"
+msgid "Enabled"
+msgstr "Einschalten"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:38
 msgctxt "HighlightSettingsPage|"
 msgid "Highlight"
 msgstr "Hervorhebung"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:38
+#: ../src/qtui/settingspages/highlightsettingspage.ui:43
 msgctxt "HighlightSettingsPage|"
 msgid "RegEx"
 msgstr "RegEx"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:43
+#: ../src/qtui/settingspages/highlightsettingspage.ui:48
 msgctxt "HighlightSettingsPage|"
 msgid "CS"
 msgstr "CS"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:48
-msgctxt "HighlightSettingsPage|"
-msgid "Enable"
-msgstr "Einschalten"
-
 #: ../src/qtui/settingspages/highlightsettingspage.ui:53
 msgctxt "HighlightSettingsPage|"
 msgid "Channel"
@@ -3409,21 +4576,155 @@ msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung beachten"
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+#: ../src/qtui/settingspages/highlightsettingspage.ui:156
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:107
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:310
+msgctxt "HighlightSettingsPage|"
+msgid "Local Highlights apply to this device only"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:163
+msgctxt "HighlightSettingsPage|"
+msgid "Details..."
+msgstr "Details..."
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:33
 msgctxt "HighlightSettingsPage|"
 msgid "Interface"
 msgstr "Oberfläche"
 
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:192
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:36
+msgctxt "HighlightSettingsPage|"
+msgid "Legacy Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:36
+msgctxt "HighlightSettingsPage|"
+msgid "Local Highlights"
+msgstr "Lokale Markierungen"
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:45
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:170
+msgctxt "HighlightSettingsPage|"
+msgid "Enable/disable this rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:50
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:171
+msgctxt "HighlightSettingsPage|"
+msgid "Phrase to match"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:55
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:173
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"<b>RegEx</b>: This option determines if the highlight rule and "
+"<i>Channel</i> should be interpreted as <b>regular expressions</b> or just "
+"as keywords."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:61
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:176
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"<b>CS</b>: This option determines if the highlight rule and <i>Channel</i> "
+"should be interpreted <b>case sensitive</b>."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:67
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:179
+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:104
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:299
+msgctxt "HighlightSettingsPage|"
+msgid "Legacy Highlights are replaced by Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:269
 msgctxt "HighlightSettingsPage|"
 msgid "this shouldn't be empty"
 msgstr "dies sollte nicht leer sein"
 
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:297
+msgctxt "HighlightSettingsPage|"
+msgid "Legacy Highlights vs. Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:300
+msgctxt "HighlightSettingsPage|"
+msgid ""
+"These highlights will keep working for now, but you should move to the "
+"improved highlight rules when you can."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:302
+#, qt-format
+msgctxt "HighlightSettingsPage|"
+msgid "Configure the new style of highlights in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:303
+msgctxt "HighlightSettingsPage|"
+msgid "Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:308
+msgctxt "HighlightSettingsPage|"
+msgid "Local Highlights vs. Remote Highlights"
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:311
+msgctxt "HighlightSettingsPage|"
+msgid "Highlights configured on this page only apply to your current device."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:313
+#, qt-format
+msgctxt "HighlightSettingsPage|"
+msgid "Configure highlights for all of your devices in <i>%1</i>."
+msgstr ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:314
+msgctxt "HighlightSettingsPage|"
+msgid "Remote Highlights"
+msgstr ""
+
 #: ../src/qtui/settingspages/highlightsettingspage.h:46
 msgctxt "HighlightSettingsPage|"
 msgid "highlight rule"
 msgstr "Highlight-Regel"
 
+#: ../src/core/identserver.cpp:42
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd clients on IPv6 %1 port %2"
+msgstr ""
+
+#: ../src/core/identserver.cpp:52
+#, qt-format
+msgctxt "IdentServer|"
+msgid "Listening for identd clients on IPv4 %1 port %2"
+msgstr ""
+
+#: ../src/core/identserver.cpp:61
+msgctxt "IdentServer|"
+msgid ""
+"Identd could not open any network interfaces to listen on! No identd "
+"functionality will be available"
+msgstr ""
+
 #: ../src/qtui/settingspages/identitiessettingspage.ui:31
 #: ../src/qtui/settingspages/identitiessettingspage.cpp:370
 msgctxt "IdentitiesSettingsPage|"
@@ -3547,8 +4848,8 @@ msgstr "Der Kindergarten ist woanders!"
 
 #: ../src/common/identity.cpp:194 ../src/common/identity.cpp:195
 msgctxt "Identity|"
-msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
-msgstr "http://quassel-irc.org - Chat comfortably. Anywhere."
+msgid "https://quassel-irc.org - Chat comfortably. Anywhere."
+msgstr "https://quassel-irc.org - Komfortabler Chat. Überall. "
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
 msgctxt "IdentityEditWidget|"
@@ -3679,7 +4980,7 @@ msgid "minutes of being idle"
 msgstr "Minuten Untätigkeit"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:399
-#: ../src/qtui/settingspages/identityeditwidget.cpp:244
+#: ../src/qtui/settingspages/identityeditwidget.cpp:290
 msgctxt "IdentityEditWidget|"
 msgid "Advanced"
 msgstr "Erweitert"
@@ -3745,16 +5046,15 @@ msgid "Key Type:"
 msgstr "Schlüsselformat:"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:605
-#: ../src/qtui/settingspages/identityeditwidget.cpp:364
-#: ../src/qtui/settingspages/identityeditwidget.cpp:376
+#: ../src/qtui/settingspages/identityeditwidget.cpp:425
 msgctxt "IdentityEditWidget|"
 msgid "No Key loaded"
 msgstr "Kein Schlüssel geladen"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:625
 #: ../src/qtui/settingspages/identityeditwidget.ui:723
-#: ../src/qtui/settingspages/identityeditwidget.cpp:365
-#: ../src/qtui/settingspages/identityeditwidget.cpp:423
+#: ../src/qtui/settingspages/identityeditwidget.cpp:426
+#: ../src/qtui/settingspages/identityeditwidget.cpp:489
 msgctxt "IdentityEditWidget|"
 msgid "Load"
 msgstr "Laden"
@@ -3771,8 +5071,8 @@ msgstr "Organisation:"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:663
 #: ../src/qtui/settingspages/identityeditwidget.ui:697
-#: ../src/qtui/settingspages/identityeditwidget.cpp:421
-#: ../src/qtui/settingspages/identityeditwidget.cpp:422
+#: ../src/qtui/settingspages/identityeditwidget.cpp:487
+#: ../src/qtui/settingspages/identityeditwidget.cpp:488
 msgctxt "IdentityEditWidget|"
 msgid "No Certificate loaded"
 msgstr "Kein Zertifikat geladen"
@@ -3782,40 +5082,117 @@ msgctxt "IdentityEditWidget|"
 msgid "CommonName:"
 msgstr "Name:"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:327
+#: ../src/qtui/settingspages/identityeditwidget.cpp:107
+msgctxt "IdentityEditWidget|"
+msgid ""
+"You can add date/time to this message using the syntax: <br/>%%<span "
+"class='italic'>&lt;format&gt;</span>%%, where <span "
+"class='italic'>&lt;format&gt;</span> is:"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:112
+msgctxt "IdentityEditWidget|"
+msgid "the hour"
+msgstr "die Stunde"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:113
+msgctxt "IdentityEditWidget|"
+msgid "the minutes"
+msgstr "die Minuten"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:114
+msgctxt "IdentityEditWidget|"
+msgid "seconds"
+msgstr "Sekunden"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:115
+msgctxt "IdentityEditWidget|"
+msgid "AM/PM"
+msgstr "AM/PM"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:116
+msgctxt "IdentityEditWidget|"
+msgid "day"
+msgstr "Tag"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:117
+msgctxt "IdentityEditWidget|"
+msgid "month"
+msgstr "onate"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:121
+msgctxt "IdentityEditWidget|"
+msgid "current timezone"
+msgstr "Aktuelle Zeitzone"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:124
+msgctxt "IdentityEditWidget|"
+msgid "Example: Away since %%hh:mm%% on %%dd.MM%%."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:125
+msgctxt "IdentityEditWidget|"
+msgid ""
+"%%%% without anything inside represents %%.  Other format codes are "
+"available."
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:373
 msgctxt "IdentityEditWidget|"
 msgid "Load a Key"
 msgstr "Schlüssel laden"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:355
+#: ../src/qtui/settingspages/identityeditwidget.cpp:410
 msgctxt "IdentityEditWidget|"
 msgid "Failed to read key"
 msgstr "Konnte Schlüssel nicht lesen"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:355
+#: ../src/qtui/settingspages/identityeditwidget.cpp:410
 msgctxt "IdentityEditWidget|"
 msgid ""
 "Failed to read the key file. It is either incompatible or invalid. Note that"
 " the key file must not have a passphrase."
 msgstr "Konnte die Schlüsseldatei nicht lesen. Entweder sie ist inkompatibel oder ungültig. Beachten Sie, dass die Schlüsseldatei keine Passphrase haben darf."
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:370
+#: ../src/qtui/settingspages/identityeditwidget.cpp:414
+msgctxt "IdentityEditWidget|"
+msgid "Core does not support ECDSA keys"
+msgstr "Core unterstützt keine ECDSA-Schlüssel"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:414
+msgctxt "IdentityEditWidget|"
+msgid ""
+"You loaded an ECDSA key, but the core does not support ECDSA keys. Please "
+"contact the core administrator."
+msgstr "Du hast ein ECDSA-Schlüssel, aber der Core unterstützt keine ECDSA-Schlüssel. Bitte kontaktiere den Core-Administrator."
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:431
 msgctxt "IdentityEditWidget|"
 msgid "RSA"
 msgstr "RSA"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:373
+#: ../src/qtui/settingspages/identityeditwidget.cpp:435
+msgctxt "IdentityEditWidget|"
+msgid "ECDSA"
+msgstr "ECDSA"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:439
 msgctxt "IdentityEditWidget|"
 msgid "DSA"
 msgstr "DSA"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:378
-#: ../src/qtui/settingspages/identityeditwidget.cpp:433
+#: ../src/qtui/settingspages/identityeditwidget.cpp:442
+msgctxt "IdentityEditWidget|"
+msgid "Invalid key or no key loaded"
+msgstr "Ungültiger Schlüssel oder kein Schlüssel geladen"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:444
+#: ../src/qtui/settingspages/identityeditwidget.cpp:499
 msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr "Löschen"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:390
+#: ../src/qtui/settingspages/identityeditwidget.cpp:456
 msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr "Ein Zertifikat laden"
@@ -3969,12 +5346,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>"
-msgstr "<p><b>Bereichsregel:</b></p>\n<p>Eine Bereichsregel enthält eine mit Strichkomma getrennte Liste von:<i>Netzwerk</i> oder <i>Kanal-</i> Namen.</p>\n<p><i>Beispiel:</i>\n<br />\n<i>#quassel*; #foobar</i>\n<br />\nfiltert <i>#foobar</i> und alle Kanäle die mit <i>#quassel</i> beginnen.</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"
@@ -3983,7 +5367,7 @@ msgid ""
 "For dynamic rules, disabling actually shows the filtered messages again.</p>"
 msgstr "<p><b>An-/Ausschalten:</b></p>\n<p>Nur angeschaltete Regeln werden gefiltert.\n<br />\nBei dynamischen Regeln werden nach dem Ausschalten die gefilterten Meldungen wieder angezeigt.</p>"
 
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:227
 msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr "Regel ist angeschaltet"
@@ -4018,17 +5402,17 @@ msgctxt "IgnoreListModel|"
 msgid "By Message"
 msgstr "Nach Meldung"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:208
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:211
 msgctxt "IgnoreListModel|"
 msgid "Enabled"
 msgstr "Einschalten"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:209
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:212
 msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:210
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:213
 msgctxt "IgnoreListModel|"
 msgid "Ignore Rule"
 msgstr "Ignorier-Regel"
@@ -4053,22 +5437,22 @@ msgctxt "IgnoreListSettingsPage|"
 msgid "&Edit"
 msgstr "Änd&ern"
 
-#: ../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 "Ignorieren-Liste"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:147
 msgctxt "IgnoreListSettingsPage|"
 msgid "Rule already exists"
 msgstr "Regel exisitert bereits"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:148
 #, qt-format
 msgctxt "IgnoreListSettingsPage|"
 msgid ""
@@ -4094,101 +5478,146 @@ msgctxt "IndicatorNotificationConfigWidget|"
 msgid "Show messages in application indicator"
 msgstr "Meldungen im Indikator anzeigen"
 
-#: ../src/qtui/ui/inputwidget.ui:26
+#: ../src/qtui/ui/inputwidget.ui:26
+msgctxt "InputWidget|"
+msgid "Form"
+msgstr "Formular"
+
+#: ../src/qtui/ui/inputwidget.ui:59
+msgctxt "InputWidget|"
+msgid "View and change nick"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:139
+msgctxt "InputWidget|"
+msgid "Bold"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:179
+msgctxt "InputWidget|"
+msgid "Italic"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:222
+msgctxt "InputWidget|"
+msgid "Underline"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:262
+msgctxt "InputWidget|"
+msgid "Set foreground color"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:293
 msgctxt "InputWidget|"
-msgid "Form"
-msgstr "Formular"
+msgid "Set background color"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:327
+msgctxt "InputWidget|"
+msgid "Clear formatting"
+msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "White"
 msgstr "Weiß"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Black"
 msgstr "Schwarz"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr "Dunkelblau"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr "Dunkelgrün"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Red"
 msgstr "Rot"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr "Dunkelrot"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr "Dunkelviolett"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Orange"
 msgstr "Orange"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr "Gelb"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Green"
 msgstr "Grün"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr "Dunkeltürkis"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr "Türkis"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Blue"
 msgstr "Blau"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr "Violett"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr "Dunkelgrau"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr "Hellgrau"
 
-#: ../src/qtui/inputwidget.cpp:86 ../src/qtui/inputwidget.cpp:87
+#: ../src/qtui/inputwidget.cpp:88 ../src/qtui/inputwidget.cpp:89
 msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr "Farbe löschen"
 
-#: ../src/qtui/inputwidget.cpp:137
+#: ../src/qtui/inputwidget.cpp:149
 msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr "Eingabezeile fokussieren"
 
+#: ../src/qtui/inputwidget.cpp:636
+msgctxt "InputWidget|"
+msgid "Hide formatting options"
+msgstr ""
+
+#: ../src/qtui/inputwidget.cpp:639
+msgctxt "InputWidget|"
+msgid "Show formatting options"
+msgstr ""
+
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
 msgctxt "InputWidgetSettingsPage|"
 msgid "Form"
@@ -4201,80 +5630,75 @@ msgstr "Benutzerdefinierte Schriftart:"
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
 msgctxt "InputWidgetSettingsPage|"
-msgid "Enable spell check"
-msgstr "Rechtschreibprüfung"
-
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
-msgctxt "InputWidgetSettingsPage|"
 msgid "Enable per chat history"
 msgstr "Eigenen Verlauf für jeden Chat"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:66
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
 msgstr "Namensauswahlliste anzeigen"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:82
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
 msgstr "Stil-Button anzeigen"
 
-#: ../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 "Aktiviert (begrenzte) Emacs-Tastaturbefehle für das Eingabefeld."
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:101
 msgctxt "InputWidgetSettingsPage|"
 msgid "Emacs key bindings"
 msgstr "Emacs-Tastaturbefehle"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enables line wrapping for input."
 msgstr "Zeilenumbruch für die Eingabe aktivieren."
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:117
 msgctxt "InputWidgetSettingsPage|"
 msgid "Line wrapping"
 msgstr "Zeilenumbruch"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:143
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
 msgctxt "InputWidgetSettingsPage|"
-msgid "Multi-Line Editing"
-msgstr "Mehr als eine Zeile"
+msgid "&Multi-Line Editing"
+msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:160
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:147
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show at most"
 msgstr "Zeige allerhöchstens"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:186
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:173
 msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
 msgstr "Zeilen"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:208
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
 msgstr "Scrollbalken"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:227
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:214
 msgctxt "InputWidgetSettingsPage|"
 msgid "Tab Completion"
 msgstr "Tab-Vervollständigung"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:222
 msgctxt "InputWidgetSettingsPage|"
 msgid "Completion suffix:"
 msgstr "Vervollständigungssuffix:"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:251
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:238
 msgctxt "InputWidgetSettingsPage|"
 msgid ": "
 msgstr ": "
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:278
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:265
 msgctxt "InputWidgetSettingsPage|"
 msgid "Add space after nick when completing mid-sentence"
 msgstr "Nach Tabvervollständigung innerhalb eines Satzes Leerzechen einfügen"
@@ -4289,7 +5713,7 @@ msgctxt "InputWidgetSettingsPage|"
 msgid "Input Widget"
 msgstr "Eingabezeile"
 
-#: ../src/common/internalpeer.cpp:58
+#: ../src/common/internalpeer.cpp:52 ../src/common/internalpeer.cpp:58
 msgctxt "InternalPeer|"
 msgid "internal connection"
 msgstr "interne Verbindung"
@@ -4314,28 +5738,95 @@ msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr "Thema"
 
-#: ../src/client/networkmodel.cpp:953
+#: ../src/core/ircparser.cpp:369
+msgctxt "IrcParser|"
+msgid "Capability negotiation not supported"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1187
 msgctxt "IrcUserItem|"
-msgid " is away"
-msgstr " ist abwesend"
+msgid "Modes"
+msgstr "Modus"
 
-#: ../src/client/networkmodel.cpp:968
-#, qt-format
+#: ../src/client/networkmodel.cpp:1191
 msgctxt "IrcUserItem|"
-msgid "idling since %1"
-msgstr "Untätig seit %1"
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: ../src/client/networkmodel.cpp:971
-#, qt-format
+#: ../src/client/networkmodel.cpp:1197
 msgctxt "IrcUserItem|"
-msgid "login time: %1"
-msgstr "Angemeldet seit: %1"
+msgid "Away message"
+msgstr "Abwesenheitsnachricht"
 
-#: ../src/client/networkmodel.cpp:974
-#, qt-format
+#: ../src/client/networkmodel.cpp:1199
+msgctxt "IrcUserItem|"
+msgid "Realname"
+msgstr "Realer Name"
+
+#: ../src/client/networkmodel.cpp:1206
+msgctxt "IrcUserItem|"
+msgid "Help status"
+msgstr "Hilfestatus"
+
+#: ../src/client/networkmodel.cpp:1207
+msgctxt "IrcUserItem|"
+msgid "Available for help"
+msgstr "Verfügbar für Hilfe"
+
+#: ../src/client/networkmodel.cpp:1210
 msgctxt "IrcUserItem|"
-msgid "server: %1"
-msgstr "Server: %1"
+msgid "Service status"
+msgstr "Service Status"
+
+#: ../src/client/networkmodel.cpp:1220
+msgctxt "IrcUserItem|"
+msgid "Not logged in"
+msgstr "Nicht eingeloggt"
+
+#: ../src/client/networkmodel.cpp:1226 ../src/client/networkmodel.cpp:1235
+msgctxt "IrcUserItem|"
+msgid "Account"
+msgstr "Konto"
+
+#: ../src/client/networkmodel.cpp:1236
+msgctxt "IrcUserItem|"
+msgid "Identified for this nick"
+msgstr "Identifiziert mit Benutzer"
+
+#: ../src/client/networkmodel.cpp:1242
+msgctxt "IrcUserItem|"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1246
+msgctxt "IrcUserItem|"
+msgid "Hostmask"
+msgstr "Hostmask"
+
+#: ../src/client/networkmodel.cpp:1250
+msgctxt "IrcUserItem|"
+msgid "Operator"
+msgstr "Operator"
+
+#: ../src/client/networkmodel.cpp:1258
+msgctxt "IrcUserItem|"
+msgid "Idling since"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1262
+msgctxt "IrcUserItem|"
+msgid "Login time"
+msgstr "Login-Zeit"
+
+#: ../src/client/networkmodel.cpp:1265
+msgctxt "IrcUserItem|"
+msgid "Server"
+msgstr "Server"
+
+#: ../src/client/networkmodel.cpp:1270
+msgctxt "IrcUserItem|"
+msgid "No information available"
+msgstr "Keine Informationen verfügbar"
 
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:14
 msgctxt "ItemViewSettingsPage|"
@@ -4372,53 +5863,53 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Use Custom Colors"
 msgstr "Benutzerdefinierte Farben"
 
-#: ../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 "Inaktive:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:169
 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
 msgstr "Ungelesene:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:193
 msgctxt "ItemViewSettingsPage|"
 msgid "Highlight:"
 msgstr "Hervorhebung:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:217
 msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
 msgstr "Andere Aktivität:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:318
 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 msgstr "Benutzerdefinierte Farben für Spitznamen"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:333
 msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
 msgstr "Angemeldet:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:373
 msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr "Abwesend:"
@@ -4463,7 +5954,7 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Other activity"
 msgstr "Andere Aktivitäten"
 
-#: ../src/qtui/knotificationbackend.cpp:139
+#: ../src/qtui/knotificationbackend.cpp:137
 #, qt-format
 msgctxt "KNotificationBackend|"
 msgid "%n pending highlight(s)"
@@ -4550,412 +6041,572 @@ msgctxt "KeySequenceWidget|"
 msgid "Reassign"
 msgstr "Neu zuweisen"
 
-#: ../src/common/protocols/legacy/legacypeer.cpp:136
+#: ../src/core/ldapauthenticator.cpp:77
+msgctxt "LdapAuthenticator|"
+msgid "LDAP"
+msgstr "LDAP"
+
+#: ../src/core/ldapauthenticator.cpp:83
+msgctxt "LdapAuthenticator|"
+msgid "Authenticate users using an LDAP server."
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:91
+msgctxt "LdapAuthenticator|"
+msgid "Hostname"
+msgstr "Hostname"
+
+#: ../src/core/ldapauthenticator.cpp:92
+msgctxt "LdapAuthenticator|"
+msgid "Port"
+msgstr "Port"
+
+#: ../src/core/ldapauthenticator.cpp:93
+msgctxt "LdapAuthenticator|"
+msgid "Bind DN"
+msgstr "Bind DN"
+
+#: ../src/core/ldapauthenticator.cpp:94
+msgctxt "LdapAuthenticator|"
+msgid "Bind Password"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:95
+msgctxt "LdapAuthenticator|"
+msgid "Base DN"
+msgstr "Basis DN"
+
+#: ../src/core/ldapauthenticator.cpp:96
+msgctxt "LdapAuthenticator|"
+msgid "Filter"
+msgstr "Filter"
+
+#: ../src/core/ldapauthenticator.cpp:97
+msgctxt "LdapAuthenticator|"
+msgid "UID Attribute"
+msgstr "UID Attribute"
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:146
 msgctxt "LegacyPeer|"
 msgid "Invalid handshake message!"
 msgstr "Ungültige Handshake-Nachricht!"
 
-#: ../src/common/protocols/legacy/legacypeer.cpp:207
+#: ../src/common/protocols/legacy/legacypeer.cpp:224
 #, qt-format
 msgctxt "LegacyPeer|"
 msgid "Unknown protocol message of type %1"
 msgstr "Unbekannte Protokollnachricht vom Typ %1"
 
-#: ../src/qtui/mainwin.cpp:358
+#: ../src/common/logger.cpp:97
+#, qt-format
+msgctxt "Logger|"
+msgid "Invalid log level %1; supported are Debug|Info|Warning|Error"
+msgstr ""
+
+#: ../src/common/logger.cpp:106
+#, qt-format
+msgctxt "Logger|"
+msgid "Could not open log file \"%1\": %2"
+msgstr "Log-Datei konnte nicht geöffnet werden: \"%1\":%2"
+
+#: ../src/common/logger.cpp:111
+#, qt-format
+msgctxt "Logger|"
+msgid "Cannot write to stderr: %1"
+msgstr ""
+
+#: ../src/qtui/mainpage.cpp:42
+msgctxt "MainPage|"
+msgid "Connect to Core..."
+msgstr "Verbinde zu Core..."
+
+#: ../src/qtui/mainwin.cpp:401
 msgctxt "MainWin|"
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:403
 msgctxt "MainWin|"
 msgid "&Connect to Core..."
 msgstr "Zum Core &verbinden..."
 
-#: ../src/qtui/mainwin.cpp:362
+#: ../src/qtui/mainwin.cpp:405
 msgctxt "MainWin|"
 msgid "&Disconnect from Core"
 msgstr "Vom Core &trennen"
 
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:407
 msgctxt "MainWin|"
 msgid "Change &Password..."
 msgstr "&Passwort ändern..."
 
-#: ../src/qtui/mainwin.cpp:366
+#: ../src/qtui/mainwin.cpp:409
 msgctxt "MainWin|"
 msgid "Core &Info..."
 msgstr "Core-&Info..."
 
-#: ../src/qtui/mainwin.cpp:368
+#: ../src/qtui/mainwin.cpp:411
 msgctxt "MainWin|"
 msgid "Configure &Networks..."
 msgstr "&Netzwerke konfigurieren..."
 
-#: ../src/qtui/mainwin.cpp:371
+#: ../src/qtui/mainwin.cpp:418
 msgctxt "MainWin|"
 msgid "&Quit"
 msgstr "&Beenden"
 
-#: ../src/qtui/mainwin.cpp:375
+#: ../src/qtui/mainwin.cpp:422
 msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
 msgstr "Chat-Listen &konfigurieren..."
 
-#: ../src/qtui/mainwin.cpp:378
+#: ../src/qtui/mainwin.cpp:425
 msgctxt "MainWin|"
 msgid "&Lock Layout"
 msgstr "Ansicht &fixieren"
 
-#: ../src/qtui/mainwin.cpp:382
+#: ../src/qtui/mainwin.cpp:429
 msgctxt "MainWin|"
 msgid "Show &Search Bar"
 msgstr "&Suchleiste anzeigen"
 
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:431
 msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr "Abwesenheitslog anzeigen"
 
-#: ../src/qtui/mainwin.cpp:386
+#: ../src/qtui/mainwin.cpp:433
 msgctxt "MainWin|"
 msgid "Show &Menubar"
 msgstr "&Menüleiste anzeigen"
 
-#: ../src/qtui/mainwin.cpp:389
+#: ../src/qtui/mainwin.cpp:436
 msgctxt "MainWin|"
 msgid "Show Status &Bar"
 msgstr "St&atusleiste anzeigen"
 
-#: ../src/qtui/mainwin.cpp:395
+#: ../src/qtui/mainwin.cpp:442
 msgctxt "MainWin|"
 msgid "&Full Screen Mode"
 msgstr "&Vollbildmodus"
 
-#: ../src/qtui/mainwin.cpp:402
+#: ../src/qtui/mainwin.cpp:449
 msgctxt "MainWin|"
 msgid "Configure &Shortcuts..."
 msgstr "&Tastenkürzel einrichten ..."
 
-#: ../src/qtui/mainwin.cpp:408 ../src/qtui/mainwin.cpp:412
+#: ../src/qtui/mainwin.cpp:455 ../src/qtui/mainwin.cpp:459
 msgctxt "MainWin|"
 msgid "&Configure Quassel..."
 msgstr "Quassel &konfigurieren..."
 
-#: ../src/qtui/mainwin.cpp:418
+#: ../src/qtui/mainwin.cpp:465
 msgctxt "MainWin|"
 msgid "&About Quassel"
 msgstr "&Über Quassel"
 
-#: ../src/qtui/mainwin.cpp:423
+#: ../src/qtui/mainwin.cpp:470
 msgctxt "MainWin|"
 msgid "About &Qt"
 msgstr "Ü&ber Qt"
 
-#: ../src/qtui/mainwin.cpp:427
+#: ../src/qtui/mainwin.cpp:474
 msgctxt "MainWin|"
 msgid "Debug &NetworkModel"
 msgstr "Debug &NetworkModel"
 
-#: ../src/qtui/mainwin.cpp:429
+#: ../src/qtui/mainwin.cpp:476
 msgctxt "MainWin|"
 msgid "Debug &BufferViewOverlay"
 msgstr "Fehler beseitigen (&BufferViewOverlay)"
 
-#: ../src/qtui/mainwin.cpp:431
+#: ../src/qtui/mainwin.cpp:478
 msgctxt "MainWin|"
 msgid "Debug &MessageModel"
 msgstr "Debug &MessageModel"
 
-#: ../src/qtui/mainwin.cpp:433
+#: ../src/qtui/mainwin.cpp:480
 msgctxt "MainWin|"
 msgid "Debug &HotList"
 msgstr "Fehler beseitigen (&HotList)"
 
-#: ../src/qtui/mainwin.cpp:435
+#: ../src/qtui/mainwin.cpp:482
 msgctxt "MainWin|"
 msgid "Debug &Log"
 msgstr "Debug &Log"
 
-#: ../src/qtui/mainwin.cpp:437
+#: ../src/qtui/mainwin.cpp:484
 msgctxt "MainWin|"
 msgid "Reload Stylesheet"
 msgstr "Layoutdatei neu laden"
 
-#: ../src/qtui/mainwin.cpp:440
+#: ../src/qtui/mainwin.cpp:487
 msgctxt "MainWin|"
 msgid "Hide Current Buffer"
 msgstr "Aktuellen Chat ausblenden"
 
-#: ../src/qtui/mainwin.cpp:444
+#: ../src/qtui/mainwin.cpp:491
+msgctxt "MainWin|"
+msgid "Text formatting"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:494
+msgctxt "MainWin|"
+msgid "Apply foreground color"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:499
+msgctxt "MainWin|"
+msgid "Apply background color"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:504
+msgctxt "MainWin|"
+msgid "Clear formatting"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:509
+msgctxt "MainWin|"
+msgid "Toggle bold"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:514
+msgctxt "MainWin|"
+msgid "Toggle italics"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:519
+msgctxt "MainWin|"
+msgid "Toggle underline"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:523
 msgctxt "MainWin|"
 msgid "Navigation"
 msgstr "Navigation"
 
-#: ../src/qtui/mainwin.cpp:446
+#: ../src/qtui/mainwin.cpp:525
 msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr "Zum neusten Chat springen"
 
-#: ../src/qtui/mainwin.cpp:458
+#: ../src/qtui/mainwin.cpp:528
+msgctxt "MainWin|"
+msgid "Activate the buffer search"
+msgstr "Aktiviere die Puffer-Suche"
+
+#: ../src/qtui/mainwin.cpp:540
 msgctxt "MainWin|"
 msgid "Set Quick Access #0"
 msgstr "Schnellzugriff #0 festlegen"
 
-#: ../src/qtui/mainwin.cpp:460
+#: ../src/qtui/mainwin.cpp:542
 msgctxt "MainWin|"
 msgid "Set Quick Access #1"
 msgstr "Schnellzugriff #1 festlegen"
 
-#: ../src/qtui/mainwin.cpp:462
+#: ../src/qtui/mainwin.cpp:544
 msgctxt "MainWin|"
 msgid "Set Quick Access #2"
 msgstr "Schnellzugriff #2 festlegen"
 
-#: ../src/qtui/mainwin.cpp:464
+#: ../src/qtui/mainwin.cpp:546
 msgctxt "MainWin|"
 msgid "Set Quick Access #3"
 msgstr "Schnellzugriff #3 festlegen"
 
-#: ../src/qtui/mainwin.cpp:466
+#: ../src/qtui/mainwin.cpp:548
 msgctxt "MainWin|"
 msgid "Set Quick Access #4"
 msgstr "Schnellzugriff #4 festlegen"
 
-#: ../src/qtui/mainwin.cpp:468
+#: ../src/qtui/mainwin.cpp:550
 msgctxt "MainWin|"
 msgid "Set Quick Access #5"
 msgstr "Schnellzugriff #5 festlegen"
 
-#: ../src/qtui/mainwin.cpp:470
+#: ../src/qtui/mainwin.cpp:552
 msgctxt "MainWin|"
 msgid "Set Quick Access #6"
 msgstr "Schnellzugriff #6 festlegen"
 
-#: ../src/qtui/mainwin.cpp:472
+#: ../src/qtui/mainwin.cpp:554
 msgctxt "MainWin|"
 msgid "Set Quick Access #7"
 msgstr "Schnellzugriff #7 festlegen"
 
-#: ../src/qtui/mainwin.cpp:474
+#: ../src/qtui/mainwin.cpp:556
 msgctxt "MainWin|"
 msgid "Set Quick Access #8"
 msgstr "Schnellzugriff #8 festlegen"
 
-#: ../src/qtui/mainwin.cpp:476
+#: ../src/qtui/mainwin.cpp:558
 msgctxt "MainWin|"
 msgid "Set Quick Access #9"
 msgstr "Schnellzugriff #9 festlegen"
 
-#: ../src/qtui/mainwin.cpp:479
+#: ../src/qtui/mainwin.cpp:561
 msgctxt "MainWin|"
 msgid "Quick Access #0"
 msgstr "Schnellzugriff #0"
 
-#: ../src/qtui/mainwin.cpp:481
+#: ../src/qtui/mainwin.cpp:563
 msgctxt "MainWin|"
 msgid "Quick Access #1"
 msgstr "Schnellzugriff #1"
 
-#: ../src/qtui/mainwin.cpp:483
+#: ../src/qtui/mainwin.cpp:565
 msgctxt "MainWin|"
 msgid "Quick Access #2"
 msgstr "Schnellzugriff #2"
 
-#: ../src/qtui/mainwin.cpp:485
+#: ../src/qtui/mainwin.cpp:567
 msgctxt "MainWin|"
 msgid "Quick Access #3"
 msgstr "Schnellzugriff #3"
 
-#: ../src/qtui/mainwin.cpp:487
+#: ../src/qtui/mainwin.cpp:569
 msgctxt "MainWin|"
 msgid "Quick Access #4"
 msgstr "Schnellzugriff #4"
 
-#: ../src/qtui/mainwin.cpp:489
+#: ../src/qtui/mainwin.cpp:571
 msgctxt "MainWin|"
 msgid "Quick Access #5"
 msgstr "Schnellzugriff #5"
 
-#: ../src/qtui/mainwin.cpp:491
+#: ../src/qtui/mainwin.cpp:573
 msgctxt "MainWin|"
 msgid "Quick Access #6"
 msgstr "Schnellzugriff #6"
 
-#: ../src/qtui/mainwin.cpp:493
+#: ../src/qtui/mainwin.cpp:575
 msgctxt "MainWin|"
 msgid "Quick Access #7"
 msgstr "Schnellzugriff #7"
 
-#: ../src/qtui/mainwin.cpp:495
+#: ../src/qtui/mainwin.cpp:577
 msgctxt "MainWin|"
 msgid "Quick Access #8"
 msgstr "Schnellzugriff #8"
 
-#: ../src/qtui/mainwin.cpp:497
+#: ../src/qtui/mainwin.cpp:579
 msgctxt "MainWin|"
 msgid "Quick Access #9"
 msgstr "Schnellzugriff #9"
 
-#: ../src/qtui/mainwin.cpp:501
+#: ../src/qtui/mainwin.cpp:583
 msgctxt "MainWin|"
 msgid "Activate Next Chat List"
 msgstr "Aktiviere die nächste Chatliste"
 
-#: ../src/qtui/mainwin.cpp:503
+#: ../src/qtui/mainwin.cpp:585
 msgctxt "MainWin|"
 msgid "Activate Previous Chat List"
 msgstr "Vorherige die nächste Chatliste"
 
-#: ../src/qtui/mainwin.cpp:505
+#: ../src/qtui/mainwin.cpp:587
 msgctxt "MainWin|"
 msgid "Go to Next Chat"
 msgstr "Gehe zum nächsten Chat"
 
-#: ../src/qtui/mainwin.cpp:507
+#: ../src/qtui/mainwin.cpp:589
 msgctxt "MainWin|"
 msgid "Go to Previous Chat"
 msgstr "Gehe zum vorherigen Chat"
 
-#: ../src/qtui/mainwin.cpp:516
+#: ../src/qtui/mainwin.cpp:598
 msgctxt "MainWin|"
 msgid "&File"
 msgstr "&Datei"
 
-#: ../src/qtui/mainwin.cpp:529
+#: ../src/qtui/mainwin.cpp:611
 msgctxt "MainWin|"
 msgid "&Networks"
 msgstr "&Netzwerke"
 
-#: ../src/qtui/mainwin.cpp:535
+#: ../src/qtui/mainwin.cpp:617
 msgctxt "MainWin|"
 msgid "&View"
 msgstr "&Ansicht"
 
-#: ../src/qtui/mainwin.cpp:536
+#: ../src/qtui/mainwin.cpp:618
 msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr "&Chat-Listen"
 
-#: ../src/qtui/mainwin.cpp:538
+#: ../src/qtui/mainwin.cpp:620
 msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr "&Werkzeugleiste"
 
-#: ../src/qtui/mainwin.cpp:552
+#: ../src/qtui/mainwin.cpp:634
 msgctxt "MainWin|"
 msgid "&Settings"
 msgstr "Ein&stellungen"
 
-#: ../src/qtui/mainwin.cpp:562
+#: ../src/qtui/mainwin.cpp:644
 msgctxt "MainWin|"
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: ../src/qtui/mainwin.cpp:571
+#: ../src/qtui/mainwin.cpp:653
 msgctxt "MainWin|"
 msgid "Debug"
 msgstr "Debug"
 
-#: ../src/qtui/mainwin.cpp:747
+#: ../src/qtui/mainwin.cpp:830
 msgctxt "MainWin|"
 msgid "Feature Not Supported"
 msgstr "Funktion nicht unterstützt"
 
-#: ../src/qtui/mainwin.cpp:748
+#: ../src/qtui/mainwin.cpp:831
 msgctxt "MainWin|"
 msgid "<b>Your Quassel Core does not support this feature</b>"
 msgstr "<b>Ihr Quassel Core unterstützt diese Funktion nicht</b>"
 
-#: ../src/qtui/mainwin.cpp:750
+#: ../src/qtui/mainwin.cpp:833
 msgctxt "MainWin|"
 msgid ""
 "You need a Quassel Core v0.12.0 or newer in order to be able to remotely "
 "change your password."
 msgstr "Sie benötigen Quassel Core v0.12.0 oder neuer um Ihr Passwort vom Client aus ändern zu können."
 
-#: ../src/qtui/mainwin.cpp:863
+#: ../src/qtui/mainwin.cpp:843
+msgctxt "MainWin|"
+msgid "Upgrading..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:844
+msgctxt "MainWin|"
+msgid "Your database is being upgraded"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:847
+msgctxt "MainWin|"
+msgid ""
+"In order to support new features, we need to make changes to your backlog "
+"database. This may take a long while."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:849
+msgctxt "MainWin|"
+msgid "Do not exit Quassel until the upgrade is complete!"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:866
+msgctxt "MainWin|"
+msgid "Fatal error"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:867
+msgctxt "MainWin|"
+msgid "Quassel encountered a fatal error and is terminated."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:869
+msgctxt "MainWin|"
+msgid "Reason:<em>"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:997
 msgctxt "MainWin|"
 msgid "Nicks"
 msgstr "Spitznamen"
 
-#: ../src/qtui/mainwin.cpp:872
+#: ../src/qtui/mainwin.cpp:1007
 msgctxt "MainWin|"
 msgid "Show Nick List"
 msgstr "Spitznamenliste anzeigen"
 
-#: ../src/qtui/mainwin.cpp:885
+#: ../src/qtui/mainwin.cpp:1022
 msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr "Chatmonitor"
 
-#: ../src/qtui/mainwin.cpp:897
+#: ../src/qtui/mainwin.cpp:1033
 msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr "Chatmonitor anzeigen"
 
-#: ../src/qtui/mainwin.cpp:903
+#: ../src/qtui/mainwin.cpp:1039
 msgctxt "MainWin|"
 msgid "Inputline"
 msgstr "Eingabezeile"
 
-#: ../src/qtui/mainwin.cpp:912
+#: ../src/qtui/mainwin.cpp:1048
 msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr "Eingabezeile anzeigen"
 
-#: ../src/qtui/mainwin.cpp:927
+#: ../src/qtui/mainwin.cpp:1061
 msgctxt "MainWin|"
 msgid "Topic"
 msgstr "Thema"
 
-#: ../src/qtui/mainwin.cpp:939
+#: ../src/qtui/mainwin.cpp:1073
 msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr "Thema anzeigen"
 
-#: ../src/qtui/mainwin.cpp:1033
+#: ../src/qtui/mainwin.cpp:1079
+msgctxt "MainWin|"
+msgid "Transfers"
+msgstr "Übertragung"
+
+#: ../src/qtui/mainwin.cpp:1090
+msgctxt "MainWin|"
+msgid "Show File Transfers"
+msgstr "Zeige Dateiübertragung"
+
+#: ../src/qtui/mainwin.cpp:1187
 msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr "Hauptwerkzeugleiste"
 
-#: ../src/qtui/mainwin.cpp:1097
+#: ../src/qtui/mainwin.cpp:1207
+msgctxt "MainWin|"
+msgid "Nick Toolbar"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1284
 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr "Mit Quassel-Core verbunden."
 
-#: ../src/qtui/mainwin.cpp:1197
+#: ../src/qtui/mainwin.cpp:1384
 msgctxt "MainWin|"
 msgid "Not connected to core."
 msgstr "Nicht mit Core verbunden."
 
-#: ../src/qtui/mainwin.cpp:1215 ../src/qtui/mainwin.cpp:1225
+#: ../src/qtui/mainwin.cpp:1403 ../src/qtui/mainwin.cpp:1413
 msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr "Unverschlüsselte Verbindung"
 
-#: ../src/qtui/mainwin.cpp:1215
+#: ../src/qtui/mainwin.cpp:1403
 msgctxt "MainWin|"
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr "<b>Ihr Client unterstüzt keine SSL-Verschlüsselung</b>"
 
-#: ../src/qtui/mainwin.cpp:1217 ../src/qtui/mainwin.cpp:1227
+#: ../src/qtui/mainwin.cpp:1405 ../src/qtui/mainwin.cpp:1415
 msgctxt "MainWin|"
 msgid ""
 "Sensitive data, like passwords, will be transmitted unencrypted to your "
 "Quassel core."
 msgstr "Persönliche Daten, wie Passwörter, werden unverschlüsselt zum Quassel-Core gesendet."
 
-#: ../src/qtui/mainwin.cpp:1225
+#: ../src/qtui/mainwin.cpp:1413
 msgctxt "MainWin|"
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr "<b>Ihr Quassel-Core unterstüzt keine SSL-Verschlüsselung</b>"
 
-#: ../src/qtui/mainwin.cpp:1243 ../src/qtui/mainwin.cpp:1264
+#: ../src/qtui/mainwin.cpp:1431 ../src/qtui/mainwin.cpp:1452
 msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr "Nicht vertrauenswürdiges SSL-Zertifikat"
 
-#: ../src/qtui/mainwin.cpp:1244
+#: ../src/qtui/mainwin.cpp:1432
 #, qt-format
 msgctxt "MainWin|"
 msgid ""
@@ -4963,38 +6614,48 @@ msgid ""
 "following reasons:</b>"
 msgstr "<b>Das SSL-Zertifikat des Quassel-Core auf %1 ist nicht vertrauenswürdig, weil:</b>"
 
-#: ../src/qtui/mainwin.cpp:1247
+#: ../src/qtui/mainwin.cpp:1435
 msgctxt "MainWin|"
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: ../src/qtui/mainwin.cpp:1248
+#: ../src/qtui/mainwin.cpp:1436
 msgctxt "MainWin|"
 msgid "Show Certificate"
 msgstr "SSL-Zertifikat anzeigen"
 
-#: ../src/qtui/mainwin.cpp:1265
+#: ../src/qtui/mainwin.cpp:1453
 msgctxt "MainWin|"
 msgid ""
 "Would you like to accept this certificate forever without being prompted?"
 msgstr "Möchten sie das Zertifikat dauerhaft, ohne künftige Nachfragen akzeptieren?"
 
-#: ../src/qtui/mainwin.cpp:1267
+#: ../src/qtui/mainwin.cpp:1455
 msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr "Nur aktuelle Sitzung"
 
-#: ../src/qtui/mainwin.cpp:1268
+#: ../src/qtui/mainwin.cpp:1456
 msgctxt "MainWin|"
 msgid "Forever"
 msgstr "Dauerhaft"
 
-#: ../src/qtui/mainwin.cpp:1279
+#: ../src/qtui/mainwin.cpp:1467
 msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr "Core-Verbindungsfehler"
 
-#: ../src/client/messagemodel.cpp:404
+#: ../src/qtui/mainwin.cpp:1499 ../src/qtui/mainwin.cpp:1500
+msgctxt "MainWin|"
+msgid "No network selected"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1502
+msgctxt "MainWin|"
+msgid "Select a network before trying to view the channel list."
+msgstr ""
+
+#: ../src/client/messagemodel.cpp:405
 #, qt-format
 msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -5010,7 +6671,12 @@ msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr "Empfange Verlauf"
 
-#: ../src/uisupport/multilineedit.cpp:701
+#: ../src/uisupport/multilineedit.cpp:111
+msgctxt "MultiLineEdit|"
+msgid "Auto Spell Check"
+msgstr ""
+
+#: ../src/uisupport/multilineedit.cpp:745
 #, qt-format
 msgctxt "MultiLineEdit|"
 msgid "Do you really want to paste %n line(s)?"
@@ -5018,7 +6684,7 @@ msgid_plural "Do you really want to paste %n line(s)?"
 msgstr[0] "Wollen Sie wirklich %n Zeile einfügen?"
 msgstr[1] "Wollen Sie wirklich %n Zeilen einfügen?"
 
-#: ../src/uisupport/multilineedit.cpp:714
+#: ../src/uisupport/multilineedit.cpp:758
 msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr "Spamschutz"
@@ -5065,8 +6731,38 @@ msgstr "Serverpasswort:"
 
 #: ../src/qtui/settingspages/networkadddlg.ui:131
 msgctxt "NetworkAddDlg|"
-msgid "Use secure connection"
-msgstr "Gesicherte Verbindung benutzen"
+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 "Benutze verschlüsselte Verbindung"
+
+#: ../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 "Überprüfe Verbindungssicherheit"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1056
+msgctxt "NetworkAddDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr "Dein Quassel Core unterstützt dieses Leistungsmerkmal nicht"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1057
+msgctxt "NetworkAddDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to verify connection "
+"security."
+msgstr ""
 
 #: ../src/qtui/settingspages/networkeditdlg.ui:13
 msgctxt "NetworkEditDlg|"
@@ -5078,91 +6774,115 @@ msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
 msgstr "Bitte geben Sie einen Netzwerknamen ein:"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:841
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1130
 msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr "Netzwerk hinzufügen"
 
-#: ../src/client/networkmodel.cpp:216 ../src/client/networkmodel.cpp:219
-#, qt-format
+#: ../src/client/networkmodel.cpp:255
 msgctxt "NetworkItem|"
-msgid "Server: %1"
-msgstr "Server: %1"
+msgid "Server"
+msgstr "Server"
 
-#: ../src/client/networkmodel.cpp:221
-#, qt-format
+#: ../src/client/networkmodel.cpp:256
 msgctxt "NetworkItem|"
-msgid "Users: %1"
-msgstr "Benutzer: %1"
+msgid "Users"
+msgstr "Benutzer"
+
+#: ../src/client/networkmodel.cpp:258
+msgctxt "NetworkItem|"
+msgid "Lag"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:224
+#: ../src/client/networkmodel.cpp:258
 #, qt-format
 msgctxt "NetworkItem|"
-msgid "Lag: %1 msecs"
-msgstr "Latenz: %1 msek"
+msgid "%1 msecs"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:1002
+#: ../src/client/networkmodel.cpp:262
+msgctxt "NetworkItem|"
+msgid "Not connected"
+msgstr "Nicht verbunden"
+
+#: ../src/client/networkmodel.cpp:1314
 msgctxt "NetworkModel|"
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/client/networkmodel.cpp:1002
+#: ../src/client/networkmodel.cpp:1314
 msgctxt "NetworkModel|"
 msgid "Topic"
 msgstr "Thema"
 
-#: ../src/client/networkmodel.cpp:1002
+#: ../src/client/networkmodel.cpp:1314
 msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr "Spitznamenzähler"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:177
+#: ../src/uisupport/networkmodelcontroller.cpp:178
 msgctxt "NetworkModelController|"
 msgid "Do you want to delete the following buffer(s) permanently?"
 msgid_plural "Do you want to delete the following buffer(s) permanently?"
 msgstr[0] "Wollen Sie folgenden Chat permanent löschen?"
 msgstr[1] "Wollen Sie folgende Chats permanent löschen?"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:190
+#: ../src/uisupport/networkmodelcontroller.cpp:191
 #, qt-format
 msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr "...und <b>%1</b> weitere<br><br>"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:191
+#: ../src/uisupport/networkmodelcontroller.cpp:192
 msgctxt "NetworkModelController|"
 msgid ""
 "<b>Note:</b> This will delete all related data, including all backlog data, "
 "from the core's database and cannot be undone."
 msgstr "<b>Achtung:</b> Diese Aktion wird alle betroffenen Daten, einschließlich des Verlaufes, vom Core entfernen. Kann nicht rückgängig gemacht werden."
 
-#: ../src/uisupport/networkmodelcontroller.cpp:193
+#: ../src/uisupport/networkmodelcontroller.cpp:194
 msgctxt "NetworkModelController|"
 msgid ""
 "<br>Active channel buffers cannot be deleted, please part the channel first."
 msgstr "<br>Aktive Chats können nicht gelöscht werden. Bitte den Kanal erst verlassen."
 
-#: ../src/uisupport/networkmodelcontroller.cpp:195
+#: ../src/uisupport/networkmodelcontroller.cpp:196
 msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr "Verläufe permanent löschen?"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:544
+#: ../src/uisupport/networkmodelcontroller.cpp:241
+#: ../src/uisupport/networkmodelcontroller.cpp:243
+msgctxt "NetworkModelController|"
+msgid "Question"
+msgstr "Fragen"
+
+#: ../src/uisupport/networkmodelcontroller.cpp:241
+msgctxt "NetworkModelController|"
+msgid "Really Connect to all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:243
+msgctxt "NetworkModelController|"
+msgid "Really disconnect from all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:556
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr "Kanal betreten"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:547
+#: ../src/uisupport/networkmodelcontroller.cpp:559
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Network:"
 msgstr "Netzwerk:"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:549
+#: ../src/uisupport/networkmodelcontroller.cpp:561
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:551
+#: ../src/uisupport/networkmodelcontroller.cpp:563
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Password:"
 msgstr "Passwort:"
@@ -5183,13 +6903,13 @@ msgid "Re&name..."
 msgstr "Umbe&nennen..."
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:65
-#: ../src/qtui/settingspages/networkssettingspage.ui:235
+#: ../src/qtui/settingspages/networkssettingspage.ui:234
 msgctxt "NetworksSettingsPage|"
 msgid "&Add..."
 msgstr "&Hinzufügen..."
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:88
-#: ../src/qtui/settingspages/networkssettingspage.ui:252
+#: ../src/qtui/settingspages/networkssettingspage.ui:251
 msgctxt "NetworksSettingsPage|"
 msgid "De&lete"
 msgstr "&Löschen"
@@ -5205,8 +6925,8 @@ msgid "Identity:"
 msgstr "Identität:"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:149
-#: ../src/qtui/settingspages/networkssettingspage.ui:281
-#: ../src/qtui/settingspages/networkssettingspage.ui:295
+#: ../src/qtui/settingspages/networkssettingspage.ui:280
+#: ../src/qtui/settingspages/networkssettingspage.ui:294
 msgctxt "NetworksSettingsPage|"
 msgid "..."
 msgstr "…"
@@ -5226,118 +6946,172 @@ msgctxt "NetworksSettingsPage|"
 msgid "&Edit..."
 msgstr "&Bearbeiten ..."
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:278
+#: ../src/qtui/settingspages/networkssettingspage.ui:277
 msgctxt "NetworksSettingsPage|"
 msgid "Move upwards in list"
 msgstr "In Liste nach oben verschieben"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:292
+#: ../src/qtui/settingspages/networkssettingspage.ui:291
 msgctxt "NetworksSettingsPage|"
 msgid "Move downwards in list"
 msgstr "In Liste nach unten verschieben"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:337
+#: ../src/qtui/settingspages/networkssettingspage.ui:336
 msgctxt "NetworksSettingsPage|"
 msgid "Commands"
 msgstr "Befehle"
 
-#: ../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 "Automatische Identifikation oder verschiedene Befehle zur Ausführung nach Herstellen der Serververbindung konfigurieren"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:346
+#: ../src/qtui/settingspages/networkssettingspage.ui:345
 msgctxt "NetworksSettingsPage|"
 msgid "Commands to execute on connect:"
 msgstr "Beim Verbinden auszuführende Befehle:"
 
-#: ../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 "Geben Sie eine Liste von IRC-Befehlen an, die beim Verbinden ausgeführt werden.\nBerücksichtigen Sie, dass Quassel IRC Kanälen automatisch erneut betritt. /join wird hier daher selten benötigt!"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:374
+#: ../src/qtui/settingspages/networkssettingspage.ui:373
 msgctxt "NetworksSettingsPage|"
 msgid "Connection"
 msgstr "Verbindung"
 
-#: ../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 "Automatisches Wiederverbinden bei Netzwerkfehlern"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:386
+#: ../src/qtui/settingspages/networkssettingspage.ui:385
 msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
 msgstr "Automatisches Wiederverbinden"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:397
+#: ../src/qtui/settingspages/networkssettingspage.ui:396
+#: ../src/qtui/settingspages/networkssettingspage.ui:595
 msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr "Zwischen den Verbindungsversuchen"
 
-#: ../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 "warten"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:444
+#: ../src/qtui/settingspages/networkssettingspage.ui:443
 msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
 msgstr "Anzahl der Wiederverbindungsversuche:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:464
+#: ../src/qtui/settingspages/networkssettingspage.ui:463
+#: ../src/qtui/settingspages/networkssettingspage.ui:547
 msgctxt "NetworksSettingsPage|"
 msgid "Unlimited"
 msgstr "Unbegrenzt"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:489
+#: ../src/qtui/settingspages/networkssettingspage.ui:488
 msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
 msgstr "Alle Kanäle beim Wiederverbinden erneut betreten"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:516
-#: ../src/qtui/settingspages/networkssettingspage.ui:525
+#: ../src/qtui/settingspages/networkssettingspage.ui:507
 msgctxt "NetworksSettingsPage|"
-msgid "Auto Identify"
-msgstr "Auto-Identifizieren"
+msgid "Use Custom Rate Limits"
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:540
+#: ../src/qtui/settingspages/networkssettingspage.ui:521
 msgctxt "NetworksSettingsPage|"
-msgid "NickServ"
-msgstr "NickServ"
+msgid "Max. messages at once:"
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:557
+#: ../src/qtui/settingspages/networkssettingspage.ui:528
 msgctxt "NetworksSettingsPage|"
-msgid "Service:"
-msgstr "Service:"
+msgid "Maximum number of messages to send without any delays"
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:567
-#: ../src/qtui/settingspages/networkssettingspage.ui:615
+#: ../src/qtui/settingspages/networkssettingspage.ui:544
 msgctxt "NetworksSettingsPage|"
-msgid "Password:"
-msgstr "Passwort:"
+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 "zwischen zukünftige Nachrichten"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:663
+#: ../src/qtui/settingspages/networkssettingspage.ui:814
+msgctxt "NetworksSettingsPage|"
+msgid "Auto Identify"
+msgstr "Auto-Identifizieren"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:672
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Authenticate using your nickname and password before joining any channels"
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:580
+#: ../src/qtui/settingspages/networkssettingspage.ui:675
 msgctxt "NetworksSettingsPage|"
 msgid "Use SASL Authentication"
 msgstr "SASL-Authentifizierung benutzen"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:625
+#: ../src/qtui/settingspages/networkssettingspage.ui:716
+msgctxt "NetworksSettingsPage|"
+msgid "Account name, often the same as your nickname"
+msgstr "Kontoname, oft der selbe als dein Benutzername"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:729
 msgctxt "NetworksSettingsPage|"
 msgid "Account:"
 msgstr "Kontoname:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:635
+#: ../src/qtui/settingspages/networkssettingspage.ui:739
+#: ../src/qtui/settingspages/networkssettingspage.ui:842
+msgctxt "NetworksSettingsPage|"
+msgid "Account password"
+msgstr "Kontopasswort"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:752
+#: ../src/qtui/settingspages/networkssettingspage.ui:862
+msgctxt "NetworksSettingsPage|"
+msgid "Password:"
+msgstr "Passwort:"
+
+#: ../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 "Details..."
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:798
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because"
@@ -5345,105 +7119,169 @@ msgid ""
 "used.</p></body></html>"
 msgstr "<html><head/><body><p><span style=\" font-weight:600;\">Hinweis:</span> Da die Identität ein SSL Zertifikat verwendet, wird SASL EXTERNAL genutzt.</p></body></html>"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:659
+#: ../src/qtui/settingspages/networkssettingspage.ui:811
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Authenticate to services using your password.  Use SASL instead to identify "
+"before joining channels."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:829
+msgctxt "NetworksSettingsPage|"
+msgid "Service user to send your password to, usually NickServ"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:832
+msgctxt "NetworksSettingsPage|"
+msgid "NickServ"
+msgstr "NickServ"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:852
+msgctxt "NetworksSettingsPage|"
+msgid "Service:"
+msgstr "Service:"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:886
 msgctxt "NetworksSettingsPage|"
 msgid "Encodings"
 msgstr "Kodierungen"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:662
+#: ../src/qtui/settingspages/networkssettingspage.ui:889
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure advanced settings such as message encodings and automatic "
 "reconnect"
 msgstr "Erweiterte Einstellungen wie Meldungskodierung und automatisches Wiederverbinden konfigurieren"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:671
+#: ../src/qtui/settingspages/networkssettingspage.ui:898
 msgctxt "NetworksSettingsPage|"
 msgid "Control encodings for in- and outgoing messages"
 msgstr "Kodierung für ein- und abgehende Meldungen kontrollieren"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:674
+#: ../src/qtui/settingspages/networkssettingspage.ui:901
 msgctxt "NetworksSettingsPage|"
 msgid "Use Custom Encodings"
 msgstr "Spezifische Kodierung verwenden"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:685
-#: ../src/qtui/settingspages/networkssettingspage.ui:705
+#: ../src/qtui/settingspages/networkssettingspage.ui:912
+#: ../src/qtui/settingspages/networkssettingspage.ui:932
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify which encoding your messages will be sent in.\n"
 "UTF-8 should be a sane choice for most networks."
 msgstr "Geben Sie an, mit welcher Kodierung Ihre Meldungen gesendet werden sollen.\nUTF-8 sollte für die meisten Netzwerke eine sinnvolle Wahl sein."
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:689
+#: ../src/qtui/settingspages/networkssettingspage.ui:916
 msgctxt "NetworksSettingsPage|"
 msgid "Send messages in:"
 msgstr "Meldungen senden in:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:716
-#: ../src/qtui/settingspages/networkssettingspage.ui:736
+#: ../src/qtui/settingspages/networkssettingspage.ui:943
+#: ../src/qtui/settingspages/networkssettingspage.ui:963
 msgctxt "NetworksSettingsPage|"
 msgid ""
-"Incoming messages encoded in Utf8 will always be treated as such.\n"
-"This setting defines the encoding for messages that are not Utf8."
-msgstr "In UTF-8 kodierte eingehende Meldungen werden immer als solche behandelt.\nDiese Einstellung bestimmt die Kodierung für Meldungen, die nicht UTF-8-kodiert sind."
+"Incoming messages encoded in UTF-8 will always be treated as such.\n"
+"This setting defines the encoding for messages that are not UTF-8."
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:720
+#: ../src/qtui/settingspages/networkssettingspage.ui:947
 msgctxt "NetworksSettingsPage|"
 msgid "Receive fallback:"
 msgstr "Fallback für Empfang:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:747
-#: ../src/qtui/settingspages/networkssettingspage.ui:761
+#: ../src/qtui/settingspages/networkssettingspage.ui:974
+#: ../src/qtui/settingspages/networkssettingspage.ui:987
 msgctxt "NetworksSettingsPage|"
 msgid ""
-"This specifies how control messages, nicks and servernames are encoded.\n"
-"Unless you *really* know what you do, leave this as ISO-8859-1!"
-msgstr "Dies gibt an, wie Kontrollmeldungen, Spitznamen und Servernamen kodiert sind.\nLassen Sie dies auf ISO-8859-1 gesetzt, falls Sie nicht *wirklich* wissen, was Sie tun!"
+"<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:751
+#: ../src/qtui/settingspages/networkssettingspage.ui:977
 msgctxt "NetworksSettingsPage|"
 msgid "Server encoding:"
 msgstr "Serverkodierung:"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:38
+#: ../src/qtui/settingspages/networkssettingspage.cpp:41
 msgctxt "NetworksSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:38
+#: ../src/qtui/settingspages/networkssettingspage.cpp:41
 msgctxt "NetworksSettingsPage|"
 msgid "Networks"
 msgstr "Netzwerke"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:185
+#: ../src/qtui/settingspages/networkssettingspage.cpp:184
+#: ../src/qtui/settingspages/networkssettingspage.cpp:196
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<p>Override default message rate limiting.</p><p><b>Setting limits too low "
+"may get you disconnected from the server!</b></p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:199
+msgctxt "NetworksSettingsPage|"
+msgid "Your Quassel core does not support this feature"
+msgstr "Dein Quassel Core unterstützt dieses Leistungsmerkmal nicht"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:200
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to modify message rate "
+"limits."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:238
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"
 msgstr "<b>Die folgenden Probleme müssen behoben werden, bevor Ihre Änderungen angewendet werden können:</b><ul>"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:186
+#: ../src/qtui/settingspages/networkssettingspage.cpp:239
 msgctxt "NetworksSettingsPage|"
 msgid "<li>All networks need at least one server defined</li>"
 msgstr "<li>Jedes Netzwerk benötigt die Angabe mindestens eines Servers</li>"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:187
+#: ../src/qtui/settingspages/networkssettingspage.cpp:240
 msgctxt "NetworksSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:188
+#: ../src/qtui/settingspages/networkssettingspage.cpp:241
 msgctxt "NetworksSettingsPage|"
 msgid "Invalid Network Settings"
 msgstr "Ungültige Netzwerkeinstellungen"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:651
+#: ../src/qtui/settingspages/networkssettingspage.cpp:737
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:743
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:749
+msgctxt "NetworksSettingsPage|"
+msgid "Not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:755
+msgctxt "NetworksSettingsPage|"
+msgid "Supported by network"
+msgstr "Unterstützt vom Netzwerk"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:838
 msgctxt "NetworksSettingsPage|"
 msgid "Delete Network?"
 msgstr "Netzwerk löschen?"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:652
+#: ../src/qtui/settingspages/networkssettingspage.cpp:839
 #, qt-format
 msgctxt "NetworksSettingsPage|"
 msgid ""
@@ -5451,6 +7289,70 @@ msgid ""
 "including the backlog?"
 msgstr "Wollen Sie das Netzwerk \"%1\" und alle damit verbundenen Einstellungen inklusive des Verlaufs wirklich löschen?"
 
+#: ../src/qtui/settingspages/networkssettingspage.cpp:971
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:972
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Quassel could not check if \"%1\" supports SASL.  This may be due to unsaved"
+" changes or an older Quassel core.  You can still try using SASL."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:977
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if SASL supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:978
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Quassel cannot check if \"%1\" supports SASL when disconnected.  Connect to "
+"the network, or try using SASL anyways."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:983
+msgctxt "NetworksSettingsPage|"
+msgid "SASL not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:984
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" does not currently support SASL.  However, support might "
+"be added later on."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:989
+msgctxt "NetworksSettingsPage|"
+msgid "SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:990
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" supports SASL.  In most cases, you should use SASL "
+"instead of NickServ identification."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:997
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid "SASL support for \"%1\""
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1002
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"SASL is a standardized way to log in and identify yourself to IRC servers."
+msgstr ""
+
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
 msgctxt "NickEditDlg|"
 msgid "Edit Nickname"
@@ -5554,11 +7456,41 @@ msgctxt "PhononNotificationConfigWidget|"
 msgid "Select the sound file to play"
 msgstr "Tondatei auswählen"
 
-#: ../src/core/postgresqlstorage.cpp:72
+#: ../src/core/postgresqlstorage.cpp:58
+msgctxt "PostgreSqlStorage|"
+msgid "PostgreSQL driver plugin not available for Qt. Installed drivers:"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:81
 msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr "PostgreSQL Turbo Bomber HD!"
 
+#: ../src/core/postgresqlstorage.cpp:88
+msgctxt "PostgreSqlStorage|"
+msgid "Username"
+msgstr "Benutzername"
+
+#: ../src/core/postgresqlstorage.cpp:89
+msgctxt "PostgreSqlStorage|"
+msgid "Password"
+msgstr "Passwort"
+
+#: ../src/core/postgresqlstorage.cpp:90
+msgctxt "PostgreSqlStorage|"
+msgid "Hostname"
+msgstr "Hostname"
+
+#: ../src/core/postgresqlstorage.cpp:91
+msgctxt "PostgreSqlStorage|"
+msgid "Port"
+msgstr "Port"
+
+#: ../src/core/postgresqlstorage.cpp:92
+msgctxt "PostgreSqlStorage|"
+msgid "Database"
+msgstr "Datenbank"
+
 #: ../src/client/backlogrequester.cpp:95
 #, qt-format
 msgctxt "QObject|"
@@ -5591,212 +7523,339 @@ msgid ""
 "wizard any time and use the settings dialog for more detailed changes."
 msgstr "Dieser Dialog wird Ihnen helfen, Ihre Identität und ihre IRC-Verbindungen auszuwählen.<br>Dies schließt nur die wichtigsten Einstellungen mit ein. Sie können diesen Dialog jederzeit schließen und in den Einstellungen weitere Modifikationen vornehmen."
 
-#: ../src/uisupport/qssparser.cpp:128 ../src/uisupport/qssparser.cpp:178
-#: ../src/uisupport/qssparser.cpp:334
+#: ../src/uisupport/qssparser.cpp:151 ../src/uisupport/qssparser.cpp:206
+#: ../src/uisupport/qssparser.cpp:365
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid block declaration: %1"
 msgstr "Ungülitge Block-Deklaration: %1"
 
-#: ../src/uisupport/qssparser.cpp:147
+#: ../src/uisupport/qssparser.cpp:170
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette role assignment: %1"
 msgstr "Ungülltige Paletten-Zuweisung: %1"
 
-#: ../src/uisupport/qssparser.cpp:166
+#: ../src/uisupport/qssparser.cpp:189
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr "Unbekannter Paletten-Name: %1"
 
-#: ../src/uisupport/qssparser.cpp:204
+#: ../src/uisupport/qssparser.cpp:233
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
 msgstr "Ungültige Name für das Unterlement: %1"
 
-#: ../src/uisupport/qssparser.cpp:248
+#: ../src/uisupport/qssparser.cpp:277
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message type in %1"
 msgstr "Ungültiger Nachrichtentyp in: %1"
 
-#: ../src/uisupport/qssparser.cpp:257
+#: ../src/uisupport/qssparser.cpp:286
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr "Ungültige Klausel: %1"
 
-#: ../src/uisupport/qssparser.cpp:269
+#: ../src/uisupport/qssparser.cpp:299
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message label: %1"
 msgstr "Ungültige Nachrichtenbezeichnung: %1"
 
-#: ../src/uisupport/qssparser.cpp:281
+#: ../src/uisupport/qssparser.cpp:310
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr "Ungültige Absenderhash-Spezifikation: %1"
 
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:314
 msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr "Absenderhash darf allerhöchstens \"0x0f\" sein!"
 
-#: ../src/uisupport/qssparser.cpp:301
+#: ../src/uisupport/qssparser.cpp:330
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid format name: %1"
 msgstr "Ungültiges Format für den Namen: %1"
 
-#: ../src/uisupport/qssparser.cpp:309
+#: ../src/uisupport/qssparser.cpp:338
 #, qt-format
 msgctxt "QssParser|"
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr "Ungültige IRC-Farbspezifikation (darf nur zwischen 0x00 und 0x0f liegen): %1"
 
-#: ../src/uisupport/qssparser.cpp:318
+#: ../src/uisupport/qssparser.cpp:347
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
 msgstr "Unbehandelte Klausel: %1"
 
-#: ../src/uisupport/qssparser.cpp:349
+#: ../src/uisupport/qssparser.cpp:380
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid proplist %1"
 msgstr "Ungültige Eigenschaftsliste: %1"
 
-#: ../src/uisupport/qssparser.cpp:368
+#: ../src/uisupport/qssparser.cpp:399
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid chatlist item type %1"
 msgstr "Ungültiger Elementtyp in der Chat-Liste: %1"
 
-#: ../src/uisupport/qssparser.cpp:384
+#: ../src/uisupport/qssparser.cpp:415
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid chatlist state %1"
 msgstr "Ungültiger Status in der Chat-Liste: %1"
 
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:445
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid property declaration: %1"
 msgstr "Ungültige Deklaration einer Eigenschaft: %1"
 
-#: ../src/uisupport/qssparser.cpp:438
+#: ../src/uisupport/qssparser.cpp:483
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font property: %1"
 msgstr "Ungültige Eigenschaft der Schriftart: %1"
 
-#: ../src/uisupport/qssparser.cpp:444
+#: ../src/uisupport/qssparser.cpp:489
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown ChatLine property: %1"
 msgstr "Unbekannte Eigenschaft der Chat-Zeile: %1"
 
-#: ../src/uisupport/qssparser.cpp:468
+#: ../src/uisupport/qssparser.cpp:508
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid boolean value: %1"
+msgstr "Ungültige Wahrheitswerte: %1"
+
+#: ../src/uisupport/qssparser.cpp:544
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette color role specification: %1"
 msgstr "Ungülltige Paletten-Farb-Spezifikation: %1"
 
-#: ../src/uisupport/qssparser.cpp:475
+#: ../src/uisupport/qssparser.cpp:551
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette color role: %1"
 msgstr "Unbekannte Paletten-Rolle: %1"
 
-#: ../src/uisupport/qssparser.cpp:482 ../src/uisupport/qssparser.cpp:505
-#: ../src/uisupport/qssparser.cpp:527
+#: ../src/uisupport/qssparser.cpp:558 ../src/uisupport/qssparser.cpp:581
+#: ../src/uisupport/qssparser.cpp:603
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid gradient declaration: %1"
 msgstr "Ungültiger Gradient: %1"
 
-#: ../src/uisupport/qssparser.cpp:491 ../src/uisupport/qssparser.cpp:513
-#: ../src/uisupport/qssparser.cpp:537
+#: ../src/uisupport/qssparser.cpp:567 ../src/uisupport/qssparser.cpp:589
+#: ../src/uisupport/qssparser.cpp:613
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid gradient stops list: %1"
 msgstr "Ungültiger Gradient (Stop-Liste): %1"
 
-#: ../src/uisupport/qssparser.cpp:646
+#: ../src/uisupport/qssparser.cpp:722
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font specification: %1"
 msgstr "Ungültige Schriftart: %1"
 
-#: ../src/uisupport/qssparser.cpp:687
+#: ../src/uisupport/qssparser.cpp:773
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font style specification: %1"
 msgstr "Ungültiger Stil für die Schriftart: %1"
 
-#: ../src/uisupport/qssparser.cpp:702
+#: ../src/uisupport/qssparser.cpp:788
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font weight specification: %1"
 msgstr "Ungültiger Formatierung für die Schriftart: %1"
 
-#: ../src/uisupport/qssparser.cpp:714
+#: ../src/uisupport/qssparser.cpp:800
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font size specification: %1"
 msgstr "Ungültige Größe für die Schriftart: %1"
 
-#: ../src/common/util.cpp:169
+#: ../src/qtui/qtmultimedianotificationbackend.cpp:167
+msgctxt "QtMultimediaNotificationBackend::ConfigWidget|"
+msgid "Select Audio File"
+msgstr "Audiodatei auswählen"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:14
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Form"
+msgstr "Formular"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:20
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Play a sound"
+msgstr "Ton abspielen"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:46
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Prelisten to the selected sound"
+msgstr "Ausgewählte Ton probehören"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:59
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:69
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Select the sound file to play"
+msgstr "Tondatei auswählen"
+
+#. Supported icon theme names
+#: ../src/qtui/qtui.cpp:284
+msgctxt "QtUi|"
+msgid "Breeze"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:285
+msgctxt "QtUi|"
+msgid "Breeze Dark"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:287
+msgctxt "QtUi|"
+msgid "Oxygen"
+msgstr "Oxygen"
+
+#: ../src/qtui/qtui.cpp:341
+msgctxt "QtUi|"
+msgid ""
+"No supported icon theme installed, you'll lack icons! Supported are the "
+"KDE/Plasma themes Breeze, Breeze Dark and Oxygen."
+msgstr ""
+
+#: ../src/qtui/qtuiapplication.cpp:105
+msgctxt "QtUiApplication|"
+msgid "Could not initialize Quassel!"
+msgstr ""
+
+#: ../src/qtui/qtuiapplication.cpp:110
+msgctxt "QtUiApplication|"
+msgid "Could not load or upgrade client settings!"
+msgstr ""
+
+#: ../src/common/util.cpp:173
 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "Jahr"
 
-#: ../src/common/util.cpp:170
+#: ../src/common/util.cpp:174
 msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr "Tag"
 
-#: ../src/common/util.cpp:171
+#: ../src/common/util.cpp:175
 msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr "Std."
 
-#: ../src/common/util.cpp:172
+#: ../src/common/util.cpp:176
 msgctxt "Quassel::secondsToString()|"
 msgid "min"
 msgstr "Min."
 
-#: ../src/common/util.cpp:173
+#: ../src/common/util.cpp:177
 msgctxt "Quassel::secondsToString()|"
 msgid "sec"
 msgstr "Sek."
 
-#: ../src/client/networkmodel.cpp:497
+#: ../src/client/networkmodel.cpp:589
 #, qt-format
 msgctxt "QueryBufferItem|"
-msgid "<b>Query with %1</b>"
-msgstr "<b>Dialog mit %1</b>"
+msgid "Query with %1"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:515
-#, qt-format
+#: ../src/client/networkmodel.cpp:611
 msgctxt "QueryBufferItem|"
-msgid "idling since %1"
-msgstr "Untätig seit %1"
+msgid "Unknown"
+msgstr "Unbekannt"
 
-#: ../src/client/networkmodel.cpp:518
-#, qt-format
+#: ../src/client/networkmodel.cpp:617
 msgctxt "QueryBufferItem|"
-msgid "login time: %1"
-msgstr "Angemeldet seit: %1"
+msgid "Away message"
+msgstr "Abwesenheitsnachricht"
 
-#: ../src/client/networkmodel.cpp:521
-#, qt-format
+#: ../src/client/networkmodel.cpp:619
+msgctxt "QueryBufferItem|"
+msgid "Realname"
+msgstr "Realer Name"
+
+#: ../src/client/networkmodel.cpp:625
+msgctxt "QueryBufferItem|"
+msgid "Help status"
+msgstr "Hilfestatus"
+
+#: ../src/client/networkmodel.cpp:626
+msgctxt "QueryBufferItem|"
+msgid "Available for help"
+msgstr "Verfügbar für Hilfe"
+
+#: ../src/client/networkmodel.cpp:629
+msgctxt "QueryBufferItem|"
+msgid "Service status"
+msgstr "Service Status"
+
+#: ../src/client/networkmodel.cpp:639
+msgctxt "QueryBufferItem|"
+msgid "Not logged in"
+msgstr "Nicht eingeloggt"
+
+#: ../src/client/networkmodel.cpp:645 ../src/client/networkmodel.cpp:654
+msgctxt "QueryBufferItem|"
+msgid "Account"
+msgstr "Konto"
+
+#: ../src/client/networkmodel.cpp:655
+msgctxt "QueryBufferItem|"
+msgid "Identified for this nick"
+msgstr "Identifiziert mit Benutzer"
+
+#: ../src/client/networkmodel.cpp:661
 msgctxt "QueryBufferItem|"
-msgid "server: %1"
-msgstr "Server: %1"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:665
+msgctxt "QueryBufferItem|"
+msgid "Hostmask"
+msgstr "Hostmask"
+
+#: ../src/client/networkmodel.cpp:669
+msgctxt "QueryBufferItem|"
+msgid "Operator"
+msgstr "Operator"
+
+#: ../src/client/networkmodel.cpp:677
+msgctxt "QueryBufferItem|"
+msgid "Idling since"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:681
+msgctxt "QueryBufferItem|"
+msgid "Login time"
+msgstr "Login-Zeit"
+
+#: ../src/client/networkmodel.cpp:684
+msgctxt "QueryBufferItem|"
+msgid "Server"
+msgstr "Server"
+
+#: ../src/client/networkmodel.cpp:690
+msgctxt "QueryBufferItem|"
+msgid "No information available"
+msgstr "Keine Informationen verfügbar"
 
 #: ../src/qtui/ui/receivefiledlg.ui:14
 msgctxt "ReceiveFileDlg|"
@@ -5831,8 +7890,8 @@ msgstr "Abbrechen"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:14
 msgctxt "ServerEditDlg|"
-msgid "Dialog"
-msgstr "Dialog"
+msgid "Edit Server"
+msgstr "Server bearbeiten"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:30
 msgctxt "ServerEditDlg|"
@@ -5845,7 +7904,7 @@ msgid "Server address:"
 msgstr "Serveradresse:"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:45
-#: ../src/qtui/settingspages/servereditdlg.ui:227
+#: ../src/qtui/settingspages/servereditdlg.ui:246
 msgctxt "ServerEditDlg|"
 msgid "Port:"
 msgstr "Port:"
@@ -5857,124 +7916,154 @@ msgstr "Passwort:"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:94
 msgctxt "ServerEditDlg|"
-msgid "Use SSL"
-msgstr "SSL benutzen"
+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 "Benutze verschlüsselte Verbindung"
+
+#: ../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 "Überprüfe Verbindungssicherheit"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:119
+#: ../src/qtui/settingspages/servereditdlg.ui:138
 msgctxt "ServerEditDlg|"
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../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 "Use only TLSv1 unless you know what you are doing!"
 msgstr "Benutzen Sie nur TLSv1, es sei denn Sie sind absolut sicher, dass eine Änderung notwendig ist!"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:151
+#: ../src/qtui/settingspages/servereditdlg.ui:170
 msgctxt "ServerEditDlg|"
 msgid "SSLv3 (insecure)"
 msgstr "SSLv3 (unsicher)"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:156
+#: ../src/qtui/settingspages/servereditdlg.ui:175
 msgctxt "ServerEditDlg|"
 msgid "SSLv2 (insecure)"
 msgstr "SSLv2 (unsicher)"
 
-#: ../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 "Proxy benutzen"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:188
+#: ../src/qtui/settingspages/servereditdlg.ui:207
 msgctxt "ServerEditDlg|"
 msgid "Proxy Type:"
 msgstr "Proxy-Typ:"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:196
+#: ../src/qtui/settingspages/servereditdlg.ui:215
 msgctxt "ServerEditDlg|"
-msgid "Socks 5"
-msgstr "Socks 5"
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
 
-#: ../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 "Proxy-Rechner:"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:220
+#: ../src/qtui/settingspages/servereditdlg.ui:239
 msgctxt "ServerEditDlg|"
 msgid "localhost"
 msgstr "Lokaler Rechner"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:251
+#: ../src/qtui/settingspages/servereditdlg.ui:270
 msgctxt "ServerEditDlg|"
 msgid "Proxy Username:"
 msgstr "Proxy-Benutzername:"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:261
+#: ../src/qtui/settingspages/servereditdlg.ui:280
 msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr "Proxy-Passwort:"
 
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1205
+msgctxt "ServerEditDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr "Dein Quassel Core unterstützt dieses Leistungsmerkmal nicht"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1206
+msgctxt "ServerEditDlg|"
+msgid ""
+"You need a Quassel core v0.13.0 or newer in order to verify connection "
+"security."
+msgstr ""
+
 #: ../src/qtui/ui/settingsdlg.ui:14
 msgctxt "SettingsDlg|"
 msgid "Configure Quassel"
 msgstr "Quassel konfigurieren"
 
-#: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50
-#: ../src/qtui/settingsdlg.cpp:111
+#: ../src/qtui/ui/settingsdlg.ui:41 ../src/qtui/ui/settingsdlg.ui:56
+#: ../src/qtui/settingsdlg.cpp:112
 msgctxt "SettingsDlg|"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../src/qtui/settingsdlg.cpp:121
+#: ../src/qtui/settingsdlg.cpp:122
 msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr "Einstellungen speichern"
 
-#: ../src/qtui/settingsdlg.cpp:122
+#: ../src/qtui/settingsdlg.cpp:123
 msgctxt "SettingsDlg|"
 msgid ""
 "There are unsaved changes on the current configuration page. Would you like "
 "to apply your changes now?"
 msgstr "Es gibt nicht gespeicherte Änderungen auf der aktuellen Konfigurationsseite. Möchten Sie diese Änderungen jetzt anwenden?"
 
-#: ../src/qtui/settingsdlg.cpp:136 ../src/qtui/settingsdlg.cpp:140
+#: ../src/qtui/settingsdlg.cpp:137 ../src/qtui/settingsdlg.cpp:141
 #, qt-format
 msgctxt "SettingsDlg|"
 msgid "Configure %1"
 msgstr "%1 einrichten"
 
-#: ../src/qtui/settingsdlg.cpp:220
+#: ../src/qtui/settingsdlg.cpp:221
 msgctxt "SettingsDlg|"
 msgid "Reload Settings"
 msgstr "Einstellungen neu laden"
 
-#: ../src/qtui/settingsdlg.cpp:220
+#: ../src/qtui/settingsdlg.cpp:221
 msgctxt "SettingsDlg|"
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr "Möchten Sie die Einstellungen neu laden und die Änderungen auf dieser Seite zurücknehmen?"
 
-#: ../src/qtui/settingsdlg.cpp:231
+#: ../src/qtui/settingsdlg.cpp:232
 msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
 msgstr "Standardeinstellungen wiederherstellen"
 
-#: ../src/qtui/settingsdlg.cpp:231
+#: ../src/qtui/settingsdlg.cpp:232
 msgctxt "SettingsDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Möchten Sie die Standardwerte für diese Seite wiederherstellen?"
@@ -5989,28 +8078,28 @@ msgctxt "SettingsPageDlg|"
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: ../src/qtui/settingspagedlg.cpp:38
+#: ../src/qtui/settingspagedlg.cpp:39
 #, qt-format
 msgctxt "SettingsPageDlg|"
 msgid "Configure %1"
 msgstr "%1 einrichten"
 
-#: ../src/qtui/settingspagedlg.cpp:119
+#: ../src/qtui/settingspagedlg.cpp:120
 msgctxt "SettingsPageDlg|"
 msgid "Reload Settings"
 msgstr "Einstellungen neu laden"
 
-#: ../src/qtui/settingspagedlg.cpp:119
+#: ../src/qtui/settingspagedlg.cpp:120
 msgctxt "SettingsPageDlg|"
 msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr "Möchten Sie die Einstellungen neu laden und die Änderungen auf dieser Seite zurücknehmen?"
 
-#: ../src/qtui/settingspagedlg.cpp:130
+#: ../src/qtui/settingspagedlg.cpp:131
 msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr "Standardeinstellungen wiederherstellen"
 
-#: ../src/qtui/settingspagedlg.cpp:130
+#: ../src/qtui/settingspagedlg.cpp:131
 msgctxt "SettingsPageDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Möchten Sie die Standardwerte für diese Seite wiederherstellen?"
@@ -6067,7 +8156,7 @@ msgctxt "ShortcutsSettingsPage|"
 msgid "Shortcuts"
 msgstr "Tastenkürzel"
 
-#: ../src/common/signalproxy.cpp:775
+#: ../src/common/signalproxy.cpp:792
 msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr "Trenne"
@@ -6150,7 +8239,7 @@ msgid ""
 "network"
 msgstr "Eine Liste von IRC-Kanälen, die Sie automatischen nach dem Verbinden betreten"
 
-#: ../src/qtui/snorenotificationbackend.cpp:59
+#: ../src/qtui/snorenotificationbackend.cpp:56
 msgctxt "SnoreNotificationBackend|"
 msgid "Private Message"
 msgstr "Private Nachricht"
@@ -6165,27 +8254,34 @@ msgctxt "SnoreNotificationConfigWidget|"
 msgid "Snore"
 msgstr "Snore"
 
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:41
+#: ../src/qtui/ui/snorentificationconfigwidget.ui:40
 msgctxt "SnoreNotificationConfigWidget|"
-msgid "Backend:"
-msgstr "Backend:"
+msgid "Enable Snore"
+msgstr "Snore aktivieren"
 
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:64
-msgctxt "SnoreNotificationConfigWidget|"
-msgid "Timeout:"
-msgstr "Zeitüberschreitung:"
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Interface"
+msgstr "Oberfläche"
 
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:80
-msgctxt "SnoreNotificationConfigWidget|"
-msgid " s"
-msgstr " s"
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Spell Checking"
+msgstr ""
 
-#: ../src/qtui/ui/snorentificationconfigwidget.ui:96
-msgctxt "SnoreNotificationConfigWidget|"
-msgid "0 means infinite"
-msgstr "0 bedeutet unendlich"
+#: ../src/core/sqlauthenticator.cpp:58
+msgctxt "SqlAuthenticator|"
+msgid "Database"
+msgstr "Datenbank"
 
-#: ../src/core/sqlitestorage.cpp:60
+#: ../src/core/sqlauthenticator.cpp:64
+msgctxt "SqlAuthenticator|"
+msgid ""
+"Do not authenticate against any remote service, but instead save a hashed "
+"and salted password in the database selected in the next step."
+msgstr ""
+
+#: ../src/core/sqlitestorage.cpp:67
 msgctxt "SqliteStorage|"
 msgid ""
 "SQLite is a file-based database engine that does not require any setup. It "
@@ -6280,7 +8376,12 @@ msgctxt "SslInfoDlg|"
 msgid "<b>SHA1 digest:</b>"
 msgstr "<b>SHA1 Digest:</b>"
 
-#: ../src/qtui/ui/sslinfodlg.ui:431
+#: ../src/qtui/ui/sslinfodlg.ui:418
+msgctxt "SslInfoDlg|"
+msgid "<b>SHA256 digest:</b>"
+msgstr "<b>SHA256 digest:</b>"
+
+#: ../src/qtui/ui/sslinfodlg.ui:448
 msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
 msgstr "<b>Vertrauenswürdig</b>"
@@ -6301,22 +8402,58 @@ msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr "%1 zu %2"
 
-#: ../src/client/networkmodel.h:151
+#: ../src/client/networkmodel.h:170
 msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
 msgstr "Statusfenster"
 
-#: ../src/qtui/systemtray.cpp:67 ../src/qtui/systemtray.cpp:100
+#: ../src/qtui/systemtray.cpp:49 ../src/qtui/systemtray.cpp:246
 msgctxt "SystemTray|"
 msgid "&Minimize"
 msgstr "&Minimieren"
 
-#: ../src/qtui/systemtray.cpp:102
+#: ../src/qtui/systemtray.cpp:248
 msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr "&Wiederherstellen"
 
-#: ../src/qtui/systraynotificationbackend.cpp:141
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:20
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Form"
+msgstr "Formular"
+
+#: ../src/qtui/ui/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/ui/systrayanimationconfigwidget.ui:31
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Alert tray icon and"
+msgstr ""
+
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:54
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "do nothing"
+msgstr ""
+
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:59
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "change color"
+msgstr ""
+
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:64
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "blink"
+msgstr ""
+
+#: ../src/qtui/systraynotificationbackend.cpp:132
 #, qt-format
 msgctxt "SystrayNotificationBackend|"
 msgid "%n pending highlight(s)"
@@ -6324,7 +8461,7 @@ msgid_plural "%n pending highlight(s)"
 msgstr[0] "%n ungelesene Hervorhebung"
 msgstr[1] "%n ungelesene Hervorhebungen"
 
-#: ../src/qtui/systraynotificationbackend.cpp:155
+#: ../src/qtui/systraynotificationbackend.cpp:146
 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr "Meldungen im Indikator anzeigen"
@@ -6354,146 +8491,146 @@ msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr " Sekunden"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:30
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgctxt "ToolBarActionProvider|"
 msgid "Connect"
 msgstr "Verbindung herstellen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:30
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgctxt "ToolBarActionProvider|"
 msgid "Connect to IRC"
 msgstr "Zum IRC verbinden"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect"
 msgstr "Verbindung trennen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
 msgstr "Vom IRC trennen"
 
 #: ../src/uisupport/toolbaractionprovider.cpp:33
 msgctxt "ToolBarActionProvider|"
+msgid "Connect to all"
+msgstr "Zu allen verbinden"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:34
+msgctxt "ToolBarActionProvider|"
+msgid "Disconnect from all"
+msgstr "Von allen trennen"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:36
+msgctxt "ToolBarActionProvider|"
 msgid "Part"
 msgstr "Verlassen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:33
+#: ../src/uisupport/toolbaractionprovider.cpp:36
 msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
 msgstr "Markierten Kanal verlassen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgctxt "ToolBarActionProvider|"
 msgid "Join"
 msgstr "Betreten"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr "Kanal betreten"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:36
+#: ../src/uisupport/toolbaractionprovider.cpp:39
 msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr "Dialog"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:36
+#: ../src/uisupport/toolbaractionprovider.cpp:39
 msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr "Privates Gespräch (Query) starten"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr "Benutzerinfo anfordern"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:39
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr "Op"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:39
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgctxt "ToolBarActionProvider|"
 msgid "Give operator privileges to user"
 msgstr "Operator-Status geben"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr "Deop"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgctxt "ToolBarActionProvider|"
 msgid "Take operator privileges from user"
 msgstr "Operator-Status nehmen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr "Voice"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgctxt "ToolBarActionProvider|"
 msgid "Give voice to user"
 msgstr "Voice geben"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr "Devoice"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgctxt "ToolBarActionProvider|"
 msgid "Take voice from user"
 msgstr "Voice nehmen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr "Kicken"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
 msgstr "Benutzer aus Kanal kicken"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:47
 msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr "Bannen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:47
 msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
 msgstr "Benutzer aus Kanal verbannen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:48
 msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
 msgstr "Rauswerfen/Verbannen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:48
 msgctxt "ToolBarActionProvider|"
 msgid "Remove and ban user from channel"
 msgstr "Benutzer aus Kanal kicken und verbannen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:50
-msgctxt "ToolBarActionProvider|"
-msgid "Connect to all"
-msgstr "Zu allen verbinden"
-
-#: ../src/uisupport/toolbaractionprovider.cpp:57
-msgctxt "ToolBarActionProvider|"
-msgid "Disconnect from all"
-msgstr "Von allen trennen"
-
 #: ../src/qtui/ui/topicwidget.ui:32
 msgctxt "TopicWidget|"
 msgid "Form"
@@ -6504,13 +8641,13 @@ msgctxt "TopicWidget|"
 msgid "..."
 msgstr "..."
 
-#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128
+#: ../src/qtui/topicwidget.cpp:121 ../src/qtui/topicwidget.cpp:127
 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Users: %1"
 msgstr "Benutzer: %1"
 
-#: ../src/qtui/topicwidget.cpp:123 ../src/qtui/topicwidget.cpp:129
+#: ../src/qtui/topicwidget.cpp:122 ../src/qtui/topicwidget.cpp:128
 #, qt-format
 msgctxt "TopicWidget|"
 msgid "Lag: %1 msecs"
@@ -6546,86 +8683,176 @@ msgctxt "TopicWidgetSettingsPage|"
 msgid "Topic Widget"
 msgstr "Themenanzeige"
 
+#: ../src/common/transfer.cpp:95
+msgctxt "Transfer|"
+msgid "New"
+msgstr "Neu"
+
+#: ../src/common/transfer.cpp:97
+msgctxt "Transfer|"
+msgid "Pending"
+msgstr "Ausstehend"
+
+#: ../src/common/transfer.cpp:99
+msgctxt "Transfer|"
+msgid "Connecting"
+msgstr "Verbinden"
+
+#: ../src/common/transfer.cpp:101
+msgctxt "Transfer|"
+msgid "Transferring"
+msgstr "Übertragen"
+
+#: ../src/common/transfer.cpp:103
+msgctxt "Transfer|"
+msgid "Paused"
+msgstr "Pausiert"
+
+#: ../src/common/transfer.cpp:105
+msgctxt "Transfer|"
+msgid "Completed"
+msgstr "Fertiggestellt"
+
+#: ../src/common/transfer.cpp:107
+msgctxt "Transfer|"
+msgid "Failed"
+msgstr "Fehlgeschlagen"
+
+#: ../src/common/transfer.cpp:109
+msgctxt "Transfer|"
+msgid "Rejected"
+msgstr "Abgewiesen"
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Type"
+msgstr "Typ"
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "File"
+msgstr "Datei"
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Status"
+msgstr "Status"
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Progress"
+msgstr "Fortschritt"
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Transferred"
+msgstr "Übertragen"
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Speed"
+msgstr "Geschwindigkeit"
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Peer"
+msgstr "Peer"
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Peer Address"
+msgstr "Peer Adresse"
+
+#: ../src/client/transfermodel.cpp:80
+msgctxt "TransferModel|"
+msgid "Send"
+msgstr "Senden"
+
+#: ../src/client/transfermodel.cpp:80
+msgctxt "TransferModel|"
+msgid "Receive"
+msgstr "Empfangen"
+
 #. Nick Message
-#: ../src/uisupport/uistyle.cpp:690
+#: ../src/uisupport/uistyle.cpp:936
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "You are now known as %DN%1%DN"
 msgstr "Sie heißen jetzt %DN%1%DN"
 
-#: ../src/uisupport/uistyle.cpp:691
+#: ../src/uisupport/uistyle.cpp:937
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr "%DN%1%DN heißt jetzt %DN%2%DN"
 
 #. Mode Message
-#: ../src/uisupport/uistyle.cpp:695
+#: ../src/uisupport/uistyle.cpp:941
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "User mode: %DM%1%DM"
 msgstr "Benutzermodus:  %DM%1%DM"
 
-#: ../src/uisupport/uistyle.cpp:696
+#: ../src/uisupport/uistyle.cpp:942
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr "Modus %DM%1%DM by %DN%2%DN"
 
 #. Join Message
-#: ../src/uisupport/uistyle.cpp:700
+#: ../src/uisupport/uistyle.cpp:946
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH hat %DC%4%DC betreten"
 
 #. Part Message
-#: ../src/uisupport/uistyle.cpp:703
+#: ../src/uisupport/uistyle.cpp:949
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH hat %DC%4%DC verlassen"
 
 #. Quit Message
-#: ../src/uisupport/uistyle.cpp:708
+#: ../src/uisupport/uistyle.cpp:954
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr "%DN%1%DN %DH(%2@%3)%DH hat das Netzwerk verlassen"
 
 #. Kick Message
-#: ../src/uisupport/uistyle.cpp:716
+#: ../src/uisupport/uistyle.cpp:962
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr "%DN%1%DN hat %DN%2%DN aus dem Chat %DC%3%DC geworfen"
 
 #. Day Change Message
-#: ../src/uisupport/uistyle.cpp:731
+#: ../src/uisupport/uistyle.cpp:977
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
 msgstr "{Tageswechsel: %1}"
 
-#: ../src/uisupport/uistyle.cpp:744
+#: ../src/uisupport/uistyle.cpp:990
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr "Netsplit zwischen %DH%1%DH und %DH%2%DH ist vorbei. Hinzugekommene Nutzer: "
 
-#: ../src/uisupport/uistyle.cpp:748 ../src/uisupport/uistyle.cpp:764
+#: ../src/uisupport/uistyle.cpp:994 ../src/uisupport/uistyle.cpp:1010
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN (%2 more)"
 msgstr "%DN%1%DN (%2 weitere)"
 
-#: ../src/uisupport/uistyle.cpp:759
+#: ../src/uisupport/uistyle.cpp:1005
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr "Netsplit zwischen %DH%1%DH und %DH%2%DH. Getrennte Nutzer: "
 
-#: ../src/client/networkmodel.cpp:825
+#: ../src/client/networkmodel.cpp:1031
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Owner(s)"
@@ -6633,7 +8860,7 @@ msgid_plural "%n Owner(s)"
 msgstr[0] "%n Besitzer"
 msgstr[1] "%n Besitzer"
 
-#: ../src/client/networkmodel.cpp:827
+#: ../src/client/networkmodel.cpp:1033
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Admin(s)"
@@ -6641,7 +8868,7 @@ msgid_plural "%n Admin(s)"
 msgstr[0] "%n Admin"
 msgstr[1] "%n Admins"
 
-#: ../src/client/networkmodel.cpp:829
+#: ../src/client/networkmodel.cpp:1035
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Operator(s)"
@@ -6649,7 +8876,7 @@ msgid_plural "%n Operator(s)"
 msgstr[0] "%n Operator"
 msgstr[1] "%n Operatoren"
 
-#: ../src/client/networkmodel.cpp:831
+#: ../src/client/networkmodel.cpp:1037
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Half-Op(s)"
@@ -6657,7 +8884,7 @@ msgid_plural "%n Half-Op(s)"
 msgstr[0] "%n Halb-Operator"
 msgstr[1] "%n Halb-Operatoren"
 
-#: ../src/client/networkmodel.cpp:833
+#: ../src/client/networkmodel.cpp:1039
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Voiced"
@@ -6665,7 +8892,7 @@ msgid_plural "%n Voiced"
 msgstr[0] "%n Sprecher"
 msgstr[1] "%n Sprecher"
 
-#: ../src/client/networkmodel.cpp:835
+#: ../src/client/networkmodel.cpp:1041
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n User(s)"