X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fja.po;fp=po%2Fja.po;h=26742795c5822aed8f2b76401dbe40f8b2602875;hp=32185dd165cb8a59f5b57dae942749a236da6bbe;hb=ad715f63465417cc43c9a4de09d200401238fb11;hpb=63ecd84a68c4896e2548cfdedf67f6f130989236

diff --git a/po/ja.po b/po/ja.po
index 32185dd1..26742795 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Quassel IRC\n"
 "Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
-"PO-Revision-Date: 2016-02-12 10:43+0000\n"
+"PO-Revision-Date: 2018-08-28 13:38+0000\n"
 "Last-Translator: Daniel Albers <daniel@lbe.rs>\n"
-"Language-Team: Japanese (http://www.transifex.com/ald/quassel/language/ja/)\n"
+"Language-Team: Japanese (http://www.transifex.com/quassel/quassel/language/ja/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,22 +28,22 @@ msgstr ""
 
 #: ../src/uisupport/aboutdata.cpp:174
 msgctxt "AboutData|"
-msgid "Project Founder, Lead Developer"
+msgid "Project founder, lead developer"
 msgstr ""
 
 #: ../src/uisupport/aboutdata.cpp:175
 msgctxt "AboutData|"
-msgid "Project Motivator, Lead Developer"
+msgid "Project motivator, lead developer"
 msgstr ""
 
 #: ../src/uisupport/aboutdata.cpp:176
 msgctxt "AboutData|"
-msgid "Former Lead Developer"
+msgid "Former lead developer"
 msgstr ""
 
 #: ../src/uisupport/aboutdata.cpp:177
 msgctxt "AboutData|"
-msgid "Master of Translation, many fixes and enhancements"
+msgid "Master of Translation, many fixes and enhancements, Travis support"
 msgstr ""
 
 #: ../src/uisupport/aboutdata.cpp:178
@@ -56,475 +56,557 @@ msgctxt "AboutData|"
 msgid "Many fixes and improvements, bug and patch triaging, community support"
 msgstr ""
 
-#: ../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 ""
+
+#: ../src/uisupport/aboutdata.cpp:181
+msgctxt "AboutData|"
+msgid ""
+"Quasseldroid, architecture, (mobile) performance, many other improvements "
+"and fixes, testing"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:185
+msgctxt "AboutData|"
+msgid "OSX UI improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:186 ../src/uisupport/aboutdata.cpp:201
 msgctxt "AboutData|"
 msgid "Chatview improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:184
+#: ../src/uisupport/aboutdata.cpp:187
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter, Danish translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:185 ../src/uisupport/aboutdata.cpp: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 ""
 
-#: ../src/uisupport/aboutdata.cpp:186
+#: ../src/uisupport/aboutdata.cpp:189
+msgctxt "AboutData|"
+msgid "Build system fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:190 ../src/uisupport/aboutdata.cpp:330
+msgctxt "AboutData|"
+msgid "Database performance improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:191
 msgctxt "AboutData|"
 msgid "Tray icon fix"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:187
+#: ../src/uisupport/aboutdata.cpp:192
 msgctxt "AboutData|"
 msgid "Language improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:188
+#: ../src/uisupport/aboutdata.cpp:193
 msgctxt "AboutData|"
 msgid "Documentation improvements"
 msgstr ""
 
-#: ../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 ""
+
+#: ../src/uisupport/aboutdata.cpp:195 ../src/uisupport/aboutdata.cpp:269
+msgctxt "AboutData|"
+msgid "Slovenian translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:196 ../src/uisupport/aboutdata.cpp:222
+#: ../src/uisupport/aboutdata.cpp:226 ../src/uisupport/aboutdata.cpp:243
+#: ../src/uisupport/aboutdata.cpp:252 ../src/uisupport/aboutdata.cpp:274
+#: ../src/uisupport/aboutdata.cpp:290 ../src/uisupport/aboutdata.cpp:310
+#: ../src/uisupport/aboutdata.cpp:347
 msgctxt "AboutData|"
 msgid "Fixes"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../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 ""
 
-#: ../src/uisupport/aboutdata.cpp:192
+#: ../src/uisupport/aboutdata.cpp:200
 msgctxt "AboutData|"
 msgid "Message indicator support"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/uisupport/aboutdata.cpp:196
+#: ../src/uisupport/aboutdata.cpp:204
 msgctxt "AboutData|"
 msgid "Windows build system fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:197
+#: ../src/uisupport/aboutdata.cpp:205
 msgctxt "AboutData|"
-msgid "Nicer tooltips"
+msgid "AppData metadata, LDAP support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:198
+#: ../src/uisupport/aboutdata.cpp:206
+msgctxt "AboutData|"
+msgid "Nicer tooltips, spell check and other improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:207
 msgctxt "AboutData|"
 msgid "Crash fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp: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 ""
 
-#: ../src/uisupport/aboutdata.cpp:200
+#: ../src/uisupport/aboutdata.cpp:209
+msgctxt "AboutData|"
+msgid "Occitan translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:210
 msgctxt "AboutData|"
 msgid "Usability review"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:201
+#: ../src/uisupport/aboutdata.cpp:211
 msgctxt "AboutData|"
 msgid "SASL support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:202
+#: ../src/uisupport/aboutdata.cpp:212
 msgctxt "AboutData|"
 msgid "Various improvements"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/uisupport/aboutdata.cpp:205
+#: ../src/uisupport/aboutdata.cpp:215
+msgctxt "AboutData|"
+msgid "Settings fixes"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:216 ../src/uisupport/aboutdata.cpp:294
 msgctxt "AboutData|"
 msgid "Galician translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:206
+#: ../src/uisupport/aboutdata.cpp:217 ../src/uisupport/aboutdata.cpp:339
 msgctxt "AboutData|"
 msgid "Esperanto translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:207
+#: ../src/uisupport/aboutdata.cpp:218
 msgctxt "AboutData|"
 msgid "Japanese translation"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/uisupport/aboutdata.cpp:212
+#: ../src/uisupport/aboutdata.cpp:224
 msgctxt "AboutData|"
 msgid "Translation system fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:213
+#: ../src/uisupport/aboutdata.cpp:225
 msgctxt "AboutData|"
 msgid "OSX Notification Center support"
 msgstr ""
 
-#: ../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 ""
+
+#: ../src/uisupport/aboutdata.cpp:228 ../src/uisupport/aboutdata.cpp:292
 msgctxt "AboutData|"
 msgid "Mac fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:216
+#: ../src/uisupport/aboutdata.cpp:229
 msgctxt "AboutData|"
 msgid "D-Bus notifications"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:217
+#: ../src/uisupport/aboutdata.cpp:230
 msgctxt "AboutData|"
 msgid "Polish translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:218
+#: ../src/uisupport/aboutdata.cpp:231 ../src/uisupport/aboutdata.cpp:312
 msgctxt "AboutData|"
 msgid "Build system improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:219
+#: ../src/uisupport/aboutdata.cpp:232
 msgctxt "AboutData|"
 msgid "Formatting support and other input line improvements, many other fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:221
+#: ../src/uisupport/aboutdata.cpp:234
 msgctxt "AboutData|"
 msgid "BluesTheme stylesheet"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 "Sanitize topic handling"
+msgid "German translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:226
+#: ../src/uisupport/aboutdata.cpp:239
 msgctxt "AboutData|"
-msgid "Norwegian translation"
+msgid "Sanitize topic handling, twitch.tv support"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:227
+#: ../src/uisupport/aboutdata.cpp:240
 msgctxt "AboutData|"
-msgid "Hungarian translation"
+msgid "Norwegian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:228
+#: ../src/uisupport/aboutdata.cpp:241
 msgctxt "AboutData|"
-msgid "IRC parser improvements"
+msgid "Hungarian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:229 ../src/uisupport/aboutdata.cpp:311
-#: ../src/uisupport/aboutdata.cpp:316
+#: ../src/uisupport/aboutdata.cpp:242
 msgctxt "AboutData|"
-msgid "Turkish translation"
+msgid "IRC parser improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:230
+#: ../src/uisupport/aboutdata.cpp:245
 msgctxt "AboutData|"
-msgid "MinGW support, SNORE backend, Windows packaging"
+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 ""
 
-#: ../src/uisupport/aboutdata.cpp:232
+#: ../src/uisupport/aboutdata.cpp:247
 msgctxt "AboutData|"
 msgid "{Ku|U}buntu packager, motivator, promoter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:233
+#: ../src/uisupport/aboutdata.cpp:248
 msgctxt "AboutData|"
-msgid "Various features"
+msgid "Various features and improvements"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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"
+msgid "Czech translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:239
+#: ../src/uisupport/aboutdata.cpp:254
 msgctxt "AboutData|"
 msgid "Python improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:241
+#: ../src/uisupport/aboutdata.cpp:256
+msgctxt "AboutData|"
+msgid "Proxy improvements, Spanish translation"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:257
 msgctxt "AboutData|"
 msgid "Postgres migration fixes"
 msgstr ""
 
-#: ../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 ""
+
+#: ../src/uisupport/aboutdata.cpp:259
 msgctxt "AboutData|"
 msgid "Context menu fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:245
+#: ../src/uisupport/aboutdata.cpp:263
 msgctxt "AboutData|"
 msgid "Many fixes and improvements, bug triaging"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:246
+#: ../src/uisupport/aboutdata.cpp:264
 msgctxt "AboutData|"
 msgid "Original \"All-Seeing Eye\" logo"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:247
+#: ../src/uisupport/aboutdata.cpp:265
 msgctxt "AboutData|"
 msgid "Project founder, various improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:249
+#: ../src/uisupport/aboutdata.cpp:268
 msgctxt "AboutData|"
 msgid "Serbian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:250
-msgctxt "AboutData|"
-msgid "Slovenian translation"
-msgstr ""
-
-#: ../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 ""
 
-#: ../src/uisupport/aboutdata.cpp:252
+#: ../src/uisupport/aboutdata.cpp:271
 msgctxt "AboutData|"
 msgid "Qt5 porting help, Travis CI setup"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:253 ../src/uisupport/aboutdata.cpp:264
-#: ../src/uisupport/aboutdata.cpp:266 ../src/uisupport/aboutdata.cpp:307
+#: ../src/uisupport/aboutdata.cpp:273
 msgctxt "AboutData|"
-msgid "German translation"
+msgid "Buffer merge improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:254
+#: ../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 "Buffer merge improvements"
+msgid "Greek translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:258
+#: ../src/uisupport/aboutdata.cpp:278
 msgctxt "AboutData|"
 msgid "OSX improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:259
+#: ../src/uisupport/aboutdata.cpp:279
 msgctxt "AboutData|"
 msgid "Lithuanian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:260
+#: ../src/uisupport/aboutdata.cpp:280
 msgctxt "AboutData|"
 msgid "Documentation fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:262
+#: ../src/uisupport/aboutdata.cpp:283 ../src/uisupport/aboutdata.cpp:316
+msgctxt "AboutData|"
+msgid "Improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:284
 msgctxt "AboutData|"
 msgid "Ideas, hacking, initial motivation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:265
+#: ../src/uisupport/aboutdata.cpp:287
 msgctxt "AboutData|"
-msgid "Core and other fixes, QuasselDroid"
+msgid "Many fixes and improvements, Sonnet support, QuasselDroid"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:268
+#: ../src/uisupport/aboutdata.cpp:291
 msgctxt "AboutData|"
 msgid "German translation, fixes"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:270
+#: ../src/uisupport/aboutdata.cpp:293
 msgctxt "AboutData|"
-msgid "Many fixes and improvements; Ubuntu live packages"
+msgid "Many fixes and improvements; Ubuntu PPAs"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:272
+#: ../src/uisupport/aboutdata.cpp:296
 msgctxt "AboutData|"
 msgid "Tons of Oxygen icons including the Quassel logo"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:274
+#: ../src/uisupport/aboutdata.cpp:298
 msgctxt "AboutData|"
 msgid "Initial design and main window layout"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:275
+#: ../src/uisupport/aboutdata.cpp:299
 msgctxt "AboutData|"
 msgid "Early beta tester and bughunter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:276
-msgctxt "AboutData|"
-msgid "Danish translation"
-msgstr ""
-
-#: ../src/uisupport/aboutdata.cpp:277
+#: ../src/uisupport/aboutdata.cpp:302
 msgctxt "AboutData|"
 msgid "Linewrap for input line"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:278
+#: ../src/uisupport/aboutdata.cpp:303
 msgctxt "AboutData|"
 msgid "Performance improvements and cleanups"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:279
+#: ../src/uisupport/aboutdata.cpp:305
 msgctxt "AboutData|"
 msgid "/print command"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:280
+#: ../src/uisupport/aboutdata.cpp:306
 msgctxt "AboutData|"
 msgid "Performance improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:283
+#: ../src/uisupport/aboutdata.cpp:308
 msgctxt "AboutData|"
-msgid "Build system fixes"
+msgid "Hindi and Marathi translations"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:313
+msgctxt "AboutData|"
+msgid ""
+"Windows build support, automated OSX builds in Travis, various improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:285
+#: ../src/uisupport/aboutdata.cpp:315
 msgctxt "AboutData|"
 msgid "Emacs keybindings"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:287
+#: ../src/uisupport/aboutdata.cpp:318
 msgctxt "AboutData|"
 msgid "Highlight configuration improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:288
+#: ../src/uisupport/aboutdata.cpp:319
 msgctxt "AboutData|"
-msgid "Kubuntu packager, (packaging/build system) bughunter"
+msgid "Debian/Kubuntu packager, (packaging/build system) bughunter"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:290
+#: ../src/uisupport/aboutdata.cpp:320
 msgctxt "AboutData|"
-msgid "Audio backend improvements"
+msgid "Bugfixes, German translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:292
+#: ../src/uisupport/aboutdata.cpp:321
 msgctxt "AboutData|"
-msgid "Dutch translation"
+msgid "Audio backend improvements"
 msgstr ""
 
-#: ../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"
+msgid "Chinese translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:298
+#: ../src/uisupport/aboutdata.cpp:325
 msgctxt "AboutData|"
-msgid "Fixing and hosting Windows builds"
+msgid "Dutch translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:300
+#: ../src/uisupport/aboutdata.cpp:329 ../src/uisupport/aboutdata.cpp:332
 msgctxt "AboutData|"
 msgid "Korean translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:301
+#: ../src/uisupport/aboutdata.cpp:331
+msgctxt "AboutData|"
+msgid "Alias improvements"
+msgstr ""
+
+#: ../src/uisupport/aboutdata.cpp:333
 msgctxt "AboutData|"
 msgid "Norwegian translation, documentation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:304
+#: ../src/uisupport/aboutdata.cpp:336
 msgctxt "AboutData|"
 msgid "Former Windows builder"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:305
+#: ../src/uisupport/aboutdata.cpp:337
 msgctxt "AboutData|"
 msgid "Fixes, Debian packaging"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:306
+#: ../src/uisupport/aboutdata.cpp:338
 msgctxt "AboutData|"
 msgid "Fixes and feedback"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:308 ../src/uisupport/aboutdata.cpp:310
-msgctxt "AboutData|"
-msgid "Czech translation"
-msgstr ""
-
-#: ../src/uisupport/aboutdata.cpp:313
+#: ../src/uisupport/aboutdata.cpp:348
 msgctxt "AboutData|"
 msgid "Network detection improvements"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:314
+#: ../src/uisupport/aboutdata.cpp:349
 msgctxt "AboutData|"
 msgid "Ukrainian translation"
 msgstr ""
 
-#: ../src/uisupport/aboutdata.cpp:315
+#: ../src/uisupport/aboutdata.cpp:350
 msgctxt "AboutData|"
 msgid "Portuguese translation"
 msgstr ""
@@ -563,77 +645,105 @@ msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr "&Thanks To"
 
-#: ../src/qtui/aboutdlg.cpp:38
+#: ../src/qtui/aboutdlg.cpp:44
+msgctxt "AboutDlg|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:50
 #, qt-format
 msgctxt "AboutDlg|"
-msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
+msgid ""
+"<b>Version:</b> %1<br><b>Version date:</b> %2<br><b>Protocol version:</b> %3"
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:54
+#: ../src/qtui/aboutdlg.cpp:67
 #, qt-format
 msgctxt "AboutDlg|"
 msgid ""
 "<b>A modern, distributed IRC Client</b><br><br>&copy;%1 by the Quassel "
-"Project<br><a href=\"http://quassel-irc.org\">http://quassel-"
+"Project<br><a href=\"https://quassel-irc.org\">https://quassel-"
 "irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> on <a"
-" href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
-"licensed under <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a>"
-" and <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>Most "
-"icons are &copy; by the <a href=\"http://www.oxygen-icons.org\">Oxygen "
-"Team</a> and used under the <a "
-"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Please use "
-"<a href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> to "
+" href=\"https://www.freenode.net\">Freenode</a><br><br>Quassel IRC is dual-"
+"licensed under <a "
+"href=\"https://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</a> and <a "
+"href=\"https://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br><a "
+"href=\"https://api.kde.org/frameworks/breeze-icons/html\">Breeze icon "
+"theme</a> &copy; Uri Herrera and others, licensed under the <a "
+"href=\"https://github.com/KDE/breeze-icons/blob/21ffd9b/COPYING-"
+"ICONS\">LGPLv3</a>.<br><a href=\"https://api.kde.org/frameworks/oxygen-"
+"icons5/html\">Oxygen icon theme</a> &copy; Nuno Pinheiro and others, "
+"licensed under the <a href=\"https://github.com/KDE/oxygen-"
+"icons/blob/master/COPYING\">LGPLv3</a>.<br><br>Please use <a "
+"href=\"https://bugs.quassel-irc.org\">https://bugs.quassel-irc.org</a> to "
 "report bugs."
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:72
+#: ../src/qtui/aboutdlg.cpp:87
 msgctxt "AboutDlg|"
 msgid "Quassel IRC is mainly developed by:"
 msgstr "Quassel IRC の主要な開発者："
 
-#: ../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 ""
 
-#: ../src/qtui/aboutdlg.cpp:91
+#: ../src/qtui/aboutdlg.cpp:105
 msgctxt "AboutDlg|"
 msgid ""
 "...and anybody else finding and reporting bugs, giving feedback, helping "
 "others and being part of the community!"
 msgstr ""
 
-#: ../src/qtui/aboutdlg.cpp:100
+#: ../src/qtui/aboutdlg.cpp:112
+msgctxt "AboutDlg|"
+msgid "Special thanks goes to:"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:116
+msgctxt "AboutDlg|"
+msgid "for the original Quassel logo - The All-Seeing Eye"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:120
+msgctxt "AboutDlg|"
+msgid "for the Oxygen Quassel logo"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:124
+msgctxt "AboutDlg|"
+msgid "for the amazing Breeze and Oxygen icon themes"
+msgstr ""
+
+#: ../src/qtui/aboutdlg.cpp:128
 msgctxt "AboutDlg|"
 msgid ""
-"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"
-"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd><i>for the original Quassel"
-" icon - The All-Seeing Eye</i><br></dt><dt><img "
-"src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-"
-"icons.org\">The Oxygen Team</a></b></dt><dd><i>for creating all the artwork "
-"you see throughout Quassel</i><br></dd><dt><img src=\":/pics/qt-"
-"logo-32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software "
-"formerly known as Trolltech</a></b></dt><dd><i>for creating Qt and Qtopia, "
-"and for sponsoring development of QuasselTopia with Greenphones and "
-"more</i><br></dd><dt><a href=\"http://www.nokia.com\"><img "
-"src=\":/pics/nokia.png\"></a></b></dt><dd><i>for sponsoring development of "
-"Quassel Mobile with N810s</i></dd>"
+"for creating an awesome framework, and for sponsoring development with "
+"Greenphones, N810s, N950s and more"
 msgstr ""
 
-#: ../src/core/abstractsqlstorage.cpp:140
+#: ../src/core/abstractsqlstorage.cpp:142
 #, qt-format
 msgctxt "AbstractSqlStorage|"
 msgid ""
-"Installed Schema (version %1) is not up to date. Upgrading to version %2..."
+"Installed database schema (version %1) is not up to date. Upgrading to "
+"version %2...  This may take a while for major upgrades."
 msgstr ""
 
-#: ../src/core/abstractsqlstorage.cpp:142
+#: ../src/core/abstractsqlstorage.cpp:149
 msgctxt "AbstractSqlStorage|"
 msgid "Upgrade failed..."
 msgstr "更新に失敗しました..."
 
+#: ../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 ""
@@ -641,28 +751,113 @@ msgid ""
 "command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
 msgstr ""
 
-#: ../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 ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:112
+msgctxt "AliasesModel|"
+msgid "your current nickname"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:113
+msgctxt "AliasesModel|"
+msgid "the name of the selected channel"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:120
+msgctxt "AliasesModel|"
+msgid "Multiple commands can be separated with semicolons"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:124
+msgctxt "AliasesModel|"
+msgid "Example:"
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:124
+msgctxt "AliasesModel|"
+msgid "\"Test $1; Test $2; Test All $0\""
+msgstr ""
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:125
 msgctxt "AliasesModel|"
 msgid ""
-"<b>The string the shortcut will be expanded to</b><br /><b>special "
-"variables:</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - "
-"<b>$i..j</b> represents the i'th to j'th parameter separated by spaces.<br "
-"/> - <b>$i..</b> represents all parameters from i on separated by spaces.<br"
-" /> - <b>$i:hostname</b> represents the hostname of the user identified by "
-"the i'th parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br"
-" /> - <b>$nick</b> your current nickname<br /> - <b>$channel</b> the name of"
-" the selected channel<br /><br />Multiple commands can be separated with "
-"semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will"
-" be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test "
-"All 1 2 3\" when called like /test 1 2 3"
+"...will be expanded to three separate messages \"Test 1\", \"Test 2\" and "
+"\"Test All 1 2 3\" when called like <i>/test 1 2 3</i>"
 msgstr ""
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:185
+#: ../src/qtui/settingspages/aliasesmodel.cpp:246
 msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr "別名"
 
-#: ../src/qtui/settingspages/aliasesmodel.cpp:186
+#: ../src/qtui/settingspages/aliasesmodel.cpp:247
 msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr ""
@@ -682,12 +877,12 @@ msgctxt "AliasesSettingsPage|"
 msgid "Delete"
 msgstr "削除"
 
-#: ../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 "別名"
@@ -699,106 +894,138 @@ msgstr "フォーム"
 
 #: ../src/qtui/settingspages/appearancesettingspage.ui:22
 msgctxt "AppearanceSettingsPage|"
-msgid "Client style:"
-msgstr "クライアントスタイル："
-
-#: ../src/qtui/settingspages/appearancesettingspage.ui:29
-msgctxt "AppearanceSettingsPage|"
-msgid "Set application style"
-msgstr "アップリケージョンスタイルを設定"
-
-#: ../src/qtui/settingspages/appearancesettingspage.ui:36
-msgctxt "AppearanceSettingsPage|"
 msgid "Language:"
 msgstr "言語："
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:43
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29
 msgctxt "AppearanceSettingsPage|"
 msgid "Set the application language. Requires restart!"
 msgstr "アップリケージョン言語を設定（再起動が必要です）。"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+#: ../src/qtui/settingspages/appearancesettingspage.ui:33
 msgctxt "AppearanceSettingsPage|"
 msgid "<Untranslated>"
 msgstr "＜未翻訳＞"
 
-#: ../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 "＜システムデフォルト＞"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:75
+#: ../src/qtui/settingspages/appearancesettingspage.ui:59
 msgctxt "AppearanceSettingsPage|"
-msgid "Use custom stylesheet"
-msgstr "カスタムスタイルシートを使用"
+msgid "Widget style:"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:109
+#: ../src/qtui/settingspages/appearancesettingspage.ui:66
 msgctxt "AppearanceSettingsPage|"
-msgid "Path:"
-msgstr "パス名："
+msgid "Set application style"
+msgstr "アップリケージョンスタイルを設定"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:141
+#: ../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:90
+msgctxt "AppearanceSettingsPage|"
+msgid "Override system theme"
+msgstr ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:110
+msgctxt "AppearanceSettingsPage|"
+msgid "Use custom stylesheet"
+msgstr "カスタムスタイルシートを使用"
+
+#: ../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 "システムトレイアイコンを表示"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:184
+#: ../src/qtui/settingspages/appearancesettingspage.ui:188
 msgctxt "AppearanceSettingsPage|"
-msgid "Hide to tray on close button"
-msgstr "閉じるボタンでトレイに隠す"
+msgid "Invert brightness"
+msgstr ""
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:216
+#: ../src/qtui/settingspages/appearancesettingspage.ui:233
 msgctxt "AppearanceSettingsPage|"
-msgid "Enable animations"
-msgstr "アニメーションを有効にする"
+msgid "Hide to tray on close button"
+msgstr "閉じるボタンでトレイに隠す"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:231
+#: ../src/qtui/settingspages/appearancesettingspage.ui:248
 msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
 msgstr "メッセージのリダイレクト"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:237
+#: ../src/qtui/settingspages/appearancesettingspage.ui:257
 msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr "ユーザの通知："
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:280
+#: ../src/qtui/settingspages/appearancesettingspage.ui:300
 msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
 msgstr "サーバの通知："
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:294
+#: ../src/qtui/settingspages/appearancesettingspage.ui:314
 msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
 msgstr "デフォルトのターゲット"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:301
+#: ../src/qtui/settingspages/appearancesettingspage.ui:321
 msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr "ステータスウィンドウ"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:308
+#: ../src/qtui/settingspages/appearancesettingspage.ui:328
 msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
 msgstr "現在のチャット"
 
-#: ../src/qtui/settingspages/appearancesettingspage.ui:315
+#: ../src/qtui/settingspages/appearancesettingspage.ui:335
 msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr "エラー："
 
-#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:36
 msgctxt "AppearanceSettingsPage|"
 msgid "Interface"
 msgstr "インターフェース"
 
-#: ../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 ""
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:294
 msgctxt "AppearanceSettingsPage|"
 msgid "Please choose a stylesheet file"
 msgstr "スタイルシートのファイルを選択してください"
@@ -865,7 +1092,7 @@ msgstr ""
 #: ../src/qtui/settingspages/backlogsettingspage.ui:138
 msgctxt "BacklogSettingsPage|"
 msgid ""
-"amount of messages per buffer that are requested after the core connection "
+"Amount of messages per buffer that are requested after the core connection "
 "has been established."
 msgstr ""
 
@@ -933,28 +1160,28 @@ msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr ""
 
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:30
 msgctxt "BacklogSettingsPage|"
 msgid "Interface"
 msgstr "インターフェース"
 
-#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:30
 msgctxt "BacklogSettingsPage|"
 msgid "Backlog Fetching"
 msgstr ""
 
-#: ../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 "完全にバッファをマージしますか？"
 
-#: ../src/uisupport/bufferview.cpp:254
+#: ../src/uisupport/bufferview.cpp:268
 #, qt-format
 msgctxt "BufferView|"
 msgid ""
@@ -962,6 +1189,11 @@ msgid ""
 " This cannot be reversed!"
 msgstr ""
 
+#: ../src/uisupport/bufferview.cpp:715
+msgctxt "BufferViewDock|"
+msgid "Search..."
+msgstr ""
+
 #: ../src/qtui/settingspages/buffervieweditdlg.ui:14
 msgctxt "BufferViewEditDlg|"
 msgid "Dialog"
@@ -972,7 +1204,7 @@ msgctxt "BufferViewEditDlg|"
 msgid "Please enter a name for the chat list:"
 msgstr "ネットワーク名を入力してください："
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:582
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:585
 msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr "チャットリストを追加"
@@ -1013,7 +1245,7 @@ msgid "Network:"
 msgstr "ネットワーク："
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:128
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:129
 msgctxt "BufferViewSettingsPage|"
 msgid "All"
 msgstr "すべて"
@@ -1062,30 +1294,35 @@ msgstr "アルファベット順"
 
 #: ../src/qtui/settingspages/bufferviewsettingspage.ui:163
 msgctxt "BufferViewSettingsPage|"
+msgid "Show search"
+msgstr ""
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:170
+msgctxt "BufferViewSettingsPage|"
 msgid "Minimum Activity:"
 msgstr "最小限の活動："
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:171
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:178
 msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
 msgstr "活動なし"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:176
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:183
 msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
 msgstr "他の活動"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:181
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:188
 msgctxt "BufferViewSettingsPage|"
 msgid "New Message"
 msgstr "新しいメッセージ"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:186
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:193
 msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
 msgstr "強調"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.ui:212
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:219
 msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr "プレビュー："
@@ -1100,12 +1337,12 @@ msgctxt "BufferViewSettingsPage|"
 msgid "Custom Chat Lists"
 msgstr "カスタムチャットリスト"
 
-#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:383
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:384
 msgctxt "BufferViewSettingsPage|"
 msgid "Delete Chat List?"
 msgstr "チャットリストを削除してもよろしいですか？"
 
-#: ../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\"?"
@@ -1141,41 +1378,32 @@ msgctxt "BufferWidget|"
 msgid "Go to Marker Line"
 msgstr "しおり："
 
-#: ../src/client/networkmodel.cpp:589 ../src/client/networkmodel.cpp:591
+#: ../src/client/networkmodel.cpp:776
 #, qt-format
 msgctxt "ChannelBufferItem|"
-msgid "<b>Channel %1</b>"
-msgstr "<b>チャンネル %1</b>"
+msgid "Channel %1"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:595
-#, qt-format
+#: ../src/client/networkmodel.cpp:780
 msgctxt "ChannelBufferItem|"
-msgid "<b>Users:</b> %1"
-msgstr "<b>ユーザ：</b> %1"
+msgid "Users"
+msgstr "ユーザ"
 
-#: ../src/client/networkmodel.cpp:599
-#, qt-format
+#: ../src/client/networkmodel.cpp:785
 msgctxt "ChannelBufferItem|"
-msgid "<b>Mode:</b> %1"
-msgstr "<b>モード：</b> %1"
+msgid "Mode"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:614
-#, qt-format
+#: ../src/client/networkmodel.cpp:795
 msgctxt "ChannelBufferItem|"
-msgid "<b>Topic:</b> %1"
-msgstr "<b>トピック：</b> %1"
+msgid "Topic"
+msgstr "トピック"
 
-#: ../src/client/networkmodel.cpp:619
+#: ../src/client/networkmodel.cpp:801
 msgctxt "ChannelBufferItem|"
-msgid "Not active <br /> Double-click to join"
+msgid "Not active, double-click to join"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:622
-#, qt-format
-msgctxt "ChannelBufferItem|"
-msgid "<p> %1 </p>"
-msgstr "<p> %1 </p>"
-
 #: ../src/qtui/ui/channellistdlg.ui:14
 msgctxt "ChannelListDlg|"
 msgid "Channel List"
@@ -1257,7 +1485,7 @@ msgid "Move selected buffers to the right"
 msgstr "選択してるバッファを右に動く"
 
 #: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:273
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:285
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show:"
 msgstr "表示："
@@ -1278,87 +1506,248 @@ msgctxt "ChatMonitorSettingsPage|"
 msgid "Show own messages"
 msgstr "自分のメッセージを表示"
 
-#: ../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 ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:167
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:197
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Show messages from backlog"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:192
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:222
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages from backlog on reconnect"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:195
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:225
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Include read messages"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Interface"
 msgstr "インターフェース"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:36
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Chat Monitor"
 msgstr "チャットモニター"
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt In"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:61
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Opt Out"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:276
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:288
 msgctxt "ChatMonitorSettingsPage|"
 msgid "Ignore:"
 msgstr "無視："
 
-#: ../src/qtui/chatmonitorview.cpp:54
+#: ../src/qtui/chatmonitorview.cpp:57
 msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
 msgstr "自分のメッセージを表示"
 
-#: ../src/qtui/chatmonitorview.cpp:61
+#: ../src/qtui/chatmonitorview.cpp:64
 msgctxt "ChatMonitorView|"
 msgid "Show Network Name"
 msgstr "ネットワーク名を表示"
 
-#: ../src/qtui/chatmonitorview.cpp:66
+#: ../src/qtui/chatmonitorview.cpp:69
 msgctxt "ChatMonitorView|"
 msgid "Show Buffer Name"
 msgstr "バッファ名を表示"
 
-#: ../src/qtui/chatmonitorview.cpp:73
+#: ../src/qtui/chatmonitorview.cpp:76
 msgctxt "ChatMonitorView|"
 msgid "Configure..."
 msgstr "設定..."
 
-#: ../src/qtui/chatscene.cpp:826
+#: ../src/qtui/chatscene.cpp:840
 msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr "セレクションをコピー"
 
-#: ../src/qtui/chatscene.cpp:833
+#: ../src/qtui/chatscene.cpp:847
 #, qt-format
 msgctxt "ChatScene|"
 msgid "Search '%1'"
 msgstr ""
 
-#: ../src/qtui/chatscene.cpp:845
+#: ../src/qtui/chatscene.cpp:859
 msgctxt "ChatScene|"
 msgid "Reset Column Widths"
 msgstr ""
 
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:14
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Form"
+msgstr "フォーム"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:20
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Show colored text in the chat window"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:23
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Allow colored text (mIRC color codes)"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:39
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Custom Colors"
+msgstr "カスタム色"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:60
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Action:"
+msgstr "操作："
+
+#: ../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 "タイムスタンプ："
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:108
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Channel message:"
+msgstr "チャンネルメッセージ："
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:148
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight foreground:"
+msgstr "強調表示の前景色："
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:172
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Command message:"
+msgstr "コマンドメッセージ："
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:196
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Highlight background:"
+msgstr "強調表示の背景色："
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:203
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Server message:"
+msgstr "サーバメッセージ："
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:227
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Marker line:"
+msgstr "しおり："
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:251
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Error message:"
+msgstr "エラーメッセージ："
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:275
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Background:"
+msgstr "背景:"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:332
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Color senders in chat based on nicknames"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:335
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Use Sender Coloring"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.ui:650
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Own messages:"
+msgstr "自分のメッセージ："
+
+#: ../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 "インターフェース"
+
+#: ../src/qtui/settingspages/chatviewcolorsettingspage.cpp:29
+msgctxt "ChatViewColorSettingsPage|"
+msgid "Chat View Colors"
+msgstr ""
+
 #: ../src/qtui/ui/chatviewsearchbar.ui:13
 msgctxt "ChatViewSearchBar|"
 msgid "Form"
@@ -1398,10 +1787,15 @@ msgstr "フォーム"
 
 #: ../src/qtui/settingspages/chatviewsettingspage.ui:22
 msgctxt "ChatViewSettingsPage|"
-msgid "Timestamp format:"
-msgstr "タイムスタンプのフォーマット："
+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"
@@ -1414,67 +1808,83 @@ msgid ""
 "</body></html>"
 msgstr ""
 
-#: ../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 "カスタムチャットウィンドウのフォント："
+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"
+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)"
+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:121
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:142
+msgctxt "ChatViewSettingsPage|"
+msgid "Custom chat window font:"
+msgstr "カスタムチャットウィンドウのフォント："
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:175
 msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Show a website preview window when hovering the mouse over a web address"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:124
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:178
 msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:143
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:197
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when switching chats"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:162
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:216
 msgctxt "ChatViewSettingsPage|"
 msgid "Set marker line automatically when Quassel loses focus"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:180
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:234
 msgctxt "ChatViewSettingsPage|"
-msgid "Web Search Url:"
+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 "
@@ -1484,120 +1894,51 @@ msgid ""
 "style=\" font-weight:600;\">%s</span></p></body></html>"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:193
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:247
 msgctxt "ChatViewSettingsPage|"
 msgid "https://www.google.com/search?q=%s"
 msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:202
-msgctxt "ChatViewSettingsPage|"
-msgid "Custom Colors"
-msgstr "カスタム色"
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:220
-msgctxt "ChatViewSettingsPage|"
-msgid "Action:"
-msgstr "操作："
-
-#: ../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 "タイムスタンプ："
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:268
-msgctxt "ChatViewSettingsPage|"
-msgid "Channel message:"
-msgstr "チャンネルメッセージ："
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:305
-msgctxt "ChatViewSettingsPage|"
-msgid "Highlight foreground:"
-msgstr "強調表示の前景色："
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:329
-msgctxt "ChatViewSettingsPage|"
-msgid "Command message:"
-msgstr "コマンドメッセージ："
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:353
-msgctxt "ChatViewSettingsPage|"
-msgid "Highlight background:"
-msgstr "強調表示の背景色："
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:360
-msgctxt "ChatViewSettingsPage|"
-msgid "Server message:"
-msgstr "サーバメッセージ："
-
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:384
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:29
 msgctxt "ChatViewSettingsPage|"
-msgid "Marker line:"
-msgstr "しおり："
+msgid "Interface"
+msgstr "インターフェース"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:408
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:29
 msgctxt "ChatViewSettingsPage|"
-msgid "Error message:"
-msgstr "エラーメッセージ："
+msgid "Chat View"
+msgstr "チャットビュー"
 
-#: ../src/qtui/settingspages/chatviewsettingspage.ui:432
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:43
 msgctxt "ChatViewSettingsPage|"
-msgid "Background:"
-msgstr "背景:"
+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"
+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 "自分のメッセージ："
+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 "インターフェース"
+msgid "No modes"
+msgstr ""
 
-#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:70
 msgctxt "ChatViewSettingsPage|"
-msgid "Chat View"
-msgstr "チャットビュー"
+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"
+msgid "All modes"
 msgstr ""
 
 #: ../src/common/qt5cliparser.cpp:30
@@ -1605,66 +1946,66 @@ msgctxt "CliParser|"
 msgid "Quassel IRC is a modern, distributed IRC client."
 msgstr ""
 
-#: ../src/client/client.cpp:324
+#: ../src/client/client.cpp:354
 msgctxt "Client|"
 msgid "Identity already exists in client!"
 msgstr ""
 
-#: ../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 "安全な接続を使う"
 
-#: ../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 "%1 に接続中..."
 
-#: ../src/client/clientauthhandler.cpp:103
+#: ../src/client/clientauthhandler.cpp:121
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Looking up %1..."
 msgstr "%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 "%1 に接続しました"
 
-#: ../src/client/clientauthhandler.cpp:114
+#: ../src/client/clientauthhandler.cpp:132
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid "Disconnecting from %1..."
 msgstr "%1 から切断中..."
 
-#: ../src/client/clientauthhandler.cpp:118
+#: ../src/client/clientauthhandler.cpp:136
 msgctxt "ClientAuthHandler|"
 msgid "Disconnected"
 msgstr "切断しました"
 
-#: ../src/client/clientauthhandler.cpp:153
+#: ../src/client/clientauthhandler.cpp:171
 msgctxt "ClientAuthHandler|"
 msgid "Reconnecting in compatibility mode..."
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/client/clientauthhandler.cpp:244
+#: ../src/client/clientauthhandler.cpp:262
 msgctxt "ClientAuthHandler|"
 msgid "Core speaks none of the protocols we support"
 msgstr ""
 
-#: ../src/client/clientauthhandler.cpp:259
+#: ../src/client/clientauthhandler.cpp:277
 #, qt-format
 msgctxt "ClientAuthHandler|"
 msgid ""
@@ -1672,32 +2013,44 @@ msgid ""
 "at least protocol v%1, but the core speaks v%2 only."
 msgstr ""
 
-#: ../src/client/clientauthhandler.cpp:261
+#: ../src/client/clientauthhandler.cpp:279
 msgctxt "ClientAuthHandler|"
 msgid "Incompatible protocol version, connection to core refused"
 msgstr ""
 
-#: ../src/client/clientauthhandler.cpp:283
+#: ../src/client/clientauthhandler.cpp:301
 msgctxt "ClientAuthHandler|"
 msgid "Synchronizing to core..."
 msgstr "コアに接続(&C)..."
 
-#: ../src/client/clientauthhandler.cpp:298
+#: ../src/client/clientauthhandler.cpp:316
 msgctxt "ClientAuthHandler|"
 msgid "The core refused connection from this client"
 msgstr ""
 
-#: ../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 "ログイン中..."
 
-#: ../src/client/clientauthhandler.cpp:367
+#: ../src/client/clientauthhandler.cpp:395
 msgctxt "ClientAuthHandler|"
 msgid "Login canceled"
 msgstr "ログインがキャンセルしました"
 
-#: ../src/client/clientauthhandler.cpp:425
+#: ../src/client/clientauthhandler.cpp:453
 msgctxt "ClientAuthHandler|"
 msgid "Unencrypted connection cancelled"
 msgstr ""
@@ -1713,12 +2066,12 @@ msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr "すべてのチャット"
 
-#: ../src/client/clientuserinputhandler.cpp:98
+#: ../src/client/clientuserinputhandler.cpp:100
 msgctxt "ClientUserInputHandler|"
 msgid "/JOIN expects a channel"
 msgstr ""
 
-#: ../src/client/clientuserinputhandler.cpp:110
+#: ../src/client/clientuserinputhandler.cpp:112
 msgctxt "ClientUserInputHandler|"
 msgid "/QUERY expects at least a nick"
 msgstr ""
@@ -1797,196 +2150,201 @@ msgctxt "ConnectionSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: ../src/qtui/chatitem.cpp:801
+#: ../src/qtui/chatitem.cpp:873
 msgctxt "ContentsChatItem|"
 msgid "Copy Link Address"
 msgstr "リンクアドレスをコピー"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:39
+#: ../src/uisupport/contextmenuactionprovider.cpp:38
 msgctxt "ContextMenuActionProvider|"
 msgid "Connect"
 msgstr "接続"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:40
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
 msgctxt "ContextMenuActionProvider|"
 msgid "Disconnect"
 msgstr "切断"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:42
+#: ../src/uisupport/contextmenuactionprovider.cpp:41
 msgctxt "ContextMenuActionProvider|"
 msgid "Join"
 msgstr "入室"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:43
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
 msgctxt "ContextMenuActionProvider|"
 msgid "Part"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:44
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
 msgctxt "ContextMenuActionProvider|"
 msgid "Delete Chat(s)..."
 msgstr "チャットを削除..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:45
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
 msgctxt "ContextMenuActionProvider|"
 msgid "Go to Chat"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:47
+#: ../src/uisupport/contextmenuactionprovider.cpp:46
 msgctxt "ContextMenuActionProvider|"
 msgid "Joins/Parts/Quits"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:48
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
 msgctxt "ContextMenuActionProvider|"
 msgid "Joins"
 msgstr "入室"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:49
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
 msgctxt "ContextMenuActionProvider|"
 msgid "Parts"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:50
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
 msgctxt "ContextMenuActionProvider|"
 msgid "Quits"
 msgstr "閉じる(&Q)"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:51
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
 msgctxt "ContextMenuActionProvider|"
 msgid "Nick Changes"
 msgstr "ニックの変更"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:52
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
 msgctxt "ContextMenuActionProvider|"
 msgid "Mode Changes"
 msgstr "モードの変更"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:53
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
 msgctxt "ContextMenuActionProvider|"
 msgid "Day Changes"
 msgstr "日付の変更"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:54
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
 msgctxt "ContextMenuActionProvider|"
 msgid "Topic Changes"
 msgstr "トピックの変更"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:55
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
 msgctxt "ContextMenuActionProvider|"
 msgid "Set as Default..."
 msgstr "既定として適当"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:56
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
 msgctxt "ContextMenuActionProvider|"
 msgid "Use Defaults..."
 msgstr "既定を使用..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:58
+#: ../src/uisupport/contextmenuactionprovider.cpp:57
 msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr "チャンネルに入室..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:60
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
 msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
 msgstr "クエリを表示"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:61
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
 msgstr "クエリを表示"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:62
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
 msgctxt "ContextMenuActionProvider|"
 msgid "Whois"
 msgstr "ユーザ情報"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:64
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
 msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr "バージョン"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:65
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
 msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:66
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
 msgctxt "ContextMenuActionProvider|"
 msgid "Ping"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:67
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
 msgctxt "ContextMenuActionProvider|"
 msgid "Client info"
 msgstr "クライアント情報"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:68
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
 msgctxt "ContextMenuActionProvider|"
 msgid "Custom..."
 msgstr "カスタム..."
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:80
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:81
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:82
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Half-Operator Status"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:83
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Half-Operator Status"
 msgstr ""
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:84
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
 msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
 msgstr "発言権を与える"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:85
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
 msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
 msgstr "発言権を奪う"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:86
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr "チャンネルに入室"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:87
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
 msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr "チャンネルに入室"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:88
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
 msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr "追放 (Kick / Ban)"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:90
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Temporarily"
 msgstr "一時的にチャットを隠す"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:91
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
 msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Permanently"
 msgstr "完全にチャットを隠しますか？"
 
-#: ../src/uisupport/contextmenuactionprovider.cpp:92
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
 msgstr "チャンネルリストを表示"
 
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
+msgctxt "ContextMenuActionProvider|"
+msgid "Configure"
+msgstr ""
+
 #: ../src/uisupport/contextmenuactionprovider.cpp:93
 msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
@@ -2022,107 +2380,275 @@ msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr ""
 
-#: ../src/core/core.cpp:191
+#: ../src/core/core.cpp:116
 msgctxt "Core|"
-msgid "Could not initialize any storage backend! Exiting..."
+msgid "Invalid core settings version!"
 msgstr ""
 
-#: ../src/core/core.cpp:192
+#: ../src/core/core.cpp:183
+#, qt-format
+msgctxt "Core|"
+msgid "Cannot configure from environment: %1"
+msgstr ""
+
+#: ../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 ""
 
-#: ../src/core/core.cpp:252
+#: ../src/core/core.cpp:200
+msgctxt "Core|"
+msgid "Cannot write quasselcore configuration; probably a permission problem."
+msgstr ""
+
+#: ../src/core/core.cpp:249
+msgctxt "Core|"
+msgid "Cannot open port for listening!"
+msgstr ""
+
+#: ../src/core/core.cpp:292
+msgctxt "Core|"
+msgid "Cannot restore a state for an unconfigured core!"
+msgstr ""
+
+#: ../src/core/core.cpp:296
 msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
 msgstr ""
 
-#: ../src/core/core.cpp:286
+#: ../src/core/core.cpp:333
 msgctxt "Core|"
 msgid "Core is already configured! Not configuring again..."
 msgstr ""
 
-#: ../src/core/core.cpp:289
+#: ../src/core/core.cpp:336
 msgctxt "Core|"
 msgid "Admin user or password not set."
 msgstr ""
 
-#: ../src/core/core.cpp:292
+#: ../src/core/core.cpp:340
 msgctxt "Core|"
 msgid "Could not setup storage!"
 msgstr ""
 
-#: ../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 "管理ユーザを作成"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/core/core.cpp:465
+#: ../src/core/core.cpp:651
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv6 interface %1:%2: %3"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/core/core.cpp:484
+#: ../src/core/core.cpp:670
 #, qt-format
 msgctxt "Core|"
 msgid "Could not open IPv4 interface %1:%2: %3"
 msgstr ""
 
-#: ../src/core/core.cpp:492
+#: ../src/core/core.cpp:678
 #, qt-format
 msgctxt "Core|"
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr ""
 
-#: ../src/core/core.cpp:501
+#: ../src/core/core.cpp:687
 msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
 msgstr ""
 
-#: ../src/core/core.cpp:541
+#: ../src/core/core.cpp:735
 msgctxt "Core|"
 msgid "Client connected from"
 msgstr "コアから切断しました。"
 
-#: ../src/core/core.cpp:544
+#: ../src/core/core.cpp:738
 msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr ""
 
-#: ../src/core/core.cpp:556
+#: ../src/core/core.cpp:750
 msgctxt "Core|"
 msgid "Non-authed client disconnected:"
 msgstr ""
 
-#: ../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 "内部コア"
 
 #: ../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 "コアアカウントを編集"
@@ -2143,7 +2669,7 @@ msgid "Local Core"
 msgstr "ローカルコア"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:170
 msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr "ホスト名："
@@ -2155,13 +2681,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 "ポート："
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
-#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:229
 msgctxt "CoreAccountEditDlg|"
 msgid "User:"
 msgstr "ユーザ："
@@ -2179,25 +2705,40 @@ msgstr "パスワードを保存"
 
 #: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
 msgctxt "CoreAccountEditDlg|"
-msgid "Use a Proxy"
-msgstr "Proxy を使用"
+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 "Proxy タイプ"
 
-#: ../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/coreaccounteditdlg.ui:311
+msgctxt "CoreAccountEditDlg|"
+msgid "&Manual proxy configuration"
+msgstr ""
 
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:263
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:295
 msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr "コアアカウントを追加"
@@ -2247,22 +2788,28 @@ msgctxt "CoreAccountSettingsPage|"
 msgid "Always connect to"
 msgstr ""
 
-#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:30
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
 msgctxt "CoreAccountSettingsPage|"
 msgid "Remote Cores"
 msgstr "リモートコア"
 
-#: ../src/core/coreauthhandler.cpp:132 ../src/core/coreauthhandler.cpp:144
+#: ../src/core/coreapplication.cpp:46
+msgctxt "CoreApplication|"
+msgid "Could not initialize Quassel!"
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:138 ../src/core/coreauthhandler.cpp:150
+#: ../src/core/coreauthhandler.cpp:225
 msgctxt "CoreAuthHandler|"
 msgid "Client"
 msgstr "クライアント"
 
-#: ../src/core/coreauthhandler.cpp:132
+#: ../src/core/coreauthhandler.cpp:138
 msgctxt "CoreAuthHandler|"
 msgid "too old, rejecting."
 msgstr ""
 
-#: ../src/core/coreauthhandler.cpp:133
+#: ../src/core/coreauthhandler.cpp:139
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid ""
@@ -2271,73 +2818,101 @@ msgid ""
 " client."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/core/coreauthhandler.cpp:162
+#: ../src/core/coreauthhandler.cpp:168
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid "SSL required but non-SSL connection attempt from %1"
 msgstr ""
 
-#: ../src/core/coreauthhandler.cpp: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 ""
 
-#: ../src/core/coreauthhandler.cpp:177
-#, qt-format
+#: ../src/core/coreauthhandler.cpp:225
 msgctxt "CoreAuthHandler|"
-msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
+msgid "attempted to login before the core was configured, rejecting."
 msgstr ""
 
-#: ../src/core/coreauthhandler.cpp:213
+#: ../src/core/coreauthhandler.cpp:226
+msgctxt "CoreAuthHandler|"
+msgid ""
+"<b>Attempted to login before core was configured!</b><br>The core must be "
+"configured before attempting to login."
+msgstr ""
+
+#: ../src/core/coreauthhandler.cpp:238
 #, qt-format
 msgctxt "CoreAuthHandler|"
 msgid "Invalid login attempt from %1 as \"%2\""
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/qtui/coreconfigwizard.cpp:69
+#: ../src/qtui/coreconfigwizard.cpp:43
+msgctxt "CoreConfigWizard|"
+msgid "Description"
+msgstr "詳細"
+
+#: ../src/qtui/coreconfigwizard.cpp:162
 msgctxt "CoreConfigWizard|"
 msgid "Core Configuration Wizard"
 msgstr "コアの設定ウイザード"
 
-#: ../src/qtui/coreconfigwizard.cpp:98
+#: ../src/qtui/coreconfigwizard.cpp:203
 msgctxt "CoreConfigWizard|"
 msgid "Your core has been successfully configured. Logging you in..."
 msgstr "コアの設定に成功しました。ログイン中..."
 
-#: ../src/qtui/coreconfigwizard.cpp:107
+#: ../src/qtui/coreconfigwizard.cpp:212
 #, qt-format
 msgctxt "CoreConfigWizard|"
 msgid ""
@@ -2345,45 +2920,48 @@ msgid ""
 "over."
 msgstr ""
 
-#: ../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 ""
-
 #: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Form"
 msgstr "フォーム"
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:25
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr "ユーザ名："
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:35
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Password:"
 msgstr "パスワード："
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:49
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr "パスワードを再入力："
 
-#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:63
 msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr "パスワードを保存"
 
-#: ../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 ""
 
+#: ../src/qtui/ui/coreconfigwizardauthenticationselectionpage.ui:14
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Form"
+msgstr "フォーム"
+
+#: ../src/qtui/ui/coreconfigwizardauthenticationselectionpage.ui:25
+msgctxt "CoreConfigWizardAuthenticationSelectionPage|"
+msgid "Authentication Backend:"
+msgstr ""
+
 #: ../src/qtui/ui/coreconfigwizardintropage.ui:13
 msgctxt "CoreConfigWizardIntroPage|"
 msgid "Form"
@@ -2394,103 +2972,102 @@ msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:162
+#: ../src/qtui/coreconfigwizard.cpp:258
 msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid "Create Admin User"
 msgstr "管理ユーザを作成"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/qtui/coreconfigwizard.cpp:198
+#: ../src/qtui/coreconfigwizard.cpp:379
 msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
 msgstr "保存バックエンドを選択"
 
-#: ../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."
+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 "接続の設定"
+msgid "Storage Settings"
+msgstr ""
 
-#: ../src/qtui/coreconfigwizard.cpp:342
+#: ../src/qtui/coreconfigwizard.cpp:484
 msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid "Storing Your Settings"
 msgstr "設定を保存"
 
-#: ../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 ""
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:14
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Form"
 msgstr "フォーム"
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:22
 msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr "保存バックエンド："
 
-#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
-msgctxt "CoreConfigWizardStorageSelectionPage|"
-msgid "Description"
-msgstr "詳細"
-
-#: ../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 "フォーム"
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:20
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr ""
 
-#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:36
 msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr "管理ユーザ："
 
-#: ../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 "保存バックエンド："
 
-#: ../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 ""
@@ -2536,33 +3113,38 @@ msgctxt "CoreConnection|"
 msgid "Network is down"
 msgstr "ネットワーク"
 
-#: ../src/client/coreconnection.cpp:265
+#: ../src/client/coreconnection.cpp:274
 msgctxt "CoreConnection|"
 msgid "Disconnected"
 msgstr "切断しました"
 
-#: ../src/client/coreconnection.cpp:300
+#: ../src/client/coreconnection.cpp:309
 msgctxt "CoreConnection|"
 msgid "Disconnected from core."
 msgstr "コアから切断しました。"
 
-#: ../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 ""
 
-#: ../src/client/coreconnection.cpp:440
+#: ../src/client/coreconnection.cpp:448
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronizing to %1..."
 msgstr "%1 に接続中..."
 
-#: ../src/client/coreconnection.cpp:476
+#: ../src/client/coreconnection.cpp:481
 msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr ""
 
-#: ../src/client/coreconnection.cpp:527
+#: ../src/client/coreconnection.cpp:532
 #, qt-format
 msgctxt "CoreConnection|"
 msgid "Synchronized to %1"
@@ -2654,141 +3236,496 @@ msgctxt "CoreConnectionStatusWidget|"
 msgid "Message"
 msgstr "メッセージ"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:67
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
 msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
 msgstr "秒"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:67
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
 msgctxt "CoreConnectionStatusWidget|milliseconds"
 msgid "ms"
 msgstr "秒"
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:68
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67
 #, qt-format
 msgctxt "CoreConnectionStatusWidget|"
 msgid "(Lag: %1 %2)"
 msgstr ""
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:84
+#: ../src/qtui/coreconnectionstatuswidget.cpp:83
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is encrypted with SSL."
 msgstr ""
 
-#: ../src/qtui/coreconnectionstatuswidget.cpp:88
+#: ../src/qtui/coreconnectionstatuswidget.cpp:87
 msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:13
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:14
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Form"
+msgstr "フォーム"
+
+#: ../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 "ニックを強調"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:127
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Case sensitive"
+msgstr "大文字小文字を区別"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:153
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Custom Highlights"
+msgstr "カスタムの強調"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:166
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:269
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Enabled"
+msgstr "有効"
+
+#: ../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 "CS"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:186
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:289
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Sender"
+msgstr ""
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:191
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:294
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Channel"
+msgstr "チャンネル"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:207
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:310
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Add"
+msgstr "追加"
+
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:214
+#: ../src/qtui/settingspages/corehighlightsettingspage.ui:317
+msgctxt "CoreHighlightSettingsPage|"
+msgid "Remove"
+msgstr "削除"
+
+#: ../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 "インターフェース"
+
+#: ../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 "なし"
+
+#: ../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 "強調の規則"
+
+#: ../src/qtui/ui/coreinfodlg.ui:14
 msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr "コアの情報"
 
-#: ../src/qtui/ui/coreinfodlg.ui:21
+#: ../src/qtui/ui/coreinfodlg.ui:22
 msgctxt "CoreInfoDlg|"
 msgid "Version:"
 msgstr "バージョン："
 
-#: ../src/qtui/ui/coreinfodlg.ui:28
+#: ../src/qtui/ui/coreinfodlg.ui:36
 msgctxt "CoreInfoDlg|"
-msgid "<core version>"
-msgstr "＜コアのバージョン＞"
+msgid "Version date:"
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:35
+#: ../src/qtui/ui/coreinfodlg.ui:50
 msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:42
+#: ../src/qtui/ui/coreinfodlg.ui:64
+msgctxt "CoreInfoDlg|"
+msgid "Connected clients:"
+msgstr ""
+
+#: ../src/qtui/ui/coreinfodlg.ui:117 ../src/qtui/coreinfodlg.cpp:193
+msgctxt "CoreInfoDlg|"
+msgid "Your Quassel core is too old to show active sessions"
+msgstr ""
+
+#: ../src/qtui/ui/coreinfodlg.ui:124
 msgctxt "CoreInfoDlg|"
-msgid "Connected Clients:"
-msgstr "＜接続してるクライアント＞"
+msgid "Details..."
+msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:49
+#: ../src/qtui/ui/coreinfodlg.ui:200
 msgctxt "CoreInfoDlg|"
-msgid "<connected clients>"
-msgstr "＜接続してるクライアント＞"
+msgid "Close"
+msgstr "閉じる"
 
-#: ../src/qtui/ui/coreinfodlg.ui:56
+#: ../src/qtui/coreinfodlg.cpp:86 ../src/qtui/coreinfodlg.cpp:87
+#: ../src/qtui/coreinfodlg.cpp:160
 msgctxt "CoreInfoDlg|"
-msgid "<core uptime>"
+msgid "Unknown"
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:63
+#: ../src/qtui/coreinfodlg.cpp:90
 msgctxt "CoreInfoDlg|"
-msgid "Build date:"
+msgid "Disconnected from core"
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:70
+#: ../src/qtui/coreinfodlg.cpp:91 ../src/qtui/coreinfodlg.cpp:157
 msgctxt "CoreInfoDlg|"
-msgid "<build date>"
+msgid "Not available"
 msgstr ""
 
-#: ../src/qtui/ui/coreinfodlg.ui:81
+#: ../src/qtui/coreinfodlg.cpp:99
 msgctxt "CoreInfoDlg|"
-msgid "Close"
-msgstr "閉じる"
+msgid "Unknown date"
+msgstr ""
 
-#: ../src/qtui/coreinfodlg.cpp:57
+#: ../src/qtui/coreinfodlg.cpp:173
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid "%n Day(s)"
 msgid_plural "%n Day(s)"
 msgstr[0] ""
 
-#: ../src/qtui/coreinfodlg.cpp:58
+#: ../src/qtui/coreinfodlg.cpp:174
 #, qt-format
 msgctxt "CoreInfoDlg|"
 msgid " %1:%2:%3 (since %4)"
 msgstr " %1:%2:%3 （%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 ""
 
-#: ../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 ""
 
-#: ../src/core/corenetwork.cpp:233
+#: ../src/core/corenetwork.cpp:316
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Disconnecting. (%1)"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:233
+#: ../src/core/corenetwork.cpp:316
 msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:441
+#: ../src/core/corenetwork.cpp:539
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"
 msgstr ""
 
-#: ../src/core/corenetwork.cpp:443
+#: ../src/core/corenetwork.cpp:541
 #, qt-format
 msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
 msgstr "接続に失敗しました：%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 "クライアント"
 
-#: ../src/core/coresession.cpp:233
+#: ../src/core/coresession.cpp:298
 #, qt-format
 msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."
 msgstr ""
 
-#: ../src/core/coresession.cpp:481
+#: ../src/core/coresession.cpp:623
 #, qt-format
 msgctxt "CoreSession|"
 msgid ""
@@ -2796,121 +3733,186 @@ msgid ""
 " create network %1!"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/core/coresessioneventprocessor.cpp:450
+#: ../src/core/coresessioneventprocessor.cpp:800
 msgctxt "CoreSessionEventProcessor|"
 msgid "Unable to perform key exchange, missing qca-ossl plugin."
 msgstr ""
 
-#: ../src/core/coresessioneventprocessor.cpp:461
+#: ../src/core/coresessioneventprocessor.cpp:811
 msgctxt "CoreSessionEventProcessor|"
 msgid "Unable to parse the DH1080_INIT. Key exchange failed."
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/core/coresessioneventprocessor.cpp:475
+#: ../src/core/coresessioneventprocessor.cpp:825
 msgctxt "CoreSessionEventProcessor|"
 msgid "Failed to parse DH1080_FINISH. Key exchange failed."
 msgstr ""
 
-#: ../src/core/coresessioneventprocessor.cpp:1052
+#: ../src/core/coresessioneventprocessor.cpp:1587
 msgctxt "CoreSessionEventProcessor|"
 msgid "Reverse DCC SEND not supported"
 msgstr ""
 
-#: ../src/core/coresessioneventprocessor.cpp:1070
+#: ../src/core/coresessioneventprocessor.cpp:1605
 #, qt-format
 msgctxt "CoreSessionEventProcessor|"
 msgid "DCC %1 not supported"
 msgstr ""
 
-#: ../src/core/coretransfer.cpp:58
+#: ../src/qtui/ui/coresessionwidget.ui:29
+msgctxt "CoreSessionWidget|"
+msgid "12.34.56.78"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:37
+msgctxt "CoreSessionWidget|"
+msgid "Client:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:51
+msgctxt "CoreSessionWidget|"
+msgid "Version date:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:65
+msgctxt "CoreSessionWidget|"
+msgid "Location:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:79
+msgctxt "CoreSessionWidget|"
+msgid "Connected since:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:93
+msgctxt "CoreSessionWidget|"
+msgid "Secure:"
+msgstr ""
+
+#: ../src/qtui/ui/coresessionwidget.ui:124
+msgctxt "CoreSessionWidget|"
+msgid "End Session"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:41
+msgctxt "CoreSessionWidget|"
+msgid "Unknown date"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:53
+msgctxt "CoreSessionWidget|"
+msgid "Yes"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:53
+msgctxt "CoreSessionWidget|"
+msgid "No"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:59 ../src/qtui/coresessionwidget.cpp:72
+msgctxt "CoreSessionWidget|"
+msgid "End the client's session, disconnecting it"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:73
+msgctxt "CoreSessionWidget|"
+msgid "This client does not support being remotely disconnected"
+msgstr ""
+
+#: ../src/qtui/coresessionwidget.cpp:86
+msgctxt "CoreSessionWidget|"
+msgid "Ending session..."
+msgstr ""
+
+#: ../src/core/coretransfer.cpp:64
 msgctxt "CoreTransfer|"
 msgid "Socket closed while still transferring!"
 msgstr ""
 
-#: ../src/core/coretransfer.cpp:70
+#: ../src/core/coretransfer.cpp:76
 #, qt-format
 msgctxt "CoreTransfer|"
 msgid "DCC connection error: %1"
 msgstr ""
 
-#: ../src/core/coretransfer.cpp:114
+#: ../src/core/coretransfer.cpp:120
 msgctxt "CoreTransfer|"
 msgid "Reverse DCC not supported yet!"
 msgstr ""
 
-#: ../src/core/coretransfer.cpp:160
+#: ../src/core/coretransfer.cpp:167
 msgctxt "CoreTransfer|"
 msgid "DCC Receive: Got more data than expected!"
 msgstr ""
 
-#: ../src/core/coretransfer.cpp:176
+#: ../src/core/coretransfer.cpp:183
 msgctxt "CoreTransfer|"
 msgid "DCC Receive: Quassel Client disconnected during transfer!"
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:88
+#: ../src/core/coreuserinputhandler.cpp:104
 msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr "退席中"
 
-#: ../src/core/coreuserinputhandler.cpp:169
+#: ../src/core/coreuserinputhandler.cpp:185
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/core/coreuserinputhandler.cpp:212
+#: ../src/core/coreuserinputhandler.cpp:229
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been deleted."
 msgstr ""
 
-#: ../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 "
@@ -2919,31 +3921,31 @@ msgid ""
 "with QCA2 present."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/core/coreuserinputhandler.cpp:387
+#: ../src/core/coreuserinputhandler.cpp:404
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Failed to initiate key exchange with %1."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:392
+#: ../src/core/coreuserinputhandler.cpp:409
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "Initiated key exchange with %1."
 msgstr ""
 
-#: ../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 "
@@ -2952,13 +3954,18 @@ msgid ""
 "with QCA present."
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 "
@@ -2966,20 +3973,20 @@ msgid ""
 "it."
 msgstr ""
 
-#: ../src/core/coreuserinputhandler.cpp:641
+#: ../src/core/coreuserinputhandler.cpp:703
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 has been set."
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/core/coreuserinputhandler.cpp:682
+#: ../src/core/coreuserinputhandler.cpp:744
 #, qt-format
 msgctxt "CoreUserInputHandler|"
 msgid "The key for %1 is %2:%3"
@@ -2995,25 +4002,127 @@ msgctxt "CreateIdentityDlg|"
 msgid "Identity name:"
 msgstr "個人情報名："
 
-#: ../src/qtui/settingspages/createidentitydlg.ui:37
-msgctxt "CreateIdentityDlg|"
-msgid "Create blank identity"
-msgstr "新規の個人情報を作成"
+#: ../src/qtui/settingspages/createidentitydlg.ui:37
+msgctxt "CreateIdentityDlg|"
+msgid "Create blank identity"
+msgstr "新規の個人情報を作成"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:49
+msgctxt "CreateIdentityDlg|"
+msgid "Duplicate:"
+msgstr "個人情報を複製："
+
+#: ../src/common/protocols/datastream/datastreampeer.cpp:117
+msgctxt "DataStreamPeer|"
+msgid "Invalid handshake message!"
+msgstr ""
+
+#: ../src/common/protocols/datastream/datastreampeer.cpp:173
+#, qt-format
+msgctxt "DataStreamPeer|"
+msgid "Unknown protocol message of type %1"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:14
+msgctxt "DccSettingsPage|"
+msgid "Form"
+msgstr "フォーム"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:20
+msgctxt "DccSettingsPage|"
+msgid "Enable DCC"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:37
+msgctxt "DccSettingsPage|"
+msgid "Ports:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:51
+#: ../src/qtui/settingspages/dccsettingspage.ui:134
+msgctxt "DccSettingsPage|"
+msgid "Automatic"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:56
+#: ../src/qtui/settingspages/dccsettingspage.ui:139
+msgctxt "DccSettingsPage|"
+msgid "Manual"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:82
+msgctxt "DccSettingsPage|"
+msgid "to"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:110
+msgctxt "DccSettingsPage|"
+msgid "Outgoing IP:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:164
+msgctxt "DccSettingsPage|"
+msgid "DCC send timeout:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:171
+msgctxt "DccSettingsPage|"
+msgid " seconds"
+msgstr " 秒"
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:213
+msgctxt "DccSettingsPage|"
+msgid "Chunk size:"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:220
+msgctxt "DccSettingsPage|"
+msgid " KiB"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:263
+msgctxt "DccSettingsPage|"
+msgid "Use passive/reverse DCC"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:276
+msgctxt "DccSettingsPage|"
+msgid "Use fast sending (might not work with all peers)"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:295
+msgctxt "DccSettingsPage|"
+msgid "File transfers"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.ui:303
+msgctxt "DccSettingsPage|"
+msgid "Default download folder:"
+msgstr ""
 
-#: ../src/qtui/settingspages/createidentitydlg.ui:49
-msgctxt "CreateIdentityDlg|"
-msgid "Duplicate:"
-msgstr "個人情報を複製："
+#: ../src/qtui/settingspages/dccsettingspage.ui:313
+msgctxt "DccSettingsPage|"
+msgid "..."
+msgstr "..."
 
-#: ../src/common/protocols/datastream/datastreampeer.cpp:114
-msgctxt "DataStreamPeer|"
-msgid "Invalid handshake message!"
+#: ../src/qtui/settingspages/dccsettingspage.ui:322
+msgctxt "DccSettingsPage|"
+msgid "Create folder per sender"
 msgstr ""
 
-#: ../src/common/protocols/datastream/datastreampeer.cpp:161
-#, qt-format
-msgctxt "DataStreamPeer|"
-msgid "Unknown protocol message of type %1"
+#: ../src/qtui/settingspages/dccsettingspage.ui:329
+msgctxt "DccSettingsPage|"
+msgid "Prefix filenames with sender"
+msgstr ""
+
+#: ../src/qtui/settingspages/dccsettingspage.cpp:27
+msgctxt "DccSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/settingspages/dccsettingspage.cpp:27
+msgctxt "DccSettingsPage|"
+msgid "DCC"
 msgstr ""
 
 #: ../src/qtui/ui/debugbufferviewoverlay.ui:13
@@ -3111,230 +4220,240 @@ msgctxt "DockManagerNotificationBackend::ConfigWidget|"
 msgid "Mark dockmanager entry"
 msgstr ""
 
-#: ../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 "ユーザ情報"
 
-#: ../src/core/eventstringifier.cpp:239
+#: ../src/core/eventstringifier.cpp:253
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 invited you to channel %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:341
+#: ../src/core/eventstringifier.cpp:408
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has changed topic for %2 to: \"%3\""
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:347
+#: ../src/core/eventstringifier.cpp:419
+msgctxt "EventStringifier|"
+msgid "Error from server: "
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:424
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Operwall] %1: %2"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/core/eventstringifier.cpp:384
+#: ../src/core/eventstringifier.cpp:471
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 is away: \"%2\""
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:391
+#: ../src/core/eventstringifier.cpp:478
 msgctxt "EventStringifier|"
 msgid "You are no longer marked as being away"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:399
+#: ../src/core/eventstringifier.cpp:486
 msgctxt "EventStringifier|"
 msgid "You have been marked as being away"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:421
+#: ../src/core/eventstringifier.cpp:508
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is %2 (%3)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:437
+#: ../src/core/eventstringifier.cpp:524
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is online via %2 (%3)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:439
+#: ../src/core/eventstringifier.cpp:526
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was online via %2 (%3)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:449
+#: ../src/core/eventstringifier.cpp:536
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was %2@%3 (%4)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:458
+#: ../src/core/eventstringifier.cpp:545
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] End of /WHO list for %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:470
+#: ../src/core/eventstringifier.cpp:566
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is logged in since %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:474
+#: ../src/core/eventstringifier.cpp:570
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is idling for %2 (since %3)"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:484
+#: ../src/core/eventstringifier.cpp:580
 msgctxt "EventStringifier|"
 msgid "[Whois] End of /WHOIS list"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:507
+#: ../src/core/eventstringifier.cpp:603
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is a user on channels: %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:509
+#: ../src/core/eventstringifier.cpp:605
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 has voice on channels: %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:511
+#: ../src/core/eventstringifier.cpp:607
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is an operator on channels: %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:532
+#: ../src/core/eventstringifier.cpp:631
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 has %2 users. Topic is: \"%3\""
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:540
+#: ../src/core/eventstringifier.cpp:639
 msgctxt "EventStringifier|"
 msgid "End of channel list"
 msgstr "チャンネルリストを表示"
 
-#: ../src/core/eventstringifier.cpp:558
+#: ../src/core/eventstringifier.cpp:657
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Homepage for %1 is %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:575
+#: ../src/core/eventstringifier.cpp:683
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Channel %1 created on %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:589
+#: ../src/core/eventstringifier.cpp:697
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whois] %1 is authed as %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:592
+#: ../src/core/eventstringifier.cpp:700
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Whowas] %1 was authed as %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:601
+#: ../src/core/eventstringifier.cpp:709
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "No topic is set for %1."
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:609
+#: ../src/core/eventstringifier.cpp:717
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic for %1 is \"%2\""
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:621
+#: ../src/core/eventstringifier.cpp:738
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Topic set by %1 on %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:634
+#: ../src/core/eventstringifier.cpp:751
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "%1 has been invited to %2"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:642
+#: ../src/core/eventstringifier.cpp:759
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "[Who] %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/core/eventstringifier.cpp:659
+#: ../src/core/eventstringifier.cpp:786
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick %1 contains illegal characters"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:669
+#: ../src/core/eventstringifier.cpp:796
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick already in use: %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:679
+#: ../src/core/eventstringifier.cpp:806
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Nick/channel is temporarily unavailable: %1"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:702
+#: ../src/core/eventstringifier.cpp:830
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "sending CTCP-%1 request to %2"
 msgstr ""
 
-#. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
-#: ../src/core/eventstringifier.cpp:717
+#: ../src/core/eventstringifier.cpp:846
 msgctxt "EventStringifier|"
 msgid "unknown"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:718
+#: ../src/core/eventstringifier.cpp:847
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received %1CTCP-%2 request by %3"
 msgstr ""
 
-#: ../src/core/eventstringifier.cpp:721
+#: ../src/core/eventstringifier.cpp:850
 #, qt-format
 msgctxt "EventStringifier|"
 msgid "Received CTCP-%1 answer from %2: %3"
 msgstr ""
 
-#: ../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"
@@ -3392,26 +4511,25 @@ msgid "Custom Highlights"
 msgstr "カスタムの強調"
 
 #: ../src/qtui/settingspages/highlightsettingspage.ui:33
-#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+msgctxt "HighlightSettingsPage|"
+msgid "Enabled"
+msgstr "有効"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:38
 msgctxt "HighlightSettingsPage|"
 msgid "Highlight"
 msgstr "強調"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:38
+#: ../src/qtui/settingspages/highlightsettingspage.ui:43
 msgctxt "HighlightSettingsPage|"
 msgid "RegEx"
 msgstr "RegEx"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:43
+#: ../src/qtui/settingspages/highlightsettingspage.ui:48
 msgctxt "HighlightSettingsPage|"
 msgid "CS"
 msgstr "CS"
 
-#: ../src/qtui/settingspages/highlightsettingspage.ui:48
-msgctxt "HighlightSettingsPage|"
-msgid "Enable"
-msgstr "有効"
-
 #: ../src/qtui/settingspages/highlightsettingspage.ui:53
 msgctxt "HighlightSettingsPage|"
 msgid "Channel"
@@ -3452,21 +4570,155 @@ msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr "大文字小文字を区別"
 
-#: ../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 "インターフェース"
 
-#: ../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 ""
 
+#: ../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 "強調の規則"
 
+#: ../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|"
@@ -3590,7 +4842,7 @@ msgstr ""
 
 #: ../src/common/identity.cpp:194 ../src/common/identity.cpp:195
 msgctxt "Identity|"
-msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
+msgid "https://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:30
@@ -3722,7 +4974,7 @@ msgid "minutes of being idle"
 msgstr ""
 
 #: ../src/qtui/settingspages/identityeditwidget.ui:399
-#: ../src/qtui/settingspages/identityeditwidget.cpp:244
+#: ../src/qtui/settingspages/identityeditwidget.cpp:290
 msgctxt "IdentityEditWidget|"
 msgid "Advanced"
 msgstr "詳細"
@@ -3788,16 +5040,15 @@ msgid "Key Type:"
 msgstr "Proxy タイプ"
 
 #: ../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 ""
 
 #: ../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 "ロード"
@@ -3814,8 +5065,8 @@ msgstr ""
 
 #: ../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 ""
@@ -3825,40 +5076,117 @@ msgctxt "IdentityEditWidget|"
 msgid "CommonName:"
 msgstr "ホスト名："
 
-#: ../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 ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:113
+msgctxt "IdentityEditWidget|"
+msgid "the minutes"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:114
+msgctxt "IdentityEditWidget|"
+msgid "seconds"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:115
+msgctxt "IdentityEditWidget|"
+msgid "AM/PM"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:116
+msgctxt "IdentityEditWidget|"
+msgid "day"
+msgstr "日"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:117
+msgctxt "IdentityEditWidget|"
+msgid "month"
+msgstr ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:121
+msgctxt "IdentityEditWidget|"
+msgid "current timezone"
+msgstr ""
+
+#: ../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 ""
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:355
+#: ../src/qtui/settingspages/identityeditwidget.cpp:410
 msgctxt "IdentityEditWidget|"
 msgid "Failed to read key"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
+
+#: ../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 ""
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:444
+#: ../src/qtui/settingspages/identityeditwidget.cpp:499
 msgctxt "IdentityEditWidget|"
 msgid "Clear"
 msgstr "クリア"
 
-#: ../src/qtui/settingspages/identityeditwidget.cpp:390
+#: ../src/qtui/settingspages/identityeditwidget.cpp:456
 msgctxt "IdentityEditWidget|"
 msgid "Load a Certificate"
 msgstr ""
@@ -4012,12 +5340,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>"
+"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"
@@ -4026,7 +5361,7 @@ msgid ""
 "For dynamic rules, disabling actually shows the filtered messages again.</p>"
 msgstr ""
 
-#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:227
 msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr ""
@@ -4061,17 +5396,17 @@ msgctxt "IgnoreListModel|"
 msgid "By Message"
 msgstr "メッセージ"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:208
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:211
 msgctxt "IgnoreListModel|"
 msgid "Enabled"
 msgstr "有効"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:209
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:212
 msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr "タイプ"
 
-#: ../src/qtui/settingspages/ignorelistmodel.cpp:210
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:213
 msgctxt "IgnoreListModel|"
 msgid "Ignore Rule"
 msgstr "無視する"
@@ -4096,22 +5431,22 @@ msgctxt "IgnoreListSettingsPage|"
 msgid "&Edit"
 msgstr "編集(&E)"
 
-#: ../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 "無視リストを表示"
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:147
 msgctxt "IgnoreListSettingsPage|"
 msgid "Rule already exists"
 msgstr ""
 
-#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:148
 #, qt-format
 msgctxt "IgnoreListSettingsPage|"
 msgid ""
@@ -4142,96 +5477,141 @@ msgctxt "InputWidget|"
 msgid "Form"
 msgstr "フォーム"
 
-#: ../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 ""
+
+#: ../src/qtui/ui/inputwidget.ui:293
+msgctxt "InputWidget|"
+msgid "Set background color"
+msgstr ""
+
+#: ../src/qtui/ui/inputwidget.ui:327
+msgctxt "InputWidget|"
+msgid "Clear formatting"
+msgstr ""
+
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "White"
 msgstr "白色"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Black"
 msgstr "黒色"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr "濃青色"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr "濃緑色"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Red"
 msgstr "赤色"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr "暗紅色"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr "暗紫色"
 
-#: ../src/qtui/inputwidget.cpp:75
+#: ../src/qtui/inputwidget.cpp:77
 msgctxt "InputWidget|"
 msgid "Orange"
 msgstr "オレンジ色"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr "黄色"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Green"
 msgstr "緑色"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr "暗紫色"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr ""
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Blue"
 msgstr "青色"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr "紫色"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr "濃緑色"
 
-#: ../src/qtui/inputwidget.cpp:76
+#: ../src/qtui/inputwidget.cpp:78
 msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr ""
 
-#: ../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 "クリア"
 
-#: ../src/qtui/inputwidget.cpp:137
+#: ../src/qtui/inputwidget.cpp:149
 msgctxt "InputWidget|"
 msgid "Focus Input Line"
 msgstr ""
 
+#: ../src/qtui/inputwidget.cpp:636
+msgctxt "InputWidget|"
+msgid "Hide formatting options"
+msgstr ""
+
+#: ../src/qtui/inputwidget.cpp:639
+msgctxt "InputWidget|"
+msgid "Show formatting options"
+msgstr ""
+
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
 msgctxt "InputWidgetSettingsPage|"
 msgid "Form"
@@ -4244,80 +5624,75 @@ msgstr "カスタムフォント："
 
 #: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
 msgctxt "InputWidgetSettingsPage|"
-msgid "Enable spell check"
-msgstr ""
-
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
-msgctxt "InputWidgetSettingsPage|"
 msgid "Enable per chat history"
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:66
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
 msgstr "ニックセレクタを表示"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:82
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
 msgstr "システムトレイアイコンを表示"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:98
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enables (limited) Emacs key bindings in the input field."
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:101
 msgctxt "InputWidgetSettingsPage|"
 msgid "Emacs key bindings"
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enables line wrapping for input."
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:117
 msgctxt "InputWidgetSettingsPage|"
 msgid "Line wrapping"
 msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:143
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:130
 msgctxt "InputWidgetSettingsPage|"
-msgid "Multi-Line Editing"
-msgstr "複数行の編集"
+msgid "&Multi-Line Editing"
+msgstr ""
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:160
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:147
 msgctxt "InputWidgetSettingsPage|"
 msgid "Show at most"
 msgstr "チャットモニタを表示"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:186
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:173
 msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
 msgstr "行"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:208
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:195
 msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
 msgstr "スクロールバーを有効"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:227
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:214
 msgctxt "InputWidgetSettingsPage|"
 msgid "Tab Completion"
 msgstr "セレクションをコピー"
 
-#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:222
 msgctxt "InputWidgetSettingsPage|"
 msgid "Completion suffix:"
 msgstr ""
 
-#: ../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 ""
@@ -4332,7 +5707,7 @@ msgctxt "InputWidgetSettingsPage|"
 msgid "Input Widget"
 msgstr "トピックウィジェット"
 
-#: ../src/common/internalpeer.cpp:58
+#: ../src/common/internalpeer.cpp:52 ../src/common/internalpeer.cpp:58
 msgctxt "InternalPeer|"
 msgid "internal connection"
 msgstr ""
@@ -4357,56 +5732,96 @@ msgctxt "IrcListModel|"
 msgid "Topic"
 msgstr "トピック"
 
-#: ../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)"
+msgid "Unknown"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:980
+#: ../src/client/networkmodel.cpp:1197
 msgctxt "IrcUserItem|"
-msgid "Away&nbsp;Message"
+msgid "Away message"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:982
+#: ../src/client/networkmodel.cpp:1199
 msgctxt "IrcUserItem|"
 msgid "Realname"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:983 ../src/client/networkmodel.cpp:987
+#: ../src/client/networkmodel.cpp:1206
 msgctxt "IrcUserItem|"
-msgid "Operator"
+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:984
+#: ../src/client/networkmodel.cpp:1226 ../src/client/networkmodel.cpp:1235
 msgctxt "IrcUserItem|"
-msgid "Suser&nbsp;Host"
+msgid "Account"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:985
+#: ../src/client/networkmodel.cpp:1236
 msgctxt "IrcUserItem|"
-msgid "Whois&nbsp;Service&nbsp;Reply"
+msgid "Identified for this nick"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:986
+#: ../src/client/networkmodel.cpp:1242
+msgctxt "IrcUserItem|"
+msgid "Service Reply"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1246
 msgctxt "IrcUserItem|"
 msgid "Hostmask"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:993
+#: ../src/client/networkmodel.cpp:1250
+msgctxt "IrcUserItem|"
+msgid "Operator"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:1258
 msgctxt "IrcUserItem|"
-msgid "Idling&nbsp;since"
+msgid "Idling since"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:997
+#: ../src/client/networkmodel.cpp:1262
 msgctxt "IrcUserItem|"
-msgid "Login&nbsp;time"
+msgid "Login time"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1000
+#: ../src/client/networkmodel.cpp:1265
 msgctxt "IrcUserItem|"
 msgid "Server"
 msgstr ""
 
+#: ../src/client/networkmodel.cpp:1270
+msgctxt "IrcUserItem|"
+msgid "No information available"
+msgstr ""
+
 #: ../src/qtui/settingspages/itemviewsettingspage.ui:14
 msgctxt "ItemViewSettingsPage|"
 msgid "Form"
@@ -4442,53 +5857,53 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Use Custom Colors"
 msgstr "カスタム色を使う"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:121
 msgctxt "ItemViewSettingsPage|"
 msgid "Standard:"
 msgstr ""
 
-#: ../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 "非アクティブ："
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:169
 msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
 msgstr "未読メッセージ："
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:193
 msgctxt "ItemViewSettingsPage|"
 msgid "Highlight:"
 msgstr "強調："
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:217
 msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
 msgstr "他の活動"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:318
 msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 msgstr "カスタム色"
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:333
 msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
 msgstr "オンライン："
 
-#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:373
 msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr "退席中："
@@ -4533,7 +5948,7 @@ msgctxt "ItemViewSettingsPage|"
 msgid "Other activity"
 msgstr "他の活動"
 
-#: ../src/qtui/knotificationbackend.cpp:139
+#: ../src/qtui/knotificationbackend.cpp:137
 #, qt-format
 msgctxt "KNotificationBackend|"
 msgid "%n pending highlight(s)"
@@ -4619,417 +6034,572 @@ msgctxt "KeySequenceWidget|"
 msgid "Reassign"
 msgstr ""
 
-#: ../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 ""
+
+#: ../src/core/ldapauthenticator.cpp:92
+msgctxt "LdapAuthenticator|"
+msgid "Port"
+msgstr ""
+
+#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/qtui/mainpage.cpp:40
+#: ../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 "Logger|"
+msgid "Cannot write to stderr: %1"
+msgstr ""
+
+#: ../src/qtui/mainpage.cpp:42
 msgctxt "MainPage|"
 msgid "Connect to Core..."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:360
+#: ../src/qtui/mainwin.cpp:401
 msgctxt "MainWin|"
 msgid "General"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:362
+#: ../src/qtui/mainwin.cpp:403
 msgctxt "MainWin|"
 msgid "&Connect to Core..."
 msgstr "コアに接続(&C)..."
 
-#: ../src/qtui/mainwin.cpp:364
+#: ../src/qtui/mainwin.cpp:405
 msgctxt "MainWin|"
 msgid "&Disconnect from Core"
 msgstr "コアに切断(&D)..."
 
-#: ../src/qtui/mainwin.cpp:366
+#: ../src/qtui/mainwin.cpp:407
 msgctxt "MainWin|"
 msgid "Change &Password..."
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:368
+#: ../src/qtui/mainwin.cpp:409
 msgctxt "MainWin|"
 msgid "Core &Info..."
 msgstr "コア情報(&I)..."
 
-#: ../src/qtui/mainwin.cpp:370
+#: ../src/qtui/mainwin.cpp:411
 msgctxt "MainWin|"
 msgid "Configure &Networks..."
 msgstr "ネットワークを設定(&N)..."
 
-#: ../src/qtui/mainwin.cpp:373
+#: ../src/qtui/mainwin.cpp:418
 msgctxt "MainWin|"
 msgid "&Quit"
 msgstr "閉じる(&Q)"
 
-#: ../src/qtui/mainwin.cpp:377
+#: ../src/qtui/mainwin.cpp:422
 msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
 msgstr "チャットリストを設定(&C)..."
 
-#: ../src/qtui/mainwin.cpp:380
+#: ../src/qtui/mainwin.cpp:425
 msgctxt "MainWin|"
 msgid "&Lock Layout"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:384
+#: ../src/qtui/mainwin.cpp:429
 msgctxt "MainWin|"
 msgid "Show &Search Bar"
 msgstr "検索バーを表示(&S)"
 
-#: ../src/qtui/mainwin.cpp:386
+#: ../src/qtui/mainwin.cpp:431
 msgctxt "MainWin|"
 msgid "Show Away Log"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:388
+#: ../src/qtui/mainwin.cpp:433
 msgctxt "MainWin|"
 msgid "Show &Menubar"
 msgstr "メニューバーを表示(&M)"
 
-#: ../src/qtui/mainwin.cpp:391
+#: ../src/qtui/mainwin.cpp:436
 msgctxt "MainWin|"
 msgid "Show Status &Bar"
 msgstr "ステータスバーを表示(&B)"
 
-#: ../src/qtui/mainwin.cpp:397
+#: ../src/qtui/mainwin.cpp:442
 msgctxt "MainWin|"
 msgid "&Full Screen Mode"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:404
+#: ../src/qtui/mainwin.cpp:449
 msgctxt "MainWin|"
 msgid "Configure &Shortcuts..."
 msgstr "ネットワークを設定(&N)..."
 
-#: ../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 "Quassel を設定(&C)..."
 
-#: ../src/qtui/mainwin.cpp:420
+#: ../src/qtui/mainwin.cpp:465
 msgctxt "MainWin|"
 msgid "&About Quassel"
 msgstr "Quassel について(&A)"
 
-#: ../src/qtui/mainwin.cpp:425
+#: ../src/qtui/mainwin.cpp:470
 msgctxt "MainWin|"
 msgid "About &Qt"
 msgstr "Qt について(&Q)"
 
-#: ../src/qtui/mainwin.cpp:429
+#: ../src/qtui/mainwin.cpp:474
 msgctxt "MainWin|"
 msgid "Debug &NetworkModel"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:431
+#: ../src/qtui/mainwin.cpp:476
 msgctxt "MainWin|"
 msgid "Debug &BufferViewOverlay"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:433
+#: ../src/qtui/mainwin.cpp:478
 msgctxt "MainWin|"
 msgid "Debug &MessageModel"
 msgstr "新しいメッセージ"
 
-#: ../src/qtui/mainwin.cpp:435
+#: ../src/qtui/mainwin.cpp:480
 msgctxt "MainWin|"
 msgid "Debug &HotList"
 msgstr "デバグログ(&L)"
 
-#: ../src/qtui/mainwin.cpp:437
+#: ../src/qtui/mainwin.cpp:482
 msgctxt "MainWin|"
 msgid "Debug &Log"
 msgstr "デバグログ(&L)"
 
-#: ../src/qtui/mainwin.cpp:439
+#: ../src/qtui/mainwin.cpp:484
 msgctxt "MainWin|"
 msgid "Reload Stylesheet"
 msgstr "スタイルシートを再読み込む"
 
-#: ../src/qtui/mainwin.cpp:442
+#: ../src/qtui/mainwin.cpp:487
 msgctxt "MainWin|"
 msgid "Hide Current Buffer"
 msgstr ""
 
-#: ../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 ""
+
+#: ../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 "通知"
 
-#: ../src/qtui/mainwin.cpp:448
+#: ../src/qtui/mainwin.cpp:525
 msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/qtui/mainwin.cpp:462
+#: ../src/qtui/mainwin.cpp:542
 msgctxt "MainWin|"
 msgid "Set Quick Access #1"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:464
+#: ../src/qtui/mainwin.cpp:544
 msgctxt "MainWin|"
 msgid "Set Quick Access #2"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:466
+#: ../src/qtui/mainwin.cpp:546
 msgctxt "MainWin|"
 msgid "Set Quick Access #3"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:468
+#: ../src/qtui/mainwin.cpp:548
 msgctxt "MainWin|"
 msgid "Set Quick Access #4"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:470
+#: ../src/qtui/mainwin.cpp:550
 msgctxt "MainWin|"
 msgid "Set Quick Access #5"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:472
+#: ../src/qtui/mainwin.cpp:552
 msgctxt "MainWin|"
 msgid "Set Quick Access #6"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:474
+#: ../src/qtui/mainwin.cpp:554
 msgctxt "MainWin|"
 msgid "Set Quick Access #7"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:476
+#: ../src/qtui/mainwin.cpp:556
 msgctxt "MainWin|"
 msgid "Set Quick Access #8"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:478
+#: ../src/qtui/mainwin.cpp:558
 msgctxt "MainWin|"
 msgid "Set Quick Access #9"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:481
+#: ../src/qtui/mainwin.cpp:561
 msgctxt "MainWin|"
 msgid "Quick Access #0"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:483
+#: ../src/qtui/mainwin.cpp:563
 msgctxt "MainWin|"
 msgid "Quick Access #1"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:485
+#: ../src/qtui/mainwin.cpp:565
 msgctxt "MainWin|"
 msgid "Quick Access #2"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:487
+#: ../src/qtui/mainwin.cpp:567
 msgctxt "MainWin|"
 msgid "Quick Access #3"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:489
+#: ../src/qtui/mainwin.cpp:569
 msgctxt "MainWin|"
 msgid "Quick Access #4"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:491
+#: ../src/qtui/mainwin.cpp:571
 msgctxt "MainWin|"
 msgid "Quick Access #5"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:493
+#: ../src/qtui/mainwin.cpp:573
 msgctxt "MainWin|"
 msgid "Quick Access #6"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:495
+#: ../src/qtui/mainwin.cpp:575
 msgctxt "MainWin|"
 msgid "Quick Access #7"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:497
+#: ../src/qtui/mainwin.cpp:577
 msgctxt "MainWin|"
 msgid "Quick Access #8"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:499
+#: ../src/qtui/mainwin.cpp:579
 msgctxt "MainWin|"
 msgid "Quick Access #9"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:503
+#: ../src/qtui/mainwin.cpp:583
 msgctxt "MainWin|"
 msgid "Activate Next Chat List"
 msgstr "チャットリストを削除してもよろしいですか？"
 
-#: ../src/qtui/mainwin.cpp:505
+#: ../src/qtui/mainwin.cpp:585
 msgctxt "MainWin|"
 msgid "Activate Previous Chat List"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:507
+#: ../src/qtui/mainwin.cpp:587
 msgctxt "MainWin|"
 msgid "Go to Next Chat"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:509
+#: ../src/qtui/mainwin.cpp:589
 msgctxt "MainWin|"
 msgid "Go to Previous Chat"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:518
+#: ../src/qtui/mainwin.cpp:598
 msgctxt "MainWin|"
 msgid "&File"
 msgstr "ファイル(&F)"
 
-#: ../src/qtui/mainwin.cpp:531
+#: ../src/qtui/mainwin.cpp:611
 msgctxt "MainWin|"
 msgid "&Networks"
 msgstr "ネットワーク(&N)"
 
-#: ../src/qtui/mainwin.cpp:537
+#: ../src/qtui/mainwin.cpp:617
 msgctxt "MainWin|"
 msgid "&View"
 msgstr "表示(&V)"
 
-#: ../src/qtui/mainwin.cpp:538
+#: ../src/qtui/mainwin.cpp:618
 msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr "チャットリスト(&C)"
 
-#: ../src/qtui/mainwin.cpp:540
+#: ../src/qtui/mainwin.cpp:620
 msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr "ツールバー（&T）"
 
-#: ../src/qtui/mainwin.cpp:554
+#: ../src/qtui/mainwin.cpp:634
 msgctxt "MainWin|"
 msgid "&Settings"
 msgstr "設定(&S)"
 
-#: ../src/qtui/mainwin.cpp:564
+#: ../src/qtui/mainwin.cpp:644
 msgctxt "MainWin|"
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 
-#: ../src/qtui/mainwin.cpp:573
+#: ../src/qtui/mainwin.cpp:653
 msgctxt "MainWin|"
 msgid "Debug"
 msgstr "デバグ"
 
-#: ../src/qtui/mainwin.cpp:749
+#: ../src/qtui/mainwin.cpp:830
 msgctxt "MainWin|"
 msgid "Feature Not Supported"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:750
+#: ../src/qtui/mainwin.cpp:831
 msgctxt "MainWin|"
 msgid "<b>Your Quassel Core does not support this feature</b>"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/qtui/mainwin.cpp:865
+#: ../src/qtui/mainwin.cpp:843
+msgctxt "MainWin|"
+msgid "Upgrading..."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:844
+msgctxt "MainWin|"
+msgid "Your database is being upgraded"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:847
+msgctxt "MainWin|"
+msgid ""
+"In order to support new features, we need to make changes to your backlog "
+"database. This may take a long while."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:849
+msgctxt "MainWin|"
+msgid "Do not exit Quassel until the upgrade is complete!"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:866
+msgctxt "MainWin|"
+msgid "Fatal error"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:867
+msgctxt "MainWin|"
+msgid "Quassel encountered a fatal error and is terminated."
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:869
+msgctxt "MainWin|"
+msgid "Reason:<em>"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:997
 msgctxt "MainWin|"
 msgid "Nicks"
 msgstr "ニック"
 
-#: ../src/qtui/mainwin.cpp:874
+#: ../src/qtui/mainwin.cpp:1007
 msgctxt "MainWin|"
 msgid "Show Nick List"
 msgstr "ニックリストを表示"
 
-#: ../src/qtui/mainwin.cpp:889
+#: ../src/qtui/mainwin.cpp:1022
 msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr "チャットモニター"
 
-#: ../src/qtui/mainwin.cpp:901
+#: ../src/qtui/mainwin.cpp:1033
 msgctxt "MainWin|"
 msgid "Show Chat Monitor"
 msgstr "チャットモニタを表示"
 
-#: ../src/qtui/mainwin.cpp:907
+#: ../src/qtui/mainwin.cpp:1039
 msgctxt "MainWin|"
 msgid "Inputline"
 msgstr "オンライン："
 
-#: ../src/qtui/mainwin.cpp:916
+#: ../src/qtui/mainwin.cpp:1048
 msgctxt "MainWin|"
 msgid "Show Input Line"
 msgstr "無視リストを表示"
 
-#: ../src/qtui/mainwin.cpp:931
+#: ../src/qtui/mainwin.cpp:1061
 msgctxt "MainWin|"
 msgid "Topic"
 msgstr "トピック"
 
-#: ../src/qtui/mainwin.cpp:943
+#: ../src/qtui/mainwin.cpp:1073
 msgctxt "MainWin|"
 msgid "Show Topic Line"
 msgstr "ニックリストを表示"
 
-#: ../src/qtui/mainwin.cpp:1037
+#: ../src/qtui/mainwin.cpp:1079
+msgctxt "MainWin|"
+msgid "Transfers"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1090
+msgctxt "MainWin|"
+msgid "Show File Transfers"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1187
 msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr "メインツールバー"
 
-#: ../src/qtui/mainwin.cpp:1101
+#: ../src/qtui/mainwin.cpp:1207
+msgctxt "MainWin|"
+msgid "Nick Toolbar"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1284
 msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr "コアに接続"
 
-#: ../src/qtui/mainwin.cpp:1201
+#: ../src/qtui/mainwin.cpp:1384
 msgctxt "MainWin|"
 msgid "Not connected to core."
 msgstr "コアから切断しました。"
 
-#: ../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 "安全な接続を使う"
 
-#: ../src/qtui/mainwin.cpp:1220
+#: ../src/qtui/mainwin.cpp:1403
 msgctxt "MainWin|"
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/qtui/mainwin.cpp:1230
+#: ../src/qtui/mainwin.cpp:1413
 msgctxt "MainWin|"
 msgid "<b>Your core does not support SSL encryption</b>"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/qtui/mainwin.cpp:1249
+#: ../src/qtui/mainwin.cpp:1432
 #, qt-format
 msgctxt "MainWin|"
 msgid ""
@@ -5037,38 +6607,48 @@ msgid ""
 "following reasons:</b>"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1252
+#: ../src/qtui/mainwin.cpp:1435
 msgctxt "MainWin|"
 msgid "Continue"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1253
+#: ../src/qtui/mainwin.cpp:1436
 msgctxt "MainWin|"
 msgid "Show Certificate"
 msgstr "クエリを表示"
 
-#: ../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 ""
 
-#: ../src/qtui/mainwin.cpp:1272
+#: ../src/qtui/mainwin.cpp:1455
 msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1273
+#: ../src/qtui/mainwin.cpp:1456
 msgctxt "MainWin|"
 msgid "Forever"
 msgstr ""
 
-#: ../src/qtui/mainwin.cpp:1284
+#: ../src/qtui/mainwin.cpp:1467
 msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr "接続の設定"
 
-#: ../src/client/messagemodel.cpp:404
+#: ../src/qtui/mainwin.cpp:1499 ../src/qtui/mainwin.cpp:1500
+msgctxt "MainWin|"
+msgid "No network selected"
+msgstr ""
+
+#: ../src/qtui/mainwin.cpp:1502
+msgctxt "MainWin|"
+msgid "Select a network before trying to view the channel list."
+msgstr ""
+
+#: ../src/client/messagemodel.cpp:405
 #, qt-format
 msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
@@ -5084,14 +6664,19 @@ msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr ""
 
-#: ../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)?"
 msgid_plural "Do you really want to paste %n line(s)?"
 msgstr[0] ""
 
-#: ../src/uisupport/multilineedit.cpp:724
+#: ../src/uisupport/multilineedit.cpp:758
 msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr ""
@@ -5138,8 +6723,38 @@ msgstr "サーバパスワード："
 
 #: ../src/qtui/settingspages/networkadddlg.ui:131
 msgctxt "NetworkAddDlg|"
-msgid "Use secure connection"
-msgstr "安全な接続を使う"
+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|"
@@ -5151,90 +6766,114 @@ msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
 msgstr "ネットワーク名を入力してください："
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:841
+#: ../src/qtui/settingspages/networkssettingspage.cpp:1130
 msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr "ネットワーク"
 
-#: ../src/client/networkmodel.cpp:216 ../src/client/networkmodel.cpp:219
-#, qt-format
+#: ../src/client/networkmodel.cpp:255
+msgctxt "NetworkItem|"
+msgid "Server"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:256
 msgctxt "NetworkItem|"
-msgid "Server: %1"
-msgstr "サーバ：%1"
+msgid "Users"
+msgstr "ユーザ"
 
-#: ../src/client/networkmodel.cpp:221
-#, qt-format
+#: ../src/client/networkmodel.cpp:258
 msgctxt "NetworkItem|"
-msgid "Users: %1"
-msgstr "ユーザ：%1"
+msgid "Lag"
+msgstr ""
 
-#: ../src/client/networkmodel.cpp:224
+#: ../src/client/networkmodel.cpp:258
 #, qt-format
 msgctxt "NetworkItem|"
-msgid "Lag: %1 msecs"
+msgid "%1 msecs"
+msgstr ""
+
+#: ../src/client/networkmodel.cpp:262
+msgctxt "NetworkItem|"
+msgid "Not connected"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:1029
+#: ../src/client/networkmodel.cpp:1314
 msgctxt "NetworkModel|"
 msgid "Chat"
 msgstr "チャット"
 
-#: ../src/client/networkmodel.cpp:1029
+#: ../src/client/networkmodel.cpp:1314
 msgctxt "NetworkModel|"
 msgid "Topic"
 msgstr "トピック"
 
-#: ../src/client/networkmodel.cpp:1029
+#: ../src/client/networkmodel.cpp:1314
 msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr "ニックの変更"
 
-#: ../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] ""
 
-#: ../src/uisupport/networkmodelcontroller.cpp:190
+#: ../src/uisupport/networkmodelcontroller.cpp:191
 #, qt-format
 msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/uisupport/networkmodelcontroller.cpp:195
+#: ../src/uisupport/networkmodelcontroller.cpp:196
 msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr "完全にバッファを削除しますか？"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:544
+#: ../src/uisupport/networkmodelcontroller.cpp:241
+#: ../src/uisupport/networkmodelcontroller.cpp:243
+msgctxt "NetworkModelController|"
+msgid "Question"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:241
+msgctxt "NetworkModelController|"
+msgid "Really Connect to all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:243
+msgctxt "NetworkModelController|"
+msgid "Really disconnect from all IRC Networks?"
+msgstr ""
+
+#: ../src/uisupport/networkmodelcontroller.cpp:556
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr "チャンネルに入室"
 
-#: ../src/uisupport/networkmodelcontroller.cpp:547
+#: ../src/uisupport/networkmodelcontroller.cpp:559
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Network:"
 msgstr "ネットワーク："
 
-#: ../src/uisupport/networkmodelcontroller.cpp:549
+#: ../src/uisupport/networkmodelcontroller.cpp:561
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr "チャンネル："
 
-#: ../src/uisupport/networkmodelcontroller.cpp:551
+#: ../src/uisupport/networkmodelcontroller.cpp:563
 msgctxt "NetworkModelController::JoinDlg|"
 msgid "Password:"
 msgstr "パスワード："
@@ -5255,13 +6894,13 @@ msgid "Re&name..."
 msgstr "名前変更(&N)..."
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:65
-#: ../src/qtui/settingspages/networkssettingspage.ui:235
+#: ../src/qtui/settingspages/networkssettingspage.ui:234
 msgctxt "NetworksSettingsPage|"
 msgid "&Add..."
 msgstr "追加(&A)..."
 
 #: ../src/qtui/settingspages/networkssettingspage.ui:88
-#: ../src/qtui/settingspages/networkssettingspage.ui:252
+#: ../src/qtui/settingspages/networkssettingspage.ui:251
 msgctxt "NetworksSettingsPage|"
 msgid "De&lete"
 msgstr "削除(&L)"
@@ -5277,8 +6916,8 @@ msgid "Identity:"
 msgstr "個人情報："
 
 #: ../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 "..."
@@ -5298,118 +6937,172 @@ msgctxt "NetworksSettingsPage|"
 msgid "&Edit..."
 msgstr "編集(&E)..."
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:278
+#: ../src/qtui/settingspages/networkssettingspage.ui:277
 msgctxt "NetworksSettingsPage|"
 msgid "Move upwards in list"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:292
+#: ../src/qtui/settingspages/networkssettingspage.ui:291
 msgctxt "NetworksSettingsPage|"
 msgid "Move downwards in list"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:337
+#: ../src/qtui/settingspages/networkssettingspage.ui:336
 msgctxt "NetworksSettingsPage|"
 msgid "Commands"
 msgstr "コマンド"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:340
+#: ../src/qtui/settingspages/networkssettingspage.ui:339
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:346
+#: ../src/qtui/settingspages/networkssettingspage.ui:345
 msgctxt "NetworksSettingsPage|"
 msgid "Commands to execute on connect:"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:362
+#: ../src/qtui/settingspages/networkssettingspage.ui:361
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify a list of IRC commands to be executed upon connect.\n"
 "Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:374
+#: ../src/qtui/settingspages/networkssettingspage.ui:373
 msgctxt "NetworksSettingsPage|"
 msgid "Connection"
 msgstr "接続"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:383
+#: ../src/qtui/settingspages/networkssettingspage.ui:382
 msgctxt "NetworksSettingsPage|"
 msgid "Automatically reconnect to the IRC network after connection failures"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:386
+#: ../src/qtui/settingspages/networkssettingspage.ui:385
 msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
 msgstr "起動時に自動的に接続"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:397
+#: ../src/qtui/settingspages/networkssettingspage.ui:396
+#: ../src/qtui/settingspages/networkssettingspage.ui:595
 msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:404
+#: ../src/qtui/settingspages/networkssettingspage.ui:403
+#: ../src/qtui/settingspages/networkssettingspage.ui:605
 msgctxt "NetworksSettingsPage|"
 msgid " s"
 msgstr "秒"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:420
+#: ../src/qtui/settingspages/networkssettingspage.ui:419
 msgctxt "NetworksSettingsPage|"
 msgid "between retries"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:444
+#: ../src/qtui/settingspages/networkssettingspage.ui:443
 msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:464
+#: ../src/qtui/settingspages/networkssettingspage.ui:463
+#: ../src/qtui/settingspages/networkssettingspage.ui:547
 msgctxt "NetworksSettingsPage|"
 msgid "Unlimited"
 msgstr "無制限"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:489
+#: ../src/qtui/settingspages/networkssettingspage.ui:488
 msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
 msgstr "再接続の後で、すべてのチャンネルに再入室"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:516
-#: ../src/qtui/settingspages/networkssettingspage.ui:525
+#: ../src/qtui/settingspages/networkssettingspage.ui:507
+msgctxt "NetworksSettingsPage|"
+msgid "Use Custom Rate Limits"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:521
+msgctxt "NetworksSettingsPage|"
+msgid "Max. messages at once:"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:528
+msgctxt "NetworksSettingsPage|"
+msgid "Maximum number of messages to send without any delays"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:544
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p>Disable all rate limiting, e.g. for IRC "
+"bridges.</p><p>Don't use with most normal networks.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:602
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<html><head/><body><p>Delay between messages after the maximum number of "
+"undelayed messages have been sent.</p></body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:621
+msgctxt "NetworksSettingsPage|"
+msgid "between future messages"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:663
+#: ../src/qtui/settingspages/networkssettingspage.ui:814
 msgctxt "NetworksSettingsPage|"
 msgid "Auto Identify"
 msgstr "個人情報を追加"
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:540
+#: ../src/qtui/settingspages/networkssettingspage.ui:672
 msgctxt "NetworksSettingsPage|"
-msgid "NickServ"
-msgstr "NickServ"
+msgid ""
+"Authenticate using your nickname and password before joining any channels"
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:557
+#: ../src/qtui/settingspages/networkssettingspage.ui:675
 msgctxt "NetworksSettingsPage|"
-msgid "Service:"
-msgstr "サービス："
+msgid "Use SASL Authentication"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:716
+msgctxt "NetworksSettingsPage|"
+msgid "Account name, often the same as your nickname"
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:567
-#: ../src/qtui/settingspages/networkssettingspage.ui:615
+#: ../src/qtui/settingspages/networkssettingspage.ui:729
+msgctxt "NetworksSettingsPage|"
+msgid "Account:"
+msgstr "アカウント："
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:739
+#: ../src/qtui/settingspages/networkssettingspage.ui:842
+msgctxt "NetworksSettingsPage|"
+msgid "Account password"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:752
+#: ../src/qtui/settingspages/networkssettingspage.ui:862
 msgctxt "NetworksSettingsPage|"
 msgid "Password:"
 msgstr "パスワード："
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:580
+#: ../src/qtui/settingspages/networkssettingspage.ui:776
 msgctxt "NetworksSettingsPage|"
-msgid "Use SASL Authentication"
+msgid "Could not detect if supported by server"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:625
+#: ../src/qtui/settingspages/networkssettingspage.ui:783
 msgctxt "NetworksSettingsPage|"
-msgid "Account:"
-msgstr "アカウント："
+msgid "Details..."
+msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:635
+#: ../src/qtui/settingspages/networkssettingspage.ui:798
 msgctxt "NetworksSettingsPage|"
 msgid ""
 "<html><head/><body><p><span style=\" font-weight:600;\">Note:</span> because"
@@ -5417,110 +7110,238 @@ msgid ""
 "used.</p></body></html>"
 msgstr ""
 
-#: ../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 "サービス："
+
+#: ../src/qtui/settingspages/networkssettingspage.ui:886
 msgctxt "NetworksSettingsPage|"
 msgid "Encodings"
 msgstr "エンコーディング："
 
-#: ../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 ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:671
+#: ../src/qtui/settingspages/networkssettingspage.ui:898
 msgctxt "NetworksSettingsPage|"
 msgid "Control encodings for in- and outgoing messages"
 msgstr ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:674
+#: ../src/qtui/settingspages/networkssettingspage.ui:901
 msgctxt "NetworksSettingsPage|"
 msgid "Use Custom Encodings"
 msgstr "カスタム色を使う"
 
-#: ../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 ""
 
-#: ../src/qtui/settingspages/networkssettingspage.ui:689
+#: ../src/qtui/settingspages/networkssettingspage.ui:916
 msgctxt "NetworksSettingsPage|"
 msgid "Send messages in:"
 msgstr "自分のメッセージ："
 
-#: ../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."
+"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 ""
 
-#: ../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!"
+"<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 "サーバエンコーディング："
 
-#: ../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 "ネットワーク"
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:187
+#: ../src/qtui/settingspages/networkssettingspage.cpp:240
 msgctxt "NetworksSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:188
+#: ../src/qtui/settingspages/networkssettingspage.cpp:241
 msgctxt "NetworksSettingsPage|"
 msgid "Invalid Network Settings"
 msgstr "ネットワーク詳細"
 
-#: ../src/qtui/settingspages/networkssettingspage.cpp:651
+#: ../src/qtui/settingspages/networkssettingspage.cpp:737
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:743
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:749
+msgctxt "NetworksSettingsPage|"
+msgid "Not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:755
+msgctxt "NetworksSettingsPage|"
+msgid "Supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:838
+msgctxt "NetworksSettingsPage|"
+msgid "Delete Network?"
+msgstr "ネットワークを削除してもよろしいですか？"
+
+#: ../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 ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:971
+msgctxt "NetworksSettingsPage|"
+msgid "Could not check if SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:972
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Quassel could not check if \"%1\" supports SASL.  This may be due to unsaved"
+" changes or an older Quassel core.  You can still try using SASL."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:977
+msgctxt "NetworksSettingsPage|"
+msgid "Cannot check if SASL supported when disconnected"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:978
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Quassel cannot check if \"%1\" supports SASL when disconnected.  Connect to "
+"the network, or try using SASL anyways."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:983
+msgctxt "NetworksSettingsPage|"
+msgid "SASL not currently supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:984
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"The network \"%1\" does not currently support SASL.  However, support might "
+"be added later on."
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:989
+msgctxt "NetworksSettingsPage|"
+msgid "SASL supported by network"
+msgstr ""
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:990
+#, qt-format
 msgctxt "NetworksSettingsPage|"
-msgid "Delete Network?"
-msgstr "ネットワークを削除してもよろしいですか？"
+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?"
+"SASL is a standardized way to log in and identify yourself to IRC servers."
 msgstr ""
 
 #: ../src/qtui/settingspages/nickeditdlg.ui:13
@@ -5626,11 +7447,41 @@ msgctxt "PhononNotificationConfigWidget|"
 msgid "Select the sound file to play"
 msgstr ""
 
-#: ../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 ""
 
+#: ../src/core/postgresqlstorage.cpp:88
+msgctxt "PostgreSqlStorage|"
+msgid "Username"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:89
+msgctxt "PostgreSqlStorage|"
+msgid "Password"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:90
+msgctxt "PostgreSqlStorage|"
+msgid "Hostname"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:91
+msgctxt "PostgreSqlStorage|"
+msgid "Port"
+msgstr ""
+
+#: ../src/core/postgresqlstorage.cpp:92
+msgctxt "PostgreSqlStorage|"
+msgid "Database"
+msgstr ""
+
 #: ../src/client/backlogrequester.cpp:95
 #, qt-format
 msgctxt "QObject|"
@@ -5663,212 +7514,339 @@ msgid ""
 "wizard any time and use the settings dialog for more detailed changes."
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/uisupport/qssparser.cpp:147
+#: ../src/uisupport/qssparser.cpp:170
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette role assignment: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:166
+#: ../src/uisupport/qssparser.cpp:189
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:204
+#: ../src/uisupport/qssparser.cpp:233
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:248
+#: ../src/uisupport/qssparser.cpp:277
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message type in %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:257
+#: ../src/uisupport/qssparser.cpp:286
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:269
+#: ../src/uisupport/qssparser.cpp:299
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid message label: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:281
+#: ../src/uisupport/qssparser.cpp:310
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:285
+#: ../src/uisupport/qssparser.cpp:314
 msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:301
+#: ../src/uisupport/qssparser.cpp:330
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid format name: %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../src/uisupport/qssparser.cpp:318
+#: ../src/uisupport/qssparser.cpp:347
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:349
+#: ../src/uisupport/qssparser.cpp:380
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid proplist %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:368
+#: ../src/uisupport/qssparser.cpp:399
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid chatlist item type %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:384
+#: ../src/uisupport/qssparser.cpp:415
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid chatlist state %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:414
+#: ../src/uisupport/qssparser.cpp:445
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid property declaration: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:438
+#: ../src/uisupport/qssparser.cpp:483
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font property: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:444
+#: ../src/uisupport/qssparser.cpp:489
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown ChatLine property: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:468
+#: ../src/uisupport/qssparser.cpp:508
+#, qt-format
+msgctxt "QssParser|"
+msgid "Invalid boolean value: %1"
+msgstr ""
+
+#: ../src/uisupport/qssparser.cpp:544
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid palette color role specification: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:475
+#: ../src/uisupport/qssparser.cpp:551
 #, qt-format
 msgctxt "QssParser|"
 msgid "Unknown palette color role: %1"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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 ""
 
-#: ../src/uisupport/qssparser.cpp:646
+#: ../src/uisupport/qssparser.cpp:722
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font specification: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:687
+#: ../src/uisupport/qssparser.cpp:773
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font style specification: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:702
+#: ../src/uisupport/qssparser.cpp:788
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font weight specification: %1"
 msgstr ""
 
-#: ../src/uisupport/qssparser.cpp:714
+#: ../src/uisupport/qssparser.cpp:800
 #, qt-format
 msgctxt "QssParser|"
 msgid "Invalid font size specification: %1"
 msgstr ""
 
-#: ../src/common/util.cpp:169
+#: ../src/qtui/qtmultimedianotificationbackend.cpp:167
+msgctxt "QtMultimediaNotificationBackend::ConfigWidget|"
+msgid "Select Audio File"
+msgstr "オーディオファイルを選択"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:14
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Form"
+msgstr "フォーム"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:20
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Play a sound"
+msgstr "サウンドを再生"
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:46
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Prelisten to the selected sound"
+msgstr ""
+
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:59
+#: ../src/qtui/ui/qtmultimedianotificationconfigwidget.ui:69
+msgctxt "QtMultimediaNotificationConfigWidget|"
+msgid "Select the sound file to play"
+msgstr ""
+
+#. Supported icon theme names
+#: ../src/qtui/qtui.cpp:284
+msgctxt "QtUi|"
+msgid "Breeze"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:285
+msgctxt "QtUi|"
+msgid "Breeze Dark"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:287
+msgctxt "QtUi|"
+msgid "Oxygen"
+msgstr ""
+
+#: ../src/qtui/qtui.cpp:341
+msgctxt "QtUi|"
+msgid ""
+"No supported icon theme installed, you'll lack icons! Supported are the "
+"KDE/Plasma themes Breeze, Breeze Dark and Oxygen."
+msgstr ""
+
+#: ../src/qtui/qtuiapplication.cpp:105
+msgctxt "QtUiApplication|"
+msgid "Could not initialize Quassel!"
+msgstr ""
+
+#: ../src/qtui/qtuiapplication.cpp:110
+msgctxt "QtUiApplication|"
+msgid "Could not load or upgrade client settings!"
+msgstr ""
+
+#: ../src/common/util.cpp:173
 msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "å¹´"
 
-#: ../src/common/util.cpp:170
+#: ../src/common/util.cpp:174
 msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr "日"
 
-#: ../src/common/util.cpp:171
+#: ../src/common/util.cpp:175
 msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr "時"
 
-#: ../src/common/util.cpp:172
+#: ../src/common/util.cpp:176
 msgctxt "Quassel::secondsToString()|"
 msgid "min"
 msgstr "分"
 
-#: ../src/common/util.cpp:173
+#: ../src/common/util.cpp:177
 msgctxt "Quassel::secondsToString()|"
 msgid "sec"
 msgstr "秒"
 
-#: ../src/client/networkmodel.cpp:503
+#: ../src/client/networkmodel.cpp:589
 #, qt-format
 msgctxt "QueryBufferItem|"
-msgid "<b>Query with %1</b>"
+msgid "Query with %1"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:521
-#, qt-format
+#: ../src/client/networkmodel.cpp:611
 msgctxt "QueryBufferItem|"
-msgid "idling since %1"
+msgid "Unknown"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:524
-#, qt-format
+#: ../src/client/networkmodel.cpp:617
 msgctxt "QueryBufferItem|"
-msgid "login time: %1"
+msgid "Away message"
 msgstr ""
 
-#: ../src/client/networkmodel.cpp:527
-#, qt-format
+#: ../src/client/networkmodel.cpp:619
+msgctxt "QueryBufferItem|"
+msgid "Realname"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/client/networkmodel.cpp:669
+msgctxt "QueryBufferItem|"
+msgid "Operator"
+msgstr ""
+
+#: ../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 ""
+
+#: ../src/client/networkmodel.cpp:690
 msgctxt "QueryBufferItem|"
-msgid "server: %1"
-msgstr "サーバ：%1"
+msgid "No information available"
+msgstr ""
 
 #: ../src/qtui/ui/receivefiledlg.ui:14
 msgctxt "ReceiveFileDlg|"
@@ -5903,8 +7881,8 @@ msgstr "中止"
 
 #: ../src/qtui/settingspages/servereditdlg.ui:14
 msgctxt "ServerEditDlg|"
-msgid "Dialog"
-msgstr "ダイアログ"
+msgid "Edit Server"
+msgstr ""
 
 #: ../src/qtui/settingspages/servereditdlg.ui:30
 msgctxt "ServerEditDlg|"
@@ -5917,7 +7895,7 @@ msgid "Server address:"
 msgstr "サーバアドレス："
 
 #: ../src/qtui/settingspages/servereditdlg.ui:45
-#: ../src/qtui/settingspages/servereditdlg.ui:227
+#: ../src/qtui/settingspages/servereditdlg.ui:246
 msgctxt "ServerEditDlg|"
 msgid "Port:"
 msgstr "ポート："
@@ -5929,124 +7907,154 @@ msgstr "パスワード："
 
 #: ../src/qtui/settingspages/servereditdlg.ui:94
 msgctxt "ServerEditDlg|"
-msgid "Use SSL"
-msgstr "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 "詳細"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:140
+#: ../src/qtui/settingspages/servereditdlg.ui:159
 msgctxt "ServerEditDlg|"
 msgid "SSL Version:"
 msgstr "SSL バージョン："
 
-#: ../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 ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:151
+#: ../src/qtui/settingspages/servereditdlg.ui:170
 msgctxt "ServerEditDlg|"
 msgid "SSLv3 (insecure)"
 msgstr ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:156
+#: ../src/qtui/settingspages/servereditdlg.ui:175
 msgctxt "ServerEditDlg|"
 msgid "SSLv2 (insecure)"
 msgstr ""
 
-#: ../src/qtui/settingspages/servereditdlg.ui:161
+#: ../src/qtui/settingspages/servereditdlg.ui:180
 msgctxt "ServerEditDlg|"
 msgid "TLSv1"
 msgstr "TLSv1"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:171
+#: ../src/qtui/settingspages/servereditdlg.ui:190
 msgctxt "ServerEditDlg|"
 msgid "Use a Proxy"
 msgstr "Proxy を使用"
 
-#: ../src/qtui/settingspages/servereditdlg.ui:188
+#: ../src/qtui/settingspages/servereditdlg.ui:207
 msgctxt "ServerEditDlg|"
 msgid "Proxy Type:"
 msgstr "Proxy タイプ"
 
-#: ../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 "Proxy ホスト："
 
-#: ../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 "Proxy ユーザ名："
 
-#: ../src/qtui/settingspages/servereditdlg.ui:261
+#: ../src/qtui/settingspages/servereditdlg.ui:280
 msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr "Proxy パスワード："
 
+#: ../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 "Quassel を設定"
 
-#: ../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 "設定"
 
-#: ../src/qtui/settingsdlg.cpp:121
+#: ../src/qtui/settingsdlg.cpp:122
 msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr "変更を保存"
 
-#: ../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 ""
 
-#: ../src/qtui/settingsdlg.cpp:136 ../src/qtui/settingsdlg.cpp:140
+#: ../src/qtui/settingsdlg.cpp:137 ../src/qtui/settingsdlg.cpp:141
 #, qt-format
 msgctxt "SettingsDlg|"
 msgid "Configure %1"
 msgstr "%1 を設定"
 
-#: ../src/qtui/settingsdlg.cpp:220
+#: ../src/qtui/settingsdlg.cpp:221
 msgctxt "SettingsDlg|"
 msgid "Reload Settings"
 msgstr "設定を再読み込む"
 
-#: ../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 ""
 
-#: ../src/qtui/settingsdlg.cpp:231
+#: ../src/qtui/settingsdlg.cpp:232
 msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
 msgstr "既定を使用..."
 
-#: ../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 ""
@@ -6061,28 +8069,28 @@ msgctxt "SettingsPageDlg|"
 msgid "Settings"
 msgstr "設定"
 
-#: ../src/qtui/settingspagedlg.cpp:38
+#: ../src/qtui/settingspagedlg.cpp:39
 #, qt-format
 msgctxt "SettingsPageDlg|"
 msgid "Configure %1"
 msgstr "%1 を設定"
 
-#: ../src/qtui/settingspagedlg.cpp:119
+#: ../src/qtui/settingspagedlg.cpp:120
 msgctxt "SettingsPageDlg|"
 msgid "Reload Settings"
 msgstr "設定を再読み込む"
 
-#: ../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 ""
 
-#: ../src/qtui/settingspagedlg.cpp:130
+#: ../src/qtui/settingspagedlg.cpp:131
 msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr "既定を使用..."
 
-#: ../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 ""
@@ -6139,7 +8147,7 @@ msgctxt "ShortcutsSettingsPage|"
 msgid "Shortcuts"
 msgstr "ショートカット"
 
-#: ../src/common/signalproxy.cpp:775
+#: ../src/common/signalproxy.cpp:792
 msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr "切断中"
@@ -6242,7 +8250,29 @@ msgctxt "SnoreNotificationConfigWidget|"
 msgid "Enable Snore"
 msgstr ""
 
-#: ../src/core/sqlitestorage.cpp:60
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Interface"
+msgstr "インターフェース"
+
+#: ../src/qtui/settingspages/sonnetsettingspage.cpp:28
+msgctxt "SonnetSettingsPage|"
+msgid "Spell Checking"
+msgstr ""
+
+#: ../src/core/sqlauthenticator.cpp:58
+msgctxt "SqlAuthenticator|"
+msgid "Database"
+msgstr ""
+
+#: ../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 "
@@ -6363,29 +8393,65 @@ msgctxt "SslInfoDlg|"
 msgid "%1 to %2"
 msgstr ""
 
-#: ../src/client/networkmodel.h:151
+#: ../src/client/networkmodel.h:170
 msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
 msgstr "ステータスバッファ"
 
-#: ../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 "最小化"
 
-#: ../src/qtui/systemtray.cpp:102
+#: ../src/qtui/systemtray.cpp:248
 msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr "復元(&R)"
 
-#: ../src/qtui/systraynotificationbackend.cpp:141
+#: ../src/qtui/ui/systrayanimationconfigwidget.ui:20
+msgctxt "SystrayAnimationConfigWidget|"
+msgid "Form"
+msgstr "フォーム"
+
+#: ../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)"
 msgid_plural "%n pending highlight(s)"
 msgstr[0] ""
 
-#: ../src/qtui/systraynotificationbackend.cpp:155
+#: ../src/qtui/systraynotificationbackend.cpp:146
 msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
 msgstr "メッセージをポップアップで表示"
@@ -6415,146 +8481,146 @@ msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr " 秒"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:30
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgctxt "ToolBarActionProvider|"
 msgid "Connect"
 msgstr "接続"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:30
+#: ../src/uisupport/toolbaractionprovider.cpp:31
 msgctxt "ToolBarActionProvider|"
 msgid "Connect to IRC"
 msgstr "IRC へ接続"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect"
 msgstr "切断"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:31
+#: ../src/uisupport/toolbaractionprovider.cpp:32
 msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
 msgstr "IRC から切断"
 
 #: ../src/uisupport/toolbaractionprovider.cpp:33
 msgctxt "ToolBarActionProvider|"
+msgid "Connect to all"
+msgstr "すべてに接続"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:34
+msgctxt "ToolBarActionProvider|"
+msgid "Disconnect from all"
+msgstr "すべてから切断"
+
+#: ../src/uisupport/toolbaractionprovider.cpp:36
+msgctxt "ToolBarActionProvider|"
 msgid "Part"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:33
+#: ../src/uisupport/toolbaractionprovider.cpp:36
 msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgctxt "ToolBarActionProvider|"
 msgid "Join"
 msgstr "入室"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:34
+#: ../src/uisupport/toolbaractionprovider.cpp:37
 msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr "チャンネルに入室"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:36
+#: ../src/uisupport/toolbaractionprovider.cpp:39
 msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr "クエリ"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:36
+#: ../src/uisupport/toolbaractionprovider.cpp:39
 msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr "ユーザ情報"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:37
+#: ../src/uisupport/toolbaractionprovider.cpp:40
 msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
 msgstr "セキュリティ情報"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:39
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:39
+#: ../src/uisupport/toolbaractionprovider.cpp:42
 msgctxt "ToolBarActionProvider|"
 msgid "Give operator privileges to user"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:40
+#: ../src/uisupport/toolbaractionprovider.cpp:43
 msgctxt "ToolBarActionProvider|"
 msgid "Take operator privileges from user"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr "%n 発言権所持者"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:41
+#: ../src/uisupport/toolbaractionprovider.cpp:44
 msgctxt "ToolBarActionProvider|"
 msgid "Give voice to user"
 msgstr "発言権を与える"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:42
+#: ../src/uisupport/toolbaractionprovider.cpp:45
 msgctxt "ToolBarActionProvider|"
 msgid "Take voice from user"
 msgstr "発言権を奪う"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr "追い出す (Kick)"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:43
+#: ../src/uisupport/toolbaractionprovider.cpp:46
 msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
 msgstr "完全にバッファを削除しますか？"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:47
 msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr ""
 
-#: ../src/uisupport/toolbaractionprovider.cpp:44
+#: ../src/uisupport/toolbaractionprovider.cpp:47
 msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
 msgstr ""
 
-#: ../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 "完全にバッファを削除しますか？"
 
-#: ../src/uisupport/toolbaractionprovider.cpp:50
-msgctxt "ToolBarActionProvider|"
-msgid "Connect to all"
-msgstr "すべてに接続"
-
-#: ../src/uisupport/toolbaractionprovider.cpp:57
-msgctxt "ToolBarActionProvider|"
-msgid "Disconnect from all"
-msgstr "すべてから切断"
-
 #: ../src/qtui/ui/topicwidget.ui:32
 msgctxt "TopicWidget|"
 msgid "Form"
@@ -6565,13 +8631,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 "ユーザ：%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"
@@ -6607,121 +8673,211 @@ msgctxt "TopicWidgetSettingsPage|"
 msgid "Topic Widget"
 msgstr "トピックウィジェット"
 
+#: ../src/common/transfer.cpp:95
+msgctxt "Transfer|"
+msgid "New"
+msgstr "新規"
+
+#: ../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 "タイプ"
+
+#: ../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 ""
 
-#: ../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 ""
 
 #. Mode Message
-#: ../src/uisupport/uistyle.cpp:695
+#: ../src/uisupport/uistyle.cpp:941
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "User mode: %DM%1%DM"
 msgstr "ユーザモード：%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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. 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 ""
 
 #. Day Change Message
-#: ../src/uisupport/uistyle.cpp:731
+#: ../src/uisupport/uistyle.cpp:977
 #, qt-format
 msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
 msgstr ""
 
-#: ../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 ""
 
-#: ../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"
 
-#: ../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 ""
 
-#: ../src/client/networkmodel.cpp:831
+#: ../src/client/networkmodel.cpp:1031
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Owner(s)"
 msgid_plural "%n Owner(s)"
 msgstr[0] "%n 所有者"
 
-#: ../src/client/networkmodel.cpp:833
+#: ../src/client/networkmodel.cpp:1033
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Admin(s)"
 msgid_plural "%n Admin(s)"
 msgstr[0] "%n 管理者"
 
-#: ../src/client/networkmodel.cpp:835
+#: ../src/client/networkmodel.cpp:1035
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Operator(s)"
 msgid_plural "%n Operator(s)"
 msgstr[0] "%n オペレータ"
 
-#: ../src/client/networkmodel.cpp:837
+#: ../src/client/networkmodel.cpp:1037
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Half-Op(s)"
 msgid_plural "%n Half-Op(s)"
 msgstr[0] "%n サブオペレータ"
 
-#: ../src/client/networkmodel.cpp:839
+#: ../src/client/networkmodel.cpp:1039
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n Voiced"
 msgid_plural "%n Voiced"
 msgstr[0] "%n 発言権所持者"
 
-#: ../src/client/networkmodel.cpp:841
+#: ../src/client/networkmodel.cpp:1041
 #, qt-format
 msgctxt "UserCategoryItem|"
 msgid "%n User(s)"