Introduce french translation
authorRegis PERRIN <crperrin@gmail.com>
Fri, 4 Jul 2008 13:04:47 +0000 (15:04 +0200)
committerManuel Nickschas <sputnick@quassel-irc.org>
Fri, 4 Jul 2008 13:20:51 +0000 (15:20 +0200)
    Update Translation files
    Add French Strings
    Add into i18n.qrc french support

i18n/i18n.qrc
i18n/quassel.ts
i18n/quassel_da.ts
i18n/quassel_de.ts
i18n/quassel_fr.ts [new file with mode: 0644]

index f220035..6115ce6 100644 (file)
@@ -1,6 +1,7 @@
 <!DOCTYPE RCC><RCC version="1.0">
 <qresource prefix="/i18n">
    <file>quassel.qm</file>
+                       <file>quassel_fr.qm</file>
    <file>quassel_da.qm</file>
 <!--   <file>quassel_de.qm</file> -->
 </qresource>
index 0a11417..0875e1c 100644 (file)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="en_US">
-<defaultcodec></defaultcodec>
 <context>
     <name>AboutDlg</name>
     <message>
@@ -27,37 +26,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="46"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="47"/>
         <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; on &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC is dual-licensed under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; and &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Most icons are &amp;copy; by the &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; and used under the &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Please use &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; to report bugs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="54"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
         <source>Quassel IRC is mainly developed by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="68"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="69"/>
         <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="89"/>
-        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the shiny icons you see throughout Quassel&lt;/dd&gt;&lt;br&gt;&lt;dt&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
         <source>About Quassel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="22"/>
-        <source>background:white;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="57"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;
@@ -65,7 +54,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="73"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="77"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
@@ -73,54 +62,34 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="107"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="119"/>
         <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="173"/>
-        <source>QTextBrowser { background:transparent;}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="127"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="147"/>
         <source>A&amp;uthors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="147"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
         <source>&amp;Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="167"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="203"/>
         <source>&amp;Thanks To</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AdminUserPage</name>
-    <message>
-        <location filename="../src/qtui/configwizard.cpp" line="65"/>
-        <source>Setup Admin User</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/configwizard.cpp" line="66"/>
-        <source>Please enter credentials for the admin user.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/configwizard.cpp" line="68"/>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="72"/>
-        <source>Password:</source>
+        <location filename="../src/qtui/aboutdlg.cpp" line="95"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for great artwork and the Quassel logo/icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the other shiny icons you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AdminUserPage</name>
+</context>
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
@@ -147,143 +116,166 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="153"/>
+        <location filename="../src/client/networkmodel.cpp" line="157"/>
         <source>Status Buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="291"/>
+        <location filename="../src/client/networkmodel.cpp" line="295"/>
         <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="295"/>
+        <location filename="../src/client/networkmodel.cpp" line="299"/>
         <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="298"/>
+        <location filename="../src/client/networkmodel.cpp" line="302"/>
         <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="308"/>
+        <location filename="../src/client/networkmodel.cpp" line="312"/>
         <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="312"/>
+        <location filename="../src/client/networkmodel.cpp" line="321"/>
         <source>Not active &lt;br /&gt; Double-click to join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="316"/>
+        <location filename="../src/client/networkmodel.cpp" line="325"/>
         <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="317"/>
+        <location filename="../src/client/networkmodel.cpp" line="326"/>
         <source>Away Message: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="320"/>
+        <location filename="../src/client/networkmodel.cpp" line="329"/>
         <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="324"/>
+        <location filename="../src/client/networkmodel.cpp" line="333"/>
         <source>&lt;p&gt; %1 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="318"/>
+        <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BufferView</name>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="167"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="52"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="168"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="53"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="246"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
         <source>Join Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="171"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="56"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="172"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="57"/>
         <source>Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="173"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="60"/>
         <source>Delete buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="175"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="393"/>
         <source>Hide Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="176"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="63"/>
         <source>Join Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="177"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="64"/>
         <source>Part Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="178"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="65"/>
         <source>Kill Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="179"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="66"/>
         <source>Quit Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="180"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="67"/>
         <source>Mode Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="192"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="61"/>
         <source>Ignore list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="194"/>
-        <source>WHO</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="247"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
         <source>Input channel name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="265"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="516"/>
         <source>Remove buffer permanently?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="267"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="518"/>
         <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="51"/>
+        <source>Show Channel List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="58"/>
+        <source>Hide buffers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="59"/>
+        <source>Hide buffers permanently</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BufferViewDock</name>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="586"/>
+        <source>All Buffers</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BufferViewEditDlg</name>
@@ -298,7 +290,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="203"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="461"/>
         <source>Add Buffer View</source>
         <translation type="unfinished"></translation>
     </message>
@@ -306,12 +298,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BufferViewSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="28"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="28"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
         <source>Buffer Views</source>
         <translation type="unfinished"></translation>
     </message>
@@ -341,38 +333,88 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="88"/>
-        <source>Show only Buffers from:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="100"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="106"/>
         <source>Restrict Buffers to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="106"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="112"/>
         <source>Status Buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="113"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="119"/>
         <source>Channel Buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="120"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="126"/>
         <source>Query Buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="130"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="143"/>
         <source>Add new Buffers automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="137"/>
-        <source>Sort Buffers alphabetically</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="294"/>
+        <source>Delete Buffer View?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="295"/>
+        <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="88"/>
+        <source>Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="96"/>
+        <source>All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="136"/>
+        <source>Hide inactive Buffers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="150"/>
+        <source>Sort alphabetically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="157"/>
+        <source>Minimum Activity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="165"/>
+        <source>No Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="170"/>
+        <source>Other Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="175"/>
+        <source>New Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="180"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="206"/>
+        <source>Preview:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -417,19 +459,43 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BufferWidget</name>
     <message>
-        <location filename="../src/qtui/ui/bufferwidget.ui" line="106"/>
-        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+        <location filename="../src/qtui/ui/bufferwidget.ui" line="75"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/quassel/96x96/apps/quassel.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ChannelListDlg</name>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="13"/>
+        <source>Channel List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="37"/>
+        <source>Search Pattern:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="47"/>
+        <source>Search Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="71"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>Client</name>
     <message>
-        <location filename="../src/client/client.cpp" line="275"/>
+        <location filename="../src/client/client.cpp" line="287"/>
         <source>Identity already exists in client!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -457,18 +523,18 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="185"/>
-        <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least a Core Version %1 (Build &gt;= %2) to connect.</source>
+        <location filename="../src/client/clientsyncer.cpp" line="208"/>
+        <source>&lt;b&gt;The Quassel Core you are trying to connect to does not support SSL!&lt;/b&gt;&lt;br /&gt;If you want to connect anyways, disable the usage of SSL in the account settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="201"/>
-        <source>&lt;b&gt;The Quassel Core you are trying to connect to does not support SSL!&lt;/b&gt;&lt;br /&gt;If you want to connect anyways, disable the usage of SSL in the account settings.</source>
+        <location filename="../src/client/clientsyncer.cpp" line="238"/>
+        <source>Logging in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="225"/>
-        <source>Logging in...</source>
+        <location filename="../src/client/clientsyncer.cpp" line="192"/>
+        <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least core/client protocol v%1 to connect.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -787,24 +853,9 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>ConclusionPage</name>
-    <message>
-        <location filename="../src/qtui/configwizard.cpp" line="170"/>
-        <source>Conclusion</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/configwizard.cpp" line="171"/>
-        <source>You chose the following configuration:</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ConfigWizard</name>
-    <message>
-        <location filename="../src/qtui/configwizard.cpp" line="44"/>
-        <source>Core Configuration Wizard</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Core</name>
@@ -814,85 +865,87 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="114"/>
+        <location filename="../src/core/core.cpp" line="117"/>
         <source>Calling restoreState() even though active sessions exist!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="120"/>
-        <source>Core state too old, ignoring...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/core/core.cpp" line="140"/>
+        <location filename="../src/core/core.cpp" line="145"/>
         <source>Admin user or password not set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="143"/>
+        <location filename="../src/core/core.cpp" line="148"/>
         <source>Could not setup storage!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="147"/>
+        <location filename="../src/core/core.cpp" line="152"/>
         <source>Creating admin user...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="368"/>
+        <location filename="../src/core/core.cpp" line="388"/>
         <source>Antique client trying to connect... refusing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="384"/>
-        <source>&lt;b&gt;Quassel Core Version %1 (Build &amp;ge; %2)&lt;/b&gt;&lt;br&gt;Up %3d%4h%5m (since %6)</source>
+        <location filename="../src/core/core.cpp" line="404"/>
+        <source>Client %1 too old, rejecting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="405"/>
-        <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client version %1 (Build &gt;= %2).&lt;br&gt;Please consider upgrading your client.</source>
+        <location filename="../src/core/core.cpp" line="482"/>
+        <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="407"/>
-        <source>Client %1 too old, rejecting.</source>
+        <location filename="../src/core/core.cpp" line="484"/>
+        <source>Client %1 did not send an init message before trying to login, rejecting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="443"/>
-        <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
+        <location filename="../src/core/core.cpp" line="504"/>
+        <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="445"/>
-        <source>Client %1 did not send an init message before trying to login, rejecting.</source>
+        <location filename="../src/core/core.cpp" line="522"/>
+        <source>Non-authed client disconnected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="465"/>
-        <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
+        <location filename="../src/core/core.cpp" line="545"/>
+        <source>Could not initialize session for client %1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="471"/>
-        <source>Client %1 initialized and authentificated successfully as &quot;%2&quot; (UserId: %3).</source>
+        <location filename="../src/core/core.cpp" line="60"/>
+        <source>Currently, Quassel only supports SQLite3. You need to build your
+Qt library with the sqlite plugin enabled in order for quasselcore
+to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="483"/>
-        <source>Non-authed client disconnected.</source>
+        <location filename="../src/core/core.cpp" line="402"/>
+        <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client/core protocol version %1.&lt;br&gt;Please consider upgrading your client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="506"/>
-        <source>Could not initialize session for client %1!</source>
+        <location filename="../src/core/core.cpp" line="419"/>
+        <source>&lt;b&gt;Quassel Core Version %1&lt;/b&gt;&lt;br&gt;Built: %2&lt;br&gt;Up %3d%4h%5m (since %6)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="510"/>
+        <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CoreAccountEditDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="486"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="492"/>
         <source>Add Core Account</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1069,7 +1122,12 @@ p, li { white-space: pre-wrap; }
     </message>
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="68"/>
-        <source>&lt;em&gt;Note: Adding more users and changing your username/password has not been implemented yet.</source>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;Note: &lt;/span&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Adding more users and changing your username/password is not possible via Quassel&apos;s interface yet.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:10pt;&quot;&gt;If you need to do these things have a look at the manageusers.py script which is located in the /scripts directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1090,12 +1148,12 @@ p, li { white-space: pre-wrap; }
     <name>CoreConfigWizardPages::AdminUserPage</name>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="138"/>
-        <source>Create User Account</source>
+        <source>Create Admin User</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="139"/>
-        <source>First, we will create a user account on the core. This first user will have administrator privileges.</source>
+        <source>First, we will create a user on the core. This first user will have administrator privileges.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1202,7 +1260,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="73"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="87"/>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1212,12 +1270,12 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="168"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="174"/>
         <source>Remove Account Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="170"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="176"/>
         <source>Do you really want to remove your local settings for this Quassel Core account?&lt;br&gt;Note: This will &lt;em&gt;not&lt;/em&gt; remove or change any data on the Core itself!</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1242,82 +1300,82 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="215"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="221"/>
         <source>Connect to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="232"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="238"/>
         <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="256"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="262"/>
         <source>Not connected to %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="257"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="263"/>
         <source>Looking up %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="258"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="264"/>
         <source>Connecting to %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="259"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="265"/>
         <source>Connected to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="260"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="266"/>
         <source>Unknown connection state to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="312"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="318"/>
         <source>Logging in...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="270"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="292"/>
         <source>Login</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="38"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="50"/>
         <source>Connect to Quassel Core</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="65"/>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="63"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="76"/>
         <source>Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="103"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="118"/>
         <source>Always use this account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="132"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="155"/>
         <source>Initializing your connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="165"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="179"/>
         <source>Connected to apollo.mindpool.net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="197"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="211"/>
         <source>Core Info
 reserve
 some
@@ -1325,67 +1383,67 @@ space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="290"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="303"/>
         <source>User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="304"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="317"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="318"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="331"/>
         <source>Remember</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="340"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="361"/>
         <source>Configure your Quassel Core</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="346"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="367"/>
         <source>The Quassel Core you are connected to is not configured yet. You may now launch a configuration wizard that helps you setting up your Core.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="374"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="395"/>
         <source>Launch Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="431"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="469"/>
         <source>Initializing your session...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="439"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="477"/>
         <source>&lt;b&gt;Please be patient while your client synchronizes with the Quassel Core!&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="454"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="492"/>
         <source>Session state:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="471"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="509"/>
         <source>Network states:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="527"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="565"/>
         <source>0/0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="491"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="529"/>
         <source>Channel states:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="511"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="549"/>
         <source>User states:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1431,15 +1489,25 @@ space</source>
 <context>
     <name>CoreSession</name>
     <message>
-        <location filename="../src/core/coresession.cpp" line="147"/>
+        <location filename="../src/core/coresession.cpp" line="153"/>
         <source>Default Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/coresession.cpp" line="232"/>
+        <location filename="../src/core/coresession.cpp" line="241"/>
         <source>Client %1 disconnected (UserId: %2).</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="410"/>
+        <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="425"/>
+        <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateIdentityDlg</name>
@@ -1467,27 +1535,27 @@ space</source>
 <context>
     <name>CtcpHandler</name>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="168"/>
+        <location filename="../src/core/ctcphandler.cpp" line="166"/>
         <source>Received CTCP PING request from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="173"/>
+        <location filename="../src/core/ctcphandler.cpp" line="171"/>
         <source>Received CTCP PING answer from %1 with %2 seconds round trip time</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="182"/>
+        <location filename="../src/core/ctcphandler.cpp" line="180"/>
         <source>Received CTCP VERSION request by %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="185"/>
+        <location filename="../src/core/ctcphandler.cpp" line="183"/>
         <source>Received CTCP VERSION answer from %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="193"/>
+        <location filename="../src/core/ctcphandler.cpp" line="191"/>
         <source>Received unknown CTCP %1 by %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1718,6 +1786,21 @@ space</source>
         <source>Mouse wheel changes displayed buffers</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="161"/>
+        <source>The suffix appended to a nick on completion via TAB. Default is &quot;: &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="164"/>
+        <source>Input Line:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="172"/>
+        <source>Completion suffix:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>HighlightSettingsPage</name>
@@ -1800,7 +1883,7 @@ space</source>
 <context>
     <name>IdentitiesSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="99"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="110"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1855,7 +1938,7 @@ space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="203"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
         <source>Rename Identity</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1865,142 +1948,142 @@ space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="262"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="268"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="52"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="53"/>
         <source>Add Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="55"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="56"/>
         <source>Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="74"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="76"/>
         <source>Remove Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="107"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="118"/>
         <source>Real Name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="114"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="125"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="123"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="134"/>
         <source>Nicknames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="159"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="170"/>
         <source>Add Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="162"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="173"/>
         <source>&amp;Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="184"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="196"/>
         <source>Remove Nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="187"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="199"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="206"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="219"/>
         <source>Re&amp;name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="246"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="251"/>
         <source>Move upwards in list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="259"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="265"/>
         <source>Move downwards in list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="306"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="321"/>
         <source>A&amp;way</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="479"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="452"/>
         <source>Away Reason</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="472"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="445"/>
         <source>Return Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="367"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="370"/>
         <source>Away Nick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="376"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="379"/>
         <source>Auto Away</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="420"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
         <source>Auto away after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="430"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="415"/>
         <source>minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="511"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="492"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="519"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="500"/>
         <source>Ident:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="526"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="507"/>
         <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="535"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="516"/>
         <source>Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="561"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="530"/>
         <source>Part Reason:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="574"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="543"/>
         <source>Quit Reason:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="584"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="553"/>
         <source>Kick Reason:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2058,164 +2141,182 @@ space</source>
 </context>
 <context>
     <name>IntroPage</name>
+</context>
+<context>
+    <name>IrcListModel</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="49"/>
-        <source>Introduction</source>
+        <location filename="../src/client/irclistmodel.cpp" line="60"/>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/irclistmodel.cpp" line="61"/>
+        <source>Users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="51"/>
-        <source>This wizard will guide you through the setup process for your shiny new Quassel IRC Client.</source>
+        <location filename="../src/client/irclistmodel.cpp" line="61"/>
+        <source>Topic</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IrcServerHandler</name>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="194"/>
-        <source>Received invalid MODE from %s: %s</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="369"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="411"/>
         <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="438"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="515"/>
         <source>[Whois] %1 is away: &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="449"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="526"/>
         <source>%1 is away: &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="465"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="597"/>
         <source>[Whois] %1 is %2 (%3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="477"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="612"/>
         <source>%1 is online via %2 (%3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="575"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="723"/>
         <source>[Whois] %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="664"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="864"/>
         <source>[Whowas] %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="501"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="642"/>
         <source>[Whowas] %1 was %2 (%3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="513"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="656"/>
         <source>[Who] End of /WHO list for %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="531"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="676"/>
         <source>[Whois] %1 is logged in since %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="533"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="678"/>
         <source>[Whois] %1 is idling for %2 (%3)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="536"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="681"/>
         <source>[Whois] idle message: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="565"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="713"/>
         <source>[Whois] %1 is a user on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="567"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
         <source>[Whois] %1 has voice on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="569"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="717"/>
         <source>[Whois] %1 is an operator on channels: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="583"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="777"/>
         <source>No topic is set for %1.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="592"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="789"/>
         <source>Topic for %1 is &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="600"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="800"/>
         <source>Topic set by %1 on %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="620"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="823"/>
         <source>[Who] %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="677"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="877"/>
         <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="678"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="878"/>
         <source>Due to a bug in Unreal IRCd (and maybe other irc-servers too) we&apos;re unable to determine the erroneous nick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="679"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="879"/>
         <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="682"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="882"/>
         <source>Nick %1 contains illegal characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="692"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="894"/>
         <source>Nick already in use: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="917"/>
         <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="480"/>
+        <source>%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="745"/>
+        <source>Channel %1 has %2 users. Topic is: %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="754"/>
+        <source>End of channel list</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IrcUserItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="600"/>
+        <location filename="../src/client/networkmodel.cpp" line="606"/>
         <source>idling since %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="603"/>
+        <location filename="../src/client/networkmodel.cpp" line="609"/>
         <source>login time: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="606"/>
+        <location filename="../src/client/networkmodel.cpp" line="612"/>
         <source>server: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2246,12 +2347,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWin</name>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="81"/>
+        <location filename="../src/qtui/mainwin.cpp" line="88"/>
         <source>Waiting for core...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="372"/>
+        <location filename="../src/qtui/mainwin.cpp" line="485"/>
         <source>Not connected to core.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2261,52 +2362,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="177"/>
-        <source>All Buffers</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/mainwin.cpp" line="178"/>
-        <source>All Channels</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/mainwin.cpp" line="179"/>
-        <source>All Queries</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/mainwin.cpp" line="180"/>
-        <source>All Networks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/mainwin.cpp" line="181"/>
-        <source>Full Custom</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/mainwin.cpp" line="223"/>
+        <location filename="../src/qtui/mainwin.cpp" line="264"/>
         <source>Nicks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="240"/>
+        <location filename="../src/qtui/mainwin.cpp" line="283"/>
         <source>Chat Monitor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="261"/>
+        <location filename="../src/qtui/mainwin.cpp" line="305"/>
         <source>Inputline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="278"/>
+        <location filename="../src/qtui/mainwin.cpp" line="322"/>
         <source>Topic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="350"/>
+        <location filename="../src/qtui/mainwin.cpp" line="426"/>
         <source>Connected to core.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2316,275 +2392,275 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="53"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="50"/>
         <source>&amp;File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="57"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="54"/>
         <source>&amp;Networks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="74"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="69"/>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="80"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="75"/>
         <source>&amp;Views</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="87"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="82"/>
         <source>&amp;Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="94"/>
-        <source>&amp;Debug</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="119"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="107"/>
         <source>&amp;Network List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="122"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="110"/>
         <source>F2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="130"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="118"/>
         <source>Quick &amp;Connect...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="232"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="229"/>
         <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="146"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="134"/>
         <source>Reconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="154"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="142"/>
         <source>Join Channel...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="162"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="153"/>
         <source>Set Away globally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="171"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="165"/>
         <source>Quit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="179"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="173"/>
         <source>Edit Identities...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="189"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
         <source>Configure Quassel...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="192"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="185"/>
         <source>F7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="200"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="197"/>
         <source>Manage Views...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="205"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="202"/>
         <source>About Qt...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="217"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="214"/>
         <source>About Quassel IRC...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="222"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="219"/>
         <source>Import Backlog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="227"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="224"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="237"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="234"/>
         <source>Internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="250"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="246"/>
         <source>Disconnect from Core</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="263"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="258"/>
         <source>Connect to Core...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="268"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="263"/>
         <source>Debug &amp;Console</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="273"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="268"/>
         <source>Disconnect from Network...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="281"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="276"/>
         <source>&amp;Edit Networks...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="343"/>
+        <source>Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Message</name>
     <message>
-        <location filename="../src/common/message.cpp" line="104"/>
+        <location filename="../src/common/message.cpp" line="105"/>
         <source>%DT[%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="109"/>
+        <location filename="../src/common/message.cpp" line="110"/>
         <source>%DS&lt;%1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="109"/>
+        <location filename="../src/common/message.cpp" line="110"/>
         <source>%D0%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="111"/>
+        <location filename="../src/common/message.cpp" line="112"/>
         <source>%Dn[%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="111"/>
+        <location filename="../src/common/message.cpp" line="112"/>
         <source>%Dn%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="113"/>
+        <location filename="../src/common/message.cpp" line="114"/>
         <source>%Ds*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="113"/>
+        <location filename="../src/common/message.cpp" line="114"/>
         <source>%Ds%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="115"/>
+        <location filename="../src/common/message.cpp" line="116"/>
         <source>%De*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="150"/>
+        <location filename="../src/common/message.cpp" line="151"/>
         <source>%De%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="117"/>
+        <location filename="../src/common/message.cpp" line="118"/>
         <source>%Dj--&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="117"/>
+        <location filename="../src/common/message.cpp" line="118"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="119"/>
+        <location filename="../src/common/message.cpp" line="120"/>
         <source>%Dp&lt;--</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="119"/>
+        <location filename="../src/common/message.cpp" line="120"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="123"/>
+        <location filename="../src/common/message.cpp" line="124"/>
         <source>%Dq&lt;--</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="123"/>
+        <location filename="../src/common/message.cpp" line="124"/>
         <source>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="127"/>
+        <location filename="../src/common/message.cpp" line="128"/>
         <source>%Dk&lt;-*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="131"/>
+        <location filename="../src/common/message.cpp" line="132"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="136"/>
+        <location filename="../src/common/message.cpp" line="137"/>
         <source>%Dr&lt;-&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="137"/>
+        <location filename="../src/common/message.cpp" line="138"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="138"/>
+        <location filename="../src/common/message.cpp" line="139"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="141"/>
+        <location filename="../src/common/message.cpp" line="142"/>
         <source>%Dm***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="142"/>
+        <location filename="../src/common/message.cpp" line="143"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="143"/>
+        <location filename="../src/common/message.cpp" line="144"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="146"/>
+        <location filename="../src/common/message.cpp" line="147"/>
         <source>%Da-*-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="147"/>
+        <location filename="../src/common/message.cpp" line="148"/>
         <source>%Da%DN%1%DN %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="151"/>
+        <location filename="../src/common/message.cpp" line="152"/>
         <source>%De[%1]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2592,27 +2668,27 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NetworkConnection</name>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="179"/>
+        <location filename="../src/core/networkconnection.cpp" line="190"/>
         <source>Connection failed. Cycling to next Server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="189"/>
+        <location filename="../src/core/networkconnection.cpp" line="200"/>
         <source>Connecting to %1:%2...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="242"/>
+        <location filename="../src/core/networkconnection.cpp" line="253"/>
         <source>Disconnecting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="262"/>
+        <location filename="../src/core/networkconnection.cpp" line="276"/>
         <source>Could not connect to %1 (%2)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="264"/>
+        <location filename="../src/core/networkconnection.cpp" line="278"/>
         <source>Connection failure: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2630,7 +2706,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="635"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="636"/>
         <source>Add Network</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2638,17 +2714,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NetworkModel</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="631"/>
+        <location filename="../src/client/networkmodel.cpp" line="637"/>
         <source>Buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="631"/>
+        <location filename="../src/client/networkmodel.cpp" line="637"/>
         <source>Topic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="631"/>
+        <location filename="../src/client/networkmodel.cpp" line="637"/>
         <source>Nick Count</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2701,181 +2777,224 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="532"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="533"/>
         <source>Delete Network?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="533"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="534"/>
         <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="5"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="13"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="29"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="37"/>
         <source>Re&amp;name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="200"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="225"/>
         <source>&amp;Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="216"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="242"/>
         <source>De&amp;lete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="99"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="110"/>
         <source>Connect now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="117"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="130"/>
         <source>Network Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="125"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="138"/>
         <source>Identity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="457"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="540"/>
         <source>This specifies how control messages, nicks and servernames are encoded.
 Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="158"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="178"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="184"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="207"/>
         <source>&amp;Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="241"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="268"/>
         <source>Move upwards in list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="257"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="285"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="254"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="282"/>
         <source>Move downwards in list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="302"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="331"/>
         <source>Choose random server for connecting</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="310"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="347"/>
         <source>Perform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="316"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="356"/>
         <source>Commands to execute on connect:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="336"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="380"/>
         <source>Auto Identify</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="349"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="412"/>
         <source>Service:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="359"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="395"/>
         <source>NickServ</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="369"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="422"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="391"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="441"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="400"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="456"/>
         <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="408"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="468"/>
         <source>Send messages in:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="431"/>
-        <source>Incoming messages encoded in Utf8 will always be treated as such. This setting defines the encoding for messages that are not Utf8.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="434"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="499"/>
         <source>Receive fallback:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="461"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="530"/>
         <source>Server encoding:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="480"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="556"/>
         <source>Use defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="496"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="575"/>
         <source>Automatic Reconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="507"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="586"/>
         <source>Interval:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="514"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="593"/>
         <source> s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="530"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="609"/>
         <source>Retries:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="550"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="629"/>
         <source>Unlimited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="562"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="641"/>
         <source>Rejoin all channels on reconnect</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="181"/>
+        <source>Manage servers for this network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="350"/>
+        <source>Configure automatic identification or misc. commands to be executed after connecting to a server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="366"/>
+        <source>Specify a list of IRC commands to be executed upon connect.
+Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="444"/>
+        <source>Configure advanced settings such as message encodings and automatic reconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="453"/>
+        <source>Control encodings for in- and outgoing messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="484"/>
+        <source>Specify which encoding your messages will be sent in.
+UTF-8 should be a sane choice for most networks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="515"/>
+        <source>Incoming messages encoded in Utf8 will always be treated as such.
+This setting defines the encoding for messages that are not Utf8.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="553"/>
+        <source>Use default settings for encodings (recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="572"/>
+        <source>Control automatic reconnect to the network</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NickEditDlg</name>
@@ -2956,7 +3075,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="128"/>
+        <location filename="../src/uisupport/nickview.cpp" line="127"/>
         <source>Kick %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2966,25 +3085,30 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="131"/>
+        <location filename="../src/uisupport/nickview.cpp" line="130"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="136"/>
+        <location filename="../src/uisupport/nickview.cpp" line="135"/>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="137"/>
+        <location filename="../src/uisupport/nickview.cpp" line="136"/>
         <source>DCC-Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="139"/>
+        <location filename="../src/uisupport/nickview.cpp" line="138"/>
         <source>Send file</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="128"/>
+        <source>Ban %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtopiaMainWin</name>
@@ -3109,32 +3233,32 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>SettingsDlg</name>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="86"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="71"/>
         <source>Save changes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="87"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="72"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="167"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="147"/>
         <source>Reload Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="167"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="147"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="176"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="176"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3144,7 +3268,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/settingsdlg.ui" line="53"/>
+        <location filename="../src/qtui/ui/settingsdlg.ui" line="49"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3152,33 +3276,33 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>SettingsPageDlg</name>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="94"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
         <source>Reload Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="94"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="103"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
         <source>Restore Defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="103"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/settingspagedlg.ui" line="13"/>
-        <source>Dialog</source>
+        <location filename="../src/qtui/ui/settingspagedlg.ui" line="29"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/settingspagedlg.ui" line="25"/>
-        <source>Settings</source>
+        <location filename="../src/qtui/ui/settingspagedlg.ui" line="13"/>
+        <source>Configure Quassel</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3192,87 +3316,166 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 </context>
 <context>
     <name>StorageDetailsPage</name>
+</context>
+<context>
+    <name>StorageSelectionPage</name>
+</context>
+<context>
+    <name>TopicButton</name>
+</context>
+<context>
+    <name>TopicLabel</name>
+    <message>
+        <location filename="../src/qtui/topiclabel.cpp" line="43"/>
+        <source>Drag to scroll the topic!</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TopicWidget</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="118"/>
-        <source>Setup Storage Provider</source>
+        <location filename="../src/qtui/ui/topicwidget.ui" line="31"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>UiStyle</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="119"/>
-        <source>Please enter credentials for the selected storage provider.</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="273"/>
+        <source>%DT[%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="121"/>
-        <source>Host:</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="278"/>
+        <source>%DS&lt;%1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="125"/>
-        <source>Port:</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="278"/>
+        <source>%D0%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="131"/>
-        <source>Database:</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="280"/>
+        <source>%Dn[%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="135"/>
-        <source>User:</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="280"/>
+        <source>%Dn%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="139"/>
-        <source>Password:</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="282"/>
+        <source>%Ds*</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>StorageSelectionPage</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="94"/>
-        <source>Select Storage Provider</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="282"/>
+        <source>%Ds%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="95"/>
-        <source>Please select the storage provider you want to use.</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="284"/>
+        <source>%De*</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TopicButton</name>
     <message>
-        <location filename="../src/qtui/topicbutton.cpp" line="39"/>
-        <source>Click to edit!</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="319"/>
+        <source>%De%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/topicbutton.cpp" line="80"/>
-        <source>%1
-
-Click to edit!</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="286"/>
+        <source>%Dj--&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>TopicWidget</name>
     <message>
-        <location filename="../src/qtui/ui/topicwidget.ui" line="31"/>
-        <source>Form</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="286"/>
+        <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/topicwidget.ui" line="65"/>
-        <source>...</source>
+        <location filename="../src/uisupport/uistyle.cpp" line="288"/>
+        <source>%Dp&lt;--</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="288"/>
+        <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="292"/>
+        <source>%Dq&lt;--</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="292"/>
+        <source>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="296"/>
+        <source>%Dk&lt;-*</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="300"/>
+        <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="305"/>
+        <source>%Dr&lt;-&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="306"/>
+        <source>%DrYou are now known as %DN%1%DN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="307"/>
+        <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="310"/>
+        <source>%Dm***</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="311"/>
+        <source>%DmUser mode: %DM%1%DM</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="312"/>
+        <source>%DmMode %DM%1%DM by %DN%2%DN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="315"/>
+        <source>%Da-*-</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="316"/>
+        <source>%Da%DN%1%DN %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="320"/>
+        <source>%De[%1]</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>UserCategoryItem</name>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="478"/>
+        <location filename="../src/client/networkmodel.cpp" line="489"/>
         <source>%n Owner(s)</source>
         <translation>
             <numerusform>%n Owner</numerusform>
@@ -3280,7 +3483,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="479"/>
+        <location filename="../src/client/networkmodel.cpp" line="490"/>
         <source>%n Admin(s)</source>
         <translation>
             <numerusform>%n Admin</numerusform>
@@ -3288,7 +3491,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="480"/>
+        <location filename="../src/client/networkmodel.cpp" line="491"/>
         <source>%n Operator(s)</source>
         <translation>
             <numerusform>%n Operator</numerusform>
@@ -3296,7 +3499,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="481"/>
+        <location filename="../src/client/networkmodel.cpp" line="492"/>
         <source>%n Half-Op(s)</source>
         <translation>
             <numerusform>%n Half-Op</numerusform>
@@ -3304,7 +3507,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="482"/>
+        <location filename="../src/client/networkmodel.cpp" line="493"/>
         <source>%n Voiced</source>
         <translation>
             <numerusform>%n Voiced</numerusform>
@@ -3312,7 +3515,7 @@ Click to edit!</source>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="../src/client/networkmodel.cpp" line="483"/>
+        <location filename="../src/client/networkmodel.cpp" line="494"/>
         <source>%n User(s)</source>
         <translation>
             <numerusform>%n User</numerusform>
@@ -3323,7 +3526,7 @@ Click to edit!</source>
 <context>
     <name>UserInputHandler</name>
     <message>
-        <location filename="../src/core/userinputhandler.cpp" line="76"/>
+        <location filename="../src/core/userinputhandler.cpp" line="113"/>
         <source>sending CTCP-%1 request</source>
         <translation type="unfinished"></translation>
     </message>
index a0cbecb..921793b 100644 (file)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="da_DK">
-<defaultcodec></defaultcodec>
 <context>
     <name>AboutDlg</name>
     <message>
@@ -32,32 +31,27 @@ p, li { white-space: pre-wrap; }
         <translation>Om Quassel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="46"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="47"/>
         <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; on &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC is dual-licensed under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; and &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Most icons are &amp;copy; by the &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; and used under the &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Please use &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; to report bugs.</source>
         <translation>&lt;b&gt;En moderne, distribueret IRC klient&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 af Quassel projektet&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; på &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC er dobbelt-licenseret under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; og &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;De fleste ikoner &amp;copy; af &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen teamet&lt;/a&gt; og benyttet under &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Brug &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; for at rapportere bugs.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="54"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
         <source>Quassel IRC is mainly developed by:</source>
         <translation>Quassel IRC er hovedsagligt udviklet af:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/aboutdlg.cpp" line="68"/>
+        <location filename="../src/qtui/aboutdlg.cpp" line="69"/>
         <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
         <translation>Vi vil gerne takke de følgende bidragsydere (i alfabetisk rækkefølge) og alle dem vi har glemt at nævne her:</translation>
     </message>
     <message>
         <location filename="../src/qtui/aboutdlg.cpp" line="89"/>
         <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the shiny icons you see throughout Quassel&lt;/dd&gt;&lt;br&gt;&lt;dt&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
-        <translation>En særlig tak går til: &lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen teamet&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for at have skabt de fleste ikoner der er brugt i Quassel&lt;/dd&gt;&lt;br&gt;&lt;dt&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for at have skabt Qt og Qtopia, og for at sponsorere udviklingen af Quasseltopia med bl.a. Greenphones&lt;/dd&gt;</translation>
+        <translation type="obsolete">En særlig tak går til: &lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen teamet&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for at have skabt de fleste ikoner der er brugt i Quassel&lt;/dd&gt;&lt;br&gt;&lt;dt&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/dt&gt;&lt;dd&gt;for at have skabt Qt og Qtopia, og for at sponsorere udviklingen af Quasseltopia med bl.a. Greenphones&lt;/dd&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="22"/>
-        <source>background:white;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="57"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;
@@ -65,7 +59,7 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="73"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="77"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
@@ -73,149 +67,245 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="107"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="119"/>
         <source>&amp;About</source>
         <translation>&amp;Om</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="173"/>
-        <source>QTextBrowser { background:transparent;}</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="127"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="147"/>
         <source>A&amp;uthors</source>
         <translation>&amp;Udviklere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="147"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
         <source>&amp;Contributors</source>
         <translation>&amp;Bidragsydere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="167"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="203"/>
         <source>&amp;Thanks To</source>
         <translation>&amp;Tak til</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="95"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for great artwork and the Quassel logo/icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the other shiny icons you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AdminUserPage</name>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="65"/>
         <source>Setup Admin User</source>
-        <translation>Opsæt administrator-bruger</translation>
+        <translation type="obsolete">Opsæt administrator-bruger</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="66"/>
         <source>Please enter credentials for the admin user.</source>
-        <translation>Indtast login-informationer for administrator brugeren.</translation>
+        <translation type="obsolete">Indtast login-informationer for administrator brugeren.</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="68"/>
         <source>Name:</source>
-        <translation>Navn:</translation>
+        <translation type="obsolete">Navn:</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="72"/>
         <source>Password:</source>
-        <translation>Kodeord:</translation>
+        <translation type="obsolete">Kodeord:</translation>
+    </message>
+</context>
+<context>
+    <name>AppearanceSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
+        <source>Appearance</source>
+        <translation type="unfinished">Udseende</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
+        <source>General</source>
+        <translation type="unfinished">Generelt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation type="unfinished">Formular</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
+        <source>Client style:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BufferItem</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="153"/>
+        <location filename="../src/client/networkmodel.cpp" line="157"/>
         <source>Status Buffer</source>
         <translation>Status buffer</translation>
     </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="295"/>
+        <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="299"/>
+        <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="302"/>
+        <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="312"/>
+        <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="318"/>
+        <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="321"/>
+        <source>Not active &lt;br /&gt; Double-click to join</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="325"/>
+        <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="326"/>
+        <source>Away Message: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="329"/>
+        <source>%1 - %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/networkmodel.cpp" line="333"/>
+        <source>&lt;p&gt; %1 &lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BufferView</name>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="161"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="52"/>
         <source>Connect</source>
         <translation>Forbind</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="162"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="53"/>
         <source>Disconnect</source>
         <translation>Afbryd</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="240"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
         <source>Join Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="165"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="56"/>
         <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="166"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="57"/>
         <source>Part</source>
         <translation>Forlad</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="167"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="60"/>
         <source>Delete buffer</source>
         <translation>Slet buffer</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="169"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="393"/>
         <source>Hide Events</source>
         <translation>Skjul hændelser</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="170"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="63"/>
         <source>Join Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="171"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="64"/>
         <source>Part Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="172"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="65"/>
         <source>Kill Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="173"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="66"/>
         <source>Quit Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="174"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="67"/>
         <source>Mode Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="186"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="61"/>
         <source>Ignore list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/uisupport/bufferview.cpp" line="188"/>
         <source>WHO</source>
-        <translation>WHO</translation>
+        <translation type="obsolete">WHO</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="241"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
         <source>Input channel name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="259"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="516"/>
         <source>Remove buffer permanently?</source>
         <translation>Fjern buffer permanent?</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/bufferview.cpp" line="261"/>
+        <location filename="../src/uisupport/bufferview.cpp" line="518"/>
         <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
         <translation>Vil du slette bufferen &quot;%1&quot; permanent? Det vil slette alt tilhørende data, inklusive log-filer, fra serverens database!</translation>
     </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="51"/>
+        <source>Show Channel List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="58"/>
+        <source>Hide buffers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="59"/>
+        <source>Hide buffers permanently</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BufferViewDock</name>
+    <message>
+        <location filename="../src/uisupport/bufferview.cpp" line="586"/>
+        <source>All Buffers</source>
+        <translation type="unfinished">Alle buffere</translation>
+    </message>
 </context>
 <context>
     <name>BufferViewEditDlg</name>
@@ -230,7 +320,7 @@ p, li { white-space: pre-wrap; }
         <translation>Buffervisningens navn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="203"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="461"/>
         <source>Add Buffer View</source>
         <translation>Tilføj buffer visning</translation>
     </message>
@@ -238,12 +328,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BufferViewSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="28"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
         <source>General</source>
         <translation>Generelt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="28"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
         <source>Buffer Views</source>
         <translation>Buffer visninger</translation>
     </message>
@@ -273,60 +363,115 @@ p, li { white-space: pre-wrap; }
         <translation>Buffer visning settings</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="88"/>
-        <source>Show only Buffers from:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="100"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="106"/>
         <source>Restrict Buffers to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="106"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="112"/>
         <source>Status Buffers</source>
         <translation>Status buffers</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="113"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="119"/>
         <source>Channel Buffers</source>
         <translation>Kanal buffers</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="120"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="126"/>
         <source>Query Buffers</source>
         <translation>Forespørgsels buffere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="130"/>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="143"/>
         <source>Add new Buffers automatically</source>
         <translation>Tilføj nye buffers automatisk</translation>
     </message>
     <message>
         <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="137"/>
         <source>Sort Buffers alphabetically</source>
-        <translation>Sorter buffers alfabetisk</translation>
+        <translation type="obsolete">Sorter buffers alfabetisk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="294"/>
+        <source>Delete Buffer View?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="295"/>
+        <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="88"/>
+        <source>Network:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="96"/>
+        <source>All</source>
+        <translation type="unfinished">Alle</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="136"/>
+        <source>Hide inactive Buffers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="150"/>
+        <source>Sort alphabetically</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="157"/>
+        <source>Minimum Activity:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="165"/>
+        <source>No Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="170"/>
+        <source>Other Activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="175"/>
+        <source>New Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="180"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="206"/>
+        <source>Preview:</source>
+        <translation type="unfinished">Forhåndsvisning:</translation>
     </message>
 </context>
 <context>
     <name>BufferViewWidget</name>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="36"/>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="37"/>
         <source>All</source>
         <translation>Alle</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="37"/>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="38"/>
         <source>Chans</source>
         <translation>Kanaler</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="38"/>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="39"/>
         <source>Queries</source>
         <translation>Forespørgsler</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="39"/>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="40"/>
         <source>Nets</source>
         <translation>Netværk</translation>
     </message>
@@ -355,13 +500,46 @@ p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat komfortabelt. Hvorsomhelst.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation type="obsolete">&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat komfortabelt. Hvorsomhelst.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/bufferwidget.ui" line="75"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/quassel/96x96/apps/quassel.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>ChannelListDlg</name>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="13"/>
+        <source>Channel List</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="37"/>
+        <source>Search Pattern:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="47"/>
+        <source>Search Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="71"/>
+        <source>Filter:</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Client</name>
     <message>
-        <location filename="../src/client/client.cpp" line="275"/>
+        <location filename="../src/client/client.cpp" line="287"/>
         <source>Identity already exists in client!</source>
         <translation>Identiteten eksisterer allerede i klienten!</translation>
     </message>
@@ -369,30 +547,45 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>ClientSyncer</name>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="54"/>
+        <location filename="../src/client/clientsyncer.cpp" line="55"/>
         <source>The Quassel Core you try to connect to is too old! Please consider upgrading.</source>
         <translation>Quassel serveren du prøver at forbinde til er for gammel! Overvej at upgradere den.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="79"/>
+        <location filename="../src/client/clientsyncer.cpp" line="80"/>
         <source>&lt;b&gt;Invalid data received from core!&lt;/b&gt;&lt;br&gt;Disconnecting.</source>
         <translation>&lt;b&gt;Ugyldig data modtaget fra serveren!&lt;/b&gt;&lt;br&gt;Afbryder.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="110"/>
+        <location filename="../src/client/clientsyncer.cpp" line="112"/>
         <source>Internal connections not yet supported.</source>
         <translation>Interne forbindelser er endnu ikke understøttet.</translation>
     </message>
     <message>
         <location filename="../src/client/clientsyncer.cpp" line="170"/>
         <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least a Core Version %1 (Build &gt;= %2) to connect.</source>
-        <translation>&lt;b&gt;Quassel serveren du prøver at forbinde til er for gammel!&lt;/b&gt;&lt;br&gt;Version %1, eller højere, er nødvendig (Build &gt;= %2) for at forbinde.</translation>
+        <translation type="obsolete">&lt;b&gt;Quassel serveren du prøver at forbinde til er for gammel!&lt;/b&gt;&lt;br&gt;Version %1, eller højere, er nødvendig (Build &gt;= %2) for at forbinde.</translation>
     </message>
     <message>
-        <location filename="../src/client/clientsyncer.cpp" line="191"/>
+        <location filename="../src/client/clientsyncer.cpp" line="238"/>
         <source>Logging in...</source>
         <translation>Logger på...</translation>
     </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="130"/>
+        <source>&lt;b&gt;This client is built without SSL Support!&lt;/b&gt;&lt;br /&gt;Disable the usage of SSL in the account settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="192"/>
+        <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least core/client protocol v%1 to connect.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/clientsyncer.cpp" line="208"/>
+        <source>&lt;b&gt;The Quassel Core you are trying to connect to does not support SSL!&lt;/b&gt;&lt;br /&gt;If you want to connect anyways, disable the usage of SSL in the account settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ColorSettingsPage</name>
@@ -712,12 +905,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="170"/>
         <source>Conclusion</source>
-        <translation>Konklusion</translation>
+        <translation type="obsolete">Konklusion</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="171"/>
         <source>You chose the following configuration:</source>
-        <translation>Du har valgt følgende opsætning:</translation>
+        <translation type="obsolete">Du har valgt følgende opsætning:</translation>
     </message>
 </context>
 <context>
@@ -725,96 +918,103 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="44"/>
         <source>Core Configuration Wizard</source>
-        <translation>Server opsætnings guide</translation>
+        <translation type="obsolete">Server opsætnings guide</translation>
     </message>
 </context>
 <context>
     <name>Core</name>
     <message>
-        <location filename="../src/core/core.cpp" line="55"/>
+        <location filename="../src/core/core.cpp" line="57"/>
         <source>Could not initialize any storage backend! Exiting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="112"/>
+        <location filename="../src/core/core.cpp" line="117"/>
         <source>Calling restoreState() even though active sessions exist!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/core/core.cpp" line="118"/>
         <source>Core state too old, ignoring...</source>
-        <translation>Servertilstand for gammel, ignorerer...</translation>
+        <translation type="obsolete">Servertilstand for gammel, ignorerer...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="138"/>
+        <location filename="../src/core/core.cpp" line="145"/>
         <source>Admin user or password not set.</source>
         <translation>Administratorbruger eller -password ikke angivet.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="141"/>
+        <location filename="../src/core/core.cpp" line="148"/>
         <source>Could not setup storage!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="145"/>
+        <location filename="../src/core/core.cpp" line="152"/>
         <source>Creating admin user...</source>
         <translation>Operetter administrator bruger...</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="365"/>
+        <location filename="../src/core/core.cpp" line="388"/>
         <source>Antique client trying to connect... refusing.</source>
         <translation>Antik klient prøver at forbinde... nægter.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="381"/>
-        <source>&lt;b&gt;Quassel Core Version %1 (Build &amp;ge; %2)&lt;/b&gt;&lt;br&gt;Up %3d%4h%5m (since %6)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/core/core.cpp" line="392"/>
-        <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client version %1 (Build &gt;= %2).&lt;br&gt;Please consider upgrading your client.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/core/core.cpp" line="394"/>
+        <location filename="../src/core/core.cpp" line="404"/>
         <source>Client %1 too old, rejecting.</source>
         <translation>Klienten %1 er for gammel, afviser.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="420"/>
+        <location filename="../src/core/core.cpp" line="482"/>
         <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="422"/>
+        <location filename="../src/core/core.cpp" line="484"/>
         <source>Client %1 did not send an init message before trying to login, rejecting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="442"/>
+        <location filename="../src/core/core.cpp" line="504"/>
         <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
         <translation>&lt;b&gt;Ugyldigt brugernavn eller kodeord!&lt;/b&gt;&lt;br&gt;Brugernavn/password-kombinationen du indtastede kunne ikke findes i databasen.</translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="448"/>
-        <source>Client %1 initialized and authentificated successfully as &quot;%2&quot;.</source>
+        <location filename="../src/core/core.cpp" line="522"/>
+        <source>Non-authed client disconnected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="460"/>
-        <source>Non-authed client disconnected.</source>
+        <location filename="../src/core/core.cpp" line="545"/>
+        <source>Could not initialize session for client %1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/core.cpp" line="483"/>
-        <source>Could not initialize session for client %1!</source>
+        <location filename="../src/core/core.cpp" line="60"/>
+        <source>Currently, Quassel only supports SQLite3. You need to build your
+Qt library with the sqlite plugin enabled in order for quasselcore
+to work.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="402"/>
+        <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client/core protocol version %1.&lt;br&gt;Please consider upgrading your client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="419"/>
+        <source>&lt;b&gt;Quassel Core Version %1&lt;/b&gt;&lt;br&gt;Built: %2&lt;br&gt;Up %3d%4h%5m (since %6)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/core.cpp" line="510"/>
+        <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CoreAccountEditDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="479"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="492"/>
         <source>Add Core Account</source>
         <translation>Tilføj konto</translation>
     </message>
@@ -849,55 +1049,95 @@ p, li { white-space: pre-wrap; }
         <translation>Port:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="112"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="109"/>
         <source>Use secure connection (SSL)</source>
         <translation>Brug sikker forbindelse (SSL)</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="127"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="124"/>
         <source>Use a proxy:</source>
         <translation>Brug en proxy:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="139"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="136"/>
         <source>Proxy Type:</source>
         <translation>Proxy type:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="147"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="144"/>
         <source>Socks 5</source>
         <translation>Socks 5</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="152"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="149"/>
         <source>HTTP</source>
         <translation>HTTP</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="160"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="157"/>
         <source>Proxy Host:</source>
         <translation>Proxy vært:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="167"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="164"/>
         <source>Proxy Port:</source>
         <translation>Proxy port:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="174"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="171"/>
         <source>localhost</source>
         <translation>localhost</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="191"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="188"/>
         <source>Proxy Username:</source>
         <translation>Proxy brugernavn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="201"/>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="198"/>
         <source>Proxy Password:</source>
         <translation>Proxy password:</translation>
     </message>
+    <message>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="289"/>
+        <source>Missing information</source>
+        <translation type="unfinished">Manglende information</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="290"/>
+        <source>Please enter all required information or discard changes to return to account selection.</source>
+        <translation type="unfinished">Indtast alle nødvendige informationer, eller bortkast ændringerne for at vende tilbage til valg af konto.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="297"/>
+        <source>Non-unique account name</source>
+        <translation type="unfinished">Ikke-unikt konto navn</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="299"/>
+        <source>Account names need to be unique. Please enter a different name or discard all changes to return to account selection.</source>
+        <translation type="unfinished">Kontonavnet skal være unikt. Indtast et andet kontonavn, eller bortkast ændringerne for at vende tilbage til valg af konto.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="40"/>
+        <source>Host:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="47"/>
+        <source>Password:</source>
+        <translation type="unfinished">Kodeord:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="63"/>
+        <source>Account:</source>
+        <translation type="unfinished">Konto:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreaccounteditdlg.ui" line="90"/>
+        <source>User:</source>
+        <translation type="unfinished">Bruger:</translation>
+    </message>
 </context>
 <context>
     <name>CoreConfigWizard</name>
@@ -952,7 +1192,17 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="68"/>
         <source>&lt;em&gt;Note: Adding more users and changing your username/password has not been implemented yet.</source>
-        <translation>&lt;em&gt;Nb: Det er endnu ikke muligt at tilføje flere brugere, eller ændre brugernavn og kodeord.</translation>
+        <translation type="obsolete">&lt;em&gt;Nb: Det er endnu ikke muligt at tilføje flere brugere, eller ændre brugernavn og kodeord.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/coreconfigwizardadminuserpage.ui" line="68"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:8pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:13pt;&quot;&gt;&lt;span style=&quot; font-size:10pt; font-weight:600;&quot;&gt;Note: &lt;/span&gt;&lt;span style=&quot; font-size:10pt;&quot;&gt;Adding more users and changing your username/password is not possible via Quassel&apos;s interface yet.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Lucida Grande&apos;; font-size:10pt;&quot;&gt;If you need to do these things have a look at the manageusers.py script which is located in the /scripts directory.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -973,12 +1223,22 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="138"/>
         <source>Create User Account</source>
-        <translation>Opret konto</translation>
+        <translation type="obsolete">Opret konto</translation>
     </message>
     <message>
         <location filename="../src/qtui/coreconfigwizard.cpp" line="139"/>
         <source>First, we will create a user account on the core. This first user will have administrator privileges.</source>
-        <translation>First skal vi oprette en brugerkonto på serveren. Denne bruger vil have administrator rettigheder.</translation>
+        <translation type="obsolete">First skal vi oprette en brugerkonto på serveren. Denne bruger vil have administrator rettigheder.</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="138"/>
+        <source>Create Admin User</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/coreconfigwizard.cpp" line="139"/>
+        <source>First, we will create a user on the core. This first user will have administrator privileges.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1081,15 +1341,15 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="119"/>
         <source>Delete account?</source>
-        <translation>Slet konto?</translation>
+        <translation type="obsolete">Slet konto?</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="121"/>
         <source>Do you really want to delete the data for the account &apos;%1&apos;?&lt;br&gt;Note that this only affects your local account settings and will not remove any data from the core.</source>
-        <translation>Vil du virkeligt slette data for kontoen &apos;%1&apos;?&lt;br&gt;Bemærk at dette kun har en effekt på den lokale klient, og ikke vile slette noget fra serveren.</translation>
+        <translation type="obsolete">Vil du virkeligt slette data for kontoen &apos;%1&apos;?&lt;br&gt;Bemærk at dette kun har en effekt på den lokale klient, og ikke vile slette noget fra serveren.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="38"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="50"/>
         <source>Connect to Quassel Core</source>
         <translation>Forbind til Quassel server</translation>
     </message>
@@ -1099,37 +1359,37 @@ p, li { white-space: pre-wrap; }
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="280"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="303"/>
         <source>User:</source>
         <translation>Bruger:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="294"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="317"/>
         <source>Password:</source>
         <translation>Kodeord:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="308"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="331"/>
         <source>Remember</source>
         <translation>Husk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="103"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="118"/>
         <source>Always use this account</source>
         <translation>Brug altid denne konto</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="38"/>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="46"/>
         <source>New</source>
         <translation>Ny</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="73"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="87"/>
         <source>Delete</source>
         <translation>Slet</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="40"/>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="48"/>
         <source>Properties...</source>
         <translation>Egenskaber...</translation>
     </message>
@@ -1149,82 +1409,82 @@ p, li { white-space: pre-wrap; }
         <translation>Forbind</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="167"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="174"/>
         <source>Remove Account Settings</source>
         <translation>Fjern konto-indstillinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="169"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="176"/>
         <source>Do you really want to remove your local settings for this Quassel Core account?&lt;br&gt;Note: This will &lt;em&gt;not&lt;/em&gt; remove or change any data on the Core itself!</source>
         <translation>Vil du virkeligt fjerne dine lokale indstillinger for denne konto?&lt;br&gt;Note: Dette vil &lt;em&gt;ikke&lt;/em&gt; fjerne eller ændre noget på serveren!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="213"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="221"/>
         <source>Connect to %1</source>
         <translation>Forbind til %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="229"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="238"/>
         <source>&lt;div style=color:red;&gt;Connection to %1 failed!&lt;/div&gt;</source>
         <translation>&lt;div style=color:red;&gt;Forbindelse til %1 mislykkedes!&lt;/div&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="246"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="262"/>
         <source>Not connected to %1.</source>
         <translation>Ikke forbundet til %1.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="247"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="263"/>
         <source>Looking up %1...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="248"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="264"/>
         <source>Connecting to %1...</source>
         <translation>Forbinder til %1...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="249"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="265"/>
         <source>Connected to %1</source>
         <translation>Forbundet til %1</translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="250"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="266"/>
         <source>Unknown connection state to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="302"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="318"/>
         <source>Logging in...</source>
         <translation>Logger på...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="260"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="292"/>
         <source>Login</source>
         <translation>Log på</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="65"/>
         <source>Edit...</source>
         <translation>Rediger...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="63"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="76"/>
         <source>Add...</source>
         <translation>Tilføj...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="132"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="155"/>
         <source>Initializing your connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="165"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="179"/>
         <source>Connected to apollo.mindpool.net.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="197"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="211"/>
         <source>Core Info
 reserve
 some
@@ -1232,52 +1492,52 @@ space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="330"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="361"/>
         <source>Configure your Quassel Core</source>
         <translation>Konfigurér Quassel serveren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="336"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="367"/>
         <source>The Quassel Core you are connected to is not configured yet. You may now launch a configuration wizard that helps you setting up your Core.</source>
         <translation>Quassel serveren du er forbundet til er endnu ikke konfigureret. Du kan nu åbne konfigurations-guiden, der vil guide dig gennem konfigurationen.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="364"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="395"/>
         <source>Launch Wizard</source>
         <translation>Start guide</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="421"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="469"/>
         <source>Initializing your session...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="429"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="477"/>
         <source>&lt;b&gt;Please be patient while your client synchronizes with the Quassel Core!&lt;/b&gt;</source>
         <translation>&lt;b&gt;Vær&apos; tålmodig mens klienten synkroniserer med Quassel serveren!&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="444"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="492"/>
         <source>Session state:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="461"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="509"/>
         <source>Network states:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="517"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="565"/>
         <source>0/0</source>
         <translation type="unfinished">0/0</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="481"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="529"/>
         <source>Channel states:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="501"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="549"/>
         <source>User states:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1287,13 +1547,13 @@ space</source>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="255"/>
         <source>Connection Error</source>
-        <translation>Forbindelsesfejl</translation>
+        <translation type="obsolete">Forbindelsesfejl</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="255"/>
         <source>&lt;b&gt;Could not connect to Quassel Core!&lt;/b&gt;&lt;br&gt;
 </source>
-        <translation>&lt;b&gt;Kunne ikke forbinde til Quassel-serveren!&lt;/b&gt;&lt;br&gt;
+        <translation type="obsolete">&lt;b&gt;Kunne ikke forbinde til Quassel-serveren!&lt;/b&gt;&lt;br&gt;
 </translation>
     </message>
     <message>
@@ -1304,21 +1564,66 @@ space</source>
     <message>
         <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="32"/>
         <source>Connecting...</source>
-        <translation>Forbinder...</translation>
+        <translation type="obsolete">Forbinder...</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="19"/>
         <source>&lt;b&gt;Connection to core in progress.&lt;/b&gt;</source>
-        <translation>&lt;b&gt;Forbindelse til server i gang.&lt;/b&gt;</translation>
+        <translation type="obsolete">&lt;b&gt;Forbindelse til server i gang.&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="19"/>
+        <source>Connecting to core...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="34"/>
+        <source>Session</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="98"/>
+        <source>%p%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="54"/>
+        <source>Networks</source>
+        <translation type="unfinished">Netværk</translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="71"/>
+        <source>Channels</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="88"/>
+        <source>Users</source>
+        <translation type="unfinished">Brugere</translation>
     </message>
 </context>
 <context>
     <name>CoreSession</name>
     <message>
-        <location filename="../src/core/coresession.cpp" line="146"/>
+        <location filename="../src/core/coresession.cpp" line="153"/>
         <source>Default Identity</source>
         <translation>Normal identitet</translation>
     </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="241"/>
+        <source>Client %1 disconnected (UserId: %2).</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="410"/>
+        <source>CoreSession::createNetwork(): Got invalid networkId from Core when trying to create network %1!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/coresession.cpp" line="425"/>
+        <source>CoreSession::createNetwork(): Trying to create a network that already exists, updating instead!</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CreateIdentityDlg</name>
@@ -1346,27 +1651,27 @@ space</source>
 <context>
     <name>CtcpHandler</name>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="163"/>
+        <location filename="../src/core/ctcphandler.cpp" line="166"/>
         <source>Received CTCP PING request from %1</source>
         <translation>Modtog CTCP PING forespørgsel af %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="178"/>
+        <location filename="../src/core/ctcphandler.cpp" line="180"/>
         <source>Received CTCP VERSION request by %1</source>
         <translation>Modtog CTCP VERSION forespørgsel af %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="189"/>
+        <location filename="../src/core/ctcphandler.cpp" line="191"/>
         <source>Received unknown CTCP %1 by %2</source>
         <translation>Modtog ukendt CTCP %1 af %2</translation>
     </message>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="168"/>
+        <location filename="../src/core/ctcphandler.cpp" line="171"/>
         <source>Received CTCP PING answer from %1 with %2 seconds round trip time</source>
         <translation>Modtog CTCP PING svar fra %1 med %2 sekunders svartid</translation>
     </message>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="181"/>
+        <location filename="../src/core/ctcphandler.cpp" line="183"/>
         <source>Received CTCP VERSION answer from %1: %2</source>
         <translation>Modtog CTCP VERSION svar fra %1: %2</translation>
     </message>
@@ -1399,22 +1704,22 @@ space</source>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="195"/>
         <source>Missing information</source>
-        <translation>Manglende information</translation>
+        <translation type="obsolete">Manglende information</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="196"/>
         <source>Please enter all required information or discard changes to return to account selection.</source>
-        <translation>Indtast alle nødvendige informationer, eller bortkast ændringerne for at vende tilbage til valg af konto.</translation>
+        <translation type="obsolete">Indtast alle nødvendige informationer, eller bortkast ændringerne for at vende tilbage til valg af konto.</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="202"/>
         <source>Non-unique account name</source>
-        <translation>Ikke-unikt konto navn</translation>
+        <translation type="obsolete">Ikke-unikt konto navn</translation>
     </message>
     <message>
         <location filename="../src/qtopia/coreconnectdlg.cpp" line="204"/>
         <source>Account names need to be unique. Please enter a different name or discard all changes to return to account selection.</source>
-        <translation>Kontonavnet skal være unikt. Indtast et andet kontonavn, eller bortkast ændringerne for at vende tilbage til valg af konto.</translation>
+        <translation type="obsolete">Kontonavnet skal være unikt. Indtast et andet kontonavn, eller bortkast ændringerne for at vende tilbage til valg af konto.</translation>
     </message>
     <message>
         <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="13"/>
@@ -1617,121 +1922,214 @@ space</source>
         <source>Mouse wheel changes displayed buffers</source>
         <translation>Scrollhjul skifter den viste buffer</translation>
     </message>
-</context>
-<context>
-    <name>IdentitiesSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="99"/>
-        <source>General</source>
-        <translation>Generelt</translation>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="161"/>
+        <source>The suffix appended to a nick on completion via TAB. Default is &quot;: &quot;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="29"/>
-        <source>Identities</source>
-        <translation>Identiteter</translation>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="164"/>
+        <source>Input Line:</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="55"/>
-        <source>Add...</source>
-        <translation>Tilføj...</translation>
+        <location filename="../src/qtui/settingspages/generalsettingspage.ui" line="172"/>
+        <source>Completion suffix:</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HighlightSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="262"/>
-        <source>...</source>
-        <translation>...</translation>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="30"/>
+        <source>Behaviour</source>
+        <translation type="unfinished">Opførsel</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="107"/>
-        <source>Real Name:</source>
-        <translation>Fulde navn:</translation>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="32"/>
+        <source>Highlight</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="123"/>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.cpp" line="157"/>
+        <source>this shouldn&apos;t be empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.h" line="45"/>
+        <source>highlight rule</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation type="unfinished">Formular</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="19"/>
+        <source>Highlight list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="37"/>
+        <source>RegEx</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="42"/>
+        <source>CS</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="47"/>
+        <source>Enable</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="55"/>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="62"/>
+        <source>Remove</source>
+        <translation type="unfinished">Fjern</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="85"/>
+        <source>Highlight nicks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="91"/>
+        <source>All nicks from identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="98"/>
+        <source>Current nick</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/highlightsettingspage.ui" line="108"/>
+        <source>None</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IdentitiesSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="110"/>
+        <source>General</source>
+        <translation>Generelt</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.cpp" line="29"/>
+        <source>Identities</source>
+        <translation>Identiteter</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="56"/>
+        <source>Add...</source>
+        <translation>Tilføj...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="268"/>
+        <source>...</source>
+        <translation>...</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="118"/>
+        <source>Real Name:</source>
+        <translation>Fulde navn:</translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="134"/>
         <source>Nicknames</source>
         <translation>Kaldenavne</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="162"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="173"/>
         <source>&amp;Add...</source>
         <translation>&amp;Tilføj...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="206"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="219"/>
         <source>Re&amp;name...</source>
         <translation>&amp;Omdøb...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="246"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="251"/>
         <source>Move upwards in list</source>
         <translation>Flyt opad i listen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="259"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="265"/>
         <source>Move downwards in list</source>
         <translation>Flyt nedad i listen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="306"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="321"/>
         <source>A&amp;way</source>
         <translation>&amp;Away</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="479"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="452"/>
         <source>Away Reason</source>
         <translation>Away årsag</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="472"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="445"/>
         <source>Return Message</source>
         <translation>Tilbage besked</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="367"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="370"/>
         <source>Away Nick</source>
         <translation>Navn når du er away</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="376"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="379"/>
         <source>Auto Away</source>
         <translation>Automatisk away</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="420"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="405"/>
         <source>Auto away after</source>
         <translation>Automatisk away efter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="430"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="415"/>
         <source>minutes</source>
         <translation>minutter</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="511"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="492"/>
         <source>Advanced</source>
         <translation>Advanceret</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="519"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="500"/>
         <source>Ident:</source>
         <translation>Ident:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="535"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="516"/>
         <source>Messages</source>
         <translation>Beskeder</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="561"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="530"/>
         <source>Part Reason:</source>
         <translation>Part årsag:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="574"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="543"/>
         <source>Quit Reason:</source>
         <translation>Afslut årsag:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="584"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="553"/>
         <source>Kick Reason:</source>
         <translation>Kick årsag:</translation>
     </message>
@@ -1781,7 +2179,7 @@ space</source>
         <translation>Vil du virkeligt slette identiteten &quot;%1&quot;?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="203"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="216"/>
         <source>Rename Identity</source>
         <translation>Omdøb identitet</translation>
     </message>
@@ -1791,37 +2189,37 @@ space</source>
         <translation>Indtast et nyt navn for identiteten &quot;%1&quot;!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="52"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="53"/>
         <source>Add Identity</source>
         <translation>Tilføj identitet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="74"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="76"/>
         <source>Remove Identity</source>
         <translation>Fjern identitet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="114"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="125"/>
         <source>The &quot;Real Name&quot; is shown in /whois.</source>
         <translation>Det fulde navn bliver vist i /whois.</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="159"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="170"/>
         <source>Add Nickname</source>
         <translation>Tilføj nick</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="184"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="196"/>
         <source>Remove Nickname</source>
         <translation>Fjern nick</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="187"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="199"/>
         <source>Remove</source>
         <translation>Fjern</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="526"/>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="507"/>
         <source>The &quot;ident&quot; is part of your hostmask and, together with your host, uniquely identifies you within the IRC network.</source>
         <translation>Ident er en del af dit hostmask, og udgør, sammen med dit hostname, din unikke identitetet på IRC-netværket.</translation>
     </message>
@@ -1882,146 +2280,224 @@ space</source>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="49"/>
         <source>Introduction</source>
-        <translation>Introduktion</translation>
+        <translation type="obsolete">Introduktion</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="51"/>
         <source>This wizard will guide you through the setup process for your shiny new Quassel IRC Client.</source>
-        <translation>Denne guide vil hjælpe dig med at opsætte din shiny nye Quassen IRC klient.</translation>
+        <translation type="obsolete">Denne guide vil hjælpe dig med at opsætte din shiny nye Quassen IRC klient.</translation>
+    </message>
+</context>
+<context>
+    <name>IrcListModel</name>
+    <message>
+        <location filename="../src/client/irclistmodel.cpp" line="60"/>
+        <source>Channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/irclistmodel.cpp" line="61"/>
+        <source>Users</source>
+        <translation type="unfinished">Brugere</translation>
+    </message>
+    <message>
+        <location filename="../src/client/irclistmodel.cpp" line="61"/>
+        <source>Topic</source>
+        <translation type="unfinished">Emne</translation>
     </message>
 </context>
 <context>
     <name>IrcServerHandler</name>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="360"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="411"/>
         <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
         <translation>%1 har skiftet emne for %2 til: &quot;%3&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="538"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="777"/>
         <source>No topic is set for %1.</source>
         <translation>Intet emne er sat for %1.</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="547"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="789"/>
         <source>Topic for %1 is &quot;%2&quot;</source>
         <translation>Emne for %1 er &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="555"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="800"/>
         <source>Topic set by %1 on %2</source>
         <translation>Emne valg af %1 på %2</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="194"/>
         <source>Received invalid MODE from %s: %s</source>
-        <translation>Modtog ugyldig MODE fra %s: %s</translation>
+        <translation type="obsolete">Modtog ugyldig MODE fra %s: %s</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="429"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="515"/>
         <source>[Whois] %1 is away: &quot;%2&quot;</source>
         <translation>[Whois] %1 er ikke tilstede: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="440"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="526"/>
         <source>%1 is away: &quot;%2&quot;</source>
         <translation>%1 er ikke tilstede: &quot;%2&quot;</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="530"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="723"/>
         <source>[Whois] %1</source>
         <translation>[Whois] %1</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="618"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="864"/>
         <source>[Whowas] %1</source>
         <translation>[Whowas] %1</translation>
     </message>
     <message>
         <location filename="../src/core/ircserverhandler.cpp" line="511"/>
         <source>[Whois] %1 is logged in since %2 seconds</source>
-        <translation>[Whois] %1 har været logget på i %2 sekunder</translation>
-    </message>
-    <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="513"/>
-        <source>[Whois] %1 is idling for %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">[Whois] %1 har været logget på i %2 sekunder</translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="516"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="681"/>
         <source>[Whois] idle message: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="631"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="877"/>
         <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="632"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="878"/>
         <source>Due to a bug in Unreal IRCd (and maybe other irc-servers too) we&apos;re unable to determine the erroneous nick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="633"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="879"/>
         <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="636"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="882"/>
         <source>Nick %1 contains illegal characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="646"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="894"/>
         <source>Nick already in use: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ircserverhandler.cpp" line="669"/>
+        <location filename="../src/core/ircserverhandler.cpp" line="917"/>
         <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="480"/>
+        <source>%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="597"/>
+        <source>[Whois] %1 is %2 (%3)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="612"/>
+        <source>%1 is online via %2 (%3)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="642"/>
+        <source>[Whowas] %1 was %2 (%3)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="656"/>
+        <source>[Who] End of /WHO list for %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="676"/>
+        <source>[Whois] %1 is logged in since %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="678"/>
+        <source>[Whois] %1 is idling for %2 (%3)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="713"/>
+        <source>[Whois] %1 is a user on channels: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="715"/>
+        <source>[Whois] %1 has voice on channels: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="717"/>
+        <source>[Whois] %1 is an operator on channels: %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="745"/>
+        <source>Channel %1 has %2 users. Topic is: %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="754"/>
+        <source>End of channel list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="823"/>
+        <source>[Who] %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IrcUserItem</name>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="601"/>
         <source>year</source>
-        <translation>år</translation>
+        <translation type="obsolete">år</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="602"/>
         <source>day</source>
-        <translation>dag</translation>
+        <translation type="obsolete">dag</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="603"/>
         <source>h</source>
-        <translation>t</translation>
+        <translation type="obsolete">t</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="604"/>
         <source>min</source>
-        <translation>min</translation>
+        <translation type="obsolete">min</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="605"/>
         <source>sec</source>
-        <translation>sek</translation>
+        <translation type="obsolete">sek</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="615"/>
+        <location filename="../src/client/networkmodel.cpp" line="606"/>
         <source>idling since %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="618"/>
+        <location filename="../src/client/networkmodel.cpp" line="609"/>
         <source>login time: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="621"/>
+        <location filename="../src/client/networkmodel.cpp" line="612"/>
         <source>server: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2052,102 +2528,102 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>MainWin</name>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="74"/>
+        <location filename="../src/qtui/mainwin.cpp" line="88"/>
         <source>Waiting for core...</source>
         <translation>Venter på serveren...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="345"/>
+        <location filename="../src/qtui/mainwin.cpp" line="485"/>
         <source>Not connected to core.</source>
         <translation>Ikke forbundet til serveren.</translation>
     </message>
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="160"/>
         <source>All Channels</source>
-        <translation>Alle kanaler</translation>
+        <translation type="obsolete">Alle kanaler</translation>
     </message>
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="162"/>
         <source>All Networks</source>
-        <translation>Alle netværk</translation>
+        <translation type="obsolete">Alle netværk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="119"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="107"/>
         <source>&amp;Network List...</source>
         <translation>&amp;Netværks liste...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="122"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="110"/>
         <source>F2</source>
         <translation>F2</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="232"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="229"/>
         <source>Disconnect</source>
         <translation>Afbryd forbindelsen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="179"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="173"/>
         <source>Edit Identities...</source>
         <translation>Rediger identiteter...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="189"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="182"/>
         <source>Configure Quassel...</source>
         <translation>Konfigurer Quassel...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="192"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="185"/>
         <source>F7</source>
         <translation>F7</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="205"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="202"/>
         <source>About Qt...</source>
         <translation>Om Qt...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="217"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="214"/>
         <source>About Quassel IRC...</source>
         <translation>Om Quassel IRC...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="227"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="224"/>
         <source>Connect</source>
         <translation>Forbind</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="237"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="234"/>
         <source>Internal</source>
         <translation>Intern</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="250"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="246"/>
         <source>Disconnect from Core</source>
         <translation>Afbryd forbindelsen til serveren</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="263"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="258"/>
         <source>Connect to Core...</source>
         <translation>Forbind til server...</translation>
     </message>
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="159"/>
         <source>All Buffers</source>
-        <translation>Alle buffere</translation>
+        <translation type="obsolete">Alle buffere</translation>
     </message>
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="161"/>
         <source>All Queries</source>
-        <translation>Alle forespørgsler</translation>
+        <translation type="obsolete">Alle forespørgsler</translation>
     </message>
     <message>
         <location filename="../src/qtui/mainwin.cpp" line="163"/>
         <source>Full Custom</source>
-        <translation>Brugerdefineret</translation>
+        <translation type="obsolete">Brugerdefineret</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="334"/>
+        <location filename="../src/qtui/mainwin.cpp" line="426"/>
         <source>Connected to core.</source>
         <translation>Forbundet til server.</translation>
     </message>
@@ -2157,240 +2633,245 @@ p, li { white-space: pre-wrap; }
         <translation>HovedVindue</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="130"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="118"/>
         <source>Quick &amp;Connect...</source>
         <translation>&amp;Hurtig forbind...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="146"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="134"/>
         <source>Reconnect</source>
         <translation>Gen-forbind</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="154"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="142"/>
         <source>Join Channel...</source>
         <translation>Deltag i kanal...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="162"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="153"/>
         <source>Set Away globally</source>
         <translation>Sæt Away globalt</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="171"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="165"/>
         <source>Quit...</source>
         <translation>Afslut...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="200"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="197"/>
         <source>Manage Views...</source>
         <translation>Administrér visninger...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="222"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="219"/>
         <source>Import Backlog</source>
         <translation>Importér logfil</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="268"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="263"/>
         <source>Debug &amp;Console</source>
         <translation>Debug &amp;konsol</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="203"/>
+        <location filename="../src/qtui/mainwin.cpp" line="264"/>
         <source>Nicks</source>
         <translation>Navneliste</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="151"/>
+        <location filename="../src/qtui/mainwin.cpp" line="169"/>
         <source>Edit &amp;Networks...</source>
         <translation>Redigér &amp;netværk...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="220"/>
+        <location filename="../src/qtui/mainwin.cpp" line="283"/>
         <source>Chat Monitor</source>
         <translation>Char monitor</translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="241"/>
+        <location filename="../src/qtui/mainwin.cpp" line="305"/>
         <source>Inputline</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/mainwin.cpp" line="258"/>
+        <location filename="../src/qtui/mainwin.cpp" line="322"/>
         <source>Topic</source>
         <translation>Emne</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="53"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="50"/>
         <source>&amp;File</source>
         <translation>&amp;Fil</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="57"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="54"/>
         <source>&amp;Networks</source>
         <translation>&amp;Netværk</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="74"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="69"/>
         <source>&amp;Settings</source>
         <translation>&amp;Indstillinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="80"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="75"/>
         <source>&amp;Views</source>
         <translation>&amp;Visninger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="87"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="82"/>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/mainwin.ui" line="94"/>
         <source>&amp;Debug</source>
-        <translation>&amp;Debug</translation>
+        <translation type="obsolete">&amp;Debug</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="273"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="268"/>
         <source>Disconnect from Network...</source>
         <translation>Afbryd fra netværk...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/mainwin.ui" line="281"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="276"/>
         <source>&amp;Edit Networks...</source>
         <translation>&amp;Rediger netværk...</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="343"/>
+        <source>Statusbar</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Message</name>
     <message>
-        <location filename="../src/common/message.cpp" line="104"/>
+        <location filename="../src/common/message.cpp" line="105"/>
         <source>%DT[%1]</source>
         <translation>%DT[%1]</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="109"/>
+        <location filename="../src/common/message.cpp" line="110"/>
         <source>%DS&lt;%1&gt;</source>
         <translation>%DS&lt;%1&gt;</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="109"/>
+        <location filename="../src/common/message.cpp" line="110"/>
         <source>%D0%1</source>
         <translation>%D0%1</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="113"/>
+        <location filename="../src/common/message.cpp" line="114"/>
         <source>%Ds*</source>
         <translation>%Ds*</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="113"/>
+        <location filename="../src/common/message.cpp" line="114"/>
         <source>%Ds%1</source>
         <translation>%Ds%1</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="115"/>
+        <location filename="../src/common/message.cpp" line="116"/>
         <source>%De*</source>
         <translation>%De*</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="150"/>
+        <location filename="../src/common/message.cpp" line="151"/>
         <source>%De%1</source>
         <translation>%De%1</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="117"/>
+        <location filename="../src/common/message.cpp" line="118"/>
         <source>%Dj--&gt;</source>
         <translation>%Dj--&gt;</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="119"/>
+        <location filename="../src/common/message.cpp" line="120"/>
         <source>%Dp&lt;--</source>
         <translation>%Dp&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="123"/>
+        <location filename="../src/common/message.cpp" line="124"/>
         <source>%Dq&lt;--</source>
         <translation>%Dq&lt;--</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="127"/>
+        <location filename="../src/common/message.cpp" line="128"/>
         <source>%Dk&lt;-*</source>
         <translation>%Dk&lt;-*</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="136"/>
+        <location filename="../src/common/message.cpp" line="137"/>
         <source>%Dr&lt;-&gt;</source>
         <translation>%Dr&lt;-&gt;</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="137"/>
+        <location filename="../src/common/message.cpp" line="138"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation>%DrDu er nu kendt som %DN%1%DN</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="141"/>
+        <location filename="../src/common/message.cpp" line="142"/>
         <source>%Dm***</source>
         <translation>%Dm***</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="146"/>
+        <location filename="../src/common/message.cpp" line="147"/>
         <source>%Da-*-</source>
         <translation>%Da-*-</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="151"/>
+        <location filename="../src/common/message.cpp" line="152"/>
         <source>%De[%1]</source>
         <translation>%De[%1]</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="123"/>
+        <location filename="../src/common/message.cpp" line="124"/>
         <source>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit</source>
         <translation>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH afsluttede</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="142"/>
+        <location filename="../src/common/message.cpp" line="143"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation>%DmBruger mode: %DM%1%DM</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="111"/>
+        <location filename="../src/common/message.cpp" line="112"/>
         <source>%Dn[%1]</source>
         <translation>%Dn[%1]</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="111"/>
+        <location filename="../src/common/message.cpp" line="112"/>
         <source>%Dn%1</source>
         <translation>%Dn%1</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="117"/>
+        <location filename="../src/common/message.cpp" line="118"/>
         <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="119"/>
+        <location filename="../src/common/message.cpp" line="120"/>
         <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
         <translation>%Dp%DN%1%DN %DH(%2@%3)%DH forlod %DC%4%DC</translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="131"/>
+        <location filename="../src/common/message.cpp" line="132"/>
         <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="138"/>
+        <location filename="../src/common/message.cpp" line="139"/>
         <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="143"/>
+        <location filename="../src/common/message.cpp" line="144"/>
         <source>%DmMode %DM%1%DM by %DN%2%DN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="147"/>
+        <location filename="../src/common/message.cpp" line="148"/>
         <source>%Da%DN%1%DN %2</source>
         <translation>%Da%DN%1%DN %2</translation>
     </message>
@@ -2398,27 +2879,27 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NetworkConnection</name>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="210"/>
+        <location filename="../src/core/networkconnection.cpp" line="190"/>
         <source>Connection failed. Cycling to next Server</source>
         <translation>Forbindelse mislykkedes. Prøver næste server</translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="220"/>
+        <location filename="../src/core/networkconnection.cpp" line="200"/>
         <source>Connecting to %1:%2...</source>
         <translation>Forbinder til %1:%2...</translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="269"/>
+        <location filename="../src/core/networkconnection.cpp" line="253"/>
         <source>Disconnecting.</source>
         <translation>Afbryder.</translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="289"/>
+        <location filename="../src/core/networkconnection.cpp" line="276"/>
         <source>Could not connect to %1 (%2)</source>
         <translation>Kunne ikke forbinde til %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../src/core/networkconnection.cpp" line="291"/>
+        <location filename="../src/core/networkconnection.cpp" line="278"/>
         <source>Connection failure: %1</source>
         <translation>Forbindelsesfejl: %1</translation>
     </message>
@@ -2436,7 +2917,7 @@ p, li { white-space: pre-wrap; }
         <translation>Indtast et netværksnavn:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="635"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="636"/>
         <source>Add Network</source>
         <translation>Tilføj netværk</translation>
     </message>
@@ -2444,17 +2925,17 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NetworkModel</name>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="646"/>
+        <location filename="../src/client/networkmodel.cpp" line="637"/>
         <source>Buffer</source>
         <translation>Buffer</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="646"/>
+        <location filename="../src/client/networkmodel.cpp" line="637"/>
         <source>Topic</source>
         <translation>Emne</translation>
     </message>
     <message>
-        <location filename="../src/client/networkmodel.cpp" line="646"/>
+        <location filename="../src/client/networkmodel.cpp" line="637"/>
         <source>Nick Count</source>
         <translation>Brugere</translation>
     </message>
@@ -2507,12 +2988,12 @@ p, li { white-space: pre-wrap; }
         <translation>Anvend først!</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="532"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="533"/>
         <source>Delete Network?</source>
         <translation>Slet netværk?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="533"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.cpp" line="534"/>
         <source>Do you really want to delete the network &quot;%1&quot; and all related settings, including the backlog?</source>
         <translation>Vil du virkeligt slette netværket &quot;%1&quot;, og alle tilhørende indstillinger, inklusive log-filer?</translation>
     </message>
@@ -2522,166 +3003,209 @@ p, li { white-space: pre-wrap; }
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="44"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="37"/>
         <source>Re&amp;name...</source>
         <translation>&amp;Omdøb...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="234"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="225"/>
         <source>&amp;Add...</source>
         <translation>&amp;Tilføj...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="251"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="242"/>
         <source>De&amp;lete</source>
         <translation>&amp;Slet</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="117"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="110"/>
         <source>Connect now</source>
         <translation>Forbind nu</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="139"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="130"/>
         <source>Network Details</source>
         <translation>Netværks detaljer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="147"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="138"/>
         <source>Identity:</source>
         <translation>Identitet:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="527"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="540"/>
         <source>This specifies how control messages, nicks and servernames are encoded.
 Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="188"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="178"/>
         <source>Servers</source>
         <translation>Servere</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="216"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="207"/>
         <source>&amp;Edit...</source>
         <translation>&amp;Rediger...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="283"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="268"/>
         <source>Move upwards in list</source>
         <translation>Flyt opad i listen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="300"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="285"/>
         <source>...</source>
         <translation>...</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="297"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="282"/>
         <source>Move downwards in list</source>
         <translation>Flyt nedad i listen</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="346"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="331"/>
         <source>Choose random server for connecting</source>
         <translation>Vælg en tilfældig server at forbinde til</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="364"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="347"/>
         <source>Perform</source>
         <translation type="unfinished">Udfør</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="370"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="356"/>
         <source>Commands to execute on connect:</source>
         <translation>Kommandoer der skal eksekveres ved forbindelse:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="392"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="380"/>
         <source>Auto Identify</source>
         <translation>Automatisk identificering</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="406"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="412"/>
         <source>Service:</source>
         <translation>Service:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="416"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="395"/>
         <source>NickServ</source>
         <translation>NickServ</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="426"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="422"/>
         <source>Password:</source>
         <translation>Kodeord:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="459"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="441"/>
         <source>Advanced</source>
         <translation>Advanceret</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="468"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="456"/>
         <source>Encodings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="478"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="468"/>
         <source>Send messages in:</source>
         <translation>Send beskeder i:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="501"/>
-        <source>Incoming messages encoded in Utf8 will always be treated as such. This setting defines the encoding for messages that are not Utf8.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="504"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="499"/>
         <source>Receive fallback:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="531"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="530"/>
         <source>Server encoding:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="565"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="556"/>
         <source>Use defaults</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="581"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="575"/>
         <source>Automatic Reconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="594"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="586"/>
         <source>Interval:</source>
         <translation>Interval:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="601"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="593"/>
         <source> s</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="617"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="609"/>
         <source>Retries:</source>
         <translation>Forsøg:</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="637"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="629"/>
         <source>Unlimited</source>
         <translation>Ubegrænset</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="664"/>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="641"/>
         <source>Rejoin all channels on reconnect</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="181"/>
+        <source>Manage servers for this network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="350"/>
+        <source>Configure automatic identification or misc. commands to be executed after connecting to a server</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="366"/>
+        <source>Specify a list of IRC commands to be executed upon connect.
+Note that Quassel IRC automatically rejoins channels, so /join will rarely be needed here!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="444"/>
+        <source>Configure advanced settings such as message encodings and automatic reconnect</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="453"/>
+        <source>Control encodings for in- and outgoing messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="484"/>
+        <source>Specify which encoding your messages will be sent in.
+UTF-8 should be a sane choice for most networks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="515"/>
+        <source>Incoming messages encoded in Utf8 will always be treated as such.
+This setting defines the encoding for messages that are not Utf8.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="553"/>
+        <source>Use default settings for encodings (recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="572"/>
+        <source>Control automatic reconnect to the network</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NickEditDlg</name>
@@ -2717,119 +3241,152 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>NickView</name>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="112"/>
+        <location filename="../src/uisupport/nickview.cpp" line="114"/>
         <source>WHOIS</source>
         <translation>WHOIS</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="113"/>
+        <location filename="../src/uisupport/nickview.cpp" line="115"/>
         <source>VERSION</source>
         <translation>VERSION</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="114"/>
+        <location filename="../src/uisupport/nickview.cpp" line="116"/>
         <source>PING</source>
         <translation>PING</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="118"/>
+        <location filename="../src/uisupport/nickview.cpp" line="120"/>
         <source>Modes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="119"/>
+        <location filename="../src/uisupport/nickview.cpp" line="121"/>
         <source>Op %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="120"/>
+        <location filename="../src/uisupport/nickview.cpp" line="122"/>
         <source>Deop %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="121"/>
+        <location filename="../src/uisupport/nickview.cpp" line="123"/>
         <source>Voice %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="122"/>
+        <location filename="../src/uisupport/nickview.cpp" line="124"/>
         <source>Devoice %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="124"/>
+        <location filename="../src/uisupport/nickview.cpp" line="126"/>
         <source>Kick/Ban</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="126"/>
+        <location filename="../src/uisupport/nickview.cpp" line="127"/>
         <source>Kick %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="127"/>
+        <location filename="../src/uisupport/nickview.cpp" line="129"/>
         <source>Kickban %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="129"/>
+        <location filename="../src/uisupport/nickview.cpp" line="130"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="134"/>
+        <location filename="../src/uisupport/nickview.cpp" line="135"/>
         <source>Query</source>
         <translation>Forespørgsel</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="135"/>
+        <location filename="../src/uisupport/nickview.cpp" line="136"/>
         <source>DCC-Chat</source>
         <translation>DCC-chat</translation>
     </message>
     <message>
-        <location filename="../src/uisupport/nickview.cpp" line="137"/>
+        <location filename="../src/uisupport/nickview.cpp" line="138"/>
         <source>Send file</source>
         <translation>Send fil</translation>
     </message>
+    <message>
+        <location filename="../src/uisupport/nickview.cpp" line="128"/>
+        <source>Ban %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtopiaMainWin</name>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="66"/>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="74"/>
         <source>Show Toolbar</source>
         <translation>Vis værktøjslinje</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="97"/>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="106"/>
         <source>Quit Quassel IRC?</source>
         <translation>Afslut Quassel IRC?</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="97"/>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="106"/>
         <source>Do you really want to quit Quassel IRC?</source>
         <translation>Vil du virkeligt afslutte Quassel IRC?</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="99"/>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="108"/>
         <source>Quit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="110"/>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="119"/>
         <source>Show Buffers</source>
         <translation>Vis buffere</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="111"/>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="120"/>
         <source>Show Nicks</source>
         <translation>Vis navne</translation>
     </message>
     <message>
-        <location filename="../src/qtopia/qtopiamainwin.cpp" line="120"/>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="129"/>
         <source>About...</source>
         <translation>Om...</translation>
     </message>
 </context>
+<context>
+    <name>Quassel::secondsToString()</name>
+    <message>
+        <location filename="../src/common/util.cpp" line="165"/>
+        <source>year</source>
+        <translation type="unfinished">år</translation>
+    </message>
+    <message>
+        <location filename="../src/common/util.cpp" line="166"/>
+        <source>day</source>
+        <translation type="unfinished">dag</translation>
+    </message>
+    <message>
+        <location filename="../src/common/util.cpp" line="167"/>
+        <source>h</source>
+        <translation type="unfinished">t</translation>
+    </message>
+    <message>
+        <location filename="../src/common/util.cpp" line="168"/>
+        <source>min</source>
+        <translation type="unfinished">min</translation>
+    </message>
+    <message>
+        <location filename="../src/common/util.cpp" line="169"/>
+        <source>sec</source>
+        <translation type="unfinished">sek</translation>
+    </message>
+</context>
 <context>
     <name>SaveIdentitiesDlg</name>
     <message>
@@ -2887,37 +3444,37 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>SettingsDlg</name>
     <message>
-        <location filename="../src/qtui/ui/settingsdlg.ui" line="53"/>
+        <location filename="../src/qtui/ui/settingsdlg.ui" line="49"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="86"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="71"/>
         <source>Save changes</source>
         <translation>Gem ændringer</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="87"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="72"/>
         <source>There are unsaved changes on the current configuration page. Would you like to apply your changes now?</source>
         <translation>Der er ikke-gemte ændringer på denne side af opsætningen. Vil du gennemføre ændringerne nu?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="167"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="147"/>
         <source>Reload Settings</source>
         <translation>Reload indstillingerne</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="167"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="147"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation>Vil du reloade indstillingerne, selvom det bortkaster ændringerne på denne side?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="176"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
         <source>Restore Defaults</source>
         <translation>Gendan standard-indstillinger</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingsdlg.cpp" line="176"/>
+        <location filename="../src/qtui/settingsdlg.cpp" line="156"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Vil du gendanne standard-værdierne for denne side?</translation>
     </message>
@@ -2930,40 +3487,45 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
 <context>
     <name>SettingsPageDlg</name>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="94"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
         <source>Reload Settings</source>
         <translation>Genindlæs indstillingerne</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="94"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="100"/>
         <source>Do you like to reload the settings, undoing your changes on this page?</source>
         <translation>Vil du genindlæse indstillingerne, selvom det forkaster ændringerne på denne side?</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="103"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
         <source>Restore Defaults</source>
         <translation>Gendan normaler</translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspagedlg.cpp" line="103"/>
+        <location filename="../src/qtui/settingspagedlg.cpp" line="109"/>
         <source>Do you like to restore the default values for this page?</source>
         <translation>Vil du gendanne standard-værdierne for denne side?</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/settingspagedlg.ui" line="13"/>
         <source>Dialog</source>
-        <translation>Vindue</translation>
+        <translation type="obsolete">Vindue</translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/settingspagedlg.ui" line="25"/>
+        <location filename="../src/qtui/ui/settingspagedlg.ui" line="29"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
+    <message>
+        <location filename="../src/qtui/ui/settingspagedlg.ui" line="13"/>
+        <source>Configure Quassel</source>
+        <translation type="unfinished">Konfigurer Quassel</translation>
+    </message>
 </context>
 <context>
     <name>SqliteStorage</name>
     <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="47"/>
+        <location filename="../src/core/sqlitestorage.cpp" line="49"/>
         <source>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 via network. Use SQLite if your Quassel Core should store its data on the same machine it is running on, and if you only expect a few users to use your core.</source>
         <translation>SQLite er en filbaseret database engine der ikke kræver noget setup. Det brugbart for små og mellem-store databaser der ikke kræver adgang over netværk. Brug SQLite hvis din Quassel server skal gemme dens data på den samme maskine som den kører på, og hvis du kun forventer at nogle få brugere skal bruge serveren.</translation>
     </message>
@@ -2973,37 +3535,37 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="118"/>
         <source>Setup Storage Provider</source>
-        <translation>Opsæt opbevarings udbyder</translation>
+        <translation type="obsolete">Opsæt opbevarings udbyder</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="119"/>
         <source>Please enter credentials for the selected storage provider.</source>
-        <translation>Indtast login-informationer for den valgte opbevarings udbyder.</translation>
+        <translation type="obsolete">Indtast login-informationer for den valgte opbevarings udbyder.</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="121"/>
         <source>Host:</source>
-        <translation>Host:</translation>
+        <translation type="obsolete">Host:</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="125"/>
         <source>Port:</source>
-        <translation>Port:</translation>
+        <translation type="obsolete">Port:</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="131"/>
         <source>Database:</source>
-        <translation>Database:</translation>
+        <translation type="obsolete">Database:</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="135"/>
         <source>User:</source>
-        <translation>Bruger:</translation>
+        <translation type="obsolete">Bruger:</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="139"/>
         <source>Password:</source>
-        <translation>Kodeord:</translation>
+        <translation type="obsolete">Kodeord:</translation>
     </message>
 </context>
 <context>
@@ -3011,12 +3573,20 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="94"/>
         <source>Select Storage Provider</source>
-        <translation>Vælg opbevarings udbyder</translation>
+        <translation type="obsolete">Vælg opbevarings udbyder</translation>
     </message>
     <message>
         <location filename="../src/qtui/configwizard.cpp" line="95"/>
         <source>Please select the storage provider you want to use.</source>
-        <translation>Vælg den opbevarings udbyder du ønsker at bruge.</translation>
+        <translation type="obsolete">Vælg den opbevarings udbyder du ønsker at bruge.</translation>
+    </message>
+</context>
+<context>
+    <name>TopicLabel</name>
+    <message>
+        <location filename="../src/qtui/topiclabel.cpp" line="43"/>
+        <source>Drag to scroll the topic!</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3024,7 +3594,7 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
     <message>
         <location filename="../src/qtui/ui/topicwidget.ui" line="65"/>
         <source>...</source>
-        <translation>...</translation>
+        <translation type="obsolete">...</translation>
     </message>
     <message>
         <location filename="../src/qtui/ui/topicwidget.ui" line="31"/>
@@ -3032,43 +3602,219 @@ Unless you *really* know what you do, leave this as ISO-8859-1!</source>
         <translation>Formular</translation>
     </message>
 </context>
+<context>
+    <name>UiStyle</name>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="273"/>
+        <source>%DT[%1]</source>
+        <translation type="unfinished">%DT[%1]</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="278"/>
+        <source>%DS&lt;%1&gt;</source>
+        <translation type="unfinished">%DS&lt;%1&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="278"/>
+        <source>%D0%1</source>
+        <translation type="unfinished">%D0%1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="280"/>
+        <source>%Dn[%1]</source>
+        <translation type="unfinished">%Dn[%1]</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="280"/>
+        <source>%Dn%1</source>
+        <translation type="unfinished">%Dn%1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="282"/>
+        <source>%Ds*</source>
+        <translation type="unfinished">%Ds*</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="282"/>
+        <source>%Ds%1</source>
+        <translation type="unfinished">%Ds%1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="284"/>
+        <source>%De*</source>
+        <translation type="unfinished">%De*</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="319"/>
+        <source>%De%1</source>
+        <translation type="unfinished">%De%1</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="286"/>
+        <source>%Dj--&gt;</source>
+        <translation type="unfinished">%Dj--&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="286"/>
+        <source>%Dj%DN%1%DN %DH(%2@%3)%DH has joined %DC%4%DC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="288"/>
+        <source>%Dp&lt;--</source>
+        <translation type="unfinished">%Dp&lt;--</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="288"/>
+        <source>%Dp%DN%1%DN %DH(%2@%3)%DH has left %DC%4%DC</source>
+        <translation type="unfinished">%Dp%DN%1%DN %DH(%2@%3)%DH forlod %DC%4%DC</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="292"/>
+        <source>%Dq&lt;--</source>
+        <translation type="unfinished">%Dq&lt;--</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="292"/>
+        <source>%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit</source>
+        <translation type="unfinished">%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH afsluttede</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="296"/>
+        <source>%Dk&lt;-*</source>
+        <translation type="unfinished">%Dk&lt;-*</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="300"/>
+        <source>%Dk%DN%1%DN has kicked %DN%2%DN from %DC%3%DC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="305"/>
+        <source>%Dr&lt;-&gt;</source>
+        <translation type="unfinished">%Dr&lt;-&gt;</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="306"/>
+        <source>%DrYou are now known as %DN%1%DN</source>
+        <translation type="unfinished">%DrDu er nu kendt som %DN%1%DN</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="307"/>
+        <source>%Dr%DN%1%DN is now known as %DN%2%DN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="310"/>
+        <source>%Dm***</source>
+        <translation type="unfinished">%Dm***</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="311"/>
+        <source>%DmUser mode: %DM%1%DM</source>
+        <translation type="unfinished">%DmBruger mode: %DM%1%DM</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="312"/>
+        <source>%DmMode %DM%1%DM by %DN%2%DN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="315"/>
+        <source>%Da-*-</source>
+        <translation type="unfinished">%Da-*-</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="316"/>
+        <source>%Da%DN%1%DN %2</source>
+        <translation type="unfinished">%Da%DN%1%DN %2</translation>
+    </message>
+    <message>
+        <location filename="../src/uisupport/uistyle.cpp" line="320"/>
+        <source>%De[%1]</source>
+        <translation type="unfinished">%De[%1]</translation>
+    </message>
+</context>
 <context>
     <name>UserCategoryItem</name>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="469"/>
         <source>Owners</source>
-        <translation>Ejere</translation>
+        <translation type="obsolete">Ejere</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="470"/>
         <source>Admins</source>
-        <translation>Administratorer</translation>
+        <translation type="obsolete">Administratorer</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="471"/>
         <source>Operators</source>
-        <translation>Operatører</translation>
+        <translation type="obsolete">Operatører</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="472"/>
         <source>Half-Ops</source>
-        <translation>Halv-ops</translation>
-    </message>
-    <message>
-        <location filename="../src/client/networkmodel.cpp" line="473"/>
-        <source>Voiced</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Halv-ops</translation>
     </message>
     <message>
         <location filename="../src/client/networkmodel.cpp" line="485"/>
         <source>Users</source>
-        <translation>Brugere</translation>
+        <translation type="obsolete">Brugere</translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="489"/>
+        <source>%n Owner(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="490"/>
+        <source>%n Admin(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="491"/>
+        <source>%n Operator(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="492"/>
+        <source>%n Half-Op(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="493"/>
+        <source>%n Voiced</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/networkmodel.cpp" line="494"/>
+        <source>%n User(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
     <name>UserInputHandler</name>
     <message>
-        <location filename="../src/core/userinputhandler.cpp" line="76"/>
+        <location filename="../src/core/userinputhandler.cpp" line="113"/>
         <source>sending CTCP-%1 request</source>
         <translation>sender CTCP-%1 forespørgsel</translation>
     </message>
index 7335a4e..cd8b099 100644 (file)
@@ -1,36 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.1" language="de">
-<defaultcodec></defaultcodec>
 <context>
     <name>AboutDlg</name>
     <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
-        <source>Dialog</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="28"/>
-        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Bitstream Vera Sans&apos;; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Quassel IRC &lt;/span&gt;(pre-release)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="64"/>
+        <location filename="../src/qtopia/ui/aboutdlg.ui" line="13"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="69"/>
-        <source>Authors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/qtui/ui/aboutdlg.ui" line="74"/>
-        <source>Licence Agreement</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/qtopia/ui/aboutdlg.ui" line="19"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -49,2028 +25,3576 @@ p, li { white-space: pre-wrap; }
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:5pt;&quot;&gt;&amp;lt;devel@quassel-irc.org&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>AccountManagementSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages.h" line="74"/>
-        <source>Administration</source>
+        <location filename="../src/qtui/aboutdlg.cpp" line="47"/>
+        <source>&lt;b&gt;A modern, distributed IRC Client&lt;/b&gt;&lt;br&gt;&lt;br&gt;&amp;copy;2005-2008 by the Quassel Project&lt;br&gt;&lt;a href=&quot;http://quassel-irc.org&quot;&gt;http://quassel-irc.org&lt;/a&gt;&lt;br&gt;&lt;a href=&quot;irc://irc.freenode.net/quassel&quot;&gt;#quassel&lt;/a&gt; on &lt;a href=&quot;http://www.freenode.net&quot;&gt;Freenode&lt;/a&gt;&lt;br&gt;&lt;br&gt;Quassel IRC is dual-licensed under &lt;a href=&quot;http://www.gnu.org/licenses/gpl-2.0.txt&quot;&gt;GPLv2&lt;/a&gt; and &lt;a href=&quot;http://www.gnu.org/licenses/gpl-3.0.txt&quot;&gt;GPLv3&lt;/a&gt;.&lt;br&gt;Most icons are &amp;copy; by the &lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;Oxygen Team&lt;/a&gt; and used under the &lt;a href=&quot;http://www.gnu.org/licenses/lgpl.html&quot;&gt;LGPL&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Please use &lt;a href=&quot;http://bugs.quassel-irc.org&quot;&gt;http://bugs.quassel-irc.org&lt;/a&gt; to report bugs.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages.h" line="75"/>
-        <source>Account Management</source>
+        <location filename="../src/qtui/aboutdlg.cpp" line="55"/>
+        <source>Quassel IRC is mainly developed by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/usermgmtpage.ui" line="13"/>
-        <source>Form</source>
+        <location filename="../src/qtui/aboutdlg.cpp" line="69"/>
+        <source>We would like to thank the following contributors (in alphabetical order) and everybody we forgot to mention here:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/aboutdlg.cpp" line="95"/>
+        <source>Special thanks goes to:&lt;br&gt;&lt;dl&gt;&lt;dt&gt;&lt;b&gt;John &quot;nox-Hand&quot; Hand&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for great artwork and the Quassel logo/icon&lt;/dt&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.oxygen-icons.org&quot;&gt;The Oxygen Team&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating most of the other shiny icons you see throughout Quassel&lt;/dd&gt;&lt;dt&gt;&lt;b&gt;&lt;a href=&quot;http://www.trolltech.com&quot;&gt;Trolltech&lt;/a&gt;&lt;/b&gt;&lt;/dt&gt;&lt;dd&gt;for creating Qt and Qtopia, and for sponsoring development of Quasseltopia with Greenphones and more&lt;/dd&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
+        <source>About Quassel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/usermgmtpage.ui" line="19"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="61"/>
         <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:&apos;Bitstream Vera Sans&apos;; font-size:11pt;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Account Management&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:15pt; font-weight:600; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Quassel IRC&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/usermgmtpage.ui" line="43"/>
-        <source>Add...</source>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="77"/>
+        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:10pt; font-weight:600; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Version 0.2.0-pre, Build &amp;gt;= 474 (2008-02-08)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/usermgmtpage.ui" line="50"/>
-        <source>Remove</source>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="119"/>
+        <source>&amp;About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/usermgmtpage.ui" line="70"/>
-        <source>Rename</source>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="147"/>
+        <source>A&amp;uthors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/usermgmtpage.ui" line="77"/>
-        <source>Password...</source>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="175"/>
+        <source>&amp;Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/usermgmtpage.ui" line="84"/>
-        <source>Admin</source>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="203"/>
+        <source>&amp;Thanks To</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>AccountManagementSettingsPage</name>
+</context>
 <context>
     <name>AdminUserPage</name>
+</context>
+<context>
+    <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="65"/>
-        <source>Setup Admin User</source>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="66"/>
-        <source>Please enter credentials for the admin user.</source>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.cpp" line="29"/>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="68"/>
-        <source>Name:</source>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="13"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="72"/>
-        <source>Password:</source>
+        <location filename="../src/qtui/settingspages/appearancesettingspage.ui" line="19"/>
+        <source>Client style:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>Buffer</name>
+</context>
+<context>
+    <name>BufferItem</name>
     <message>
-        <location filename="../src/client/buffer.cpp" line="95"/>
+        <location filename="../src/client/networkmodel.cpp" line="157"/>
         <source>Status Buffer</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>BufferManagementSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages.h" line="37"/>
-        <source>Buffers</source>
+        <location filename="../src/client/networkmodel.cpp" line="295"/>
+        <source>&lt;b&gt;Status buffer of %1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages.h" line="38"/>
-        <source>Buffer Management</source>
+        <location filename="../src/client/networkmodel.cpp" line="299"/>
+        <source>&lt;b&gt;Channel %1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="13"/>
-        <source>Form</source>
+        <location filename="../src/client/networkmodel.cpp" line="302"/>
+        <source>&lt;b&gt;Users:&lt;/b&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="28"/>
-        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Bitstream Vera Sans&apos;; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Buffer Management&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="../src/client/networkmodel.cpp" line="312"/>
+        <source>&lt;b&gt;Topic:&lt;/b&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="68"/>
-        <source>Statistics</source>
+        <location filename="../src/client/networkmodel.cpp" line="318"/>
+        <source>&lt;b&gt;Mode:&lt;/b&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="83"/>
-        <source>Created: 01.04.2007
-Lines:     1234
-</source>
+        <location filename="../src/client/networkmodel.cpp" line="321"/>
+        <source>Not active &lt;br /&gt; Double-click to join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="102"/>
-        <source>Defines how many messages the local Quassel client shows for this buffer. This is independent from the central backlog storage in the core.</source>
+        <location filename="../src/client/networkmodel.cpp" line="325"/>
+        <source>&lt;b&gt;Query with %1&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="105"/>
-        <source>Local Display</source>
+        <location filename="../src/client/networkmodel.cpp" line="326"/>
+        <source>Away Message: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="117"/>
-        <source>Override default display options</source>
+        <location filename="../src/client/networkmodel.cpp" line="329"/>
+        <source>%1 - %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="135"/>
-        <source>Show all messages</source>
+        <location filename="../src/client/networkmodel.cpp" line="333"/>
+        <source>&lt;p&gt; %1 &lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>BufferManagementSettingsPage</name>
+</context>
+<context>
+    <name>BufferTreeModel</name>
+</context>
+<context>
+    <name>BufferView</name>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="158"/>
-        <source>Show last</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="51"/>
+        <source>Show Channel List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="412"/>
-        <source>messages</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="52"/>
+        <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="216"/>
-        <source>Show messages from the last</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="53"/>
+        <source>Disconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="465"/>
-        <source>days</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
+        <source>Join Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="261"/>
-        <source>Hide buffer locally</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="56"/>
+        <source>Join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="521"/>
-        <source>Save as default</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="57"/>
+        <source>Part</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="315"/>
-        <source>Backlog Storage</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="58"/>
+        <source>Hide buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="327"/>
-        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Bitstream Vera Sans&apos;; font-size:11pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Warning:&lt;/span&gt; This affects the global message storage (backlog) for the selected buffer!&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="59"/>
+        <source>Hide buffers permanently</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="343"/>
-        <source>Override default storage settings</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="60"/>
+        <source>Delete buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="361"/>
-        <source>Keep all messages</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="61"/>
+        <source>Ignore list</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="384"/>
-        <source>Keep last</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="63"/>
+        <source>Join Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="442"/>
-        <source>Keep messages from the last</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="64"/>
+        <source>Part Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="554"/>
-        <source>Delete permanently</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="65"/>
+        <source>Kill Events</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>BufferTreeModel</name>
     <message>
-        <location filename="../src/client/buffertreemodel.cpp" line="253"/>
-        <source>Buffer</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="66"/>
+        <source>Quit Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/buffertreemodel.cpp" line="253"/>
-        <source>Topic</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="67"/>
+        <source>Mode Events</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/buffertreemodel.cpp" line="253"/>
-        <source>Nick Count</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="393"/>
+        <source>Hide Events</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>BufferViewWidget</name>
     <message>
-        <location filename="../src/qtui/ui/bufferviewwidget.ui" line="27"/>
-        <source>BufferView</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="484"/>
+        <source>Input channel name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="36"/>
-        <source>All</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="516"/>
+        <source>Remove buffer permanently?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="37"/>
-        <source>Chans</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="518"/>
+        <source>Do you want to delete the buffer &quot;%1&quot; permanently? This will delete all related data, including all backlog data, from the core&apos;s database!</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>BufferViewDock</name>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="38"/>
-        <source>Queries</source>
+        <location filename="../src/uisupport/bufferview.cpp" line="586"/>
+        <source>All Buffers</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>BufferViewEditDlg</name>
     <message>
-        <location filename="../src/qtopia/bufferviewwidget.cpp" line="39"/>
-        <source>Nets</source>
+        <location filename="../src/qtui/settingspages/buffervieweditdlg.ui" line="13"/>
+        <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="13"/>
-        <source>Select Buffer</source>
+        <location filename="../src/qtui/settingspages/buffervieweditdlg.ui" line="21"/>
+        <source>Please enter a name for the buffer view:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="29"/>
-        <source>Tab 1</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="461"/>
+        <source>Add Buffer View</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>BufferWidget</name>
+    <name>BufferViewSettingsPage</name>
     <message>
-        <location filename="../src/qtui/ui/bufferwidget.ui" line="28"/>
-        <source>YourNickname #quassel Network: The Topic</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/bufferwidget.ui" line="106"/>
-        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;&quot;&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;Quassel IRC&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="34"/>
+        <source>Buffer Views</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ChannelWidget</name>
     <message>
-        <location filename="../src/qtui/ui/channelwidget.ui" line="30"/>
-        <source>YourNickname #quassel Network: The Topic</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="294"/>
+        <source>Delete Buffer View?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channelwidget.ui" line="74"/>
-        <source>...</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.cpp" line="295"/>
+        <source>Do you really want to delete the buffer view &quot;%1&quot;?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channelwidget.ui" line="114"/>
-        <source>&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Bitstream Vera Sans Mono&apos;; font-size:8pt; font-weight:400; font-style:normal; text-decoration:none;&quot;&gt;
-&lt;p style=&quot;-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:&apos;Nimbus Mono L&apos;;&quot;&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="13"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channelwidget.ui" line="152"/>
-        <source>32 Users</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="30"/>
+        <source>Re&amp;name...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channelwidget.ui" line="157"/>
-        <source>@ Operators</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="46"/>
+        <source>&amp;Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channelwidget.ui" line="201"/>
-        <source>New Sub Item</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="68"/>
+        <source>De&amp;lete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channelwidget.ui" line="216"/>
-        <source>New Item</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="80"/>
+        <source>Buffer View  Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channelwidget.ui" line="177"/>
-        <source>4 Voiced</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="88"/>
+        <source>Network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/channelwidget.ui" line="197"/>
-        <source>19 Users</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="96"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Client</name>
     <message>
-        <location filename="../src/client/client.cpp" line="212"/>
-        <source>Already connected to Core!</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="106"/>
+        <source>Restrict Buffers to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="229"/>
-        <source>Connecting...</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="112"/>
+        <source>Status Buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="251"/>
-        <source>Synchronizing to core...</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="119"/>
+        <source>Channel Buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="303"/>
-        <source>Invalid data received from core!</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="126"/>
+        <source>Query Buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="366"/>
-        <source>Requesting network states...</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="136"/>
+        <source>Hide inactive Buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="372"/>
-        <source>Requesting User states...</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="143"/>
+        <source>Add new Buffers automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="378"/>
-        <source>Requesting Channel states...</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="150"/>
+        <source>Sort alphabetically</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ConclusionPage</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="170"/>
-        <source>Conclusion</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="157"/>
+        <source>Minimum Activity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="171"/>
-        <source>You chose the following configuration:</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="165"/>
+        <source>No Activity</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ConfigWizard</name>
     <message>
-        <location filename="../src/qtui/configwizard.cpp" line="44"/>
-        <source>Core Configuration Wizard</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="170"/>
+        <source>Other Activity</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ConnectionSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages.h" line="56"/>
-        <source>Behavior</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="175"/>
+        <source>New Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages.h" line="57"/>
-        <source>Connection</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="180"/>
+        <source>Highlight</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/connectionpage.ui" line="13"/>
-        <source>Form</source>
+        <location filename="../src/qtui/settingspages/bufferviewsettingspage.ui" line="206"/>
+        <source>Preview:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CoreConnectDlg</name>
+    <name>BufferViewWidget</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="169"/>
-        <source>Create Account</source>
+        <location filename="../src/qtui/ui/bufferviewwidget.ui" line="27"/>
+        <source>BufferView</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="70"/>
-        <source>In order to connect to a Quassel Core, you need to create an account.&lt;br&gt;Please enter a name for this account now:</source>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="37"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="70"/>
-        <source>Default</source>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="38"/>
+        <source>Chans</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="169"/>
-        <source>Please enter a name for the new account:</source>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="39"/>
+        <source>Queries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="172"/>
-        <source>Account name already exists!</source>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="40"/>
+        <source>Nets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="172"/>
-        <source>An account named &apos;%1&apos; already exists, and account names must be unique!</source>
+        <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="13"/>
+        <source>Select Buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="183"/>
-        <source>Delete account?</source>
+        <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="29"/>
+        <source>Tab 1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>BufferWidget</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="185"/>
-        <source>Do you really want to delete the data for the account &apos;%1&apos;?&lt;br&gt;Note that this only affects your local account settings and will not remove any data from the core.</source>
+        <location filename="../src/qtui/ui/bufferwidget.ui" line="75"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Trebuchet MS&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/quassel/96x96/apps/quassel.png&quot; /&gt;&lt;span style=&quot; font-size:89pt; color:#00008b;&quot;&gt;uassel IRC&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:49pt;&quot;&gt;&lt;span style=&quot; font-size:22pt;&quot;&gt;Chat comfortably. Anywhere.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ChannelListDlg</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="218"/>
-        <source>Can&apos;t connect to internal core at the moment [serious breakage due to switch to dynamic signals]. Please check back later.</source>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="13"/>
+        <source>Channel List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="221"/>
-        <source>Can&apos;t connect to internal core, since we are running as a standalone GUI!</source>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="37"/>
+        <source>Search Pattern:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="224"/>
-        <source>Connecting to internal core</source>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="47"/>
+        <source>Search Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="227"/>
-        <source>Connecting to %1</source>
+        <location filename="../src/qtui/ui/channellistdlg.ui" line="71"/>
+        <source>Filter:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ChannelWidget</name>
+</context>
+<context>
+    <name>Client</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="241"/>
-        <source>Invalid user or password. Pleasy try again.%1</source>
+        <location filename="../src/client/client.cpp" line="287"/>
+        <source>Identity already exists in client!</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ClientSyncer</name>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="288"/>
-        <source>Connected to core.</source>
+        <location filename="../src/client/clientsyncer.cpp" line="55"/>
+        <source>The Quassel Core you try to connect to is too old! Please consider upgrading.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="295"/>
-        <source>Connection Error</source>
+        <location filename="../src/client/clientsyncer.cpp" line="80"/>
+        <source>&lt;b&gt;Invalid data received from core!&lt;/b&gt;&lt;br&gt;Disconnecting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/coreconnectdlg.cpp" line="295"/>
-        <source>&lt;b&gt;Could not connect to Quassel Core!&lt;/b&gt;&lt;br&gt;
-</source>
+        <location filename="../src/client/clientsyncer.cpp" line="112"/>
+        <source>Internal connections not yet supported.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="19"/>
-        <source>Connect to Quassel Core</source>
+        <location filename="../src/client/clientsyncer.cpp" line="130"/>
+        <source>&lt;b&gt;This client is built without SSL Support!&lt;/b&gt;&lt;br /&gt;Disable the usage of SSL in the account settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
-        <source>Account Settings</source>
+        <location filename="../src/client/clientsyncer.cpp" line="192"/>
+        <source>&lt;b&gt;The Quassel Core you are trying to connect to is too old!&lt;/b&gt;&lt;br&gt;Need at least core/client protocol v%1 to connect.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="59"/>
-        <source>Account:</source>
+        <location filename="../src/client/clientsyncer.cpp" line="208"/>
+        <source>&lt;b&gt;The Quassel Core you are trying to connect to does not support SSL!&lt;/b&gt;&lt;br /&gt;If you want to connect anyways, disable the usage of SSL in the account settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="96"/>
-        <source>...</source>
+        <location filename="../src/client/clientsyncer.cpp" line="238"/>
+        <source>Logging in...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ColorSettingsPage</name>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="119"/>
-        <source>Host:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="33"/>
+        <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="129"/>
-        <source>Use internal</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.cpp" line="33"/>
+        <source>Color settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="139"/>
-        <source>Port:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="19"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="172"/>
-        <source>User:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="29"/>
+        <source>Bufferview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="182"/>
-        <source>Password:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="35"/>
+        <source>Activities:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="196"/>
-        <source>Remember</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1489"/>
+        <source>FG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="236"/>
-        <source>Always use this account</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1499"/>
+        <source>BG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="275"/>
-        <source>Connecting to...</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1509"/>
+        <source>Use BG</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="281"/>
-        <source>Connecting...</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="71"/>
+        <source>Default:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="300"/>
-        <source>GUI Profile:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="120"/>
+        <source>Inactive:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="323"/>
-        <source>New...</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="160"/>
+        <source>Highlight:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="332"/>
-        <source>Always use this profile</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="197"/>
+        <source>New Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="38"/>
-        <source>New</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="234"/>
+        <source>Other Activity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="39"/>
-        <source>Delete</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1612"/>
+        <source>Preview:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="40"/>
-        <source>Properties...</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1619"/>
+        <source>1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="21"/>
-        <source>Select Core Account</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="319"/>
+        <source>Chatview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="39"/>
-        <source>Available Quassel Core accounts:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="335"/>
+        <source>Server Activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="128"/>
-        <source>Connect</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="885"/>
+        <source>Foreground</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CoreConnectProgressDlg</name>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="255"/>
-        <source>Connection Error</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="895"/>
+        <source>Background</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="255"/>
-        <source>&lt;b&gt;Could not connect to Quassel Core!&lt;/b&gt;&lt;br&gt;
-</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="371"/>
+        <source>Error Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="13"/>
-        <source>Connection Progress</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="411"/>
+        <source>Notice Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="32"/>
-        <source>Connecting...</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="451"/>
+        <source>Plain Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="19"/>
-        <source>&lt;b&gt;Connection to core in progress.&lt;/b&gt;</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="491"/>
+        <source>Server Message:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CoreSettingsPage</name>
     <message>
-        <location filename="../src/qtui/ui/coresettingspage.ui" line="13"/>
-        <source>Form</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="531"/>
+        <source>Highlight Message:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CtcpHandler</name>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="135"/>
-        <source>Received CTCP PING request from %1</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="562"/>
+        <source>User Activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="145"/>
-        <source>Received CTCP VERSION request by %1</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="598"/>
+        <source>Action Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/ctcphandler.cpp" line="152"/>
-        <source>Received unknown CTCP %1 by %2</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="638"/>
+        <source>Join Message:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>EditCoreAcctDlg</name>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="195"/>
-        <source>Missing information</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="678"/>
+        <source>Kick Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="196"/>
-        <source>Please enter all required information or discard changes to return to account selection.</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="718"/>
+        <source>Mode Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="202"/>
-        <source>Non-unique account name</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="758"/>
+        <source>Part Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="204"/>
-        <source>Account names need to be unique. Please enter a different name or discard all changes to return to account selection.</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="798"/>
+        <source>Quit Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="13"/>
-        <source>Edit Core Account</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="838"/>
+        <source>Rename Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="33"/>
-        <source>Port:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="879"/>
+        <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="40"/>
-        <source>Host:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="915"/>
+        <source>Timestamp:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="47"/>
-        <source>Password:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="955"/>
+        <source>Sender:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="63"/>
-        <source>Account:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="995"/>
+        <source>Nick:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/editcoreacctdlg.ui" line="90"/>
-        <source>User:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1035"/>
+        <source>Hostmask:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>FontsSettingsPage</name>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.cpp" line="28"/>
-        <source>Appearance</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1075"/>
+        <source>Channelname:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.cpp" line="28"/>
-        <source>Fonts</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1115"/>
+        <source>Mode flags:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="13"/>
-        <source>Form</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1155"/>
+        <source>Url:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="22"/>
-        <source>Custom Application Fonts</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1218"/>
+        <source>Mirc Color Codes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="223"/>
-        <source>General:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1230"/>
+        <source>Color Codes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="312"/>
-        <source>Font</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1236"/>
+        <source>Color 0:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="328"/>
-        <source>Choose...</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1257"/>
+        <source>Color 1:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="78"/>
-        <source>Topic:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1278"/>
+        <source>Color 2:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="120"/>
-        <source>Buffer Views:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1299"/>
+        <source>Color 3:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="165"/>
-        <source>Nick List:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1320"/>
+        <source>Color 4:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="215"/>
-        <source>Chat Widget</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1341"/>
+        <source>Color 5:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="335"/>
-        <source>Nicks:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1362"/>
+        <source>Color 6:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="345"/>
-        <source>Timestamp:</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1383"/>
+        <source>Color 7:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="365"/>
-        <source>Some of these settings require a restart of the Quassel Client in order to take effect. We intend to fix this.</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1404"/>
+        <source>Color 8:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Form</name>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="13"/>
-        <source>Form</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1411"/>
+        <source>Color 14:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="22"/>
-        <source>Network</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1418"/>
+        <source>Color 15:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="27"/>
-        <source>Identity</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1425"/>
+        <source>Color 13:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="149"/>
-        <source>&amp;Add...</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1432"/>
+        <source>Color 12:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="59"/>
-        <source>Connect now</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1439"/>
+        <source>Color 11:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="75"/>
-        <source>Re&amp;name...</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1446"/>
+        <source>Color 10:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="169"/>
-        <source>De&amp;lete</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1453"/>
+        <source>Color 9:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="105"/>
-        <source>Network Details</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1477"/>
+        <source>Nickview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="121"/>
-        <source>Servers</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1483"/>
+        <source>Nick status:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="159"/>
-        <source>&amp;Edit...</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1519"/>
+        <source>Online:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="209"/>
-        <source>Move upwards in list</source>
+        <location filename="../src/qtui/settingspages/colorsettingspage.ui" line="1559"/>
+        <source>Away:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ConclusionPage</name>
+</context>
+<context>
+    <name>ConfigWizard</name>
+</context>
+<context>
+    <name>ConnectionSettingsPage</name>
+</context>
+<context>
+    <name>Core</name>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="225"/>
-        <source>...</source>
+        <location filename="../src/core/core.cpp" line="57"/>
+        <source>Could not initialize any storage backend! Exiting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="222"/>
-        <source>Move downwards in list</source>
+        <location filename="../src/core/core.cpp" line="60"/>
+        <source>Currently, Quassel only supports SQLite3. You need to build your
+Qt library with the sqlite plugin enabled in order for quasselcore
+to work.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="267"/>
-        <source>Choose random server for connecting</source>
+        <location filename="../src/core/core.cpp" line="117"/>
+        <source>Calling restoreState() even though active sessions exist!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="275"/>
-        <source>Perform</source>
+        <location filename="../src/core/core.cpp" line="145"/>
+        <source>Admin user or password not set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="281"/>
-        <source>Commands to execute on connect:</source>
+        <location filename="../src/core/core.cpp" line="148"/>
+        <source>Could not setup storage!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="298"/>
-        <source>Auto Identify</source>
+        <location filename="../src/core/core.cpp" line="152"/>
+        <source>Creating admin user...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="312"/>
-        <source>Service:</source>
+        <location filename="../src/core/core.cpp" line="388"/>
+        <source>Antique client trying to connect... refusing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="319"/>
-        <source>NickServ</source>
+        <location filename="../src/core/core.cpp" line="402"/>
+        <source>&lt;b&gt;Your Quassel Client is too old!&lt;/b&gt;&lt;br&gt;This core needs at least client/core protocol version %1.&lt;br&gt;Please consider upgrading your client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="326"/>
-        <source>Password:</source>
+        <location filename="../src/core/core.cpp" line="404"/>
+        <source>Client %1 too old, rejecting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="346"/>
-        <source>Advanced</source>
+        <location filename="../src/core/core.cpp" line="419"/>
+        <source>&lt;b&gt;Quassel Core Version %1&lt;/b&gt;&lt;br&gt;Built: %2&lt;br&gt;Up %3d%4h%5m (since %6)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="352"/>
-        <source>Network Encoding</source>
+        <location filename="../src/core/core.cpp" line="482"/>
+        <source>&lt;b&gt;Client not initialized!&lt;/b&gt;&lt;br&gt;You need to send an init message before trying to login.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="360"/>
-        <source>Sending:</source>
+        <location filename="../src/core/core.cpp" line="484"/>
+        <source>Client %1 did not send an init message before trying to login, rejecting.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="380"/>
-        <source>Receiving:</source>
+        <location filename="../src/core/core.cpp" line="504"/>
+        <source>&lt;b&gt;Invalid username or password!&lt;/b&gt;&lt;br&gt;The username/password combination you supplied could not be found in the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="402"/>
-        <source>Use defaults</source>
+        <location filename="../src/core/core.cpp" line="510"/>
+        <source>Client %1 initialized and authenticated successfully as &quot;%2&quot; (UserId: %3).</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>IdentitiesDlg</name>
     <message>
-        <location filename="../src/qtui/identities.cpp" line="288"/>
-        <source>Default Identity</source>
+        <location filename="../src/core/core.cpp" line="522"/>
+        <source>Non-authed client disconnected.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/identities.cpp" line="61"/>
-        <source>Data changed remotely!</source>
+        <location filename="../src/core/core.cpp" line="545"/>
+        <source>Could not initialize session for client %1!</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>CoreAccountEditDlg</name>
     <message>
-        <location filename="../src/qtui/identities.cpp" line="62"/>
-        <source>&lt;b&gt;Some other GUI client changed the identities data!&lt;/b&gt;&lt;br&gt;Apply updated settings, losing all changes done locally?</source>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="492"/>
+        <source>Add Core Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/identities.cpp" line="253"/>
-        <source>Invalid Identity!</source>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="289"/>
+        <source>Missing information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/identities.cpp" line="255"/>
-        <source>One or more of your identities do not contain all necessary information:
-
-%1
-Please fill in any missing information.</source>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="290"/>
+        <source>Please enter all required information or discard changes to return to account selection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/identities.cpp" line="266"/>
-        <source> You have not set a real name.</source>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="297"/>
+        <source>Non-unique account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/identities.cpp" line="269"/>
-        <source> You have to specify an Ident.</source>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="299"/>
+        <source>Account names need to be unique. Please enter a different name or discard all changes to return to account selection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtui/identities.cpp" line="272"/>
-        <source> You haven&apos;t entered any nicknames.</source>
+        <location filename="../src/qtui/ui/coreaccounteditdlg.ui" line="13"/>
+        <source>Edit Core Account</source>
         <translation type="unfinished"></translation>