X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=po%2Fnl.po;h=8e1e6bca7a5cc9f573b9d0e4110b5697b51d6775;hp=f10108bf968efb3e1f1f2f94fdced682da05ef5d;hb=b1862df754fe8272f3eb091a25396335b99eb7c6;hpb=92dd618e135573ceb8d9b163c1ddcb5849fe1ab9

diff --git a/po/nl.po b/po/nl.po
index f10108bf..8e1e6bca 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,121 +1,54 @@
-# Dutch translation for quassel
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
-# This file is distributed under the same license as the quassel package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
 #
+# Translators:
+# Daniel Albers <daniel@lbe.rs>, 2012.
+# Daniel Albers <daniel@lbers.com>, 2011.
+# redmar <redmar@ubuntu-nl.org>, 2010.
+#   <simon.philips@gmail.com>, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: quassel\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2010-03-03 10:51+0200\n"
-"PO-Revision-Date: 2010-03-21 05:12+0000\n"
-"Last-Translator: Redmar <redmar.vdberg@gmail.com>\n"
-"Language-Team: Dutch <nl@li.org>\n"
+"Project-Id-Version: Quassel IRC\n"
+"Report-Msgid-Bugs-To: http://bugs.quassel-irc.org/\n"
+"PO-Revision-Date: 2012-06-24 20:04+0000\n"
+"Last-Translator: Daniel Albers <daniel@lbe.rs>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-03-28 22:52+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: nl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Qt-Contexts: true\n"
 
-#: AboutDlg#1
-msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
-msgstr "<b>Versie:</b> %1<br><b>Protocol versie:</b> %2<br><b>Built:</b> %3"
-
-#: AboutDlg#2
-msgid ""
-"<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2010 by the "
-"Quassel Project<br><a href=\"http://quassel-irc.org\">http://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 "
-"report bugs."
-msgstr ""
-"<b>Een moderne, gedistribueerde IRC-client</b><br><br>&copy;2005-2010 het "
-"Quassel project<br><a href=\"http://quassel-irc.org\">http://quassel-"
-"irc.org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> op <a "
-"href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel-IRC valt onder "
-"twee licenties: <a href=\"http://www.gnu.org/licenses/gpl-"
-"2.0.txt\">GPLv2</a> en <a href=\"http://www.gnu.org/licenses/gpl-"
-"3.0.txt\">GPLv3</a>.<br>De meeste pictogrammen zijn &copy; van het <a "
-"href=\"http://www.oxygen-icons.org\">Oxygen Team</a> en vallen onder de <a "
-"href=\"http://www.gnu.org/licenses/lgpl.html\">LGPL</a>.<br><br>Gebruik <a "
-"href=\"http://bugs.quassel-irc.org\">http://bugs.quassel-irc.org</a> om bugs "
-"te melden."
-
-#: AboutDlg#3
-msgid "Quassel IRC is mainly developed by:"
-msgstr "Quassel-IRC wordt voornamelijk ontwikkeld door:"
-
-#: AboutDlg#4
-msgid ""
-"We would like to thank the following contributors (in alphabetical order) "
-"and everybody we forgot to mention here:"
-msgstr ""
-"We willen de volgende personen (in alfabetische volgorde) bedanken die een "
-"steentje bijgedragen hebben, naast iedereen die we hier vergeten zijn:"
-
-#: AboutDlg#5
-msgid ""
-"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-"
-"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>for the original Quassel "
-"icon - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a "
-"href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for "
-"creating all the artwork you see throughout Quassel</dd><dt><img "
-"src=\":/pics/qt-logo-32.png\">&nbsp;<b><a "
-"href=\"http://www.trolltech.com\">Qt Software formerly known as "
-"Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring "
-"development of QuasselTopia with Greenphones and more</dd><dt><a "
-"href=\"http://www.nokia.com\"><img "
-"src=\":/pics/nokia.png\"></a></b></dt><dd>for keeping Qt alive, and for "
-"sponsoring development of Quassel Mobile with N810s</dd>"
-msgstr ""
-"Onze speciale dank gaat uit naar:<br><dl><dt><img src=\":/pics/quassel-"
-"eye.png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>voor het originele Quassel "
-"pictogram - The All-Seeing Eye</dt><dt><img "
-"src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://www.oxygen-"
-"icons.org\">The Oxygen Team</a></b></dt><dd>voor het creëren van al het "
-"artwork dat u in Quassel ziet </dd><dt><img src=\":/pics/qt-logo-"
-"32.png\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software het "
-"vroegere Trolltech</a></b></dt><dd>voor het maken van Qt en Qtopia, en voor "
-"het sponsoren van QuasselTopia met Greenphones en meer</dd><dt><a "
-"href=\"http://www.nokia.com\"><img "
-"src=\":/pics/nokia.png\"></a></b></dt><dd>voor het in stand houden van Qt en "
-"voor het sponsoren van de ontwikkeling van Quassel Mobile met N810's</dd>"
-
-#: AboutDlg#6
+#: ../src/qtui/ui/aboutdlg.ui:17
+msgctxt "AboutDlg|"
 msgid "About Quassel"
 msgstr "Over Quassel"
 
-#: AboutDlg#7
+#: ../src/qtui/ui/aboutdlg.ui:59
+msgctxt "AboutDlg|"
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; "
 "font-weight:600; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel "
-"IRC</p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel IRC</p></body></"
+"html>"
 msgstr ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:15pt; "
 "font-weight:600; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
-"right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel-"
-"IRC</p></body></html>"
+"right:0px; -qt-block-indent:0; text-indent:0px;\">Quassel-IRC</p></body></"
+"html>"
 
-#: AboutDlg#8
+#: ../src/qtui/ui/aboutdlg.ui:75
+msgctxt "AboutDlg|"
 msgid ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:600; font-style:normal;\">\n"
@@ -123,8 +56,8 @@ msgid ""
 "right:0px; -qt-block-indent:0; text-indent:0px;\">Version 0.2.0-pre, Build "
 "&gt;= 474 (2008-02-08)</p></body></html>"
 msgstr ""
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:10pt; "
 "font-weight:600; font-style:normal;\">\n"
@@ -132,221 +65,318 @@ msgstr ""
 "right:0px; -qt-block-indent:0; text-indent:0px;\">Versie 0.2.0-pre, Build "
 "&gt;= 474 (2008-02-08)</p></body></html>"
 
-#: AboutDlg#9
+#: ../src/qtui/ui/aboutdlg.ui:115
+msgctxt "AboutDlg|"
 msgid "&About"
 msgstr "I&nfo"
 
-#: AboutDlg#10
+#: ../src/qtui/ui/aboutdlg.ui:135
+msgctxt "AboutDlg|"
 msgid "A&uthors"
 msgstr "A&uteurs"
 
-#: AboutDlg#11
+#: ../src/qtui/ui/aboutdlg.ui:155
+msgctxt "AboutDlg|"
 msgid "&Contributors"
 msgstr "&Medewerkers"
 
-#: AboutDlg#12
+#: ../src/qtui/ui/aboutdlg.ui:175
+msgctxt "AboutDlg|"
 msgid "&Thanks To"
 msgstr "Me&t dank aan"
 
-#: AbstractSqlStorage#1
+#: ../src/qtui/aboutdlg.cpp:33
+#, qt-format
+msgctxt "AboutDlg|"
+msgid "<b>Version:</b> %1<br><b>Protocol version:</b> %2<br><b>Built:</b> %3"
+msgstr "<b>Versie:</b> %1<br><b>Protocol versie:</b> %2<br><b>Built:</b> %3"
+
+#: ../src/qtui/aboutdlg.cpp:49
+msgctxt "AboutDlg|"
+msgid ""
+"<b>A modern, distributed IRC Client</b><br><br>&copy;2005-2012 by the "
+"Quassel Project<br><a href=\"http://quassel-irc.org\">http://quassel-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 report bugs."
+msgstr ""
+"<b>Een moderne, gedistribueerde IRC-client</b><br><br>&copy;2005-2012 het "
+"Quassel project<br><a href=\"http://quassel-irc.org\">http://quassel-irc."
+"org</a><br><a href=\"irc://irc.freenode.net/quassel\">#quassel</a> op <a "
+"href=\"http://www.freenode.net\">Freenode</a><br><br>Quassel-IRC valt onder "
+"twee licenties: <a href=\"http://www.gnu.org/licenses/gpl-2.0.txt\">GPLv2</"
+"a> en <a href=\"http://www.gnu.org/licenses/gpl-3.0.txt\">GPLv3</a>.<br>De "
+"meeste pictogrammen zijn &copy; van het <a href=\"http://www.oxygen-icons.org"
+"\">Oxygen Team</a> en vallen onder de <a href=\"http://www.gnu.org/licenses/"
+"lgpl.html\">LGPL</a>.<br><br>Gebruik <a href=\"http://bugs.quassel-irc.org"
+"\">http://bugs.quassel-irc.org</a> om bugs te melden."
+
+#: ../src/qtui/aboutdlg.cpp:67
+msgctxt "AboutDlg|"
+msgid "Quassel IRC is mainly developed by:"
+msgstr "Quassel-IRC wordt voornamelijk ontwikkeld door:"
+
+#: ../src/qtui/aboutdlg.cpp:84
+msgctxt "AboutDlg|"
+msgid ""
+"We would like to thank the following contributors (in alphabetical order) "
+"and everybody we forgot to mention here:"
+msgstr ""
+"We willen de volgende personen (in alfabetische volgorde) bedanken die een "
+"steentje bijgedragen hebben, naast iedereen die we hier vergeten zijn:"
+
+#: ../src/qtui/aboutdlg.cpp:167
+msgctxt "AboutDlg|"
+msgid ""
+"Special thanks goes to:<br><dl><dt><img src=\":/pics/quassel-eye.png\">&nbsp;"
+"<b>John \"nox\" Hand</b></dt><dd>for the original Quassel icon - The All-"
+"Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;<b><a href=\"http://"
+"www.oxygen-icons.org\">The Oxygen Team</a></b></dt><dd>for creating all the "
+"artwork you see throughout Quassel</dd><dt><img src=\":/pics/qt-logo-32.png"
+"\">&nbsp;<b><a href=\"http://www.trolltech.com\">Qt Software formerly known "
+"as Trolltech</a></b></dt><dd>for creating Qt and Qtopia, and for sponsoring "
+"development of QuasselTopia with Greenphones and more</dd><dt><a href="
+"\"http://www.nokia.com\"><img src=\":/pics/nokia.png\"></a></b></dt><dd>for "
+"keeping Qt alive, and for sponsoring development of Quassel Mobile with "
+"N810s</dd>"
+msgstr ""
+"Onze speciale dank gaat uit naar:<br><dl><dt><img src=\":/pics/quassel-eye."
+"png\">&nbsp;<b>John \"nox\" Hand</b></dt><dd>voor het originele Quassel "
+"pictogram - The All-Seeing Eye</dt><dt><img src=\":/pics/oxygen.png\">&nbsp;"
+"<b><a href=\"http://www.oxygen-icons.org\">The Oxygen Team</a></b></"
+"dt><dd>voor het creëren van al het artwork dat u in Quassel ziet </"
+"dd><dt><img src=\":/pics/qt-logo-32.png\">&nbsp;<b><a href=\"http://www."
+"trolltech.com\">Qt Software het vroegere Trolltech</a></b></dt><dd>voor het "
+"maken van Qt en Qtopia, en voor het sponsoren van QuasselTopia met "
+"Greenphones en meer</dd><dt><a href=\"http://www.nokia.com\"><img src=\":/"
+"pics/nokia.png\"></a></b></dt><dd>voor het in stand houden van Qt en voor "
+"het sponsoren van de ontwikkeling van Quassel Mobile met N810's</dd>"
+
+#: ../src/core/abstractsqlstorage.cpp:124
+#, qt-format
+msgctxt "AbstractSqlStorage|"
 msgid ""
 "Installed Schema (version %1) is not up to date. Upgrading to version %2..."
 msgstr ""
 "Het geïnstalleerde Schema (versie %1) is niet de laatste versie. Upgraden "
 "naar versie %2..."
 
-#: AbstractSqlStorage#2
+#: ../src/core/abstractsqlstorage.cpp:126
+msgctxt "AbstractSqlStorage|"
 msgid "Upgrade failed..."
 msgstr "Upgraden mislukt..."
 
-#: AliasesModel#1
+#: ../src/qtui/settingspages/aliasesmodel.cpp:57
+msgctxt "AliasesModel|"
 msgid ""
 "<b>The shortcut for the alias</b><br />It can be used as a regular slash "
 "command.<br /><br /><b>Example:</b> \"foo\" can be used per /foo"
 msgstr ""
-"<b>De afkorting voor de alias</b><br />Het kan als een regulier slash-"
+"<b>De sneltoets voor de alias</b><br />Het kan als een regulier slash-"
 "commando gebruikt worden.<br /><br /><b>Voorbeeld:</b> \"foo\" kan gebruikt "
 "worden met /foo"
 
-#: AliasesModel#2
+#: ../src/qtui/settingspages/aliasesmodel.cpp:61
+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 "
+"<b>The string the shortcut will be expanded to</b><br /><b>special variables:"
+"</b><br /> - <b>$i</b> represents the i'th parameter.<br /> - <b>$i..j</b> "
+"represents the i'th to j'th parameter separated by spaces.<br /> - <b>$i..</"
+"b> represents all parameters from i on separated by spaces.<br /> - <b>$i:"
+"hostname</b> represents the hostname of the user identified by the i'th "
+"parameter or a * if unknown.<br /> - <b>$0</b> the whole string.<br /> - <b>"
+"$nick</b> your current nickname<br /> - <b>$channel</b> the name of the "
+"selected channel<br /><br />Multiple commands can be separated with "
 "semicolons<br /><br /><b>Example:</b> \"Test $1; Test $2; Test All $0\" will "
 "be expanded to three separate messages \"Test 1\", \"Test 2\" and \"Test All "
 "1 2 3\" when called like /test 1 2 3"
 msgstr ""
 "<b>De zin in de afkorting zal uitgeschreven worden naar</b><br /><b>speciale "
-"variabelen:</b><br /> - <b>$i</b> staat voor de i-de parameter.<br /> - "
-"<b>$i..j</b> staat voor de i-de to j-de parameter, gescheiden door "
-"spaties.<br /> - <b>$i..</b> staat voor alle parameters vanaf i gescheiden "
-"door spaties.<br /> - <b>$i:hostname</b> staat voor de hostname van de "
-"gebruiker geïdentificeerd door de i-de parameter of een * als dit niet "
-"bekend is.<br /> - <b>$0</b> de hele zin.<br /> - <b>$nick</b> uw huidige "
-"bijnaam<br /> - <b>$channel</b> de naam van het geselecteerde kanaal<br "
-"/><br />Meerdere commando's kunnen door puntkomma's gescheiden worden.<br "
-"/><br /><b>Voorbeeld:</b> \"Test $1; Test $2; Test Alle $0\" zal "
-"uitgeschreven worden als drie verschillende berichten \"Test 1\", \"Test 2\" "
-"and \"Test Alle 1 2 3\" wanneer aangeroepen met /test 1 2 3"
-
-#: AliasesModel#3
+"variabelen:</b><br /> - <b>$i</b> staat voor de i-de parameter.<br /> - <b>"
+"$i..j</b> staat voor de i-de to j-de parameter, gescheiden door spaties.<br /"
+"> - <b>$i..</b> staat voor alle parameters vanaf i gescheiden door spaties."
+"<br /> - <b>$i:hostname</b> staat voor de hostname van de gebruiker "
+"geïdentificeerd door de i-de parameter of een * als dit niet bekend is.<br /"
+"> - <b>$0</b> de hele zin.<br /> - <b>$nick</b> uw huidige bijnaam<br /> - "
+"<b>$channel</b> de naam van het geselecteerde kanaal<br /><br />Meerdere "
+"commando's kunnen door puntkomma's gescheiden worden.<br /><br /"
+"><b>Voorbeeld:</b> \"Test $1; Test $2; Test Alle $0\" zal uitgeschreven "
+"worden als drie verschillende berichten \"Test 1\", \"Test 2\" and \"Test "
+"Alle 1 2 3\" wanneer aangeroepen met /test 1 2 3"
+
+#: ../src/qtui/settingspages/aliasesmodel.cpp:185
+msgctxt "AliasesModel|"
 msgid "Alias"
 msgstr "Alias"
 
-#: AliasesModel#4
+#: ../src/qtui/settingspages/aliasesmodel.cpp:186
+msgctxt "AliasesModel|"
 msgid "Expansion"
 msgstr "Uitbreiding"
 
-#: AliasesSettingsPage#1
-msgctxt "AliasesSettingsPage#1"
-msgid "IRC"
-msgstr "IRC"
-
-#: AliasesSettingsPage#2
-msgid "Aliases"
-msgstr "Aliassen"
-
-#: AliasesSettingsPage#3
-msgctxt "AliasesSettingsPage#3"
+#: ../src/qtui/settingspages/aliasessettingspage.ui:13
+msgctxt "AliasesSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: AliasesSettingsPage#4
-msgctxt "AliasesSettingsPage#4"
+#: ../src/qtui/settingspages/aliasessettingspage.ui:27
+msgctxt "AliasesSettingsPage|"
 msgid "New"
 msgstr "Nieuw"
 
-#: AliasesSettingsPage#5
-msgctxt "AliasesSettingsPage#5"
+#: ../src/qtui/settingspages/aliasessettingspage.ui:41
+msgctxt "AliasesSettingsPage|"
 msgid "Delete"
-msgstr "Verwijder"
-
-#: AppearanceSettingsPage#1
-msgctxt "AppearanceSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
+msgstr "Verwijderen"
 
-#: AppearanceSettingsPage#2
-msgid "<System Default>"
-msgstr "<Systeemstandaard>"
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+msgctxt "AliasesSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
 
-#: AppearanceSettingsPage#3
-msgid "Please choose a stylesheet file"
-msgstr "Kies een stylesheet-bestand"
+#: ../src/qtui/settingspages/aliasessettingspage.cpp:29
+msgctxt "AliasesSettingsPage|"
+msgid "Aliases"
+msgstr "Aliassen"
 
-#: AppearanceSettingsPage#4
-msgctxt "AppearanceSettingsPage#4"
+#: ../src/qtui/settingspages/appearancesettingspage.ui:14
+msgctxt "AppearanceSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: AppearanceSettingsPage#5
+#: ../src/qtui/settingspages/appearancesettingspage.ui:22
+msgctxt "AppearanceSettingsPage|"
 msgid "Client style:"
 msgstr "Clientstijl:"
 
-#: AppearanceSettingsPage#6
+#: ../src/qtui/settingspages/appearancesettingspage.ui:29
+msgctxt "AppearanceSettingsPage|"
 msgid "Set application style"
-msgstr "Stel programmastijl in"
+msgstr "Programmastijl instellen"
 
-#: AppearanceSettingsPage#7
+#: ../src/qtui/settingspages/appearancesettingspage.ui:36
+msgctxt "AppearanceSettingsPage|"
 msgid "Language:"
 msgstr "Taal:"
 
-#: AppearanceSettingsPage#8
+#: ../src/qtui/settingspages/appearancesettingspage.ui:43
+msgctxt "AppearanceSettingsPage|"
 msgid "Set the application language. Requires restart!"
 msgstr "Stel de programmataal in. Herstart vereist!"
 
-#: AppearanceSettingsPage#9
+#: ../src/qtui/settingspages/appearancesettingspage.ui:47
+msgctxt "AppearanceSettingsPage|"
 msgid "<Untranslated>"
 msgstr "<Onvertaald>"
 
-#: AppearanceSettingsPage#10
+#: ../src/qtui/settingspages/appearancesettingspage.ui:52
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:76
+msgctxt "AppearanceSettingsPage|"
+msgid "<System Default>"
+msgstr "<Systeemstandaard>"
+
+#: ../src/qtui/settingspages/appearancesettingspage.ui:75
+msgctxt "AppearanceSettingsPage|"
 msgid "Use custom stylesheet"
-msgstr "Gebruik eigen stylesheet"
+msgstr "Eigen stylesheet gebruiken"
 
-#: AppearanceSettingsPage#11
+#: ../src/qtui/settingspages/appearancesettingspage.ui:109
+msgctxt "AppearanceSettingsPage|"
 msgid "Path:"
 msgstr "Pad"
 
-#: AppearanceSettingsPage#12
-msgctxt "AppearanceSettingsPage#12"
+#: ../src/qtui/settingspages/appearancesettingspage.ui:141
+msgctxt "AppearanceSettingsPage|"
 msgid "..."
-msgstr "..."
+msgstr "…"
 
-#: AppearanceSettingsPage#13
+#: ../src/qtui/settingspages/appearancesettingspage.ui:150
+msgctxt "AppearanceSettingsPage|"
 msgid "Show system tray icon"
 msgstr "Systeemvakpictogram tonen"
 
-#: AppearanceSettingsPage#14
+#: ../src/qtui/settingspages/appearancesettingspage.ui:184
+msgctxt "AppearanceSettingsPage|"
 msgid "Hide to tray on close button"
 msgstr "Verberg naar systeemvak als het venster wordt gesloten"
 
-#: AppearanceSettingsPage#15
+#: ../src/qtui/settingspages/appearancesettingspage.ui:216
+msgctxt "AppearanceSettingsPage|"
 msgid "Enable animations"
-msgstr "Activeer animaties"
+msgstr "Animaties activeren"
 
-#: AppearanceSettingsPage#16
+#: ../src/qtui/settingspages/appearancesettingspage.ui:231
+msgctxt "AppearanceSettingsPage|"
 msgid "Message Redirection"
 msgstr "Berichten doorsturen"
 
-#: AppearanceSettingsPage#17
+#: ../src/qtui/settingspages/appearancesettingspage.ui:237
+msgctxt "AppearanceSettingsPage|"
 msgid "User Notices:"
 msgstr "Gebruikers waarschuwingen:"
 
-#: AppearanceSettingsPage#18
+#: ../src/qtui/settingspages/appearancesettingspage.ui:280
+msgctxt "AppearanceSettingsPage|"
 msgid "Server Notices:"
-msgstr "Server waarschuwingen"
+msgstr "Serverwaarschuwingen"
 
-#: AppearanceSettingsPage#19
+#: ../src/qtui/settingspages/appearancesettingspage.ui:294
+msgctxt "AppearanceSettingsPage|"
 msgid "Default Target"
 msgstr "Standaarddoel"
 
-#: AppearanceSettingsPage#20
+#: ../src/qtui/settingspages/appearancesettingspage.ui:301
+msgctxt "AppearanceSettingsPage|"
 msgid "Status Window"
 msgstr "Statusvenster"
 
-#: AppearanceSettingsPage#21
+#: ../src/qtui/settingspages/appearancesettingspage.ui:308
+msgctxt "AppearanceSettingsPage|"
 msgid "Current Chat"
 msgstr "Huidige chat"
 
-#: AppearanceSettingsPage#22
+#: ../src/qtui/settingspages/appearancesettingspage.ui:315
+msgctxt "AppearanceSettingsPage|"
 msgid "Errors:"
 msgstr "Fouten:"
 
-#: AwayLogView#1
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:35
+msgctxt "AppearanceSettingsPage|"
+msgid "Interface"
+msgstr "Interface"
+
+#: ../src/qtui/settingspages/appearancesettingspage.cpp:242
+msgctxt "AppearanceSettingsPage|"
+msgid "Please choose a stylesheet file"
+msgstr "Kies een stylesheet-bestand"
+
+#: ../src/qtui/awaylogview.cpp:33
+msgctxt "AwayLogView|"
 msgid "Away Log"
-msgstr "Altijd loggen"
+msgstr "Afwezigheidslog"
 
-#: AwayLogView#2
-msgctxt "AwayLogView#2"
+#: ../src/qtui/awaylogview.cpp:46
+msgctxt "AwayLogView|"
 msgid "Show Network Name"
-msgstr "Toon netwerknaam"
+msgstr "Netwerknaam weergeven"
 
-#: AwayLogView#3
-msgctxt "AwayLogView#3"
+#: ../src/qtui/awaylogview.cpp:51
+msgctxt "AwayLogView|"
 msgid "Show Buffer Name"
-msgstr "Toon buffernaam"
-
-#: BacklogSettingsPage#1
-msgctxt "BacklogSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
+msgstr "Buffernaam weergeven"
 
-#: BacklogSettingsPage#2
-msgid "Backlog Fetching"
-msgstr "Backlog verkrijgen"
-
-#: BacklogSettingsPage#3
-msgctxt "BacklogSettingsPage#3"
+#: ../src/qtui/settingspages/backlogsettingspage.ui:14
+msgctxt "BacklogSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: BacklogSettingsPage#4
+#: ../src/qtui/settingspages/backlogsettingspage.ui:22
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "Number of messages to be requested from the core when using scrolling up in "
 "the buffer view."
@@ -354,27 +384,33 @@ msgstr ""
 "Aantal berichten dat van de core gevraagd moet worden wanneer omhoog wordt "
 "gescrold in de buffer-view."
 
-#: BacklogSettingsPage#5
+#: ../src/qtui/settingspages/backlogsettingspage.ui:25
+msgctxt "BacklogSettingsPage|"
 msgid "Dynamic backlog amount:"
-msgstr "Grootte van dynamische backlog"
+msgstr "Grootte van dynamische backlog:"
 
-#: BacklogSettingsPage#6
+#: ../src/qtui/settingspages/backlogsettingspage.ui:75
+msgctxt "BacklogSettingsPage|"
 msgid "Backlog request method:"
 msgstr "Backlog aanvraagmethode:"
 
-#: BacklogSettingsPage#7
+#: ../src/qtui/settingspages/backlogsettingspage.ui:83
+msgctxt "BacklogSettingsPage|"
 msgid "Fixed amount per chat"
 msgstr "Vaste hoeveelheid per chat"
 
-#: BacklogSettingsPage#8
+#: ../src/qtui/settingspages/backlogsettingspage.ui:88
+msgctxt "BacklogSettingsPage|"
 msgid "Unread messages per chat"
 msgstr "Ongelezen berichten per chat"
 
-#: BacklogSettingsPage#9
+#: ../src/qtui/settingspages/backlogsettingspage.ui:93
+msgctxt "BacklogSettingsPage|"
 msgid "Globally unread messages"
 msgstr "Globaal ongelezen berichten"
 
-#: BacklogSettingsPage#10
+#: ../src/qtui/settingspages/backlogsettingspage.ui:123
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "The simplest requester. It fetches a fixed amount of lines for each chat "
 "window from the backlog."
@@ -382,7 +418,8 @@ msgstr ""
 "Eenvoudig ophalen. Haal voor elk venster een vast aantal regels op van de "
 "backlog."
 
-#: BacklogSettingsPage#11
+#: ../src/qtui/settingspages/backlogsettingspage.ui:138
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "amount of messages per buffer that are requested after the core connection "
 "has been established."
@@ -390,11 +427,13 @@ msgstr ""
 "aantal berichten per buffer dat wordt opgevraagd nadat de core-verbinding "
 "tot stand is gebracht."
 
-#: BacklogSettingsPage#12
+#: ../src/qtui/settingspages/backlogsettingspage.ui:141
+msgctxt "BacklogSettingsPage|"
 msgid "Initial backlog amount:"
 msgstr "Initiële grootte backlog:"
 
-#: BacklogSettingsPage#13
+#: ../src/qtui/settingspages/backlogsettingspage.ui:205
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "This requester fetches unread messages for each chat window individually. "
 "The amount of lines can be limited per chat.\n"
@@ -408,20 +447,30 @@ msgstr ""
 "U kunt er ook voor kiezen nog extra regels op te vragen voor een betere "
 "context."
 
-#: BacklogSettingsPage#14
+#: ../src/qtui/settingspages/backlogsettingspage.ui:222
+#: ../src/qtui/settingspages/backlogsettingspage.ui:232
+#: ../src/qtui/settingspages/backlogsettingspage.ui:354
+msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched per buffer."
 msgstr "Maximaal aantal berichten dat per buffer opgehaald kan worden."
 
-#: BacklogSettingsPage#15
+#: ../src/qtui/settingspages/backlogsettingspage.ui:225
+#: ../src/qtui/settingspages/backlogsettingspage.ui:347
+msgctxt "BacklogSettingsPage|"
 msgid "Limit:"
 msgstr "Limiet:"
 
-#: BacklogSettingsPage#16
-msgctxt "BacklogSettingsPage#16"
+#: ../src/qtui/settingspages/backlogsettingspage.ui:235
+#: ../src/qtui/settingspages/backlogsettingspage.ui:357
+msgctxt "BacklogSettingsPage|"
 msgid "Unlimited"
-msgstr "Ongelimiteerd"
+msgstr "Onbeperkt"
 
-#: BacklogSettingsPage#17
+#: ../src/qtui/settingspages/backlogsettingspage.ui:260
+#: ../src/qtui/settingspages/backlogsettingspage.ui:270
+#: ../src/qtui/settingspages/backlogsettingspage.ui:382
+#: ../src/qtui/settingspages/backlogsettingspage.ui:392
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "Amount of messages to be fetched in addition to the unread messages. The "
 "Limit does not apply here."
@@ -429,11 +478,14 @@ msgstr ""
 "Aantal berichten dat naast het aantal ongelezen berichten opgehaald kan "
 "worden. Het Limiet is hierbij niet van toepassing."
 
-#: BacklogSettingsPage#18
+#: ../src/qtui/settingspages/backlogsettingspage.ui:263
+#: ../src/qtui/settingspages/backlogsettingspage.ui:385
+msgctxt "BacklogSettingsPage|"
 msgid "Additional Messages:"
 msgstr "Extra berichten:"
 
-#: BacklogSettingsPage#19
+#: ../src/qtui/settingspages/backlogsettingspage.ui:324
+msgctxt "BacklogSettingsPage|"
 msgid ""
 "This requester fetches all messages newer than the oldest unread message for "
 "all chats.\n"
@@ -456,19 +508,35 @@ msgstr ""
 "\n"
 "U kunt er ook van kiezen extra berichten op te halen voor een betere context."
 
-#: BacklogSettingsPage#20
+#: ../src/qtui/settingspages/backlogsettingspage.ui:344
+msgctxt "BacklogSettingsPage|"
 msgid "Maximum amount of messages to be fetched over all buffers."
 msgstr "Maximaal aantal op te halen berichten voor alle buffers bij elkaar."
 
-#: BufferItem#1
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgctxt "BacklogSettingsPage|"
+msgid "Interface"
+msgstr "Interface"
+
+#: ../src/qtui/settingspages/backlogsettingspage.cpp:27
+msgctxt "BacklogSettingsPage|"
+msgid "Backlog Fetching"
+msgstr "Backlog verkrijgen"
+
+#: ../src/client/networkmodel.cpp:386
+#, qt-format
+msgctxt "BufferItem|"
 msgid "<p> %1 - %2 </p>"
 msgstr "<p> %1 - %2 </p>"
 
-#: BufferView#1
+#: ../src/uisupport/bufferview.cpp:272
+msgctxt "BufferView|"
 msgid "Merge buffers permanently?"
 msgstr "Buffers definitief samenvoegen?"
 
-#: BufferView#2
+#: ../src/uisupport/bufferview.cpp:273
+#, qt-format
+msgctxt "BufferView|"
 msgid ""
 "Do you want to merge the buffer \"%1\" permanently into buffer \"%2\"?\n"
 " This cannot be reversed!"
@@ -476,74 +544,64 @@ msgstr ""
 "Wilt u de buffer \"%1\" definitief in buffer \"%2\" invoegen?\n"
 " Dit kan niet ongedaan gemaakt worden!"
 
-#: BufferViewEditDlg#1
-msgctxt "BufferViewEditDlg#1"
+#: ../src/qtui/settingspages/buffervieweditdlg.ui:14
+msgctxt "BufferViewEditDlg|"
 msgid "Dialog"
-msgstr "Dialoog"
+msgstr "Dialoogvenster"
 
-#: BufferViewEditDlg#2
+#: ../src/qtui/settingspages/buffervieweditdlg.ui:22
+msgctxt "BufferViewEditDlg|"
 msgid "Please enter a name for the chat list:"
 msgstr "Vul een naam voor de chatlijst in:"
 
-#: BufferViewEditDlg#3
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:575
+msgctxt "BufferViewEditDlg|"
 msgid "Add Chat List"
 msgstr "Chatlijst toevoegen"
 
-#: BufferViewFilter#1
+#: ../src/uisupport/bufferviewfilter.cpp:54
+msgctxt "BufferViewFilter|"
 msgid "Show / Hide Chats"
 msgstr "Chats tonen/verbergen"
 
-#: BufferViewSettingsPage#1
-msgctxt "BufferViewSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: BufferViewSettingsPage#2
-msgid "Custom Chat Lists"
-msgstr "Eigen chatlijst"
-
-#: BufferViewSettingsPage#3
-msgid "All"
-msgstr "Alle"
-
-#: BufferViewSettingsPage#4
-msgid "Delete Chat List?"
-msgstr "Chatlijst verwijderen?"
-
-#: BufferViewSettingsPage#5
-msgid "Do you really want to delete the chat list \"%1\"?"
-msgstr "Wilt u echt de chatlijst \"%1\" verwijderen?"
-
-#: BufferViewSettingsPage#6
-msgctxt "BufferViewSettingsPage#6"
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:14
+msgctxt "BufferViewSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: BufferViewSettingsPage#7
-msgctxt "BufferViewSettingsPage#7"
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:31
+msgctxt "BufferViewSettingsPage|"
 msgid "Re&name..."
-msgstr "Her&noemen..."
+msgstr "Her&noemen…"
 
-#: BufferViewSettingsPage#8
-msgctxt "BufferViewSettingsPage#8"
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:48
+msgctxt "BufferViewSettingsPage|"
 msgid "&Add..."
 msgstr "&Toevoegen..."
 
-#: BufferViewSettingsPage#9
-msgctxt "BufferViewSettingsPage#9"
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:71
+msgctxt "BufferViewSettingsPage|"
 msgid "De&lete"
 msgstr "&Verwijderen"
 
-#: BufferViewSettingsPage#10
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:84
+msgctxt "BufferViewSettingsPage|"
 msgid "Chat List Settings"
 msgstr "Chatlijst instellingen"
 
-#: BufferViewSettingsPage#11
-msgctxt "BufferViewSettingsPage#11"
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:92
+msgctxt "BufferViewSettingsPage|"
 msgid "Network:"
 msgstr "Netwerk:"
 
-#: BufferViewSettingsPage#12
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:100
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:123
+msgctxt "BufferViewSettingsPage|"
+msgid "All"
+msgstr "Alle"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:110
+msgctxt "BufferViewSettingsPage|"
 msgid ""
 "This option is not available when all Networks are visible.\n"
 "In this mode no separate status buffer is displayed."
@@ -551,104 +609,164 @@ msgstr ""
 "Deze optie is niet beschikbaar wanneer alle Netwerken zichtbaar zijn.\n"
 "In deze modus wordt geen aparte statusbuffer getoond."
 
-#: BufferViewSettingsPage#13
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:114
+msgctxt "BufferViewSettingsPage|"
 msgid "Show status window"
-msgstr "Toon statusvenster"
+msgstr "Statusvenster weergeven"
 
-#: BufferViewSettingsPage#14
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:121
+msgctxt "BufferViewSettingsPage|"
 msgid "Show channels"
-msgstr "Toon kanalen"
+msgstr "Kanalen weergeven"
 
-#: BufferViewSettingsPage#15
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:128
+msgctxt "BufferViewSettingsPage|"
 msgid "Show queries"
-msgstr "Toon aanvragen"
+msgstr "Queries weergeven"
 
-#: BufferViewSettingsPage#16
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:135
+msgctxt "BufferViewSettingsPage|"
 msgid "Hide inactive chats"
 msgstr "Inactieve chats verbergen"
 
-#: BufferViewSettingsPage#17
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:142
+msgctxt "BufferViewSettingsPage|"
 msgid "Add new chats automatically"
 msgstr "Automatisch nieuwe chats toevoegen"
 
-#: BufferViewSettingsPage#18
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:149
+msgctxt "BufferViewSettingsPage|"
 msgid "Sort alphabetically"
 msgstr "Op alfabet sorteren"
 
-#: BufferViewSettingsPage#19
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:156
+msgctxt "BufferViewSettingsPage|"
 msgid "Minimum Activity:"
 msgstr "Minimale activiteit:"
 
-#: BufferViewSettingsPage#20
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:164
+msgctxt "BufferViewSettingsPage|"
 msgid "No Activity"
 msgstr "Geen activiteit"
 
-#: BufferViewSettingsPage#21
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:169
+msgctxt "BufferViewSettingsPage|"
 msgid "Other Activity"
 msgstr "Andere activiteit"
 
-#: BufferViewSettingsPage#22
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:174
+msgctxt "BufferViewSettingsPage|"
 msgid "New Message"
 msgstr "Nieuw bericht"
 
-#: BufferViewSettingsPage#23
-msgctxt "BufferViewSettingsPage#23"
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:179
+msgctxt "BufferViewSettingsPage|"
 msgid "Highlight"
 msgstr "Markeer"
 
-#: BufferViewSettingsPage#24
+#: ../src/qtui/settingspages/bufferviewsettingspage.ui:205
+msgctxt "BufferViewSettingsPage|"
 msgid "Preview:"
 msgstr "Voorbeeld:"
 
-#: BufferViewWidget#1
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+msgctxt "BufferViewSettingsPage|"
+msgid "Interface"
+msgstr "Interface"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:36
+msgctxt "BufferViewSettingsPage|"
+msgid "Custom Chat Lists"
+msgstr "Eigen chatlijst"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:378
+msgctxt "BufferViewSettingsPage|"
+msgid "Delete Chat List?"
+msgstr "Chatlijst verwijderen?"
+
+#: ../src/qtui/settingspages/bufferviewsettingspage.cpp:379
+#, qt-format
+msgctxt "BufferViewSettingsPage|"
+msgid "Do you really want to delete the chat list \"%1\"?"
+msgstr "Wilt u de chatlijst \"%1\" echt verwijderen?"
+
+#: ../src/qtui/ui/bufferviewwidget.ui:26
+msgctxt "BufferViewWidget|"
 msgid "BufferView"
 msgstr "Bufferweergave"
 
-#: BufferWidget#1
+#: ../src/qtui/bufferwidget.cpp:78
+msgctxt "BufferWidget|"
 msgid "Zoom In"
 msgstr "Inzoomen"
 
-#: BufferWidget#2
+#: ../src/qtui/bufferwidget.cpp:84
+msgctxt "BufferWidget|"
 msgid "Zoom Out"
 msgstr "Uitzoomen"
 
-#: BufferWidget#3
+#: ../src/qtui/bufferwidget.cpp:89
+msgctxt "BufferWidget|"
 msgid "Actual Size"
 msgstr "Werkelijke grootte"
 
-#: ChannelBufferItem#1
+#: ../src/qtui/bufferwidget.cpp:93
+msgctxt "BufferWidget|"
+msgid "Set Marker Line"
+msgstr "Stel markeerlijn in"
+
+#: ../src/qtui/bufferwidget.cpp:97
+msgctxt "BufferWidget|"
+msgid "Go to Marker Line"
+msgstr "Ga naar de markeerlijn"
+
+#: ../src/client/networkmodel.cpp:565
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Channel %1</b>"
 msgstr "<b>Kanaal %1</b>"
 
-#: ChannelBufferItem#2
+#: ../src/client/networkmodel.cpp:568
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Users:</b> %1"
 msgstr "<b>Gebruikers:</b> %1"
 
-#: ChannelBufferItem#3
+#: ../src/client/networkmodel.cpp:572
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Mode:</b> %1"
 msgstr "<b>Modus:</b> %1"
 
-#: ChannelBufferItem#4
+#: ../src/client/networkmodel.cpp:583
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<b>Topic:</b> %1"
 msgstr "<b>Onderwerp:</b> %1"
 
-#: ChannelBufferItem#5
+#: ../src/client/networkmodel.cpp:588
+msgctxt "ChannelBufferItem|"
 msgid "Not active <br /> Double-click to join"
 msgstr "Niet actief <br /> Dubbelklik om binnen te gaan"
 
-#: ChannelBufferItem#6
+#: ../src/client/networkmodel.cpp:591
+#, qt-format
+msgctxt "ChannelBufferItem|"
 msgid "<p> %1 </p>"
 msgstr "<p> %1 </p>"
 
-#: ChannelListDlg#1
+#: ../src/qtui/ui/channellistdlg.ui:14
+msgctxt "ChannelListDlg|"
 msgid "Channel List"
 msgstr "Kanaallijst"
 
-#: ChannelListDlg#2
+#: ../src/qtui/ui/channellistdlg.ui:38
+msgctxt "ChannelListDlg|"
 msgid "Search Pattern:"
 msgstr "Zoekpatroon:"
 
-#: ChannelListDlg#3
+#: ../src/qtui/ui/channellistdlg.ui:48
+msgctxt "ChannelListDlg|"
 msgid ""
 "Toggle between simple and advanced mode.\n"
 "Advanced mode allows to pass search strings to the IRC Server."
@@ -656,91 +774,71 @@ msgstr ""
 "Wissel tussen eenvoudige en geavanceerde modus.\n"
 "In de geavanceerde modus kunt u zoekopdrachten naar de IRC-server sturen."
 
-#: ChannelListDlg#4
+#: ../src/qtui/ui/channellistdlg.ui:62
+msgctxt "ChannelListDlg|"
 msgid "Show Channels"
-msgstr "Toon kanalen"
+msgstr "Kanalen weergeven"
 
-#: ChannelListDlg#5
+#: ../src/qtui/ui/channellistdlg.ui:86
+msgctxt "ChannelListDlg|"
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ChannelListDlg#6
-msgid "Errors Occured:"
+#: ../src/qtui/ui/channellistdlg.ui:98
+msgctxt "ChannelListDlg|"
+msgid "Errors Occurred:"
 msgstr "Er zijn fouten opgetreden:"
 
-#: ChannelListDlg#7
+#: ../src/qtui/ui/channellistdlg.ui:132
+msgctxt "ChannelListDlg|"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC "
-"ERROR!!11</span></p>\n"
+"family:'Lucida Grande'; font-size:13pt;\">SUPER EVIL CATASTROPHIC ERROR!!11</"
+"span></p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
 "family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:8pt; font-"
 "weight:400; font-style:normal;\">\n"
 "<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-"
 "right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-"
-"family:'Lucida Grande'; font-size:13pt;\">SUPERERGE CATASTROFALE "
-"FOUT!!11</span></p>\n"
+"family:'Lucida Grande'; font-size:13pt;\">SUPERERGE CATASTROFALE FOUT!!11</"
+"span></p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; "
 "margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-"
 "family:'Lucida Grande'; font-size:13pt;\"></p></body></html>"
 
-#: ChatMonitorSettingsPage#1
-msgctxt "ChatMonitorSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: ChatMonitorSettingsPage#2
-msgctxt "ChatMonitorSettingsPage#2"
-msgid "Chat Monitor"
-msgstr "Chatmonitor"
-
-#: ChatMonitorSettingsPage#3
-msgid "Opt In"
-msgstr "Opt in"
-
-#: ChatMonitorSettingsPage#4
-msgid "Opt Out"
-msgstr "Opt out"
-
-#: ChatMonitorSettingsPage#5
-msgid "Show:"
-msgstr "Toon:"
-
-#: ChatMonitorSettingsPage#6
-msgid "Ignore:"
-msgstr "Negeer:"
-
-#: ChatMonitorSettingsPage#7
-msgctxt "ChatMonitorSettingsPage#7"
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:14
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: ChatMonitorSettingsPage#8
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:22
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Operation Mode:"
 msgstr "Operatie-modus:"
 
-#: ChatMonitorSettingsPage#9
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:29
+msgctxt "ChatMonitorSettingsPage|"
 msgid ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
 "weight:400; font-style:normal;\">\n"
@@ -757,10 +855,10 @@ msgid ""
 "decoration: underline;\">Opt-Out:</span> Buffers on the right side will be "
 "ignored in chatmonitor</p></body></html>"
 msgstr ""
-"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" "
-"\"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
-"<html><head><meta name=\"qrichtext\" content=\"1\" /><style "
-"type=\"text/css\">\n"
+"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/"
+"REC-html40/strict.dtd\">\n"
+"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css"
+"\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:'DejaVu Sans'; font-size:9pt; font-"
 "weight:400; font-style:normal;\">\n"
@@ -777,220 +875,367 @@ msgstr ""
 "decoration: underline;\">Opt-Out:</span> Buffers aan de rechterkant zullen "
 "in de chatmonitor genegeerd worden</p></body></html>"
 
-#: ChatMonitorSettingsPage#10
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:61
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Available:"
 msgstr "Beschikbaar:"
 
-#: ChatMonitorSettingsPage#11
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:88
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Move selected buffers to the left"
-msgstr "Verplaats de geselecteerde buffers naar links"
+msgstr "Geselecteerde buffers naar links verplaatsen"
 
-#: ChatMonitorSettingsPage#12
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:102
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Move selected buffers to the right"
-msgstr "Verplaats de geselecteerde buffers naar rechts"
+msgstr "Geselecteerde buffers naar rechts verplaatsen"
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:133
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:258
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Show:"
+msgstr "Toon:"
 
-#: ChatMonitorSettingsPage#13
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:147
+msgctxt "ChatMonitorSettingsPage|"
 msgid ""
 "Show highlights in chatmonitor even if the originating buffer is ignored"
 msgstr ""
 "Toon markeringen in de chatmonitor zelfs als de oorspronkelijke buffer "
 "genegeerd wordt"
 
-#: ChatMonitorSettingsPage#14
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:150
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Always show highlighted messages"
-msgstr "Toon gemarkeerde berichten altijd"
+msgstr "Gemarkeerde berichten altijd weergeven"
 
-#: ChatMonitorSettingsPage#15
+#: ../src/qtui/settingspages/chatmonitorsettingspage.ui:157
+msgctxt "ChatMonitorSettingsPage|"
 msgid "Show own messages"
-msgstr "Toon eigen berichten"
+msgstr "Eigen berichten weergeven"
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Interface"
+msgstr "Interface"
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:35
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Chat Monitor"
+msgstr "Chatmonitor"
 
-#: ChatMonitorView#1
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:59
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Opt In"
+msgstr "Opt-in"
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:60
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Opt Out"
+msgstr "Opt-out"
+
+#: ../src/qtui/settingspages/chatmonitorsettingspage.cpp:261
+msgctxt "ChatMonitorSettingsPage|"
+msgid "Ignore:"
+msgstr "Negeer:"
+
+#: ../src/qtui/chatmonitorview.cpp:54
+msgctxt "ChatMonitorView|"
 msgid "Show Own Messages"
-msgstr "Toon eigen berichten"
+msgstr "Eigen berichten weergeven"
 
-#: ChatMonitorView#2
-msgctxt "ChatMonitorView#2"
+#: ../src/qtui/chatmonitorview.cpp:61
+msgctxt "ChatMonitorView|"
 msgid "Show Network Name"
-msgstr "Toon netwerknaam"
+msgstr "Netwerknaam weergeven"
 
-#: ChatMonitorView#3
-msgctxt "ChatMonitorView#3"
+#: ../src/qtui/chatmonitorview.cpp:66
+msgctxt "ChatMonitorView|"
 msgid "Show Buffer Name"
-msgstr "Toon buffernaam"
+msgstr "Buffernaam weergeven"
 
-#: ChatMonitorView#4
+#: ../src/qtui/chatmonitorview.cpp:73
+msgctxt "ChatMonitorView|"
 msgid "Configure..."
-msgstr "Configureer..."
+msgstr "Instellen…"
 
-#: ChatScene#1
+#: ../src/qtui/chatscene.cpp:803
+msgctxt "ChatScene|"
 msgid "Copy Selection"
 msgstr "Selectie kopiëren"
 
-#: ChatViewSearchBar#1
-msgctxt "ChatViewSearchBar#1"
+#: ../src/qtui/ui/chatviewsearchbar.ui:13
+msgctxt "ChatViewSearchBar|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: ChatViewSearchBar#2
-msgctxt "ChatViewSearchBar#2"
+#: ../src/qtui/ui/chatviewsearchbar.ui:19
+#: ../src/qtui/ui/chatviewsearchbar.ui:33
+#: ../src/qtui/ui/chatviewsearchbar.ui:44
+msgctxt "ChatViewSearchBar|"
 msgid "..."
-msgstr "..."
+msgstr "…"
 
-#: ChatViewSearchBar#3
+#: ../src/qtui/ui/chatviewsearchbar.ui:55
+msgctxt "ChatViewSearchBar|"
 msgid "case sensitive"
 msgstr "hoofdlettergevoelig"
 
-#: ChatViewSearchBar#4
+#: ../src/qtui/ui/chatviewsearchbar.ui:62
+msgctxt "ChatViewSearchBar|"
 msgid "search nick"
-msgstr "zoek nick"
+msgstr "nick zoeken"
 
-#: ChatViewSearchBar#5
+#: ../src/qtui/ui/chatviewsearchbar.ui:69
+msgctxt "ChatViewSearchBar|"
 msgid "search message"
-msgstr "zoek bericht"
+msgstr "bericht zoeken"
 
-#: ChatViewSearchBar#6
+#: ../src/qtui/ui/chatviewsearchbar.ui:82
+msgctxt "ChatViewSearchBar|"
 msgid "ignore joins, parts, etc."
 msgstr "negeer binnenkomen, verlaten, etc,"
 
-#: ChatViewSettingsPage#1
-msgctxt "ChatViewSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: ChatViewSettingsPage#2
-msgid "Chat View"
-msgstr "Chatvenster"
-
-#: ChatViewSettingsPage#3
-msgctxt "ChatViewSettingsPage#3"
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:14
+msgctxt "ChatViewSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: ChatViewSettingsPage#4
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:22
+msgctxt "ChatViewSettingsPage|"
 msgid "Timestamp format:"
 msgstr "Tijdformaat"
 
-#: ChatViewSettingsPage#5
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:29
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"<html><head/><body><p>Usage examples:</p>\n"
+"<table cellpadding=\"2\">\n"
+"<tr><td>dd.MM.yyyy</td><td>21.05.2001</td></tr>\n"
+"<tr><td>ddd MMMM d yy</td><td>Tue May 21 01</td></tr>\n"
+"<tr><td>hh:mm:ss.zzz</td><td>14:13:09.042</td></tr>\n"
+"<tr><td>h:m:s ap</td><td>2:13:9 pm</td></tr>\n"
+"</table>\n"
+"</body></html>"
+msgstr ""
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:42
+msgctxt "ChatViewSettingsPage|"
 msgid "[hh:mm:ss]"
 msgstr "[hh:mm:ss]"
 
-#: ChatViewSettingsPage#6
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:69
+msgctxt "ChatViewSettingsPage|"
 msgid "Custom chat window font:"
-msgstr "Chatvenster lettertype:"
+msgstr "Lettertype voor eigen chatvenster:"
 
-#: ChatViewSettingsPage#7
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:102
+msgctxt "ChatViewSettingsPage|"
+msgid "Show colored text in the chat window"
+msgstr "Laat gekleurde text zien in het chat venster"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:105
+msgctxt "ChatViewSettingsPage|"
 msgid "Allow colored text (mIRC color codes)"
-msgstr "Sta gekleurde tekst toe (mIRC color codes)"
+msgstr "Gekleurde tekst toestaan (mIRC color codes)"
 
-#: ChatViewSettingsPage#8
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:121
+msgctxt "ChatViewSettingsPage|"
 msgid ""
 "Show a website preview window when hovering the mouse over a web address"
 msgstr "Toon een previewvenster wanneer u uw muis boven een url houdt."
 
-#: ChatViewSettingsPage#9
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:124
+msgctxt "ChatViewSettingsPage|"
 msgid "Show previews of webpages on URL hover"
 msgstr "Toon previews van webpagina's als uw muis boven een url staat"
 
-#: ChatViewSettingsPage#10
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:140
+msgctxt "ChatViewSettingsPage|"
+msgid ""
+"Set the marker line to the bottom of the current chat window when selecting "
+"another channel"
+msgstr ""
+"Stel de markeerlijn in onderaan het huidige chatvenster wanneer een ander "
+"kanaal geselecteerd wordt"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:143
+msgctxt "ChatViewSettingsPage|"
+msgid "Set marker line automatically when switching chats"
+msgstr "Stel de markeerlijn automatisch in als chats gewisseld worden"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:159
+msgctxt "ChatViewSettingsPage|"
 msgid "Custom Colors"
 msgstr "Eigen kleuren"
 
-#: ChatViewSettingsPage#11
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:177
+msgctxt "ChatViewSettingsPage|"
 msgid "Action:"
 msgstr "Actie:"
 
-#: ChatViewSettingsPage#12
-msgctxt "ChatViewSettingsPage#12"
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:184
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:208
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:232
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:269
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:293
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:324
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:348
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:372
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:396
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:413
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:453
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:470
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:487
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:504
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:521
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:538
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:555
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:572
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:589
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:606
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:623
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:640
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:657
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:674
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:691
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:708
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:736
+msgctxt "ChatViewSettingsPage|"
 msgid "..."
-msgstr "..."
+msgstr "…"
 
-#: ChatViewSettingsPage#13
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:201
+msgctxt "ChatViewSettingsPage|"
 msgid "Timestamp:"
 msgstr "Tijd:"
 
-#: ChatViewSettingsPage#14
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:225
+msgctxt "ChatViewSettingsPage|"
 msgid "Channel message:"
 msgstr "Kanaalbericht:"
 
-#: ChatViewSettingsPage#15
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:262
+msgctxt "ChatViewSettingsPage|"
 msgid "Highlight foreground:"
 msgstr "Voorgrond bij markering:"
 
-#: ChatViewSettingsPage#16
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:286
+msgctxt "ChatViewSettingsPage|"
 msgid "Command message:"
 msgstr "Commandobericht:"
 
-#: ChatViewSettingsPage#17
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:310
+msgctxt "ChatViewSettingsPage|"
 msgid "Highlight background:"
 msgstr "Achtergrond bij markering:"
 
-#: ChatViewSettingsPage#18
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:317
+msgctxt "ChatViewSettingsPage|"
 msgid "Server message:"
 msgstr "Serverbericht:"
 
-#: ChatViewSettingsPage#19
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:341
+msgctxt "ChatViewSettingsPage|"
 msgid "Marker line:"
 msgstr "Markeerlijn:"
 
-#: ChatViewSettingsPage#20
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:365
+msgctxt "ChatViewSettingsPage|"
 msgid "Error message:"
 msgstr "Foutbericht:"
 
-#: ChatViewSettingsPage#21
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:389
+msgctxt "ChatViewSettingsPage|"
 msgid "Background:"
 msgstr "Achtergrond:"
 
-#: ChatViewSettingsPage#22
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:433
+msgctxt "ChatViewSettingsPage|"
 msgid "Use Sender Coloring"
 msgstr "Kleur naar verzender"
 
-#: ChatViewSettingsPage#23
+#: ../src/qtui/settingspages/chatviewsettingspage.ui:729
+msgctxt "ChatViewSettingsPage|"
 msgid "Own messages:"
 msgstr "Eigen berichten:"
 
-#: Client#1
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgctxt "ChatViewSettingsPage|"
+msgid "Interface"
+msgstr "Interface"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:28
+msgctxt "ChatViewSettingsPage|"
+msgid "Chat View"
+msgstr "Chatvenster"
+
+#: ../src/qtui/settingspages/chatviewsettingspage.cpp:41
+msgctxt "ChatViewSettingsPage|"
+msgid "You need at 0.6 quasselcore to use this feature"
+msgstr ""
+"U heeft minstens versie 0.6 van quasselcore nodig om deze optie te gebruiken"
+
+#: ../src/client/client.cpp:318
+msgctxt "Client|"
 msgid "Identity already exists in client!"
 msgstr "Identiteit bestaat al in client!"
 
-#: Client#2
+#: ../src/client/clientbacklogmanager.cpp:178
+#, qt-format
+msgctxt "ClientBacklogManager|"
+msgid "Processed %1 messages in %2 seconds."
+msgstr "In %2 seconden %1 berichten verwerkt"
+
+#: ../src/client/clientbufferviewmanager.cpp:60
+msgctxt "ClientBufferViewManager|"
 msgid "All Chats"
 msgstr "Alle chats"
 
-#: ClientBacklogManager#1
-msgid "Processed %1 messages in %2 seconds."
-msgstr "In %2 seconden %1 berichten verwerkt"
+#: ../src/client/clientuserinputhandler.cpp:98
+msgctxt "ClientUserInputHandler|"
+msgid "/JOIN expects a channel"
+msgstr "/JOIN verwacht een kanaal"
 
-#: ConnectionSettingsPage#1
-msgctxt "ConnectionSettingsPage#1"
-msgid "IRC"
-msgstr "IRC"
+#: ../src/client/clientuserinputhandler.cpp:110
+msgctxt "ClientUserInputHandler|"
+msgid "/QUERY expects at least a nick"
+msgstr "/QUERY verwacht minimaal een bijnaam"
 
-#: ConnectionSettingsPage#2
+#: ../src/qtui/settingspages/connectionsettingspage.ui:14
+msgctxt "ConnectionSettingsPage|"
 msgid "Configure the IRC Connection"
-msgstr "Configureer de IRC-verbinding"
+msgstr "De IRC-verbinding configureren"
 
-#: ConnectionSettingsPage#3
+#: ../src/qtui/settingspages/connectionsettingspage.ui:20
+msgctxt "ConnectionSettingsPage|"
 msgid "Enable Ping Timeout Detection"
-msgstr "Detecteer ping-timeout"
+msgstr "Detectie van ping-timeout inschakelen"
 
-#: ConnectionSettingsPage#4
+#: ../src/qtui/settingspages/connectionsettingspage.ui:37
+msgctxt "ConnectionSettingsPage|"
 msgid "Ping interval:"
 msgstr "Ping-interval:"
 
-#: ConnectionSettingsPage#5
-msgctxt "ConnectionSettingsPage#5"
+#: ../src/qtui/settingspages/connectionsettingspage.ui:44
+#: ../src/qtui/settingspages/connectionsettingspage.ui:155
+#: ../src/qtui/settingspages/connectionsettingspage.ui:213
+msgctxt "ConnectionSettingsPage|"
 msgid " seconds"
 msgstr " seconden"
 
-#: ConnectionSettingsPage#6
+#: ../src/qtui/settingspages/connectionsettingspage.ui:80
+msgctxt "ConnectionSettingsPage|"
 msgid "Disconnect after"
 msgstr "Verbreek de verbinding na"
 
-#: ConnectionSettingsPage#7
+#: ../src/qtui/settingspages/connectionsettingspage.ui:103
+msgctxt "ConnectionSettingsPage|"
 msgid "missed pings"
 msgstr "gemiste pings"
 
-#: ConnectionSettingsPage#8
+#: ../src/qtui/settingspages/connectionsettingspage.ui:128
+msgctxt "ConnectionSettingsPage|"
 msgid ""
 "This enables periodic polling of user information using /WHO. This is mostly "
 "interesting for tracking users' away status."
@@ -998,205 +1243,263 @@ msgstr ""
 "Vraag periodiek gebruikersinformatie op met /WHO. Dit is vooral handig voor "
 "het bijhouden van de afwezigheidsstatus van gebruikers."
 
-#: ConnectionSettingsPage#9
+#: ../src/qtui/settingspages/connectionsettingspage.ui:131
+msgctxt "ConnectionSettingsPage|"
 msgid "Enable Automatic User Information Lookup (/WHO)"
 msgstr "Activeer automatisch opvragen van gebruikersinformatie (/WHO)"
 
-#: ConnectionSettingsPage#10
+#: ../src/qtui/settingspages/connectionsettingspage.ui:148
+msgctxt "ConnectionSettingsPage|"
 msgid "Update interval:"
 msgstr "Vernieuwingsinterval"
 
-#: ConnectionSettingsPage#11
+#: ../src/qtui/settingspages/connectionsettingspage.ui:177
+msgctxt "ConnectionSettingsPage|"
 msgid "Ignore channels with more than:"
 msgstr "Negeer kanalen met meer dan:"
 
-#: ConnectionSettingsPage#12
+#: ../src/qtui/settingspages/connectionsettingspage.ui:184
+msgctxt "ConnectionSettingsPage|"
 msgid " users"
 msgstr " gebruikers"
 
-#: ConnectionSettingsPage#13
+#: ../src/qtui/settingspages/connectionsettingspage.ui:206
+msgctxt "ConnectionSettingsPage|"
 msgid "Minimum delay between requests:"
 msgstr "Minimale vertraging tussen aanvragen:"
 
-#: ContentsChatItem#1
+#: ../src/qtui/settingspages/connectionsettingspage.cpp:27
+msgctxt "ConnectionSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/chatitem.cpp:803
+msgctxt "ContentsChatItem|"
 msgid "Copy Link Address"
-msgstr "Kopieer link-adres"
+msgstr "Link-adres kopiëren"
 
-#: ContextMenuActionProvider#1
-msgctxt "ContextMenuActionProvider#1"
+#: ../src/uisupport/contextmenuactionprovider.cpp:39
+msgctxt "ContextMenuActionProvider|"
 msgid "Connect"
-msgstr "Verbindt"
+msgstr "Verbinden"
 
-#: ContextMenuActionProvider#2
-msgctxt "ContextMenuActionProvider#2"
+#: ../src/uisupport/contextmenuactionprovider.cpp:40
+msgctxt "ContextMenuActionProvider|"
 msgid "Disconnect"
-msgstr "Verbreek verbinding"
+msgstr "Verbinding verbreken"
 
-#: ContextMenuActionProvider#3
-msgctxt "ContextMenuActionProvider#3"
+#: ../src/uisupport/contextmenuactionprovider.cpp:42
+msgctxt "ContextMenuActionProvider|"
 msgid "Join"
 msgstr "Binnengaan"
 
-#: ContextMenuActionProvider#4
-msgctxt "ContextMenuActionProvider#4"
+#: ../src/uisupport/contextmenuactionprovider.cpp:43
+msgctxt "ContextMenuActionProvider|"
 msgid "Part"
-msgstr "Verlaat"
+msgstr "Verlaten"
 
-#: ContextMenuActionProvider#5
+#: ../src/uisupport/contextmenuactionprovider.cpp:44
+msgctxt "ContextMenuActionProvider|"
 msgid "Delete Chat(s)..."
-msgstr "Verwijder chat(s)..."
+msgstr "Chat(s) verwijderen..."
 
-#: ContextMenuActionProvider#6
+#: ../src/uisupport/contextmenuactionprovider.cpp:45
+msgctxt "ContextMenuActionProvider|"
 msgid "Go to Chat"
 msgstr "Ga naar chat"
 
-#: ContextMenuActionProvider#7
+#: ../src/uisupport/contextmenuactionprovider.cpp:47
+msgctxt "ContextMenuActionProvider|"
 msgid "Joins"
 msgstr "Binnenkomstberichten"
 
-#: ContextMenuActionProvider#8
+#: ../src/uisupport/contextmenuactionprovider.cpp:48
+msgctxt "ContextMenuActionProvider|"
 msgid "Parts"
 msgstr "Vertrekberichten"
 
-#: ContextMenuActionProvider#9
+#: ../src/uisupport/contextmenuactionprovider.cpp:49
+msgctxt "ContextMenuActionProvider|"
 msgid "Quits"
 msgstr "Afsluitberichten"
 
-#: ContextMenuActionProvider#10
+#: ../src/uisupport/contextmenuactionprovider.cpp:50
+msgctxt "ContextMenuActionProvider|"
 msgid "Nick Changes"
-msgstr "Veranderde bijnaam"
+msgstr "Veranderde nick"
 
-#: ContextMenuActionProvider#11
+#: ../src/uisupport/contextmenuactionprovider.cpp:51
+msgctxt "ContextMenuActionProvider|"
 msgid "Mode Changes"
 msgstr "Modus verandert"
 
-#: ContextMenuActionProvider#12
+#: ../src/uisupport/contextmenuactionprovider.cpp:52
+msgctxt "ContextMenuActionProvider|"
 msgid "Day Changes"
 msgstr "Dag verandert"
 
-#: ContextMenuActionProvider#13
+#: ../src/uisupport/contextmenuactionprovider.cpp:53
+msgctxt "ContextMenuActionProvider|"
 msgid "Topic Changes"
 msgstr "Onderwerp verandert"
 
-#: ContextMenuActionProvider#14
+#: ../src/uisupport/contextmenuactionprovider.cpp:54
+msgctxt "ContextMenuActionProvider|"
 msgid "Set as Default..."
 msgstr "Stel in als standaard..."
 
-#: ContextMenuActionProvider#15
+#: ../src/uisupport/contextmenuactionprovider.cpp:55
+msgctxt "ContextMenuActionProvider|"
 msgid "Use Defaults..."
 msgstr "Gebruik standaardwaarden..."
 
-#: ContextMenuActionProvider#16
+#: ../src/uisupport/contextmenuactionprovider.cpp:57
+msgctxt "ContextMenuActionProvider|"
 msgid "Join Channel..."
 msgstr "Kanaal binnengaan..."
 
-#: ContextMenuActionProvider#17
+#: ../src/uisupport/contextmenuactionprovider.cpp:59
+msgctxt "ContextMenuActionProvider|"
 msgid "Start Query"
-msgstr "Start aanvraag"
+msgstr "Start query"
 
-#: ContextMenuActionProvider#18
+#: ../src/uisupport/contextmenuactionprovider.cpp:60
+msgctxt "ContextMenuActionProvider|"
 msgid "Show Query"
-msgstr "Toon aanvraag"
+msgstr "Query weergeven"
 
-#: ContextMenuActionProvider#19
-msgctxt "ContextMenuActionProvider#19"
+#: ../src/uisupport/contextmenuactionprovider.cpp:61
+msgctxt "ContextMenuActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
-#: ContextMenuActionProvider#20
+#: ../src/uisupport/contextmenuactionprovider.cpp:63
+msgctxt "ContextMenuActionProvider|"
 msgid "Version"
 msgstr "Version"
 
-#: ContextMenuActionProvider#21
+#: ../src/uisupport/contextmenuactionprovider.cpp:64
+msgctxt "ContextMenuActionProvider|"
 msgid "Time"
 msgstr "Time"
 
-#: ContextMenuActionProvider#22
+#: ../src/uisupport/contextmenuactionprovider.cpp:65
+msgctxt "ContextMenuActionProvider|"
 msgid "Ping"
 msgstr "Ping"
 
-#: ContextMenuActionProvider#23
-msgid "Finger"
-msgstr "Finger"
+#: ../src/uisupport/contextmenuactionprovider.cpp:66
+msgctxt "ContextMenuActionProvider|"
+msgid "Client info"
+msgstr "Client-informatie"
 
-#: ContextMenuActionProvider#24
+#: ../src/uisupport/contextmenuactionprovider.cpp:67
+msgctxt "ContextMenuActionProvider|"
 msgid "Custom..."
 msgstr "Eigen..."
 
-#: ContextMenuActionProvider#25
+#: ../src/uisupport/contextmenuactionprovider.cpp:79
+msgctxt "ContextMenuActionProvider|"
 msgid "Give Operator Status"
 msgstr "Geef operatorstatus"
 
-#: ContextMenuActionProvider#26
+#: ../src/uisupport/contextmenuactionprovider.cpp:80
+msgctxt "ContextMenuActionProvider|"
 msgid "Take Operator Status"
 msgstr "Herroep operatorstatus"
 
-#: ContextMenuActionProvider#27
+#: ../src/uisupport/contextmenuactionprovider.cpp:81
+msgctxt "ContextMenuActionProvider|"
+msgid "Give Half-Operator Status"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:82
+msgctxt "ContextMenuActionProvider|"
+msgid "Take Half-Operator Status"
+msgstr ""
+
+#: ../src/uisupport/contextmenuactionprovider.cpp:83
+msgctxt "ContextMenuActionProvider|"
 msgid "Give Voice"
-msgstr "Geef Voice"
+msgstr "Geef voice"
 
-#: ContextMenuActionProvider#28
+#: ../src/uisupport/contextmenuactionprovider.cpp:84
+msgctxt "ContextMenuActionProvider|"
 msgid "Take Voice"
-msgstr "Herroep Voice"
+msgstr "Herroep voice"
 
-#: ContextMenuActionProvider#29
+#: ../src/uisupport/contextmenuactionprovider.cpp:85
+msgctxt "ContextMenuActionProvider|"
 msgid "Kick From Channel"
 msgstr "Schop het kanaal uit"
 
-#: ContextMenuActionProvider#30
+#: ../src/uisupport/contextmenuactionprovider.cpp:86
+msgctxt "ContextMenuActionProvider|"
 msgid "Ban From Channel"
 msgstr "Verban uit het kanaal"
 
-#: ContextMenuActionProvider#31
+#: ../src/uisupport/contextmenuactionprovider.cpp:87
+msgctxt "ContextMenuActionProvider|"
 msgid "Kick && Ban"
 msgstr "Kick && Ban"
 
-#: ContextMenuActionProvider#32
+#: ../src/uisupport/contextmenuactionprovider.cpp:89
+msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Temporarily"
 msgstr "Chat(s) tijdelijk verbergen"
 
-#: ContextMenuActionProvider#33
+#: ../src/uisupport/contextmenuactionprovider.cpp:90
+msgctxt "ContextMenuActionProvider|"
 msgid "Hide Chat(s) Permanently"
 msgstr "Chat(s) permanent verbergen"
 
-#: ContextMenuActionProvider#34
+#: ../src/uisupport/contextmenuactionprovider.cpp:91
+msgctxt "ContextMenuActionProvider|"
 msgid "Show Channel List"
-msgstr "Toon kanaallijst"
+msgstr "Kanaallijst weergeven"
 
-#: ContextMenuActionProvider#35
+#: ../src/uisupport/contextmenuactionprovider.cpp:92
+msgctxt "ContextMenuActionProvider|"
 msgid "Show Ignore List"
-msgstr "Toon negeerlijst"
+msgstr "Negeerlijst weergeven"
 
-#: ContextMenuActionProvider#36
+#: ../src/uisupport/contextmenuactionprovider.cpp:105
+msgctxt "ContextMenuActionProvider|"
 msgid "Hide Events"
-msgstr "Verberg gebeurtenissen"
+msgstr "Gebeurtenissen verbergen"
 
-#: ContextMenuActionProvider#37
-msgctxt "ContextMenuActionProvider#37"
+#: ../src/uisupport/contextmenuactionprovider.cpp:113
+msgctxt "ContextMenuActionProvider|"
 msgid "CTCP"
 msgstr "CTCP"
 
-#: ContextMenuActionProvider#38
+#: ../src/uisupport/contextmenuactionprovider.cpp:128
+msgctxt "ContextMenuActionProvider|"
 msgid "Actions"
 msgstr "Acties"
 
-#: ContextMenuActionProvider#39
+#: ../src/uisupport/contextmenuactionprovider.cpp:132
+msgctxt "ContextMenuActionProvider|"
 msgid "Ignore"
-msgstr "Negeer"
+msgstr "Negeren"
 
-#: ContextMenuActionProvider#40
+#: ../src/uisupport/contextmenuactionprovider.cpp:137
+msgctxt "ContextMenuActionProvider|"
 msgid "Add Ignore Rule"
-msgstr "Voeg negeer-regel toe"
+msgstr "Negeer-regel toevoegen"
 
-#: ContextMenuActionProvider#41
+#: ../src/uisupport/contextmenuactionprovider.cpp:138
+msgctxt "ContextMenuActionProvider|"
 msgid "Existing Rules"
 msgstr "Bestaande regels"
 
-#: Core#1
+#: ../src/core/core.cpp:188
+msgctxt "Core|"
 msgid "Could not initialize any storage backend! Exiting..."
 msgstr "Kon geen opslag-backend starten! Afsluiten..."
 
-#: Core#2
+#: ../src/core/core.cpp:189
+msgctxt "Core|"
 msgid ""
 "Currently, Quassel supports SQLite3 and PostgreSQL. You need to build your\n"
 "Qt library with the sqlite or postgres plugin enabled in order for "
@@ -1204,98 +1507,119 @@ msgid ""
 "to work."
 msgstr ""
 "Quassel ondersteunt momenteel SQLite3 en PostgreSQL. U moet uw\n"
-"Qt-bibliotheek met de sqlite of postgres plug-in bouwen anders zal "
+"Qt-bibliotheek met de sqlite of postgres plug-in bouwen, anders zal "
 "quasselcore\n"
 "niet werken."
 
-#: Core#3
+#: ../src/core/core.cpp:247
+msgctxt "Core|"
 msgid "Calling restoreState() even though active sessions exist!"
-msgstr "restoreState() aanroepen hoewel een sessie actief is!"
+msgstr "restoreState() wordt aangeroepen, hoewel een sessie actief is!"
 
-#: Core#4
+#: ../src/core/core.cpp:293
+msgctxt "Core|"
 msgid "Admin user or password not set."
 msgstr "Beheerderaccount of wachtwoord niet ingesteld."
 
-#: Core#5
+#: ../src/core/core.cpp:296
+msgctxt "Core|"
 msgid "Could not setup storage!"
-msgstr "Kon opslag niet starten!"
+msgstr "Kan opslag niet starten!"
 
-#: Core#6
+#: ../src/core/core.cpp:300
+msgctxt "Core|"
 msgid "Creating admin user..."
 msgstr "Beheerderaccount instellen..."
 
-#: Core#7
+#: ../src/core/core.cpp:432
+#, qt-format
+msgctxt "Core|"
 msgid "Invalid listen address %1"
 msgstr "Ongeldig luisteradres %1"
 
-#: Core#8
-msgid ""
-"Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
-msgstr ""
-"Op IPv4 %1 poort %2 naar GUI-clients luisteren met protocol versie %3"
+#: ../src/core/core.cpp:441
+#, qt-format
+msgctxt "Core|"
+msgid "Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
+msgstr "Op IPv6 %1 poort %2 naar GUI-clients luisteren met protocol versie %3"
 
-#: Core#9
-msgid "Could not open IPv4 interface %1:%2: %3"
-msgstr "Kon IPv4-interface niet openen %1:%2: %3"
+#: ../src/core/core.cpp:450
+#, qt-format
+msgctxt "Core|"
+msgid "Could not open IPv6 interface %1:%2: %3"
+msgstr "Kan IPv6-interface niet openen %1:%2: %3"
 
-#: Core#10
-msgid ""
-"Listening for GUI clients on IPv6 %1 port %2 using protocol version %3"
-msgstr ""
-"Op IPv6 %1 poort %2 naar GUI-clients luisteren met protocol versie %3"
+#: ../src/core/core.cpp:458
+#, qt-format
+msgctxt "Core|"
+msgid "Listening for GUI clients on IPv4 %1 port %2 using protocol version %3"
+msgstr "Op IPv4 %1 poort %2 naar GUI-clients luisteren met protocol versie %3"
 
-#: Core#11
-msgid "Could not open IPv6 interface %1:%2: %3"
-msgstr "Kon IPv6-interface niet openen %1:%2: %3"
+#: ../src/core/core.cpp:469
+#, qt-format
+msgctxt "Core|"
+msgid "Could not open IPv4 interface %1:%2: %3"
+msgstr "Kan IPv4-interface niet openen %1:%2: %3"
 
-#: Core#12
+#: ../src/core/core.cpp:477
+#, qt-format
+msgctxt "Core|"
 msgid "Invalid listen address %1, unknown network protocol"
 msgstr "Ongeldig luisteradres %1, onbekend netwerkprotocol"
 
-#: Core#13
+#: ../src/core/core.cpp:486
+msgctxt "Core|"
 msgid "Could not open any network interfaces to listen on!"
-msgstr "Kon geen enkele netwerkinterface openen om bij te luisteren!"
+msgstr "Kan geen enkele netwerkinterface openen om bij te luisteren!"
 
-#: Core#14
+#: ../src/core/core.cpp:524
+msgctxt "Core|"
 msgid "Client connected from"
 msgstr "Client verbindt vanaf"
 
-#: Core#15
+#: ../src/core/core.cpp:527
+msgctxt "Core|"
 msgid "Closing server for basic setup."
 msgstr "Server afsluiten voor standaard set-up."
 
-#: Core#16
+#: ../src/core/core.cpp:550
+msgctxt "Core|"
 msgid "Antique client trying to connect... refusing."
 msgstr "Verouderde client probeert te verbinden... weiger."
 
-#: Core#17
+#: ../src/core/core.cpp:562
+#, qt-format
+msgctxt "Core|"
 msgid ""
-"<b>Your Quassel Client is too old!</b><br>This core needs at least "
-"client/core protocol version %1.<br>Please consider upgrading your client."
+"<b>Your Quassel Client is too old!</b><br>This core needs at least client/"
+"core protocol version %1.<br>Please consider upgrading your client."
 msgstr ""
 "<b>Uw Quassel client is te oud!</b><br>Deze core heeft minstens client/core "
-"protocol versie %1 nodig.<br>Upgrade alstublieft uw client."
+"protocol versie %1 nodig.<br>Upgrade uw client."
 
-#: Core#18
-msgctxt "Core#18"
+#: ../src/core/core.cpp:566 ../src/core/core.cpp:657 ../src/core/core.cpp:683
+msgctxt "Core|"
 msgid "Client"
 msgstr "Client"
 
-#: Core#19
+#: ../src/core/core.cpp:566
+msgctxt "Core|"
 msgid "too old, rejecting."
 msgstr "te oud, weigeren."
 
-#: Core#20
-msgid ""
-"<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
-msgstr ""
-"<b>Quassel-core versie %1</b><br>Built: %2<br>Op %3d%4h%5m (sinds %6)"
+#: ../src/core/core.cpp:583
+#, qt-format
+msgctxt "Core|"
+msgid "<b>Quassel Core Version %1</b><br>Built: %2<br>Up %3d%4h%5m (since %6)"
+msgstr "<b>Quassel-core versie %1</b><br>Built: %2<br>Op %3d%4h%5m (sinds %6)"
 
-#: Core#21
+#: ../src/core/core.cpp:637
+msgctxt "Core|"
 msgid "Starting TLS for Client:"
 msgstr "TLS voor client starten:"
 
-#: Core#22
+#: ../src/core/core.cpp:655
+msgctxt "Core|"
 msgid ""
 "<b>Client not initialized!</b><br>You need to send an init message before "
 "trying to login."
@@ -1303,171 +1627,203 @@ msgstr ""
 "<b>Client niet geïnitialiseerd!</b><br>U moet een init-bericht sturen "
 "voordat u probeert in te loggen."
 
-#: Core#23
+#: ../src/core/core.cpp:657
+msgctxt "Core|"
 msgid "did not send an init message before trying to login, rejecting."
 msgstr "verstuurde geen init-bericht voordat er werd aangemeld, weigeren."
 
-#: Core#24
+#: ../src/core/core.cpp:677
+msgctxt "Core|"
 msgid ""
 "<b>Invalid username or password!</b><br>The username/password combination "
 "you supplied could not be found in the database."
 msgstr ""
-"<b>Ongeldige gebruikersnaam of wachtwoord!</b><br>De "
-"gebruikersnaam/wachtwoord-combinatie die u opgaf kon niet in de database "
-"gevonden worden."
+"<b>Ongeldige gebruikersnaam of wachtwoord!</b><br>De gebruikersnaam/"
+"wachtwoord-combinatie die u opgaf kan niet in de database gevonden worden."
 
-#: Core#25
+#: ../src/core/core.cpp:683
+#, qt-format
+msgctxt "Core|"
 msgid "initialized and authenticated successfully as \"%1\" (UserId: %2)."
 msgstr "initialisatie en authenticatie succesvol als \"%1\"(Userid: %2)."
 
-#: Core#26
+#: ../src/core/core.cpp:696
+msgctxt "Core|"
 msgid "Non-authed client disconnected."
 msgstr "Verbinding zonder authenticatie verbroken."
 
-#: Core#27
+#: ../src/core/core.cpp:703
+msgctxt "Core|"
 msgid "Non-authed client disconnected. (socket allready destroyed)"
 msgstr "Verbinding zonder authenticatie verbroken. (socket is al geleegd)"
 
-#: Core#28
+#: ../src/core/core.cpp:755
+msgctxt "Core|"
 msgid "Could not initialize session for client:"
-msgstr "Kon geen sessie initialiseren voor client:"
+msgstr "Kan geen sessie voor client initialiseren:"
 
-#: Core#29
+#: ../src/core/core.cpp:781
+msgctxt "Core|"
 msgid "Could not find a session for client:"
-msgstr "Kon geen sessie vinden voor client:"
+msgstr "Kan geen sessie voor client vinden:"
 
-#: CoreAccount#1
-msgctxt "CoreAccount#1"
+#: ../src/client/coreaccount.h:40
+msgctxt "CoreAccount|"
 msgid "Internal Core"
 msgstr "Interne core"
 
-#: CoreAccountEditDlg#1
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:14
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:260
+msgctxt "CoreAccountEditDlg|"
 msgid "Edit Core Account"
 msgstr "Core-account bewerken"
 
-#: CoreAccountEditDlg#2
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:20
+msgctxt "CoreAccountEditDlg|"
 msgid "Account Details"
 msgstr "Accountdetails"
 
-#: CoreAccountEditDlg#3
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:26
+msgctxt "CoreAccountEditDlg|"
 msgid "Account Name:"
 msgstr "Accountnaam:"
 
-#: CoreAccountEditDlg#4
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:33
+msgctxt "CoreAccountEditDlg|"
 msgid "Local Core"
 msgstr "Locale core"
 
-#: CoreAccountEditDlg#5
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:40
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:173
+msgctxt "CoreAccountEditDlg|"
 msgid "Hostname:"
 msgstr "Hostnaam:"
 
-#: CoreAccountEditDlg#6
-msgctxt "CoreAccountEditDlg#6"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:47
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:180
+msgctxt "CoreAccountEditDlg|"
 msgid "localhost"
 msgstr "localhost"
 
-#: CoreAccountEditDlg#7
-msgctxt "CoreAccountEditDlg#7"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:54
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:187
+msgctxt "CoreAccountEditDlg|"
 msgid "Port:"
 msgstr "Poort:"
 
-#: CoreAccountEditDlg#8
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:93
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:226
+msgctxt "CoreAccountEditDlg|"
 msgid "User:"
 msgstr "Gebruiker:"
 
-#: CoreAccountEditDlg#9
-msgctxt "CoreAccountEditDlg#9"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:103
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:236
+msgctxt "CoreAccountEditDlg|"
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: CoreAccountEditDlg#10
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:117
+msgctxt "CoreAccountEditDlg|"
 msgid "Remember"
-msgstr "Onthoudt"
+msgstr "Onthouden"
 
-#: CoreAccountEditDlg#11
-msgctxt "CoreAccountEditDlg#11"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:127
+msgctxt "CoreAccountEditDlg|"
 msgid "Use a Proxy"
-msgstr "Gebruik een proxy"
+msgstr "Een proxy gebruiken"
 
-#: CoreAccountEditDlg#12
-msgctxt "CoreAccountEditDlg#12"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:139
+msgctxt "CoreAccountEditDlg|"
 msgid "Proxy Type:"
-msgstr "Proxytype"
+msgstr "Proxytype:"
 
-#: CoreAccountEditDlg#13
-msgctxt "CoreAccountEditDlg#13"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:147
+msgctxt "CoreAccountEditDlg|"
 msgid "Socks 5"
 msgstr "Socks 5"
 
-#: CoreAccountEditDlg#14
-msgctxt "CoreAccountEditDlg#14"
+#: ../src/qtui/settingspages/coreaccounteditdlg.ui:152
+msgctxt "CoreAccountEditDlg|"
 msgid "HTTP"
 msgstr "HTTP"
 
-#: CoreAccountEditDlg#15
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:262
+msgctxt "CoreAccountEditDlg|"
 msgid "Add Core Account"
 msgstr "Core-account toevoegen"
 
-#: CoreAccountModel#1
-msgctxt "CoreAccountModel#1"
+#: ../src/client/coreaccountmodel.cpp:68
+msgctxt "CoreAccountModel|"
 msgid "Internal Core"
 msgstr "Interne core"
 
-#: CoreAccountSettingsPage#1
-msgctxt "CoreAccountSettingsPage#1"
-msgid "Remote Cores"
-msgstr "Remote-core"
-
-#: CoreAccountSettingsPage#2
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:20
+msgctxt "CoreAccountSettingsPage|"
 msgid "Connect to Quassel Core"
-msgstr "Verbindt met Quassel-core"
+msgstr "Met Quassel-core verbinden"
 
-#: CoreAccountSettingsPage#3
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:30
+msgctxt "CoreAccountSettingsPage|"
 msgid "Core Accounts"
 msgstr "Core-accounts"
 
-#: CoreAccountSettingsPage#4
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:45
+msgctxt "CoreAccountSettingsPage|"
 msgid "Edit..."
-msgstr "Bewerken..."
+msgstr "Bewerken…"
 
-#: CoreAccountSettingsPage#5
-msgctxt "CoreAccountSettingsPage#5"
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:56
+msgctxt "CoreAccountSettingsPage|"
 msgid "Add..."
-msgstr "Toevoegen..."
+msgstr "Toevoegen…"
 
-#: CoreAccountSettingsPage#6
-msgctxt "CoreAccountSettingsPage#6"
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:67
+msgctxt "CoreAccountSettingsPage|"
 msgid "Delete"
-msgstr "Verwijder"
+msgstr "Verwijderen"
 
-#: CoreAccountSettingsPage#7
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:96
+msgctxt "CoreAccountSettingsPage|"
 msgid "Automatically connect on startup"
 msgstr "Bij starten automatisch verbinden"
 
-#: CoreAccountSettingsPage#8
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:136
+msgctxt "CoreAccountSettingsPage|"
 msgid "Connect to last account used"
 msgstr "Met laatst gebruikte account verbinden"
 
-#: CoreAccountSettingsPage#9
+#: ../src/qtui/settingspages/coreaccountsettingspage.ui:148
+msgctxt "CoreAccountSettingsPage|"
 msgid "Always connect to"
 msgstr "Altijd verbinden met"
 
-#: CoreConfigWizard#1
+#: ../src/qtui/settingspages/coreaccountsettingspage.cpp:29
+msgctxt "CoreAccountSettingsPage|"
+msgid "Remote Cores"
+msgstr "Remote-cores"
+
+#: ../src/qtui/coreconfigwizard.cpp:69
+msgctxt "CoreConfigWizard|"
 msgid "Core Configuration Wizard"
 msgstr "Core-configuratie"
 
-#: CoreConfigWizard#2
+#: ../src/qtui/coreconfigwizard.cpp:103
+msgctxt "CoreConfigWizard|"
 msgid "Your core has been successfully configured. Logging you in..."
-msgstr "Uw core is succesvol geconfigureerd. Aanmelden..."
+msgstr "Uw core is succesvol geconfigureerd. Bezig me aanmelden…"
 
-#: CoreConfigWizard#3
+#: ../src/qtui/coreconfigwizard.cpp:112
+#, qt-format
+msgctxt "CoreConfigWizard|"
 msgid ""
 "Core configuration failed:<br><b>%1</b><br>Press <em>Next</em> to start over."
 msgstr ""
-"Core-configuratie mislukt:<br><b>%1</b><br>Druk op <em>volgende</em> om "
+"Core-configuratie mislukt:<br><b>%1</b><br>Druk op <em>Volgende</em> om "
 "opnieuw te beginnen."
 
-#: CoreConfigWizard#4
+#: ../src/qtui/coreconfigwizard.cpp:131
+msgctxt "CoreConfigWizard|"
 msgid ""
 "Your are now logged into your freshly configured Quassel Core!<br>Please "
 "remember to configure your identities and networks now."
@@ -1475,56 +1831,61 @@ msgstr ""
 "U bent nu aangemeld bij uw nieuw configureerde Quassel-core!<br>Denk er aan "
 "dat u uw netwerken en identiteiten nog moet instellen."
 
-#: CoreConfigWizardAdminUserPage#1
-msgctxt "CoreConfigWizardAdminUserPage#1"
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:14
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: CoreConfigWizardAdminUserPage#2
-msgctxt "CoreConfigWizardAdminUserPage#2"
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:22
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: CoreConfigWizardAdminUserPage#3
-msgctxt "CoreConfigWizardAdminUserPage#3"
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:32
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: CoreConfigWizardAdminUserPage#4
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:46
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Repeat password:"
 msgstr "Herhaal wachtwoord:"
 
-#: CoreConfigWizardAdminUserPage#5
-msgctxt "CoreConfigWizardAdminUserPage#5"
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:60
+msgctxt "CoreConfigWizardAdminUserPage|"
 msgid "Remember password"
 msgstr "Wachtwoord onthouden"
 
-#: CoreConfigWizardAdminUserPage#6
+#: ../src/qtui/ui/coreconfigwizardadminuserpage.ui:69
+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>\"."
+"If you need to do these things, please run \"<tt><nobr>quasselcore --help</"
+"nobr></tt>\"."
 msgstr ""
 "<b>Let op:</b> Meer gebruikers toevoegen of uw gebruikersnaam/wachtwoord "
 "wijzigen is nog niet mogelijk via de Quassel-client interface.\n"
 "Als u dit wilt doen moet u \"<tt><nobr>quasselcore --help</nobr></tt>\" "
 "uitvoeren."
 
-#: CoreConfigWizardIntroPage#1
-msgctxt "CoreConfigWizardIntroPage#1"
+#: ../src/qtui/ui/coreconfigwizardintropage.ui:13
+msgctxt "CoreConfigWizardIntroPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: CoreConfigWizardIntroPage#2
+#: ../src/qtui/ui/coreconfigwizardintropage.ui:19
+msgctxt "CoreConfigWizardIntroPage|"
 msgid "This wizard will guide you through the setup of your Quassel Core."
 msgstr "Deze wizard helpt u bij het opzetten van uw Quassel-core."
 
-#: CoreConfigWizardPages::AdminUserPage#1
+#: ../src/qtui/coreconfigwizard.cpp:167
+msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid "Create Admin User"
 msgstr "Beheerder aanmaken"
 
-#: CoreConfigWizardPages::AdminUserPage#2
+#: ../src/qtui/coreconfigwizard.cpp:168
+msgctxt "CoreConfigWizardPages::AdminUserPage|"
 msgid ""
 "First, we will create a user on the core. This first user will have "
 "administrator privileges."
@@ -1532,15 +1893,18 @@ msgstr ""
 "Eerst zullen we een gebruiker op de core aanmaken. Deze eerste gebruiker zal "
 "beheerdersrechten hebben."
 
-#: CoreConfigWizardPages::IntroPage#1
+#: ../src/qtui/coreconfigwizard.cpp:150
+msgctxt "CoreConfigWizardPages::IntroPage|"
 msgid "Introduction"
 msgstr "Introductie"
 
-#: CoreConfigWizardPages::StorageSelectionPage#1
+#: ../src/qtui/coreconfigwizard.cpp:203
+msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Select Storage Backend"
 msgstr "Selecteer opslag-backend"
 
-#: CoreConfigWizardPages::StorageSelectionPage#2
+#: ../src/qtui/coreconfigwizard.cpp:204
+msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid ""
 "Please select a database backend for the Quassel Core storage to store the "
 "backlog and other data in."
@@ -1548,15 +1912,18 @@ msgstr ""
 "Selecteer een database-backend voor de Quassel-core opslag om het backlog en "
 "andere data in op te slaan."
 
-#: CoreConfigWizardPages::StorageSelectionPage#3
+#: ../src/qtui/coreconfigwizard.cpp:305
+msgctxt "CoreConfigWizardPages::StorageSelectionPage|"
 msgid "Connection Properties"
 msgstr "Eigenschappen verbinding"
 
-#: CoreConfigWizardPages::SyncPage#1
+#: ../src/qtui/coreconfigwizard.cpp:347
+msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid "Storing Your Settings"
 msgstr "Uw instellingen opslaan"
 
-#: CoreConfigWizardPages::SyncPage#2
+#: ../src/qtui/coreconfigwizard.cpp:348
+msgctxt "CoreConfigWizardPages::SyncPage|"
 msgid ""
 "Your settings are now stored in the core, and you will be logged in "
 "automatically."
@@ -1564,184 +1931,214 @@ msgstr ""
 "Uw instellingen zijn nu in de core opgeslagen en u zult automatisch "
 "aangemeld worden."
 
-#: CoreConfigWizardStorageSelectionPage#1
-msgctxt "CoreConfigWizardStorageSelectionPage#1"
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:13
+msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: CoreConfigWizardStorageSelectionPage#2
-msgctxt "CoreConfigWizardStorageSelectionPage#2"
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:21
+msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Storage Backend:"
 msgstr "Opslag-backend:"
 
-#: CoreConfigWizardStorageSelectionPage#3
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:56
+msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Description"
 msgstr "Beschrijving"
 
-#: CoreConfigWizardStorageSelectionPage#4
+#: ../src/qtui/ui/coreconfigwizardstorageselectionpage.ui:62
+msgctxt "CoreConfigWizardStorageSelectionPage|"
 msgid "Foobar"
 msgstr "Foobar"
 
-#: CoreConfigWizardSyncPage#1
-msgctxt "CoreConfigWizardSyncPage#1"
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:13
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: CoreConfigWizardSyncPage#2
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:19
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "Your Choices"
 msgstr "Uw keuzes"
 
-#: CoreConfigWizardSyncPage#3
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:35
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "Admin User:"
 msgstr "Beheerder:"
 
-#: CoreConfigWizardSyncPage#4
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:42
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "foo"
 msgstr "foo"
 
-#: CoreConfigWizardSyncPage#5
-msgctxt "CoreConfigWizardSyncPage#5"
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:55
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "Storage Backend:"
-msgstr "Opslag backend:"
+msgstr "Opslag-backend:"
 
-#: CoreConfigWizardSyncPage#6
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:62
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "bar"
 msgstr "bar"
 
-#: CoreConfigWizardSyncPage#7
+#: ../src/qtui/ui/coreconfigwizardsyncpage.ui:102
+msgctxt "CoreConfigWizardSyncPage|"
 msgid "Please wait while your settings are being transmitted to the core..."
-msgstr "Een moment, uw instellingen worden naar de core verzonden..."
-
-#: CoreConnectAuthDlg#1
-msgid "Please enter your credentials for %1:"
-msgstr "Vul uw aanmeldgegevens voor %1 in:"
+msgstr "Een moment, uw instellingen worden naar de core verzonden…"
 
-#: CoreConnectAuthDlg#2
+#: ../src/qtui/ui/coreconnectauthdlg.ui:14
+msgctxt "CoreConnectAuthDlg|"
 msgid "Authentication Required"
 msgstr "Aanmelden verplicht"
 
-#: CoreConnectAuthDlg#3
+#: ../src/qtui/ui/coreconnectauthdlg.ui:20
+msgctxt "CoreConnectAuthDlg|"
 msgid "Please enter your account data:"
 msgstr "Vul uw accountgegevens in:"
 
-#: CoreConnectAuthDlg#4
-msgctxt "CoreConnectAuthDlg#4"
+#: ../src/qtui/ui/coreconnectauthdlg.ui:35
+msgctxt "CoreConnectAuthDlg|"
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: CoreConnectAuthDlg#5
-msgctxt "CoreConnectAuthDlg#5"
+#: ../src/qtui/ui/coreconnectauthdlg.ui:49
+msgctxt "CoreConnectAuthDlg|"
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: CoreConnectAuthDlg#6
-msgctxt "CoreConnectAuthDlg#6"
+#: ../src/qtui/ui/coreconnectauthdlg.ui:58
+msgctxt "CoreConnectAuthDlg|"
 msgid "Remember password"
 msgstr "Wachtwoord onthouden"
 
-#: CoreConnectDlg#1
+#: ../src/qtui/coreconnectdlg.cpp:81
+#, qt-format
+msgctxt "CoreConnectAuthDlg|"
+msgid "Please enter your credentials for %1:"
+msgstr "Vul uw aanmeldgegevens voor %1 in:"
+
+#: ../src/qtui/coreconnectdlg.cpp:41
+msgctxt "CoreConnectDlg|"
 msgid "Connect to Core"
-msgstr "Verbindt met core"
+msgstr "Met core verbinden"
 
-#: CoreConnection#1
+#: ../src/client/coreconnection.cpp:189
+msgctxt "CoreConnection|"
 msgid "Network is down"
 msgstr "Netwerk is niet actief"
 
-#: CoreConnection#2
+#: ../src/client/coreconnection.cpp:229 ../src/client/coreconnection.cpp:369
+msgctxt "CoreConnection|"
 msgid "Disconnected"
 msgstr "Verbinding verbroken"
 
-#: CoreConnection#3
+#: ../src/client/coreconnection.cpp:232
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Looking up %1..."
-msgstr "%1 opzoeken..."
+msgstr "%1 opzoeken…"
 
-#: CoreConnection#4
+#: ../src/client/coreconnection.cpp:235 ../src/client/coreconnection.cpp:507
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Connecting to %1..."
-msgstr "Met %1 verbinden..."
+msgstr "Met %1 verbinden…"
 
-#: CoreConnection#5
+#: ../src/client/coreconnection.cpp:238 ../src/client/coreconnection.cpp:641
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Connected to %1"
 msgstr "Verbonden met %1"
 
-#: CoreConnection#6
+#: ../src/client/coreconnection.cpp:241
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Disconnecting from %1..."
-msgstr "Verbinding met %1 verbreken..."
+msgstr "Verbinding met %1 verbreken…"
 
-#: CoreConnection#7
+#: ../src/client/coreconnection.cpp:309
+msgctxt "CoreConnection|"
 msgid ""
 "The Quassel Core you try to connect to is too old! Please consider upgrading."
 msgstr ""
 "De Quassel-core waarmee u wilt verbinden is te oud! Probeer een nieuwere "
 "versie te installeren."
 
-#: CoreConnection#8
+#: ../src/client/coreconnection.cpp:344
+msgctxt "CoreConnection|"
 msgid "Invalid data received from core"
 msgstr "Ongeldige data van de core ontvangen"
 
-#: CoreConnection#9
+#: ../src/client/coreconnection.cpp:399
+msgctxt "CoreConnection|"
 msgid "Disconnected from core."
 msgstr "Verbinding met de core verbroken."
 
-#: CoreConnection#10
+#: ../src/client/coreconnection.cpp:484 ../src/client/coreconnection.cpp:573
+#: ../src/client/coreconnection.cpp:622
+msgctxt "CoreConnection|"
 msgid "Unencrypted connection canceled"
 msgstr "Onversleutelde verbinding afgebroken"
 
-#: CoreConnection#11
+#: ../src/client/coreconnection.cpp:516
+msgctxt "CoreConnection|"
 msgid "Synchronizing to core..."
-msgstr "Met de core synchroniseren..."
+msgstr "Met de core synchroniseren…"
 
-#: CoreConnection#12
+#: ../src/client/coreconnection.cpp:539
+#, qt-format
+msgctxt "CoreConnection|"
 msgid ""
 "<b>The Quassel Core you are trying to connect to is too old!</b><br>Need at "
 "least core/client protocol v%1 to connect."
 msgstr ""
-"<b>De Quassel-core waarmee u wilt verbinden is te oud!</b><br>Minstens "
-"core/client protocol v%1 benodigd om te verbinden."
+"<b>De Quassel-core waarmee u wilt verbinden is te oud!</b><br>Core/client "
+"protocol v%1 of hoger is vereist om te verbinden."
 
-#: CoreConnection#13
+#: ../src/client/coreconnection.cpp:665
+msgctxt "CoreConnection|"
 msgid "Logging in..."
-msgstr "Aanmelden..."
+msgstr "Aanmelden…"
 
-#: CoreConnection#14
+#: ../src/client/coreconnection.cpp:670
+msgctxt "CoreConnection|"
 msgid "Login canceled"
 msgstr "Aanmelden afgebroken"
 
-#: CoreConnection#15
+#: ../src/client/coreconnection.cpp:699
+msgctxt "CoreConnection|"
 msgid "Receiving session state"
 msgstr "Sessiestatus ontvangen"
 
-#: CoreConnection#16
+#: ../src/client/coreconnection.cpp:701
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Synchronizing to %1..."
-msgstr "Met %1 synchroniseren..."
+msgstr "Met %1 synchroniseren…"
 
-#: CoreConnection#17
+#: ../src/client/coreconnection.cpp:731
+msgctxt "CoreConnection|"
 msgid "Receiving network states"
 msgstr "Netwerkstatus ontvangen"
 
-#: CoreConnection#18
+#: ../src/client/coreconnection.cpp:785
+#, qt-format
+msgctxt "CoreConnection|"
 msgid "Synchronized to %1"
 msgstr "Met %1 gesynchroniseerd"
 
-#: CoreConnectionSettingsPage#1
-msgctxt "CoreConnectionSettingsPage#1"
-msgid "Remote Cores"
-msgstr "Core op afstand"
-
-#: CoreConnectionSettingsPage#2
-msgctxt "CoreConnectionSettingsPage#2"
-msgid "Connection"
-msgstr "Verbinding"
-
-#: CoreConnectionSettingsPage#3
-msgctxt "CoreConnectionSettingsPage#3"
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:14
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: CoreConnectionSettingsPage#4
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:20
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Network Status Detection"
 msgstr "Netwerkstatus detecteren"
 
-#: CoreConnectionSettingsPage#5
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:26
+msgctxt "CoreConnectionSettingsPage|"
 msgid ""
 "Rely on KDE's hardware layer to detect if we're online. Recommended for most "
 "KDE users"
@@ -1749,11 +2146,15 @@ msgstr ""
 "Gebruik de KDE hardwarelayer om er achter te komen of we online zijn. "
 "Aangeraden voor de meeste KDE-gebruikers"
 
-#: CoreConnectionSettingsPage#6
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:29
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Use KDE's network status detection (via Solid)"
 msgstr "Gebruik de netwerkstatusdetectie van KDE (via Solid)"
 
-#: CoreConnectionSettingsPage#7
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:41
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:57
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:154
+msgctxt "CoreConnectionSettingsPage|"
 msgid ""
 "Actively ping the remote core and disconnect if we didn't get a reply after "
 "a certain time"
@@ -1761,16 +2162,19 @@ msgstr ""
 "Ping de core op afstand en verbreek de verbinding als we niet binnen een "
 "bepaalde tijd een reactie krijgen"
 
-#: CoreConnectionSettingsPage#8
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:44
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Ping timeout after"
 msgstr "Ping timeout na"
 
-#: CoreConnectionSettingsPage#9
-msgctxt "CoreConnectionSettingsPage#9"
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:60
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:157
+msgctxt "CoreConnectionSettingsPage|"
 msgid " seconds"
 msgstr " seconden"
 
-#: CoreConnectionSettingsPage#10
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:100
+msgctxt "CoreConnectionSettingsPage|"
 msgid ""
 "Only disconnect if the network socket gets closed by the operating system. "
 "This may take a long time after actually losing connectivity"
@@ -1779,131 +2183,179 @@ msgstr ""
 "gesloten wordt. Dit kan lang na het daadwerkelijk verliezen van de "
 "verbinding zijn"
 
-#: CoreConnectionSettingsPage#11
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:103
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Never time out actively"
 msgstr "Nooit actief verlopen"
 
-#: CoreConnectionSettingsPage#12
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:113
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Automatically reconnect on network failures"
 msgstr "Automatisch opnieuw verbinden na netwerkfouten"
 
-#: CoreConnectionSettingsPage#13
+#: ../src/qtui/settingspages/coreconnectionsettingspage.ui:147
+msgctxt "CoreConnectionSettingsPage|"
 msgid "Retry every"
 msgstr "Probeer opnieuw na elke"
 
-#: CoreConnectionStatusWidget#1
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Remote Cores"
+msgstr "Remote-cores"
+
+#: ../src/qtui/settingspages/coreconnectionsettingspage.cpp:24
+msgctxt "CoreConnectionSettingsPage|"
+msgid "Connection"
+msgstr "Verbinding"
+
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:14
+msgctxt "CoreConnectionStatusWidget|"
+msgid "Form"
+msgstr "Formulier"
+
+#: ../src/qtui/ui/coreconnectionstatuswidget.ui:32
+msgctxt "CoreConnectionStatusWidget|"
+msgid "Message"
+msgstr "Bericht"
+
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
+msgctxt "CoreConnectionStatusWidget|seconds"
 msgid "s"
 msgstr "s"
 
-#: CoreConnectionStatusWidget#2
+#: ../src/qtui/coreconnectionstatuswidget.cpp:66
+msgctxt "CoreConnectionStatusWidget|milliseconds"
 msgid "ms"
 msgstr "ms"
 
-#: CoreConnectionStatusWidget#3
+#: ../src/qtui/coreconnectionstatuswidget.cpp:67
+#, qt-format
+msgctxt "CoreConnectionStatusWidget|"
 msgid "(Lag: %1 %2)"
 msgstr "(Vertraging: %1 %2)"
 
-#: CoreConnectionStatusWidget#4
+#: ../src/qtui/coreconnectionstatuswidget.cpp:83
+msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is encrypted with SSL."
 msgstr "De verbinding met uw core is versleuteld met SSL."
 
-#: CoreConnectionStatusWidget#5
+#: ../src/qtui/coreconnectionstatuswidget.cpp:87
+msgctxt "CoreConnectionStatusWidget|"
 msgid "The connection to your core is not encrypted."
 msgstr "De verbinding met uw core is niet versleuteld."
 
-#: CoreConnectionStatusWidget#6
-msgctxt "CoreConnectionStatusWidget#6"
-msgid "Form"
-msgstr "Form"
-
-#: CoreConnectionStatusWidget#7
-msgctxt "CoreConnectionStatusWidget#7"
-msgid "Message"
-msgstr "Bericht"
-
-#: CoreInfoDlg#1
-msgid "%n Day(s)"
-msgstr "%n Dag(en)"
-
-#: CoreInfoDlg#2
-msgid " %1:%2:%3 (since %4)"
-msgstr " %1:%2:%3 (sinds %4)"
-
-#: CoreInfoDlg#3
+#: ../src/qtui/ui/coreinfodlg.ui:13
+msgctxt "CoreInfoDlg|"
 msgid "Core Information"
 msgstr "Core informatie"
 
-#: CoreInfoDlg#4
+#: ../src/qtui/ui/coreinfodlg.ui:21
+msgctxt "CoreInfoDlg|"
 msgid "Version:"
 msgstr "Versie:"
 
-#: CoreInfoDlg#5
+#: ../src/qtui/ui/coreinfodlg.ui:28
+msgctxt "CoreInfoDlg|"
 msgid "<core version>"
 msgstr "<core-versie>"
 
-#: CoreInfoDlg#6
+#: ../src/qtui/ui/coreinfodlg.ui:35
+msgctxt "CoreInfoDlg|"
 msgid "Uptime:"
 msgstr "Uptime:"
 
-#: CoreInfoDlg#7
+#: ../src/qtui/ui/coreinfodlg.ui:42
+msgctxt "CoreInfoDlg|"
 msgid "Connected Clients:"
 msgstr "Verbonden clients:"
 
-#: CoreInfoDlg#8
+#: ../src/qtui/ui/coreinfodlg.ui:49
+msgctxt "CoreInfoDlg|"
 msgid "<connected clients>"
 msgstr "<verbonden clients>"
 
-#: CoreInfoDlg#9
+#: ../src/qtui/ui/coreinfodlg.ui:56
+msgctxt "CoreInfoDlg|"
 msgid "<core uptime>"
 msgstr "<core uptime>"
 
-#: CoreInfoDlg#10
+#: ../src/qtui/ui/coreinfodlg.ui:63
+msgctxt "CoreInfoDlg|"
 msgid "Build date:"
 msgstr "Build datum:"
 
-#: CoreInfoDlg#11
+#: ../src/qtui/ui/coreinfodlg.ui:70
+msgctxt "CoreInfoDlg|"
 msgid "<build date>"
 msgstr "<build datum>"
 
-#: CoreInfoDlg#12
-msgctxt "CoreInfoDlg#12"
+#: ../src/qtui/ui/coreinfodlg.ui:81
+msgctxt "CoreInfoDlg|"
 msgid "Close"
-msgstr "Sluit"
+msgstr "Sluiten"
+
+#: ../src/qtui/coreinfodlg.cpp:57
+#, qt-format
+msgctxt "CoreInfoDlg|"
+msgid "%n Day(s)"
+msgid_plural "%n Day(s)"
+msgstr[0] "%n Dag"
+msgstr[1] "%n Dagen"
+
+#: ../src/qtui/coreinfodlg.cpp:58
+#, qt-format
+msgctxt "CoreInfoDlg|"
+msgid " %1:%2:%3 (since %4)"
+msgstr " %1:%2:%3 (sinds %4)"
 
-#: CoreNetwork#1
+#: ../src/core/corenetwork.cpp:166
+msgctxt "CoreNetwork|"
 msgid "Connection failed. Cycling to next Server"
 msgstr "Verbinden mislukt. Volgende server proberen"
 
-#: CoreNetwork#2
+#: ../src/core/corenetwork.cpp:174 ../src/core/corenetwork.cpp:175
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Connecting to %1:%2..."
-msgstr "Verbinden met %1:%2..."
+msgstr "Met %1:%2 verbinden…"
 
-#: CoreNetwork#3
+#: ../src/core/corenetwork.cpp:227
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Disconnecting. (%1)"
 msgstr "Verbinding verbreken. (%1)"
 
-#: CoreNetwork#4
+#: ../src/core/corenetwork.cpp:227
+msgctxt "CoreNetwork|"
 msgid "Core Shutdown"
 msgstr "Core uitschakelen"
 
-#: CoreNetwork#5
+#: ../src/core/corenetwork.cpp:396
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Could not connect to %1 (%2)"
-msgstr "Kon niet met %1 (%2) verbinden"
+msgstr "Kan niet met %1 (%2) verbinden"
 
-#: CoreNetwork#6
+#: ../src/core/corenetwork.cpp:398
+#, qt-format
+msgctxt "CoreNetwork|"
 msgid "Connection failure: %1"
 msgstr "Verbinden mislukt: %1"
 
-#: CoreSession#1
-msgctxt "CoreSession#1"
+#: ../src/core/coresession.cpp:236
+msgctxt "CoreSession|"
 msgid "Client"
 msgstr "Client"
 
-#: CoreSession#2
+#: ../src/core/coresession.cpp:236
+#, qt-format
+msgctxt "CoreSession|"
 msgid "disconnected (UserId: %1)."
 msgstr "verbinding verbroken (Userid: %1)."
 
-#: CoreSession#3
+#: ../src/core/coresession.cpp:497
+#, qt-format
+msgctxt "CoreSession|"
 msgid ""
 "CoreSession::createNetwork(): Got invalid networkId from Core when trying to "
 "create network %1!"
@@ -1911,7 +2363,8 @@ msgstr ""
 "CoreSession::createNetwork(): Got invalid networkId from Core when trying to "
 "create network %1!"
 
-#: CoreSession#4
+#: ../src/core/coresession.cpp:529
+msgctxt "CoreSession|"
 msgid ""
 "CoreSession::createNetwork(): Trying to create a network that already "
 "exists, updating instead!"
@@ -1919,250 +2372,620 @@ msgstr ""
 "CoreSession::createNetwork(): Trying to create a network that already "
 "exists, updating instead!"
 
-#: CoreUserInputHandler#1
+#: ../src/core/coresessioneventprocessor.cpp:71
+msgctxt "CoreSessionEventProcessor|"
+msgid ""
+"No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
+msgstr ""
+"Geen beschikbare en toegestane nicks in de lijst gevonden. Gebruik /nick "
+"<anderenick> om door te gaan"
+
+#: ../src/core/coreuserinputhandler.cpp:88
+msgctxt "CoreUserInputHandler|"
 msgid "away"
 msgstr "afwezig"
 
-#: CoreUserInputHandler#2
+#: ../src/core/coreuserinputhandler.cpp:169
+#, qt-format
+msgctxt "CoreUserInputHandler|"
 msgid "sending CTCP-%1 request to %2"
-msgstr "CTCP-%1 request naar %2 sturen"
+msgstr "CTCP-%1 request naar %2 versturen"
+
+#: ../src/core/coreuserinputhandler.cpp:198
+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 ""
+"[gebruik] /delkey <bijnaam|kanaal> verwijdert de encryptiesleutel voor "
+"bijnaam of kanaal, gebruik /delkey wanneer het in een kanaal of query wordt "
+"gebruikt."
+
+#: ../src/core/coreuserinputhandler.cpp:205
+#: ../src/core/coreuserinputhandler.cpp:606
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "No key has been set for %1."
+msgstr "Er is geen sleutel ingesteld voor %1."
+
+#: ../src/core/coreuserinputhandler.cpp:218
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 has been deleted."
+msgstr "De sleutel voor %1 is verwijderd."
+
+#: ../src/core/coreuserinputhandler.cpp:222
+#: ../src/core/coreuserinputhandler.cpp:614
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"Error: Setting an encryption key requires Quassel to have been built with "
+"support for the Qt Cryptographic Architecture (QCA2) library. Contact your "
+"distributor about a Quassel package with QCA2 support, or rebuild Quassel "
+"with QCA2 present."
+msgstr ""
+"Fout: Om een encryptiesleutel in te kunnen stellen moet Quassel Qt "
+"Cryptographic Architecture (QCA2) ondersteunen. Neem contact op met uw "
+"distributeur voor een Quassel pakket met QCA2 ondersteuning, of compileer "
+"Quassel met QCA2."
+
+#: ../src/core/coreuserinputhandler.cpp:499
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "Starting query with %1"
+msgstr "Query starten met %1"
+
+#: ../src/core/coreuserinputhandler.cpp:556
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"[usage] /setkey <nick|channel> <key> sets the encryption key for nick or "
+"channel. /setkey <key> when in a channel or query buffer sets the key for it."
+msgstr ""
+"[gebruik] /setkey <bijnaam|kanaal> <key> stelt de encryptiesleutel in voor "
+"bijnaam of kanaal. /setkey <key> wanneer in een kanaal of query buffer stelt "
+"de sleutel in"
+
+#: ../src/core/coreuserinputhandler.cpp:571
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 has been set."
+msgstr "De sleutel voor %1 is nu ingesteld."
+
+#: ../src/core/coreuserinputhandler.cpp:574
+msgctxt "CoreUserInputHandler|"
+msgid ""
+"Error: Setting an encryption key requires Quassel to have been built with "
+"support for the Qt Cryptographic Architecture (QCA) library. Contact your "
+"distributor about a Quassel package with QCA support, or rebuild Quassel "
+"with QCA present."
+msgstr ""
+"Fout: Om een encryptiesleutel in te kunnen stellen moet Quassel Qt "
+"Cryptographic Architecture (QCA) ondersteunen. Neem contact op met uw "
+"distributeur voor een Quassel pakket met QCA ondersteuning, of compileer "
+"Quassel met QCA."
 
-#: CreateIdentityDlg#1
+#: ../src/core/coreuserinputhandler.cpp:598
+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 ""
+"[gebruik] /delkey <bijnaam|kanaal> verwijdert de encryptiesleutel voor "
+"bijnaam of kanaal, gebruik /delkey wanneer het in een kanaal of query wordt "
+"gebruikt."
+
+#: ../src/core/coreuserinputhandler.cpp:610
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "The key for %1 is %2"
+msgstr "Homepage van %1 is %2"
+
+#: ../src/core/coreuserinputhandler.cpp:738
+#, qt-format
+msgctxt "CoreUserInputHandler|"
+msgid "[Error] Could not encrypt your message: %1"
+msgstr "[fout] Kan uw bericht niet versleutelen: %1"
+
+#: ../src/qtui/settingspages/createidentitydlg.ui:17
+msgctxt "CreateIdentityDlg|"
 msgid "Create New Identity"
 msgstr "Nieuwe identiteit aanmaken"
 
-#: CreateIdentityDlg#2
+#: ../src/qtui/settingspages/createidentitydlg.ui:25
+msgctxt "CreateIdentityDlg|"
 msgid "Identity name:"
 msgstr "Naam van identiteit:"
 
-#: CreateIdentityDlg#3
+#: ../src/qtui/settingspages/createidentitydlg.ui:37
+msgctxt "CreateIdentityDlg|"
 msgid "Create blank identity"
 msgstr "Lege identiteit aanmaken"
 
-#: CreateIdentityDlg#4
+#: ../src/qtui/settingspages/createidentitydlg.ui:49
+msgctxt "CreateIdentityDlg|"
 msgid "Duplicate:"
-msgstr "Dupliceer:"
+msgstr "Dupliceren:"
 
-#: CtcpHandler#1
-msgid "Received CTCP PING request from %1"
-msgstr "CTCP PING request van %1 ontvangen"
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:13
+msgctxt "DebugBufferViewOverlay|"
+msgid "Debug BufferView Overlay"
+msgstr "Debug BufferView Overlay"
 
-#: CtcpHandler#2
-msgid "Received CTCP PING answer from %1 with %2 seconds round trip time"
-msgstr "CTCP PING antwoord van %1 ontvangen met %2 seconden round trip time"
-
-#: CtcpHandler#3
-msgid "Received CTCP VERSION request by %1"
-msgstr "CTCP VERSION request van %1 ontvangen"
-
-#: CtcpHandler#4
-msgid "Received CTCP VERSION answer from %1: %2"
-msgstr "CTCP VERSION antwoord ontvangen van %1: %2"
-
-#: CtcpHandler#5
-msgid "Received CTCP TIME request by %1"
-msgstr "CTCP TIME request van %1 ontvangen"
-
-#: CtcpHandler#6
-msgid "Received CTCP TIME answer from %1: %2"
-msgstr "CTCP TIME antwoord van %1: %2 ontvangen"
-
-#: CtcpHandler#7
-msgid "Received unknown CTCP %1 by %2"
-msgstr "Onbekende CTCP %1 ontvangen van %2"
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:26
+msgctxt "DebugBufferViewOverlay|"
+msgid "Overlay View"
+msgstr "Overlay View"
 
-#: CtcpHandler#8
-msgid " with arguments: %1"
-msgstr " met argumenten: %1"
+#: ../src/qtui/ui/debugbufferviewoverlay.ui:39
+msgctxt "DebugBufferViewOverlay|"
+msgid "Overlay Properties"
+msgstr "Overlay eigenschappen"
 
-#: DebugBufferViewOverlay#1
+#: ../src/qtui/debugbufferviewoverlay.cpp:50
+msgctxt "DebugBufferViewOverlay|"
 msgid "BufferViews:"
 msgstr "BufferViews:"
 
-#: DebugBufferViewOverlay#2
+#: ../src/qtui/debugbufferviewoverlay.cpp:51
+msgctxt "DebugBufferViewOverlay|"
 msgid "All Networks:"
 msgstr "Alle netwerken:"
 
-#: DebugBufferViewOverlay#3
+#: ../src/qtui/debugbufferviewoverlay.cpp:52
+msgctxt "DebugBufferViewOverlay|"
 msgid "Networks:"
 msgstr "Netwerken:"
 
-#: DebugBufferViewOverlay#4
+#: ../src/qtui/debugbufferviewoverlay.cpp:53
+msgctxt "DebugBufferViewOverlay|"
 msgid "Buffers:"
 msgstr "Buffers:"
 
-#: DebugBufferViewOverlay#5
+#: ../src/qtui/debugbufferviewoverlay.cpp:54
+msgctxt "DebugBufferViewOverlay|"
 msgid "Removed buffers:"
 msgstr "Verwijderde buffers:"
 
-#: DebugBufferViewOverlay#6
+#: ../src/qtui/debugbufferviewoverlay.cpp:55
+msgctxt "DebugBufferViewOverlay|"
 msgid "Temp. removed buffers:"
 msgstr "Tijdelijk verwijderde buffers:"
 
-#: DebugBufferViewOverlay#7
-msgid "Add Buffers Automatically:"
-msgstr "Automatisch buffers toevoegen:"
-
-#: DebugBufferViewOverlay#8
-msgid "Hide inactive buffers:"
-msgstr "Inactieve buffers verbergen:"
-
-#: DebugBufferViewOverlay#9
+#: ../src/qtui/debugbufferviewoverlay.cpp:57
+msgctxt "DebugBufferViewOverlay|"
 msgid "Allowed buffer types:"
 msgstr "Toegestane buffertypes:"
 
-#: DebugBufferViewOverlay#10
+#: ../src/qtui/debugbufferviewoverlay.cpp:58
+msgctxt "DebugBufferViewOverlay|"
 msgid "Minimum activity:"
 msgstr "Minimale activiteit:"
 
-#: DebugBufferViewOverlay#11
+#: ../src/qtui/debugbufferviewoverlay.cpp:60
+msgctxt "DebugBufferViewOverlay|"
 msgid "Is initialized:"
 msgstr "Is geïnitialiseerd:"
 
-#: DebugBufferViewOverlay#12
-msgid "Debug BufferView Overlay"
-msgstr "Debug BufferView Overlay"
-
-#: DebugBufferViewOverlay#13
-msgid "Overlay View"
-msgstr "Overlay View"
-
-#: DebugBufferViewOverlay#14
-msgid "Overlay Properties"
-msgstr "Overlay eigenschappen"
-
-#: DebugConsole#1
+#: ../src/qtui/ui/debugconsole.ui:14
+msgctxt "DebugConsole|"
 msgid "Debug Console"
 msgstr "Debug console"
 
-#: DebugConsole#2
+#: ../src/qtui/ui/debugconsole.ui:44
+msgctxt "DebugConsole|"
 msgid "local"
 msgstr "lokaal"
 
-#: DebugConsole#3
+#: ../src/qtui/ui/debugconsole.ui:54
+msgctxt "DebugConsole|"
 msgid "core"
 msgstr "core"
 
-#: DebugConsole#4
+#: ../src/qtui/ui/debugconsole.ui:82
+msgctxt "DebugConsole|"
 msgid "Evaluate!"
 msgstr "Evalueer!"
 
-#: DebugLogWidget#1
+#: ../src/qtui/ui/debuglogwidget.ui:13
+msgctxt "DebugLogWidget|"
 msgid "Debug Log"
 msgstr "Debug log"
 
-#: DebugLogWidget#2
-msgctxt "DebugLogWidget#2"
+#: ../src/qtui/ui/debuglogwidget.ui:43
+msgctxt "DebugLogWidget|"
 msgid "Close"
-msgstr "Sluit"
+msgstr "Sluiten"
+
+#: ../src/core/eventstringifier.cpp:219 ../src/core/eventstringifier.cpp:360
+msgctxt "EventStringifier|"
+msgid "[Whois] "
+msgstr "[Whois] %1"
+
+#: ../src/core/eventstringifier.cpp:234
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 invited you to channel %2"
+msgstr "%1 heeft u uitgenodigd voor kanaal %2"
+
+#: ../src/core/eventstringifier.cpp:336
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 has changed topic for %2 to: \"%3\""
+msgstr "%1 heeft het onderwerp van %2 verandert naar: ‘%3’"
+
+#: ../src/core/eventstringifier.cpp:345
+msgctxt "EventStringifier|"
+msgid ""
+"Received non-RFC-compliant RPL_ISUPPORT: this can lead to unexpected "
+"behavior!"
+msgstr ""
+"Received non RFC compliant RPL_ISUPPORT: dit kan tot onverwacht gedrag "
+"leiden!"
+
+#: ../src/core/eventstringifier.cpp:374
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 is away: \"%2\""
+msgstr "%1 is afwezig: ‘%2’"
+
+#: ../src/core/eventstringifier.cpp:381
+msgctxt "EventStringifier|"
+msgid "You are no longer marked as being away"
+msgstr "Je staat niet langer op afwezig"
+
+#: ../src/core/eventstringifier.cpp:389
+msgctxt "EventStringifier|"
+msgid "You have been marked as being away"
+msgstr "Je staat nu op afwezig"
+
+#: ../src/core/eventstringifier.cpp:411
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is %2 (%3)"
+msgstr "[Whois] %1 is %2 (%3)"
+
+#: ../src/core/eventstringifier.cpp:427
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is online via %2 (%3)"
+msgstr "%1 is online via %2 (%3)"
+
+#: ../src/core/eventstringifier.cpp:429
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was online via %2 (%3)"
+msgstr "[Whowas] %1 was %2 (%3)"
+
+#: ../src/core/eventstringifier.cpp:439
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was %2@%3 (%4)"
+msgstr "[Whowas] %1 was %2@%3 (%4)"
+
+#: ../src/core/eventstringifier.cpp:448
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Who] End of /WHO list for %1"
+msgstr "[Who] Einde van de /WHO-lijst voor %1"
+
+#: ../src/core/eventstringifier.cpp:460
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is logged in since %2"
+msgstr "[Whois] %1 is aangemeld sinds %2"
+
+#: ../src/core/eventstringifier.cpp:462
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is idling for %2 (since %3)"
+msgstr "[Whois] %1 is %2 (%3) inactief"
+
+#: ../src/core/eventstringifier.cpp:471
+msgctxt "EventStringifier|"
+msgid "[Whois] End of /WHOIS list"
+msgstr "[Who] Einde van de /WHO-lijst voor %1"
+
+#: ../src/core/eventstringifier.cpp:494
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is a user on channels: %2"
+msgstr "[Whois] %1 is een gebruiker in kanalen: %2"
+
+#: ../src/core/eventstringifier.cpp:496
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 has voice on channels: %2"
+msgstr "[Whois] %1 heeft voice in kanalen: %2"
+
+#: ../src/core/eventstringifier.cpp:498
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is an operator on channels: %2"
+msgstr "[Whois] %1 is een operator in kanalen: %2"
+
+#: ../src/core/eventstringifier.cpp:519
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Channel %1 has %2 users. Topic is: \"%3\""
+msgstr "Kanaal %1 heeft %2 gebruikers. Onderwerp is: %3"
+
+#: ../src/core/eventstringifier.cpp:527
+msgctxt "EventStringifier|"
+msgid "End of channel list"
+msgstr "Einde van kanaallijst"
+
+#: ../src/core/eventstringifier.cpp:545
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Homepage for %1 is %2"
+msgstr "Homepage van %1 is %2"
+
+#: ../src/core/eventstringifier.cpp:562
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Channel %1 created on %2"
+msgstr "Kanaal %1 is op %2 aangemaakt"
+
+#: ../src/core/eventstringifier.cpp:574
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whois] %1 is authed as %2"
+msgstr "[Whois] %1 is afwezig: ‘%2’"
+
+#: ../src/core/eventstringifier.cpp:577
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Whowas] %1 was authed as %2"
+msgstr ""
+
+#: ../src/core/eventstringifier.cpp:586
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "No topic is set for %1."
+msgstr "Geen onderwerp ingesteld voor %1."
+
+#: ../src/core/eventstringifier.cpp:594
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Topic for %1 is \"%2\""
+msgstr "Onderwerp voor %1 is ‘%2’"
+
+#: ../src/core/eventstringifier.cpp:605
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Topic set by %1 on %2"
+msgstr "Onderwerp op %2 door %1 ingesteld"
+
+#: ../src/core/eventstringifier.cpp:617
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "%1 has been invited to %2"
+msgstr "%1 is uitgenodigd voor %2"
+
+#: ../src/core/eventstringifier.cpp:625
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "[Who] %1"
+msgstr "[Who] %1"
+
+#: ../src/core/eventstringifier.cpp:632
+msgctxt "EventStringifier|"
+msgid "End of /WHOWAS"
+msgstr "Einde van /WHOWAS"
+
+#: ../src/core/eventstringifier.cpp:642
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Nick %1 contains illegal characters"
+msgstr "Nick %1 bevat niet-toegestane tekens"
+
+#: ../src/core/eventstringifier.cpp:652
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Nick already in use: %1"
+msgstr "Nick is al in gebruik: %1"
+
+#: ../src/core/eventstringifier.cpp:662
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Nick/channel is temporarily unavailable: %1"
+msgstr "Nick/kanaal is tijdelijk niet beschikbaar: %1"
+
+#: ../src/core/eventstringifier.cpp:685
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "sending CTCP-%1 request to %2"
+msgstr "CTCP-%1 request naar %2 versturen"
+
+#. Optional "unknown" in "Received unknown CTCP-FOO request by bar"
+#: ../src/core/eventstringifier.cpp:700
+msgctxt "EventStringifier|"
+msgid "unknown"
+msgstr "onbekend"
+
+#: ../src/core/eventstringifier.cpp:701
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Received %1CTCP-%2 request by %3"
+msgstr "%1CTCP-%2 aanvraag ontvangen van %3"
+
+#: ../src/core/eventstringifier.cpp:704
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Received CTCP-%1 answer from %2: %3"
+msgstr "CTCP-%1 antwoord ontvangen van %2: %3"
+
+#: ../src/core/eventstringifier.cpp:719
+#, qt-format
+msgctxt "EventStringifier|"
+msgid "Received CTCP-PING answer from %1 with %2 seconds round trip time"
+msgstr "CTCP PING antwoord van %1 ontvangen met %2 seconden round trip time"
 
-#: ExecWrapper#1
+#: ../src/client/execwrapper.cpp:49
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Invalid command string for /exec: %1"
 msgstr "Ongeldige opdracht voor /exec: %1"
 
-#: ExecWrapper#2
+#: ../src/client/execwrapper.cpp:58
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Name \"%1\" is invalid: ../ or ..\\ are not allowed!"
-msgstr "Naam \"%1\" is ongeldig: ../ of ..\\ is niet toegestaan!"
+msgstr "Naam ‘%1’ is ongeldig: ../ of ..\\ is niet toegestaan!"
 
-#: ExecWrapper#3
+#: ../src/client/execwrapper.cpp:69
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Could not find script \"%1\""
-msgstr "Kon het script \"%1\" niet vinden"
+msgstr "Kan het script ‘%1’ niet vinden"
 
-#: ExecWrapper#4
+#: ../src/client/execwrapper.cpp:93
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Script \"%1\" crashed with exit code %2."
-msgstr "Script \"%1\" crashte met exit code %2."
+msgstr "Script ‘%1’ crashte met exit code %2."
 
-#: ExecWrapper#5
+#: ../src/client/execwrapper.cpp:111
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Script \"%1\" could not start."
-msgstr "Script \"%1\" kon niet starten."
+msgstr "Script ‘%1’ kan niet starten."
 
-#: ExecWrapper#6
+#: ../src/client/execwrapper.cpp:113
+#, qt-format
+msgctxt "ExecWrapper|"
 msgid "Script \"%1\" caused error %2."
-msgstr "Script \"%1\" veroorzaakte fout %2."
+msgstr "Script ‘%1’ veroorzaakte fout %2."
 
-#: FontSelector#1
+#: ../src/uisupport/fontselector.cpp:32
+msgctxt "FontSelector|"
 msgid "Choose..."
-msgstr "Kies..."
+msgstr "Kiezen…"
 
-#: HighlightSettingsPage#1
-msgctxt "HighlightSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: HighlightSettingsPage#2
-msgctxt "HighlightSettingsPage#2"
-msgid "Highlight"
-msgstr "Markeer"
-
-#: HighlightSettingsPage#3
-msgid "this shouldn't be empty"
-msgstr "dit zou niet leeg moeten zijn"
-
-#: HighlightSettingsPage#4
-msgid "highlight rule"
-msgstr "markeringsregel"
-
-#: HighlightSettingsPage#5
-msgctxt "HighlightSettingsPage#5"
+#: ../src/qtui/settingspages/highlightsettingspage.ui:14
+msgctxt "HighlightSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: HighlightSettingsPage#6
+#: ../src/qtui/settingspages/highlightsettingspage.ui:20
+msgctxt "HighlightSettingsPage|"
 msgid "Custom Highlights"
 msgstr "Eigen markering"
 
-#: HighlightSettingsPage#7
+#: ../src/qtui/settingspages/highlightsettingspage.ui:33
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+msgctxt "HighlightSettingsPage|"
+msgid "Highlight"
+msgstr "Markeer"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:38
+msgctxt "HighlightSettingsPage|"
 msgid "RegEx"
 msgstr "RegEx"
 
-#: HighlightSettingsPage#8
+#: ../src/qtui/settingspages/highlightsettingspage.ui:43
+msgctxt "HighlightSettingsPage|"
 msgid "CS"
 msgstr "CS"
 
-#: HighlightSettingsPage#9
+#: ../src/qtui/settingspages/highlightsettingspage.ui:48
+msgctxt "HighlightSettingsPage|"
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: HighlightSettingsPage#10
+#: ../src/qtui/settingspages/highlightsettingspage.ui:53
+msgctxt "HighlightSettingsPage|"
+msgid "Channel"
+msgstr "Kanaal"
+
+#: ../src/qtui/settingspages/highlightsettingspage.ui:69
+msgctxt "HighlightSettingsPage|"
 msgid "Add"
 msgstr "Toevoegen"
 
-#: HighlightSettingsPage#11
-msgctxt "HighlightSettingsPage#11"
+#: ../src/qtui/settingspages/highlightsettingspage.ui:76
+msgctxt "HighlightSettingsPage|"
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: HighlightSettingsPage#12
+#: ../src/qtui/settingspages/highlightsettingspage.ui:101
+msgctxt "HighlightSettingsPage|"
 msgid "Highlight Nicks"
-msgstr "Markeer nicks"
+msgstr "Nicks markeren"
 
-#: HighlightSettingsPage#13
+#: ../src/qtui/settingspages/highlightsettingspage.ui:107
+msgctxt "HighlightSettingsPage|"
 msgid "All nicks from identity"
 msgstr "Alle nicks van identiteit"
 
-#: HighlightSettingsPage#14
+#: ../src/qtui/settingspages/highlightsettingspage.ui:114
+msgctxt "HighlightSettingsPage|"
 msgid "Current nick"
 msgstr "Huidige nick"
 
-#: HighlightSettingsPage#15
+#: ../src/qtui/settingspages/highlightsettingspage.ui:124
+msgctxt "HighlightSettingsPage|"
 msgid "None"
 msgstr "Geen"
 
-#: HighlightSettingsPage#16
+#: ../src/qtui/settingspages/highlightsettingspage.ui:131
+msgctxt "HighlightSettingsPage|"
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: IdentitiesSettingsPage#1
-msgctxt "IdentitiesSettingsPage#1"
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:29
+msgctxt "HighlightSettingsPage|"
+msgid "Interface"
+msgstr "Interface"
+
+#: ../src/qtui/settingspages/highlightsettingspage.cpp:184
+msgctxt "HighlightSettingsPage|"
+msgid "this shouldn't be empty"
+msgstr "dit zou niet leeg moeten zijn"
+
+#: ../src/qtui/settingspages/highlightsettingspage.h:46
+msgctxt "HighlightSettingsPage|"
+msgid "highlight rule"
+msgstr "markeringsregel"
+
+#: ../src/qtui/settingspages/identitiessettingspage.ui:31
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:364
+msgctxt "IdentitiesSettingsPage|"
+msgid "Rename Identity"
+msgstr "Identiteit hernoemen"
+
+#: ../src/qtui/settingspages/identitiessettingspage.ui:34
+#: ../src/qtui/settingspages/identitiessettingspage.ui:77
+msgctxt "IdentitiesSettingsPage|"
+msgid "..."
+msgstr "…"
+
+#: ../src/qtui/settingspages/identitiessettingspage.ui:51
+msgctxt "IdentitiesSettingsPage|"
+msgid "Add Identity"
+msgstr "Identiteit toevoegen"
+
+#: ../src/qtui/settingspages/identitiessettingspage.ui:54
+msgctxt "IdentitiesSettingsPage|"
+msgid "Add..."
+msgstr "Toevoegen…"
+
+#: ../src/qtui/settingspages/identitiessettingspage.ui:74
+msgctxt "IdentitiesSettingsPage|"
+msgid "Remove Identity"
+msgstr "Identiteit verwijderen"
+
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+msgctxt "IdentitiesSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: IdentitiesSettingsPage#2
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:31
+msgctxt "IdentitiesSettingsPage|"
 msgid "Identities"
 msgstr "Identiteiten"
 
-#: IdentitiesSettingsPage#3
-msgctxt "IdentitiesSettingsPage#3"
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:199
+msgctxt "IdentitiesSettingsPage|"
 msgid ""
 "<b>The following problems need to be corrected before your changes can be "
 "applied:</b><ul>"
@@ -2170,276 +2993,266 @@ msgstr ""
 "<b>De volgende problemen moeten opgelost worden voordat uw wijzigingen "
 "toegepast kunnen worden:</b><ul>"
 
-#: IdentitiesSettingsPage#4
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:200
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>All identities need an identity name set</li>"
 msgstr "<li>U moet voor alle identiteiten een naam instellen</li>"
 
-#: IdentitiesSettingsPage#5
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:201
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>Every identity needs at least one nickname defined</li>"
-msgstr ""
-"<li>Voor elke identiteit moet minstens een bijnaam ingesteld zijn</li>"
+msgstr "<li>Voor elke identiteit moet minstens één bijnaam ingesteld zijn</li>"
 
-#: IdentitiesSettingsPage#6
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:202
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify a real name for every identity</li>"
 msgstr "<li>U moet voor elke identiteit een echte naam opgeven</li>"
 
-#: IdentitiesSettingsPage#7
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:203
+msgctxt "IdentitiesSettingsPage|"
 msgid "<li>You need to specify an ident for every identity</li>"
 msgstr "<li>U moet voor elke identiteit een ident opgeven</li>"
 
-#: IdentitiesSettingsPage#8
-msgctxt "IdentitiesSettingsPage#8"
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:204
+msgctxt "IdentitiesSettingsPage|"
 msgid "</ul>"
 msgstr "</ul>"
 
-#: IdentitiesSettingsPage#9
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:205
+msgctxt "IdentitiesSettingsPage|"
 msgid "One or more identities are invalid"
 msgstr "Een of meer identiteiten zijn niet geldig"
 
-#: IdentitiesSettingsPage#10
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:350
+msgctxt "IdentitiesSettingsPage|"
 msgid "Delete Identity?"
 msgstr "Identiteit verwijderen?"
 
-#: IdentitiesSettingsPage#11
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:351
+#, qt-format
+msgctxt "IdentitiesSettingsPage|"
 msgid "Do you really want to delete identity \"%1\"?"
-msgstr "Wilt u echt identiteit \"%1\" verwijderen?"
-
-#: IdentitiesSettingsPage#12
-msgctxt "IdentitiesSettingsPage#12"
-msgid "Rename Identity"
-msgstr "Identiteit hernoemen"
+msgstr "Wilt u identiteit ‘%1’ echt verwijderen?"
 
-#: IdentitiesSettingsPage#13
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:365
+#, qt-format
+msgctxt "IdentitiesSettingsPage|"
 msgid "Please enter a new name for the identity \"%1\"!"
-msgstr "Vul een nieuwe naam in voor identiteit \"%1\"."
-
-#: IdentitiesSettingsPage#14
-msgctxt "IdentitiesSettingsPage#14"
-msgid "..."
-msgstr "..."
-
-#: IdentitiesSettingsPage#15
-msgid "Add Identity"
-msgstr "Identiteit toevoegen"
-
-#: IdentitiesSettingsPage#16
-msgctxt "IdentitiesSettingsPage#16"
-msgid "Add..."
-msgstr "Toevoegen..."
+msgstr "Vul een nieuwe naam voor identiteit ‘%1’ in."
 
-#: IdentitiesSettingsPage#17
-msgid "Remove Identity"
-msgstr "Identiteit verwijderen"
-
-#: Identity#1
+#: ../src/common/identity.cpp:147
+msgctxt "Identity|"
 msgid "Quassel IRC User"
 msgstr "Quassel IRC-gebruiker"
 
-#: Identity#2
+#: ../src/common/identity.cpp:177
+msgctxt "Identity|"
 msgid "<empty>"
 msgstr "<leeg>"
 
-#: Identity#3
+#: ../src/common/identity.cpp:183
+msgctxt "Identity|"
 msgid "Gone fishing."
 msgstr "Aan het vissen."
 
-#: Identity#4
+#: ../src/common/identity.cpp:187
+msgctxt "Identity|"
 msgid "Not here. No, really. not here!"
 msgstr "Niet hier. Echt waar, niet hier!"
 
-#: Identity#5
+#: ../src/common/identity.cpp:190
+msgctxt "Identity|"
 msgid "All Quassel clients vanished from the face of the earth..."
-msgstr "Alle Quassel-clients zijn van de aardbodem verdwenen..."
+msgstr "Alle Quassel-clients zijn van de aardbodem verdwenen…"
 
-#: Identity#6
+#: ../src/common/identity.cpp:193
+msgctxt "Identity|"
 msgid "Kindergarten is elsewhere!"
 msgstr "Kleutelschool is ergens anders!"
 
-#: Identity#7
+#: ../src/common/identity.cpp:194 ../src/common/identity.cpp:195
+msgctxt "Identity|"
 msgid "http://quassel-irc.org - Chat comfortably. Anywhere."
 msgstr "http://quassel-irc.org - Chat comfortabel. Waar dan ook."
 
-#: IdentityEditWidget#1
-msgctxt "IdentityEditWidget#1"
-msgid "Advanced"
-msgstr "Geavanceerd"
-
-#: IdentityEditWidget#2
-msgid "Load a Key"
-msgstr "Laadt een sleutel"
-
-#: IdentityEditWidget#3
-msgid "No Key loaded"
-msgstr "Geen sleutel geladen"
-
-#: IdentityEditWidget#4
-msgid "Load"
-msgstr "Laden"
-
-#: IdentityEditWidget#5
-msgid "RSA"
-msgstr "RSA"
-
-#: IdentityEditWidget#6
-msgid "DSA"
-msgstr "DSA"
-
-#: IdentityEditWidget#7
-msgid "Clear"
-msgstr "Wis"
-
-#: IdentityEditWidget#8
-msgid "Load a Certificate"
-msgstr "Laadt een certificaat"
-
-#: IdentityEditWidget#9
-msgid "No Certificate loaded"
-msgstr "Geen certificaat geladen"
-
-#: IdentityEditWidget#10
+#: ../src/qtui/settingspages/identityeditwidget.ui:30
+msgctxt "IdentityEditWidget|"
 msgid "General"
 msgstr "Algemeen"
 
-#: IdentityEditWidget#11
+#: ../src/qtui/settingspages/identityeditwidget.ui:38
+msgctxt "IdentityEditWidget|"
 msgid "Real Name:"
 msgstr "Echte naam:"
 
-#: IdentityEditWidget#12
+#: ../src/qtui/settingspages/identityeditwidget.ui:45
+msgctxt "IdentityEditWidget|"
 msgid "The \"Real Name\" is shown in /whois."
-msgstr "De \"Echte naam\" wordt getoond in /whois."
+msgstr "De ‘Echte naam’ wordtin /whois getoond ."
 
-#: IdentityEditWidget#13
+#: ../src/qtui/settingspages/identityeditwidget.ui:54
+msgctxt "IdentityEditWidget|"
 msgid "Nicknames"
 msgstr "Bijnamen (Nicknames)"
 
-#: IdentityEditWidget#14
-msgctxt "IdentityEditWidget#14"
+#: ../src/qtui/settingspages/identityeditwidget.ui:90
+msgctxt "IdentityEditWidget|"
 msgid "Add Nickname"
 msgstr "Bijnaam toevoegen"
 
-#: IdentityEditWidget#15
-msgctxt "IdentityEditWidget#15"
+#: ../src/qtui/settingspages/identityeditwidget.ui:93
+msgctxt "IdentityEditWidget|"
 msgid "&Add..."
 msgstr "&Toevoegen..."
 
-#: IdentityEditWidget#16
+#: ../src/qtui/settingspages/identityeditwidget.ui:116
+msgctxt "IdentityEditWidget|"
 msgid "Remove Nickname"
-msgstr "Verwijder bijnaam"
+msgstr "Bijnaam verwijderen"
 
-#: IdentityEditWidget#17
-msgctxt "IdentityEditWidget#17"
+#: ../src/qtui/settingspages/identityeditwidget.ui:119
+msgctxt "IdentityEditWidget|"
 msgid "Remove"
-msgstr "Verwijder"
+msgstr "Verwijderen"
 
-#: IdentityEditWidget#18
-msgctxt "IdentityEditWidget#18"
+#: ../src/qtui/settingspages/identityeditwidget.ui:136
+msgctxt "IdentityEditWidget|"
 msgid "Rename Identity"
 msgstr "Identiteit hernoemen"
 
-#: IdentityEditWidget#19
-msgctxt "IdentityEditWidget#19"
+#: ../src/qtui/settingspages/identityeditwidget.ui:139
+msgctxt "IdentityEditWidget|"
 msgid "Re&name..."
-msgstr "Her&noemen..."
+msgstr "Her&noemen…"
 
-#: IdentityEditWidget#20
-msgctxt "IdentityEditWidget#20"
+#: ../src/qtui/settingspages/identityeditwidget.ui:165
+msgctxt "IdentityEditWidget|"
 msgid "Move upwards in list"
 msgstr "In de lijst omhoog verplaatsen"
 
-#: IdentityEditWidget#21
-msgctxt "IdentityEditWidget#21"
+#: ../src/qtui/settingspages/identityeditwidget.ui:168
+#: ../src/qtui/settingspages/identityeditwidget.ui:182
+msgctxt "IdentityEditWidget|"
 msgid "..."
-msgstr "..."
+msgstr "…"
 
-#: IdentityEditWidget#22
-msgctxt "IdentityEditWidget#22"
+#: ../src/qtui/settingspages/identityeditwidget.ui:179
+msgctxt "IdentityEditWidget|"
 msgid "Move downwards in list"
 msgstr "In de lijst omlaag verplaatsen"
 
-#: IdentityEditWidget#23
+#: ../src/qtui/settingspages/identityeditwidget.ui:227
+msgctxt "IdentityEditWidget|"
 msgid "A&way"
 msgstr "&Weg"
 
-#: IdentityEditWidget#24
+#: ../src/qtui/settingspages/identityeditwidget.ui:233
+msgctxt "IdentityEditWidget|"
 msgid "Default Away Settings"
 msgstr "Standaard afwezigheidsinstellingen"
 
-#: IdentityEditWidget#25
+#: ../src/qtui/settingspages/identityeditwidget.ui:244
+msgctxt "IdentityEditWidget|"
 msgid "Nick to be used when being away"
-msgstr "Te gebruiken bijnaam als u afwezig bent"
+msgstr "Te gebruiken nick als u afwezig bent"
 
-#: IdentityEditWidget#26
+#: ../src/qtui/settingspages/identityeditwidget.ui:254
+msgctxt "IdentityEditWidget|"
 msgid "Default away reason"
 msgstr "Standaard afwezigheidsreden"
 
-#: IdentityEditWidget#27
+#: ../src/qtui/settingspages/identityeditwidget.ui:261
+msgctxt "IdentityEditWidget|"
 msgid "Away Nick:"
 msgstr "Afwezigheidsbijnaam:"
 
-#: IdentityEditWidget#28
+#: ../src/qtui/settingspages/identityeditwidget.ui:268
+#: ../src/qtui/settingspages/identityeditwidget.ui:297
+#: ../src/qtui/settingspages/identityeditwidget.ui:366
+msgctxt "IdentityEditWidget|"
 msgid "Away Reason:"
 msgstr "Afwezigheidsreden:"
 
-#: IdentityEditWidget#29
+#: ../src/qtui/settingspages/identityeditwidget.ui:280
+msgctxt "IdentityEditWidget|"
 msgid "Set away when all clients have detached from the core"
 msgstr "Stel afwezig in wanneer alle clients van de core ontkoppeld zijn"
 
-#: IdentityEditWidget#30
+#: ../src/qtui/settingspages/identityeditwidget.ui:283
+msgctxt "IdentityEditWidget|"
 msgid "Away On Detach"
 msgstr "Afwezig bij ontkoppelen"
 
-#: IdentityEditWidget#31
+#: ../src/qtui/settingspages/identityeditwidget.ui:315
+msgctxt "IdentityEditWidget|"
 msgid "Not implemented yet"
 msgstr "Nog niet geïmplementeerd"
 
-#: IdentityEditWidget#32
+#: ../src/qtui/settingspages/identityeditwidget.ui:318
+msgctxt "IdentityEditWidget|"
 msgid "Away On Idle"
 msgstr "Afwezig bij geen activiteit"
 
-#: IdentityEditWidget#33
+#: ../src/qtui/settingspages/identityeditwidget.ui:332
+msgctxt "IdentityEditWidget|"
 msgid "Set away after"
 msgstr "Stel afwezig in na"
 
-#: IdentityEditWidget#34
+#: ../src/qtui/settingspages/identityeditwidget.ui:342
+msgctxt "IdentityEditWidget|"
 msgid "minutes of being idle"
 msgstr "minuten zonder activiteit"
 
-#: IdentityEditWidget#35
+#: ../src/qtui/settingspages/identityeditwidget.ui:399
+#: ../src/qtui/settingspages/identityeditwidget.cpp:236
+msgctxt "IdentityEditWidget|"
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#: ../src/qtui/settingspages/identityeditwidget.ui:407
+msgctxt "IdentityEditWidget|"
 msgid "Ident:"
 msgstr "Ident:"
 
-#: IdentityEditWidget#36
+#: ../src/qtui/settingspages/identityeditwidget.ui:414
+msgctxt "IdentityEditWidget|"
 msgid ""
 "The \"ident\" is part of your hostmask and, together with your host, "
 "uniquely identifies you within the IRC network."
 msgstr ""
-"Het \"identi\" is deel van uw hostmask en identificeert u, in combinatie met "
+"Het ‘identi’ is deel van uw hostmask en identificeert u, in combinatie met "
 "uw host, bij het IRC-netwerk."
 
-#: IdentityEditWidget#37
+#: ../src/qtui/settingspages/identityeditwidget.ui:423
+msgctxt "IdentityEditWidget|"
 msgid "Messages"
 msgstr "Berichten"
 
-#: IdentityEditWidget#38
+#: ../src/qtui/settingspages/identityeditwidget.ui:431
+msgctxt "IdentityEditWidget|"
 msgid "Part Reason:"
-msgstr "Vertrek reden:"
+msgstr "Reden voor vertrek:"
 
-#: IdentityEditWidget#39
+#: ../src/qtui/settingspages/identityeditwidget.ui:444
+msgctxt "IdentityEditWidget|"
 msgid "Quit Reason:"
-msgstr "Afsluit reden:"
+msgstr "Reden voor afsluiten:"
 
-#: IdentityEditWidget#40
+#: ../src/qtui/settingspages/identityeditwidget.ui:454
+msgctxt "IdentityEditWidget|"
 msgid "Kick Reason:"
-msgstr "Kick reden:"
+msgstr "Reden voor kick:"
 
-#: IdentityEditWidget#41
+#: ../src/qtui/settingspages/identityeditwidget.ui:488
+msgctxt "IdentityEditWidget|"
 msgid ""
 "You need an SSL Capable Client to edit your Cores SSL Key and Certificate"
 msgstr ""
 "U heeft een clien nodig die SSL begrijpt als u de SSL-sleutel en -"
 "certificaat wilt bewerken"
 
-#: IdentityEditWidget#42
+#: ../src/qtui/settingspages/identityeditwidget.ui:517
+msgctxt "IdentityEditWidget|"
 msgid ""
 "Warning: you are not connected with a secured connection to the Quassel "
 "Core!\n"
@@ -2447,77 +3260,140 @@ msgid ""
 "Certificate!"
 msgstr ""
 "Waarschuwing: uw verbinding met de Quassel-core is niet beveiligd! Als u "
-"doorgaat zult u uw SSL-sleutel en certificaat niet-beveiligd verzenden!"
+"doorgaat zult u uw SSL-sleutel en certificaat niet-beveiligd verzonden "
+"worden!"
 
-#: IdentityEditWidget#43
-msgctxt "IdentityEditWidget#43"
+#: ../src/qtui/settingspages/identityeditwidget.ui:546
+msgctxt "IdentityEditWidget|"
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: IdentityEditWidget#44
+#: ../src/qtui/settingspages/identityeditwidget.ui:584
+msgctxt "IdentityEditWidget|"
 msgid "Use SSL Key"
-msgstr "Gebruik SSL-sleutel"
+msgstr "SSL-sleutel gebruiken"
 
-#: IdentityEditWidget#45
+#: ../src/qtui/settingspages/identityeditwidget.ui:598
+msgctxt "IdentityEditWidget|"
 msgid "Key Type:"
 msgstr "Sleuteltype:"
 
-#: IdentityEditWidget#46
+#: ../src/qtui/settingspages/identityeditwidget.ui:605
+#: ../src/qtui/settingspages/identityeditwidget.cpp:350
+#: ../src/qtui/settingspages/identityeditwidget.cpp:362
+msgctxt "IdentityEditWidget|"
+msgid "No Key loaded"
+msgstr "Geen sleutel geladen"
+
+#: ../src/qtui/settingspages/identityeditwidget.ui:625
+#: ../src/qtui/settingspages/identityeditwidget.ui:723
+#: ../src/qtui/settingspages/identityeditwidget.cpp:351
+#: ../src/qtui/settingspages/identityeditwidget.cpp:405
+msgctxt "IdentityEditWidget|"
+msgid "Load"
+msgstr "Laden"
+
+#: ../src/qtui/settingspages/identityeditwidget.ui:637
+msgctxt "IdentityEditWidget|"
 msgid "Use SSL Certificate"
-msgstr "Gebruik SSL-certificaat"
+msgstr "SSL-certificaat gebruiken"
 
-#: IdentityEditWidget#47
+#: ../src/qtui/settingspages/identityeditwidget.ui:656
+msgctxt "IdentityEditWidget|"
 msgid "Organisation:"
 msgstr "Organisatie:"
 
-#: IdentityEditWidget#48
+#: ../src/qtui/settingspages/identityeditwidget.ui:663
+#: ../src/qtui/settingspages/identityeditwidget.ui:697
+#: ../src/qtui/settingspages/identityeditwidget.cpp:403
+#: ../src/qtui/settingspages/identityeditwidget.cpp:404
+msgctxt "IdentityEditWidget|"
+msgid "No Certificate loaded"
+msgstr "Geen certificaat geladen"
+
+#: ../src/qtui/settingspages/identityeditwidget.ui:690
+msgctxt "IdentityEditWidget|"
 msgid "CommonName:"
 msgstr "CommonName:"
 
-#: IdentityPage#1
+#: ../src/qtui/settingspages/identityeditwidget.cpp:319
+msgctxt "IdentityEditWidget|"
+msgid "Load a Key"
+msgstr "Een sleutel laden"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:356
+msgctxt "IdentityEditWidget|"
+msgid "RSA"
+msgstr "RSA"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:359
+msgctxt "IdentityEditWidget|"
+msgid "DSA"
+msgstr "DSA"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:364
+#: ../src/qtui/settingspages/identityeditwidget.cpp:410
+msgctxt "IdentityEditWidget|"
+msgid "Clear"
+msgstr "Wissen"
+
+#: ../src/qtui/settingspages/identityeditwidget.cpp:376
+msgctxt "IdentityEditWidget|"
+msgid "Load a Certificate"
+msgstr "Een certificaat laden"
+
+#: ../src/qtui/ircconnectionwizard.cpp:115
+msgctxt "IdentityPage|"
 msgid "Setup Identity"
 msgstr "Identiteit instellen"
 
-#: IdentityPage#2
+#: ../src/qtui/ircconnectionwizard.cpp:120
+msgctxt "IdentityPage|"
 msgid "Default Identity"
 msgstr "Standaard identiteit"
 
-#: IgnoreListEditDlg#1
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:15
+msgctxt "IgnoreListEditDlg|"
 msgid "Configure Ignore Rule"
 msgstr "Configureer negeer-regel"
 
-#: IgnoreListEditDlg#2
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:27
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Strictness:</b></p>\n"
 "<p><u>Dynamic:</u></p>\n"
 "<p>Messages are filtered \"on the fly\".\n"
-"Whenever you disable/delete the ignore rule, the messages are shown "
-"again.</p>\n"
+"Whenever you disable/delete the ignore rule, the messages are shown again.</"
+"p>\n"
 "<p><u>Permanent:</u></p>\n"
 "<p>Messages are filtered before they get stored in the database.</p>"
 msgstr ""
-"<p><b>Strengheid:</b></p>\n"
+"<p><b>Striktheid:</b></p>\n"
 "<p><u>Dynamisch:</u></p>\n"
-"<p>Berichten worden \"on the fly\" gefilterd.\n"
+"<p>Berichten worden ‘on the fly’ gefilterd.\n"
 "Wanneer u de negeer-regel uitschakelt of verwijdert worden de berichten weer "
 "zichtbaar.</p>\n"
 "<p><u>Permanent:</u></p>\n"
-"<p>Berichten worden gefilterd voordat ze in de database opgeslagen "
-"worden.</p>"
+"<p>Berichten worden gefilterd voordat ze in de database opgeslagen worden.</"
+"p>"
 
-#: IgnoreListEditDlg#3
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:35
+msgctxt "IgnoreListEditDlg|"
 msgid "Strictness"
-msgstr "Strengheid"
+msgstr "Striktheid"
 
-#: IgnoreListEditDlg#4
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:41
+msgctxt "IgnoreListEditDlg|"
 msgid "Dynamic"
 msgstr "Dynamisch"
 
-#: IgnoreListEditDlg#5
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:48
+msgctxt "IgnoreListEditDlg|"
 msgid "Permanent"
 msgstr "Permanent"
 
-#: IgnoreListEditDlg#6
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:58
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Rule Type:</b></p>\n"
 "<p><u>Sender:</u></p>\n"
@@ -2533,29 +3409,32 @@ msgstr ""
 "<p><u>Bericht:</u></p>\n"
 "<p>De regel wordt gebruikt op grond van de inhoud van het bericht</p>"
 
-#: IgnoreListEditDlg#7
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:66
+msgctxt "IgnoreListEditDlg|"
 msgid "Rule Type"
 msgstr "Regeltype"
 
-#: IgnoreListEditDlg#8
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:72
+msgctxt "IgnoreListEditDlg|"
 msgid "Sender"
 msgstr "Afzender"
 
-#: IgnoreListEditDlg#9
-msgctxt "IgnoreListEditDlg#9"
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:79
+msgctxt "IgnoreListEditDlg|"
 msgid "Message"
 msgstr "Bericht"
 
-#: IgnoreListEditDlg#10
-msgctxt "IgnoreListEditDlg#10"
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:86
+msgctxt "IgnoreListEditDlg|"
 msgid "CTCP"
 msgstr "CTCP"
 
-#: IgnoreListEditDlg#11
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:98
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Ignore rule:</b></p>\n"
-"<p>Depending on the type of the rule, the text is matched against "
-"either:</p>\n"
+"<p>Depending on the type of the rule, the text is matched against either:</"
+"p>\n"
 "<p><u>- the message content:</u></p>\n"
 "<p><i>Example:</i>\n"
 "<br />\n"
@@ -2584,12 +3463,13 @@ msgstr ""
 "- <i>stupid!.+</i> (RegEx) is van toepassing op elke verzender met de "
 "nickname <i>stupid</i> van elke host</p>"
 
-#: IgnoreListEditDlg#12
-msgctxt "IgnoreListEditDlg#12"
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:112
+msgctxt "IgnoreListEditDlg|"
 msgid "Ignore Rule"
 msgstr "Negeer-regel"
 
-#: IgnoreListEditDlg#13
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:123
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Use regular expressions:</b></p>\n"
 "<p>If enabled, rules follow regular expression syntax.</p>\n"
@@ -2603,15 +3483,17 @@ msgstr ""
 "<p>Gebruik regular expression syntaxis.</p>\n"
 "<p>Anders kunnen regels ook wildcards bevatten met de volgende speciale "
 "tekens:</p>\n"
-"<p> *: staat voor \"elk aantal van welk teken dan ook\"\n"
+"<p> *: staat voor ‘elk aantal van welk teken dan ook’\n"
 "<br />\n"
-"?: staat voor \"precies een teken\"</p>"
+"?: staat voor ‘precies een teken’</p>"
 
-#: IgnoreListEditDlg#14
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:131
+msgctxt "IgnoreListEditDlg|"
 msgid "Regular expression"
 msgstr "Regular expression"
 
-#: IgnoreListEditDlg#15
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:143
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Scope:</b></p>\n"
 "<p><u>Global:</u></p>\n"
@@ -2633,25 +3515,28 @@ msgstr ""
 "<p>De lijst hieronder bevat de kanalen waarop de regel van toepassing moet "
 "zijn</p>"
 
-#: IgnoreListEditDlg#16
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:152
+msgctxt "IgnoreListEditDlg|"
 msgid "Scope"
 msgstr "Beriek"
 
-#: IgnoreListEditDlg#17
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:160
+msgctxt "IgnoreListEditDlg|"
 msgid "Global"
 msgstr "Globaal"
 
-#: IgnoreListEditDlg#18
-msgctxt "IgnoreListEditDlg#18"
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:167
+msgctxt "IgnoreListEditDlg|"
 msgid "Network"
 msgstr "Netwerk"
 
-#: IgnoreListEditDlg#19
-msgctxt "IgnoreListEditDlg#19"
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:174
+msgctxt "IgnoreListEditDlg|"
 msgid "Channel"
 msgstr "Kanaal"
 
-#: IgnoreListEditDlg#20
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:183
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Scope rule:</b></p>\n"
 "<p>A scope rule is a semicolon separated list of either <i>network</i> or "
@@ -2672,7 +3557,8 @@ msgstr ""
 "zou van toepassing zijn op #foobar en elk kanaal dat met <i>#quassel</i> "
 "begint.</p>"
 
-#: IgnoreListEditDlg#21
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:214
+msgctxt "IgnoreListEditDlg|"
 msgid ""
 "<p><b>Enable / Disable:</b></p>\n"
 "<p>Only enabled rules are filtered.\n"
@@ -2685,11 +3571,13 @@ msgstr ""
 "Voor dynamische regels zal uitschakelen de gefilterde berichten juist weer "
 "tonen.</p>"
 
-#: IgnoreListEditDlg#22
+#: ../src/qtui/settingspages/ignorelisteditdlg.ui:220
+msgctxt "IgnoreListEditDlg|"
 msgid "Rule is enabled"
 msgstr "Regel is ingeschakeld"
 
-#: IgnoreListModel#1
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:71
+msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Enable / Disable:</b><br />Only enabled rules are filtered.<br />For "
 "dynamic rules, disabling actually shows the filtered messages again"
@@ -2698,708 +3586,921 @@ msgstr ""
 "toepassing. <br /> Voor dynamische regels zal uitschakelen de gefilterde "
 "berichten juist weer tonen.</p>"
 
-#: IgnoreListModel#2
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:75
+msgctxt "IgnoreListModel|"
 msgid ""
 "<b>Ignore rule:</b><br />Depending on the type of the rule, the text is "
-"matched against either:<br /><br />- <u>the message content:</u><br "
-"/><i>Example:<i><br />    \"*foobar*\" matches any text containing the word "
-"\"foobar\"<br /><br />- <u>the sender string "
-"<i>nick!ident@host.name<i></u><br /><i>Example:</i><br />    "
-"\"*@foobar.com\" matches any sender from host foobar.com<br />    "
-"\"stupid!.+\" (RegEx) matches any sender with nickname \"stupid\" from any "
-"host<br />"
+"matched against either:<br /><br />- <u>the message content:</u><br /"
+"><i>Example:<i><br />    \"*foobar*\" matches any text containing the word "
+"\"foobar\"<br /><br />- <u>the sender string <i>nick!ident@host.name<i></"
+"u><br /><i>Example:</i><br />    \"*@foobar.com\" matches any sender from "
+"host foobar.com<br />    \"stupid!.+\" (RegEx) matches any sender with "
+"nickname \"stupid\" from any host<br />"
 msgstr ""
 "<b>Negeer-regel:</b><br />Afhankelijk van het type regels is deze van "
-"toepassing op:<br /><br />- <u>de inhoud van het bericht:</u><br "
-"/><i>Voorbeeld:<i><br />    \"*foobar*\" komt overeen met elke tekst die het "
-"woord \"foobar\" bevat\"<br /><br />- <u>de afzender "
-"<i>nick!ident@host.name<i></u><br /><i>Voorbeeld:</i><br />    "
-"\"*@foobar.com\" komt overeen met elke afzender van de host  foobar.com<br "
-"/>    \"stupid!.+\" (RegEx) komt overeen met elke afzender met de bijnaam "
-"\"stupid\" van elke host<br />"
-
-#: IgnoreListModel#3
+"toepassing op:<br /><br />- <u>de inhoud van het bericht:</u><br /"
+"><i>Voorbeeld:<i><br />    ‘*foobar*’ komt overeen met elke tekst die het "
+"woord ‘foobar’ bevat\"<br /><br />- <u>de afzender <i>nick!ident@host."
+"name<i></u><br /><i>Voorbeeld:</i><br />    ‘*@foobar.com’ komt overeen met "
+"elke afzender van de host  foobar.com<br />    ‘stupid!.+’ (RegEx) komt "
+"overeen met elke afzender met de bijnaam ‘stupid’, van elke host<br />"
+
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:91
+msgctxt "IgnoreListModel|"
 msgid "By Sender"
 msgstr "Naar afzender"
 
-#: IgnoreListModel#4
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:93
+msgctxt "IgnoreListModel|"
 msgid "By Message"
 msgstr "Naar bericht"
 
-#: IgnoreListModel#5
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:208
+msgctxt "IgnoreListModel|"
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: IgnoreListModel#6
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:209
+msgctxt "IgnoreListModel|"
 msgid "Type"
 msgstr "Type"
 
-#: IgnoreListModel#7
-msgctxt "IgnoreListModel#7"
+#: ../src/qtui/settingspages/ignorelistmodel.cpp:210
+msgctxt "IgnoreListModel|"
 msgid "Ignore Rule"
 msgstr "Negeer-regel"
 
-#: IgnoreListSettingsPage#1
-msgctxt "IgnoreListSettingsPage#1"
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:14
+msgctxt "IgnoreListSettingsPage|"
+msgid "Form"
+msgstr "Formulier"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:28
+msgctxt "IgnoreListSettingsPage|"
+msgid "New"
+msgstr "Nieuw"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:42
+msgctxt "IgnoreListSettingsPage|"
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.ui:56
+msgctxt "IgnoreListSettingsPage|"
+msgid "&Edit"
+msgstr "Be&werken"
+
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+msgctxt "IgnoreListSettingsPage|"
 msgid "IRC"
 msgstr "IRC"
 
-#: IgnoreListSettingsPage#2
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:34
+msgctxt "IgnoreListSettingsPage|"
 msgid "Ignore List"
 msgstr "Negeerlijst"
 
-#: IgnoreListSettingsPage#3
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:144
+msgctxt "IgnoreListSettingsPage|"
 msgid "Rule already exists"
 msgstr "Regel bestaat al"
 
-#: IgnoreListSettingsPage#4
+#: ../src/qtui/settingspages/ignorelistsettingspage.cpp:145
+#, qt-format
+msgctxt "IgnoreListSettingsPage|"
 msgid ""
 "There is already a rule\n"
 "\"%1\"\n"
 "Please choose another rule."
 msgstr ""
 "Er bestaat al een regel\n"
-"\"%1\"\n"
+"‘%1’\n"
 "Kies een andere regel."
 
-#: IgnoreListSettingsPage#5
-msgctxt "IgnoreListSettingsPage#5"
-msgid "Form"
-msgstr "Form"
-
-#: IgnoreListSettingsPage#6
-msgctxt "IgnoreListSettingsPage#6"
-msgid "New"
-msgstr "Nieuw"
-
-#: IgnoreListSettingsPage#7
-msgctxt "IgnoreListSettingsPage#7"
-msgid "Delete"
-msgstr "Verwijder"
-
-#: IgnoreListSettingsPage#8
-msgid "&Edit"
-msgstr "Be&werk"
-
-#: IndicatorNotificationConfigWidget#1
-msgctxt "IndicatorNotificationConfigWidget#1"
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:14
+msgctxt "IndicatorNotificationConfigWidget|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: IndicatorNotificationConfigWidget#2
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:20
+msgctxt "IndicatorNotificationConfigWidget|"
 msgid ""
 "This enables support for the Ayatana Project's application indicator "
 "(libindicate)."
 msgstr ""
-"Dit activeert ondersteuning voor de yatana Project's application indicator "
-"(libindicate)."
+"Dit activeert ondersteuning voor de application indicator van het Ayatana "
+"Project (libindicate)."
 
-#: IndicatorNotificationConfigWidget#3
+#: ../src/qtui/ui/indicatornotificationconfigwidget.ui:23
+msgctxt "IndicatorNotificationConfigWidget|"
 msgid "Show messages in application indicator"
-msgstr "Toon berichten in applicatie-indicator"
+msgstr "Berichten in applicatie-indicator weergeven"
+
+#: ../src/qtui/ui/inputwidget.ui:26
+msgctxt "InputWidget|"
+msgid "Form"
+msgstr "Formulier"
 
-#: InputWidget#1
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "White"
 msgstr "Wit"
 
-#: InputWidget#2
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Black"
 msgstr "Zwart"
 
-#: InputWidget#3
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Dark blue"
 msgstr "Donkerblauw"
 
-#: InputWidget#4
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Dark green"
 msgstr "Donkergroen"
 
-#: InputWidget#5
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Red"
 msgstr "Rood"
 
-#: InputWidget#6
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Dark red"
 msgstr "Donkerrood"
 
-#: InputWidget#7
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Dark magenta"
 msgstr "Donkermagenta"
 
-#: InputWidget#8
+#: ../src/qtui/inputwidget.cpp:73
+msgctxt "InputWidget|"
 msgid "Orange"
 msgstr "Oranje"
 
-#: InputWidget#9
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Yellow"
 msgstr "Geel"
 
-#: InputWidget#10
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Green"
 msgstr "Groen"
 
-#: InputWidget#11
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Dark cyan"
 msgstr "Donkercyaan"
 
-#: InputWidget#12
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Cyan"
 msgstr "Cyaan"
 
-#: InputWidget#13
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Blue"
 msgstr "Blauw"
 
-#: InputWidget#14
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Magenta"
 msgstr "Magenta"
 
-#: InputWidget#15
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Dark gray"
 msgstr "Donkergrijs"
 
-#: InputWidget#16
+#: ../src/qtui/inputwidget.cpp:74
+msgctxt "InputWidget|"
 msgid "Light gray"
 msgstr "Lichtgrijs"
 
-#: InputWidget#17
+#: ../src/qtui/inputwidget.cpp:84 ../src/qtui/inputwidget.cpp:85
+msgctxt "InputWidget|"
 msgid "Clear Color"
 msgstr "Heldere kleur"
 
-#: InputWidget#18
+#: ../src/qtui/inputwidget.cpp:132
+msgctxt "InputWidget|"
 msgid "Focus Input Line"
-msgstr "Focus inputregel"
-
-#: InputWidget#19
-msgid "Ctrl+L"
-msgstr "Ctrl+L"
-
-#: InputWidget#20
-msgctxt "InputWidget#20"
-msgid "Form"
-msgstr "Form"
-
-#: InputWidgetSettingsPage#1
-msgctxt "InputWidgetSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: InputWidgetSettingsPage#2
-msgid "Input Widget"
-msgstr "Input widget"
+msgstr "Focus voerregel"
 
-#: InputWidgetSettingsPage#3
-msgctxt "InputWidgetSettingsPage#3"
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:14
+msgctxt "InputWidgetSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: InputWidgetSettingsPage#4
-msgctxt "InputWidgetSettingsPage#4"
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:22
+msgctxt "InputWidgetSettingsPage|"
 msgid "Custom font:"
 msgstr "Eigen lettertype:"
 
-#: InputWidgetSettingsPage#5
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:50
+msgctxt "InputWidgetSettingsPage|"
 msgid "Enable spell check"
 msgstr "Spellingscontrole activeren"
 
-#: InputWidgetSettingsPage#6
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:63
+msgctxt "InputWidgetSettingsPage|"
 msgid "Enable per chat history"
 msgstr "Geschiedenis per chat activeren"
 
-#: InputWidgetSettingsPage#7
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:79
+msgctxt "InputWidgetSettingsPage|"
 msgid "Show nick selector"
-msgstr "Toon nick-kiezen"
+msgstr "Nick-kiezen weergeven"
 
-#: InputWidgetSettingsPage#8
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:95
+msgctxt "InputWidgetSettingsPage|"
 msgid "Show style buttons"
-msgstr "Toon stijlknoppen"
+msgstr "Stijlknoppen weergeven"
 
-#: InputWidgetSettingsPage#9
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:111
+msgctxt "InputWidgetSettingsPage|"
+msgid "Enables (limited) Emacs key bindings in the input field."
+msgstr "Activeert (beperkte) Emacs-sneltoetsen in het invoerveld."
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:114
+msgctxt "InputWidgetSettingsPage|"
+msgid "Emacs key bindings"
+msgstr "Emacs-sneltoetsen"
+
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:127
+msgctxt "InputWidgetSettingsPage|"
 msgid "Multi-Line Editing"
 msgstr "Meerdere regels bewerken"
 
-#: InputWidgetSettingsPage#10
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:144
+msgctxt "InputWidgetSettingsPage|"
 msgid "Show at most"
 msgstr "Toon maximaal"
 
-#: InputWidgetSettingsPage#11
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:170
+msgctxt "InputWidgetSettingsPage|"
 msgid "lines"
 msgstr "regels"
 
-#: InputWidgetSettingsPage#12
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:192
+msgctxt "InputWidgetSettingsPage|"
 msgid "Enable scrollbars"
-msgstr "Activeer schuifbalken"
-
-#: InputWidgetSettingsPage#13
-msgid "Tab Completion"
-msgstr "Tab-completion"
-
-#: InputWidgetSettingsPage#14
-msgid "Completion suffix:"
-msgstr "Completion suffix:"
-
-#: InputWidgetSettingsPage#15
-msgid ": "
-msgstr ": "
-
-#: IrcConnectionWizard#1
-msgid "Save && Connect"
-msgstr "Save && Connect"
-
-#: IrcListModel#1
-msgctxt "IrcListModel#1"
-msgid "Channel"
-msgstr "Kanaal"
-
-#: IrcListModel#2
-msgid "Users"
-msgstr "Gebruikers"
-
-#: IrcListModel#3
-msgctxt "IrcListModel#3"
-msgid "Topic"
-msgstr "Onderwerp"
-
-#: IrcServerHandler#1
-msgid "%1 has changed topic for %2 to: \"%3\""
-msgstr "%1 heeft het onderwerp van %2 verandert naar: \"%3\""
-
-#: IrcServerHandler#2
-msgid "Received RPL_ISUPPORT (005) without parameters!"
-msgstr "Received RPL_ISUPPORT (005) without parameters!"
-
-#: IrcServerHandler#3
-msgid ""
-"Received non RFC compliant RPL_ISUPPORT: this can lead to unexpected "
-"behavior!"
-msgstr ""
-"Received non RFC compliant RPL_ISUPPORT: dit kan tot onverwacht gedrag "
-"leiden!"
-
-#: IrcServerHandler#4
-msgctxt "IrcServerHandler#4"
-msgid "%1"
-msgstr "%1"
-
-#: IrcServerHandler#5
-msgid "[Whois] %1 is away: \"%2\""
-msgstr "[Whois] %1 is afwezig: \"%2\""
-
-#: IrcServerHandler#6
-msgid "%1 is away: \"%2\""
-msgstr "%1 is afwezig: \"%2\""
-
-#: IrcServerHandler#7
-msgid "[Whois] %1"
-msgstr "[Whois] %1"
-
-#: IrcServerHandler#8
-msgid "[Whois] %1 is %2 (%3)"
-msgstr "[Whois] %1 is %2 (%3)"
-
-#: IrcServerHandler#9
-msgid "%1 is online via %2 (%3)"
-msgstr "%1 is online via %2 (%3)"
-
-#: IrcServerHandler#10
-msgid "[Whowas] %1"
-msgstr "[Whowas] %1"
-
-#: IrcServerHandler#11
-msgid "[Whowas] %1 was %2 (%3)"
-msgstr "[Whowas] %1 was %2 (%3)"
-
-#: IrcServerHandler#12
-msgid "[Who] End of /WHO list for %1"
-msgstr "[Who] Einde van de /WHO-lijst voor %1"
-
-#: IrcServerHandler#13
-msgid "[Whois] %1 is logged in since %2"
-msgstr "[Whois] %1 is aangemeld sinds %2"
-
-#: IrcServerHandler#14
-msgid "[Whois] %1 is idling for %2 (%3)"
-msgstr "[Whois] %1 is %2 (%3) inactief"
-
-#: IrcServerHandler#15
-msgid "[Whois] idle message: %1"
-msgstr "[Whois] inactief-bericht: %1"
-
-#: IrcServerHandler#16
-msgid "[Whois] %1 is a user on channels: %2"
-msgstr "[Whois] %1 is een gebruiker in kanalen: %2"
-
-#: IrcServerHandler#17
-msgid "[Whois] %1 has voice on channels: %2"
-msgstr "[Whois] %1 heeft voice op kanalen: %2"
-
-#: IrcServerHandler#18
-msgid "[Whois] %1 is an operator on channels: %2"
-msgstr "[Whois] %1 is een operator op kanalen: %2"
-
-#: IrcServerHandler#19
-msgid "Channel %1 has %2 users. Topic is: %3"
-msgstr "Kanaal %1 heeft %2 gebruikers. Onderwerp is: %3"
+msgstr "Schuifbalken activeren"
 
-#: IrcServerHandler#20
-msgid "End of channel list"
-msgstr "Einde van kanaallijst"
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:211
+msgctxt "InputWidgetSettingsPage|"
+msgid "Tab Completion"
+msgstr "Tab-completion"
 
-#: IrcServerHandler#21
-msgid "Homepage for %1 is %2"
-msgstr "Homepage van %1 is %2"
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:219
+msgctxt "InputWidgetSettingsPage|"
+msgid "Completion suffix:"
+msgstr "Completion suffix:"
 
-#: IrcServerHandler#22
-msgid "Channel %1 created on %2"
-msgstr "Kanaal %1 is op %2 aangemaakt"
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:235
+msgctxt "InputWidgetSettingsPage|"
+msgid ": "
+msgstr ": "
 
-#: IrcServerHandler#23
-msgid "No topic is set for %1."
-msgstr "Geen onderwerp ingesteld voor %1."
+#: ../src/qtui/settingspages/inputwidgetsettingspage.ui:262
+msgctxt "InputWidgetSettingsPage|"
+msgid "Add space after nick when completing mid-sentence"
+msgstr "Plaats een spatie na de nick bij het vervolledigen midden in een zin"
 
-#: IrcServerHandler#24
-msgid "Topic for %1 is \"%2\""
-msgstr "Onderwerp voor %1 is \"%2\""
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24
+msgctxt "InputWidgetSettingsPage|"
+msgid "Interface"
+msgstr "Interface"
 
-#: IrcServerHandler#25
-msgid "Topic set by %1 on %2"
-msgstr "Onderwerp op %2 door %1 ingesteld"
+#: ../src/qtui/settingspages/inputwidgetsettingspage.cpp:24
+msgctxt "InputWidgetSettingsPage|"
+msgid "Input Widget"
+msgstr "Input widget"
 
-#: IrcServerHandler#26
-msgid "[Who] %1"
-msgstr "[Who] %1"
+#: ../src/qtui/ircconnectionwizard.cpp:49
+msgctxt "IrcConnectionWizard|"
+msgid "Save && Connect"
+msgstr "Opslaan && verbinden"
 
-#: IrcServerHandler#27
-msgid "Nick %1 contains illegal characters"
-msgstr "Nick %1 bevat niet-toegestane tekens"
+#: ../src/client/irclistmodel.cpp:65
+msgctxt "IrcListModel|"
+msgid "Channel"
+msgstr "Kanaal"
 
-#: IrcServerHandler#28
-msgid "Nick already in use: %1"
-msgstr "Nick is al in gebruik: %1"
+#: ../src/client/irclistmodel.cpp:66
+msgctxt "IrcListModel|"
+msgid "Users"
+msgstr "Gebruikers"
 
-#: IrcServerHandler#29
-msgid "Nick/channel is temporarily unavailable: %1"
-msgstr "Nick/kanaal is tijdelijk niet beschikbaar: %1"
+#: ../src/client/irclistmodel.cpp:67
+msgctxt "IrcListModel|"
+msgid "Topic"
+msgstr "Onderwerp"
 
-#: IrcServerHandler#30
-msgid ""
-"No free and valid nicks in nicklist found. use: /nick <othernick> to continue"
-msgstr ""
-"Geen beschikbare en toegestane nicks in de lijst gevonden. Gebruik /nick "
-"<anderenick> om door te gaan"
+#: ../src/client/networkmodel.cpp:911
+msgctxt "IrcUserItem|"
+msgid " is away"
+msgstr " is afwezig"
 
-#: IrcUserItem#1
-msgctxt "IrcUserItem#1"
+#: ../src/client/networkmodel.cpp:926
+#, qt-format
+msgctxt "IrcUserItem|"
 msgid "idling since %1"
 msgstr "niet actief sinds %1"
 
-#: IrcUserItem#2
-msgctxt "IrcUserItem#2"
+#: ../src/client/networkmodel.cpp:929
+#, qt-format
+msgctxt "IrcUserItem|"
 msgid "login time: %1"
 msgstr "logintijd: %1"
 
-#: IrcUserItem#3
-msgctxt "IrcUserItem#3"
+#: ../src/client/networkmodel.cpp:932
+#, qt-format
+msgctxt "IrcUserItem|"
 msgid "server: %1"
 msgstr "server: %1"
 
-#: ItemViewSettingsPage#1
-msgctxt "ItemViewSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
-
-#: ItemViewSettingsPage#2
-msgid "Chat & Nick Lists"
-msgstr "Chat & Nicklijsten"
-
-#: ItemViewSettingsPage#3
-msgctxt "ItemViewSettingsPage#3"
-msgid "Network"
-msgstr "Netwerk"
-
-#: ItemViewSettingsPage#4
-msgid "Inactive"
-msgstr "Niet actief"
-
-#: ItemViewSettingsPage#5
-msgid "Normal"
-msgstr "Normaal"
-
-#: ItemViewSettingsPage#6
-msgid "Unread messages"
-msgstr "Ongelezen berichten"
-
-#: ItemViewSettingsPage#7
-msgctxt "ItemViewSettingsPage#7"
-msgid "Highlight"
-msgstr "Markeer"
-
-#: ItemViewSettingsPage#8
-msgid "Other activity"
-msgstr "Andere activiteit"
-
-#: ItemViewSettingsPage#9
-msgctxt "ItemViewSettingsPage#9"
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:14
+msgctxt "ItemViewSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: ItemViewSettingsPage#10
-msgctxt "ItemViewSettingsPage#10"
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:22
+msgctxt "ItemViewSettingsPage|"
 msgid "Custom font:"
 msgstr "Eigen lettertype:"
 
-#: ItemViewSettingsPage#11
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:50
+msgctxt "ItemViewSettingsPage|"
 msgid "Show icons"
 msgstr "Toon pictogrammen"
 
-#: ItemViewSettingsPage#12
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:66
+msgctxt "ItemViewSettingsPage|"
 msgid "Chat List"
 msgstr "Chatlijst"
 
-#: ItemViewSettingsPage#13
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:72
+msgctxt "ItemViewSettingsPage|"
 msgid "Display topic in tooltip"
 msgstr "Toon onderwerp in tooltip"
 
-#: ItemViewSettingsPage#14
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:85
+msgctxt "ItemViewSettingsPage|"
 msgid "Mouse wheel changes selected chat"
 msgstr "Muiswiel verandert geselecteerde chat"
 
-#: ItemViewSettingsPage#15
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:101
+msgctxt "ItemViewSettingsPage|"
 msgid "Use Custom Colors"
-msgstr "Gebruik eigen kleuren"
+msgstr "Eigen kleuren gebruiken"
 
-#: ItemViewSettingsPage#16
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:118
+msgctxt "ItemViewSettingsPage|"
 msgid "Standard:"
 msgstr "Standaard:"
 
-#: ItemViewSettingsPage#17
-msgctxt "ItemViewSettingsPage#17"
+#: ../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
+msgctxt "ItemViewSettingsPage|"
 msgid "..."
-msgstr "..."
+msgstr "…"
 
-#: ItemViewSettingsPage#18
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:142
+msgctxt "ItemViewSettingsPage|"
 msgid "Inactive:"
 msgstr "Inactief:"
 
-#: ItemViewSettingsPage#19
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:166
+msgctxt "ItemViewSettingsPage|"
 msgid "Unread messages:"
 msgstr "Ongelezen berichten:"
 
-#: ItemViewSettingsPage#20
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:190
+msgctxt "ItemViewSettingsPage|"
 msgid "Highlight:"
 msgstr "Markeer:"
 
-#: ItemViewSettingsPage#21
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:214
+msgctxt "ItemViewSettingsPage|"
 msgid "Other activity:"
 msgstr "Andere activiteit:"
 
-#: ItemViewSettingsPage#22
-msgid "1"
-msgstr "1"
-
-#: ItemViewSettingsPage#23
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:286
+msgctxt "ItemViewSettingsPage|"
 msgid "Custom Nick List Colors"
 msgstr "Eigen kleuren voor nicklijst"
 
-#: ItemViewSettingsPage#24
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:301
+msgctxt "ItemViewSettingsPage|"
 msgid "Online:"
 msgstr "Online:"
 
-#: ItemViewSettingsPage#25
+#: ../src/qtui/settingspages/itemviewsettingspage.ui:338
+msgctxt "ItemViewSettingsPage|"
 msgid "Away:"
 msgstr "Afwezig:"
 
-#: KNotificationBackend#1
-msgctxt "KNotificationBackend#1"
-msgid "%n pending highlights"
-msgstr "%n markeringen in wachtrij"
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29
+msgctxt "ItemViewSettingsPage|"
+msgid "Interface"
+msgstr "Interface"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:29
+msgctxt "ItemViewSettingsPage|"
+msgid "Chat & Nick Lists"
+msgstr "Chat & Nicklijsten"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:34
+msgctxt "ItemViewSettingsPage|"
+msgid "Network"
+msgstr "Netwerk"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:37
+msgctxt "ItemViewSettingsPage|"
+msgid "Inactive"
+msgstr "Niet actief"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:38
+msgctxt "ItemViewSettingsPage|"
+msgid "Normal"
+msgstr "Normaal"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:39
+msgctxt "ItemViewSettingsPage|"
+msgid "Unread messages"
+msgstr "Ongelezen berichten"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:40
+msgctxt "ItemViewSettingsPage|"
+msgid "Highlight"
+msgstr "Markeer"
+
+#: ../src/qtui/settingspages/itemviewsettingspage.cpp:41
+msgctxt "ItemViewSettingsPage|"
+msgid "Other activity"
+msgstr "Andere activiteit"
+
+#: ../src/qtui/knotificationbackend.cpp:130
+#, qt-format
+msgctxt "KNotificationBackend|"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"
+msgstr[0] "%n markering in wachtrij"
+msgstr[1] "%n markeringen in wachtrij"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:80
+msgctxt "KeySequenceButton|"
+msgid "The key you just pressed is not supported by Qt."
+msgstr "De toets die u net heeft ingedrukt wordt niet door Qt ondersteund."
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:81
+msgctxt "KeySequenceButton|"
+msgid "Unsupported Key"
+msgstr "Niet-ondersteunde toets"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:176
+msgctxt "KeySequenceWidget|"
+msgid ""
+"Click on the button, then enter the shortcut like you would in the program.\n"
+"Example for Ctrl+a: hold the Ctrl key and press a."
+msgstr ""
+"Druk op de knop en vul dan de sneltoets in die u in het programma wilt "
+"gebruiken.\n"
+"Voorbeeld voor Ctrl+a: Houd de Ctrl-toets ingedrukt en druk op a."
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:274
+msgctxt "KeySequenceWidget|Meta key"
+msgid "Meta"
+msgstr "Meta"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:275
+msgctxt "KeySequenceWidget|Ctrl key"
+msgid "Ctrl"
+msgstr "Ctrl"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:276
+msgctxt "KeySequenceWidget|Alt key"
+msgid "Alt"
+msgstr "Alt"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:277
+msgctxt "KeySequenceWidget|Shift key"
+msgid "Shift"
+msgstr "Shift"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:281
+msgctxt ""
+"KeySequenceWidget|What the user inputs now will be taken as the new shortcut"
+msgid "Input"
+msgstr "Invoer"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:288
+msgctxt "KeySequenceWidget|No shortcut defined"
+msgid "None"
+msgstr "Geen"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:383
+#: ../src/qtui/settingspages/keysequencewidget.cpp:389
+msgctxt "KeySequenceWidget|"
+msgid "Shortcut Conflict"
+msgstr "Sneltoetsconflict"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:384
+#, qt-format
+msgctxt "KeySequenceWidget|"
+msgid ""
+"The \"%1\" shortcut is already in use, and cannot be configured.\n"
+"Please choose another one."
+msgstr ""
+"De \"%1\" sneltoets is al in gebruik en kan niet geconfigureerd worden.\n"
+"Kies een andere sneltoets."
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:390
+#, qt-format
+msgctxt "KeySequenceWidget|"
+msgid ""
+"The \"%1\" shortcut is ambiguous with the shortcut for the following action:"
+msgstr ""
+"De \"%1\" sneltoets heeft een conflict met de sneltoets voor de volgende "
+"actie:"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:392
+msgctxt "KeySequenceWidget|"
+msgid "Do you want to reassign this shortcut to the selected action?"
+msgstr "Wilt u deze sneltoets toewijzen aan de geselecteerde actie?"
+
+#: ../src/qtui/settingspages/keysequencewidget.cpp:395
+msgctxt "KeySequenceWidget|"
+msgid "Reassign"
+msgstr "Opnieuw toewijzen"
+
+#: ../src/qtui/mainwin.cpp:332
+msgctxt "MainWin|"
+msgid "General"
+msgstr "Algemeen"
 
-#: MainWin#1
+#: ../src/qtui/mainwin.cpp:334
+msgctxt "MainWin|"
 msgid "&Connect to Core..."
-msgstr "Verbindt met &core..."
+msgstr "Met &core verbinden…"
 
-#: MainWin#2
+#: ../src/qtui/mainwin.cpp:336
+msgctxt "MainWin|"
 msgid "&Disconnect from Core"
-msgstr "&Verbreek verbinding met core"
+msgstr "Verbinding met core &verbreken"
 
-#: MainWin#3
+#: ../src/qtui/mainwin.cpp:338
+msgctxt "MainWin|"
 msgid "Core &Info..."
-msgstr "Core &informatie"
+msgstr "&Informatie over core…"
 
-#: MainWin#4
+#: ../src/qtui/mainwin.cpp:340
+msgctxt "MainWin|"
 msgid "Configure &Networks..."
-msgstr "&Netwerken configureren..."
+msgstr "&Netwerken configureren…"
 
-#: MainWin#5
+#: ../src/qtui/mainwin.cpp:343
+msgctxt "MainWin|"
 msgid "&Quit"
 msgstr "&Afsluiten"
 
-#: MainWin#6
-msgid "Ctrl+Q"
-msgstr "Ctrl+Q"
-
-#: MainWin#7
+#: ../src/qtui/mainwin.cpp:347
+msgctxt "MainWin|"
 msgid "&Configure Chat Lists..."
-msgstr "&Configureer chatlijsten..."
+msgstr "Chatlijsten configureren…"
 
-#: MainWin#8
+#: ../src/qtui/mainwin.cpp:350
+msgctxt "MainWin|"
 msgid "&Lock Layout"
-msgstr "Zet &lay-out vast"
+msgstr "Inde&ling vastzetten"
 
-#: MainWin#9
+#: ../src/qtui/mainwin.cpp:354
+msgctxt "MainWin|"
 msgid "Show &Search Bar"
-msgstr "Toon &zoekbalk"
+msgstr "&Zoekbalk weergeven"
 
-#: MainWin#10
+#: ../src/qtui/mainwin.cpp:356
+msgctxt "MainWin|"
 msgid "Show Away Log"
-msgstr "Toon afwezigheidslog"
+msgstr "Afwezigheidslog weergeven"
 
-#: MainWin#11
+#: ../src/qtui/mainwin.cpp:358
+msgctxt "MainWin|"
 msgid "Show &Menubar"
-msgstr "Toon &menubalk"
-
-#: MainWin#12
-msgid "Ctrl+M"
-msgstr "Ctrl+M"
+msgstr "&Menubalk weergeven"
 
-#: MainWin#13
+#: ../src/qtui/mainwin.cpp:361
+msgctxt "MainWin|"
 msgid "Show Status &Bar"
-msgstr "Toon status&balk"
+msgstr "Status&balk weergeven"
 
-#: MainWin#14
-msgid "&Configure Quassel..."
-msgstr "&Configureer Quassel..."
+#: ../src/qtui/mainwin.cpp:367
+msgctxt "MainWin|"
+msgid "&Full Screen Mode"
+msgstr "&Schermvullend"
+
+#: ../src/qtui/mainwin.cpp:374
+msgctxt "MainWin|"
+msgid "Configure &Shortcuts..."
+msgstr "&Sneltoetsen instellen…"
 
-#: MainWin#15
-msgid "F7"
-msgstr "F7"
+#: ../src/qtui/mainwin.cpp:380 ../src/qtui/mainwin.cpp:384
+msgctxt "MainWin|"
+msgid "&Configure Quassel..."
+msgstr "Quassel configureren…"
 
-#: MainWin#16
+#: ../src/qtui/mainwin.cpp:390
+msgctxt "MainWin|"
 msgid "&About Quassel"
 msgstr "&Over Quassel"
 
-#: MainWin#17
+#: ../src/qtui/mainwin.cpp:395
+msgctxt "MainWin|"
 msgid "About &Qt"
 msgstr "Over &Qt"
 
-#: MainWin#18
+#: ../src/qtui/mainwin.cpp:399
+msgctxt "MainWin|"
 msgid "Debug &NetworkModel"
 msgstr "Debug &NetworkModel"
 
-#: MainWin#19
+#: ../src/qtui/mainwin.cpp:401
+msgctxt "MainWin|"
 msgid "Debug &BufferViewOverlay"
 msgstr "Debug &BufferViewOverlay"
 
-#: MainWin#20
+#: ../src/qtui/mainwin.cpp:403
+msgctxt "MainWin|"
 msgid "Debug &MessageModel"
 msgstr "Debug &MessageModel"
 
-#: MainWin#21
+#: ../src/qtui/mainwin.cpp:405
+msgctxt "MainWin|"
 msgid "Debug &HotList"
 msgstr "Debug &HotList"
 
-#: MainWin#22
+#: ../src/qtui/mainwin.cpp:407
+msgctxt "MainWin|"
 msgid "Debug &Log"
 msgstr "Debug &log"
 
-#: MainWin#23
+#: ../src/qtui/mainwin.cpp:409
+msgctxt "MainWin|"
 msgid "Reload Stylesheet"
-msgstr "Herlaadt stijlsheet"
+msgstr "Stijlblad herladen"
 
-# Niet heel exact, maar dit is wat jump to hot chat betekent:
-#
-# you switch to the channel with the oldest unread message
-#: MainWin#24
+#: ../src/qtui/mainwin.cpp:412
+msgctxt "MainWin|"
+msgid "Hide Current Buffer"
+msgstr "Huidige buffer verbergen"
+
+#: ../src/qtui/mainwin.cpp:416
+msgctxt "MainWin|"
+msgid "Navigation"
+msgstr "Navigatie"
+
+#: ../src/qtui/mainwin.cpp:418
+msgctxt "MainWin|"
 msgid "Jump to hot chat"
 msgstr "Open het kanaal met oudste ongelezen bericht"
 
-#: MainWin#25
+#: ../src/qtui/mainwin.cpp:430
+msgctxt "MainWin|"
+msgid "Set Quick Access #0"
+msgstr "Stel snel-wisselen #0 in"
+
+#: ../src/qtui/mainwin.cpp:432
+msgctxt "MainWin|"
+msgid "Set Quick Access #1"
+msgstr "Stel snel-wisselen #1 in"
+
+#: ../src/qtui/mainwin.cpp:434
+msgctxt "MainWin|"
+msgid "Set Quick Access #2"
+msgstr "Stel snel-wisselen #2 in"
+
+#: ../src/qtui/mainwin.cpp:436
+msgctxt "MainWin|"
+msgid "Set Quick Access #3"
+msgstr "Stel snel-wisselen #3 in"
+
+#: ../src/qtui/mainwin.cpp:438
+msgctxt "MainWin|"
+msgid "Set Quick Access #4"
+msgstr "Stel snel-wisselen #4 in"
+
+#: ../src/qtui/mainwin.cpp:440
+msgctxt "MainWin|"
+msgid "Set Quick Access #5"
+msgstr "Stel snel-wisselen #5 in"
+
+#: ../src/qtui/mainwin.cpp:442
+msgctxt "MainWin|"
+msgid "Set Quick Access #6"
+msgstr "Stel snel-wisselen #6 in"
+
+#: ../src/qtui/mainwin.cpp:444
+msgctxt "MainWin|"
+msgid "Set Quick Access #7"
+msgstr "Stel snel-wisselen #7 in"
+
+#: ../src/qtui/mainwin.cpp:446
+msgctxt "MainWin|"
+msgid "Set Quick Access #8"
+msgstr "Stel snel-wisselen #8 in"
+
+#: ../src/qtui/mainwin.cpp:448
+msgctxt "MainWin|"
+msgid "Set Quick Access #9"
+msgstr "Stel snel-wisselen #9 in"
+
+#: ../src/qtui/mainwin.cpp:451
+msgctxt "MainWin|"
+msgid "Quick Access #0"
+msgstr "Snel-wisselen #0"
+
+#: ../src/qtui/mainwin.cpp:453
+msgctxt "MainWin|"
+msgid "Quick Access #1"
+msgstr "Snel-wisselen #1"
+
+#: ../src/qtui/mainwin.cpp:455
+msgctxt "MainWin|"
+msgid "Quick Access #2"
+msgstr "Snel-wisselen #2"
+
+#: ../src/qtui/mainwin.cpp:457
+msgctxt "MainWin|"
+msgid "Quick Access #3"
+msgstr "Snel-wisselen #3"
+
+#: ../src/qtui/mainwin.cpp:459
+msgctxt "MainWin|"
+msgid "Quick Access #4"
+msgstr "Snel-wisselen #4"
+
+#: ../src/qtui/mainwin.cpp:461
+msgctxt "MainWin|"
+msgid "Quick Access #5"
+msgstr "Snel-wisselen #5"
+
+#: ../src/qtui/mainwin.cpp:463
+msgctxt "MainWin|"
+msgid "Quick Access #6"
+msgstr "Snel-wisselen #6"
+
+#: ../src/qtui/mainwin.cpp:465
+msgctxt "MainWin|"
+msgid "Quick Access #7"
+msgstr "Snel-wisselen #7"
+
+#: ../src/qtui/mainwin.cpp:467
+msgctxt "MainWin|"
+msgid "Quick Access #8"
+msgstr "Snel-wisselen #8"
+
+#: ../src/qtui/mainwin.cpp:469
+msgctxt "MainWin|"
+msgid "Quick Access #9"
+msgstr "Snel-wisselen #9"
+
+#: ../src/qtui/mainwin.cpp:473
+msgctxt "MainWin|"
+msgid "Activate Next Chat List"
+msgstr "Activeer volgende chatlijst"
+
+#: ../src/qtui/mainwin.cpp:475
+msgctxt "MainWin|"
+msgid "Activate Previous Chat List"
+msgstr "Activeer vorige chatlijst"
+
+#: ../src/qtui/mainwin.cpp:477
+msgctxt "MainWin|"
+msgid "Go to Next Chat"
+msgstr "Ga naar de volgende chatlijst"
+
+#: ../src/qtui/mainwin.cpp:479
+msgctxt "MainWin|"
+msgid "Go to Previous Chat"
+msgstr "Ga naar de vorige chatlijst"
+
+#: ../src/qtui/mainwin.cpp:488
+msgctxt "MainWin|"
 msgid "&File"
 msgstr "&Bestand"
 
-#: MainWin#26
+#: ../src/qtui/mainwin.cpp:501
+msgctxt "MainWin|"
 msgid "&Networks"
 msgstr "&Netwerken"
 
-#: MainWin#27
+#: ../src/qtui/mainwin.cpp:507
+msgctxt "MainWin|"
 msgid "&View"
-msgstr "&Toon"
+msgstr "&Weergave"
 
-#: MainWin#28
+#: ../src/qtui/mainwin.cpp:508
+msgctxt "MainWin|"
 msgid "&Chat Lists"
 msgstr "&Chatlijsten"
 
-#: MainWin#29
+#: ../src/qtui/mainwin.cpp:510
+msgctxt "MainWin|"
 msgid "&Toolbars"
 msgstr "&Werkbalken"
 
-#: MainWin#30
+#: ../src/qtui/mainwin.cpp:524
+msgctxt "MainWin|"
 msgid "&Settings"
 msgstr "&Instellingen"
 
-#: MainWin#31
+#: ../src/qtui/mainwin.cpp:533
+msgctxt "MainWin|"
 msgid "&Help"
 msgstr "&Hulp"
 
-#: MainWin#32
+#: ../src/qtui/mainwin.cpp:541
+msgctxt "MainWin|"
 msgid "Debug"
 msgstr "Debug"
 
-#: MainWin#33
+#: ../src/qtui/mainwin.cpp:817
+msgctxt "MainWin|"
 msgid "Nicks"
 msgstr "Nicks"
 
-#: MainWin#34
+#: ../src/qtui/mainwin.cpp:826
+msgctxt "MainWin|"
 msgid "Show Nick List"
-msgstr "Toon nicklijst"
+msgstr "Nicklijst weergeven"
 
-#: MainWin#35
-msgctxt "MainWin#35"
+#: ../src/qtui/mainwin.cpp:839
+msgctxt "MainWin|"
 msgid "Chat Monitor"
 msgstr "Chatmonitor"
 
-#: MainWin#36
+#: ../src/qtui/mainwin.cpp:851
+msgctxt "MainWin|"
 msgid "Show Chat Monitor"
-msgstr "Toon chatmonitor"
+msgstr "Chatmonitor weergeven"
 
-#: MainWin#37
+#: ../src/qtui/mainwin.cpp:857
+msgctxt "MainWin|"
 msgid "Inputline"
 msgstr "Invoerregel"
 
-#: MainWin#38
+#: ../src/qtui/mainwin.cpp:866
+msgctxt "MainWin|"
 msgid "Show Input Line"
-msgstr "Toon invoerregel"
+msgstr "Invoerregel weergeven"
 
-#: MainWin#39
-msgctxt "MainWin#39"
+#: ../src/qtui/mainwin.cpp:881
+msgctxt "MainWin|"
 msgid "Topic"
 msgstr "Onderwerp"
 
-#: MainWin#40
+#: ../src/qtui/mainwin.cpp:893
+msgctxt "MainWin|"
 msgid "Show Topic Line"
-msgstr "Toon onderwerpregel"
+msgstr "Onderwerpregel weergeven"
 
-#: MainWin#41
+#: ../src/qtui/mainwin.cpp:987
+msgctxt "MainWin|"
 msgid "Main Toolbar"
 msgstr "Hoofdwerkbalk"
 
-#: MainWin#42
+#: ../src/qtui/mainwin.cpp:1030
+msgctxt "MainWin|"
 msgid "Connected to core."
 msgstr "Met core verbonden."
 
-#: MainWin#43
+#: ../src/qtui/mainwin.cpp:1129
+msgctxt "MainWin|"
 msgid "Not connected to core."
 msgstr "Niet met core verbonden."
 
-#: MainWin#44
+#: ../src/qtui/mainwin.cpp:1147 ../src/qtui/mainwin.cpp:1157
+msgctxt "MainWin|"
 msgid "Unencrypted Connection"
 msgstr "Onversleutelde verbinding"
 
-#: MainWin#45
+#: ../src/qtui/mainwin.cpp:1147
+msgctxt "MainWin|"
 msgid "<b>Your client does not support SSL encryption</b>"
 msgstr "<b>U client ondersteunt geen SSL-versleuteling</b>"
 
-#: MainWin#46
+#: ../src/qtui/mainwin.cpp:1149 ../src/qtui/mainwin.cpp:1159
+msgctxt "MainWin|"
 msgid ""
 "Sensitive data, like passwords, will be transmitted unencrypted to your "
 "Quassel core."
@@ -3407,15 +4508,19 @@ msgstr ""
 "Gevoelige gegevens, zoals wachtwoorden, zullen onversleuteld naar uw Quassel-"
 "core verzonden worden."
 
-#: MainWin#47
+#: ../src/qtui/mainwin.cpp:1157
+msgctxt "MainWin|"
 msgid "<b>Your core does not support SSL encryption</b>"
-msgstr "<b>U core ondersteunt geen SSL-versleuteling</b>"
+msgstr "<b>Uw core ondersteunt geen SSL-versleuteling</b>"
 
-#: MainWin#48
+#: ../src/qtui/mainwin.cpp:1175 ../src/qtui/mainwin.cpp:1196
+msgctxt "MainWin|"
 msgid "Untrusted Security Certificate"
 msgstr "Onbetrouwbaar beveiligingscertificaat"
 
-#: MainWin#49
+#: ../src/qtui/mainwin.cpp:1176
+#, qt-format
+msgctxt "MainWin|"
 msgid ""
 "<b>The SSL certificate provided by the core at %1 is untrusted for the "
 "following reasons:</b>"
@@ -3423,144 +4528,176 @@ msgstr ""
 "<b>Het door de core op %1 opgegeven beveiligingscertificaat is om de "
 "volgende redenen onbetrouwbaar:</b>"
 
-#: MainWin#50
-msgctxt "MainWin#50"
+#: ../src/qtui/mainwin.cpp:1179
+msgctxt "MainWin|"
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: MainWin#51
+#: ../src/qtui/mainwin.cpp:1180
+msgctxt "MainWin|"
 msgid "Show Certificate"
-msgstr "Toon certificaat"
+msgstr "Certificaat weergeven"
 
-#: MainWin#52
+#: ../src/qtui/mainwin.cpp:1197
+msgctxt "MainWin|"
 msgid ""
 "Would you like to accept this certificate forever without being prompted?"
 msgstr ""
-"Wilt u dit certificaat permanent accepteren zonder hierom gevraagd te worden?"
+"Wilt u dit certificaat permanent accepteren, zonder hierom gevraagd te "
+"worden?"
 
-#: MainWin#53
+#: ../src/qtui/mainwin.cpp:1199
+msgctxt "MainWin|"
 msgid "Current Session Only"
 msgstr "Alleen deze sessie"
 
-#: MainWin#54
+#: ../src/qtui/mainwin.cpp:1200
+msgctxt "MainWin|"
 msgid "Forever"
 msgstr "Permanent"
 
-#: MainWin#55
+#: ../src/qtui/mainwin.cpp:1211
+msgctxt "MainWin|"
 msgid "Core Connection Error"
 msgstr "Core-verbinding fout"
 
-#: MessageModel#1
+#: ../src/client/messagemodel.cpp:404
+#, qt-format
+msgctxt "MessageModel|"
 msgid "Requesting %1 messages from backlog for buffer %2:%3"
 msgstr "%1 berichten van de backlog aanvragen voor buffer %2:%3"
 
-#: MsgProcessorStatusWidget#1
-msgctxt "MsgProcessorStatusWidget#1"
+#: ../src/qtui/ui/msgprocessorstatuswidget.ui:19
+msgctxt "MsgProcessorStatusWidget|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: MsgProcessorStatusWidget#2
+#: ../src/qtui/ui/msgprocessorstatuswidget.ui:34
+msgctxt "MsgProcessorStatusWidget|"
 msgid "Receiving Backlog"
 msgstr "Backlog ontvangen"
 
-#: MultiLineEdit#1
-msgid "Do you really want to paste %n lines?"
-msgstr "Wilt u echt %n regels plakken?"
+#: ../src/uisupport/multilineedit.cpp:718
+#, 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] "Wilt u echt %n regel plakken?"
+msgstr[1] "Wilt u echt %n regels plakken?"
 
-#: MultiLineEdit#2
+#: ../src/uisupport/multilineedit.cpp:727
+msgctxt "MultiLineEdit|"
 msgid "Paste Protection"
 msgstr "Plak-bescherming"
 
-#: NetworkAddDlg#1
-msgctxt "NetworkAddDlg#1"
+#: ../src/qtui/settingspages/networkadddlg.ui:14
+msgctxt "NetworkAddDlg|"
 msgid "Add Network"
 msgstr "Netwerk toevoegen"
 
-#: NetworkAddDlg#2
+#: ../src/qtui/settingspages/networkadddlg.ui:22
+msgctxt "NetworkAddDlg|"
 msgid "Use preset:"
 msgstr "Gebruik voorinstellingen:"
 
-#: NetworkAddDlg#3
+#: ../src/qtui/settingspages/networkadddlg.ui:57
+msgctxt "NetworkAddDlg|"
 msgid "Manually specify network settings"
 msgstr "Handmatig netwerkinstellingen opgeven"
 
-#: NetworkAddDlg#4
+#: ../src/qtui/settingspages/networkadddlg.ui:67
+msgctxt "NetworkAddDlg|"
 msgid "Manual Settings"
 msgstr "Handmatige instellingen"
 
-#: NetworkAddDlg#5
-msgctxt "NetworkAddDlg#5"
+#: ../src/qtui/settingspages/networkadddlg.ui:75
+msgctxt "NetworkAddDlg|"
 msgid "Network name:"
 msgstr "Netwerknaam:"
 
-#: NetworkAddDlg#6
-msgctxt "NetworkAddDlg#6"
+#: ../src/qtui/settingspages/networkadddlg.ui:85
+msgctxt "NetworkAddDlg|"
 msgid "Server address:"
 msgstr "Serveradres:"
 
-#: NetworkAddDlg#7
-msgctxt "NetworkAddDlg#7"
+#: ../src/qtui/settingspages/networkadddlg.ui:95
+msgctxt "NetworkAddDlg|"
 msgid "Port:"
 msgstr "Poort:"
 
-#: NetworkAddDlg#8
+#: ../src/qtui/settingspages/networkadddlg.ui:115
+msgctxt "NetworkAddDlg|"
 msgid "Server password:"
 msgstr "Serverwachtwoord:"
 
-#: NetworkAddDlg#9
+#: ../src/qtui/settingspages/networkadddlg.ui:131
+msgctxt "NetworkAddDlg|"
 msgid "Use secure connection"
-msgstr "Gebruik beveiligde verbinding"
+msgstr "Beveiligde verbinding gebruiken"
 
-#: NetworkEditDlg#1
-msgctxt "NetworkEditDlg#1"
+#: ../src/qtui/settingspages/networkeditdlg.ui:13
+msgctxt "NetworkEditDlg|"
 msgid "Dialog"
-msgstr "Dialoog"
+msgstr "Dialoogvenster"
 
-#: NetworkEditDlg#2
+#: ../src/qtui/settingspages/networkeditdlg.ui:21
+msgctxt "NetworkEditDlg|"
 msgid "Please enter a network name:"
 msgstr "Vul een netwerknaam in:"
 
-#: NetworkEditDlg#3
-msgctxt "NetworkEditDlg#3"
+#: ../src/qtui/settingspages/networkssettingspage.cpp:792
+msgctxt "NetworkEditDlg|"
 msgid "Add Network"
 msgstr "Netwerk toevoegen"
 
-#: NetworkItem#1
+#: ../src/client/networkmodel.cpp:213
+#, qt-format
+msgctxt "NetworkItem|"
 msgid "Server: %1"
 msgstr "Server: %1"
 
-#: NetworkItem#2
-msgctxt "NetworkItem#2"
+#: ../src/client/networkmodel.cpp:214
+#, qt-format
+msgctxt "NetworkItem|"
 msgid "Users: %1"
 msgstr "Gebruikers: %1"
 
-#: NetworkItem#3
-msgctxt "NetworkItem#3"
+#: ../src/client/networkmodel.cpp:217
+#, qt-format
+msgctxt "NetworkItem|"
 msgid "Lag: %1 msecs"
 msgstr "Vertraging: %1 msec"
 
-#: NetworkModel#1
+#: ../src/client/networkmodel.cpp:960
+msgctxt "NetworkModel|"
 msgid "Chat"
 msgstr "Chat"
 
-#: NetworkModel#2
-msgctxt "NetworkModel#2"
+#: ../src/client/networkmodel.cpp:960
+msgctxt "NetworkModel|"
 msgid "Topic"
 msgstr "Onderwerp"
 
-#: NetworkModel#3
+#: ../src/client/networkmodel.cpp:960
+msgctxt "NetworkModel|"
 msgid "Nick Count"
 msgstr "Aantal nicks"
 
-#: NetworkModelController#1
+#: ../src/uisupport/networkmodelcontroller.cpp:177
+msgctxt "NetworkModelController|"
 msgid "Do you want to delete the following buffer(s) permanently?"
-msgstr "Wilt u de volgende buffer(s) permanent verwijderen?"
+msgid_plural "Do you want to delete the following buffer(s) permanently?"
+msgstr[0] "Wilt u de volgende buffer definitief verwijderen?"
+msgstr[1] "Wilt u de volgende buffers definitief verwijderen?"
 
-#: NetworkModelController#2
+#: ../src/uisupport/networkmodelcontroller.cpp:190
+#, qt-format
+msgctxt "NetworkModelController|"
 msgid "...and <b>%1</b> more<br><br>"
 msgstr "...en <b>%1</b> meer<br><br>"
 
-#: NetworkModelController#3
+#: ../src/uisupport/networkmodelcontroller.cpp:191
+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."
@@ -3569,157 +4706,129 @@ msgstr ""
 "gegevens, van de core-database verwijderen en kan niet ongedaan gemaakt "
 "worden."
 
-#: NetworkModelController#4
+#: ../src/uisupport/networkmodelcontroller.cpp:193
+msgctxt "NetworkModelController|"
 msgid ""
 "<br>Active channel buffers cannot be deleted, please part the channel first."
 msgstr ""
 "<br>Actieve kanaalbuffers kunnen niet verwijderd worden, verlaat eerst het "
 "kanaal."
 
-#: NetworkModelController#5
+#: ../src/uisupport/networkmodelcontroller.cpp:195
+msgctxt "NetworkModelController|"
 msgid "Remove buffers permanently?"
 msgstr "Buffers permanent verwijderen?"
 
-#: NetworkModelController::JoinDlg#1
+#: ../src/uisupport/networkmodelcontroller.cpp:530
+msgctxt "NetworkModelController::JoinDlg|"
 msgid "Join Channel"
 msgstr "Kanaal binnengaan"
 
-#: NetworkModelController::JoinDlg#2
-msgctxt "NetworkModelController::JoinDlg#2"
+#: ../src/uisupport/networkmodelcontroller.cpp:533
+msgctxt "NetworkModelController::JoinDlg|"
 msgid "Network:"
 msgstr "Netwerk:"
 
-#: NetworkModelController::JoinDlg#3
+#: ../src/uisupport/networkmodelcontroller.cpp:535
+msgctxt "NetworkModelController::JoinDlg|"
 msgid "Channel:"
 msgstr "Kanaal:"
 
-#: NetworkModelController::JoinDlg#4
-msgctxt "NetworkModelController::JoinDlg#4"
+#: ../src/uisupport/networkmodelcontroller.cpp:537
+msgctxt "NetworkModelController::JoinDlg|"
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: NetworkPage#1
+#: ../src/qtui/ircconnectionwizard.cpp:158
+msgctxt "NetworkPage|"
 msgid "Setup Network Connection"
 msgstr "Netwerkverbinding opzetten"
 
-#: NetworksSettingsPage#1
-msgctxt "NetworksSettingsPage#1"
-msgid "IRC"
-msgstr "IRC"
-
-#: NetworksSettingsPage#2
-msgid "Networks"
-msgstr "Netwerken"
-
-#: NetworksSettingsPage#3
-msgctxt "NetworksSettingsPage#3"
-msgid ""
-"<b>The following problems need to be corrected before your changes can be "
-"applied:</b><ul>"
-msgstr ""
-"<b>De volgende problemen moeten opgelost worden voordat uw wijzigingen "
-"toegepast kunnen worden:</b><ul>"
-
-#: NetworksSettingsPage#4
-msgid "<li>All networks need at least one server defined</li>"
-msgstr ""
-"<li>Voor alle netwerken moet minstens een server opgegeven worden</li>"
-
-#: NetworksSettingsPage#5
-msgctxt "NetworksSettingsPage#5"
-msgid "</ul>"
-msgstr "</ul>"
-
-#: NetworksSettingsPage#6
-msgid "Invalid Network Settings"
-msgstr "Ongeldige netwerkinstellingen"
-
-#: NetworksSettingsPage#7
-msgid "Delete Network?"
-msgstr "Netwerk verwijderen?"
-
-#: NetworksSettingsPage#8
-msgid ""
-"Do you really want to delete the network \"%1\" and all related settings, "
-"including the backlog?"
-msgstr ""
-"Wilt u echt netwerk \"%1\" en alle bijbehorende gegevens, waaronder het "
-"backlog, verwijderen?"
-
-#: NetworksSettingsPage#9
-msgctxt "NetworksSettingsPage#9"
+#: ../src/qtui/settingspages/networkssettingspage.ui:14
+msgctxt "NetworksSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: NetworksSettingsPage#10
-msgctxt "NetworksSettingsPage#10"
+#: ../src/qtui/settingspages/networkssettingspage.ui:48
+msgctxt "NetworksSettingsPage|"
 msgid "Re&name..."
-msgstr "Her&noemen..."
+msgstr "Her&noemen…"
 
-#: NetworksSettingsPage#11
-msgctxt "NetworksSettingsPage#11"
+#: ../src/qtui/settingspages/networkssettingspage.ui:65
+#: ../src/qtui/settingspages/networkssettingspage.ui:235
+msgctxt "NetworksSettingsPage|"
 msgid "&Add..."
-msgstr "&Toevoegen"
+msgstr "&Toevoegen..."
 
-#: NetworksSettingsPage#12
-msgctxt "NetworksSettingsPage#12"
+#: ../src/qtui/settingspages/networkssettingspage.ui:88
+#: ../src/qtui/settingspages/networkssettingspage.ui:252
+msgctxt "NetworksSettingsPage|"
 msgid "De&lete"
-msgstr "&Verwijder"
+msgstr "&Verwijderen"
 
-#: NetworksSettingsPage#13
+#: ../src/qtui/settingspages/networkssettingspage.ui:124
+msgctxt "NetworksSettingsPage|"
 msgid "Network Details"
 msgstr "Netwerkdetails"
 
-#: NetworksSettingsPage#14
+#: ../src/qtui/settingspages/networkssettingspage.ui:132
+msgctxt "NetworksSettingsPage|"
 msgid "Identity:"
 msgstr "Identiteit:"
 
-#: NetworksSettingsPage#15
-msgctxt "NetworksSettingsPage#15"
+#: ../src/qtui/settingspages/networkssettingspage.ui:149
+#: ../src/qtui/settingspages/networkssettingspage.ui:281
+#: ../src/qtui/settingspages/networkssettingspage.ui:295
+msgctxt "NetworksSettingsPage|"
 msgid "..."
-msgstr "..."
+msgstr "…"
 
-#: NetworksSettingsPage#16
-msgctxt "NetworksSettingsPage#16"
+#: ../src/qtui/settingspages/networkssettingspage.ui:190
+msgctxt "NetworksSettingsPage|"
 msgid "Servers"
 msgstr "Servers"
 
-#: NetworksSettingsPage#17
+#: ../src/qtui/settingspages/networkssettingspage.ui:193
+msgctxt "NetworksSettingsPage|"
 msgid "Manage servers for this network"
 msgstr "Servers voor dit netwerk beheren"
 
-#: NetworksSettingsPage#18
-msgctxt "NetworksSettingsPage#18"
+#: ../src/qtui/settingspages/networkssettingspage.ui:217
+msgctxt "NetworksSettingsPage|"
 msgid "&Edit..."
-msgstr "Be&werken"
+msgstr "Be&werken…"
 
-#: NetworksSettingsPage#19
-msgctxt "NetworksSettingsPage#19"
+#: ../src/qtui/settingspages/networkssettingspage.ui:278
+msgctxt "NetworksSettingsPage|"
 msgid "Move upwards in list"
 msgstr "In de lijst omhoog verplaatsen"
 
-#: NetworksSettingsPage#20
-msgctxt "NetworksSettingsPage#20"
+#: ../src/qtui/settingspages/networkssettingspage.ui:292
+msgctxt "NetworksSettingsPage|"
 msgid "Move downwards in list"
 msgstr "In de lijst omlaag verplaatsen"
 
-#: NetworksSettingsPage#21
+#: ../src/qtui/settingspages/networkssettingspage.ui:337
+msgctxt "NetworksSettingsPage|"
 msgid "Commands"
 msgstr "Commando's"
 
-#: NetworksSettingsPage#22
+#: ../src/qtui/settingspages/networkssettingspage.ui:340
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure automatic identification or misc. commands to be executed after "
 "connecting to a server"
 msgstr ""
-"Configureer automatische identificatie of andere commando's om uit te voeren "
-"nadat u met een server verbonden bent"
+"Configureer automatische identificatie of andere commando's om uit te "
+"voeren, nadat u met een server verbonden bent"
 
-#: NetworksSettingsPage#23
+#: ../src/qtui/settingspages/networkssettingspage.ui:346
+msgctxt "NetworksSettingsPage|"
 msgid "Commands to execute on connect:"
 msgstr "Bij het verbinden uit te voeren commando's:"
 
-#: NetworksSettingsPage#24
+#: ../src/qtui/settingspages/networkssettingspage.ui:362
+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 "
@@ -3730,102 +4839,125 @@ msgstr ""
 "Let op dat Quassel-IRC automatisch opnieuw met kanalen verbindt, zodat /join "
 "hier zelden nodig zal zijn!"
 
-#: NetworksSettingsPage#25
-msgctxt "NetworksSettingsPage#25"
+#: ../src/qtui/settingspages/networkssettingspage.ui:374
+msgctxt "NetworksSettingsPage|"
 msgid "Connection"
 msgstr "Verbinding"
 
-#: NetworksSettingsPage#26
+#: ../src/qtui/settingspages/networkssettingspage.ui:383
+msgctxt "NetworksSettingsPage|"
 msgid "Automatically reconnect to the IRC network after connection failures"
 msgstr ""
 "Automatisch opnieuw met het IRC-netwerk verbinden als de verbinding wegvalt"
 
-#: NetworksSettingsPage#27
+#: ../src/qtui/settingspages/networkssettingspage.ui:386
+msgctxt "NetworksSettingsPage|"
 msgid "Automatic Reconnect"
 msgstr "Automatisch opnieuw verbinden"
 
-#: NetworksSettingsPage#28
+#: ../src/qtui/settingspages/networkssettingspage.ui:397
+msgctxt "NetworksSettingsPage|"
 msgid "Wait"
 msgstr "Wacht"
 
-#: NetworksSettingsPage#29
+#: ../src/qtui/settingspages/networkssettingspage.ui:404
+msgctxt "NetworksSettingsPage|"
 msgid " s"
 msgstr " s"
 
-#: NetworksSettingsPage#30
+#: ../src/qtui/settingspages/networkssettingspage.ui:420
+msgctxt "NetworksSettingsPage|"
 msgid "between retries"
 msgstr "tussen pogingen"
 
-#: NetworksSettingsPage#31
+#: ../src/qtui/settingspages/networkssettingspage.ui:444
+msgctxt "NetworksSettingsPage|"
 msgid "Number of retries:"
 msgstr "Aantal pogingen:"
 
-#: NetworksSettingsPage#32
-msgctxt "NetworksSettingsPage#32"
+#: ../src/qtui/settingspages/networkssettingspage.ui:464
+msgctxt "NetworksSettingsPage|"
 msgid "Unlimited"
-msgstr "Ongelimiteerd"
+msgstr "Onbeperkt"
 
-#: NetworksSettingsPage#33
+#: ../src/qtui/settingspages/networkssettingspage.ui:489
+msgctxt "NetworksSettingsPage|"
 msgid "Rejoin all channels after reconnect"
 msgstr "Ga alle kanalen weer binnen na opnieuw verbinden"
 
-#: NetworksSettingsPage#34
+#: ../src/qtui/settingspages/networkssettingspage.ui:516
+#: ../src/qtui/settingspages/networkssettingspage.ui:525
+msgctxt "NetworksSettingsPage|"
 msgid "Auto Identify"
 msgstr "Auto-identificatie"
 
-#: NetworksSettingsPage#35
+#: ../src/qtui/settingspages/networkssettingspage.ui:540
+msgctxt "NetworksSettingsPage|"
 msgid "NickServ"
 msgstr "NickServ"
 
-#: NetworksSettingsPage#36
+#: ../src/qtui/settingspages/networkssettingspage.ui:557
+msgctxt "NetworksSettingsPage|"
 msgid "Service:"
 msgstr "Service:"
 
-#: NetworksSettingsPage#37
-msgctxt "NetworksSettingsPage#37"
+#: ../src/qtui/settingspages/networkssettingspage.ui:567
+#: ../src/qtui/settingspages/networkssettingspage.ui:615
+msgctxt "NetworksSettingsPage|"
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: NetworksSettingsPage#38
+#: ../src/qtui/settingspages/networkssettingspage.ui:580
+msgctxt "NetworksSettingsPage|"
 msgid "Use SASL Authentication"
 msgstr "Gebruik SASL-authenticatie"
 
-#: NetworksSettingsPage#39
+#: ../src/qtui/settingspages/networkssettingspage.ui:625
+msgctxt "NetworksSettingsPage|"
 msgid "Account:"
 msgstr "Account:"
 
-#: NetworksSettingsPage#40
+#: ../src/qtui/settingspages/networkssettingspage.ui:649
+msgctxt "NetworksSettingsPage|"
 msgid "Encodings"
-msgstr "Encodering"
+msgstr "Codering"
 
-#: NetworksSettingsPage#41
+#: ../src/qtui/settingspages/networkssettingspage.ui:652
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Configure advanced settings such as message encodings and automatic reconnect"
 msgstr ""
-"Configureer geavanceerde opties zoals bericht-encodering en automatisch "
+"Configureer geavanceerde opties zoals bericht-codering en automatisch "
 "opnieuw verbinden"
 
-#: NetworksSettingsPage#42
+#: ../src/qtui/settingspages/networkssettingspage.ui:661
+msgctxt "NetworksSettingsPage|"
 msgid "Control encodings for in- and outgoing messages"
-msgstr "Beheer encodings voor inkomende en uitgaande berichten"
+msgstr "Codering voor inkomende en uitgaande berichten instellen"
 
-#: NetworksSettingsPage#43
+#: ../src/qtui/settingspages/networkssettingspage.ui:664
+msgctxt "NetworksSettingsPage|"
 msgid "Use Custom Encodings"
-msgstr "Gebruik eigen encodering"
+msgstr "Aangepaste codering gebruiken"
 
-#: NetworksSettingsPage#44
+#: ../src/qtui/settingspages/networkssettingspage.ui:675
+#: ../src/qtui/settingspages/networkssettingspage.ui:695
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "Specify which encoding your messages will be sent in.\n"
 "UTF-8 should be a sane choice for most networks."
 msgstr ""
-"Stel in in welke encoding uw berichten verzonden zullen worden.\n"
+"Stel in in welke codering uw berichten verzonden zullen worden.\n"
 "UTF-8 is een zinnige keuze voor de meeste netwerken."
 
-#: NetworksSettingsPage#45
+#: ../src/qtui/settingspages/networkssettingspage.ui:679
+msgctxt "NetworksSettingsPage|"
 msgid "Send messages in:"
 msgstr "Verzend berichten in:"
 
-#: NetworksSettingsPage#46
+#: ../src/qtui/settingspages/networkssettingspage.ui:706
+#: ../src/qtui/settingspages/networkssettingspage.ui:726
+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."
@@ -3833,36 +4965,87 @@ msgstr ""
 "Binnenkomende berichten in Utf8 zullen altijd zo behandeld worden.\n"
 "Deze instellingen geven de codering voor berichten die niet Utf8 zijn."
 
-#: NetworksSettingsPage#47
+#: ../src/qtui/settingspages/networkssettingspage.ui:710
+msgctxt "NetworksSettingsPage|"
 msgid "Receive fallback:"
 msgstr "Ontvang-terugvaloptie:"
 
-#: NetworksSettingsPage#48
+#: ../src/qtui/settingspages/networkssettingspage.ui:737
+#: ../src/qtui/settingspages/networkssettingspage.ui:751
+msgctxt "NetworksSettingsPage|"
 msgid ""
 "This specifies how control messages, nicks and servernames are encoded.\n"
 "Unless you *really* know what you do, leave this as ISO-8859-1!"
 msgstr ""
-"Dit geeft de encodering van control-messages, nicks en servernamen aan.\n"
+"Dit geeft de codering van control-messages, nicks en servernamen aan.\n"
 "Tenzij u *echt* weet wat u doet moet u dit op ISO-8859-1 laten staan!"
 
-#: NetworksSettingsPage#49
+#: ../src/qtui/settingspages/networkssettingspage.ui:741
+msgctxt "NetworksSettingsPage|"
 msgid "Server encoding:"
-msgstr "Server encodering:"
+msgstr "Servercodering:"
 
-#: NickEditDlg#1
-msgctxt "NickEditDlg#1"
-msgid "Add Nickname"
-msgstr "Bijnaam toevoegen"
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgctxt "NetworksSettingsPage|"
+msgid "IRC"
+msgstr "IRC"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:37
+msgctxt "NetworksSettingsPage|"
+msgid "Networks"
+msgstr "Netwerken"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:176
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"<b>The following problems need to be corrected before your changes can be "
+"applied:</b><ul>"
+msgstr ""
+"<b>De volgende problemen moeten opgelost worden voordat uw wijzigingen "
+"toegepast kunnen worden:</b><ul>"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:177
+msgctxt "NetworksSettingsPage|"
+msgid "<li>All networks need at least one server defined</li>"
+msgstr "<li>Voor alle netwerken moet minstens één server opgegeven worden</li>"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:178
+msgctxt "NetworksSettingsPage|"
+msgid "</ul>"
+msgstr "</ul>"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:179
+msgctxt "NetworksSettingsPage|"
+msgid "Invalid Network Settings"
+msgstr "Ongeldige netwerkinstellingen"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:602
+msgctxt "NetworksSettingsPage|"
+msgid "Delete Network?"
+msgstr "Netwerk verwijderen?"
+
+#: ../src/qtui/settingspages/networkssettingspage.cpp:603
+#, qt-format
+msgctxt "NetworksSettingsPage|"
+msgid ""
+"Do you really want to delete the network \"%1\" and all related settings, "
+"including the backlog?"
+msgstr ""
+"Wilt u netwerk ‘%1’ en alle bijbehorende gegevens, waaronder het backlog, "
+"echt verwijderen?"
 
-#: NickEditDlg#2
+#: ../src/qtui/settingspages/nickeditdlg.ui:13
+msgctxt "NickEditDlg|"
 msgid "Edit Nickname"
 msgstr "Bijnaam bewerken"
 
-#: NickEditDlg#3
+#: ../src/qtui/settingspages/nickeditdlg.ui:19
+msgctxt "NickEditDlg|"
 msgid "Please enter a valid nickname:"
 msgstr "Vul een geldige bijnaam in:"
 
-#: NickEditDlg#4
+#: ../src/qtui/settingspages/nickeditdlg.ui:32
+msgctxt "NickEditDlg|"
 msgid ""
 "A valid nickname may contain letters from the English alphabet, digits, and "
 "the special characters {, }, [, ], \\, |, `, ^, _ and -."
@@ -3870,60 +5053,79 @@ msgstr ""
 "Een geldige bijnaam mag letters uit het alfabet bevatten, cijfers en de "
 "volgende speciale tekens: {, }, [, ], \\, |, `, ^, _ en -."
 
-#: NotificationsSettingsPage#1
-msgctxt "NotificationsSettingsPage#1"
+#: ../src/qtui/settingspages/identitiessettingspage.cpp:474
+msgctxt "NickEditDlg|"
+msgid "Add Nickname"
+msgstr "Bijnaam toevoegen"
+
+#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+msgctxt "NotificationsSettingsPage|"
 msgid "Interface"
 msgstr "Interface"
 
-#: NotificationsSettingsPage#2
+#: ../src/qtui/settingspages/notificationssettingspage.cpp:28
+msgctxt "NotificationsSettingsPage|"
 msgid "Notifications"
 msgstr "Notificaties"
 
-#: PhononNotificationBackend::ConfigWidget#1
+#: ../src/qtui/phononnotificationbackend.cpp:172
+msgctxt "PhononNotificationBackend::ConfigWidget|"
 msgid "Select Audio File"
-msgstr "Kies audiobestand"
+msgstr "Audiobestand selecteren"
 
-#: PhononNotificationConfigWidget#1
-msgctxt "PhononNotificationConfigWidget#1"
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:14
+msgctxt "PhononNotificationConfigWidget|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: PhononNotificationConfigWidget#2
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:20
+msgctxt "PhononNotificationConfigWidget|"
 msgid "Play a sound"
-msgstr "Speel een geluid"
+msgstr "Een geluid afspelen"
 
-#: PhononNotificationConfigWidget#3
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:46
+msgctxt "PhononNotificationConfigWidget|"
 msgid "Prelisten to the selected sound"
 msgstr "Luister naar het geselecteerde geluid"
 
-#: PhononNotificationConfigWidget#4
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:59
+#: ../src/qtui/ui/phononnotificationconfigwidget.ui:69
+msgctxt "PhononNotificationConfigWidget|"
 msgid "Select the sound file to play"
 msgstr "Selecteer een audio bestand om af te spelen"
 
-#: PostgreSqlStorage#1
+#: ../src/core/postgresqlstorage.cpp:72
+msgctxt "PostgreSqlStorage|"
 msgid "PostgreSQL Turbo Bomber HD!"
 msgstr "PostgreSQL Turbo Bomber HD!"
 
-#: QObject#1
+#: ../src/client/backlogrequester.cpp:95
+#, qt-format
+msgctxt "QObject|"
 msgid "Requesting a total of up to %1 backlog messages for %2 buffers"
 msgstr "Een totaal van %1 backlog-berichten voor %2 buffers aanvragen"
 
-#: QObject#2
-msgid ""
-"Requesting up to %1 of all unread backlog messages (plus additional %2)"
+#: ../src/client/backlogrequester.cpp:122
+#, qt-format
+msgctxt "QObject|"
+msgid "Requesting up to %1 of all unread backlog messages (plus additional %2)"
 msgstr ""
 "Tot %1 van alle ongelezen backlog-berichten opvragen (plus nog %2 extra)"
 
-#: QObject#3
+#: ../src/client/backlogrequester.cpp:142
+#, qt-format
+msgctxt "QObject|"
 msgid "Requesting a total of up to %1 unread backlog messages for %2 buffers"
 msgstr ""
 "Een totaal van %1 ongelezen backlog-berichten voor %2 buffers aanvragen"
 
-#: QObject#4
+#: ../src/qtui/ircconnectionwizard.cpp:56
+msgctxt "QObject|"
 msgid "Welcome to Quassel IRC"
 msgstr "Welkom bij Quassel-IRC"
 
-#: QObject#5
+#: ../src/qtui/ircconnectionwizard.cpp:58
+msgctxt "QObject|"
 msgid ""
 "This wizard will help you to set up your default identity and your IRC "
 "network connection.<br>This only covers basic settings. You can cancel this "
@@ -3934,199 +5136,271 @@ msgstr ""
 "deze wizard op elk moment annuleren en het instellingenvenster gebruiken "
 "voor gedetailleerden opties."
 
-#: QssParser#1
+#: ../src/uisupport/qssparser.cpp:129 ../src/uisupport/qssparser.cpp:179
+#: ../src/uisupport/qssparser.cpp:335
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid block declaration: %1"
 msgstr "Ongeldig blok opgegeven: %1"
 
-#: QssParser#2
+#: ../src/uisupport/qssparser.cpp:148
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid palette role assignment: %1"
 msgstr "Ongeldige palette-role toegewezen: %1"
 
-#: QssParser#3
+#: ../src/uisupport/qssparser.cpp:167
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unknown palette role name: %1"
 msgstr "Onbekende palette-role-naam: %1"
 
-#: QssParser#4
+#: ../src/uisupport/qssparser.cpp:205
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid subelement name in %1"
 msgstr "Ongeldige subelementnaam in %1"
 
-#: QssParser#5
+#: ../src/uisupport/qssparser.cpp:249
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid message type in %1"
 msgstr "Ongeldig berichttype in %1"
 
-#: QssParser#6
+#: ../src/uisupport/qssparser.cpp:258
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid condition %1"
 msgstr "Ongeldige voorwaarde %1"
 
-#: QssParser#7
+#: ../src/uisupport/qssparser.cpp:270
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid message label: %1"
 msgstr "Ongeldig berichtlabel: %1"
 
-#: QssParser#8
+#: ../src/uisupport/qssparser.cpp:282
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid senderhash specification: %1"
 msgstr "Ongeldige senderhash specificatie: %1"
 
-#: QssParser#9
+#: ../src/uisupport/qssparser.cpp:286
+msgctxt "QssParser|"
 msgid "Senderhash can be at most \"0x0f\"!"
-msgstr "Senderhash kan maximaal \"0x0f\" zijn!"
+msgstr "Senderhash kan maximaal ‘0x0f’ zijn!"
 
-#: QssParser#10
+#: ../src/uisupport/qssparser.cpp:302
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid format name: %1"
 msgstr "Ongeldige formatnaam: %1"
 
-#: QssParser#11
+#: ../src/uisupport/qssparser.cpp:310
+#, qt-format
+msgctxt "QssParser|"
 msgid "Illegal IRC color specification (must be between 00 and 0f): %1"
 msgstr "Ongeldige IRC-kleur opgegeven (moet tussen 00 en 0f liggen): %1"
 
-#: QssParser#12
+#: ../src/uisupport/qssparser.cpp:319
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unhandled condition: %1"
 msgstr "Onafgehandeld probleem: %1"
 
-#: QssParser#13
+#: ../src/uisupport/qssparser.cpp:350
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid proplist %1"
 msgstr "Ongeldige proplijst %1"
 
-#: QssParser#14
+#: ../src/uisupport/qssparser.cpp:369
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid chatlist item type %1"
 msgstr "Ongeldig chatlijstobjecttype %1"
 
-#: QssParser#15
+#: ../src/uisupport/qssparser.cpp:385
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid chatlist state %1"
 msgstr "Ongeldige chatlijststatus %1"
 
-#: QssParser#16
+#: ../src/uisupport/qssparser.cpp:415
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid property declaration: %1"
 msgstr "Ongeldige eigenschapdeclaratie: %1"
 
-#: QssParser#17
+#: ../src/uisupport/qssparser.cpp:439
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font property: %1"
 msgstr "Ongeldige lettertype-eigenschap: %1"
 
-#: QssParser#18
+#: ../src/uisupport/qssparser.cpp:445
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unknown ChatLine property: %1"
-msgstr "Onbekende ChatLine eigenschap: %1"
+msgstr "Onbekende ChatLine-eigenschap: %1"
 
-#: QssParser#19
+#: ../src/uisupport/qssparser.cpp:469
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid palette color role specification: %1"
 msgstr "Ongeldige palettekleur-role opgegeven: %1"
 
-#: QssParser#20
+#: ../src/uisupport/qssparser.cpp:476
+#, qt-format
+msgctxt "QssParser|"
 msgid "Unknown palette color role: %1"
 msgstr "Onbekende palettekleur-role: %1"
 
-#: QssParser#21
+#: ../src/uisupport/qssparser.cpp:483 ../src/uisupport/qssparser.cpp:506
+#: ../src/uisupport/qssparser.cpp:528
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid gradient declaration: %1"
 msgstr "Ongeldige gradiënt opgegeven: %1"
 
-#: QssParser#22
+#: ../src/uisupport/qssparser.cpp:492 ../src/uisupport/qssparser.cpp:514
+#: ../src/uisupport/qssparser.cpp:538
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid gradient stops list: %1"
 msgstr "Ongeldige gradiënt-stoplijst: %1"
 
-#: QssParser#23
+#: ../src/uisupport/qssparser.cpp:647
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font specification: %1"
 msgstr "Ongeldig lettertype opgegeven: %1"
 
-#: QssParser#24
+#: ../src/uisupport/qssparser.cpp:688
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font style specification: %1"
 msgstr "Ongeldige lettertypestijl opgegeven: %1"
 
-#: QssParser#25
+#: ../src/uisupport/qssparser.cpp:703
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font weight specification: %1"
 msgstr "Ongeldige lettertype-dikte opgegeven: %1"
 
-#: QssParser#26
+#: ../src/uisupport/qssparser.cpp:715
+#, qt-format
+msgctxt "QssParser|"
 msgid "Invalid font size specification: %1"
 msgstr "Ongeldige lettertypegrootte opgegeven: %1"
 
-#: Quassel::secondsToString()#1
+#: ../src/common/util.cpp:162
+msgctxt "Quassel::secondsToString()|"
 msgid "year"
 msgstr "jaar"
 
-#: Quassel::secondsToString()#2
+#: ../src/common/util.cpp:163
+msgctxt "Quassel::secondsToString()|"
 msgid "day"
 msgstr "dag"
 
-#: Quassel::secondsToString()#3
+#: ../src/common/util.cpp:164
+msgctxt "Quassel::secondsToString()|"
 msgid "h"
 msgstr "h"
 
-#: Quassel::secondsToString()#4
+#: ../src/common/util.cpp:165
+msgctxt "Quassel::secondsToString()|"
 msgid "min"
 msgstr "min"
 
-#: Quassel::secondsToString()#5
+#: ../src/common/util.cpp:166
+msgctxt "Quassel::secondsToString()|"
 msgid "sec"
 msgstr "sec"
 
-#: QueryBufferItem#1
+#: ../src/client/networkmodel.cpp:482
+#, qt-format
+msgctxt "QueryBufferItem|"
 msgid "<b>Query with %1</b>"
 msgstr "<b>Aanvraag met %1</b>"
 
-#: QueryBufferItem#2
-msgctxt "QueryBufferItem#2"
+#: ../src/client/networkmodel.cpp:500
+#, qt-format
+msgctxt "QueryBufferItem|"
 msgid "idling since %1"
 msgstr "niet actief sinds %1"
 
-#: QueryBufferItem#3
-msgctxt "QueryBufferItem#3"
+#: ../src/client/networkmodel.cpp:503
+#, qt-format
+msgctxt "QueryBufferItem|"
 msgid "login time: %1"
 msgstr "logintijd: %1"
 
-#: QueryBufferItem#4
-msgctxt "QueryBufferItem#4"
+#: ../src/client/networkmodel.cpp:506
+#, qt-format
+msgctxt "QueryBufferItem|"
 msgid "server: %1"
 msgstr "server: %1"
 
-#: SaveIdentitiesDlg#1
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:13
+msgctxt "SaveIdentitiesDlg|"
 msgid "Sync With Core"
 msgstr "Met core synchroniseren"
 
-#: SaveIdentitiesDlg#2
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:21
+msgctxt "SaveIdentitiesDlg|"
 msgid "Syncing data with core, please wait..."
-msgstr "Gegevens met core synchroniseren, een moment..."
+msgstr "Gegevens met core synchroniseren, een moment…"
 
-#: SaveIdentitiesDlg#3
+#: ../src/qtui/settingspages/saveidentitiesdlg.ui:81
+msgctxt "SaveIdentitiesDlg|"
 msgid "Abort"
 msgstr "Afbreken"
 
-#: ServerEditDlg#1
-msgctxt "ServerEditDlg#1"
+#: ../src/qtui/settingspages/servereditdlg.ui:14
+msgctxt "ServerEditDlg|"
 msgid "Dialog"
-msgstr "Dialoog"
+msgstr "Dialoogvenster"
 
-#: ServerEditDlg#2
+#: ../src/qtui/settingspages/servereditdlg.ui:30
+msgctxt "ServerEditDlg|"
 msgid "Server Info"
 msgstr "Serverinformatie"
 
-#: ServerEditDlg#3
-msgctxt "ServerEditDlg#3"
+#: ../src/qtui/settingspages/servereditdlg.ui:38
+msgctxt "ServerEditDlg|"
 msgid "Server address:"
 msgstr "Serveradres:"
 
-#: ServerEditDlg#4
-msgctxt "ServerEditDlg#4"
+#: ../src/qtui/settingspages/servereditdlg.ui:45
+#: ../src/qtui/settingspages/servereditdlg.ui:227
+msgctxt "ServerEditDlg|"
 msgid "Port:"
 msgstr "Poort:"
 
-#: ServerEditDlg#5
-msgctxt "ServerEditDlg#5"
+#: ../src/qtui/settingspages/servereditdlg.ui:72
+msgctxt "ServerEditDlg|"
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ServerEditDlg#6
+#: ../src/qtui/settingspages/servereditdlg.ui:94
+msgctxt "ServerEditDlg|"
 msgid "Use SSL"
 msgstr "Gebruik SSL"
 
-#: ServerEditDlg#7
-msgctxt "ServerEditDlg#7"
+#: ../src/qtui/settingspages/servereditdlg.ui:119
+msgctxt "ServerEditDlg|"
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ServerEditDlg#8
+#: ../src/qtui/settingspages/servereditdlg.ui:140
+msgctxt "ServerEditDlg|"
 msgid "SSL Version:"
 msgstr "SSL-versie"
 
-#: ServerEditDlg#9
+#: ../src/qtui/settingspages/servereditdlg.ui:147
+msgctxt "ServerEditDlg|"
 msgid ""
 "Do not change unless you're going to connect to a server not supporting "
 "SSLv3!"
@@ -4134,65 +5408,79 @@ msgstr ""
 "Pas dit niet aan tenzij u met een server wilt verbinden die SSLv3 niet "
 "ondersteunt!"
 
-#: ServerEditDlg#10
+#: ../src/qtui/settingspages/servereditdlg.ui:151
+msgctxt "ServerEditDlg|"
 msgid "SSLv3 (default)"
 msgstr "SSLv3 (default)"
 
-#: ServerEditDlg#11
+#: ../src/qtui/settingspages/servereditdlg.ui:156
+msgctxt "ServerEditDlg|"
 msgid "SSLv2"
 msgstr "SSLv2"
 
-#: ServerEditDlg#12
+#: ../src/qtui/settingspages/servereditdlg.ui:161
+msgctxt "ServerEditDlg|"
 msgid "TLSv1"
 msgstr "TLSv1"
 
-#: ServerEditDlg#13
-msgctxt "ServerEditDlg#13"
+#: ../src/qtui/settingspages/servereditdlg.ui:171
+msgctxt "ServerEditDlg|"
 msgid "Use a Proxy"
-msgstr "Gebruik een proxy"
+msgstr "Een proxy gebruiken"
 
-#: ServerEditDlg#14
-msgctxt "ServerEditDlg#14"
+#: ../src/qtui/settingspages/servereditdlg.ui:188
+msgctxt "ServerEditDlg|"
 msgid "Proxy Type:"
 msgstr "Proxytype:"
 
-#: ServerEditDlg#15
-msgctxt "ServerEditDlg#15"
+#: ../src/qtui/settingspages/servereditdlg.ui:196
+msgctxt "ServerEditDlg|"
 msgid "Socks 5"
 msgstr "Socks 5"
 
-#: ServerEditDlg#16
-msgctxt "ServerEditDlg#16"
+#: ../src/qtui/settingspages/servereditdlg.ui:201
+msgctxt "ServerEditDlg|"
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ServerEditDlg#17
+#: ../src/qtui/settingspages/servereditdlg.ui:213
+msgctxt "ServerEditDlg|"
 msgid "Proxy Host:"
 msgstr "Proxyhost:"
 
-#: ServerEditDlg#18
-msgctxt "ServerEditDlg#18"
+#: ../src/qtui/settingspages/servereditdlg.ui:220
+msgctxt "ServerEditDlg|"
 msgid "localhost"
 msgstr "localhost"
 
-#: ServerEditDlg#19
+#: ../src/qtui/settingspages/servereditdlg.ui:251
+msgctxt "ServerEditDlg|"
 msgid "Proxy Username:"
 msgstr "Proxy-gebruikersnaam:"
 
-#: ServerEditDlg#20
+#: ../src/qtui/settingspages/servereditdlg.ui:261
+msgctxt "ServerEditDlg|"
 msgid "Proxy Password:"
 msgstr "Proxywachtwoord:"
 
-#: SettingsDlg#1
-msgctxt "SettingsDlg#1"
+#: ../src/qtui/ui/settingsdlg.ui:14
+msgctxt "SettingsDlg|"
+msgid "Configure Quassel"
+msgstr "Quassel configureren"
+
+#: ../src/qtui/ui/settingsdlg.ui:35 ../src/qtui/ui/settingsdlg.ui:50
+#: ../src/qtui/settingsdlg.cpp:111
+msgctxt "SettingsDlg|"
 msgid "Settings"
-msgstr "Instellingen"
+msgstr "Voorkeuren"
 
-#: SettingsDlg#2
+#: ../src/qtui/settingsdlg.cpp:121
+msgctxt "SettingsDlg|"
 msgid "Save changes"
 msgstr "Veranderingen opslaan"
 
-#: SettingsDlg#3
+#: ../src/qtui/settingsdlg.cpp:122
+msgctxt "SettingsDlg|"
 msgid ""
 "There are unsaved changes on the current configuration page. Would you like "
 "to apply your changes now?"
@@ -4200,164 +5488,224 @@ msgstr ""
 "Er zijn nog niet opgeslagen veranderingen in de huidige configuratie. Wilt u "
 "deze veranderingen nu toepassen?"
 
-#: SettingsDlg#4
-msgctxt "SettingsDlg#4"
+#: ../src/qtui/settingsdlg.cpp:136 ../src/qtui/settingsdlg.cpp:140
+#, qt-format
+msgctxt "SettingsDlg|"
 msgid "Configure %1"
-msgstr "Configureer %1"
+msgstr "%1 configureren"
 
-#: SettingsDlg#5
-msgctxt "SettingsDlg#5"
+#: ../src/qtui/settingsdlg.cpp:220
+msgctxt "SettingsDlg|"
 msgid "Reload Settings"
 msgstr "Instellingen herladen"
 
-#: SettingsDlg#6
-msgctxt "SettingsDlg#6"
-msgid ""
-"Do you like to reload the settings, undoing your changes on this page?"
+#: ../src/qtui/settingsdlg.cpp:220
+msgctxt "SettingsDlg|"
+msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 "Wilt u de instellingen herladen, waarmee u alle wijzigingen op deze pagina "
 "ongedaan maakt?"
 
-#: SettingsDlg#7
-msgctxt "SettingsDlg#7"
+#: ../src/qtui/settingsdlg.cpp:231
+msgctxt "SettingsDlg|"
 msgid "Restore Defaults"
 msgstr "Beginwaarden terugzetten"
 
-#: SettingsDlg#8
-msgctxt "SettingsDlg#8"
+#: ../src/qtui/settingsdlg.cpp:231
+msgctxt "SettingsDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Wilt u de beginwaarden voor deze pagina terugzetten?"
 
-#: SettingsDlg#9
-msgctxt "SettingsDlg#9"
+#: ../src/qtui/ui/settingspagedlg.ui:14
+msgctxt "SettingsPageDlg|"
 msgid "Configure Quassel"
-msgstr "Configureer Quassel"
+msgstr "Quassel configureren"
 
-#: SettingsPageDlg#1
-msgctxt "SettingsPageDlg#1"
+#: ../src/qtui/ui/settingspagedlg.ui:30
+msgctxt "SettingsPageDlg|"
+msgid "Settings"
+msgstr "Voorkeuren"
+
+#: ../src/qtui/settingspagedlg.cpp:39
+#, qt-format
+msgctxt "SettingsPageDlg|"
 msgid "Configure %1"
-msgstr "Configureer %1"
+msgstr "%1 configureren"
 
-#: SettingsPageDlg#2
-msgctxt "SettingsPageDlg#2"
+#: ../src/qtui/settingspagedlg.cpp:120
+msgctxt "SettingsPageDlg|"
 msgid "Reload Settings"
 msgstr "Instellingen herladen"
 
-#: SettingsPageDlg#3
-msgctxt "SettingsPageDlg#3"
-msgid ""
-"Do you like to reload the settings, undoing your changes on this page?"
+#: ../src/qtui/settingspagedlg.cpp:120
+msgctxt "SettingsPageDlg|"
+msgid "Do you like to reload the settings, undoing your changes on this page?"
 msgstr ""
 "Wilt u de instellingen herladen, waarmee u alle wijzigingen op deze pagina "
 "ongedaan maakt?"
 
-#: SettingsPageDlg#4
-msgctxt "SettingsPageDlg#4"
+#: ../src/qtui/settingspagedlg.cpp:131
+msgctxt "SettingsPageDlg|"
 msgid "Restore Defaults"
 msgstr "Beginwaarden terugzetten"
 
-#: SettingsPageDlg#5
-msgctxt "SettingsPageDlg#5"
+#: ../src/qtui/settingspagedlg.cpp:131
+msgctxt "SettingsPageDlg|"
 msgid "Do you like to restore the default values for this page?"
 msgstr "Wilt u de beginwaarden voor deze pagina terugzetten?"
 
-#: SettingsPageDlg#6
-msgctxt "SettingsPageDlg#6"
-msgid "Configure Quassel"
-msgstr "Configureer Quassel"
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:121
+msgctxt "ShortcutsModel|"
+msgid "Action"
+msgstr "Actie"
 
-#: SettingsPageDlg#7
-msgctxt "SettingsPageDlg#7"
-msgid "Settings"
-msgstr "Instellingen"
+#: ../src/qtui/settingspages/shortcutsmodel.cpp:123
+msgctxt "ShortcutsModel|"
+msgid "Shortcut"
+msgstr "Sneltoets"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:14
+msgctxt "ShortcutsSettingsPage|"
+msgid "Form"
+msgstr "Formulier"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:22
+msgctxt "ShortcutsSettingsPage|"
+msgid "Search:"
+msgstr "Zoek:"
 
-#: SignalProxy#1
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:62
+msgctxt "ShortcutsSettingsPage|"
+msgid "Shortcut for Selected Action"
+msgstr "Sneltoets voor de geselecteerde actie"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:68
+msgctxt "ShortcutsSettingsPage|"
+msgid "Default:"
+msgstr "Standaard:"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:75
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:99
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:111
+msgctxt "ShortcutsSettingsPage|"
+msgid "None"
+msgstr "Geen"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.ui:82
+msgctxt "ShortcutsSettingsPage|"
+msgid "Custom:"
+msgstr "Aangepast:"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
+msgctxt "ShortcutsSettingsPage|"
+msgid "Interface"
+msgstr "Interface"
+
+#: ../src/qtui/settingspages/shortcutssettingspage.cpp:65
+msgctxt "ShortcutsSettingsPage|"
+msgid "Shortcuts"
+msgstr "Sneltoetsen"
+
+#: ../src/common/signalproxy.cpp:981
+msgctxt "SignalProxy|"
 msgid "Peer tried to send package larger than max package size!"
 msgstr ""
 "Uw peer probeerde een pakket te sturen dat groter was dan de maximale "
 "pakketgrootte!"
 
-#: SignalProxy#2
+#: ../src/common/signalproxy.cpp:986
+msgctxt "SignalProxy|"
 msgid "Peer tried to send 0 byte package!"
-msgstr "Uw peer probeerde een pakket te sturen van 0 bytes!"
+msgstr "Uw peer probeerde een pakket van 0 bytes te sturen!"
 
-#: SignalProxy#3
+#: ../src/common/signalproxy.cpp:1003
+msgctxt "SignalProxy|"
 msgid "Peer sent corrupted compressed data!"
 msgstr "Uw peer verstuurde beschadigde gecomprimeerde data!"
 
-#: SignalProxy#4
+#: ../src/common/signalproxy.cpp:1019
+msgctxt "SignalProxy|"
 msgid "Peer sent corrupt data: unable to load QVariant!"
 msgstr "Uw peer verzond beschadigde data: kan QVariant niet laden!"
 
-#: SignalProxy#5
+#: ../src/common/signalproxy.cpp:1168
+msgctxt "SignalProxy|"
 msgid "Disconnecting"
 msgstr "Verbinding verbreken"
 
-#: SimpleNetworkEditor#1
-msgctxt "SimpleNetworkEditor#1"
+#: ../src/qtui/ui/simplenetworkeditor.ui:28
+msgctxt "SimpleNetworkEditor|"
 msgid "Network name:"
 msgstr "Netwerknaam:"
 
-#: SimpleNetworkEditor#2
+#: ../src/qtui/ui/simplenetworkeditor.ui:35
+msgctxt "SimpleNetworkEditor|"
 msgid "The name of the IRC network you are configuring"
 msgstr "De naam van het IRC-netwerk dat u configureert"
 
-#: SimpleNetworkEditor#3
-msgctxt "SimpleNetworkEditor#3"
+#: ../src/qtui/ui/simplenetworkeditor.ui:63
+msgctxt "SimpleNetworkEditor|"
 msgid "Servers"
 msgstr "Servers"
 
-#: SimpleNetworkEditor#4
+#: ../src/qtui/ui/simplenetworkeditor.ui:81
+msgctxt "SimpleNetworkEditor|"
 msgid "A list of IRC servers belonging to this network"
 msgstr "Een lijst van alle IRC-servers die bij dit netwerk horen"
 
-#: SimpleNetworkEditor#5
+#: ../src/qtui/ui/simplenetworkeditor.ui:96
+msgctxt "SimpleNetworkEditor|"
 msgid "Edit this server entry"
 msgstr "Bewerk deze serverinstellingen"
 
-#: SimpleNetworkEditor#6
-msgctxt "SimpleNetworkEditor#6"
+#: ../src/qtui/ui/simplenetworkeditor.ui:99
+msgctxt "SimpleNetworkEditor|"
 msgid "&Edit..."
-msgstr "Be&werken..."
+msgstr "Be&werken…"
 
-#: SimpleNetworkEditor#7
+#: ../src/qtui/ui/simplenetworkeditor.ui:116
+msgctxt "SimpleNetworkEditor|"
 msgid "Add another IRC server"
 msgstr "Nog een IRC-server toevoegen"
 
-#: SimpleNetworkEditor#8
-msgctxt "SimpleNetworkEditor#8"
+#: ../src/qtui/ui/simplenetworkeditor.ui:119
+msgctxt "SimpleNetworkEditor|"
 msgid "&Add..."
 msgstr "&Toevoegen..."
 
-#: SimpleNetworkEditor#9
+#: ../src/qtui/ui/simplenetworkeditor.ui:136
+msgctxt "SimpleNetworkEditor|"
 msgid "Remove this server entry from the list"
 msgstr "Deze server van de lijst verwijderen"
 
-#: SimpleNetworkEditor#10
-msgctxt "SimpleNetworkEditor#10"
+#: ../src/qtui/ui/simplenetworkeditor.ui:139
+msgctxt "SimpleNetworkEditor|"
 msgid "De&lete"
-msgstr "&Verwijder"
+msgstr "&Verwijderen"
 
-#: SimpleNetworkEditor#11
-msgctxt "SimpleNetworkEditor#11"
+#: ../src/qtui/ui/simplenetworkeditor.ui:165
+msgctxt "SimpleNetworkEditor|"
 msgid "Move upwards in list"
 msgstr "In de lijst omhoog verplaatsen"
 
-#: SimpleNetworkEditor#12
-msgctxt "SimpleNetworkEditor#12"
+#: ../src/qtui/ui/simplenetworkeditor.ui:168
+#: ../src/qtui/ui/simplenetworkeditor.ui:182
+msgctxt "SimpleNetworkEditor|"
 msgid "..."
-msgstr "..."
+msgstr "…"
 
-#: SimpleNetworkEditor#13
-msgctxt "SimpleNetworkEditor#13"
+#: ../src/qtui/ui/simplenetworkeditor.ui:179
+msgctxt "SimpleNetworkEditor|"
 msgid "Move downwards in list"
 msgstr "In de lijst omlaag verplaatsen"
 
-#: SimpleNetworkEditor#14
+#: ../src/qtui/ui/simplenetworkeditor.ui:226
+msgctxt "SimpleNetworkEditor|"
 msgid "Join Channels Automatically"
 msgstr "Automatisch kanalen binnengaan"
 
-#: SimpleNetworkEditor#15
+#: ../src/qtui/ui/simplenetworkeditor.ui:250
+msgctxt "SimpleNetworkEditor|"
 msgid ""
 "A list of IRC channels you will join automatically after connecting to the "
 "network"
@@ -4365,7 +5713,8 @@ msgstr ""
 "Een lijst van IRC-kanalen die u automatisch zult binnengaan wanneer u met "
 "het netwerk verbindt"
 
-#: SqliteStorage#1
+#: ../src/core/sqlitestorage.cpp:60
+msgctxt "SqliteStorage|"
 msgid ""
 "SQLite is a file-based database engine that does not require any setup. It "
 "is suitable for small and medium-sized databases that do not require access "
@@ -4379,424 +5728,523 @@ msgstr ""
 "locale machine moet opslaan en als slechts een paar mensen uw core zullen "
 "gebruiken"
 
-#: SslInfoDlg#1
-msgid "Yes"
-msgstr "Ja"
-
-#: SslInfoDlg#2
-msgid "No, for the following reasons:<ul>"
-msgstr "Nee, om de volgende redenen:<ul>"
-
-#: SslInfoDlg#3
-msgid "%1 to %2"
-msgstr "%1 tot %2"
-
-#: SslInfoDlg#4
+#: ../src/qtui/ui/sslinfodlg.ui:14
+msgctxt "SslInfoDlg|"
 msgid "Security Information"
 msgstr "Beveiligingsinformatie"
 
-#: SslInfoDlg#5
+#: ../src/qtui/ui/sslinfodlg.ui:22
+msgctxt "SslInfoDlg|"
 msgid "<b>Hostname:</b>"
 msgstr "<b>Hostnaam:</b>"
 
-#: SslInfoDlg#6
+#: ../src/qtui/ui/sslinfodlg.ui:39
+msgctxt "SslInfoDlg|"
 msgid "<b>IP address:</b>"
 msgstr "<b>IP-adres:</b>"
 
-#: SslInfoDlg#7
+#: ../src/qtui/ui/sslinfodlg.ui:56
+msgctxt "SslInfoDlg|"
 msgid "<b>Encryption:</b>"
 msgstr "<b>Versleuteling:</b>"
 
-#: SslInfoDlg#8
+#: ../src/qtui/ui/sslinfodlg.ui:73
+msgctxt "SslInfoDlg|"
 msgid "<b>Protocol:</b>"
 msgstr "<b>Protocol:</b>"
 
-#: SslInfoDlg#9
+#: ../src/qtui/ui/sslinfodlg.ui:90
+msgctxt "SslInfoDlg|"
 msgid "<b>Certificate chain:</b>"
 msgstr "<b>Certificate chain:</b>"
 
-#: SslInfoDlg#10
+#: ../src/qtui/ui/sslinfodlg.ui:120
+msgctxt "SslInfoDlg|"
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: SslInfoDlg#11
+#: ../src/qtui/ui/sslinfodlg.ui:126 ../src/qtui/ui/sslinfodlg.ui:248
+msgctxt "SslInfoDlg|"
 msgid "<b>Common name:</b>"
-msgstr "<b>Normale naam:</b>"
+msgstr "<b>Common name:</b>"
 
-#: SslInfoDlg#12
+#: ../src/qtui/ui/sslinfodlg.ui:143 ../src/qtui/ui/sslinfodlg.ui:265
+msgctxt "SslInfoDlg|"
 msgid "<b>Organization:</b>"
 msgstr "<b>Organisatie:</b>"
 
-#: SslInfoDlg#13
+#: ../src/qtui/ui/sslinfodlg.ui:160 ../src/qtui/ui/sslinfodlg.ui:282
+msgctxt "SslInfoDlg|"
 msgid "<b>Organizational unit:</b>"
 msgstr "<b>Organisatieonderdeel:</b>"
 
-#: SslInfoDlg#14
+#: ../src/qtui/ui/sslinfodlg.ui:177 ../src/qtui/ui/sslinfodlg.ui:299
+msgctxt "SslInfoDlg|"
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
-#: SslInfoDlg#15
+#: ../src/qtui/ui/sslinfodlg.ui:194 ../src/qtui/ui/sslinfodlg.ui:316
+msgctxt "SslInfoDlg|"
 msgid "<b>State or province:</b>"
 msgstr "<b>Staat of provincie:</b>"
 
-#: SslInfoDlg#16
+#: ../src/qtui/ui/sslinfodlg.ui:231 ../src/qtui/ui/sslinfodlg.ui:353
+msgctxt "SslInfoDlg|"
 msgid "<b>Locality:</b>"
 msgstr "<b>Lokaliteit:</b>"
 
-#: SslInfoDlg#17
+#: ../src/qtui/ui/sslinfodlg.ui:242
+msgctxt "SslInfoDlg|"
 msgid "Issuer"
 msgstr "Uitgever"
 
-#: SslInfoDlg#18
+#: ../src/qtui/ui/sslinfodlg.ui:367
+msgctxt "SslInfoDlg|"
 msgid "<b>Validity period:</b>"
 msgstr "<b>Geldigheidsduur:</b>"
 
-#: SslInfoDlg#19
+#: ../src/qtui/ui/sslinfodlg.ui:384
+msgctxt "SslInfoDlg|"
 msgid "<b>MD5 digest:</b>"
-msgstr "<b>MD5 controlesom:</b>"
+msgstr "<b>MD5-controlesom:</b>"
 
-#: SslInfoDlg#20
+#: ../src/qtui/ui/sslinfodlg.ui:401
+msgctxt "SslInfoDlg|"
 msgid "<b>SHA1 digest:</b>"
-msgstr "<b>SHA1 controlesom:</b>"
+msgstr "<b>SHA1-controlesom:</b>"
 
-#: SslInfoDlg#21
+#: ../src/qtui/ui/sslinfodlg.ui:431
+msgctxt "SslInfoDlg|"
 msgid "<b>Trusted:</b>"
 msgstr "<b>Vertrouwd:</b>"
 
-#: StatusBufferItem#1
+#: ../src/qtui/sslinfodlg.cpp:71
+msgctxt "SslInfoDlg|"
+msgid "Yes"
+msgstr "Ja"
+
+#: ../src/qtui/sslinfodlg.cpp:73
+msgctxt "SslInfoDlg|"
+msgid "No, for the following reasons:<ul>"
+msgstr "Nee, om de volgende redenen:<ul>"
+
+#: ../src/qtui/sslinfodlg.cpp:80
+#, qt-format
+msgctxt "SslInfoDlg|"
+msgid "%1 to %2"
+msgstr "%1 tot %2"
+
+#: ../src/client/networkmodel.h:149
+msgctxt "StatusBufferItem|"
 msgid "Status Buffer"
 msgstr "Bufferstatus"
 
-#: SystemTray#1
+#: ../src/qtui/systemtray.cpp:68 ../src/qtui/systemtray.cpp:101
+msgctxt "SystemTray|"
 msgid "&Minimize"
 msgstr "&Minimaliseren"
 
-#: SystemTray#2
+#: ../src/qtui/systemtray.cpp:103
+msgctxt "SystemTray|"
 msgid "&Restore"
 msgstr "He&rstellen"
 
-#: SystrayNotificationBackend#1
-msgctxt "SystrayNotificationBackend#1"
-msgid "%n pending highlights"
-msgstr "%n markeringen in wachtrij"
+#: ../src/qtui/systraynotificationbackend.cpp:142
+#, qt-format
+msgctxt "SystrayNotificationBackend|"
+msgid "%n pending highlight(s)"
+msgid_plural "%n pending highlight(s)"
+msgstr[0] "%n markering in wachtrij"
+msgstr[1] "%n markeringen in wachtrij"
 
-#: SystrayNotificationBackend::ConfigWidget#1
+#: ../src/qtui/systraynotificationbackend.cpp:156
+msgctxt "SystrayNotificationBackend::ConfigWidget|"
 msgid "Show a message in a popup"
-msgstr "Toon een bericht in pop-up venster"
+msgstr "Bericht in een pop-up venster weergeven"
+
+#: ../src/uisupport/tabcompleter.cpp:52
+msgctxt "TabCompleter|"
+msgid "Tab completion"
+msgstr "Tab-completion"
 
-#: TaskbarNotificationBackend::ConfigWidget#1
+#: ../src/qtui/taskbarnotificationbackend.cpp:83
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Activate dock entry, timeout:"
 msgstr "Activeer dockvermelding, timeout:"
 
-#: TaskbarNotificationBackend::ConfigWidget#2
+#: ../src/qtui/taskbarnotificationbackend.cpp:85
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Mark taskbar entry, timeout:"
 msgstr "Markeer taakbalkvermelding, timeout:"
 
-#: TaskbarNotificationBackend::ConfigWidget#3
-msgctxt "TaskbarNotificationBackend::ConfigWidget#3"
+#: ../src/qtui/taskbarnotificationbackend.cpp:93
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid "Unlimited"
-msgstr "Ongelimiteerd"
+msgstr "Onbeperkt"
 
-#: TaskbarNotificationBackend::ConfigWidget#4
-msgctxt "TaskbarNotificationBackend::ConfigWidget#4"
+#: ../src/qtui/taskbarnotificationbackend.cpp:94
+msgctxt "TaskbarNotificationBackend::ConfigWidget|"
 msgid " seconds"
 msgstr " seconden"
 
-#: ToolBarActionProvider#1
-msgctxt "ToolBarActionProvider#1"
+#: ../src/uisupport/toolbaractionprovider.cpp:31
+msgctxt "ToolBarActionProvider|"
 msgid "Connect"
-msgstr "Verbindt"
+msgstr "Verbinden"
 
-#: ToolBarActionProvider#2
+#: ../src/uisupport/toolbaractionprovider.cpp:31
+msgctxt "ToolBarActionProvider|"
 msgid "Connect to IRC"
-msgstr "Verbindt met IRC"
+msgstr "Met IRC verbinden"
 
-#: ToolBarActionProvider#3
-msgctxt "ToolBarActionProvider#3"
+#: ../src/uisupport/toolbaractionprovider.cpp:32
+msgctxt "ToolBarActionProvider|"
 msgid "Disconnect"
-msgstr "Verbreek verbinding"
+msgstr "Verbinding verbreken"
 
-#: ToolBarActionProvider#4
+#: ../src/uisupport/toolbaractionprovider.cpp:32
+msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from IRC"
 msgstr "Verbinding met IRC verbreken"
 
-#: ToolBarActionProvider#5
-msgctxt "ToolBarActionProvider#5"
+#: ../src/uisupport/toolbaractionprovider.cpp:34
+msgctxt "ToolBarActionProvider|"
 msgid "Part"
-msgstr "Verlaat"
+msgstr "Verlaten"
 
-#: ToolBarActionProvider#6
+#: ../src/uisupport/toolbaractionprovider.cpp:34
+msgctxt "ToolBarActionProvider|"
 msgid "Leave currently selected channel"
-msgstr "Verlaat het geselecteerde kanaal"
+msgstr "Het geselecteerde kanaal verlaten"
 
-#: ToolBarActionProvider#7
-msgctxt "ToolBarActionProvider#7"
+#: ../src/uisupport/toolbaractionprovider.cpp:35
+msgctxt "ToolBarActionProvider|"
 msgid "Join"
 msgstr "Binnengaan"
 
-#: ToolBarActionProvider#8
+#: ../src/uisupport/toolbaractionprovider.cpp:35
+msgctxt "ToolBarActionProvider|"
 msgid "Join a channel"
 msgstr "Een kanaal binnengaan"
 
-#: ToolBarActionProvider#9
+#: ../src/uisupport/toolbaractionprovider.cpp:37
+msgctxt "ToolBarActionProvider|"
 msgid "Query"
 msgstr "Aanvraag"
 
-#: ToolBarActionProvider#10
+#: ../src/uisupport/toolbaractionprovider.cpp:37
+msgctxt "ToolBarActionProvider|"
 msgid "Start a private conversation"
 msgstr "Start een privégesprek"
 
-#: ToolBarActionProvider#11
-msgctxt "ToolBarActionProvider#11"
+#: ../src/uisupport/toolbaractionprovider.cpp:38
+msgctxt "ToolBarActionProvider|"
 msgid "Whois"
 msgstr "Whois"
 
-#: ToolBarActionProvider#12
+#: ../src/uisupport/toolbaractionprovider.cpp:38
+msgctxt "ToolBarActionProvider|"
 msgid "Request user information"
-msgstr "Vraag gebruikersinformatie op"
+msgstr "Gebruikersinformatie opvragen"
 
-#: ToolBarActionProvider#13
+#: ../src/uisupport/toolbaractionprovider.cpp:40
+msgctxt "ToolBarActionProvider|"
 msgid "Op"
 msgstr "Op"
 
-#: ToolBarActionProvider#14
+#: ../src/uisupport/toolbaractionprovider.cpp:40
+msgctxt "ToolBarActionProvider|"
 msgid "Give operator privileges to user"
 msgstr "Geef operator-rechten aan gebruiker"
 
-#: ToolBarActionProvider#15
+#: ../src/uisupport/toolbaractionprovider.cpp:41
+msgctxt "ToolBarActionProvider|"
 msgid "Deop"
 msgstr "Deop"
 
-#: ToolBarActionProvider#16
+#: ../src/uisupport/toolbaractionprovider.cpp:41
+msgctxt "ToolBarActionProvider|"
 msgid "Take operator privileges from user"
 msgstr "Neem operator-rechten van gebruiker af"
 
-#: ToolBarActionProvider#17
+#: ../src/uisupport/toolbaractionprovider.cpp:42
+msgctxt "ToolBarActionProvider|"
 msgid "Voice"
 msgstr "Voice"
 
-#: ToolBarActionProvider#18
+#: ../src/uisupport/toolbaractionprovider.cpp:42
+msgctxt "ToolBarActionProvider|"
 msgid "Give voice to user"
 msgstr "Geef voice aan gebruiker"
 
-#: ToolBarActionProvider#19
+#: ../src/uisupport/toolbaractionprovider.cpp:43
+msgctxt "ToolBarActionProvider|"
 msgid "Devoice"
 msgstr "Ont-voice"
 
-#: ToolBarActionProvider#20
+#: ../src/uisupport/toolbaractionprovider.cpp:43
+msgctxt "ToolBarActionProvider|"
 msgid "Take voice from user"
 msgstr "Voice van gebruiker afnemen"
 
-#: ToolBarActionProvider#21
+#: ../src/uisupport/toolbaractionprovider.cpp:44
+msgctxt "ToolBarActionProvider|"
 msgid "Kick"
 msgstr "Kick"
 
-#: ToolBarActionProvider#22
+#: ../src/uisupport/toolbaractionprovider.cpp:44
+msgctxt "ToolBarActionProvider|"
 msgid "Remove user from channel"
-msgstr "Verwijder gebruiker van kanaal"
+msgstr "Gebruiker uit kanaal verwijderen"
 
-#: ToolBarActionProvider#23
+#: ../src/uisupport/toolbaractionprovider.cpp:45
+msgctxt "ToolBarActionProvider|"
 msgid "Ban"
 msgstr "Ban"
 
-#: ToolBarActionProvider#24
+#: ../src/uisupport/toolbaractionprovider.cpp:45
+msgctxt "ToolBarActionProvider|"
 msgid "Ban user from channel"
-msgstr "Verban gebruiker van kanaal"
+msgstr "Gebruiker uit kanaal verbannen"
 
-#: ToolBarActionProvider#25
+#: ../src/uisupport/toolbaractionprovider.cpp:46
+msgctxt "ToolBarActionProvider|"
 msgid "Kick/Ban"
 msgstr "Kick/Ban"
 
-#: ToolBarActionProvider#26
+#: ../src/uisupport/toolbaractionprovider.cpp:46
+msgctxt "ToolBarActionProvider|"
 msgid "Remove and ban user from channel"
-msgstr "Verwijder en verban gebruiker van kanaal"
+msgstr "Gebruiker uit het kanaal verwijderen en verbannen"
 
-#: ToolBarActionProvider#27
+#: ../src/uisupport/toolbaractionprovider.cpp:51
+msgctxt "ToolBarActionProvider|"
 msgid "Connect to all"
 msgstr "Met alle verbinden"
 
-#: ToolBarActionProvider#28
+#: ../src/uisupport/toolbaractionprovider.cpp:58
+msgctxt "ToolBarActionProvider|"
 msgid "Disconnect from all"
 msgstr "Verbinding met alle verbreken"
 
-#: TopicWidget#1
-msgctxt "TopicWidget#1"
-msgid "Users: %1"
-msgstr "Gebruikers: %1"
-
-#: TopicWidget#2
-msgctxt "TopicWidget#2"
-msgid "Lag: %1 msecs"
-msgstr "Vertraging: %1 msec"
-
-#: TopicWidget#3
-msgctxt "TopicWidget#3"
+#: ../src/qtui/ui/topicwidget.ui:32
+msgctxt "TopicWidget|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: TopicWidget#4
-msgctxt "TopicWidget#4"
+#: ../src/qtui/ui/topicwidget.ui:79
+msgctxt "TopicWidget|"
 msgid "..."
-msgstr "..."
+msgstr "…"
 
-#: TopicWidgetSettingsPage#1
-msgctxt "TopicWidgetSettingsPage#1"
-msgid "Interface"
-msgstr "Interface"
+#: ../src/qtui/topicwidget.cpp:118
+#, qt-format
+msgctxt "TopicWidget|"
+msgid "Users: %1"
+msgstr "Gebruikers: %1"
 
-#: TopicWidgetSettingsPage#2
-msgid "Topic Widget"
-msgstr "Onderwerpwidget"
+#: ../src/qtui/topicwidget.cpp:119
+#, qt-format
+msgctxt "TopicWidget|"
+msgid "Lag: %1 msecs"
+msgstr "Vertraging: %1 msec"
 
-#: TopicWidgetSettingsPage#3
-msgctxt "TopicWidgetSettingsPage#3"
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:14
+msgctxt "TopicWidgetSettingsPage|"
 msgid "Form"
-msgstr "Form"
+msgstr "Formulier"
 
-#: TopicWidgetSettingsPage#4
-msgctxt "TopicWidgetSettingsPage#4"
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:22
+msgctxt "TopicWidgetSettingsPage|"
 msgid "Custom font:"
 msgstr "Eigen lettertype:"
 
-#: TopicWidgetSettingsPage#5
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:50
+msgctxt "TopicWidgetSettingsPage|"
 msgid "Resize dynamically to fit contents"
 msgstr "Dynamisch herschalen om inhoud te bevatten"
 
-#: TopicWidgetSettingsPage#6
+#: ../src/qtui/settingspages/topicwidgetsettingspage.ui:84
+msgctxt "TopicWidgetSettingsPage|"
 msgid "On hover only"
 msgstr "Alleen bij over-zweven"
 
-#: UiStyle::StyledMessage#1
-msgctxt "UiStyle::StyledMessage#1"
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24
+msgctxt "TopicWidgetSettingsPage|"
+msgid "Interface"
+msgstr "Interface"
+
+#: ../src/qtui/settingspages/topicwidgetsettingspage.cpp:24
+msgctxt "TopicWidgetSettingsPage|"
+msgid "Topic Widget"
+msgstr "Onderwerpwidget"
+
+#. Plain Message
+#. ----------
+#. Notice Message
+#. ----------
+#. Server Message
+#. ----------
+#. Info Message
+#. ----------
+#. Error Message
+#. ----------
+#. Topic Message
+#. ----------
+#. Invite Message
+#: ../src/uisupport/uistyle.cpp:638 ../src/uisupport/uistyle.cpp:641
+#: ../src/uisupport/uistyle.cpp:682 ../src/uisupport/uistyle.cpp:685
+#: ../src/uisupport/uistyle.cpp:688 ../src/uisupport/uistyle.cpp:695
+#: ../src/uisupport/uistyle.cpp:729
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%1"
 msgstr "%1"
 
-#: UiStyle::StyledMessage#2
+#. Action Message
+#: ../src/uisupport/uistyle.cpp:644
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %2"
 msgstr "%DN%1%DN %2"
 
-#: UiStyle::StyledMessage#3
+#. Nick Message
+#: ../src/uisupport/uistyle.cpp:648
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "You are now known as %DN%1%DN"
 msgstr "U staat nu bekend als %DN%1%DN"
 
-#: UiStyle::StyledMessage#4
+#: ../src/uisupport/uistyle.cpp:649
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN is now known as %DN%2%DN"
 msgstr "%DN%1%DN staat nu bekend als %DN%2%DN"
 
-#: UiStyle::StyledMessage#5
+#. Mode Message
+#: ../src/uisupport/uistyle.cpp:653
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "User mode: %DM%1%DM"
 msgstr "Gebruikersmodus: %DM%1%DM"
 
-#: UiStyle::StyledMessage#6
+#: ../src/uisupport/uistyle.cpp:654
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "Mode %DM%1%DM by %DN%2%DN"
 msgstr "Modus %DM%1%DM door %DN%2%DN"
 
-#: UiStyle::StyledMessage#7
+#. Join Message
+#: ../src/uisupport/uistyle.cpp:658
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH is %DC%4%DC binnengekomen"
 
-#: UiStyle::StyledMessage#8
+#. Part Message
+#: ../src/uisupport/uistyle.cpp:661
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC"
 msgstr "%DN%1%DN %DH(%2@%3)%DH heeft %DC%4%DC verlaten"
 
-#: UiStyle::StyledMessage#9
+#. Quit Message
+#: ../src/uisupport/uistyle.cpp:666
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN %DH(%2@%3)%DH has quit"
 msgstr "%DN%1%DN %DH(%2@%3)%DH heeft afgesloten"
 
-#: UiStyle::StyledMessage#10
+#. Kick Message
+#: ../src/uisupport/uistyle.cpp:674
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN has kicked %DN%2%DN from %DC%3%DC"
 msgstr "%DN%1%DN heeft %DN%2%DN %DC%3%DC uitgeschopt"
 
-#: UiStyle::StyledMessage#11
+#. Day Change Message
+#: ../src/uisupport/uistyle.cpp:691
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "{Day changed to %1}"
 msgstr "{Dag veranderd naar %1}"
 
-#: UiStyle::StyledMessage#12
+#: ../src/uisupport/uistyle.cpp:704
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH ended. Users joined: "
 msgstr ""
 "De netsplit tussen %DH%1%DH en %DH%2%DH is voorbij. Gebruikers "
 "binnengekomen: "
 
-#: UiStyle::StyledMessage#13
+#: ../src/uisupport/uistyle.cpp:708 ../src/uisupport/uistyle.cpp:724
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "%DN%1%DN (%2 more)"
 msgstr "%DN%1%DN (%2 meer)"
 
-#: UiStyle::StyledMessage#14
+#: ../src/uisupport/uistyle.cpp:719
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "Netsplit between %DH%1%DH and %DH%2%DH. Users quit: "
 msgstr "Netsplit tussen %DH%1%DH en %DH%2%DH. Gebruikers verlaten: "
 
-#: UiStyle::StyledMessage#15
+#: ../src/uisupport/uistyle.cpp:731 ../src/uisupport/uistyle.cpp:779
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "[%1]"
 msgstr "[%1]"
 
-#: UiStyle::StyledMessage#16
+#: ../src/uisupport/uistyle.cpp:777
+#, qt-format
+msgctxt "UiStyle::StyledMessage|"
 msgid "<%1>"
 msgstr "<%1>"
 
-#: UiStyle::StyledMessage#17
-msgid "-*-"
-msgstr "-*-"
-
-#: UiStyle::StyledMessage#18
-msgid "<->"
-msgstr "<->"
-
-#: UiStyle::StyledMessage#19
-msgid "***"
-msgstr "***"
-
-#: UiStyle::StyledMessage#20
-msgid "-->"
-msgstr "-->"
-
-#: UiStyle::StyledMessage#21
-msgid "<--"
-msgstr "<--"
-
-#: UiStyle::StyledMessage#22
-msgid "<-*"
-msgstr "<-*"
-
-#: UiStyle::StyledMessage#23
-msgid "<-x"
-msgstr "<-x"
-
-#: UiStyle::StyledMessage#24
-msgid "*"
-msgstr "*"
-
-#: UiStyle::StyledMessage#25
-msgid "-"
-msgstr "-"
-
-#: UiStyle::StyledMessage#26
-msgid "=>"
-msgstr "=>"
-
-#: UiStyle::StyledMessage#27
-msgid "<="
-msgstr "<="
-
-#: UserCategoryItem#1
+#: ../src/client/networkmodel.cpp:783
+#, qt-format
+msgctxt "UserCategoryItem|"
 msgid "%n Owner(s)"
-msgstr "%n Eigenaar(s)"
+msgid_plural "%n Owner(s)"
+msgstr[0] "%n Eigenaar"
+msgstr[1] "%n Eigenaars"
 
-#: UserCategoryItem#2
+#: ../src/client/networkmodel.cpp:785
+#, qt-format
+msgctxt "UserCategoryItem|"
 msgid "%n Admin(s)"
-msgstr "%n Administrator(s)"
+msgid_plural "%n Admin(s)"
+msgstr[0] "%n Administrator"
+msgstr[1] "%n Administrators"
 
-#: UserCategoryItem#3
+#: ../src/client/networkmodel.cpp:787
+#, qt-format
+msgctxt "UserCategoryItem|"
 msgid "%n Operator(s)"
-msgstr "%n Operator(s)"
+msgid_plural "%n Operator(s)"
+msgstr[0] "%n Operator"
+msgstr[1] "%n Operators"
 
-#: UserCategoryItem#4
+#: ../src/client/networkmodel.cpp:789
+#, qt-format
+msgctxt "UserCategoryItem|"
 msgid "%n Half-Op(s)"
-msgstr "%n Half-Op(s)"
+msgid_plural "%n Half-Op(s)"
+msgstr[0] "%n Half-Op"
+msgstr[1] "%n Half-Ops"
 
-#: UserCategoryItem#5
+#: ../src/client/networkmodel.cpp:791
+#, qt-format
+msgctxt "UserCategoryItem|"
 msgid "%n Voiced"
-msgstr "%n met voice"
+msgid_plural "%n Voiced"
+msgstr[0] "%n met voice"
+msgstr[1] "%n met voice"
 
-#: UserCategoryItem#6
+#: ../src/client/networkmodel.cpp:793
+#, qt-format
+msgctxt "UserCategoryItem|"
 msgid "%n User(s)"
-msgstr "%n Gebruiker(s)"
+msgid_plural "%n User(s)"
+msgstr[0] "%n Gebruiker"
+msgstr[1] "%n Gebruikers"