fixed inconsistency issues. Upgrade and Distclean is strongly recommended

[quassel.git] / i18n / quassel_de.ts

diff --git a/i18n/quassel_de.ts b/i18n/quassel_de.ts
index b9fa7bc..7335a4e 100644 (file)
--- a/i18n/quassel_de.ts
+++ b/i18n/quassel_de.ts
@@ -4,12 +4,12 @@
 <context>
     <name>AboutDlg</name>
     <message>
-        <location filename="../src/qtgui/ui/aboutdlg.ui" line="16"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="16"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/aboutdlg.ui" line="28"/>
+        <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;
@@ -17,40 +17,58 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/aboutdlg.ui" line="64"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="64"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/aboutdlg.ui" line="69"/>
+        <location filename="../src/qtui/ui/aboutdlg.ui" line="69"/>
         <source>Authors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/aboutdlg.ui" line="74"/>
+        <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;
+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;&quot;&gt;&lt;span style=&quot; font-weight:600;&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:14pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-size:8pt; font-weight:400;&quot;&gt;mobile edition&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;&quot;&gt;&lt;span style=&quot; font-size:5pt;&quot;&gt; &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:5pt;&quot;&gt;(C) 2005-2007 by&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:5pt; font-weight:600;&quot;&gt;The Quassel IRC Team&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:5pt;&quot;&gt;Manuel Nickschas&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:5pt;&quot;&gt;Marcus Eggenberger&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:5pt;&quot;&gt;Marco Genise&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:5pt;&quot;&gt;&lt;span style=&quot; font-size:4pt;&quot;&gt; &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:5pt;&quot;&gt;&amp;lt;http://quassel-irc.org&amp;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: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/qtgui/settingspages.h" line="74"/>
+        <location filename="../src/qtui/settingspages.h" line="74"/>
         <source>Administration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/settingspages.h" line="75"/>
+        <location filename="../src/qtui/settingspages.h" line="75"/>
         <source>Account Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/usermgmtpage.ui" line="13"/>
+        <location filename="../src/qtui/ui/usermgmtpage.ui" line="13"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/usermgmtpage.ui" line="19"/>
+        <location filename="../src/qtui/ui/usermgmtpage.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;
 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;
@@ -58,35 +76,58 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/usermgmtpage.ui" line="43"/>
+        <location filename="../src/qtui/ui/usermgmtpage.ui" line="43"/>
         <source>Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/usermgmtpage.ui" line="50"/>
+        <location filename="../src/qtui/ui/usermgmtpage.ui" line="50"/>
         <source>Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/usermgmtpage.ui" line="70"/>
+        <location filename="../src/qtui/ui/usermgmtpage.ui" line="70"/>
         <source>Rename</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/usermgmtpage.ui" line="77"/>
+        <location filename="../src/qtui/ui/usermgmtpage.ui" line="77"/>
         <source>Password...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/usermgmtpage.ui" line="84"/>
+        <location filename="../src/qtui/ui/usermgmtpage.ui" line="84"/>
         <source>Admin</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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>Buffer</name>
     <message>
-        <location filename="../src/client/buffer.cpp" line="75"/>
+        <location filename="../src/client/buffer.cpp" line="95"/>
         <source>Status Buffer</source>
         <translation type="unfinished"></translation>
     </message>
@@ -94,22 +135,22 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BufferManagementSettingsPage</name>
     <message>
-        <location filename="../src/qtgui/settingspages.h" line="37"/>
+        <location filename="../src/qtui/settingspages.h" line="37"/>
         <source>Buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/settingspages.h" line="38"/>
+        <location filename="../src/qtui/settingspages.h" line="38"/>
         <source>Buffer Management</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="13"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="13"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="28"/>
+        <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;
@@ -117,74 +158,74 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="68"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="68"/>
         <source>Statistics</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="83"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="83"/>
         <source>Created: 01.04.2007
 Lines:     1234
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="102"/>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="105"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="105"/>
         <source>Local Display</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="117"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="117"/>
         <source>Override default display options</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="135"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="135"/>
         <source>Show all messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="158"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="158"/>
         <source>Show last</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="412"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="412"/>
         <source>messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="216"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="216"/>
         <source>Show messages from the last</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="465"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="465"/>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="261"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="261"/>
         <source>Hide buffer locally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="521"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="521"/>
         <source>Save as default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="315"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="315"/>
         <source>Backlog Storage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="327"/>
+        <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;
@@ -192,27 +233,27 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="343"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="343"/>
         <source>Override default storage settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="361"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="361"/>
         <source>Keep all messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="384"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="384"/>
         <source>Keep last</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="442"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="442"/>
         <source>Keep messages from the last</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/buffermgmtpage.ui" line="554"/>
+        <location filename="../src/qtui/ui/buffermgmtpage.ui" line="554"/>
         <source>Delete permanently</source>
         <translation type="unfinished"></translation>
     </message>
@@ -220,80 +261,90 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BufferTreeModel</name>
     <message>
-        <location filename="../src/client/buffertreemodel.cpp" line="125"/>
+        <location filename="../src/client/buffertreemodel.cpp" line="253"/>
         <source>Buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/buffertreemodel.cpp" line="125"/>
-        <source>Network</source>
+        <location filename="../src/client/buffertreemodel.cpp" line="253"/>
+        <source>Topic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/buffertreemodel.cpp" line="253"/>
+        <source>Nick Count</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BufferViewWidget</name>
     <message>
-        <location filename="../src/qtgui/ui/bufferviewwidget.ui" line="27"/>
+        <location filename="../src/qtui/ui/bufferviewwidget.ui" line="27"/>
         <source>BufferView</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>BufferWidget</name>
     <message>
-        <location filename="../src/qtgui/bufferwidget.cpp" line="221"/>
-        <source>%1 Users</source>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="36"/>
+        <source>All</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/bufferwidget.cpp" line="196"/>
-        <source>1 User</source>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="37"/>
+        <source>Chans</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/bufferwidget.cpp" line="211"/>
-        <source>%1 Operators</source>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="38"/>
+        <source>Queries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/bufferwidget.cpp" line="216"/>
-        <source>%1 Voiced</source>
+        <location filename="../src/qtopia/bufferviewwidget.cpp" line="39"/>
+        <source>Nets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/bufferwidget.ui" line="28"/>
-        <source>YourNickname #quassel Network: The Topic</source>
+        <location filename="../src/qtopia/ui/bufferviewwidget.ui" line="13"/>
+        <source>Select Buffer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/bufferwidget.ui" line="91"/>
-        <source>...</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/qtgui/ui/bufferwidget.ui" line="157"/>
+        <location filename="../src/qtui/ui/bufferwidget.ui" line="28"/>
+        <source>YourNickname #quassel Network: The Topic</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:14pt; 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;&quot;&gt;Yarrrrr!&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;Avast, ye scurvy dogs!&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;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 type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ChannelWidget</name>
     <message>
-        <location filename="../src/qtgui/ui/channelwidget.ui" line="30"/>
+        <location filename="../src/qtui/ui/channelwidget.ui" line="30"/>
         <source>YourNickname #quassel Network: The Topic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/channelwidget.ui" line="74"/>
+        <location filename="../src/qtui/ui/channelwidget.ui" line="74"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/channelwidget.ui" line="114"/>
+        <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;
@@ -301,32 +352,32 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/channelwidget.ui" line="152"/>
+        <location filename="../src/qtui/ui/channelwidget.ui" line="152"/>
         <source>32 Users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/channelwidget.ui" line="157"/>
+        <location filename="../src/qtui/ui/channelwidget.ui" line="157"/>
         <source>@ Operators</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/channelwidget.ui" line="201"/>
+        <location filename="../src/qtui/ui/channelwidget.ui" line="201"/>
         <source>New Sub Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/channelwidget.ui" line="216"/>
+        <location filename="../src/qtui/ui/channelwidget.ui" line="216"/>
         <source>New Item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/channelwidget.ui" line="177"/>
+        <location filename="../src/qtui/ui/channelwidget.ui" line="177"/>
         <source>4 Voiced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/channelwidget.ui" line="197"/>
+        <location filename="../src/qtui/ui/channelwidget.ui" line="197"/>
         <source>19 Users</source>
         <translation type="unfinished"></translation>
     </message>
@@ -334,45 +385,76 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>Client</name>
     <message>
-        <location filename="../src/client/client.cpp" line="125"/>
+        <location filename="../src/client/client.cpp" line="212"/>
         <source>Already connected to Core!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="139"/>
+        <location filename="../src/client/client.cpp" line="229"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="168"/>
+        <location filename="../src/client/client.cpp" line="251"/>
         <source>Synchronizing to core...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="213"/>
+        <location filename="../src/client/client.cpp" line="303"/>
         <source>Invalid data received from core!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/client/client.cpp" line="233"/>
+        <location filename="../src/client/client.cpp" line="366"/>
         <source>Requesting network states...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/client/client.cpp" line="372"/>
+        <source>Requesting User states...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/client/client.cpp" line="378"/>
+        <source>Requesting Channel states...</source>
+        <translation type="unfinished"></translation>
+    </message>
+</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>ConnectionSettingsPage</name>
     <message>
-        <location filename="../src/qtgui/settingspages.h" line="56"/>
+        <location filename="../src/qtui/settingspages.h" line="56"/>
         <source>Behavior</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/settingspages.h" line="57"/>
+        <location filename="../src/qtui/settingspages.h" line="57"/>
         <source>Connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/connectionpage.ui" line="13"/>
+        <location filename="../src/qtui/ui/connectionpage.ui" line="13"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
@@ -380,163 +462,163 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConnectDlg</name>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="166"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="169"/>
         <source>Create Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="67"/>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="67"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="70"/>
         <source>Default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="166"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="169"/>
         <source>Please enter a name for the new account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="169"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="172"/>
         <source>Account name already exists!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="169"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="172"/>
         <source>An account named &apos;%1&apos; already exists, and account names must be unique!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="104"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="183"/>
         <source>Delete account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="106"/>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="216"/>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="219"/>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="222"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="224"/>
         <source>Connecting to internal core</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="225"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="227"/>
         <source>Connecting to %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="239"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="241"/>
         <source>Invalid user or password. Pleasy try again.%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="286"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="288"/>
         <source>Connected to core.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="293"/>
+        <location filename="../src/qtui/coreconnectdlg.cpp" line="295"/>
         <source>Connection Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/coreconnectdlg.cpp" line="293"/>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="19"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="19"/>
         <source>Connect to Quassel Core</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="53"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="53"/>
         <source>Account Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="59"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="59"/>
         <source>Account:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectdlg.ui" line="88"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="96"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="119"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="119"/>
         <source>Host:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="129"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="129"/>
         <source>Use internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="139"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="139"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="172"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="172"/>
         <source>User:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="182"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="182"/>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="196"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="196"/>
         <source>Remember</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="236"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="236"/>
         <source>Always use this account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="275"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="275"/>
         <source>Connecting to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="281"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="281"/>
         <source>Connecting...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="300"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="300"/>
         <source>GUI Profile:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="323"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="323"/>
         <source>New...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/coreconnectdlg.ui" line="332"/>
+        <location filename="../src/qtui/ui/coreconnectdlg.ui" line="332"/>
         <source>Always use this profile</source>
         <translation type="unfinished"></translation>
     </message>
@@ -574,12 +656,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>CoreConnectProgressDlg</name>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="240"/>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="255"/>
         <source>Connection Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="240"/>
+        <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 type="unfinished"></translation>
@@ -590,38 +672,61 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="25"/>
+        <location filename="../src/qtopia/ui/coreconnectprogressdlg.ui" line="32"/>
         <source>Connecting...</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>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CoreSettingsPage</name>
     <message>
-        <location filename="../src/qtgui/ui/coresettingspage.ui" line="13"/>
+        <location filename="../src/qtui/ui/coresettingspage.ui" line="13"/>
         <source>Form</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>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ctcphandler.cpp" line="145"/>
+        <source>Received CTCP VERSION request by %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ctcphandler.cpp" line="152"/>
+        <source>Received unknown CTCP %1 by %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>EditCoreAcctDlg</name>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="180"/>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="195"/>
         <source>Missing information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="181"/>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="196"/>
         <source>Please enter all required information or discard changes to return to account selection.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="187"/>
+        <location filename="../src/qtopia/coreconnectdlg.cpp" line="202"/>
         <source>Non-unique account name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtopia/coreconnectdlg.cpp" line="189"/>
+        <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 type="unfinished"></translation>
     </message>
@@ -656,30 +761,231 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>FontsSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.cpp" line="28"/>
+        <source>Appearance</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.cpp" line="28"/>
+        <source>Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="22"/>
+        <source>Custom Application Fonts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="223"/>
+        <source>General:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="312"/>
+        <source>Font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="328"/>
+        <source>Choose...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="78"/>
+        <source>Topic:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="120"/>
+        <source>Buffer Views:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="165"/>
+        <source>Nick List:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="215"/>
+        <source>Chat Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="335"/>
+        <source>Nicks:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/fontssettingspage.ui" line="345"/>
+        <source>Timestamp:</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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Form</name>
+    <message>
+        <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="22"/>
+        <source>Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="27"/>
+        <source>Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="149"/>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="59"/>
+        <source>Connect now</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="75"/>
+        <source>Re&amp;name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="169"/>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="105"/>
+        <source>Network Details</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="121"/>
+        <source>Servers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="159"/>
+        <source>&amp;Edit...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="209"/>
+        <source>Move upwards in list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="225"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="222"/>
+        <source>Move downwards in list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="267"/>
+        <source>Choose random server for connecting</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="275"/>
+        <source>Perform</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="281"/>
+        <source>Commands to execute on connect:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="298"/>
+        <source>Auto Identify</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="312"/>
+        <source>Service:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="319"/>
+        <source>NickServ</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="326"/>
+        <source>Password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="346"/>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="352"/>
+        <source>Network Encoding</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="360"/>
+        <source>Sending:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="380"/>
+        <source>Receiving:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/networkssettingspage.ui" line="402"/>
+        <source>Use defaults</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>IdentitiesDlg</name>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="288"/>
+        <location filename="../src/qtui/identities.cpp" line="288"/>
         <source>Default Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="61"/>
+        <location filename="../src/qtui/identities.cpp" line="61"/>
         <source>Data changed remotely!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="62"/>
+        <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>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="253"/>
+        <location filename="../src/qtui/identities.cpp" line="253"/>
         <source>Invalid Identity!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="255"/>
+        <location filename="../src/qtui/identities.cpp" line="255"/>
         <source>One or more of your identities do not contain all necessary information:
 
 %1
@@ -687,133 +993,133 @@ Please fill in any missing information.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="266"/>
+        <location filename="../src/qtui/identities.cpp" line="266"/>
         <source> You have not set a real name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="269"/>
+        <location filename="../src/qtui/identities.cpp" line="269"/>
         <source> You have to specify an Ident.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="272"/>
+        <location filename="../src/qtui/identities.cpp" line="272"/>
         <source> You haven&apos;t entered any nicknames.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="275"/>
+        <location filename="../src/qtui/identities.cpp" line="275"/>
         <source>[%1]%2
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="21"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="21"/>
         <source>Edit Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="62"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="62"/>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="78"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="78"/>
         <source>&amp;General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="98"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="98"/>
         <source>Real Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="111"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="111"/>
         <source>Ident</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="120"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="120"/>
         <source>Nicknames</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="160"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="160"/>
         <source>&amp;Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="184"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="184"/>
         <source>&amp;Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="202"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="202"/>
         <source>De&amp;lete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="243"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="243"/>
         <source>...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="297"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="297"/>
         <source>&amp;Away</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="423"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="423"/>
         <source>Away Reason</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="416"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="416"/>
         <source>Return Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="340"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="340"/>
         <source>Away Nick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="349"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="349"/>
         <source>Auto Away</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="361"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="361"/>
         <source>Enable Auto Away</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="376"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="376"/>
         <source>Auto away after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="386"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="386"/>
         <source>minutes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="455"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="455"/>
         <source>&amp;Messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="475"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="475"/>
         <source>Part Reason</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="488"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="488"/>
         <source>Quit Reason</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitiesdlg.ui" line="498"/>
+        <location filename="../src/qtui/ui/identitiesdlg.ui" line="498"/>
         <source>Kick Reason</source>
         <translation type="unfinished"></translation>
     </message>
@@ -821,363 +1127,546 @@ Please fill in any missing information.</source>
 <context>
     <name>IdentitiesEditDlg</name>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="313"/>
+        <location filename="../src/qtui/identities.cpp" line="313"/>
         <source>Default Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="387"/>
+        <location filename="../src/qtui/identities.cpp" line="387"/>
         <source>Delete Identity?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="389"/>
+        <location filename="../src/qtui/identities.cpp" line="389"/>
         <source>Do you really want to delete identity &quot;%1&quot;?
 Networks using this identity will be reset to use the default identity.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="390"/>
+        <location filename="../src/qtui/identities.cpp" line="390"/>
         <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="390"/>
+        <location filename="../src/qtui/identities.cpp" line="390"/>
         <source>&amp;Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitieseditdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui/identitieseditdlg.ui" line="13"/>
         <source>Edit Identities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitieseditdlg.ui" line="47"/>
+        <location filename="../src/qtui/ui/identitieseditdlg.ui" line="47"/>
         <source>&amp;Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitieseditdlg.ui" line="54"/>
+        <location filename="../src/qtui/ui/identitieseditdlg.ui" line="54"/>
         <source>&amp;Duplicate...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitieseditdlg.ui" line="61"/>
+        <location filename="../src/qtui/ui/identitieseditdlg.ui" line="61"/>
         <source>&amp;Rename...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/identitieseditdlg.ui" line="68"/>
+        <location filename="../src/qtui/ui/identitieseditdlg.ui" line="68"/>
         <source>De&amp;lete</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context encoding="UTF-8">
+<context>
+    <name>IdentitiesSettingsPage</name>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="13"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="24"/>
+        <source>Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="236"/>
+        <source>...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="81"/>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="89"/>
+        <source>Real Name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="101"/>
+        <source>Nicknames</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="142"/>
+        <source>&amp;Add...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="164"/>
+        <source>Re&amp;name...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="180"/>
+        <source>De&amp;lete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="220"/>
+        <source>Move upwards in list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="233"/>
+        <source>Move downwards in list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="295"/>
+        <source>A&amp;way</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="456"/>
+        <source>Away Reason</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="449"/>
+        <source>Return Message</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="344"/>
+        <source>Away Nick</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="353"/>
+        <source>Auto Away</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="397"/>
+        <source>Auto away after</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="407"/>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="488"/>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="496"/>
+        <source>Ident:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="508"/>
+        <source>Messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="534"/>
+        <source>Part Reason:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="547"/>
+        <source>Quit Reason:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/settingspages/identitiessettingspage.ui" line="557"/>
+        <source>Kick Reason:</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IntroPage</name>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="49"/>
+        <source>Introduction</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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>IrcServerHandler</name>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="343"/>
+        <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="380"/>
+        <source>No topic is set for %1.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="389"/>
+        <source>Topic for %1 is &quot;%2&quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="397"/>
+        <source>Topic set by %1 on %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="426"/>
+        <source>Your desired nickname contains illegal characters!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="461"/>
+        <source>Please use /nick &lt;othernick&gt; to continue your IRC-Session!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/core/ircserverhandler.cpp" line="460"/>
+        <source>Nick %1 is already taken</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>MainWidget</name>
     <message>
         <location filename="../src/qtopia/ui/mainwidget.ui" line="13"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
-    <message encoding="UTF-8">
-        <location filename="../src/qtopia/ui/mainwidget.ui" line="48"/>
+    <message>
+        <location filename="../src/qtopia/ui/mainwidget.ui" line="56"/>
+        <source>background-color: rgba(220, 220, 255, 40%)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtopia/ui/mainwidget.ui" line="62"/>
         <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:14pt; 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; font-size:10pt;&quot;&gt;&lt;span style=&quot; font-size:6pt;&quot;&gt;&amp;lt;Sput&amp;gt; So soll das hier dann mal ungefähr aussehen...&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:6pt;&quot;&gt;&amp;lt;Foo&amp;gt; aha, na allzuviel Text bekommt man da wahrscheinlich nicht unter.&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:6pt;&quot;&gt;&amp;lt;Sput&amp;gt; Man wird sehen müssen...&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:6pt;&quot;&gt;&amp;lt;Foo&amp;gt; Das ist wohl wahr...&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+&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;&quot;&gt;&lt;span style=&quot; font-size:29pt; 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:29pt; color:#7fff00;&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#00008b;&quot;&gt;mobile edition&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:29pt; color:#483d8b;&quot;&gt;&lt;span style=&quot; font-size:6pt; color:#000000;&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>MainWin</name>
     <message>
-        <location filename="../src/qtgui/mainwin.cpp" line="39"/>
+        <location filename="../src/qtui/mainwin.cpp" line="46"/>
         <source>Waiting for core...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/mainwin.cpp" line="54"/>
+        <location filename="../src/qtui/mainwin.cpp" line="219"/>
         <source>Not connected to core.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/mainwin.cpp" line="119"/>
+        <location filename="../src/qtui/mainwin.cpp" line="165"/>
         <source>All Buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/mainwin.cpp" line="120"/>
+        <location filename="../src/qtui/mainwin.cpp" line="166"/>
         <source>All Channels</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/mainwin.cpp" line="121"/>
+        <location filename="../src/qtui/mainwin.cpp" line="167"/>
         <source>All Queries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/mainwin.cpp" line="122"/>
+        <location filename="../src/qtui/mainwin.cpp" line="168"/>
         <source>All Networks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/mainwin.cpp" line="123"/>
+        <location filename="../src/qtui/mainwin.cpp" line="169"/>
         <source>Full Custom</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="13"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="13"/>
         <source>MainWindow</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="54"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="54"/>
         <source>Connection</source>
         <translation type="unfinished">Verbindung</translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="73"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="73"/>
         <source>Settings</source>
         <translation type="unfinished">Einstellungen</translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="83"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="83"/>
         <source>Views</source>
         <translation type="unfinished">Ansicht</translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="90"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="90"/>
         <source>Help</source>
         <translation type="unfinished">Hilfe</translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="97"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="97"/>
         <source>Debug</source>
         <translation type="unfinished">Debug</translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="103"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="102"/>
         <source>Core</source>
         <translation type="unfinished">Core</translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="116"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="115"/>
         <source>&amp;Network List...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="119"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="118"/>
         <source>F2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="127"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="126"/>
         <source>Quick &amp;Connect...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="210"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="209"/>
         <source>Disconnect</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Trennen</translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="143"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="142"/>
         <source>Reconnect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="151"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="150"/>
         <source>Join Channel...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="159"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="158"/>
         <source>Set Away globally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="164"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="163"/>
         <source>Quit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="169"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="168"/>
         <source>Edit Identities...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="174"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="173"/>
         <source>Configure Quassel...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="177"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="176"/>
         <source>F7</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="185"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="184"/>
         <source>Manage Views...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="190"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="189"/>
         <source>About Qt...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="195"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="194"/>
         <source>About Quassel IRC...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="200"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="199"/>
         <source>Import Backlog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="205"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="204"/>
         <source>Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="215"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="214"/>
         <source>Internal</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="223"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="222"/>
         <source>Disconnect from Core</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/mainwin.ui" line="231"/>
+        <location filename="../src/qtui/ui/mainwin.ui" line="230"/>
         <source>Connect to Core...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/qtui/mainwin.cpp" line="208"/>
+        <source>Connected to core.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Message</name>
     <message>
-        <location filename="../src/common/message.cpp" line="88"/>
+        <location filename="../src/common/message.cpp" line="121"/>
         <source>%DT[%1]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="93"/>
+        <location filename="../src/common/message.cpp" line="126"/>
         <source>%DS&lt;%1&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="93"/>
+        <location filename="../src/common/message.cpp" line="126"/>
         <source>%D0%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="95"/>
+        <location filename="../src/common/message.cpp" line="128"/>
         <source>%Ds*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="95"/>
+        <location filename="../src/common/message.cpp" line="128"/>
         <source>%Ds%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="97"/>
+        <location filename="../src/common/message.cpp" line="130"/>
         <source>%De*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="132"/>
+        <location filename="../src/common/message.cpp" line="165"/>
         <source>%De%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="99"/>
+        <location filename="../src/common/message.cpp" line="132"/>
         <source>%Dj--&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="99"/>
+        <location filename="../src/common/message.cpp" line="132"/>
         <source>%Dj%DN%DU%1%DU%DN %DH(%2@%3)%DH has joined %DC%DU%4%DU%DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="101"/>
+        <location filename="../src/common/message.cpp" line="134"/>
         <source>%Dp&lt;--</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="101"/>
+        <location filename="../src/common/message.cpp" line="134"/>
         <source>%Dp%DN%DU%1%DU%DN %DH(%2@%3)%DH has left %DC%DU%4%DU%DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="105"/>
+        <location filename="../src/common/message.cpp" line="138"/>
         <source>%Dq&lt;--</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="105"/>
+        <location filename="../src/common/message.cpp" line="138"/>
         <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="109"/>
+        <location filename="../src/common/message.cpp" line="142"/>
         <source>%Dk&lt;-*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="113"/>
+        <location filename="../src/common/message.cpp" line="146"/>
         <source>%Dk%DN%DU%1%DU%DN has kicked %DN%DU%2%DU%DN from %DC%DU%3%DU%DC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="118"/>
+        <location filename="../src/common/message.cpp" line="151"/>
         <source>%Dr&lt;-&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="119"/>
+        <location filename="../src/common/message.cpp" line="152"/>
         <source>%DrYou are now known as %DN%1%DN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="120"/>
+        <location filename="../src/common/message.cpp" line="153"/>
         <source>%Dr%DN%1%DN is now known as %DN%DU%2%DU%DN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="123"/>
+        <location filename="../src/common/message.cpp" line="156"/>
         <source>%Dm***</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="124"/>
+        <location filename="../src/common/message.cpp" line="157"/>
         <source>%DmUser mode: %DM%1%DM</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="125"/>
+        <location filename="../src/common/message.cpp" line="158"/>
         <source>%DmMode %DM%1%DM by %DN%DU%2%DU%DN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="128"/>
+        <location filename="../src/common/message.cpp" line="161"/>
         <source>%Da-*-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="129"/>
+        <location filename="../src/common/message.cpp" line="162"/>
         <source>%Da%DN%DU%1%DU%DN %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/message.cpp" line="133"/>
+        <location filename="../src/common/message.cpp" line="166"/>
         <source>%De[%1]</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1185,102 +1674,102 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NetworkEditDlg</name>
     <message>
-        <location filename="../src/qtgui/serverlist.cpp" line="346"/>
+        <location filename="../src/qtui/serverlist.cpp" line="346"/>
         <source>Default Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/serverlist.cpp" line="271"/>
+        <location filename="../src/qtui/serverlist.cpp" line="271"/>
         <source>Invalid Network Settings!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/serverlist.cpp" line="272"/>
+        <location filename="../src/qtui/serverlist.cpp" line="272"/>
         <source>&lt;b&gt;Your network settings are invalid!&lt;/b&gt;&lt;br&gt;%1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/serverlist.cpp" line="281"/>
+        <location filename="../src/qtui/serverlist.cpp" line="281"/>
         <source> Network name already exists.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/serverlist.cpp" line="284"/>
+        <location filename="../src/qtui/serverlist.cpp" line="284"/>
         <source> You need to enter at least one server for this network.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="13"/>
         <source>Edit Network Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="33"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="54"/>
         <source>Identity:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="40"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="61"/>
         <source>Network:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="47"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="68"/>
         <source>Group:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="83"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="111"/>
         <source>Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="98"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="126"/>
         <source>Comment:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="107"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="135"/>
         <source>Auto-connect on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="124"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="152"/>
         <source>Servers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="147"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="193"/>
         <source>&amp;Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="154"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="200"/>
         <source>&amp;Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="161"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="207"/>
         <source>De&amp;lete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="168"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="214"/>
         <source>Move &amp;Up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="175"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="221"/>
         <source>Move &amp;Down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="198"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="244"/>
         <source>Perform</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/networkeditdlg.ui" line="228"/>
+        <location filename="../src/qtui/ui/networkeditdlg.ui" line="292"/>
         <source>These commands are executed after connect.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1288,159 +1777,203 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>NickEditDlg</name>
     <message>
-        <location filename="../src/qtgui/ui/nickeditdlg.ui" line="21"/>
+        <location filename="../src/qtui/ui/nickeditdlg.ui" line="21"/>
         <source>Edit Nick</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/nickeditdlg.ui" line="36"/>
+        <location filename="../src/qtui/ui/nickeditdlg.ui" line="36"/>
         <source>Nickname:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>RenameIdentityDlg</name>
+    <name>NickListWidget</name>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="430"/>
-        <source>Edit Identity Name</source>
+        <location filename="../src/qtopia/ui/nicklistwidget.ui" line="13"/>
+        <source>Nicks in Channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/identities.cpp" line="431"/>
-        <source>Identity:</source>
+        <location filename="../src/qtui/ui/nicklistwidget.ui" line="19"/>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Server</name>
-    <message>
-        <location filename="../src/core/server.cpp" line="731"/>
-        <source>%1 has changed topic for %2 to: &quot;%3&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/core/server.cpp" line="787"/>
-        <source>No topic is set for %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/core/server.cpp" line="794"/>
-        <source>Topic for %1 is &quot;%2&quot;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/core/server.cpp" line="800"/>
-        <source>Topic set by %1 on %2</source>
-        <translation type="unfinished"></translation>
+    <name>NickModel</name>
+    <message>
+        <location filename="../src/client/nickmodel.cpp" line="137"/>
+        <source>Not in channel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/nickmodel.cpp" line="147"/>
+        <source>%n Owner(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/nickmodel.cpp" line="148"/>
+        <source>%n Admin(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/nickmodel.cpp" line="149"/>
+        <source>%n Operator(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/nickmodel.cpp" line="150"/>
+        <source>%n Half-Op(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/nickmodel.cpp" line="151"/>
+        <source>%n Voiced</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <location filename="../src/client/nickmodel.cpp" line="152"/>
+        <source>%n User(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>QtopiaMainWin</name>
     <message>
-        <location filename="../src/core/server.cpp" line="843"/>
-        <source>There is a nickname in your identity&apos;s nicklist which contains illegal characters</source>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="70"/>
+        <source>Show Toolbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/server.cpp" line="844"/>
-        <source>Due to a bug in Unreal IRCd (and maybe other irc-servers too) we&apos;re unable to determine the erroneous nick</source>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="101"/>
+        <source>Quit Quassel IRC?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/server.cpp" line="845"/>
-        <source>Please use: /nick &lt;othernick&gt; to continue or clean up your nicklist</source>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="101"/>
+        <source>Do you really want to quit Quassel IRC?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/server.cpp" line="848"/>
-        <source>Nick %1 contains illegal characters</source>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="103"/>
+        <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/server.cpp" line="875"/>
-        <source>No free and valid nicks in nicklist found. use: /nick &lt;othernick&gt; to continue</source>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="114"/>
+        <source>Show Buffers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/server.cpp" line="866"/>
-        <source>Nick %1 is already taken</source>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="115"/>
+        <source>Show Nicks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/server.cpp" line="890"/>
-        <source>Received CTCP PING request by %1</source>
+        <location filename="../src/qtopia/qtopiamainwin.cpp" line="124"/>
+        <source>About...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>RenameIdentityDlg</name>
     <message>
-        <location filename="../src/core/server.cpp" line="901"/>
-        <source>Received CTCP VERSION request by %1</source>
+        <location filename="../src/qtui/identities.cpp" line="430"/>
+        <source>Edit Identity Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/server.cpp" line="908"/>
-        <source>Received unknown CTCP %1 by %2</source>
+        <location filename="../src/qtui/identities.cpp" line="431"/>
+        <source>Identity:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ServerEditDlg</name>
     <message>
-        <location filename="../src/qtgui/ui/servereditdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui/servereditdlg.ui" line="13"/>
         <source>Enter Server Details</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/servereditdlg.ui" line="58"/>
+        <location filename="../src/qtui/ui/servereditdlg.ui" line="58"/>
         <source>Server address:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/servereditdlg.ui" line="65"/>
+        <location filename="../src/qtui/ui/servereditdlg.ui" line="65"/>
         <source>Port:</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../src/qtui/settingspages/servereditdlg.ui" line="13"/>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ServerListDlg</name>
     <message>
-        <location filename="../src/qtgui/serverlist.cpp" line="138"/>
+        <location filename="../src/qtui/serverlist.cpp" line="138"/>
         <source>Remove Network?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/serverlist.cpp" line="138"/>
+        <location filename="../src/qtui/serverlist.cpp" line="138"/>
         <source>Are you sure you want to delete the selected network(s)?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/serverlistdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui/serverlistdlg.ui" line="13"/>
         <source>Server List</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/serverlistdlg.ui" line="66"/>
+        <location filename="../src/qtui/ui/serverlistdlg.ui" line="66"/>
         <source>&amp;Add...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/serverlistdlg.ui" line="79"/>
+        <location filename="../src/qtui/ui/serverlistdlg.ui" line="79"/>
         <source>&amp;Edit...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/serverlistdlg.ui" line="92"/>
+        <location filename="../src/qtui/ui/serverlistdlg.ui" line="92"/>
         <source>&amp;Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/serverlistdlg.ui" line="127"/>
+        <location filename="../src/qtui/ui/serverlistdlg.ui" line="127"/>
         <source>&amp;Show this dialog on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/serverlistdlg.ui" line="150"/>
+        <location filename="../src/qtui/ui/serverlistdlg.ui" line="150"/>
         <source>&amp;Connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/serverlistdlg.ui" line="163"/>
+        <location filename="../src/qtui/ui/serverlistdlg.ui" line="163"/>
         <source>C&amp;lose</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1448,44 +1981,95 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>SettingsDlg</name>
     <message>
-        <location filename="../src/qtgui/ui/settingsdlg.ui" line="13"/>
+        <location filename="../src/qtui/ui/settingsdlg.ui" line="13"/>
         <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/qtgui/ui/settingsdlg.ui" line="30"/>
+        <location filename="../src/qtui/ui/settingsdlg.ui" line="51"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SignalProxy</name>
+    <name>SqliteStorage</name>
+    <message>
+        <location filename="../src/core/sqlitestorage.cpp" line="148"/>
+        <source>Could not open backlog database: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="26"/>
-        <source>Device given for ProxyType == Server, ignoring...</source>
+        <location filename="../src/core/sqlitestorage.cpp" line="124"/>
+        <source>Disabling logging...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/common/signalproxy.cpp" line="42"/>
-        <source>Cannot add more than one peer to a SignalProxy in client mode!</source>
+        <location filename="../src/core/sqlitestorage.cpp" line="123"/>
+        <source>Could not create backlog table: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SqliteStorage</name>
+    <name>StorageDetailsPage</name>
     <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="33"/>
-        <source>Could not open backlog database: %1</source>
+        <location filename="../src/qtui/configwizard.cpp" line="118"/>
+        <source>Setup Storage Provider</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="179"/>
-        <source>Disabling logging...</source>
+        <location filename="../src/qtui/configwizard.cpp" line="119"/>
+        <source>Please enter credentials for the selected storage provider.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/core/sqlitestorage.cpp" line="178"/>
-        <source>Could not create backlog table: %1</source>
+        <location filename="../src/qtui/configwizard.cpp" line="121"/>
+        <source>Host:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="125"/>
+        <source>Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="131"/>
+        <source>Database:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="135"/>
+        <source>User:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/configwizard.cpp" line="139"/>
+        <source>Password:</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>
+        <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>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TopicWidget</name>
+    <message>
+        <location filename="../src/qtui/ui/topicwidget.ui" line="31"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/qtui/ui/topicwidget.ui" line="52"/>
+        <source>...</source>
         <translation type="unfinished"></translation>
     </message>
 </context>