X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Ffi.po;fp=po%2Ffi.po;h=702260887095bc8d8c431cfe0359bfd887374946;hp=5be9d1c032c8a72385e9ff0f1164549a813b9831;hb=ad715f63465417cc43c9a4de09d200401238fb11;hpb=63ecd84a68c4896e2548cfdedf67f6f130989236

diff --git a/po/fi.po b/po/fi.po
index 5be9d1c0..70226088 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Quassel IRC\n"
 "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
-"PO-Revision-Date: 2016-02-14 15:18+0000\n"
+"PO-Revision-Date: 2018-08-30 17:38+0000\n"
 "Last-Translator: Lasse Liehu <larso@gmx.com>\n"
-"Language-Team: Finnish (http://www.transifex.com/ald/quassel/language/fi/)\n"
+"Language-Team: Finnish (http://www.transifex.com/quassel/quassel/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -33,23 +33,23 @@ msgstr "Moderni, hajautettu IRC-asiakasohjelma"
 
 #: ../src/uisupport/aboutdata.cpp:174
 msgctxt "AboutData|"
-msgid "Project Founder, Lead Developer"
+msgid "Project founder, lead developer"
 msgstr "Projektin perustaja, pääkehittäjä"
 
 #: ../src/uisupport/aboutdata.cpp:175
 msgctxt "AboutData|"
-msgid "Project Motivator, Lead Developer"
+msgid "Project motivator, lead developer"
 msgstr "Projektin motivaattori, pääkehittäjä"
 
 #: ../src/uisupport/aboutdata.cpp:176
 msgctxt "AboutData|"
-msgid "Former Lead Developer"
+msgid "Former lead developer"
 msgstr "Aiempi pääkehittäjä"
 
 #: ../src/uisupport/aboutdata.cpp:177
 msgctxt "AboutData|"
-msgid "Master of Translation, many fixes and enhancements"
-msgstr "Kielikäännösten mestari, paljon korjauksia ja parannuksia"
+msgid "Master of Translation, many fixes and enhancements, Travis support"
+msgstr "Käännösmestari, paljon korjauksia ja parannuksia, Travis-tuki"
 
 #: ../src/uisupport/aboutdata.cpp:178
 msgctxt "AboutData|"
@@ -61,475 +61,557 @@ msgctxt "AboutData|"
 msgid "Many fixes and improvements, bug and patch triaging, community support"
 msgstr "Paljon korjauksia ja parannuksia, virheiden ja muutosten lajittelua, yhteisön tukemista"
 
-#: ../src/uisupport/aboutdata.cpp:183 ../src/uisupport/aboutdata.cpp:193
+#: ../src/uisupport/aboutdata.cpp:180
+msgctxt "AboutData|"
+msgid ""
+"IRCv3 support, documentation, many other improvements, testing, outstanding "
+"PRs"
+msgstr "IRCv3-tuki, dokumentaatio, monia muita parannuksia, testaus, keskeneräisten PR:ien käsittely"
+
+#: ../src/uisupport/aboutdata.cpp:181
+msgctxt "AboutData|"
+msgid ""
+"Quasseldroid, architecture, (mobile) performance, many other improvements "
+"and fixes, testing"
+msgstr "Quasseldroid, arkkitehtuuri, (mobiili)suorituskyky, monia muita parannuksia ja korjauksia, testausta"
+
+#: ../src/uisupport/aboutdata.cpp:185
+msgctxt "AboutData|"
+msgid "OSX UI improvements"
+msgstr "OS X UI -parannuksia"
+
+#: ../src/uisupport/aboutdata.cpp:186 ../src/uisupport/aboutdata.cpp:201
 msgctxt "AboutData|"
 msgid "Chatview improvements"
 msgstr "Parannuksia keskustelunäkymään"
 
-#: ../src/uisupport/aboutdata.cpp:184
+#: ../src/uisupport/aboutdata.cpp:187
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter, Danish translation"
 msgstr "Aikainen beetatestaaja ja ohjelmavirheiden metsästäjä, tanskankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:185 ../src/uisupport/aboutdata.cpp:271
-#: ../src/uisupport/aboutdata.cpp:296
+#: ../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 "Espanjankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:186
+#: ../src/uisupport/aboutdata.cpp:189
+msgctxt "AboutData|"
+msgid "Build system fixes"
+msgstr "Korjauksia käännösjärjestelmään"
+
+#: ../src/uisupport/aboutdata.cpp:190 ../src/uisupport/aboutdata.cpp:330
+msgctxt "AboutData|"
+msgid "Database performance improvements"
+msgstr "Tietokannan suorituskyvyn parannuksia"
+
+#: ../src/uisupport/aboutdata.cpp:191
 msgctxt "AboutData|"
 msgid "Tray icon fix"
 msgstr "Ilmoitusalueen kuvakkeen korjaus"
 
-#: ../src/uisupport/aboutdata.cpp:187
+#: ../src/uisupport/aboutdata.cpp:192
 msgctxt "AboutData|"
 msgid "Language improvements"
 msgstr "Kieliparannuksia"
 
-#: ../src/uisupport/aboutdata.cpp:188
+#: ../src/uisupport/aboutdata.cpp:193
 msgctxt "AboutData|"
 msgid "Documentation improvements"
 msgstr "Parannuksia dokumentaatioon"
 
-#: ../src/uisupport/aboutdata.cpp:189 ../src/uisupport/aboutdata.cpp:214
-#: ../src/uisupport/aboutdata.cpp:237 ../src/uisupport/aboutdata.cpp:255
-#: ../src/uisupport/aboutdata.cpp:267 ../src/uisupport/aboutdata.cpp:297
+#: ../src/uisupport/aboutdata.cpp:194 ../src/uisupport/aboutdata.cpp:300
+msgctxt "AboutData|"
+msgid "Brazilian translation"
+msgstr "Brasiliankielinen käännös"
+
+#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:269
+msgctxt "AboutData|"
+msgid "Slovenian translation"
+msgstr "Sloveeninkielinen käännös"
+
+#: ../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 "Korjauksia"
 
-#: ../src/uisupport/aboutdata.cpp:190 ../src/uisupport/aboutdata.cpp:299
+#: ../src/uisupport/aboutdata.cpp:197 ../src/uisupport/aboutdata.cpp:322
 msgctxt "AboutData|"
 msgid "Romanian translation"
 msgstr "Romaniankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:191 ../src/uisupport/aboutdata.cpp:244
-#: ../src/uisupport/aboutdata.cpp:256 ../src/uisupport/aboutdata.cpp:257
+#: ../src/uisupport/aboutdata.cpp:198
+msgctxt "AboutData|"
+msgid "Punjabi translation"
+msgstr "Pandžabinkielinen käännös"
+
+#: ../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 "Suomenkielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:192
+#: ../src/uisupport/aboutdata.cpp:200
 msgctxt "AboutData|"
 msgid "Message indicator support"
 msgstr "Viesti-ilmaisintuki"
 
-#: ../src/uisupport/aboutdata.cpp:194 ../src/uisupport/aboutdata.cpp:195
-#: ../src/uisupport/aboutdata.cpp:312
+#: ../src/uisupport/aboutdata.cpp:202 ../src/uisupport/aboutdata.cpp:203
+#: ../src/uisupport/aboutdata.cpp:346
 msgctxt "AboutData|"
 msgid "Build system fix"
 msgstr "Korjaus käännösjärjestelmään"
 
-#: ../src/uisupport/aboutdata.cpp:196
+#: ../src/uisupport/aboutdata.cpp:204
 msgctxt "AboutData|"
 msgid "Windows build system fixes"
 msgstr "Korjauksia Windows-käännösjärjestelmään"
 
-#: ../src/uisupport/aboutdata.cpp:197
+#: ../src/uisupport/aboutdata.cpp:205
 msgctxt "AboutData|"
-msgid "Nicer tooltips"
-msgstr "Mukavammat työkaluvihjeet"
+msgid "AppData metadata, LDAP support"
+msgstr "AppData-metatiedot, LDAP-tuki"
 
-#: ../src/uisupport/aboutdata.cpp:198
+#: ../src/uisupport/aboutdata.cpp:206
+msgctxt "AboutData|"
+msgid "Nicer tooltips, spell check and other improvements"
+msgstr "Paremmat työkaluvihjeet, oikeinkirjoituksen tarkistus ja muita parannuksia"
+
+#: ../src/uisupport/aboutdata.cpp:207
 msgctxt "AboutData|"
 msgid "Crash fixes"
 msgstr "Kaatumiskorjauksia"
 
-#: ../src/uisupport/aboutdata.cpp:199 ../src/uisupport/aboutdata.cpp:220
-#: ../src/uisupport/aboutdata.cpp:282
+#: ../src/uisupport/aboutdata.cpp:208 ../src/uisupport/aboutdata.cpp:233
+#: ../src/uisupport/aboutdata.cpp:311
 msgctxt "AboutData|"
 msgid "French translation"
 msgstr "Ranskankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:200
+#: ../src/uisupport/aboutdata.cpp:209
+msgctxt "AboutData|"
+msgid "Occitan translation"
+msgstr "Oksitaaninkielinen käännös"
+
+#: ../src/uisupport/aboutdata.cpp:210
 msgctxt "AboutData|"
 msgid "Usability review"
 msgstr "Käytettävyysarviointi"
 
-#: ../src/uisupport/aboutdata.cpp:201
+#: ../src/uisupport/aboutdata.cpp:211
 msgctxt "AboutData|"
 msgid "SASL support"
 msgstr "SASL-tuki"
 
-#: ../src/uisupport/aboutdata.cpp:202
+#: ../src/uisupport/aboutdata.cpp:212
 msgctxt "AboutData|"
 msgid "Various improvements"
 msgstr "Useita parannuksia"
 
-#: ../src/uisupport/aboutdata.cpp:203 ../src/uisupport/aboutdata.cpp:204
-#: ../src/uisupport/aboutdata.cpp:208
+#: ../src/uisupport/aboutdata.cpp:213 ../src/uisupport/aboutdata.cpp:214
+#: ../src/uisupport/aboutdata.cpp:219
 msgctxt "AboutData|"
 msgid "Various fixes and improvements"
 msgstr "Useita korjauksia ja parannuksia"
 
-#: ../src/uisupport/aboutdata.cpp:205
+#: ../src/uisupport/aboutdata.cpp:215
+msgctxt "AboutData|"
+msgid "Settings fixes"
+msgstr "Korjauksia asetuksiin"
+
+#: ../src/uisupport/aboutdata.cpp:216 ../src/uisupport/aboutdata.cpp:294
 msgctxt "AboutData|"
 msgid "Galician translation"
 msgstr "Galiciankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:206
+#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:339
 msgctxt "AboutData|"
 msgid "Esperanto translation"
 msgstr "Esperantonkielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:207
+#: ../src/uisupport/aboutdata.cpp:218
 msgctxt "AboutData|"
 msgid "Japanese translation"
 msgstr "Japaninkielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:209 ../src/uisupport/aboutdata.cpp:273
+#: ../src/uisupport/aboutdata.cpp:220 ../src/uisupport/aboutdata.cpp:297
 msgctxt "AboutData|"
 msgid "Gentoo maintainer"
 msgstr "Gentoo-ylläpitäjä"
 
-#: ../src/uisupport/aboutdata.cpp:210 ../src/uisupport/aboutdata.cpp:224
-#: ../src/uisupport/aboutdata.cpp:309
+#: ../src/uisupport/aboutdata.cpp:221 ../src/uisupport/aboutdata.cpp:237
+#: ../src/uisupport/aboutdata.cpp:342
 msgctxt "AboutData|"
 msgid "Certificate handling improvements"
 msgstr "Parannuksia varmenteiden käsittelyyn"
 
-#: ../src/uisupport/aboutdata.cpp:211
+#: ../src/uisupport/aboutdata.cpp:223
 msgctxt "AboutData|"
-msgid "Early beta tester and bughunter (on Vista™!)"
+msgid "Early beta tester and bughunter (on Vista™!)"
 msgstr "Aikainen beetatestaaja ja ohjelmavirheiden metsästäjä (Vista™-käyttöjärjestelmässä!)"
 
-#: ../src/uisupport/aboutdata.cpp:212
+#: ../src/uisupport/aboutdata.cpp:224
 msgctxt "AboutData|"
 msgid "Translation system fixes"
 msgstr "Kielikäännösjärjestelmän korjauksia"
 
-#: ../src/uisupport/aboutdata.cpp:213
+#: ../src/uisupport/aboutdata.cpp:225
 msgctxt "AboutData|"
 msgid "OSX Notification Center support"
 msgstr "OS X -ilmoituskeskuksen tuki"
 
-#: ../src/uisupport/aboutdata.cpp:215 ../src/uisupport/aboutdata.cpp:269
+#: ../src/uisupport/aboutdata.cpp:227 ../src/uisupport/aboutdata.cpp:244
+#: ../src/uisupport/aboutdata.cpp:345 ../src/uisupport/aboutdata.cpp:351
+msgctxt "AboutData|"
+msgid "Turkish translation"
+msgstr "Turkinkielinen käännös"
+
+#: ../src/uisupport/aboutdata.cpp:228 ../src/uisupport/aboutdata.cpp:292
 msgctxt "AboutData|"
 msgid "Mac fixes"
 msgstr "Mac-korjauksia"
 
-#: ../src/uisupport/aboutdata.cpp:216
+#: ../src/uisupport/aboutdata.cpp:229
 msgctxt "AboutData|"
 msgid "D-Bus notifications"
 msgstr "D-Bus-ilmoitukset"
 
-#: ../src/uisupport/aboutdata.cpp:217
+#: ../src/uisupport/aboutdata.cpp:230
 msgctxt "AboutData|"
 msgid "Polish translation"
 msgstr "Puolankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:218
+#: ../src/uisupport/aboutdata.cpp:231 ../src/uisupport/aboutdata.cpp:312
 msgctxt "AboutData|"
 msgid "Build system improvements"
 msgstr "Parannuksia käännösjärjestelmään"
 
-#: ../src/uisupport/aboutdata.cpp:219
+#: ../src/uisupport/aboutdata.cpp:232
 msgctxt "AboutData|"
 msgid "Formatting support and other input line improvements, many other fixes"
 msgstr "Muotoilutuki ja muita parannuksia syöteriviin, monia muita korjauksia"
 
-#: ../src/uisupport/aboutdata.cpp:221
+#: ../src/uisupport/aboutdata.cpp:234
 msgctxt "AboutData|"
 msgid "BluesTheme stylesheet"
 msgstr "BluesTheme-tyylisivu"
 
-#: ../src/uisupport/aboutdata.cpp:222 ../src/uisupport/aboutdata.cpp:261
-#: ../src/uisupport/aboutdata.cpp:291
+#: ../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 "Venäjänkielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:223 ../src/uisupport/aboutdata.cpp:263
+#: ../src/uisupport/aboutdata.cpp:236 ../src/uisupport/aboutdata.cpp:285
 msgctxt "AboutData|"
 msgid "Italian translation"
 msgstr "Italiankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:225
+#: ../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 "German translation"
+msgstr "Saksankielinen käännös"
+
+#: ../src/uisupport/aboutdata.cpp:239
 msgctxt "AboutData|"
-msgid "Sanitize topic handling"
-msgstr "Aiheen käsittelyn tarkistaminen"
+msgid "Sanitize topic handling, twitch.tv support"
+msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:226
+#: ../src/uisupport/aboutdata.cpp:240
 msgctxt "AboutData|"
 msgid "Norwegian translation"
 msgstr "Norjankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:227
+#: ../src/uisupport/aboutdata.cpp:241
 msgctxt "AboutData|"
 msgid "Hungarian translation"
 msgstr "Unkarinkielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:228
+#: ../src/uisupport/aboutdata.cpp:242
 msgctxt "AboutData|"
 msgid "IRC parser improvements"
 msgstr "Parannuksia IRC-jäsentimeen"
 
-#: ../src/uisupport/aboutdata.cpp:229 ../src/uisupport/aboutdata.cpp:311
-#: ../src/uisupport/aboutdata.cpp:316
-msgctxt "AboutData|"
-msgid "Turkish translation"
-msgstr "Turkinkielinen käännös"
-
-#: ../src/uisupport/aboutdata.cpp:230
+#: ../src/uisupport/aboutdata.cpp:245
 msgctxt "AboutData|"
-msgid "MinGW support, SNORE backend, Windows packaging"
-msgstr "MinGW-tuki, SNORE-toteutus, Windows-paketointi"
+msgid "Windows build support and Appveyor maintenance, snorenotify backend"
+msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:231
+#: ../src/uisupport/aboutdata.cpp:246
 msgctxt "AboutData|"
 msgid "Initial Qt5 support"
 msgstr "Alustava Qt 5 -tuki"
 
-#: ../src/uisupport/aboutdata.cpp:232
+#: ../src/uisupport/aboutdata.cpp:247
 msgctxt "AboutData|"
 msgid "{Ku|U}buntu packager, motivator, promoter"
 msgstr "{Ku|U}buntu-paketoija, motivaattori, promoottori"
 
-#: ../src/uisupport/aboutdata.cpp:233
+#: ../src/uisupport/aboutdata.cpp:248
 msgctxt "AboutData|"
-msgid "Various features"
-msgstr "Useita ominaisuuksia"
+msgid "Various features and improvements"
+msgstr "Useita ominaisuuksia ja parannuksia"
 
-#: ../src/uisupport/aboutdata.cpp:234 ../src/uisupport/aboutdata.cpp:235
-#: ../src/uisupport/aboutdata.cpp:243 ../src/uisupport/aboutdata.cpp:248
-#: ../src/uisupport/aboutdata.cpp:286
+#: ../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 "Useita korjauksia"
 
-#: ../src/uisupport/aboutdata.cpp:236 ../src/uisupport/aboutdata.cpp:240
-#: ../src/uisupport/aboutdata.cpp:281 ../src/uisupport/aboutdata.cpp:284
-#: ../src/uisupport/aboutdata.cpp:289 ../src/uisupport/aboutdata.cpp:293
+#: ../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 "Virhekorjauksia"
 
-#: ../src/uisupport/aboutdata.cpp:238
+#: ../src/uisupport/aboutdata.cpp:253 ../src/uisupport/aboutdata.cpp:341
+#: ../src/uisupport/aboutdata.cpp:344
 msgctxt "AboutData|"
-msgid "QuasselDroid and Java wizardess, documentation, bugfixes"
-msgstr "QuasselDroid- ja Java-velhotar, dokumentaatio, virhekorjauksia"
+msgid "Czech translation"
+msgstr "Tšekinkielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:239
+#: ../src/uisupport/aboutdata.cpp:254
 msgctxt "AboutData|"
 msgid "Python improvements"
 msgstr "Python-parannuksia"
 
-#: ../src/uisupport/aboutdata.cpp:241
+#: ../src/uisupport/aboutdata.cpp:256
+msgctxt "AboutData|"
+msgid "Proxy improvements, Spanish translation"
+msgstr "Parannuksia välityspalvelintukeen, espanjankielinen käännös"
+
+#: ../src/uisupport/aboutdata.cpp:257
 msgctxt "AboutData|"
 msgid "Postgres migration fixes"
 msgstr "Postgres-siirroskorjauksia"
 
-#: ../src/uisupport/aboutdata.cpp:242
+#: ../src/uisupport/aboutdata.cpp:258 ../src/uisupport/aboutdata.cpp:262
+#: ../src/uisupport/aboutdata.cpp:301
+msgctxt "AboutData|"
+msgid "Danish translation"
+msgstr "Tanskankielinen käännös"
+
+#: ../src/uisupport/aboutdata.cpp:259
 msgctxt "AboutData|"
 msgid "Context menu fixes"
 msgstr "Kontekstivalikkokorjauksia"
 
-#: ../src/uisupport/aboutdata.cpp:245
+#: ../src/uisupport/aboutdata.cpp:263
 msgctxt "AboutData|"
 msgid "Many fixes and improvements, bug triaging"
 msgstr "Paljon korjauksia ja parannuksia, ohjelmavirheiden lajittelua"
 
-#: ../src/uisupport/aboutdata.cpp:246
+#: ../src/uisupport/aboutdata.cpp:264
 msgctxt "AboutData|"
 msgid "Original \"All-Seeing Eye\" logo"
 msgstr "Alkuperäinen ”All-Seeing Eye” -logo"
 
-#: ../src/uisupport/aboutdata.cpp:247
+#: ../src/uisupport/aboutdata.cpp:265
 msgctxt "AboutData|"
 msgid "Project founder, various improvements"
 msgstr "Projektin perustaja, useita parannuksia"
 
-#: ../src/uisupport/aboutdata.cpp:249
+#: ../src/uisupport/aboutdata.cpp:268
 msgctxt "AboutData|"
 msgid "Serbian translation"
 msgstr "Serbiankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:250
-msgctxt "AboutData|"
-msgid "Slovenian translation"
-msgstr "Sloveeninkielinen käännös"
-
-#: ../src/uisupport/aboutdata.cpp:251
+#: ../src/uisupport/aboutdata.cpp:270
 msgctxt "AboutData|"
 msgid ""
 "Tireless tester, {Ku|U}buntu tester and lobbyist, liters of delicious "
 "Finnish alcohol"
 msgstr "Väsymätön testaaja, {Ku|U}buntu-testaaja ja lobbari, litroittain hyvää suomalaista alkoholia"
 
-#: ../src/uisupport/aboutdata.cpp:252
+#: ../src/uisupport/aboutdata.cpp:271
 msgctxt "AboutData|"
 msgid "Qt5 porting help, Travis CI setup"
 msgstr "Qt 5 -sovitusapua, Travis CI:n käyttöönotto"
 
-#: ../src/uisupport/aboutdata.cpp:253 ../src/uisupport/aboutdata.cpp:264
-#: ../src/uisupport/aboutdata.cpp:266 ../src/uisupport/aboutdata.cpp:307
-msgctxt "AboutData|"
-msgid "German translation"
-msgstr "Saksankielinen käännös"
-
-#: ../src/uisupport/aboutdata.cpp:254
+#: ../src/uisupport/aboutdata.cpp:273
 msgctxt "AboutData|"
 msgid "Buffer merge improvements"
 msgstr "Parannuksia puskureiden yhdistämiseen"
 
-#: ../src/uisupport/aboutdata.cpp:258
+#: ../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 "Kreikankielinen käännös"
+
+#: ../src/uisupport/aboutdata.cpp:278
 msgctxt "AboutData|"
 msgid "OSX improvements"
 msgstr "OS X -parannuksia"
 
-#: ../src/uisupport/aboutdata.cpp:259
+#: ../src/uisupport/aboutdata.cpp:279
 msgctxt "AboutData|"
 msgid "Lithuanian translation"
 msgstr "Liettuankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:260
+#: ../src/uisupport/aboutdata.cpp:280
 msgctxt "AboutData|"
 msgid "Documentation fixes"
 msgstr "Korjauksia dokumentaatioon"
 
-#: ../src/uisupport/aboutdata.cpp:262
+#: ../src/uisupport/aboutdata.cpp:283 ../src/uisupport/aboutdata.cpp:316
+msgctxt "AboutData|"
+msgid "Improvements"
+msgstr "Parannuksia"
+
+#: ../src/uisupport/aboutdata.cpp:284
 msgctxt "AboutData|"
 msgid "Ideas, hacking, initial motivation"
 msgstr "Ideoita, koodausta, alustava motivaatio"
 
-#: ../src/uisupport/aboutdata.cpp:265
+#: ../src/uisupport/aboutdata.cpp:287
 msgctxt "AboutData|"
-msgid "Core and other fixes, QuasselDroid"
-msgstr "Ydin ja muita korjauksia, QuasselDroid"
+msgid "Many fixes and improvements, Sonnet support, QuasselDroid"
+msgstr "Paljon korjauksia ja parannuksia, Sonnet-tuki, QuasselDroid"
 
-#: ../src/uisupport/aboutdata.cpp:268
+#: ../src/uisupport/aboutdata.cpp:291
 msgctxt "AboutData|"
 msgid "German translation, fixes"
 msgstr "Saksankielinen käännös, korjauksia"
 
-#: ../src/uisupport/aboutdata.cpp:270
+#: ../src/uisupport/aboutdata.cpp:293
 msgctxt "AboutData|"
-msgid "Many fixes and improvements; Ubuntu live packages"
-msgstr "Useita korjauksia ja parannuksia; Ubuntu-live-paketit"
+msgid "Many fixes and improvements; Ubuntu PPAs"
+msgstr "Paljon korjauksia ja parannuksia; Ubuntu PPA:t"
 
-#: ../src/uisupport/aboutdata.cpp:272
+#: ../src/uisupport/aboutdata.cpp:296
 msgctxt "AboutData|"
 msgid "Tons of Oxygen icons including the Quassel logo"
 msgstr "Läjäpäin Oxygen-kuvakkeita, myös Quasselin logo"
 
-#: ../src/uisupport/aboutdata.cpp:274
+#: ../src/uisupport/aboutdata.cpp:298
 msgctxt "AboutData|"
 msgid "Initial design and main window layout"
 msgstr "Alustava design ja pääikkunan asettelu"
 
-#: ../src/uisupport/aboutdata.cpp:275
+#: ../src/uisupport/aboutdata.cpp:299
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter"
 msgstr "Aikainen beetatestaaja ja ohjelmavirheiden metsästäjä"
 
-#: ../src/uisupport/aboutdata.cpp:276
-msgctxt "AboutData|"
-msgid "Danish translation"
-msgstr "Tanskankielinen käännös"
-
-#: ../src/uisupport/aboutdata.cpp:277
+#: ../src/uisupport/aboutdata.cpp:302
 msgctxt "AboutData|"
 msgid "Linewrap for input line"
 msgstr "Tekstin rivitys syöterivillä"
 
-#: ../src/uisupport/aboutdata.cpp:278
+#: ../src/uisupport/aboutdata.cpp:303
 msgctxt "AboutData|"
 msgid "Performance improvements and cleanups"
 msgstr "Suorituskykyparannuksia ja siivousta"
 
-#: ../src/uisupport/aboutdata.cpp:279
+#: ../src/uisupport/aboutdata.cpp:305
 msgctxt "AboutData|"
 msgid "/print command"
 msgstr "/print-komento"
 
-#: ../src/uisupport/aboutdata.cpp:280
+#: ../src/uisupport/aboutdata.cpp:306
 msgctxt "AboutData|"
 msgid "Performance improvements"
 msgstr "Suorituskykyparannuksia"
 
-#: ../src/uisupport/aboutdata.cpp:283
+#: ../src/uisupport/aboutdata.cpp:308
 msgctxt "AboutData|"
-msgid "Build system fixes"
-msgstr "Korjauksia käännösjärjestelmään"
+msgid "Hindi and Marathi translations"
+msgstr "Hindin- ja marathinkielinen käännös"
+
+#: ../src/uisupport/aboutdata.cpp:313
+msgctxt "AboutData|"
+msgid ""
+"Windows build support, automated OSX builds in Travis, various improvements"
+msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:285
+#: ../src/uisupport/aboutdata.cpp:315
 msgctxt "AboutData|"
 msgid "Emacs keybindings"
 msgstr "Emacs-näppäinyhdistelmät"
 
-#: ../src/uisupport/aboutdata.cpp:287
+#: ../src/uisupport/aboutdata.cpp:318
 msgctxt "AboutData|"
 msgid "Highlight configuration improvements"
 msgstr "Parannuksia korostusasetuksiin"
 
-#: ../src/uisupport/aboutdata.cpp:288
+#: ../src/uisupport/aboutdata.cpp:319
 msgctxt "AboutData|"
-msgid "Kubuntu packager, (packaging/build system) bughunter"
-msgstr "Kubuntu-paketoija, (paketoinnin/käännösjärjestelmän) virheiden metsästäjä"
+msgid "Debian/Kubuntu packager, (packaging/build system) bughunter"
+msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:290
+#: ../src/uisupport/aboutdata.cpp:320
 msgctxt "AboutData|"
-msgid "Audio backend improvements"
-msgstr "Parannuksia äänitaustajärjestelmään"
+msgid "Bugfixes, German translation"
+msgstr "Virheiden korjauksia, saksankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:292
+#: ../src/uisupport/aboutdata.cpp:321
 msgctxt "AboutData|"
-msgid "Dutch translation"
-msgstr "Hollanninkielinen käännös"
+msgid "Audio backend improvements"
+msgstr "Parannuksia äänitaustajärjestelmään"
 
-#: ../src/uisupport/aboutdata.cpp:294 ../src/uisupport/aboutdata.cpp:295
-#: ../src/uisupport/aboutdata.cpp:302 ../src/uisupport/aboutdata.cpp:303
+#: ../src/uisupport/aboutdata.cpp:324
 msgctxt "AboutData|"
-msgid "Greek translation"
-msgstr "Kreikankielinen käännös"
+msgid "Chinese translation"
+msgstr "Kiinankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:298
+#: ../src/uisupport/aboutdata.cpp:325
 msgctxt "AboutData|"
-msgid "Fixing and hosting Windows builds"
-msgstr "Windows-koontiversioiden korjaus ja levitys"
+msgid "Dutch translation"
+msgstr "Hollanninkielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:300
+#: ../src/uisupport/aboutdata.cpp:329 ../src/uisupport/aboutdata.cpp:332
 msgctxt "AboutData|"
 msgid "Korean translation"
 msgstr "Koreankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:301
+#: ../src/uisupport/aboutdata.cpp:331
+msgctxt "AboutData|"
+msgid "Alias improvements"
+msgstr "Aliasparannuksia"
+
+#: ../src/uisupport/aboutdata.cpp:333
 msgctxt "AboutData|"
 msgid "Norwegian translation, documentation"
 msgstr "Norjankielinen käännös, dokumentaatio"
 
-#: ../src/uisupport/aboutdata.cpp:304
+#: ../src/uisupport/aboutdata.cpp:336
 msgctxt "AboutData|"
 msgid "Former Windows builder"
 msgstr "Aiempi Windows-koontiversioiden tekijä"
 
-#: ../src/uisupport/aboutdata.cpp:305
+#: ../src/uisupport/aboutdata.cpp:337
 msgctxt "AboutData|"
 msgid "Fixes, Debian packaging"
 msgstr "Korjauksia, Debian-paketointi"
 
-#: ../src/uisupport/aboutdata.cpp:306
+#: ../src/uisupport/aboutdata.cpp:338
 msgctxt "AboutData|"
 msgid "Fixes and feedback"
 msgstr "Korjauksia ja palautetta"
 
-#: ../src/uisupport/aboutdata.cpp:308 ../src/uisupport/aboutdata.cpp:310
-msgctxt "AboutData|"
-msgid "Czech translation"
-msgstr "Tšekinkielinen käännös"
-
-#: ../src/uisupport/aboutdata.cpp:313
+#: ../src/uisupport/aboutdata.cpp:348
 msgctxt "AboutData|"
 msgid "Network detection improvements"
 msgstr "Parannuksia verkon tunnistamiseen"
 
-#: ../src/uisupport/aboutdata.cpp:314
+#: ../src/uisupport/aboutdata.cpp:349
 msgctxt "AboutData|"
 msgid "Ukrainian translation"
 msgstr "Ukrainankielinen käännös"
 
-#: ../src/uisupport/aboutdata.cpp:315
+#: ../src/uisupport/aboutdata.cpp:350
 msgctxt "AboutData|"
 msgid "Portuguese translation"
 msgstr "Portugalinkielinen käännös"
@@ -568,77 +650,105 @@ msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr "&Kiitokset"
 
-#: ../src/qtui/aboutdlg.cpp:38
+#: ../src/qtui/aboutdlg.cpp:44
+msgctxt "AboutDlg|"
+msgid "Unknown date"
+msgstr "Tuntematon päivämäärä"
+
+#: ../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>Versio:</b> %1<br><b>Protokollan versio:</b> %2<br><b>Käännetty:</b> %3"
+msgid ""
+"<b>Version:</b> %1<br><b>Version date:</b> %2<br><b>Protocol version:</b> %3"
+msgstr "<b>Versio:</b> %1<br><b>Version päiväys:</b> %2<br><b>Protokollan versio:</b> %3"
 
-#: ../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>Moderni hajautettu IRC</b><br><br>&copy;%1 Quassel-projekti<br><a href=\"http://quassel-irc.org\">http://quassel-irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> verkossa <a href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC on kaksoislisensoitu <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a>:n ja <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>:n alaisuudessa.<br>Suurin osa kuvakkeista on &copy; <a href=\"http://www.oxygen-icons.org\">Oxygen Team</a> ja niitä käytetään <a href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>-lisenssin mukaisesti.<br><br>Ilmoita ohjelmavirheistä osoitteessa <a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a>."
+msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:72
+#: ../src/qtui/aboutdlg.cpp:87
 msgctxt "AboutDlg|"
 msgid "Quassel IRC is mainly developed by:"
 msgstr "Quassel IRC:n pääkehittäjät ovat:"
 
-#: ../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 "Haluaisimme kiittää seuraavia henkilöitä (aakkosjärjestyksessä), sekä kaikkia ketkä unohdimme mainita tässä:"
 
-#: ../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 "…sekä kaikkia muita, jotka löysivät ohjelmavirheitä ja ilmoittivat niistä, antoivat palautetta, auttoivat muita ja olivat osa yhteisöä!"
 
-#: ../src/qtui/aboutdlg.cpp:100
+#: ../src/qtui/aboutdlg.cpp:112
+msgctxt "AboutDlg|"
+msgid "Special thanks goes to:"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:116
+msgctxt "AboutDlg|"
+msgid "for the original Quassel logo - The All-Seeing Eye"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp: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>"
-msgstr "Erityiskiitokset:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;<b>John ”nox” Hand</b></dt><dd><i>alkuperäisestä Quassel-kuvakkeesta – 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>Quasselissa nähtävän grafiikan luomisesta</i><br></dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software, tunnettu aiemmin nimellä Trolltech</a></b></dt><dd><i>Qt:n ja Qtopian luomisesta, QuasselTopian sponsoroinnista Greenphoneilla ja paljosta muusta</i><br></dd><dt><a href=\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd><i>Quassel Mobilen kehitystyön sponsoroinnista N810:illä</i></dd>"
-
-#: ../src/core/abstractsqlstorage.cpp:140
+"for creating an awesome framework, and for sponsoring development with "
+"Greenphones, N810s, N950s and more"
+msgstr ""
+
+#: ../src/core/abstractsqlstorage.cpp:142
 #, qt-format
 msgctxt "AbstractSqlStorage|"
 msgid ""
-"Installed Schema (version %1) is not up to date. Upgrading to version %2..."
-msgstr "Asennettu malli (versio %1) ei ole ajan tasalla. Päivitetään versioon %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:142
+#: ../src/core/abstractsqlstorage.cpp:149
 msgctxt "AbstractSqlStorage|"
 msgid "Upgrade failed..."
 msgstr "Päivitys epäonnistui…"
 
+#: ../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 ""
@@ -646,28 +756,113 @@ msgid ""
 "command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
 msgstr "<b>Aliaksen lyhytkomento</b><br />Sitä voidaan käyttää kuten normaalia /komentoa.<br /><br /><b>Esimerkki:</b> lyhytkomentoa ”foo” voidaan käyttää kirjoittamalla /foo"
 
-#: ../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 ""
+"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 "koko merkkijono"
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
+msgctxt "AliasesModel|"
+msgid "your current nickname"
+msgstr "nykyinen nimimerkkisi"
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:113
+msgctxt "AliasesModel|"
+msgid "the name of the selected channel"
+msgstr "valitun kanavan nimi"
+
+#: ../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 "Esimerkki:"
+
+#: ../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 ""
-"<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>Merkkijono, joksi lyhytkomento laajennetaan</b><br /><b>erikoismuuttujat:</b><br /> - <b>$i</b> merkkaa i:dettä parametria.<br /> - <b>$i..j</b> merkkaa parametreja i:dennestä j:denteen välilyönneillä erotettuna.<br /> - <b>$i..</b> merkkaa kaikkia parametreja i:dennestä eteenpäin välilyönneillä erotettuna.<br /> - <b>$i:hostname</b> merkkaa i:n tunnistaman käyttäjän verkko-osoitetta, tai * jos se on tuntematon.<br /> - <b>$0</b> koko merkkijono.<br /> - <b>$nick</b> nykyinen nimimerkkisi<br /> - <b>$channel</b> valitun kanavan nimi<br /><br />Monta komentoa voidaan erottaa toisistaan puolipistein.<br /><br /><b>Esimerkki:</b> ”Testi $1; Testi $2; Testi Kaikki $0” laajennetaan kolmeksi erilliseksi viestiksi ”Testi 1”, ”Testi 2” ja ”Testi Kaikki 1 2 3”, kun sitä kutsutaan komennolla /testi 1 2 3"
-
-#: ../src/qtui/settingspages/aliasesmodel.cpp:185
+"...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 "Laajennus"
@@ -687,12 +882,12 @@ msgctxt "AliasesSettingsPage|"
 msgid "Delete"
 msgstr "Poista"
 
-#: ../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 "Aliakset"
@@ -704,106 +899,138 @@ msgstr "Lomake"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgctxt "AppearanceSettingsPage|"
-msgid "Client style:"
-msgstr "Käyttöliittymän tyyli:"
-
-#: ../src/qtui/settingspages/appearancesettingspage.ui:29
-msgctxt "AppearanceSettingsPage|"
-msgid "Set application style"
-msgstr "Aseta sovelluksen tyyli"
-
-#: ../src/qtui/settingspages/appearancesettingspage.ui:36
-msgctxt "AppearanceSettingsPage|"
 msgid "Language:"
 msgstr "Kieli:"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:43
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgctxt "AppearanceSettingsPage|"
 msgid "Set the application language. Requires restart!"
 msgstr "Aseta sovelluksen kieli. Vaatii uudelleenkäynnistyksen!"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+#: ../src/qtui/settingspages/appearancesettingspage.ui:33
 msgctxt "AppearanceSettingsPage|"
 msgid "<Untranslated>"
 msgstr "<Kääntämätön>"
 
-#: ../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 "<Järjestelmän oletus>"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:75
+#: ../src/qtui/settingspages/appearancesettingspage.ui:59
 msgctxt "AppearanceSettingsPage|"
-msgid "Use custom stylesheet"
-msgstr "Käytä omaa tyylisivua"
+msgid "Widget style:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:66
+msgctxt "AppearanceSettingsPage|"
+msgid "Set application style"
+msgstr "Aseta sovelluksen tyyli"
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:73
+msgctxt "AppearanceSettingsPage|"
+msgid "Fallback icon theme:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:80
+msgctxt "AppearanceSettingsPage|"
+msgid ""
+"<html><head/><body><p>Icon theme to use for icons that are not found in the "
+"current system theme. Requires the selected theme to be installed either "
+"system-wide, or as part of the Quassel installation.</p><p>Supported themes "
+"are Breeze, Breeze Dark and Oxygen, all of KDE fame.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:87
+msgctxt "AppearanceSettingsPage|"
+msgid ""
+"<html><head/><body><p>If enabled, uses the selected fallback icon theme "
+"instead of the configured system theme for all icons. Recommended if you "
+"want Quassel to have a consistent look-and-feel.</p></body></html>"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:109
+#: ../src/qtui/settingspages/appearancesettingspage.ui:90
 msgctxt "AppearanceSettingsPage|"
-msgid "Path:"
-msgstr "Polku:"
+msgid "Override system theme"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:110
+msgctxt "AppearanceSettingsPage|"
+msgid "Use custom stylesheet"
+msgstr "Käytä omaa tyylisivua"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:141
+#: ../src/qtui/settingspages/appearancesettingspage.ui:148
 msgctxt "AppearanceSettingsPage|"
 msgid "..."
 msgstr "…"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:150
+#: ../src/qtui/settingspages/appearancesettingspage.ui:172
 msgctxt "AppearanceSettingsPage|"
 msgid "Show system tray icon"
 msgstr "Näytä kuvake ilmoitusalueella"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:184
+#: ../src/qtui/settingspages/appearancesettingspage.ui:188
 msgctxt "AppearanceSettingsPage|"
-msgid "Hide to tray on close button"
-msgstr "Piilota ilmoitusalueelle suljettaessa"
+msgid "Invert brightness"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:216
+#: ../src/qtui/settingspages/appearancesettingspage.ui:233
 msgctxt "AppearanceSettingsPage|"
-msgid "Enable animations"
-msgstr "Käytä animaatioita"
+msgid "Hide to tray on close button"
+msgstr "Piilota ilmoitusalueelle suljettaessa"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:231
+#: ../src/qtui/settingspages/appearancesettingspage.ui:248
 msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
 msgstr "Viestien uudelleenohjaus"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:237
+#: ../src/qtui/settingspages/appearancesettingspage.ui:257
 msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr "Käyttäjäilmoitukset:"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:280
+#: ../src/qtui/settingspages/appearancesettingspage.ui:300
 msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
 msgstr "Palvelinilmoitukset:"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:294
+#: ../src/qtui/settingspages/appearancesettingspage.ui:314
 msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
 msgstr "Oletuskohde"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:301
+#: ../src/qtui/settingspages/appearancesettingspage.ui:321
 msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr "Tilaikkuna"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:308
+#: ../src/qtui/settingspages/appearancesettingspage.ui:328
 msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
 msgstr "Nykyinen keskustelu"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:315
+#: ../src/qtui/settingspages/appearancesettingspage.ui:335
 msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr "Virheet:"
 
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:36
 msgctxt "AppearanceSettingsPage|"
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:242
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:51
+msgctxt "AppearanceSettingsPage|"
+msgid "Icon theme:"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:115
+msgctxt "AppearanceSettingsPage|"
+msgid "Automatic"
+msgstr "Automaattinen"
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:294
 msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
 msgstr "Valitse tyylisivutiedosto"
@@ -870,9 +1097,9 @@ msgstr "Yksinkertaisin pyyntötapa. Hakee tietyn määrän rivejä viestihistori
 #: ../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 "kuinka monta viestiä per puskuri pyydetään, kun yhteys ytimeen on muodostettu."
+msgstr ""
 
 #: ../src/qtui/settingspages/backlogsettingspage.ui:141
 msgctxt "BacklogSettingsPage|"
@@ -938,28 +1165,28 @@ msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr "Noudettujen viestien enimmäismäärä kaikissa puskureissa yhteensä."
 
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:30
 msgctxt "BacklogSettingsPage|"
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:30
 msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 msgstr "Viestihistorian nouto"
 
-#: ../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:253
+#: ../src/uisupport/bufferview.cpp:267
 msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr "Yhdistetäänkö puskurit pysyvästi?"
 
-#: ../src/uisupport/bufferview.cpp:254
+#: ../src/uisupport/bufferview.cpp:268
 #, qt-format
 msgctxt "BufferView|"
 msgid ""
@@ -967,6 +1194,11 @@ msgid ""
 " This cannot be reversed!"
 msgstr "Haluatko yhdistää puskurin ”%1” pysyvästi puskurin ”%2” kanssa?\n Tätä toimintoa ei voi kumota!"
 
+#: ../src/uisupport/bufferview.cpp:715
+msgctxt "BufferViewDock|"
+msgid "Search..."
+msgstr ""
+
 #: ../src/qtui/settingspages/buffervieweditdlg.ui:14
 msgctxt "BufferViewEditDlg|"
 msgid "Dialog"
@@ -977,7 +1209,7 @@ msgctxt "BufferViewEditDlg|"
 msgid "Please enter a name for the chat list:"
 msgstr "Anna keskustelulistalle nimi:"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:585
 msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr "Lisää keskustelulistalle"
@@ -1018,7 +1250,7 @@ msgid "Network:"
 msgstr "Verkko:"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:129
 msgctxt "BufferViewSettingsPage|"
 msgid "All"
 msgstr "Kaikki"
@@ -1067,30 +1299,35 @@ msgstr "Lajittele aakkosjärjestykseen"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:163
 msgctxt "BufferViewSettingsPage|"
+msgid "Show search"
+msgstr ""
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:170
+msgctxt "BufferViewSettingsPage|"
 msgid "Minimum Activity:"
 msgstr "Vähimmäistoiminta:"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:171
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:178
 msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
 msgstr "Ei toimintaa"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:176
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:183
 msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
 msgstr "Muu toiminta"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:181
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:188
 msgctxt "BufferViewSettingsPage|"
 msgid "New Message"
 msgstr "Uusi viesti"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:186
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:193
 msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
 msgstr "Korostus"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:212
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:219
 msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr "Esikatselu:"
@@ -1105,12 +1342,12 @@ msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
 msgstr "Omat keskustelulistat"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:383
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
 msgctxt "BufferViewSettingsPage|"
 msgid "Delete Chat List?"
 msgstr "Poistetaanko keskustelulista?"
 
-#: ../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\"?"
@@ -1146,40 +1383,31 @@ msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr "Siirry merkkiviivalle"
 
-#: ../src/client/networkmodel.cpp:589 ../src/client/networkmodel.cpp:591
-#, qt-format
-msgctxt "ChannelBufferItem|"
-msgid "<b>Channel %1</b>"
-msgstr "<b>Kanava %1</b>"
-
-#: ../src/client/networkmodel.cpp:595
+#: ../src/client/networkmodel.cpp:776
 #, qt-format
 msgctxt "ChannelBufferItem|"
-msgid "<b>Users:</b> %1"
-msgstr "<b>Käyttäjiä:</b> %1"
+msgid "Channel %1"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:599
-#, qt-format
+#: ../src/client/networkmodel.cpp:780
 msgctxt "ChannelBufferItem|"
-msgid "<b>Mode:</b> %1"
-msgstr "<b>Tila:</b> %1"
+msgid "Users"
+msgstr "Käyttäjiä"
 
-#: ../src/client/networkmodel.cpp:614
-#, qt-format
+#: ../src/client/networkmodel.cpp:785
 msgctxt "ChannelBufferItem|"
-msgid "<b>Topic:</b> %1"
-msgstr "<b>Aihe:</b> %1"
+msgid "Mode"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:619
+#: ../src/client/networkmodel.cpp:795
 msgctxt "ChannelBufferItem|"
-msgid "Not active <br /> Double-click to join"
-msgstr "Epäaktiivinen <br /> Liity kaksoisnapsauttamalla"
+msgid "Topic"
+msgstr "Aihe"
 
-#: ../src/client/networkmodel.cpp:622
-#, 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 ""
 
 #: ../src/qtui/ui/channellistdlg.ui:14
 msgctxt "ChannelListDlg|"
@@ -1262,7 +1490,7 @@ msgid "Move selected buffers to the right"
 msgstr "Siirrä valitut puskurit oikealle"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:273
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:285
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr "Näytä:"
@@ -1283,87 +1511,248 @@ msgctxt "ChatMonitorSettingsPage|"
 msgid "Show own messages"
 msgstr "Näytä omat viestit"
 
-#: ../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 "Näytä viestihistorian viestit uudelleenyhdistettäessä"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:167
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:197
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show messages from backlog"
 msgstr "Näytä viestihistorian viestit"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:192
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:222
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages from backlog on reconnect"
 msgstr "Näytä myös luetut viestihistorian viestit uudelleenyhdistettäessä"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:195
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:225
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages"
 msgstr "Myös luetut viestit"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr "Keskusteluvahti"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr "Mukaanotto"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:61
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr "Poisjättö"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:276
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:288
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr "Ohita:"
 
-#: ../src/qtui/chatmonitorview.cpp:54
+#: ../src/qtui/chatmonitorview.cpp:57
 msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
 msgstr "Näytä omat viestit"
 
-#: ../src/qtui/chatmonitorview.cpp:61
+#: ../src/qtui/chatmonitorview.cpp:64
 msgctxt "ChatMonitorView|"
 msgid "Show Network Name"
 msgstr "Näytä verkon nimi"
 
-#: ../src/qtui/chatmonitorview.cpp:66
+#: ../src/qtui/chatmonitorview.cpp:69
 msgctxt "ChatMonitorView|"
 msgid "Show Buffer Name"
 msgstr "Näytä puskurin nimi"
 
-#: ../src/qtui/chatmonitorview.cpp:73
+#: ../src/qtui/chatmonitorview.cpp:76
 msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr "Asetukset…"
 
-#: ../src/qtui/chatscene.cpp:826
+#: ../src/qtui/chatscene.cpp:840
 msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr "Kopioi valinta"
 
-#: ../src/qtui/chatscene.cpp:833
+#: ../src/qtui/chatscene.cpp:847
 #, qt-format
 msgctxt "ChatScene|"
 msgid "Search '%1'"
 msgstr "Hae ”%1”"
 
-#: ../src/qtui/chatscene.cpp:845
+#: ../src/qtui/chatscene.cpp:859
 msgctxt "ChatScene|"
 msgid "Reset Column Widths"
 msgstr "Nollaa sarakkeiden leveydet"
 
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:14
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Form"
+msgstr "Lomake"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:20
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Show colored text in the chat window"
+msgstr "Näytä värillistä tekstiä keskusteluikkunassa"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:23
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Allow colored text (mIRC color codes)"
+msgstr "Salli värillinen teksti (mIRC:n värikoodit)"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:39
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Custom Colors"
+msgstr "Mukautetut värit"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:60
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Action:"
+msgstr "Toiminto:"
+
+#: ../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 "Aikaleima:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:108
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Channel message:"
+msgstr "Viesti kanavalle:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:148
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight foreground:"
+msgstr "Korostuksen teksti:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:172
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Command message:"
+msgstr "Komentoviesti:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:196
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight background:"
+msgstr "Korostuksen tausta:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:203
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Server message:"
+msgstr "Palvelinviesti:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:227
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Marker line:"
+msgstr "Merkkiviiva:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:251
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Error message:"
+msgstr "Virheilmoitus:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:275
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Background:"
+msgstr "Tausta:"
+
+#: ../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 "Väritä lähettäjät"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:650
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Own messages:"
+msgstr "Omat viestit:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:689
+msgctxt "ChatViewColorSettingsPage|"
+msgid ""
+"Color sender nicknames in action messages, e.g.<br/>-*- <span style=\" font-"
+"style:italic;\">Nick</span> does an action"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:692
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color senders in action messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:708
+msgctxt "ChatViewColorSettingsPage|"
+msgid ""
+"Color nicknames in joins, parts, quits, and other messages, e.g.<br/>--> "
+"<span style=\" font-style:italic;\">Nick</span> joined #quassel"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:711
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color nicknames in other messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Interface"
+msgstr "Käyttöliittymä"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Chat View Colors"
+msgstr ""
+
 #: ../src/qtui/ui/chatviewsearchbar.ui:13
 msgctxt "ChatViewSearchBar|"
 msgid "Form"
@@ -1403,10 +1792,15 @@ msgstr "Lomake"
 
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:22
 msgctxt "ChatViewSettingsPage|"
-msgid "Timestamp format:"
-msgstr "Aikaleiman muoto:"
+msgid "Use a custom format for the timestamp"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:25
+msgctxt "ChatViewSettingsPage|"
+msgid "Custom timestamp format:"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:29
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:41
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "<html><head/><body><p>Usage examples:</p>\n"
@@ -1419,67 +1813,83 @@ msgid ""
 "</body></html>"
 msgstr "<html><head/><body><p>Käyttöesimerkkejä:</p>\n<table cellpadding=\"2\">\n<tr><td>dd.MM.yyyy</td><td>21.05.2001</td></tr>\n<tr><td>ddd d. MMMM yy</td><td>ti 21. toukokuuta 01</td></tr>\n<tr><td>hh:mm:ss.zzz</td><td>14:13:09.042</td></tr>\n<tr><td>h:m:s ap</td><td>2:13:9 pm</td></tr>\n</table>\n</body></html>"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:42
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:54
 msgctxt "ChatViewSettingsPage|"
-msgid "[hh:mm:ss]"
-msgstr "[hh:mm:ss]"
+msgid " hh:mm:ss"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:69
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:79
 msgctxt "ChatViewSettingsPage|"
-msgid "Custom chat window font:"
-msgstr "Mukautettu keskusteluikkunan fontti:"
+msgid "Shows <brackets> around the names of senders"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:102
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:82
 msgctxt "ChatViewSettingsPage|"
-msgid "Show colored text in the chat window"
-msgstr "Näytä värillistä tekstiä keskusteluikkunassa"
+msgid "Show brackets around sender names"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:105
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:100
 msgctxt "ChatViewSettingsPage|"
-msgid "Allow colored text (mIRC color codes)"
-msgstr "Salli värillinen teksti (mIRC:n värikoodit)"
+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 "Mukautettu keskusteluikkunan fontti:"
 
-#: ../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 "Näytä verkkosivusta esikatselukuva, kun hiirtä pidetään linkin päällä"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:124
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:178
 msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr "Näytä verkkosivusta esikatselu, kun hiirtä pidetään linkin päällä"
 
-#: ../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 "Aseta merkkiviiva nykyisen keskusteluikkunan loppuun, kun toinen kanava valitaan"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:143
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:197
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when switching chats"
 msgstr "Aseta merkkiviiva automaattisesti keskusteluja vaihdettaessa"
 
-#: ../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 "Aseta merkkiviiva nykyisen keskusteluikkunan loppuun, kun Quassel menettää kohdistuksen"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:162
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:216
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when Quassel loses focus"
 msgstr "Aseta merkkiviiva automaattisesti, kun Quassel menettää kohdistuksen"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:180
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:234
 msgctxt "ChatViewSettingsPage|"
-msgid "Web Search Url:"
-msgstr "Verkkohaun osoite:"
+msgid "Web Search URL:"
+msgstr ""
 
-#: ../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 "
@@ -1489,187 +1899,118 @@ msgid ""
 "style=\" font-weight:600;\">%s</span></p></body></html>"
 msgstr "<html><head/><body><p>Osoite, joka avataan valittu teksti parametrina. Laita <span style=\" font-weight:600;\">%s</span> kohtaan, johon valittu teksti tulisi laittaa.</p><p>Esimerkiksi:</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 "Mukautetut värit"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:220
-msgctxt "ChatViewSettingsPage|"
-msgid "Action:"
-msgstr "Toiminto:"
-
-#: ../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 "Aikaleima:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:268
-msgctxt "ChatViewSettingsPage|"
-msgid "Channel message:"
-msgstr "Viesti kanavalle:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:305
-msgctxt "ChatViewSettingsPage|"
-msgid "Highlight foreground:"
-msgstr "Korostuksen teksti:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:329
-msgctxt "ChatViewSettingsPage|"
-msgid "Command message:"
-msgstr "Komentoviesti:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:353
-msgctxt "ChatViewSettingsPage|"
-msgid "Highlight background:"
-msgstr "Korostuksen tausta:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:360
-msgctxt "ChatViewSettingsPage|"
-msgid "Server message:"
-msgstr "Palvelinviesti:"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:384
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:29
 msgctxt "ChatViewSettingsPage|"
-msgid "Marker line:"
-msgstr "Merkkiviiva:"
+msgid "Interface"
+msgstr "Käyttöliittymä"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:408
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:29
 msgctxt "ChatViewSettingsPage|"
-msgid "Error message:"
-msgstr "Virheilmoitus:"
+msgid "Chat View"
+msgstr "Keskustelunäkymä"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:432
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:43
 msgctxt "ChatViewSettingsPage|"
-msgid "Background:"
-msgstr "Tausta:"
+msgid "You need at least version 0.6 of Quassel Core to use this feature"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:476
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:54
 msgctxt "ChatViewSettingsPage|"
-msgid "Use Sender Coloring"
-msgstr "Väritä lähettäjät"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:772
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:55
 msgctxt "ChatViewSettingsPage|"
-msgid "Own messages:"
-msgstr "Omat viestit:"
+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 "Käyttöliittymä"
+msgid "No modes"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:70
 msgctxt "ChatViewSettingsPage|"
-msgid "Chat View"
-msgstr "Keskustelunäkymä"
+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 "Tarvitset vähintään quasselcore 0.6:n tätä ominaisuutta varten"
+msgid "All modes"
+msgstr ""
 
 #: ../src/common/qt5cliparser.cpp:30
 msgctxt "CliParser|"
 msgid "Quassel IRC is a modern, distributed IRC client."
 msgstr "Quassel IRC on moderni, hajautettu IRC-asiakasohjelma."
 
-#: ../src/client/client.cpp:324
+#: ../src/client/client.cpp:354
 msgctxt "Client|"
 msgid "Identity already exists in client!"
 msgstr "Henkilöllisyys on jo olemassa!"
 
-#: ../src/client/clientauthhandler.cpp:69
-#: ../src/client/clientauthhandler.cpp:497
+#: ../src/client/clientauthhandler.cpp:76
+#: ../src/client/clientauthhandler.cpp:525
 msgctxt "ClientAuthHandler|"
 msgid "Unencrypted connection canceled"
 msgstr "Salaamaton yhteys peruutettu"
 
-#: ../src/client/clientauthhandler.cpp:91
-#: ../src/client/clientauthhandler.cpp:107
+#: ../src/client/clientauthhandler.cpp:109
+#: ../src/client/clientauthhandler.cpp:125
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Connecting to %1..."
 msgstr "Yhdistetään ytimeen %1…"
 
-#: ../src/client/clientauthhandler.cpp:103
+#: ../src/client/clientauthhandler.cpp:121
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Looking up %1..."
 msgstr "Selvitetään verkkonimeä %1…"
 
-#: ../src/client/clientauthhandler.cpp:110
-#: ../src/client/clientauthhandler.cpp:320
+#: ../src/client/clientauthhandler.cpp:128
+#: ../src/client/clientauthhandler.cpp:348
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Connected to %1"
 msgstr "Yhdistetty ytimeen %1"
 
-#: ../src/client/clientauthhandler.cpp:114
+#: ../src/client/clientauthhandler.cpp:132
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Disconnecting from %1..."
 msgstr "Katkaistaan yhteyttä ytimeen %1…"
 
-#: ../src/client/clientauthhandler.cpp:118
+#: ../src/client/clientauthhandler.cpp:136
 msgctxt "ClientAuthHandler|"
 msgid "Disconnected"
 msgstr "Ei yhteyttä"
 
-#: ../src/client/clientauthhandler.cpp:153
+#: ../src/client/clientauthhandler.cpp:171
 msgctxt "ClientAuthHandler|"
 msgid "Reconnecting in compatibility mode..."
 msgstr "Yhdistetään uudelleen yhteensopivuustilassa…"
 
-#: ../src/client/clientauthhandler.cpp:241
+#: ../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>Yhteensopimaton Quassel-ydin</b><br>Yrität yhdistää ytimeen, joka ei tue mitään tämän asiakkaan puhumista protokollista."
 
-#: ../src/client/clientauthhandler.cpp:244
+#: ../src/client/clientauthhandler.cpp:262
 msgctxt "ClientAuthHandler|"
 msgid "Core speaks none of the protocols we support"
 msgstr "Ydin ei puhu mitään tukemistamme protokollista"
 
-#: ../src/client/clientauthhandler.cpp:259
+#: ../src/client/clientauthhandler.cpp:277
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid ""
@@ -1677,32 +2018,44 @@ msgid ""
 "at least protocol v%1, but the core speaks v%2 only."
 msgstr "<b>Quassel-ydin, johon yrität yhdistää, on liian vanha!</b><br>Yhdistämiseen tarvitaan vähintään ydin/asiakas-protokolla v%1, mutta ydin tukee vain versiota %2."
 
-#: ../src/client/clientauthhandler.cpp:261
+#: ../src/client/clientauthhandler.cpp:279
 msgctxt "ClientAuthHandler|"
 msgid "Incompatible protocol version, connection to core refused"
 msgstr "Epäyhteensopiva protokollan versio; yhteys ytimeen torjuttu"
 
-#: ../src/client/clientauthhandler.cpp:283
+#: ../src/client/clientauthhandler.cpp:301
 msgctxt "ClientAuthHandler|"
 msgid "Synchronizing to core..."
 msgstr "Synkronoidaan ytimen kanssa…"
 
-#: ../src/client/clientauthhandler.cpp:298
+#: ../src/client/clientauthhandler.cpp:316
 msgctxt "ClientAuthHandler|"
 msgid "The core refused connection from this client"
 msgstr "Ydin torjui yhteyden tältä asiakkaalta"
 
-#: ../src/client/clientauthhandler.cpp:362
+#: ../src/client/clientauthhandler.cpp:341
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core does not support the following features: %1"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:344
+#, qt-format
+msgctxt "ClientAuthHandler|"
+msgid "Core supports unknown features: %1"
+msgstr ""
+
+#: ../src/client/clientauthhandler.cpp:390
 msgctxt "ClientAuthHandler|"
 msgid "Logging in..."
 msgstr "Kirjaudutaan sisään…"
 
-#: ../src/client/clientauthhandler.cpp:367
+#: ../src/client/clientauthhandler.cpp:395
 msgctxt "ClientAuthHandler|"
 msgid "Login canceled"
 msgstr "Sisäänkirjautuminen peruutettu"
 
-#: ../src/client/clientauthhandler.cpp:425
+#: ../src/client/clientauthhandler.cpp:453
 msgctxt "ClientAuthHandler|"
 msgid "Unencrypted connection cancelled"
 msgstr "Salaamaton yhteys peruutettu"
@@ -1718,12 +2071,12 @@ msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr "Kaikki keskustelut"
 
-#: ../src/client/clientuserinputhandler.cpp:98
+#: ../src/client/clientuserinputhandler.cpp:100
 msgctxt "ClientUserInputHandler|"
 msgid "/JOIN expects a channel"
 msgstr "/JOIN tarvitsee kanavan"
 
-#: ../src/client/clientuserinputhandler.cpp:110
+#: ../src/client/clientuserinputhandler.cpp:112
 msgctxt "ClientUserInputHandler|"
 msgid "/QUERY expects at least a nick"
 msgstr "/QUERY tarvitsee vähintään nimimerkin"
@@ -1802,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 "Kopioi linkin osoite"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/contextmenuactionprovider.cpp:38
 msgctxt "ContextMenuActionProvider|"
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:40
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
 msgctxt "ContextMenuActionProvider|"
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/contextmenuactionprovider.cpp:41
 msgctxt "ContextMenuActionProvider|"
 msgid "Join"
 msgstr "Liity"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:43
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
 msgctxt "ContextMenuActionProvider|"
 msgid "Part"
 msgstr "Poistu"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:44
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
 msgctxt "ContextMenuActionProvider|"
 msgid "Delete Chat(s)..."
 msgstr "Poista keskustelut…"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:45
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
 msgctxt "ContextMenuActionProvider|"
 msgid "Go to Chat"
 msgstr "Siirry keskusteluun"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:46
 msgctxt "ContextMenuActionProvider|"
 msgid "Joins/Parts/Quits"
 msgstr "Liittymiset/poistumiset/lopettamiset"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
 msgctxt "ContextMenuActionProvider|"
 msgid "Joins"
 msgstr "Liittymiset"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
 msgctxt "ContextMenuActionProvider|"
 msgid "Parts"
 msgstr "Poistumiset"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgctxt "ContextMenuActionProvider|"
 msgid "Quits"
 msgstr "Lopetukset"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgctxt "ContextMenuActionProvider|"
 msgid "Nick Changes"
 msgstr "Nimimerkin vaihtumiset"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgctxt "ContextMenuActionProvider|"
 msgid "Mode Changes"
 msgstr "Tilan vaihtumiset"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgctxt "ContextMenuActionProvider|"
 msgid "Day Changes"
 msgstr "Päivän vaihtumiset"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgctxt "ContextMenuActionProvider|"
 msgid "Topic Changes"
 msgstr "Aiheen vaihtumiset"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:55
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgctxt "ContextMenuActionProvider|"
 msgid "Set as Default..."
 msgstr "Aseta oletukseksi…"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:56
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
 msgctxt "ContextMenuActionProvider|"
 msgid "Use Defaults..."
 msgstr "Käytä oletuksia…"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:58
+#: ../src/uisupport/contextmenuactionprovider.cpp:57
 msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr "Liity kanavalle…"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
 msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
 msgstr "Aloita yksityiskeskustelu"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:61
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr "Näytä yksityiskeskustelu"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:62
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
 msgctxt "ContextMenuActionProvider|"
 msgid "Whois"
 msgstr "Kukaon"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
 msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr "Versio"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
 msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr "Aika"
 
-#: ../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 "Ohjelman tiedot"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:68
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
 msgctxt "ContextMenuActionProvider|"
 msgid "Custom..."
 msgstr "Mukautettu…"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:80
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr "Anna operaattorioikeudet"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr "Poista operaattorioikeudet"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Half-Operator Status"
 msgstr "Anna puolioperaattorioukeudet"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Half-Operator Status"
 msgstr "Poista puolioperaattorioikeudet"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
 msgstr "Anna puheoikeus"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:85
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr "Poista puheoikeus"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:86
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr "Potki kanavalta"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:87
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
 msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr "Anna porttikielto"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:88
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr "Potki && anna porttikielto"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:90
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Temporarily"
 msgstr "Piilota keskustelut väliaikaisesti"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:91
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Permanently"
 msgstr "Piilota keskustelut pysyvästi"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:92
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
 msgstr "Näytä kanavalista"
 
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
+msgctxt "ContextMenuActionProvider|"
+msgid "Configure"
+msgstr ""
+
 #: ../src/uisupport/contextmenuactionprovider.cpp:93
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
@@ -2027,107 +2385,275 @@ msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr "Olemassa olevat säännöt"
 
-#: ../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 "Could not initialize any storage backend! Exiting..."
-msgstr "Yhtään tietokantamoottoria ei saatu käyntiin! Lopetetaan…"
+msgid "Cannot configure from environment: %1"
+msgstr ""
 
-#: ../src/core/core.cpp:192
+#: ../src/core/core.cpp:187
+msgctxt "Core|"
+msgid "Cannot configure from environment!"
+msgstr ""
+
+#: ../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 "Tällä hetkellä Quassel tukee SQLite3- ja PostgreSQL-tietokantoja. Sinun pitää\nkääntää Qt-kirjastosi joko sqlite- tai postgres-liitännäisen kanssa, jotta quasselcore\nvoi toimia."
+msgstr ""
+
+#: ../src/core/core.cpp:200
+msgctxt "Core|"
+msgid "Cannot write quasselcore configuration; probably a permission problem."
+msgstr ""
 
-#: ../src/core/core.cpp:252
+#: ../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:296
 msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr "Kutsutaan restoreState(), vaikka aktiivisia istuntoja on olemassa!"
 
-#: ../src/core/core.cpp:286
+#: ../src/core/core.cpp:333
 msgctxt "Core|"
 msgid "Core is already configured! Not configuring again..."
 msgstr "Ydin on jo asennettu! Ei asenneta uudelleen…"
 
-#: ../src/core/core.cpp:289
+#: ../src/core/core.cpp:336
 msgctxt "Core|"
 msgid "Admin user or password not set."
 msgstr "Ylläpitäjän käyttäjätunnusta tai salasanaa ei ole asetettu."
 
-#: ../src/core/core.cpp:292
+#: ../src/core/core.cpp:340
 msgctxt "Core|"
 msgid "Could not setup storage!"
 msgstr "Tietokantaa ei voitu alustaa!"
 
-#: ../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 "Luodaan ylläpitokäyttäjää…"
 
-#: ../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 "Virheellinen kuunteluosoite %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 "Odotetaan asiakasohjelmaa IPv6-osoitteen %1 portissa %2 käyttäen protokollan versiota %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 "Ei voitu avata IPv6-rajapintaa %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 "Odotetaan asiakasohjelmaa IPv4-osoitteen %1 portissa %2 käyttäen protokollan versiota %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 "Ei voitu avata IPv4-rajapintaa %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 "Virheellinen kuunteluosoite %1; tuntematon verkkoprotokolla"
 
-#: ../src/core/core.cpp:501
+#: ../src/core/core.cpp:687
 msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr "Ei voitu avata yhtään verkkorajapintaa kuuntelua varten!"
 
-#: ../src/core/core.cpp:541
+#: ../src/core/core.cpp:735
 msgctxt "Core|"
 msgid "Client connected from"
 msgstr "Asiakasohjelma yhdisti osoitteesta"
 
-#: ../src/core/core.cpp:544
+#: ../src/core/core.cpp:738
 msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr "Suljetaan palvelin perusasetusten tekoa varten."
 
-#: ../src/core/core.cpp:556
+#: ../src/core/core.cpp:750
 msgctxt "Core|"
 msgid "Non-authed client disconnected:"
 msgstr "Yhteys todentamattomaan asiakkaaseen katkaistu:"
 
-#: ../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 ""
+
+#: ../src/core/core.cpp:926
+msgctxt "Core|"
+msgid "Supported backends are:"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/core/core.cpp:942
+#, qt-format
+msgctxt "Core|"
+msgid "Storage backend is not available: %1"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/core/core.cpp:971
+msgctxt "Core|"
+msgid "Migration finished!"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/core/core.cpp:987
+#, qt-format
+msgctxt "Core|"
+msgid "Currently active storage backend does not support migration: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:990
+#, qt-format
+msgctxt "Core|"
+msgid "New storage backend does not support migration: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:1012
+#, qt-format
+msgctxt "Core|"
+msgid "Unsupported authenticator: %1"
+msgstr ""
+
+#: ../src/core/core.cpp:1013
+msgctxt "Core|"
+msgid "Supported authenticators are:"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 "Sisäinen ydin"
 
 #: ../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 "Muokkaa ydintiliä"
@@ -2148,7 +2674,7 @@ msgid "Local Core"
 msgstr "Paikallinen ydin"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:170
 msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr "Verkko-osoite:"
@@ -2160,13 +2686,13 @@ msgid "localhost"
 msgstr "localhost"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:54
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:187
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:133
 msgctxt "CoreAccountEditDlg|"
 msgid "Port:"
 msgstr "Portti:"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:229
 msgctxt "CoreAccountEditDlg|"
 msgid "User:"
 msgstr "Käyttäjä:"
@@ -2184,25 +2710,40 @@ msgstr "Muista"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
 msgctxt "CoreAccountEditDlg|"
-msgid "Use a Proxy"
-msgstr "Käytä välityspalvelinta"
+msgid "Proxy Settings"
+msgstr ""
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:144
+msgctxt "CoreAccountEditDlg|"
+msgid "SOCKS 5"
+msgstr ""
 
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:149
+msgctxt "CoreAccountEditDlg|"
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:279
 msgctxt "CoreAccountEditDlg|"
 msgid "Proxy Type:"
 msgstr "Välityspalvelimen tyyppi:"
 
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:288
 msgctxt "CoreAccountEditDlg|"
-msgid "Socks 5"
-msgstr "Socks 5"
+msgid "No pro&xy"
+msgstr ""
 
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:298
 msgctxt "CoreAccountEditDlg|"
-msgid "HTTP"
-msgstr "HTTP"
+msgid "S&ystem proxy"
+msgstr ""
 
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:263
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:311
+msgctxt "CoreAccountEditDlg|"
+msgid "&Manual proxy configuration"
+msgstr ""
+
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:295
 msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr "Lisää ydintili"
@@ -2252,22 +2793,28 @@ msgctxt "CoreAccountSettingsPage|"
 msgid "Always connect to"
 msgstr "Yhdistä aina tiliin"
 
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:30
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
 msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
 msgstr "Etäytimet"
 
-#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144
+#: ../src/core/coreapplication.cpp:46
+msgctxt "CoreApplication|"
+msgid "Could not initialize Quassel!"
+msgstr "Quasselin alustaminen epäonnistui!"
+
+#: ../src/core/coreauthhandler.cpp:138 ../src/core/coreauthhandler.cpp:150
+#: ../src/core/coreauthhandler.cpp:225
 msgctxt "CoreAuthHandler|"
 msgid "Client"
 msgstr "Ohjelma"
 
-#: ../src/core/coreauthhandler.cpp:132
+#: ../src/core/coreauthhandler.cpp:138
 msgctxt "CoreAuthHandler|"
 msgid "too old, rejecting."
 msgstr "liian vanha, hylätään."
 
-#: ../src/core/coreauthhandler.cpp:133
+#: ../src/core/coreauthhandler.cpp:139
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid ""
@@ -2276,73 +2823,101 @@ msgid ""
 " client."
 msgstr "<b>Quassel-asiakkaasi on liian vanha!</b><br>Tämä ydin vaatii vähintään asiakas/ydin-protokollan version %1 (asiakkaan versio: %2).<br>Harkitse asiakkaasi päivittämistä."
 
-#: ../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 "ei lähettänyt rekisteröitymisviestiä ennen sisäänkirjautumisen yrittämistä, hylätään."
 
-#: ../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>Asiakasta ei alustettu!</b><br>Sinun pitää lähettää rekisteröitymisviesti ennen sisäänkirjautumisen yrittämistä."
 
-#: ../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 "SSL vaaditaan, mutta tuli ei-SSL-yhdistämisyritys osoitteesta %1"
 
-#: ../src/core/coreauthhandler.cpp:163
+#: ../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 vaaditaan!</b><br>SSL vaaditaan tähän ytimeen yhdistämiseksi."
 
-#: ../src/core/coreauthhandler.cpp:177
-#, qt-format
+#: ../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>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
-msgstr "<b>Quassel-ydin versio:</b> %1<br>Käännetty: %2<br>Päällä %3 d %4 h %5 m (alkaen %6)"
+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:213
+#: ../src/core/coreauthhandler.cpp:238
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid "Invalid login attempt from %1 as \"%2\""
 msgstr "Virheellinen kirjautumisyritys osoitteesta %1 käyttäjänä ”%2”"
 
-#: ../src/core/coreauthhandler.cpp:214
+#: ../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>Virheellinen käyttäjätunnus tai salasana!</b><br>Antamaasi käyttäjätunnus/salasana-yhdistelmää ei löytynyt tietokannasta."
 
-#: ../src/core/coreauthhandler.cpp:219
+#: ../src/core/coreauthhandler.cpp:244
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid ""
 "Client %1 initialized and authenticated successfully as \"%2\" (UserId: %3)."
 msgstr "Asiakas %1 alustettu ja todennettu onnistuneesti tunnuksella ”%2” (UserId: %3)."
 
-#: ../src/core/coreauthhandler.cpp:238
+#: ../src/core/coreauthhandler.cpp:250
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support extended features."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:252
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client does not support the following features: %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:256
+#, qt-format
+msgctxt "CoreAuthHandler|"
+msgid "Client supports unknown features: %1"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:276
 msgctxt "CoreAuthHandler|"
 msgid "Starting encryption for Client:"
 msgstr "Käynnistetään salaus asiakkaalle:"
 
-#: ../src/qtui/coreconfigwizard.cpp:69
+#: ../src/qtui/coreconfigwizard.cpp:43
+msgctxt "CoreConfigWizard|"
+msgid "Description"
+msgstr "Kuvaus"
+
+#: ../src/qtui/coreconfigwizard.cpp:162
 msgctxt "CoreConfigWizard|"
 msgid "Core Configuration Wizard"
 msgstr "Ohjattu ytimen asetusten teko"
 
-#: ../src/qtui/coreconfigwizard.cpp:98
+#: ../src/qtui/coreconfigwizard.cpp:203
 msgctxt "CoreConfigWizard|"
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr "Ytimesi asetusten tekeminen onnistui. Kirjaudutaan sisään…"
 
-#: ../src/qtui/coreconfigwizard.cpp:107
+#: ../src/qtui/coreconfigwizard.cpp:212
 #, qt-format
 msgctxt "CoreConfigWizard|"
 msgid ""
@@ -2350,45 +2925,48 @@ msgid ""
 "over."
 msgstr "Ytimesi asetusten tekeminen epäonnistui:<br><b>%1</b><br>Aloita alusta painamalla <em>Seuraava</em>."
 
-#: ../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 "Olet nyt kirjautunut sisään tuoreeseen Quassel-ytimeesi!<br>Muista tehdä henkilöllisyys- ja verkkoasetuksesi nyt."
-
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Form"
 msgstr "Lomake"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:25
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr "Käyttäjätunnus:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:35
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Password:"
 msgstr "Salasana:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:49
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr "Toista salasana:"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:63
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr "Muista salasana"
 
-#: ../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>Huom:</b> Käyttäjien lisääminen tai käyttäjätunnuksen/salasanan vaihtaminen ei ole vielä mahdollista Quassel-käyttöliittymän kautta.\nJos sinun täytyy tehdä jotain näistä asioista, suorita ”<tt><nobr>quasselcore --help</nobr></tt>” palvelimellasi."
 
+#: ../src/qtui/ui/coreconfigwizardauthenticationselectionpage.ui:14
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Form"
+msgstr "Lomake"
+
+#: ../src/qtui/ui/coreconfigwizardauthenticationselectionpage.ui:25
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Authentication Backend:"
+msgstr ""
+
 #: ../src/qtui/ui/coreconfigwizardintropage.ui:13
 msgctxt "CoreConfigWizardIntroPage|"
 msgid "Form"
@@ -2399,103 +2977,102 @@ msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr "Tämä ohjattu toiminto avustaa Quassel-ytimen käyttöönotossa."
 
-#: ../src/qtui/coreconfigwizard.cpp:162
+#: ../src/qtui/coreconfigwizard.cpp:258
 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid "Create Admin User"
 msgstr "Luo ylläpitokäyttäjä"
 
-#: ../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 "Ensiksi luomme ytimeen käyttäjän. Tästä ensimmäisestä käyttäjästä tulee ylläpitäjä."
 
-#: ../src/qtui/coreconfigwizard.cpp:145
+#: ../src/qtui/coreconfigwizard.cpp:293
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid "Select Authentication Backend"
+msgstr ""
+
+#: ../src/qtui/coreconfigwizard.cpp:294
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid ""
+"Please select a backend for Quassel Core to use for authenticating users."
+msgstr ""
+
+#: ../src/qtui/coreconfigwizard.cpp:314
+msgctxt "CoreConfigWizardPages::AuthenticationSelectionPage|"
+msgid "Authentication Settings"
+msgstr ""
+
+#: ../src/qtui/coreconfigwizard.cpp:241
 msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr "Esittely"
 
-#: ../src/qtui/coreconfigwizard.cpp:198
+#: ../src/qtui/coreconfigwizard.cpp:379
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
 msgstr "Valitse tietokantamoottori"
 
-#: ../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 "Valitse tietokantamoottori, jota Quassel-ydin käyttää viestihistorian ja muun datan tallennukseen."
+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 "Yhteyden ominaisuudet"
+msgid "Storage Settings"
+msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:342
+#: ../src/qtui/coreconfigwizard.cpp:484
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid "Storing Your Settings"
 msgstr "Asetuksiesi tallennus"
 
-#: ../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 "Asetuksesi on nyt tallennettu ytimeen, ja sinut kirjataan sisään automaattisesti."
+msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:14
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Form"
 msgstr "Lomake"
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:22
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr "Tietokantamoottori:"
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
-msgctxt "CoreConfigWizardStorageSelectionPage|"
-msgid "Description"
-msgstr "Kuvaus"
-
-#: ../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 "Lomake"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:20
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr "Valintasi"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:36
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr "Ylläpitokäyttäjä:"
 
-#: ../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 "Tietokantamoottori:"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:76
 msgctxt "CoreConfigWizardSyncPage|"
-msgid "bar"
-msgstr "bar"
+msgid "Authentication Backend:"
+msgstr ""
 
-#: ../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 "Asetuksiasi siirretään ytimeen. Odota hetki…"
@@ -2541,33 +3118,38 @@ msgctxt "CoreConnection|"
 msgid "Network is down"
 msgstr "Verkkoyhteys katkennut"
 
-#: ../src/client/coreconnection.cpp:265
+#: ../src/client/coreconnection.cpp:274
 msgctxt "CoreConnection|"
 msgid "Disconnected"
 msgstr "Ei yhteyttä"
 
-#: ../src/client/coreconnection.cpp:300
+#: ../src/client/coreconnection.cpp:309
 msgctxt "CoreConnection|"
 msgid "Disconnected from core."
 msgstr "Yhteys ytimeen katkesi."
 
-#: ../src/client/coreconnection.cpp:438
+#: ../src/client/coreconnection.cpp:388
+msgctxt "CoreConnection|"
+msgid "Initializing..."
+msgstr ""
+
+#: ../src/client/coreconnection.cpp:446
 msgctxt "CoreConnection|"
 msgid "Receiving session state"
 msgstr "Vastaanotetaan istunnon tilaa"
 
-#: ../src/client/coreconnection.cpp:440
+#: ../src/client/coreconnection.cpp:448
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronizing to %1..."
 msgstr "Synkronoidaan ytimen %1 kanssa…"
 
-#: ../src/client/coreconnection.cpp:476
+#: ../src/client/coreconnection.cpp:481
 msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr "Vastaanotetaan verkkojen tiloja"
 
-#: ../src/client/coreconnection.cpp:527
+#: ../src/client/coreconnection.cpp:532
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronized to %1"
@@ -2659,83 +3241,357 @@ msgctxt "CoreConnectionStatusWidget|"
 msgid "Message"
 msgstr "Viesti"
 
-#: ../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 "(Viive: %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 "Yhteys ytimeen on salattu SSL:llä."
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:88
+#: ../src/qtui/coreconnectionstatuswidget.cpp:87
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr "Yhteys ytimeen ei ole salattu."
 
-#: ../src/qtui/ui/coreinfodlg.ui:13
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:14
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Form"
+msgstr "Lomake"
+
+#: ../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 ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:93
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Rules"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:99
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Highlight Nicks"
+msgstr "Korostetut nimimerkit"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:127
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Case sensitive"
+msgstr "Sama kirjainkoko"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:153
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Custom Highlights"
+msgstr "Mukautetut korostukset"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:166
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:269
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enabled"
+msgstr "Käytössä"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:171
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:274
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Rule"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:176
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:279
+msgctxt "CoreHighlightSettingsPage|"
+msgid "RegEx"
+msgstr "RegEx"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:181
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:284
+msgctxt "CoreHighlightSettingsPage|"
+msgid "CS"
+msgstr "SKK"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:186
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:289
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Sender"
+msgstr "Lähettäjä"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:191
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:294
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Channel"
+msgstr "Kanava"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:207
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:310
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Add"
+msgstr "Lisää"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:214
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:317
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remove"
+msgstr "Poista"
+
+#: ../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 "Käyttöliittymä"
+
+#: ../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 ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:43
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Current Nick"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.cpp:44
+msgctxt "CoreHighlightSettingsPage|"
+msgid "None"
+msgstr "Ei pikanäppäintä"
+
+#: ../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 ""
+
+#: ../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 "korostussääntö"
+
+#: ../src/qtui/ui/coreinfodlg.ui:14
 msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr "Ytimen tiedot"
 
-#: ../src/qtui/ui/coreinfodlg.ui:21
+#: ../src/qtui/ui/coreinfodlg.ui:22
 msgctxt "CoreInfoDlg|"
 msgid "Version:"
 msgstr "Versio:"
 
-#: ../src/qtui/ui/coreinfodlg.ui:28
+#: ../src/qtui/ui/coreinfodlg.ui:36
 msgctxt "CoreInfoDlg|"
-msgid "<core version>"
-msgstr "<ytimen versio>"
+msgid "Version date:"
+msgstr "Version päiväys:"
 
-#: ../src/qtui/ui/coreinfodlg.ui:35
+#: ../src/qtui/ui/coreinfodlg.ui:50
 msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr "Päälläoloaika:"
 
-#: ../src/qtui/ui/coreinfodlg.ui:42
+#: ../src/qtui/ui/coreinfodlg.ui:64
 msgctxt "CoreInfoDlg|"
-msgid "Connected Clients:"
-msgstr "Yhdistettyjä asiakkaita:"
+msgid "Connected clients:"
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:49
+#: ../src/qtui/ui/coreinfodlg.ui:117 ../src/qtui/coreinfodlg.cpp:193
 msgctxt "CoreInfoDlg|"
-msgid "<connected clients>"
-msgstr "<yhdistettyjä asiakkaita>"
+msgid "Your Quassel core is too old to show active sessions"
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:56
+#: ../src/qtui/ui/coreinfodlg.ui:124
 msgctxt "CoreInfoDlg|"
-msgid "<core uptime>"
-msgstr "<ytimen päälläoloaika>"
+msgid "Details..."
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:63
+#: ../src/qtui/ui/coreinfodlg.ui:200
 msgctxt "CoreInfoDlg|"
-msgid "Build date:"
-msgstr "Käännösaika:"
+msgid "Close"
+msgstr "Sulje"
 
-#: ../src/qtui/ui/coreinfodlg.ui:70
+#: ../src/qtui/coreinfodlg.cpp:86 ../src/qtui/coreinfodlg.cpp:87
+#: ../src/qtui/coreinfodlg.cpp:160
 msgctxt "CoreInfoDlg|"
-msgid "<build date>"
-msgstr "<käännösaika>"
+msgid "Unknown"
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:81
+#: ../src/qtui/coreinfodlg.cpp:90
 msgctxt "CoreInfoDlg|"
-msgid "Close"
-msgstr "Sulje"
+msgid "Disconnected from core"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:91 ../src/qtui/coreinfodlg.cpp:157
+msgctxt "CoreInfoDlg|"
+msgid "Not available"
+msgstr ""
+
+#: ../src/qtui/coreinfodlg.cpp:99
+msgctxt "CoreInfoDlg|"
+msgid "Unknown date"
+msgstr "Tuntematon päivämäärä"
 
-#: ../src/qtui/coreinfodlg.cpp:57
+#: ../src/qtui/coreinfodlg.cpp:173
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid "%n Day(s)"
@@ -2743,58 +3599,139 @@ msgid_plural "%n Day(s)"
 msgstr[0] "%n päivä"
 msgstr[1] "%n päivää"
 
-#: ../src/qtui/coreinfodlg.cpp:58
+#: ../src/qtui/coreinfodlg.cpp:174
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid " %1:%2:%3 (since %4)"
 msgstr " %1:%2:%3 (alkaen %4)"
 
-#: ../src/core/corenetwork.cpp:167
+#: ../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 "Yhdistäminen epäonnistui. Siirrytään seuraavalle palvelimelle"
 
-#: ../src/core/corenetwork.cpp:175 ../src/core/corenetwork.cpp:176
+#: ../src/core/corenetwork.cpp:249 ../src/core/corenetwork.cpp:250
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connecting to %1:%2..."
 msgstr "Yhdistetään palvelimeen %1:%2…"
 
-#: ../src/core/corenetwork.cpp:233
+#: ../src/core/corenetwork.cpp:316
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Disconnecting. (%1)"
 msgstr "Katkaistaan yhteys. (%1)"
 
-#: ../src/core/corenetwork.cpp:233
+#: ../src/core/corenetwork.cpp:316
 msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr "Ytimen sammutus"
 
-#: ../src/core/corenetwork.cpp:441
+#: ../src/core/corenetwork.cpp:539
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"
 msgstr "Ei voitu yhdistää verkkoon %1 (%2)"
 
-#: ../src/core/corenetwork.cpp:443
+#: ../src/core/corenetwork.cpp:541
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
 msgstr "Yhteysvirhe: %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 ""
+
+#: ../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 "Ohjelma"
 
-#: ../src/core/coresession.cpp:233
+#: ../src/core/coresession.cpp:298
 #, qt-format
 msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."
 msgstr "yhteys katkaistu (UserId: %1)."
 
-#: ../src/core/coresession.cpp:481
+#: ../src/core/coresession.cpp:623
 #, qt-format
 msgctxt "CoreSession|"
 msgid ""
@@ -2802,121 +3739,186 @@ msgid ""
 " create network %1!"
 msgstr "CoreSession::createNetwork(): Sai virheellisen networkId:n ytimeltä yrittäessään luoda verkkoa %1!"
 
-#: ../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(): Yritetään luoda verkkoa, joka on jo olemassa; päivitetään luomisen sijaan!"
 
-#: ../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 "Vapaita ja kelvollisia nimimerkkejä ei löytynyt. Jatka käyttämällä /nick <nimimerkki>"
 
-#: ../src/core/coresessioneventprocessor.cpp:450
+#: ../src/core/coresessioneventprocessor.cpp:800
 msgctxt "CoreSessionEventProcessor|"
 msgid "Unable to perform key exchange, missing qca-ossl plugin."
 msgstr "Avainten vaihdon suorittaminen epäonnistui. qca-ossl-liitännäinen puuttuu."
 
-#: ../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:n jäsennys epäonnistui. Avainten vaihto epäonnistui."
 
-#: ../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 "Avaimesi on asetettu ja viestit salataan."
 
-#: ../src/core/coresessioneventprocessor.cpp:475
+#: ../src/core/coresessioneventprocessor.cpp:825
 msgctxt "CoreSessionEventProcessor|"
 msgid "Failed to parse DH1080_FINISH. Key exchange failed."
 msgstr "DH1080_FINISH:n jäsennys epäonnistui. Avainten vaihto epäonnistui."
 
-#: ../src/core/coresessioneventprocessor.cpp:1052
+#: ../src/core/coresessioneventprocessor.cpp:1587
 msgctxt "CoreSessionEventProcessor|"
 msgid "Reverse DCC SEND not supported"
 msgstr "Käänteis-DCC:n SEND-komentoa ei tueta"
 
-#: ../src/core/coresessioneventprocessor.cpp:1070
+#: ../src/core/coresessioneventprocessor.cpp:1605
 #, qt-format
 msgctxt "CoreSessionEventProcessor|"
 msgid "DCC %1 not supported"
 msgstr "Komentoa DCC %1 ei tueta"
 
-#: ../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 ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:51
+msgctxt "CoreSessionWidget|"
+msgid "Version date:"
+msgstr "Version päiväys:"
+
+#: ../src/qtui/ui/coresessionwidget.ui:65
+msgctxt "CoreSessionWidget|"
+msgid "Location:"
+msgstr "Sijainti:"
+
+#: ../src/qtui/ui/coresessionwidget.ui:79
+msgctxt "CoreSessionWidget|"
+msgid "Connected since:"
+msgstr "Yhteyessä alkaen:"
+
+#: ../src/qtui/ui/coresessionwidget.ui:93
+msgctxt "CoreSessionWidget|"
+msgid "Secure:"
+msgstr "Turvallinen:"
+
+#: ../src/qtui/ui/coresessionwidget.ui:124
+msgctxt "CoreSessionWidget|"
+msgid "End Session"
+msgstr "Päätä istunto"
+
+#: ../src/qtui/coresessionwidget.cpp:41
+msgctxt "CoreSessionWidget|"
+msgid "Unknown date"
+msgstr "Tuntematon päivämäärä"
+
+#: ../src/qtui/coresessionwidget.cpp:53
+msgctxt "CoreSessionWidget|"
+msgid "Yes"
+msgstr "Kyllä"
+
+#: ../src/qtui/coresessionwidget.cpp:53
+msgctxt "CoreSessionWidget|"
+msgid "No"
+msgstr "Ei"
+
+#: ../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 "Päätetään istuntoa..."
+
+#: ../src/core/coretransfer.cpp:64
 msgctxt "CoreTransfer|"
 msgid "Socket closed while still transferring!"
 msgstr "Soketti suljettiin siirron aikana!"
 
-#: ../src/core/coretransfer.cpp:70
+#: ../src/core/coretransfer.cpp:76
 #, qt-format
 msgctxt "CoreTransfer|"
 msgid "DCC connection error: %1"
 msgstr "DCC-yhteysvirhe: %1"
 
-#: ../src/core/coretransfer.cpp:114
+#: ../src/core/coretransfer.cpp:120
 msgctxt "CoreTransfer|"
 msgid "Reverse DCC not supported yet!"
 msgstr "Käänteis-DCC:tä ei vielä tueta!"
 
-#: ../src/core/coretransfer.cpp:160
+#: ../src/core/coretransfer.cpp:167
 msgctxt "CoreTransfer|"
 msgid "DCC Receive: Got more data than expected!"
 msgstr "DCC-vastaanotto: Saatiin odotettua enemmän dataa!"
 
-#: ../src/core/coretransfer.cpp:176
+#: ../src/core/coretransfer.cpp:183
 msgctxt "CoreTransfer|"
 msgid "DCC Receive: Quassel Client disconnected during transfer!"
 msgstr "DCC-vastaanotto: Quassel-asiakas katkaisi yhteyden siirron aikana!"
 
-#: ../src/core/coreuserinputhandler.cpp:88
+#: ../src/core/coreuserinputhandler.cpp:104
 msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr "poissa"
 
-#: ../src/core/coreuserinputhandler.cpp:169
+#: ../src/core/coreuserinputhandler.cpp:185
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
 msgstr "lähetetään CTCP-%1-pyyntö käyttäjälle %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 "Virhe: QCA-tuen tarjoavaa liitännäistä ei löytynyt. Sen tarjoaa yleensä qca-ossl-liitännäinen."
 
-#: ../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 "[käyttö] /delkey <nimimerkki/kanava> poistaa salausavaimen nimimerkiltä tai kanavalta; kanavalla tai yksityiskeskustelussa riittää kirjoittaa ”/delkey”."
 
-#: ../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 "Kohteelle %1 ei ole asetettu avainta."
 
-#: ../src/core/coreuserinputhandler.cpp:212
+#: ../src/core/coreuserinputhandler.cpp:229
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been deleted."
 msgstr "Kohteen %1 avain on poistettu."
 
-#: ../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 "
@@ -2925,31 +3927,31 @@ msgid ""
 "with QCA2 present."
 msgstr "Virhe: Salausavaimen asettaminen vaatii Qt Cryptocraphic Architecture (QCA2)  -kirjaston Quasselia käännettäeissä. Ota yhteys jakelijaasi saadaksesi Quasselin QCA2-tuella, tai käännä Quassel uudestaan QCA2:n kanssa."
 
-#: ../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 "[käyttö] /keyx [<nimimerkki>] Aloittaa DH1080-avaintenvaihdon kohteen kanssa."
 
-#: ../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 "Avaintenvaihto on mahdollista vain yksityiskeskustelupuskurissa."
 
-#: ../src/core/coreuserinputhandler.cpp:387
+#: ../src/core/coreuserinputhandler.cpp:404
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Failed to initiate key exchange with %1."
 msgstr "Avainten vaihdon aloittaminen kohteen %1 kanssa epäonnistui."
 
-#: ../src/core/coreuserinputhandler.cpp:392
+#: ../src/core/coreuserinputhandler.cpp:409
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Initiated key exchange with %1."
 msgstr "Aloitettiin avainten vaihto kohteen %1 kanssa."
 
-#: ../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 "
@@ -2958,13 +3960,18 @@ msgid ""
 "with QCA present."
 msgstr "Virhe: Salausavaimen asettaminen vaatii Qt Cryptocraphic Architecture (QCA2)  -kirjaston Quasselia käännettäeissä. Ota yhteys jakelijaasi saadaksesi Quasselin QCA2-tuella, tai käännä Quassel uudestaan QCA2:n kanssa."
 
-#: ../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 "Aloitetaan yksityiskeskustelu käyttäjän %1 kanssa"
 
-#: ../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 "
@@ -2972,55 +3979,157 @@ msgid ""
 "it."
 msgstr "[käyttö] /setkey <nimimerkki/kanava> <avain> asettaa salausavaimen nimimerkille tai kanavalle; kanavalla tai yksityiskeskustelussa riittää kirjoittaa ”/setkey <avain>”."
 
-#: ../src/core/coreuserinputhandler.cpp:641
+#: ../src/core/coreuserinputhandler.cpp:703
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been set."
 msgstr "Kohteen %1 avain on asetettu."
 
-#: ../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 "[käyttö] /showkey <nimimerkki/kanava> näyttää nimimerkin tai kanavan salausavaimen; kanavalla tai yksityiskeskustelussa riittää kirjoittaa ”/showkey”."
 
-#: ../src/core/coreuserinputhandler.cpp:682
+#: ../src/core/coreuserinputhandler.cpp:744
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 is %2:%3"
 msgstr "Kohteen %1 avain on %2:%3"
 
-#: ../src/qtui/settingspages/createidentitydlg.ui:17
-msgctxt "CreateIdentityDlg|"
-msgid "Create New Identity"
-msgstr "Luo uusi henkilöllisyys"
+#: ../src/qtui/settingspages/createidentitydlg.ui:17
+msgctxt "CreateIdentityDlg|"
+msgid "Create New Identity"
+msgstr "Luo uusi henkilöllisyys"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:25
+msgctxt "CreateIdentityDlg|"
+msgid "Identity name:"
+msgstr "Henkilöllisyyden nimi:"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:37
+msgctxt "CreateIdentityDlg|"
+msgid "Create blank identity"
+msgstr "Luo tyhjä henkilöllisyys"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:49
+msgctxt "CreateIdentityDlg|"
+msgid "Duplicate:"
+msgstr "Monista:"
+
+#: ../src/common/protocols/datastream/datastreampeer.cpp:117
+msgctxt "DataStreamPeer|"
+msgid "Invalid handshake message!"
+msgstr "Virheellinen kättelyviesti!"
+
+#: ../src/common/protocols/datastream/datastreampeer.cpp:173
+#, qt-format
+msgctxt "DataStreamPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr "Tuntematon %1 -tyyppinen protokollaviesti"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:14
+msgctxt "DccSettingsPage|"
+msgid "Form"
+msgstr "Lomake"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:20
+msgctxt "DccSettingsPage|"
+msgid "Enable DCC"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:37
+msgctxt "DccSettingsPage|"
+msgid "Ports:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:51
+#: ../src/qtui/settingspages/dccsettingspage.ui:134
+msgctxt "DccSettingsPage|"
+msgid "Automatic"
+msgstr "Automaattinen"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:56
+#: ../src/qtui/settingspages/dccsettingspage.ui:139
+msgctxt "DccSettingsPage|"
+msgid "Manual"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:82
+msgctxt "DccSettingsPage|"
+msgid "to"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:110
+msgctxt "DccSettingsPage|"
+msgid "Outgoing IP:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:164
+msgctxt "DccSettingsPage|"
+msgid "DCC send timeout:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:171
+msgctxt "DccSettingsPage|"
+msgid " seconds"
+msgstr " sekuntia"
 
-#: ../src/qtui/settingspages/createidentitydlg.ui:25
-msgctxt "CreateIdentityDlg|"
-msgid "Identity name:"
-msgstr "Henkilöllisyyden nimi:"
+#: ../src/qtui/settingspages/dccsettingspage.ui:213
+msgctxt "DccSettingsPage|"
+msgid "Chunk size:"
+msgstr ""
 
-#: ../src/qtui/settingspages/createidentitydlg.ui:37
-msgctxt "CreateIdentityDlg|"
-msgid "Create blank identity"
-msgstr "Luo tyhjä henkilöllisyys"
+#: ../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 "Käytä passiivista/käänteistä DCC:tä"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:276
+msgctxt "DccSettingsPage|"
+msgid "Use fast sending (might not work with all peers)"
+msgstr "Käytä nopeaa lähettämistä (ei välttämättä toimi kaikkien vertaisten kanssa)"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:295
+msgctxt "DccSettingsPage|"
+msgid "File transfers"
+msgstr "Tiedostosiirrot"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:303
+msgctxt "DccSettingsPage|"
+msgid "Default download folder:"
+msgstr "Latausten oletuskansio:"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:313
+msgctxt "DccSettingsPage|"
+msgid "..."
+msgstr "…"
 
-#: ../src/qtui/settingspages/createidentitydlg.ui:49
-msgctxt "CreateIdentityDlg|"
-msgid "Duplicate:"
-msgstr "Monista:"
+#: ../src/qtui/settingspages/dccsettingspage.ui:322
+msgctxt "DccSettingsPage|"
+msgid "Create folder per sender"
+msgstr "Luo kansio per lähettäjä"
 
-#: ../src/common/protocols/datastream/datastreampeer.cpp:114
-msgctxt "DataStreamPeer|"
-msgid "Invalid handshake message!"
-msgstr "Virheellinen kättelyviesti!"
+#: ../src/qtui/settingspages/dccsettingspage.ui:329
+msgctxt "DccSettingsPage|"
+msgid "Prefix filenames with sender"
+msgstr ""
 
-#: ../src/common/protocols/datastream/datastreampeer.cpp:161
-#, qt-format
-msgctxt "DataStreamPeer|"
-msgid "Unknown protocol message of type %1"
-msgstr "Tuntematon %1 -tyyppinen protokollaviesti"
+#: ../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|"
@@ -3117,230 +4226,240 @@ msgctxt "DockManagerNotificationBackend::ConfigWidget|"
 msgid "Mark dockmanager entry"
 msgstr "Merkitse Dockmanagerin kohde"
 
-#: ../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 kutsui sinut kanavalle %2"
 
-#: ../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 vaihtoi kanavan %2 aiheeksi: ”%3”"
 
-#: ../src/core/eventstringifier.cpp:347
+#: ../src/core/eventstringifier.cpp:419
+msgctxt "EventStringifier|"
+msgid "Error from server: "
+msgstr "Virhe palvelimelta: "
+
+#: ../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 "Vastaanotettiin RFC:n vastainen RPL_ISUPPORT: tämä voi johtaa odottamattomaan toimintaan!"
 
-#: ../src/core/eventstringifier.cpp:384
+#: ../src/core/eventstringifier.cpp:471
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 is away: \"%2\""
 msgstr "%1 on poissa: ”%2”"
 
-#: ../src/core/eventstringifier.cpp:391
+#: ../src/core/eventstringifier.cpp:478
 msgctxt "EventStringifier|"
 msgid "You are no longer marked as being away"
 msgstr "Et ole enää merkitty poissa olevaksi"
 
-#: ../src/core/eventstringifier.cpp:399
+#: ../src/core/eventstringifier.cpp:486
 msgctxt "EventStringifier|"
 msgid "You have been marked as being away"
 msgstr "Sinut on merkitty poissa olevaksi"
 
-#: ../src/core/eventstringifier.cpp:421
+#: ../src/core/eventstringifier.cpp:508
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is %2 (%3)"
 msgstr "[Whois] %1 on %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 "[Whois] %1 on yhdistettynä %2 välityksellä (%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 oli yhdistettynä %2 välityksellä (%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 oli %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] /WHO-listauksen loppu kohteelle %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 on ollut kirjautuneena alkaen %2"
 
-#: ../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 on ollut jouten %2 (%3 alkaen)"
 
-#: ../src/core/eventstringifier.cpp:484
+#: ../src/core/eventstringifier.cpp:580
 msgctxt "EventStringifier|"
 msgid "[Whois] End of /WHOIS list"
 msgstr "[Who] /WHO-listauksen loppu"
 
-#: ../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 on käyttäjä kanavilla: %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 on puheoikeutettu kanavilla: %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 on operaattori kanavilla: %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 "Kanavalla %1 on %2 käyttäjää. Aihe on: %3"
 
-#: ../src/core/eventstringifier.cpp:540
+#: ../src/core/eventstringifier.cpp:639
 msgctxt "EventStringifier|"
 msgid "End of channel list"
 msgstr "Kanavalistan loppu"
 
-#: ../src/core/eventstringifier.cpp:558
+#: ../src/core/eventstringifier.cpp:657
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Homepage for %1 is %2"
 msgstr "Kotisivu kanavalle %1 on %2"
 
-#: ../src/core/eventstringifier.cpp:575
+#: ../src/core/eventstringifier.cpp:683
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 created on %2"
 msgstr "Kanava %1 on luotu %2"
 
-#: ../src/core/eventstringifier.cpp:589
+#: ../src/core/eventstringifier.cpp:697
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is authed as %2"
 msgstr "[Whois] %1 on tunnistautunut käyttäjäksi %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 oli tunnistautunut käyttäjäksi %2"
 
-#: ../src/core/eventstringifier.cpp:601
+#: ../src/core/eventstringifier.cpp:709
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "No topic is set for %1."
 msgstr "Kanavalle %1 ei ole asetettu aihetta."
 
-#: ../src/core/eventstringifier.cpp:609
+#: ../src/core/eventstringifier.cpp:717
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic for %1 is \"%2\""
 msgstr "Kanavan %1 aihe on ”%2”"
 
-#: ../src/core/eventstringifier.cpp:621
+#: ../src/core/eventstringifier.cpp:738
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic set by %1 on %2"
 msgstr "%1 asetti aiheen %2"
 
-#: ../src/core/eventstringifier.cpp:634
+#: ../src/core/eventstringifier.cpp:751
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has been invited to %2"
 msgstr "%1 on kutsuttu kanavalle %2"
 
-#: ../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-listauksen loppu"
 
-#: ../src/core/eventstringifier.cpp:659
+#: ../src/core/eventstringifier.cpp:786
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick %1 contains illegal characters"
 msgstr "Nimimerkki %1 sisältää virheellisiä merkkejä"
 
-#: ../src/core/eventstringifier.cpp:669
+#: ../src/core/eventstringifier.cpp:796
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick already in use: %1"
 msgstr "Nimimerkki jo käytössä: %1"
 
-#: ../src/core/eventstringifier.cpp:679
+#: ../src/core/eventstringifier.cpp:806
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr "Nimimerkki/kanava ei ole juuri nyt käytettävissä: %1"
 
-#: ../src/core/eventstringifier.cpp:702
+#: ../src/core/eventstringifier.cpp:830
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "sending CTCP-%1 request to %2"
 msgstr "lähetetään CTCP-%1-pyyntö kohteeseen %2"
 
-#. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
-#: ../src/core/eventstringifier.cpp:717
+#: ../src/core/eventstringifier.cpp:846
 msgctxt "EventStringifier|"
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../src/core/eventstringifier.cpp:718
+#: ../src/core/eventstringifier.cpp:847
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received %1CTCP-%2 request by %3"
 msgstr "Vastaanotettiin %1CTCP-%2-pyyntö käyttäjältä %3"
 
-#: ../src/core/eventstringifier.cpp:721
+#: ../src/core/eventstringifier.cpp:850
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-%1 answer from %2: %3"
 msgstr "Vastaanotettiin CTCP-%1-vastaus käyttäjältä %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"
@@ -3398,26 +4517,25 @@ msgid "Custom Highlights"
 msgstr "Mukautetut korostukset"
 
 #: ../src/qtui/settingspages/highlightsettingspage.ui:33
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+msgctxt "HighlightSettingsPage|"
+msgid "Enabled"
+msgstr "Käytössä"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:38
 msgctxt "HighlightSettingsPage|"
 msgid "Highlight"
 msgstr "Korostus"
 
-#: ../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 "SKK"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:48
-msgctxt "HighlightSettingsPage|"
-msgid "Enable"
-msgstr "Käytä"
-
 #: ../src/qtui/settingspages/highlightsettingspage.ui:53
 msgctxt "HighlightSettingsPage|"
 msgid "Channel"
@@ -3458,21 +4576,155 @@ msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr "Sama kirjainkoko"
 
-#: ../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 ""
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:33
 msgctxt "HighlightSettingsPage|"
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../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 ""
+
+#: ../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 "tämän ei pitäisi olla tyhjä"
 
+#: ../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 "korostussääntö"
 
+#: ../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|"
@@ -3596,8 +4848,8 @@ msgstr "Päiväkoti on muualla!"
 
 #: ../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 ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
 msgctxt "IdentityEditWidget|"
@@ -3728,7 +4980,7 @@ msgid "minutes of being idle"
 msgstr "minuutin joutenolon jälkeen"
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:399
-#: ../src/qtui/settingspages/identityeditwidget.cpp:244
+#: ../src/qtui/settingspages/identityeditwidget.cpp:290
 msgctxt "IdentityEditWidget|"
 msgid "Advanced"
 msgstr "Lisäasetukset"
@@ -3794,16 +5046,15 @@ msgid "Key Type:"
 msgstr "Avaimen tyyppi:"
 
 #: ../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 "Avainta ei ladattu"
 
 #: ../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 "Lataa"
@@ -3820,8 +5071,8 @@ msgstr "Yritys:"
 
 #: ../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 "Varmennetta ei ladattu"
@@ -3831,40 +5082,117 @@ msgctxt "IdentityEditWidget|"
 msgid "CommonName:"
 msgstr "CommonName:"
 
-#: ../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 "tunti"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:113
+msgctxt "IdentityEditWidget|"
+msgid "the minutes"
+msgstr "minuutit"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:114
+msgctxt "IdentityEditWidget|"
+msgid "seconds"
+msgstr "sekunnit"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:115
+msgctxt "IdentityEditWidget|"
+msgid "AM/PM"
+msgstr "ap./ip."
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:116
+msgctxt "IdentityEditWidget|"
+msgid "day"
+msgstr "päivä"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:117
+msgctxt "IdentityEditWidget|"
+msgid "month"
+msgstr "kuukausi"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:121
+msgctxt "IdentityEditWidget|"
+msgid "current timezone"
+msgstr "nykyinen aikavyöhyke"
+
+#: ../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 "Lataa avain"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:355
+#: ../src/qtui/settingspages/identityeditwidget.cpp:410
 msgctxt "IdentityEditWidget|"
 msgid "Failed to read key"
 msgstr "Avaimen lukeminen epäonnistui"
 
-#: ../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 "Avaintiedoston lukeminen epäonnistui. Se on joko epäyhteensopiva tai virheellinen. Huomaa, että tiedostolla ei saa olla salalausetta."
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:370
+#: ../src/qtui/settingspages/identityeditwidget.cpp:414
+msgctxt "IdentityEditWidget|"
+msgid "Core does not support ECDSA keys"
+msgstr ""
+
+#: ../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 ""
+
+#: ../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 "Virheellinen avain tai ei ladattua avainta"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:444
+#: ../src/qtui/settingspages/identityeditwidget.cpp:499
 msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:390
+#: ../src/qtui/settingspages/identityeditwidget.cpp:456
 msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr "Lataa varmenne"
@@ -4018,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 <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 on #foobar and on any channel starting with <i>#quassel</i></p>"
-msgstr "<p><b>Laajuussääntö:</b></p>\n<p>Laajuussääntö on puolipisteillä erotettu lista joko <i>verkkojen</i> tai <i>kanavien</i> nimiä.</p>\n<p><i>Esimerkki:</i>\n<br />\n<i>#quassel*; #foobar</i>\n<br />\ntarkoittaisi kanavaa #foobar sekä kaikkia kanavia, joiden nimi alkaa <i>#quassel</i></p>"
+"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"
@@ -4032,7 +5367,7 @@ msgid ""
 "For dynamic rules, disabling actually shows the filtered messages again.</p>"
 msgstr "<p><b>Käytä / Älä käytä:</b></p>\n<p>Vain käytössä olevat säännöt suodattavat.\n<br />\nDynaamisen säännön käytöstä poistaminen itse asiassa näyttää suodatetut viestit uudelleen</p>"
 
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:227
 msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr "Käytössä"
@@ -4067,17 +5402,17 @@ msgctxt "IgnoreListModel|"
 msgid "By Message"
 msgstr "Viestin mukaan"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:208
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:211
 msgctxt "IgnoreListModel|"
 msgid "Enabled"
 msgstr "Käytössä"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:209
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:212
 msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr "Tyyppi"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:210
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:213
 msgctxt "IgnoreListModel|"
 msgid "Ignore Rule"
 msgstr "Suodatussääntö"
@@ -4102,22 +5437,22 @@ msgctxt "IgnoreListSettingsPage|"
 msgid "&Edit"
 msgstr "&Muokkaa"
 
-#: ../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 "Suodatuslista"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:147
 msgctxt "IgnoreListSettingsPage|"
 msgid "Rule already exists"
 msgstr "Sääntö on jo olemassa"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:148
 #, qt-format
 msgctxt "IgnoreListSettingsPage|"
 msgid ""
@@ -4148,96 +5483,141 @@ msgctxt "InputWidget|"
 msgid "Form"
 msgstr "Lomake"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../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 "Aseta edustaväri"
+
+#: ../src/qtui/ui/inputwidget.ui:293
+msgctxt "InputWidget|"
+msgid "Set background color"
+msgstr "Aseta taustaväri"
+
+#: ../src/qtui/ui/inputwidget.ui:327
+msgctxt "InputWidget|"
+msgid "Clear formatting"
+msgstr "Poista muotoilu"
+
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "White"
 msgstr "Valkoinen"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Black"
 msgstr "Musta"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr "Tummansininen"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr "Tummanvihreä"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Red"
 msgstr "Punainen"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr "Tummanpunainen"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr "Tummanlila"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Orange"
 msgstr "Oranssi"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr "Keltainen"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Green"
 msgstr "Vihreä"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr "Tumma turkoosi"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr "Turkoosi"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Blue"
 msgstr "Sininen"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr "Lila"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr "Tummanharmaa"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr "Vaaleanharmaa"
 
-#: ../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 "Poista väri"
 
-#: ../src/qtui/inputwidget.cpp:137
+#: ../src/qtui/inputwidget.cpp:149
 msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr "Kohdista syötekenttään"
 
+#: ../src/qtui/inputwidget.cpp:636
+msgctxt "InputWidget|"
+msgid "Hide formatting options"
+msgstr "Piilota muotoiluvalinnat"
+
+#: ../src/qtui/inputwidget.cpp:639
+msgctxt "InputWidget|"
+msgid "Show formatting options"
+msgstr "Näytä muotoiluvalinnat"
+
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
 msgctxt "InputWidgetSettingsPage|"
 msgid "Form"
@@ -4250,80 +5630,75 @@ msgstr "Mukautettu fontti:"
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
 msgctxt "InputWidgetSettingsPage|"
-msgid "Enable spell check"
-msgstr "Tarkista oikeinkirjoitus"
-
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
-msgctxt "InputWidgetSettingsPage|"
 msgid "Enable per chat history"
 msgstr "Käytä keskustelukohtaista historiaa"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:66
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
 msgstr "Näytä nimimerkinvalitsin"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:82
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
 msgstr "Näytä tyylipainikkeet"
 
-#: ../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 "Käytä (rajoitettuja) Emacs-näppäinyhdistelmiä syöttökentässä."
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:101
 msgctxt "InputWidgetSettingsPage|"
 msgid "Emacs key bindings"
 msgstr "Emacs-näppäinyhdistelmät"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enables line wrapping for input."
 msgstr "Rivitä syöttökentän teksti."
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:117
 msgctxt "InputWidgetSettingsPage|"
 msgid "Line wrapping"
 msgstr "Tekstin rivitys"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:143
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
 msgctxt "InputWidgetSettingsPage|"
-msgid "Multi-Line Editing"
-msgstr "Monirivinen muokkaus"
+msgid "&Multi-Line Editing"
+msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:160
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:147
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show at most"
 msgstr "Näytä enintään"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:186
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:173
 msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
 msgstr "riviä"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:208
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
 msgstr "Näytä vierityspalkit"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:227
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:214
 msgctxt "InputWidgetSettingsPage|"
 msgid "Tab Completion"
 msgstr "Sarkaintäydennys"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:222
 msgctxt "InputWidgetSettingsPage|"
 msgid "Completion suffix:"
 msgstr "Täydennyksen loppuliite:"
 
-#: ../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 "Lisää välilyönti nimimerkin perään, kun täydennetään kesken lauseen"
@@ -4338,7 +5713,7 @@ msgctxt "InputWidgetSettingsPage|"
 msgid "Input Widget"
 msgstr "Syöttöelementti"
 
-#: ../src/common/internalpeer.cpp:58
+#: ../src/common/internalpeer.cpp:52 ../src/common/internalpeer.cpp:58
 msgctxt "InternalPeer|"
 msgid "internal connection"
 msgstr "Sisäinen yhteys"
@@ -4363,56 +5738,96 @@ msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr "Aihe"
 
-#: ../src/client/networkmodel.cpp:976
+#: ../src/core/ircparser.cpp:369
+msgctxt "IrcParser|"
+msgid "Capability negotiation not supported"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1187
+msgctxt "IrcUserItem|"
+msgid "Modes"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1191
 msgctxt "IrcUserItem|"
-msgid "(unknown)"
-msgstr "(tuntematon)"
+msgid "Unknown"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:980
+#: ../src/client/networkmodel.cpp:1197
 msgctxt "IrcUserItem|"
-msgid "Away&nbsp;Message"
-msgstr "Poissaoloviesti"
+msgid "Away message"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:982
+#: ../src/client/networkmodel.cpp:1199
 msgctxt "IrcUserItem|"
 msgid "Realname"
 msgstr "Oikea nimi"
 
-#: ../src/client/networkmodel.cpp:983 ../src/client/networkmodel.cpp:987
+#: ../src/client/networkmodel.cpp:1206
 msgctxt "IrcUserItem|"
-msgid "Operator"
-msgstr "Operaattori"
+msgid "Help status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1207
+msgctxt "IrcUserItem|"
+msgid "Available for help"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1210
+msgctxt "IrcUserItem|"
+msgid "Service status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1220
+msgctxt "IrcUserItem|"
+msgid "Not logged in"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1226 ../src/client/networkmodel.cpp:1235
+msgctxt "IrcUserItem|"
+msgid "Account"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:984
+#: ../src/client/networkmodel.cpp:1236
 msgctxt "IrcUserItem|"
-msgid "Suser&nbsp;Host"
-msgstr "Suser&nbsp;Host"
+msgid "Identified for this nick"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:985
+#: ../src/client/networkmodel.cpp:1242
 msgctxt "IrcUserItem|"
-msgid "Whois&nbsp;Service&nbsp;Reply"
-msgstr "Whois-palvelun&nbsp;vastaus"
+msgid "Service Reply"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:986
+#: ../src/client/networkmodel.cpp:1246
 msgctxt "IrcUserItem|"
 msgid "Hostmask"
 msgstr "Verkkopeite"
 
-#: ../src/client/networkmodel.cpp:993
+#: ../src/client/networkmodel.cpp:1250
+msgctxt "IrcUserItem|"
+msgid "Operator"
+msgstr "Operaattori"
+
+#: ../src/client/networkmodel.cpp:1258
 msgctxt "IrcUserItem|"
-msgid "Idling&nbsp;since"
-msgstr "Jouten&nbsp;alkaen"
+msgid "Idling since"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:997
+#: ../src/client/networkmodel.cpp:1262
 msgctxt "IrcUserItem|"
-msgid "Login&nbsp;time"
-msgstr "Kirjautumisaika"
+msgid "Login time"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:1000
+#: ../src/client/networkmodel.cpp:1265
 msgctxt "IrcUserItem|"
 msgid "Server"
 msgstr "Palvelin"
 
+#: ../src/client/networkmodel.cpp:1270
+msgctxt "IrcUserItem|"
+msgid "No information available"
+msgstr ""
+
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:14
 msgctxt "ItemViewSettingsPage|"
 msgid "Form"
@@ -4448,53 +5863,53 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Use Custom Colors"
 msgstr "Käytä mukautettuja värejä"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:121
 msgctxt "ItemViewSettingsPage|"
 msgid "Standard:"
 msgstr "Vakio:"
 
-#: ../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 "Epäaktiivinen:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:169
 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
 msgstr "Lukemattomia viestejä:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:193
 msgctxt "ItemViewSettingsPage|"
 msgid "Highlight:"
 msgstr "Korostus:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:217
 msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
 msgstr "Muu toiminta:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:318
 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 msgstr "Mukautetut nimimerkkilistan värit"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:333
 msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
 msgstr "Paikalla:"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:373
 msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr "Poissa:"
@@ -4539,7 +5954,7 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Other activity"
 msgstr "Muu toiminta"
 
-#: ../src/qtui/knotificationbackend.cpp:139
+#: ../src/qtui/knotificationbackend.cpp:137
 #, qt-format
 msgctxt "KNotificationBackend|"
 msgid "%n pending highlight(s)"
@@ -4626,417 +6041,572 @@ msgctxt "KeySequenceWidget|"
 msgid "Reassign"
 msgstr "Aseta uudelleen"
 
-#: ../src/common/protocols/legacy/legacypeer.cpp:136
+#: ../src/core/ldapauthenticator.cpp:77
+msgctxt "LdapAuthenticator|"
+msgid "LDAP"
+msgstr ""
+
+#: ../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 "Konenimi"
+
+#: ../src/core/ldapauthenticator.cpp:92
+msgctxt "LdapAuthenticator|"
+msgid "Port"
+msgstr "Portti"
+
+#: ../src/core/ldapauthenticator.cpp:93
+msgctxt "LdapAuthenticator|"
+msgid "Bind DN"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:94
+msgctxt "LdapAuthenticator|"
+msgid "Bind Password"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:95
+msgctxt "LdapAuthenticator|"
+msgid "Base DN"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:96
+msgctxt "LdapAuthenticator|"
+msgid "Filter"
+msgstr ""
+
+#: ../src/core/ldapauthenticator.cpp:97
+msgctxt "LdapAuthenticator|"
+msgid "UID Attribute"
+msgstr ""
+
+#: ../src/common/protocols/legacy/legacypeer.cpp:146
 msgctxt "LegacyPeer|"
 msgid "Invalid handshake message!"
 msgstr "Virheellinen kättelyviesti!"
 
-#: ../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 "Tuntematon %1 -tyyppinen protokollaviesti"
+
+#: ../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 ""
+
+#: ../src/common/logger.cpp:111
 #, qt-format
-msgctxt "LegacyPeer|"
-msgid "Unknown protocol message of type %1"
-msgstr "Tuntematon %1 -tyyppinen protokollaviesti"
+msgctxt "Logger|"
+msgid "Cannot write to stderr: %1"
+msgstr ""
 
-#: ../src/qtui/mainpage.cpp:40
+#: ../src/qtui/mainpage.cpp:42
 msgctxt "MainPage|"
 msgid "Connect to Core..."
 msgstr "Yhdistä ytimeen…"
 
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:401
 msgctxt "MainWin|"
 msgid "General"
 msgstr "Yleiset"
 
-#: ../src/qtui/mainwin.cpp:362
+#: ../src/qtui/mainwin.cpp:403
 msgctxt "MainWin|"
 msgid "&Connect to Core..."
 msgstr "&Yhdistä ytimeen…"
 
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:405
 msgctxt "MainWin|"
 msgid "&Disconnect from Core"
 msgstr "&Katkaise yhteys ytimeen"
 
-#: ../src/qtui/mainwin.cpp:366
+#: ../src/qtui/mainwin.cpp:407
 msgctxt "MainWin|"
 msgid "Change &Password..."
 msgstr "Vaihda &salasana…"
 
-#: ../src/qtui/mainwin.cpp:368
+#: ../src/qtui/mainwin.cpp:409
 msgctxt "MainWin|"
 msgid "Core &Info..."
 msgstr "Ytimen &tiedot…"
 
-#: ../src/qtui/mainwin.cpp:370
+#: ../src/qtui/mainwin.cpp:411
 msgctxt "MainWin|"
 msgid "Configure &Networks..."
 msgstr "&Verkkojen asetukset…"
 
-#: ../src/qtui/mainwin.cpp:373
+#: ../src/qtui/mainwin.cpp:418
 msgctxt "MainWin|"
 msgid "&Quit"
 msgstr "&Lopeta"
 
-#: ../src/qtui/mainwin.cpp:377
+#: ../src/qtui/mainwin.cpp:422
 msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
 msgstr "&Keskustelulistojen asetukset…"
 
-#: ../src/qtui/mainwin.cpp:380
+#: ../src/qtui/mainwin.cpp:425
 msgctxt "MainWin|"
 msgid "&Lock Layout"
 msgstr "&Lukitse asettelu"
 
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:429
 msgctxt "MainWin|"
 msgid "Show &Search Bar"
 msgstr "Näytä &hakurivi"
 
-#: ../src/qtui/mainwin.cpp:386
+#: ../src/qtui/mainwin.cpp:431
 msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr "Näytä poissa-loki"
 
-#: ../src/qtui/mainwin.cpp:388
+#: ../src/qtui/mainwin.cpp:433
 msgctxt "MainWin|"
 msgid "Show &Menubar"
 msgstr "Näytä &valikkorivi"
 
-#: ../src/qtui/mainwin.cpp:391
+#: ../src/qtui/mainwin.cpp:436
 msgctxt "MainWin|"
 msgid "Show Status &Bar"
 msgstr "Näytä &tilarivi"
 
-#: ../src/qtui/mainwin.cpp:397
+#: ../src/qtui/mainwin.cpp:442
 msgctxt "MainWin|"
 msgid "&Full Screen Mode"
 msgstr "Koko &näytön tila"
 
-#: ../src/qtui/mainwin.cpp:404
+#: ../src/qtui/mainwin.cpp:449
 msgctxt "MainWin|"
 msgid "Configure &Shortcuts..."
 msgstr "Muokkaa &pikanäppäimiä…"
 
-#: ../src/qtui/mainwin.cpp:410 ../src/qtui/mainwin.cpp:414
+#: ../src/qtui/mainwin.cpp:455 ../src/qtui/mainwin.cpp:459
 msgctxt "MainWin|"
 msgid "&Configure Quassel..."
 msgstr "&Quasselin asetukset…"
 
-#: ../src/qtui/mainwin.cpp:420
+#: ../src/qtui/mainwin.cpp:465
 msgctxt "MainWin|"
 msgid "&About Quassel"
 msgstr "&Tietoja Quasselista"
 
-#: ../src/qtui/mainwin.cpp:425
+#: ../src/qtui/mainwin.cpp:470
 msgctxt "MainWin|"
 msgid "About &Qt"
 msgstr "Tietoja &Qt:stä"
 
-#: ../src/qtui/mainwin.cpp:429
+#: ../src/qtui/mainwin.cpp:474
 msgctxt "MainWin|"
 msgid "Debug &NetworkModel"
 msgstr "Debuggaa &NetworkModel"
 
-#: ../src/qtui/mainwin.cpp:431
+#: ../src/qtui/mainwin.cpp:476
 msgctxt "MainWin|"
 msgid "Debug &BufferViewOverlay"
 msgstr "Debuggaa &BufferViewOverlay"
 
-#: ../src/qtui/mainwin.cpp:433
+#: ../src/qtui/mainwin.cpp:478
 msgctxt "MainWin|"
 msgid "Debug &MessageModel"
 msgstr "Debuggaa &MessageModel"
 
-#: ../src/qtui/mainwin.cpp:435
+#: ../src/qtui/mainwin.cpp:480
 msgctxt "MainWin|"
 msgid "Debug &HotList"
 msgstr "Debuggaa &HotList"
 
-#: ../src/qtui/mainwin.cpp:437
+#: ../src/qtui/mainwin.cpp:482
 msgctxt "MainWin|"
 msgid "Debug &Log"
 msgstr "Debuggaa &Log"
 
-#: ../src/qtui/mainwin.cpp:439
+#: ../src/qtui/mainwin.cpp:484
 msgctxt "MainWin|"
 msgid "Reload Stylesheet"
 msgstr "Lataa tyylisivu uudelleen"
 
-#: ../src/qtui/mainwin.cpp:442
+#: ../src/qtui/mainwin.cpp:487
 msgctxt "MainWin|"
 msgid "Hide Current Buffer"
 msgstr "Piilota nykyinen puskuri"
 
-#: ../src/qtui/mainwin.cpp:446
+#: ../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 "Poista muotoilu"
+
+#: ../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 "Selaus"
 
-#: ../src/qtui/mainwin.cpp:448
+#: ../src/qtui/mainwin.cpp:525
 msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr "Hyppää aktiiviseen keskusteluun"
 
-#: ../src/qtui/mainwin.cpp:460
+#: ../src/qtui/mainwin.cpp:528
+msgctxt "MainWin|"
+msgid "Activate the buffer search"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:540
 msgctxt "MainWin|"
 msgid "Set Quick Access #0"
 msgstr "Aseta pikavalinta #0"
 
-#: ../src/qtui/mainwin.cpp:462
+#: ../src/qtui/mainwin.cpp:542
 msgctxt "MainWin|"
 msgid "Set Quick Access #1"
 msgstr "Aseta pikavalinta #1"
 
-#: ../src/qtui/mainwin.cpp:464
+#: ../src/qtui/mainwin.cpp:544
 msgctxt "MainWin|"
 msgid "Set Quick Access #2"
 msgstr "Aseta pikavalinta #2"
 
-#: ../src/qtui/mainwin.cpp:466
+#: ../src/qtui/mainwin.cpp:546
 msgctxt "MainWin|"
 msgid "Set Quick Access #3"
 msgstr "Aseta pikavalinta #3"
 
-#: ../src/qtui/mainwin.cpp:468
+#: ../src/qtui/mainwin.cpp:548
 msgctxt "MainWin|"
 msgid "Set Quick Access #4"
 msgstr "Aseta pikavalinta #4"
 
-#: ../src/qtui/mainwin.cpp:470
+#: ../src/qtui/mainwin.cpp:550
 msgctxt "MainWin|"
 msgid "Set Quick Access #5"
 msgstr "Aseta pikavalinta #5"
 
-#: ../src/qtui/mainwin.cpp:472
+#: ../src/qtui/mainwin.cpp:552
 msgctxt "MainWin|"
 msgid "Set Quick Access #6"
 msgstr "Aseta pikavalinta #6"
 
-#: ../src/qtui/mainwin.cpp:474
+#: ../src/qtui/mainwin.cpp:554
 msgctxt "MainWin|"
 msgid "Set Quick Access #7"
 msgstr "Aseta pikavalinta #7"
 
-#: ../src/qtui/mainwin.cpp:476
+#: ../src/qtui/mainwin.cpp:556
 msgctxt "MainWin|"
 msgid "Set Quick Access #8"
 msgstr "Aseta pikavalinta #8"
 
-#: ../src/qtui/mainwin.cpp:478
+#: ../src/qtui/mainwin.cpp:558
 msgctxt "MainWin|"
 msgid "Set Quick Access #9"
 msgstr "Aseta pikavalinta #9"
 
-#: ../src/qtui/mainwin.cpp:481
+#: ../src/qtui/mainwin.cpp:561
 msgctxt "MainWin|"
 msgid "Quick Access #0"
 msgstr "Pikavalinta #0"
 
-#: ../src/qtui/mainwin.cpp:483
+#: ../src/qtui/mainwin.cpp:563
 msgctxt "MainWin|"
 msgid "Quick Access #1"
 msgstr "Pikavalinta #1"
 
-#: ../src/qtui/mainwin.cpp:485
+#: ../src/qtui/mainwin.cpp:565
 msgctxt "MainWin|"
 msgid "Quick Access #2"
 msgstr "Pikavalinta #2"
 
-#: ../src/qtui/mainwin.cpp:487
+#: ../src/qtui/mainwin.cpp:567
 msgctxt "MainWin|"
 msgid "Quick Access #3"
 msgstr "Pikavalinta #3"
 
-#: ../src/qtui/mainwin.cpp:489
+#: ../src/qtui/mainwin.cpp:569
 msgctxt "MainWin|"
 msgid "Quick Access #4"
 msgstr "Pikavalinta #4"
 
-#: ../src/qtui/mainwin.cpp:491
+#: ../src/qtui/mainwin.cpp:571
 msgctxt "MainWin|"
 msgid "Quick Access #5"
 msgstr "Pikavalinta #5"
 
-#: ../src/qtui/mainwin.cpp:493
+#: ../src/qtui/mainwin.cpp:573
 msgctxt "MainWin|"
 msgid "Quick Access #6"
 msgstr "Pikavalinta #6"
 
-#: ../src/qtui/mainwin.cpp:495
+#: ../src/qtui/mainwin.cpp:575
 msgctxt "MainWin|"
 msgid "Quick Access #7"
 msgstr "Pikavalinta #7"
 
-#: ../src/qtui/mainwin.cpp:497
+#: ../src/qtui/mainwin.cpp:577
 msgctxt "MainWin|"
 msgid "Quick Access #8"
 msgstr "Pikavalinta #8"
 
-#: ../src/qtui/mainwin.cpp:499
+#: ../src/qtui/mainwin.cpp:579
 msgctxt "MainWin|"
 msgid "Quick Access #9"
 msgstr "Pikavalinta #9"
 
-#: ../src/qtui/mainwin.cpp:503
+#: ../src/qtui/mainwin.cpp:583
 msgctxt "MainWin|"
 msgid "Activate Next Chat List"
 msgstr "Aktivoi seuraava keskustelulista"
 
-#: ../src/qtui/mainwin.cpp:505
+#: ../src/qtui/mainwin.cpp:585
 msgctxt "MainWin|"
 msgid "Activate Previous Chat List"
 msgstr "Aktivoi edellinen keskustelulista"
 
-#: ../src/qtui/mainwin.cpp:507
+#: ../src/qtui/mainwin.cpp:587
 msgctxt "MainWin|"
 msgid "Go to Next Chat"
 msgstr "Siirry seuraavaan keskusteluun"
 
-#: ../src/qtui/mainwin.cpp:509
+#: ../src/qtui/mainwin.cpp:589
 msgctxt "MainWin|"
 msgid "Go to Previous Chat"
 msgstr "Siirry edelliseen keskusteluun"
 
-#: ../src/qtui/mainwin.cpp:518
+#: ../src/qtui/mainwin.cpp:598
 msgctxt "MainWin|"
 msgid "&File"
 msgstr "&Tiedosto"
 
-#: ../src/qtui/mainwin.cpp:531
+#: ../src/qtui/mainwin.cpp:611
 msgctxt "MainWin|"
 msgid "&Networks"
 msgstr "&Verkot"
 
-#: ../src/qtui/mainwin.cpp:537
+#: ../src/qtui/mainwin.cpp:617
 msgctxt "MainWin|"
 msgid "&View"
 msgstr "&Näytä"
 
-#: ../src/qtui/mainwin.cpp:538
+#: ../src/qtui/mainwin.cpp:618
 msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr "&Keskustelulistat"
 
-#: ../src/qtui/mainwin.cpp:540
+#: ../src/qtui/mainwin.cpp:620
 msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr "&Työkalurivit"
 
-#: ../src/qtui/mainwin.cpp:554
+#: ../src/qtui/mainwin.cpp:634
 msgctxt "MainWin|"
 msgid "&Settings"
 msgstr "&Asetukset"
 
-#: ../src/qtui/mainwin.cpp:564
+#: ../src/qtui/mainwin.cpp:644
 msgctxt "MainWin|"
 msgid "&Help"
 msgstr "O&hje"
 
-#: ../src/qtui/mainwin.cpp:573
+#: ../src/qtui/mainwin.cpp:653
 msgctxt "MainWin|"
 msgid "Debug"
 msgstr "Kehittäjille"
 
-#: ../src/qtui/mainwin.cpp:749
+#: ../src/qtui/mainwin.cpp:830
 msgctxt "MainWin|"
 msgid "Feature Not Supported"
 msgstr "Ominaisuutta ei tueta"
 
-#: ../src/qtui/mainwin.cpp:750
+#: ../src/qtui/mainwin.cpp:831
 msgctxt "MainWin|"
 msgid "<b>Your Quassel Core does not support this feature</b>"
 msgstr "<b>Quassel-ytimesi ei tue tätä ominaisuutta</b>"
 
-#: ../src/qtui/mainwin.cpp:752
+#: ../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 "Tarvitset Quassel-ytimen v0.12.0 tai uudemman, jotta voit vaihtaa salasanasi etänä."
 
-#: ../src/qtui/mainwin.cpp:865
+#: ../src/qtui/mainwin.cpp:843
+msgctxt "MainWin|"
+msgid "Upgrading..."
+msgstr "Päivitetään..."
+
+#: ../src/qtui/mainwin.cpp:844
+msgctxt "MainWin|"
+msgid "Your database is being upgraded"
+msgstr "Tietokannan päivitys on meneillään"
+
+#: ../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 "Vakava virhe"
+
+#: ../src/qtui/mainwin.cpp:867
+msgctxt "MainWin|"
+msgid "Quassel encountered a fatal error and is terminated."
+msgstr "Quassel kohtasi vakavan virheen ja suljettiin."
+
+#: ../src/qtui/mainwin.cpp:869
+msgctxt "MainWin|"
+msgid "Reason:<em>"
+msgstr "Syy:<em>"
+
+#: ../src/qtui/mainwin.cpp:997
 msgctxt "MainWin|"
 msgid "Nicks"
 msgstr "Nimimerkit"
 
-#: ../src/qtui/mainwin.cpp:874
+#: ../src/qtui/mainwin.cpp:1007
 msgctxt "MainWin|"
 msgid "Show Nick List"
 msgstr "Näytä nimimerkkilista"
 
-#: ../src/qtui/mainwin.cpp:889
+#: ../src/qtui/mainwin.cpp:1022
 msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr "Keskusteluvahti"
 
-#: ../src/qtui/mainwin.cpp:901
+#: ../src/qtui/mainwin.cpp:1033
 msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr "Näytä keskusteluvahti"
 
-#: ../src/qtui/mainwin.cpp:907
+#: ../src/qtui/mainwin.cpp:1039
 msgctxt "MainWin|"
 msgid "Inputline"
 msgstr "Syöterivi"
 
-#: ../src/qtui/mainwin.cpp:916
+#: ../src/qtui/mainwin.cpp:1048
 msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr "Näytä syöterivi"
 
-#: ../src/qtui/mainwin.cpp:931
+#: ../src/qtui/mainwin.cpp:1061
 msgctxt "MainWin|"
 msgid "Topic"
 msgstr "Aihe"
 
-#: ../src/qtui/mainwin.cpp:943
+#: ../src/qtui/mainwin.cpp:1073
 msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr "Näytä aiherivi"
 
-#: ../src/qtui/mainwin.cpp:1037
+#: ../src/qtui/mainwin.cpp:1079
+msgctxt "MainWin|"
+msgid "Transfers"
+msgstr "Siirrot"
+
+#: ../src/qtui/mainwin.cpp:1090
+msgctxt "MainWin|"
+msgid "Show File Transfers"
+msgstr "Näytä tiedostosiirrot"
+
+#: ../src/qtui/mainwin.cpp:1187
 msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr "Päätyökalurivi"
 
-#: ../src/qtui/mainwin.cpp:1101
+#: ../src/qtui/mainwin.cpp:1207
+msgctxt "MainWin|"
+msgid "Nick Toolbar"
+msgstr "Nimimerkkityökalurivi"
+
+#: ../src/qtui/mainwin.cpp:1284
 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr "Yhdistetty ytimeen."
 
-#: ../src/qtui/mainwin.cpp:1201
+#: ../src/qtui/mainwin.cpp:1384
 msgctxt "MainWin|"
 msgid "Not connected to core."
 msgstr "Ei yhteyttä ytimeen."
 
-#: ../src/qtui/mainwin.cpp:1220 ../src/qtui/mainwin.cpp:1230
+#: ../src/qtui/mainwin.cpp:1403 ../src/qtui/mainwin.cpp:1413
 msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr "Salaamaton yhteys"
 
-#: ../src/qtui/mainwin.cpp:1220
+#: ../src/qtui/mainwin.cpp:1403
 msgctxt "MainWin|"
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr "<b>Asiakasohjelmasi ei tue SSL-salausta</b>"
 
-#: ../src/qtui/mainwin.cpp:1222 ../src/qtui/mainwin.cpp:1232
+#: ../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 "Arkaluontoista dataa, kuten salasanoja, lähetetään Quassel-ytimelle salaamattomana."
 
-#: ../src/qtui/mainwin.cpp:1230
+#: ../src/qtui/mainwin.cpp:1413
 msgctxt "MainWin|"
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr "<b>Ytimesi ei tue SSL-salausta</b>"
 
-#: ../src/qtui/mainwin.cpp:1248 ../src/qtui/mainwin.cpp:1269
+#: ../src/qtui/mainwin.cpp:1431 ../src/qtui/mainwin.cpp:1452
 msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr "Varmenne ei luotettu"
 
-#: ../src/qtui/mainwin.cpp:1249
+#: ../src/qtui/mainwin.cpp:1432
 #, qt-format
 msgctxt "MainWin|"
 msgid ""
@@ -5044,38 +6614,48 @@ msgid ""
 "following reasons:</b>"
 msgstr "<b>Ytimen %1 tarjoama SSL-varmenne ei ole luotettu seuraavista syistä:</b>"
 
-#: ../src/qtui/mainwin.cpp:1252
+#: ../src/qtui/mainwin.cpp:1435
 msgctxt "MainWin|"
 msgid "Continue"
 msgstr "Jatka"
 
-#: ../src/qtui/mainwin.cpp:1253
+#: ../src/qtui/mainwin.cpp:1436
 msgctxt "MainWin|"
 msgid "Show Certificate"
 msgstr "Näytä varmenne"
 
-#: ../src/qtui/mainwin.cpp:1270
+#: ../src/qtui/mainwin.cpp:1453
 msgctxt "MainWin|"
 msgid ""
 "Would you like to accept this certificate forever without being prompted?"
 msgstr "Haluatko hyväksyä tämän varmenteen aina?"
 
-#: ../src/qtui/mainwin.cpp:1272
+#: ../src/qtui/mainwin.cpp:1455
 msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr "Vain nykyisen istunnon ajaksi"
 
-#: ../src/qtui/mainwin.cpp:1273
+#: ../src/qtui/mainwin.cpp:1456
 msgctxt "MainWin|"
 msgid "Forever"
 msgstr "Aina"
 
-#: ../src/qtui/mainwin.cpp:1284
+#: ../src/qtui/mainwin.cpp:1467
 msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr "Virhe yhteydessä ytimeen"
 
-#: ../src/client/messagemodel.cpp:404
+#: ../src/qtui/mainwin.cpp:1499 ../src/qtui/mainwin.cpp:1500
+msgctxt "MainWin|"
+msgid "No network selected"
+msgstr "Verkkoa ei valittu"
+
+#: ../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"
@@ -5091,7 +6671,12 @@ msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr "Vastaanotetaan viestihistoriaa"
 
-#: ../src/uisupport/multilineedit.cpp:711
+#: ../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)?"
@@ -5099,7 +6684,7 @@ msgid_plural "Do you really want to paste %n line(s)?"
 msgstr[0] "Haluatko varmasti liittää %n rivin?"
 msgstr[1] "Haluatko varmasti liittää %n riviä?"
 
-#: ../src/uisupport/multilineedit.cpp:724
+#: ../src/uisupport/multilineedit.cpp:758
 msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr "Liittämissuoja"
@@ -5146,8 +6731,38 @@ msgstr "Palvelimen salasana:"
 
 #: ../src/qtui/settingspages/networkadddlg.ui:131
 msgctxt "NetworkAddDlg|"
-msgid "Use secure connection"
-msgstr "Käytä salattua yhteyttä"
+msgid "Try to use an encrypted connection (e.g. SSL/TLS)"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:134
+msgctxt "NetworkAddDlg|"
+msgid "Use encrypted connection"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:144
+msgctxt "NetworkAddDlg|"
+msgid ""
+"<p>Verify the encrypted connection provides a valid certificate, increasing "
+"security.<br/>Uncheck if the IRC server uses a self-signed or invalid "
+"certificate.</p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkadddlg.ui:147
+msgctxt "NetworkAddDlg|"
+msgid "Verify connection security"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1056
+msgctxt "NetworkAddDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../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|"
@@ -5159,91 +6774,115 @@ msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
 msgstr "Syötä verkon nimi:"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:841
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1130
 msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr "Lisää verkko"
 
-#: ../src/client/networkmodel.cpp:216 ../src/client/networkmodel.cpp:219
-#, qt-format
+#: ../src/client/networkmodel.cpp:255
+msgctxt "NetworkItem|"
+msgid "Server"
+msgstr "Palvelin"
+
+#: ../src/client/networkmodel.cpp:256
 msgctxt "NetworkItem|"
-msgid "Server: %1"
-msgstr "Palvelin: %1"
+msgid "Users"
+msgstr "Käyttäjiä"
 
-#: ../src/client/networkmodel.cpp:221
-#, qt-format
+#: ../src/client/networkmodel.cpp:258
 msgctxt "NetworkItem|"
-msgid "Users: %1"
-msgstr "Käyttäjiä: %1"
+msgid "Lag"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:224
+#: ../src/client/networkmodel.cpp:258
 #, qt-format
 msgctxt "NetworkItem|"
-msgid "Lag: %1 msecs"
-msgstr "Viive: %1 ms"
+msgid "%1 msecs"
+msgstr "%1 ms"
+
+#: ../src/client/networkmodel.cpp:262
+msgctxt "NetworkItem|"
+msgid "Not connected"
+msgstr "Ei yhdistetty"
 
-#: ../src/client/networkmodel.cpp:1029
+#: ../src/client/networkmodel.cpp:1314
 msgctxt "NetworkModel|"
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: ../src/client/networkmodel.cpp:1029
+#: ../src/client/networkmodel.cpp:1314
 msgctxt "NetworkModel|"
 msgid "Topic"
 msgstr "Aihe"
 
-#: ../src/client/networkmodel.cpp:1029
+#: ../src/client/networkmodel.cpp:1314
 msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr "Nimimerkkimäärä"
 
-#: ../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] "Haluatko poistaa seuraavan puskurin pysyvästi?"
 msgstr[1] "Haluatko poistaa seuraavat puskurit pysyvästi?"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:190
+#: ../src/uisupport/networkmodelcontroller.cpp:191
 #, qt-format
 msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr "…ja <b>%1</b> lisää<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>Huom:</b> Tämä poistaa ytimen tietokannasta kaikki puskuriin liittyvät tiedot, mukaan lukien viestihistorian. Tätä toimintoa ei voi kumota."
 
-#: ../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>Aktiivista kanavapuskuria ei voi poistaa. Poistu kanavalta ensin."
 
-#: ../src/uisupport/networkmodelcontroller.cpp:195
+#: ../src/uisupport/networkmodelcontroller.cpp:196
 msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr "Poistetaanko puskurit pysyvästi?"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:544
+#: ../src/uisupport/networkmodelcontroller.cpp:241
+#: ../src/uisupport/networkmodelcontroller.cpp:243
+msgctxt "NetworkModelController|"
+msgid "Question"
+msgstr "Kysymys"
+
+#: ../src/uisupport/networkmodelcontroller.cpp:241
+msgctxt "NetworkModelController|"
+msgid "Really Connect to all IRC Networks?"
+msgstr "Yhdistetäänkö varmasti kaikkiin IRC-verkkoihin?"
+
+#: ../src/uisupport/networkmodelcontroller.cpp:243
+msgctxt "NetworkModelController|"
+msgid "Really disconnect from all IRC Networks?"
+msgstr "Katkaistaanko yhteys varmasti kaikkiin IRC-verkkoihin?"
+
+#: ../src/uisupport/networkmodelcontroller.cpp:556
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr "Liity kanavalle"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:547
+#: ../src/uisupport/networkmodelcontroller.cpp:559
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Network:"
 msgstr "Verkko:"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:549
+#: ../src/uisupport/networkmodelcontroller.cpp:561
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr "Kanava:"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:551
+#: ../src/uisupport/networkmodelcontroller.cpp:563
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Password:"
 msgstr "Salasana:"
@@ -5264,13 +6903,13 @@ msgid "Re&name..."
 msgstr "Muuta &nimeä…"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:65
-#: ../src/qtui/settingspages/networkssettingspage.ui:235
+#: ../src/qtui/settingspages/networkssettingspage.ui:234
 msgctxt "NetworksSettingsPage|"
 msgid "&Add..."
 msgstr "&Lisää…"
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:88
-#: ../src/qtui/settingspages/networkssettingspage.ui:252
+#: ../src/qtui/settingspages/networkssettingspage.ui:251
 msgctxt "NetworksSettingsPage|"
 msgid "De&lete"
 msgstr "&Poista"
@@ -5286,8 +6925,8 @@ msgid "Identity:"
 msgstr "Henkilöllisyys:"
 
 #: ../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 "…"
@@ -5307,118 +6946,172 @@ msgctxt "NetworksSettingsPage|"
 msgid "&Edit..."
 msgstr "&Muokkaa…"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:278
+#: ../src/qtui/settingspages/networkssettingspage.ui:277
 msgctxt "NetworksSettingsPage|"
 msgid "Move upwards in list"
 msgstr "Siirrä ylemmäs listassa"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:292
+#: ../src/qtui/settingspages/networkssettingspage.ui:291
 msgctxt "NetworksSettingsPage|"
 msgid "Move downwards in list"
 msgstr "Siirrä alemmas listassa"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:337
+#: ../src/qtui/settingspages/networkssettingspage.ui:336
 msgctxt "NetworksSettingsPage|"
 msgid "Commands"
 msgstr "Komennot"
 
-#: ../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 "Määritä automaattinen tunnistautuminen tai muita komentoja, jotka suoritetaan palvelimelle yhdistämisen jälkeen"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:346
+#: ../src/qtui/settingspages/networkssettingspage.ui:345
 msgctxt "NetworksSettingsPage|"
 msgid "Commands to execute on connect:"
 msgstr "Yhdistettäessä suoritettavat komennot:"
 
-#: ../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 "Määritä lista IRC-komentoja, jotka suoritetaan yhdistämisen jälkeen.\nHuomioi, että Quassel IRC liittyy automaattisesti takaisin kanaville, joten /join-komentoa tuskin tarvitaan tässä!"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:374
+#: ../src/qtui/settingspages/networkssettingspage.ui:373
 msgctxt "NetworksSettingsPage|"
 msgid "Connection"
 msgstr "Yhteys"
 
-#: ../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 "Yhdistä uudelleen tähän verkkoon automaattisesti verkkovirheiden jälkeen"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:386
+#: ../src/qtui/settingspages/networkssettingspage.ui:385
 msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
 msgstr "Automaattinen uudelleenyhdistys"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:397
+#: ../src/qtui/settingspages/networkssettingspage.ui:396
+#: ../src/qtui/settingspages/networkssettingspage.ui:595
 msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr "Odota"
 
-#: ../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 "uudelleenyritysten välillä"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:444
+#: ../src/qtui/settingspages/networkssettingspage.ui:443
 msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
 msgstr "Uudelleenyritysten lukumäärä:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:464
+#: ../src/qtui/settingspages/networkssettingspage.ui:463
+#: ../src/qtui/settingspages/networkssettingspage.ui:547
 msgctxt "NetworksSettingsPage|"
 msgid "Unlimited"
 msgstr "Rajoittamaton"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:489
+#: ../src/qtui/settingspages/networkssettingspage.ui:488
 msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
 msgstr "Liity kaikille kanaville takaisin uudelleenyhdistämisen jälkeen"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:516
-#: ../src/qtui/settingspages/networkssettingspage.ui:525
+#: ../src/qtui/settingspages/networkssettingspage.ui:507
 msgctxt "NetworksSettingsPage|"
-msgid "Auto Identify"
-msgstr "Automaattitunnistautuminen"
+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 "Palvelu:"
+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 "Salasana:"
+msgid ""
+"<html><head/><body><p>Disable all rate limiting, e.g. for IRC "
+"bridges.</p><p>Don't use with most normal networks.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:602
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p>Delay between messages after the maximum number of "
+"undelayed messages have been sent.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:621
+msgctxt "NetworksSettingsPage|"
+msgid "between future messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:663
+#: ../src/qtui/settingspages/networkssettingspage.ui:814
+msgctxt "NetworksSettingsPage|"
+msgid "Auto Identify"
+msgstr "Automaattitunnistautuminen"
+
+#: ../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 "Käytä SASL-tunnistautumista"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:625
+#: ../src/qtui/settingspages/networkssettingspage.ui:716
+msgctxt "NetworksSettingsPage|"
+msgid "Account name, often the same as your nickname"
+msgstr "Tilin nimi; usein sama kuin nimimerkki"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:729
 msgctxt "NetworksSettingsPage|"
 msgid "Account:"
 msgstr "TIli:"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:635
+#: ../src/qtui/settingspages/networkssettingspage.ui:739
+#: ../src/qtui/settingspages/networkssettingspage.ui:842
+msgctxt "NetworksSettingsPage|"
+msgid "Account password"
+msgstr "Tilin salasana"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:752
+#: ../src/qtui/settingspages/networkssettingspage.ui:862
+msgctxt "NetworksSettingsPage|"
+msgid "Password:"
+msgstr "Salasana:"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:776
+msgctxt "NetworksSettingsPage|"
+msgid "Could not detect if supported by server"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:783
+msgctxt "NetworksSettingsPage|"
+msgid "Details..."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:798
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because"
@@ -5426,111 +7119,239 @@ msgid ""
 "used.</p></body></html>"
 msgstr "<html><head/><body><p><span style=\" font-weight:600;\">Huom:</span> koska henkilöllisyydelle on asetettu SSL-varmenne, käytetään SASL EXTERNALia.</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 "Palvelu:"
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:886
 msgctxt "NetworksSettingsPage|"
 msgid "Encodings"
 msgstr "Merkkikoodaukset"
 
-#: ../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 "Määritä edistyneitä asetuksia, kuten viestien merkkikoodauksia ja automaattista uudelleenyhdistämistä"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:671
+#: ../src/qtui/settingspages/networkssettingspage.ui:898
 msgctxt "NetworksSettingsPage|"
 msgid "Control encodings for in- and outgoing messages"
 msgstr "Hallitse saapuvien ja lähtevien viestien merkkikoodauksia"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:674
+#: ../src/qtui/settingspages/networkssettingspage.ui:901
 msgctxt "NetworksSettingsPage|"
 msgid "Use Custom Encodings"
 msgstr "Käytä mukautettuja merkkikoodauksia"
 
-#: ../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 "Määritä, millä merkkikoodauksella viestisi lähetetään.\nUTF-8:n pitäisi olla hyvä valinta useimmille verkoille."
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:689
+#: ../src/qtui/settingspages/networkssettingspage.ui:916
 msgctxt "NetworksSettingsPage|"
 msgid "Send messages in:"
 msgstr "Lähetetyt viestit:"
 
-#: ../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 "Saapuvat Utf8-viestit käsitellään aina sellaisenaan.\nTämä asetus määrittää niiden viestien merkkikoodauksen, jotka eivät ole Utf8:aa."
+"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 "Vastaanotetut:"
 
-#: ../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 "Tämä määrittää miten ohjausviestit, nimimerkit ja palvelinnimet merkkikoodataan.\nEllet *todella* tiedä mitä teet, jätä tämä ISO-8859-1:ksi!"
+"<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 "Palvelin:"
 
-#: ../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 "Verkot"
 
-#: ../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 ""
+
+#: ../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>Seuraavat ongelmat on korjattava, ennen kuin tekemäsi muutokset tulevat voimaan:</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>Jokainen verkko tarvitsee vähintään yhden palvelimen</li>"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:187
+#: ../src/qtui/settingspages/networkssettingspage.cpp:240
+msgctxt "NetworksSettingsPage|"
+msgid "</ul>"
+msgstr "</ul>"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:241
+msgctxt "NetworksSettingsPage|"
+msgid "Invalid Network Settings"
+msgstr "Virheelliset verkkoasetukset"
+
+#: ../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 ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:838
+msgctxt "NetworksSettingsPage|"
+msgid "Delete Network?"
+msgstr "Poistetaanko verkko?"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:839
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Do you really want to delete the network \"%1\" and all related settings, "
+"including the backlog?"
+msgstr "Haluatko varmasti poistaa verkon ”%1” ja kaikki siihen liittyvät asetukset, viestihistoria mukaan lukien?"
+
+#: ../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 "</ul>"
-msgstr "</ul>"
+msgid ""
+"The network \"%1\" does not currently support SASL.  However, support might "
+"be added later on."
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:188
+#: ../src/qtui/settingspages/networkssettingspage.cpp:989
 msgctxt "NetworksSettingsPage|"
-msgid "Invalid Network Settings"
-msgstr "Virheelliset verkkoasetukset"
+msgid "SASL supported by network"
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:651
+#: ../src/qtui/settingspages/networkssettingspage.cpp:990
+#, qt-format
 msgctxt "NetworksSettingsPage|"
-msgid "Delete Network?"
-msgstr "Poistetaanko verkko?"
+msgid ""
+"The network \"%1\" supports SASL.  In most cases, you should use SASL "
+"instead of NickServ identification."
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:652
+#: ../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 ""
-"Do you really want to delete the network \"%1\" and all related settings, "
-"including the backlog?"
-msgstr "Haluatko varmasti poistaa verkon ”%1” ja kaikki siihen liittyvät asetukset, viestihistoria mukaan lukien?"
+"SASL is a standardized way to log in and identify yourself to IRC servers."
+msgstr ""
 
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
 msgctxt "NickEditDlg|"
@@ -5635,11 +7456,41 @@ msgctxt "PhononNotificationConfigWidget|"
 msgid "Select the sound file to play"
 msgstr "Valitse soitettava ääni"
 
-#: ../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 überturbo HD!"
 
+#: ../src/core/postgresqlstorage.cpp:88
+msgctxt "PostgreSqlStorage|"
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
+#: ../src/core/postgresqlstorage.cpp:89
+msgctxt "PostgreSqlStorage|"
+msgid "Password"
+msgstr "Salasana"
+
+#: ../src/core/postgresqlstorage.cpp:90
+msgctxt "PostgreSqlStorage|"
+msgid "Hostname"
+msgstr "Konenimi"
+
+#: ../src/core/postgresqlstorage.cpp:91
+msgctxt "PostgreSqlStorage|"
+msgid "Port"
+msgstr "Portti"
+
+#: ../src/core/postgresqlstorage.cpp:92
+msgctxt "PostgreSqlStorage|"
+msgid "Database"
+msgstr "Tietokanta"
+
 #: ../src/client/backlogrequester.cpp:95
 #, qt-format
 msgctxt "QObject|"
@@ -5672,212 +7523,339 @@ msgid ""
 "wizard any time and use the settings dialog for more detailed changes."
 msgstr "Tämä ohjattu toiminto auttaa asettamaan oletushenkilöllisyyden ja IRC-verkkoyhteyden.<br>Tämä kattaa vain perusteet. Voit peruuttaa tämän ohjatun toiminnon milloin vain ja tehdä tarkemmat muutokset asetusikkunan kautta."
 
-#: ../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 "Virheellinen lohkon määrittely: %1"
 
-#: ../src/uisupport/qssparser.cpp:147
+#: ../src/uisupport/qssparser.cpp:170
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette role assignment: %1"
 msgstr "Virheellinen palettiroolin määrittely: %1"
 
-#: ../src/uisupport/qssparser.cpp:166
+#: ../src/uisupport/qssparser.cpp:189
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr "Tuntematon palettiroolin nimi: %1"
 
-#: ../src/uisupport/qssparser.cpp:204
+#: ../src/uisupport/qssparser.cpp:233
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
 msgstr "Tuntematon alielementin nimi määrittelyssä %1"
 
-#: ../src/uisupport/qssparser.cpp:248
+#: ../src/uisupport/qssparser.cpp:277
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message type in %1"
 msgstr "Virheellinen viestin tyyppi määrittelyssä %1"
 
-#: ../src/uisupport/qssparser.cpp:257
+#: ../src/uisupport/qssparser.cpp:286
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr "Virheellinen ehto %1"
 
-#: ../src/uisupport/qssparser.cpp:269
+#: ../src/uisupport/qssparser.cpp:299
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message label: %1"
 msgstr "Virheellinen viestileima: %1"
 
-#: ../src/uisupport/qssparser.cpp:281
+#: ../src/uisupport/qssparser.cpp:310
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr "Virheellinen lähettäjätiivistemäärittely: %1"
 
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:314
 msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr "Lähettäjätiiviste voi olla enintään ”0x0f”!"
 
-#: ../src/uisupport/qssparser.cpp:301
+#: ../src/uisupport/qssparser.cpp:330
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid format name: %1"
 msgstr "Virheellinen muodon nimi: %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 "Kelvoton IRC-värikoodi (pitää olla väliltä 00–0f): %1"
 
-#: ../src/uisupport/qssparser.cpp:318
+#: ../src/uisupport/qssparser.cpp:347
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
 msgstr "Käsittelemätön ehto: %1"
 
-#: ../src/uisupport/qssparser.cpp:349
+#: ../src/uisupport/qssparser.cpp:380
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid proplist %1"
 msgstr "Virheellinen ominaisuuslista %1"
 
-#: ../src/uisupport/qssparser.cpp:368
+#: ../src/uisupport/qssparser.cpp:399
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid chatlist item type %1"
 msgstr "Virheellinen keskustelulistan kohteen tyyppi %1"
 
-#: ../src/uisupport/qssparser.cpp:384
+#: ../src/uisupport/qssparser.cpp:415
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid chatlist state %1"
 msgstr "Virheellinen keskustelulistan tila %1"
 
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:445
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid property declaration: %1"
 msgstr "Virheellinen ominaisuuden määrittely: %1"
 
-#: ../src/uisupport/qssparser.cpp:438
+#: ../src/uisupport/qssparser.cpp:483
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font property: %1"
 msgstr "Virheellinen fontin ominaisuus: %1"
 
-#: ../src/uisupport/qssparser.cpp:444
+#: ../src/uisupport/qssparser.cpp:489
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown ChatLine property: %1"
 msgstr "Tuntematon ChatLine-ominaisuus: %1"
 
-#: ../src/uisupport/qssparser.cpp:468
+#: ../src/uisupport/qssparser.cpp:508
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid boolean value: %1"
+msgstr "Virheellinen Boolen arvo: %1"
+
+#: ../src/uisupport/qssparser.cpp:544
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette color role specification: %1"
 msgstr "Virheellinen palettivärin roolimäärittely: %1"
 
-#: ../src/uisupport/qssparser.cpp:475
+#: ../src/uisupport/qssparser.cpp:551
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette color role: %1"
 msgstr "Tuntematon palettivärin rooli: %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 "Virheellinen liukuvärin määrittely: %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 "Virheellinen liukuvärin pykälälista: %1"
 
-#: ../src/uisupport/qssparser.cpp:646
+#: ../src/uisupport/qssparser.cpp:722
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font specification: %1"
 msgstr "Virheellinen fontin määrittely: %1"
 
-#: ../src/uisupport/qssparser.cpp:687
+#: ../src/uisupport/qssparser.cpp:773
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font style specification: %1"
 msgstr "Virheellinen fonttityylin määrittely: %1"
 
-#: ../src/uisupport/qssparser.cpp:702
+#: ../src/uisupport/qssparser.cpp:788
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font weight specification: %1"
 msgstr "Virheellinen fontin lihavuuden määrittely: %1"
 
-#: ../src/uisupport/qssparser.cpp:714
+#: ../src/uisupport/qssparser.cpp:800
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font size specification: %1"
 msgstr "Virheellinen fontin koon määrittely: %1"
 
-#: ../src/common/util.cpp:169
+#: ../src/qtui/qtmultimedianotificationbackend.cpp:167
+msgctxt "QtMultimediaNotificationBackend::ConfigWidget|"
+msgid "Select Audio File"
+msgstr "Valitse äänitiedosto"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:14
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Form"
+msgstr "Lomake"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:20
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Play a sound"
+msgstr "Soita ääni"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:46
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Prelisten to the selected sound"
+msgstr "Esikuuntele valittu ääni"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:59
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:69
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Select the sound file to play"
+msgstr "Valitse soitettava ääni"
+
+#. Supported icon theme names
+#: ../src/qtui/qtui.cpp:284
+msgctxt "QtUi|"
+msgid "Breeze"
+msgstr "Breeze"
+
+#: ../src/qtui/qtui.cpp:285
+msgctxt "QtUi|"
+msgid "Breeze Dark"
+msgstr "Breeze Dark"
+
+#: ../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 "Quasselin alustaminen epäonnistui!"
+
+#: ../src/qtui/qtuiapplication.cpp:110
+msgctxt "QtUiApplication|"
+msgid "Could not load or upgrade client settings!"
+msgstr "Asiakkaan asetusten lataaminen tai päivittäminen epäonnistui!"
+
+#: ../src/common/util.cpp:173
 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "vuosi"
 
-#: ../src/common/util.cpp:170
+#: ../src/common/util.cpp:174
 msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr "päivä"
 
-#: ../src/common/util.cpp:171
+#: ../src/common/util.cpp:175
 msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr "h"
 
-#: ../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 "s"
 
-#: ../src/client/networkmodel.cpp:503
+#: ../src/client/networkmodel.cpp:589
 #, qt-format
 msgctxt "QueryBufferItem|"
-msgid "<b>Query with %1</b>"
-msgstr "<b>Yksityiskeskustelu käyttäjän %1 kanssa</b>"
+msgid "Query with %1"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:521
-#, qt-format
+#: ../src/client/networkmodel.cpp:611
 msgctxt "QueryBufferItem|"
-msgid "idling since %1"
-msgstr "jouten alkaen %1"
+msgid "Unknown"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:524
-#, qt-format
+#: ../src/client/networkmodel.cpp:617
 msgctxt "QueryBufferItem|"
-msgid "login time: %1"
-msgstr "kirjautumisaika: %1"
+msgid "Away message"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:527
-#, qt-format
+#: ../src/client/networkmodel.cpp:619
+msgctxt "QueryBufferItem|"
+msgid "Realname"
+msgstr "Oikea nimi"
+
+#: ../src/client/networkmodel.cpp:625
+msgctxt "QueryBufferItem|"
+msgid "Help status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:626
+msgctxt "QueryBufferItem|"
+msgid "Available for help"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:629
+msgctxt "QueryBufferItem|"
+msgid "Service status"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:639
+msgctxt "QueryBufferItem|"
+msgid "Not logged in"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:645 ../src/client/networkmodel.cpp:654
+msgctxt "QueryBufferItem|"
+msgid "Account"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:655
+msgctxt "QueryBufferItem|"
+msgid "Identified for this nick"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:661
+msgctxt "QueryBufferItem|"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:665
+msgctxt "QueryBufferItem|"
+msgid "Hostmask"
+msgstr "Verkkopeite"
+
+#: ../src/client/networkmodel.cpp:669
 msgctxt "QueryBufferItem|"
-msgid "server: %1"
-msgstr "palvelin: %1"
+msgid "Operator"
+msgstr "Operaattori"
+
+#: ../src/client/networkmodel.cpp:677
+msgctxt "QueryBufferItem|"
+msgid "Idling since"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:681
+msgctxt "QueryBufferItem|"
+msgid "Login time"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:684
+msgctxt "QueryBufferItem|"
+msgid "Server"
+msgstr "Palvelin"
+
+#: ../src/client/networkmodel.cpp:690
+msgctxt "QueryBufferItem|"
+msgid "No information available"
+msgstr ""
 
 #: ../src/qtui/ui/receivefiledlg.ui:14
 msgctxt "ReceiveFileDlg|"
@@ -5912,8 +7890,8 @@ msgstr "Keskeytä"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:14
 msgctxt "ServerEditDlg|"
-msgid "Dialog"
-msgstr "Kysely"
+msgid "Edit Server"
+msgstr ""
 
 #: ../src/qtui/settingspages/servereditdlg.ui:30
 msgctxt "ServerEditDlg|"
@@ -5926,7 +7904,7 @@ msgid "Server address:"
 msgstr "Palvelimen osoite:"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:45
-#: ../src/qtui/settingspages/servereditdlg.ui:227
+#: ../src/qtui/settingspages/servereditdlg.ui:246
 msgctxt "ServerEditDlg|"
 msgid "Port:"
 msgstr "Portti:"
@@ -5938,124 +7916,154 @@ msgstr "Salasana:"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:94
 msgctxt "ServerEditDlg|"
-msgid "Use SSL"
-msgstr "Käytä SSL:ää"
+msgid "Try to use an encrypted connection (e.g. SSL/TLS)"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:97
+msgctxt "ServerEditDlg|"
+msgid "Use encrypted connection"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:111
+msgctxt "ServerEditDlg|"
+msgid ""
+"<p>Verify the encrypted connection provides a valid certificate, increasing "
+"security.<br/>Uncheck if the IRC server uses a self-signed or invalid "
+"certificate.</p>"
+msgstr ""
+
+#: ../src/qtui/settingspages/servereditdlg.ui:114
+msgctxt "ServerEditDlg|"
+msgid "Verify connection security"
+msgstr ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:119
+#: ../src/qtui/settingspages/servereditdlg.ui:138
 msgctxt "ServerEditDlg|"
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:140
+#: ../src/qtui/settingspages/servereditdlg.ui:159
 msgctxt "ServerEditDlg|"
 msgid "SSL Version:"
 msgstr "SSL-versio:"
 
-#: ../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 "Käytä vain TLSv1:tä, ellet tiedä, mitä olet tekemässä!"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:151
+#: ../src/qtui/settingspages/servereditdlg.ui:170
 msgctxt "ServerEditDlg|"
 msgid "SSLv3 (insecure)"
 msgstr "SSLv3 (epäturvallinen)"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:156
+#: ../src/qtui/settingspages/servereditdlg.ui:175
 msgctxt "ServerEditDlg|"
 msgid "SSLv2 (insecure)"
 msgstr "SSLv2 (epäturvallinen)"
 
-#: ../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 "Käytä välityspalvelinta"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:188
+#: ../src/qtui/settingspages/servereditdlg.ui:207
 msgctxt "ServerEditDlg|"
 msgid "Proxy Type:"
 msgstr "Välityspalvelimen tyyppi:"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:196
+#: ../src/qtui/settingspages/servereditdlg.ui:215
 msgctxt "ServerEditDlg|"
-msgid "Socks 5"
-msgstr "Socks 5"
+msgid "SOCKS 5"
+msgstr ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:201
+#: ../src/qtui/settingspages/servereditdlg.ui:220
 msgctxt "ServerEditDlg|"
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:213
+#: ../src/qtui/settingspages/servereditdlg.ui:232
 msgctxt "ServerEditDlg|"
 msgid "Proxy Host:"
 msgstr "Verkko-osoite:"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:220
+#: ../src/qtui/settingspages/servereditdlg.ui:239
 msgctxt "ServerEditDlg|"
 msgid "localhost"
 msgstr "localhost"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:251
+#: ../src/qtui/settingspages/servereditdlg.ui:270
 msgctxt "ServerEditDlg|"
 msgid "Proxy Username:"
 msgstr "Käyttäjätunnus:"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:261
+#: ../src/qtui/settingspages/servereditdlg.ui:280
 msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr "Salasana:"
 
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1205
+msgctxt "ServerEditDlg|"
+msgid "Your Quassel core does not support this feature"
+msgstr ""
+
+#: ../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 "Quasselin asetukset"
 
-#: ../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 "Asetukset"
 
-#: ../src/qtui/settingsdlg.cpp:121
+#: ../src/qtui/settingsdlg.cpp:122
 msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr "Tallenna muutokset"
 
-#: ../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 "Nykyisellä asetussivulla on tallentamattomia muutoksia. Haluatko ottaa muutoksesi käyttöön nyt?"
 
-#: ../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 "Asetukset – %1"
 
-#: ../src/qtui/settingsdlg.cpp:220
+#: ../src/qtui/settingsdlg.cpp:221
 msgctxt "SettingsDlg|"
 msgid "Reload Settings"
 msgstr "Oletuspoissaoloasetukset"
 
-#: ../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 "Haluatko ladata asetukset uudelleen ja siten kumota kaikki muutokset tällä sivulla?"
 
-#: ../src/qtui/settingsdlg.cpp:231
+#: ../src/qtui/settingsdlg.cpp:232
 msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
 msgstr "Palauta oletukset"
 
-#: ../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 "Haluatko palauttaa tämän sivun oletusarvot?"
@@ -6070,28 +8078,28 @@ msgctxt "SettingsPageDlg|"
 msgid "Settings"
 msgstr "Asetukset"
 
-#: ../src/qtui/settingspagedlg.cpp:38
+#: ../src/qtui/settingspagedlg.cpp:39
 #, qt-format
 msgctxt "SettingsPageDlg|"
 msgid "Configure %1"
 msgstr "Asetukset – %1"
 
-#: ../src/qtui/settingspagedlg.cpp:119
+#: ../src/qtui/settingspagedlg.cpp:120
 msgctxt "SettingsPageDlg|"
 msgid "Reload Settings"
 msgstr "Oletuspoissaoloasetukset"
 
-#: ../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 "Haluatko ladata asetukset uudelleen ja siten kumota kaikki muutokset tällä sivulla?"
 
-#: ../src/qtui/settingspagedlg.cpp:130
+#: ../src/qtui/settingspagedlg.cpp:131
 msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr "Palauta oletukset"
 
-#: ../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 "Haluatko palauttaa tämän sivun oletusarvot?"
@@ -6148,7 +8156,7 @@ msgctxt "ShortcutsSettingsPage|"
 msgid "Shortcuts"
 msgstr "Pikanäppäimet"
 
-#: ../src/common/signalproxy.cpp:775
+#: ../src/common/signalproxy.cpp:792
 msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr "Katkaistaan yhteys"
@@ -6251,7 +8259,29 @@ msgctxt "SnoreNotificationConfigWidget|"
 msgid "Enable Snore"
 msgstr "Käytä Snorea"
 
-#: ../src/core/sqlitestorage.cpp:60
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Interface"
+msgstr "Käyttöliittymä"
+
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Spell Checking"
+msgstr ""
+
+#: ../src/core/sqlauthenticator.cpp:58
+msgctxt "SqlAuthenticator|"
+msgid "Database"
+msgstr "Tietokanta"
+
+#: ../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 "
@@ -6372,22 +8402,58 @@ msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr "%1–%2"
 
-#: ../src/client/networkmodel.h:151
+#: ../src/client/networkmodel.h:170
 msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
 msgstr "Tilapuskuri"
 
-#: ../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 "&Pienennä"
 
-#: ../src/qtui/systemtray.cpp:102
+#: ../src/qtui/systemtray.cpp:248
 msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr "&Palauta"
 
-#: ../src/qtui/systraynotificationbackend.cpp:141
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:20
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Form"
+msgstr "Lomake"
+
+#: ../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)"
@@ -6395,7 +8461,7 @@ msgid_plural "%n pending highlight(s)"
 msgstr[0] "%n odottava korostus"
 msgstr[1] "%n odottavaa korostusta"
 
-#: ../src/qtui/systraynotificationbackend.cpp:155
+#: ../src/qtui/systraynotificationbackend.cpp:146
 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr "Näytä viesti ponnahdusikkunassa"
@@ -6425,146 +8491,146 @@ msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr " sekuntia"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:30
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgctxt "ToolBarActionProvider|"
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:30
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgctxt "ToolBarActionProvider|"
 msgid "Connect to IRC"
 msgstr "Yhdistä IRC:hen"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect"
 msgstr "Katkaise yhteys"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
 msgstr "Katkaise yhteys IRC:hen"
 
 #: ../src/uisupport/toolbaractionprovider.cpp:33
 msgctxt "ToolBarActionProvider|"
+msgid "Connect to all"
+msgstr "Yhdistä kaikkiin"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:34
+msgctxt "ToolBarActionProvider|"
+msgid "Disconnect from all"
+msgstr "Katkaise yhteys kaikkiin"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:36
+msgctxt "ToolBarActionProvider|"
 msgid "Part"
 msgstr "Poistu"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:33
+#: ../src/uisupport/toolbaractionprovider.cpp:36
 msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
 msgstr "Poistu valitulta kanavalta"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgctxt "ToolBarActionProvider|"
 msgid "Join"
 msgstr "Liity"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr "Liity kanavalle"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:36
+#: ../src/uisupport/toolbaractionprovider.cpp:39
 msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr "Yksityiskeskustelu"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:36
+#: ../src/uisupport/toolbaractionprovider.cpp:39
 msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr "Aloita yksityinen keskustelu"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr "Kukaon"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr "Pyydä käyttäjän tietoja"
 
-#: ../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 "Anna operaattorioikeudet käyttäjälle"
 
-#: ../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 "Poista operaattorioikeudet käyttäjältä"
 
-#: ../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 "Anna puheoikeus käyttäjälle"
 
-#: ../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 "Poista puheoikeus käyttäjältä"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr "Potki"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
 msgstr "Poista käyttäjä kanavalta"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:47
 msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr "Ban"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:47
 msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
 msgstr "Anna käyttäjälle porttikielto kanavalle"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:48
 msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
 msgstr "Kick/Ban"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:45
+#: ../src/uisupport/toolbaractionprovider.cpp:48
 msgctxt "ToolBarActionProvider|"
 msgid "Remove and ban user from channel"
 msgstr "Poista käyttäjä kanavalta ja anna hänelle porttikielto"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:50
-msgctxt "ToolBarActionProvider|"
-msgid "Connect to all"
-msgstr "Yhdistä kaikkiin"
-
-#: ../src/uisupport/toolbaractionprovider.cpp:57
-msgctxt "ToolBarActionProvider|"
-msgid "Disconnect from all"
-msgstr "Katkaise yhteys kaikkiin"
-
 #: ../src/qtui/ui/topicwidget.ui:32
 msgctxt "TopicWidget|"
 msgid "Form"
@@ -6575,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 "Käyttäjiä: %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"
@@ -6617,86 +8683,176 @@ msgctxt "TopicWidgetSettingsPage|"
 msgid "Topic Widget"
 msgstr "Aihe-elementti"
 
+#: ../src/common/transfer.cpp:95
+msgctxt "Transfer|"
+msgid "New"
+msgstr "Uusi"
+
+#: ../src/common/transfer.cpp:97
+msgctxt "Transfer|"
+msgid "Pending"
+msgstr ""
+
+#: ../src/common/transfer.cpp:99
+msgctxt "Transfer|"
+msgid "Connecting"
+msgstr ""
+
+#: ../src/common/transfer.cpp:101
+msgctxt "Transfer|"
+msgid "Transferring"
+msgstr ""
+
+#: ../src/common/transfer.cpp:103
+msgctxt "Transfer|"
+msgid "Paused"
+msgstr ""
+
+#: ../src/common/transfer.cpp:105
+msgctxt "Transfer|"
+msgid "Completed"
+msgstr ""
+
+#: ../src/common/transfer.cpp:107
+msgctxt "Transfer|"
+msgid "Failed"
+msgstr ""
+
+#: ../src/common/transfer.cpp:109
+msgctxt "Transfer|"
+msgid "Rejected"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Type"
+msgstr "Tyyppi"
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "File"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Status"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Progress"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Transferred"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Speed"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Peer"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:47
+msgctxt "TransferModel|"
+msgid "Peer Address"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:80
+msgctxt "TransferModel|"
+msgid "Send"
+msgstr ""
+
+#: ../src/client/transfermodel.cpp:80
+msgctxt "TransferModel|"
+msgid "Receive"
+msgstr ""
+
 #. 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 "Nimimerkkisi on nyt %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 on nyt nimimerkiltään %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 "Käyttäjätila: %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 "Tilan %DM%1%DM asetti %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 liittyi kanavalle %DC%4%DC"
 
 #. 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 poistui kanavalta %DC%4%DC"
 
 #. 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 lopetti"
 
 #. 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 potki käyttäjän %DN%2%DN pois kanavalta %DC%3%DC"
 
 #. Day Change Message
-#: ../src/uisupport/uistyle.cpp:731
+#: ../src/uisupport/uistyle.cpp:977
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
 msgstr "{Päivä vaihtui – %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 verkkojen %DH%1%DH ja %DH%2%DH välillä loppui. Liittyneet käyttäjät: "
 
-#: ../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 lisää)"
 
-#: ../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 verkkojen %DH%1%DH ja %DH%2%DH välillä. Lopettaneet käyttäjät: "
 
-#: ../src/client/networkmodel.cpp:831
+#: ../src/client/networkmodel.cpp:1031
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Owner(s)"
@@ -6704,7 +8860,7 @@ msgid_plural "%n Owner(s)"
 msgstr[0] "%n omistaja"
 msgstr[1] "%n omistajaa"
 
-#: ../src/client/networkmodel.cpp:833
+#: ../src/client/networkmodel.cpp:1033
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Admin(s)"
@@ -6712,7 +8868,7 @@ msgid_plural "%n Admin(s)"
 msgstr[0] "%n ylläpitäjä"
 msgstr[1] "%n ylläpitäjää"
 
-#: ../src/client/networkmodel.cpp:835
+#: ../src/client/networkmodel.cpp:1035
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Operator(s)"
@@ -6720,7 +8876,7 @@ msgid_plural "%n Operator(s)"
 msgstr[0] "%n operaattori"
 msgstr[1] "%n operaattoria"
 
-#: ../src/client/networkmodel.cpp:837
+#: ../src/client/networkmodel.cpp:1037
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Half-Op(s)"
@@ -6728,7 +8884,7 @@ msgid_plural "%n Half-Op(s)"
 msgstr[0] "%n puolioperaattori"
 msgstr[1] "%n puolioperaattoria"
 
-#: ../src/client/networkmodel.cpp:839
+#: ../src/client/networkmodel.cpp:1039
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Voiced"
@@ -6736,7 +8892,7 @@ msgid_plural "%n Voiced"
 msgstr[0] "%n puheoikeutettu"
 msgstr[1] "%n puheoikeutettua"
 
-#: ../src/client/networkmodel.cpp:841
+#: ../src/client/networkmodel.cpp:1041
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n User(s)"